X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/9906310798d936a6cacd0ec5a2d3b607e911c423..b8e1fad6b2b0f576cf7c3875ee3d352bbab88940:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index f1252d6..151b9a4 100755
--- 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,14 +144,8 @@ start-window-manager () {
 start-clients-local () { :; }
 
 start-clients () {
-  ## Mail notification.
-  run bginit mail-notification
-
-  ## System monitor.
-  case $vnc in no) run bginit gkrellm ;; esac
-
-  ## Panel.
-  case $vnc in no) run bginit gnome-panel ;; esac
+  ## Gnome session.
+  case $vnc in no) run bginit gnome-session ;; esac
 
   ## Local clients.
   start-clients-local
@@ -136,7 +155,7 @@ start-clients () {
 ### Main screen layout.
 
 ## Choose appropriate clients.
-emacs=$(pick_program emacs emacs22 emacs21 emacs)
+emacs=$(pick_program emacs emacs23 emacs22 emacs21 emacs)
 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.
@@ -146,7 +165,7 @@ case "$emacs" in
     e_colchars=82 e_cextra=-2
     e_lineht=13 e_vextra=52
     ;;
-  emacs22)
+  emacs22 | emacs23)
     e_colwd=492 e_hextra=8
     e_colchars=82 e_cextra=-6
     e_lineht=13 e_vextra=46
@@ -184,7 +203,8 @@ declare -i \
   emacsy="(XHEIGHT - e_vextra)/e_lineht"
 
 start-emacs () {
-  run bgclients noip $emacs -geometry ${emacsx}x${emacsy}+0+0
+  GDK_NATIVE_WINDOWS=1 run bgclients noip \
+    $emacs -geometry ${emacsx}x${emacsy}+0+0
 }
 
 ## Now place some xterms.
@@ -238,7 +258,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"
 }
 
@@ -292,7 +312,7 @@ EOF
 	eval "${line#!}"
 	;;
       *)
-        set -- $line
+	set -- $line
 	run bgclients "$@"
 	;;
     esac