X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/85bbf8d3d51ef892f4707fcbd6ffc841818175d1..c543cb59536bbf53f3afe8dd024f2aebda3a1750:/xinitrc

diff --git a/xinitrc b/xinitrc
index 06adb02..43ca142 100755
--- a/xinitrc
+++ b/xinitrc
@@ -11,7 +11,6 @@ cleanup=":"
 xset b 10 2000 50
 xset r rate 500 50
 xset m 1 1
-$xx gnome-settings-daemon&
 $xx mail-notification&
 $xx $VNCSESSION || $xx gkrellm&
 if [ "$XINIT_TEST" = "" ] || [ "$XWIDTH" = "" ] || [ "$XHEIGHT" = "" ]; then
@@ -25,17 +24,29 @@ if ! $xx [ -r /tmp/.esd/socket ]; then
   cleanup="$cleanup; kill $!"
 fi
 
+# --- Picking appropriate programs ---
+
+pick_program () {
+  for i in "$@"; do
+    if type -t >/dev/null "$i"; then echo "$i"; return; fi
+  done
+  echo false
+}
+
 # --- Start a nice window manager ---
 
-$xx enlightenment $EOPTS&
+: ${wm=$(pick_program enlightenment e16)}
+$tt Window manager is $wm.
+$xx $wm $EOPTS&
 
 # --- Crank up a screenlock program ---
 
 if ! $xx $VNCSESSION; then
   xscreensaver-command -exit
   xscreensaver -no-splash&
+  $xx gnome-settings-daemon&
+  $xx gnome-panel&
 fi
-$xx gnome-panel&
 
 # --- Emacs window measurements ---
 #
@@ -43,13 +54,6 @@ $xx gnome-panel&
 # Column character width = 82; Emacs magic overhead = -2
 # Vertical line pixel height = 13; misc overhead = 52
 
-pick_program () {
-  for i in "$@"; do
-    if type -t >/dev/null "$i"; then echo "$i"; return; fi
-  done
-  echo false
-}
-
 : ${emacs=$(pick_program emacs22 emacs21)}
 $tt Using editor $emacs.
 case "$emacs" in