X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e517857ccb761df498445e0ea2ec9cf2b8c7b53f..f3f0c0a0c4b61b6d81d5186043b318fb342c8172:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index 7543e15..da8c51c 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -125,11 +125,19 @@ start-clients () {
   ## 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
+      ;;
+  esac
+
   ## Panel.
   case $vnc in no) run bginit gnome-panel ;; esac
 
   ## System tray.
-  run bginit stalonetray
+  ## run bginit stalonetray
 
   ## Local clients.
   start-clients-local
@@ -139,7 +147,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.
@@ -149,7 +157,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
@@ -187,7 +195,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.