done
###--------------------------------------------------------------------------
+### Preliminary hook.
+
+if [ -r $HOME/.xinitrc-prehook ]; then
+ . $HOME/.xinitrc-prehook
+fi
+
+###--------------------------------------------------------------------------
### Iniitial settings.
## Assume X sessions are secure.
run init xrdb -override $HOME/.Xdefaults
## Random xsettery.
- run init xset b 10 2000 50
+ run init xset b 5 2000 50
run init xset r rate 500 50
run init xset m 2 1
## Key mappings.
- xmodmap -e 'keysym BackSpace = BackSpace BackSpace'
-
- ## Gnome settings.
- case $vnc in no) run bginit gnome-settings-daemon ;; esac
+ xmodmap $HOME/.xmodmap
+ if [ -r $HOME/.xmodmap-local ]; then
+ xmodmap $HOME/.xmodmap-local
+ fi
}
###--------------------------------------------------------------------------
### Start a window manager.
-wm=$(pick_program window-manager enlightenment e16 twm)
+wm=$(pick_program window-manager e16 compiz enlightenment e17 twm)
wmopts=""
case "$wm,$vnc" in
enlightenment,yes | e16,yes)
start-clients-local () { :; }
start-clients () {
- ## Mail notification.
- run bginit mail-notification
-
- ## Gnome session. With great reluctance. At least it doesn't actually do
- ## anything.
- run bginit gnome-session
- ## Policykit authentication agent.
- agent=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
- if [ -x $agent ]; then run bginit $agent; fi
-
- ## System monitor.
- case $vnc in no) run bginit gkrellm ;; esac
-
- ## Screensaver.
- case $vnc in
- no)
- run init xscreensaver-command -exit
- run bginit xscreensaver -no-splash
+ ## Gnome session.
+ case "$vnc,$(xfce4-session --version 2>&1),$(gnome-session --version 2>&1)"
+ in
+ no,xfce4-session*)
+ run bginit xfce4-session
+ ;;
+ no,*,gnome-session\ 2.3[2-9].* | \
+ no,*,gnome-session\ 2.4[0-9].* | \
+ no,*,gnome-session\ 2.[1-9][0-9][0-9]*)
+ run bginit gnome-session --session mdw
+ ;;
+ no,*,gnome-session*)
+ run bginit gnome-session
;;
esac
- ## Panel.
- case $vnc in no) run bginit gnome-panel ;; esac
-
## Local clients.
start-clients-local
}
eval "${line#!}"
;;
*)
- set -- $line
+ set -- $line
run bgclients "$@"
;;
esac
}
###--------------------------------------------------------------------------
+### Gnome session care and feeding.
+
+session-running-p () {
+ dbus-send --session --print-reply --dest=org.freedesktop.DBus / \
+ org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager \
+ >/dev/null 2>&1
+}
+
+dbus-service-running-p () {
+ dbus-send >/dev/null 2>&1 --session --print-reply \
+ --dest=org.freedesktop.DBus / \
+ org.freedesktop.DBus.GetNameOwner string:$1
+}
+
+kill-gnome-session () {
+ win=nil
+ while read service object logout; do
+ if dbus-service-running-p $service; then win=t; break; fi
+ done <<EOF
+org.xfce.SessionManager /org/xfce/SessionManager org.xfce.Session.Manager.Shutdown uint32:1 boolean:false
+org.gnome.SessionManager /org/gnome/SessionManager org.gnome.SessionManager.Logout uint32:2
+EOF
+ case $win in nil) return ;; esac
+ info "killing session manager"
+ dbus-send --session --dest=$service $object $logout
+ for i in 1 2 3 4 5; do
+ sleep 1
+ if ! dbus-service-running-p $service; then break; fi
+ done
+}
+
+###--------------------------------------------------------------------------
### Actually start things up.
if [ -f $HOME/.xinitrc-local ]; then
case "$wait" in
yes)
xwait
+ kill-gnome-session
;;
no)
info "not waiting before exit"