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

diff --git a/dot/xinitrc b/dot/xinitrc
index f1252d6..1ba8b2c 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -125,9 +125,20 @@ 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
+
   ## Local clients.
   start-clients-local
 }
@@ -136,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.
@@ -146,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
@@ -184,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.
@@ -238,7 +250,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"
 }