xinit and xdm is fixed builddep.

2015-07-15 18:20:16 +03:00
parent a5ddc4e64f
commit f1f07fcac9
34 changed files with 1042 additions and 1 deletions
@@ -0,0 +1,8 @@
+*customization: -color
+
+Xft.dpi:        96
+
+Xft.antialias:  true
+Xft.hinting:    true
+Xft.hintstyle:  hintmedium
+Xft.rgba:       rgb
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+SESSIONDIR=/etc/X11/Xsession.d
+STARTUP=
+
+#TODO Create error file (~/.xsession-errors) here
+
+echo "X session started for $LOGNAME at $(date)"
+
+if [ -d $SESSIONDIR ]; then
+    for file in $SESSIONDIR/*.sh; do
+        . $file
+    done
+fi
+
+exec -l $SHELL -c "$STARTUP"
+
+# Control should never reach here
+exec -l $SHELL -c "xsm"
@@ -0,0 +1,11 @@
+
+SYSRESOURCES=/etc/X11/Xresources
+USERRESOURCES=$HOME/.Xresources
+
+if [ -f $SYSRESOURCES ]; then
+    xrdb -merge $SYSRESOURCES
+fi
+
+if [ -f "$USERRESOURCES" ]; then
+    xrdb -merge "$USERRESOURCES"
+fi
@@ -0,0 +1,5 @@
+
+CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
+if [ -x "$CK_LAUNCH_SESSION" -a -z "$XDG_SESSION_COOKIE" ]; then
+    STARTUP="$CK_LAUNCH_SESSION $STARTUP"
+fi
@@ -0,0 +1,3 @@
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    eval `/usr/bin/dbus-launch --sh-syntax --exit-with-session`
+fi
@@ -0,0 +1,9 @@
+[ -e /etc/profile.env ] && . /etc/profile.env
+
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+    PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+else
+    PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:${PATH}"
+fi
+export PATH
+unset ROOTPATH
@@ -0,0 +1,6 @@
+
+
+if [ -x /usr/bin/xhost -a -x /usr/bin/id ]; then
+    xhost +si:localuser:`id -un` > /dev/null
+fi
+xhost +
@@ -0,0 +1,5 @@
+
+SSH_AGENT=/usr/bin/ssh-agent
+if [ -x "$SSH_AGENT" -a -z "$SSH_AGENT_PID" ]; then
+    STARTUP="$SSH_AGENT $STARTUP"
+fi
@@ -0,0 +1,42 @@
+
+DEFAULT_DESKTOP=/etc/default/desktop
+USER_XSESSION=$HOME/.xsession
+SESSION=$DESKTOP_SESSION
+STARTUP=
+
+case $1 in
+    failsafe)
+        exec -l $SHELL -c "xterm -geometry 80x24-0-0"
+        ;;
+    custom)
+        if [ -x "$USER_XSESSION" ]; then
+            STARTUP="$USER_XSESSION"
+        fi
+        ;;
+    default|"")
+        test -f $DEFAULT_DESKTOP && . $DEFAULT_DESKTOP
+
+        if [ -n $SESSION ]; then
+            desktop_file="/usr/share/xsessions/$SESSION.desktop"
+            session_script="/etc/X11/Sessions/$SESSION"
+
+            if [ -f "$desktop_file" ]; then
+                STARTUP=`grep "^Exec=" "$desktop_file" | cut -d= -f 2-`
+            elif [ -x "$session_script" ]; then
+                STARTUP="$session_script"
+            fi
+        fi
+        ;;
+    *)
+        STARTUP="$1"
+        ;;
+esac
+
+if [ -z "$STARTUP" ]; then
+    # If STARTUP is still empty, try user script first.
+    if [ -x "$USER_XSESSION" ]; then
+        STARTUP="$USER_XSESSION"
+    else
+        STARTUP="xsm"
+    fi
+fi
@@ -0,0 +1,11 @@
+
+if test -z "${XDG_RUNTIME_DIR}"; then
+    export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
+    if ! test -d "${XDG_RUNTIME_DIR}"; then
+        mkdir "${XDG_RUNTIME_DIR}"
+        chmod 0700 "${XDG_RUNTIME_DIR}"
+    fi
+fi
+mkdir -p ~/.config
+cp weston/weston.ini ~/.config
+$EDITOR ~/.config/weston.ini
@@ -0,0 +1,4 @@
+USER_XKB=$HOME/.xkb
+USER_KEYMAP=$USER_XKB/keymap/default
+
+[ -r $USER_KEYMAP ] && xkbcomp -I$USER_XKB $USER_KEYMAP $DISPLAY
@@ -0,0 +1,12 @@
+Index: xinit-1.1.1/startx.cpp
+===================================================================
+--- xinit-1.1.1.orig/startx.cpp
+++ xinit-1.1.1/startx.cpp
+@@ -15,6 +15,7 @@ XCOMM $XFree86: xc/programs/xinit/startx
+ 
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset SESSION_MANAGER
+unset XDG_SESSION_COOKIE
+ 
+ #if defined(__SCO__) || defined(__UNIXWARE__) || defined(__APPLE__)
+ 
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+. /usr/lib/X11/xinit/Xsession