xinitrc: Switch based on VNC-ness rather than lots of feature flags.

This seems more maintainable in the long run.

diff --git a/vncsession b/vncsession
index e16bcb26f5b49841d8f96727da723b825bb538f4..3e4d0fb17bf02363b9cf63ed47477843325c975c 100755 (executable)
--- a/vncsession
+++ b/vncsession
@@ -8,7 +8,7 @@ set -vx
 __mdw_force_secure_session=yes
 . $HOME/.bash_profile
 EOPTS="-econfdir $HOME/.enlightenment-vnc"
 __mdw_force_secure_session=yes
 . $HOME/.bash_profile
 EOPTS="-econfdir $HOME/.enlightenment-vnc"

-SCSAVE=false
+VNCSESSION=true

 xmodmap -e 'keysym Alt_L = Meta_L'
 xmodmap -e 'keysym Alt_R = Meta_R'
 . $HOME/.xinitrc
 xmodmap -e 'keysym Alt_L = Meta_L'
 xmodmap -e 'keysym Alt_R = Meta_R'
 . $HOME/.xinitrc

diff --git a/xinitrc b/xinitrc
index 17471fec39162a5f0bc46d8d8a496eae30c92688..4e52f4b8c4e9150ba5dfb617aa1b1edd4dfef9a9 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -1,6 +1,7 @@
 #! /bin/bash
 
 xrdb -override $HOME/.Xdefaults
 #! /bin/bash
 
 xrdb -override $HOME/.Xdefaults

+: ${VNCSESSION=false}

 export __mdw_sechost="`hostname`"
 
 # --- Do some fiddling ---
 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&
 xset m 1 1
 gnome-settings-daemon&
 mail-notification&

-gkrellm&
+$VNCSESSION || gkrellm&

 eval `xscsize -bx`
 
 # --- Crank up ESD ---
 eval `xscsize -bx`
 
 # --- Crank up ESD ---


@@ -27,12 +28,11 @@ enlightenment $EOPTS&
 
 # --- Crank up a screenlock program ---
 
 
 # --- Crank up a screenlock program ---
 

-if ${SCSAVE-true}; then
+if ! $VNCSESSION; then

   xscreensaver-command -exit
   xscreensaver -no-splash&
 fi
 gnome-panel&
   xscreensaver-command -exit
   xscreensaver -no-splash&
 fi
 gnome-panel&

-mail-notification&

 
 # --- Emacs window measurements ---
 #
 
 # --- Emacs window measurements ---
 #