done
###--------------------------------------------------------------------------
+### Preliminary hook.
+
+if [ -r $HOME/.xinitrc-prehook ]; then
+ . $HOME/.xinitrc-prehook
+fi
+
+###--------------------------------------------------------------------------
### Iniitial settings.
## Assume X sessions are secure.
###--------------------------------------------------------------------------
### 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 () {
+
## Gnome session.
- case $vnc in no) run bginit gnome-session ;; esac
+ case "$vnc,$(gnome-session --version 2>&1)" in
+ 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,*)
+ run bginit gnome-session
+ ;;
+ esac
## Local clients.
start-clients-local
}
###--------------------------------------------------------------------------
+### 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
+}
+
+kill-gnome-session () {
+ if session-running-p; then
+ info "killing Gnome session manager"
+ dbus-send --session \
+ --dest=org.gnome.SessionManager /org/gnome/SessionManager \
+ org.gnome.SessionManager.Logout uint32:2
+ for i in 1 2 3 4 5; do
+ sleep 1
+ if ! session-running-p; then break; fi
+ done
+ fi
+}
+
+###--------------------------------------------------------------------------
### Actually start things up.
if [ -f $HOME/.xinitrc-local ]; then
case "$wait" in
yes)
xwait
+ kill-gnome-session
;;
no)
info "not waiting before exit"