dot/xinitrc: Wait for e16 to start, and tweak cursor after it does.

This should also stop xterms and the like getting in before E does and
ending up in the wrong places as a result.

diff --git a/dot/xinitrc b/dot/xinitrc
index 2ef2a18943e6ab19b063e9f7f7d40834d74fcc6e..f29edddf740cb8c349c9d0f887a715f4dcff52b6 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -109,8 +109,36 @@ case "$wm,$vnc" in
     ;;
 esac
 
     ;;
 esac
 

-start-window-manager () {
+start-e16 () {

   run bginit $wm $wmopts
   run bginit $wm $wmopts

+  win=nil
+  for i in $(seq 10); do
+    if eesh version >/dev/null 2>&1; then
+      win=t
+      break
+    fi
+    sleep 1
+  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

 }
 
 ###--------------------------------------------------------------------------
 }
 
 ###--------------------------------------------------------------------------