Gnome hacking: Introduce a custom session file.

[profile] / dot / xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index f607193..3141367 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -87,15 +87,12 @@ initialize () {
   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
 }
 
 ###--------------------------------------------------------------------------
@@ -109,8 +106,36 @@ case "$wm,$vnc" in
     ;;
 esac
 
-start-window-manager () {
+start-e16 () {
   run bginit $wm $wmopts
+  win=nil
+  for i in $(seq 10); do
+    sleep 1
+    if eesh version >/dev/null 2>&1; then
+      win=t
+      break
+    fi
+  done
+  case $win in
+    t)
+      info "$wm started ok"
+      run init xsetroot -cursor_name left_ptr
+      ;;
+    nil)
+      info "$wm failed to start!"
+      ;;
+  esac
+}
+
+start-window-manager () {
+  case $(type -t start-$wm || echo "not-found") in
+    function)
+      start-$wm $wmopts
+      ;;
+    *)
+      run bginit $wm $wmopts
+      ;;
+  esac
 }
 
 ###--------------------------------------------------------------------------
@@ -119,26 +144,19 @@ start-window-manager () {
 start-clients-local () { :; }
 
 start-clients () {
-  ## Mail notification.
-  run bginit mail-notification
 
-  ## 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,$(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
 
-  ## Panel.
-  case $vnc in no) run bginit gnome-panel ;; esac
-
-  ## System tray.
-  run bginit stalonetray
-
   ## Local clients.
   start-clients-local
 }
@@ -250,7 +268,7 @@ start-xterms () {
 
 req () {
   declare title=$1 hist=$2; shift 2
-  cmd=$(xgetline -t "$title" -p "Command:" -Hl "$HOME/$hist") &&
+  cmd=$(xgetline -t "$title" -p "_Command:" -Hl "$HOME/$hist") &&
   exec "$@" "$cmd"
 }
 
@@ -304,7 +322,7 @@ EOF
        eval "${line#!}"
        ;;
       *)
-        set -- $line
+       set -- $line
        run bgclients "$@"
        ;;
     esac