X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f617db13b0685c674817a6c7c1d148da3c07081f..7e39172b7aca0bde958251078b7c60a0c2feb7a2:/xinitrc

diff --git a/xinitrc b/xinitrc
index 17471fe..e2674c6 100755
--- a/xinitrc
+++ b/xinitrc
@@ -1,6 +1,7 @@
 #! /bin/bash
 
 xrdb -override $HOME/.Xdefaults
+: ${VNCSESSION=false}
 export __mdw_sechost="`hostname`"
 
 # --- Do some fiddling ---
@@ -11,7 +12,7 @@ xset r rate 500 50
 xset m 1 1
 gnome-settings-daemon&
 mail-notification&
-gkrellm&
+$VNCSESSION || gkrellm&
 eval `xscsize -bx`
 
 # --- Crank up ESD ---
@@ -27,12 +28,11 @@ enlightenment $EOPTS&
 
 # --- Crank up a screenlock program ---
 
-if ${SCSAVE-true}; then
+if ! $VNCSESSION; then
   xscreensaver-command -exit
   xscreensaver -no-splash&
 fi
 gnome-panel&
-mail-notification&
 
 # --- Emacs window measurements ---
 #
@@ -44,10 +44,10 @@ emacs="noip emacs"
 
 # --- Xterm window measurements ---
 #
-# Window width is 504 (fixed).
+# Window width is 503 (fixed).
 # Vertical line pixel height = 13; misc overhead = 23
 
-xterm="Eterm" xgeom=-geometry
+xterm="pterm" xgeom=geometry
 
 # --- GNOME stuff measurements ---
 #
@@ -64,7 +64,7 @@ declare -i xbound="XWIDTH - 113"
 # and the toolbar, so we add on some rows which are later mysteriously
 # subtracted.
 
-declare -i ecols="(xbound - 504 - 34)/492"
+declare -i ecols="(xbound - 503 - 34)/492"
 if (( ecols < 2 && xbound > 492 * 2 + 34 )); then
   ecols=2
 elif (( ecols < 1 )); then
@@ -87,7 +87,7 @@ $emacs -geometry $((ecols * 82 - 2))x$(((XHEIGHT - 52)/13))+0+0&
 declare -i n=0 pgx=0 l h y ht
 declare -i hstd="35 * 13 + 23" hmin="25 * 13 + 23"
 while true; do
-  if ((x + 504 > xbound)); then
+  if ((x + 503 > xbound)); then
     if ((n >= 3)); then break; fi
     x="pgx + XWIDTH" pgx="pgx + XWIDTH" xbound="xbound + XWIDTH"
   fi
@@ -104,7 +104,7 @@ while true; do
     $xterm -$xgeom 80x25+$x+$y&
     n="n + 1"
   fi
-  x="x + 504"
+  x="x + 503"
 done
 
 # --- Wait for the world to end ---