X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/46e405665813a040e6f537b274fca65b4594218d..f1e393ffe71405600f4f869d8f0b96c2ae3cae02:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index fe4b440..5b7cd61 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -108,7 +108,11 @@ fi
 ### Iniitial settings.
 
 ## Assume X sessions are secure.
-export __mdw_sechost="`hostname`"
+export __mdw_sechost="$(hostname)"
+
+## Tell things that XFCE is in charge.  This is the most desktoppy thing that
+## I run, so it's not entirely wrong.
+: ${XDG_CURRENT_DESKTOP=XFCE}; export XDG_CURRENT_DESKTOP
 
 ## Obtain the screen dimensions.
 case ",$XWIDTH,$XHEIGHT," in
@@ -217,11 +221,15 @@ start-clients () {
 
 ## Choose appropriate clients.
 emacs=$(pick_program emacs \
-  emacs23-lucid emacs24-lucid emacs23 emacs24 emacs22 emacs21 emacs)
+  emacs24-lucid emacs23-lucid emacs24 emacs23 emacs22 emacs21 emacs)
 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.
 ##
+## e_colsz = width of a column in characters (from `emacs-width' metaconfig)
+## e_charwd = width of a character in pixels (assume `6x13')
+## e_colextra = additional per-column overhead in pixels
+## e_colextrachars = additional per-column overhead in character units
 ## e_colwd = basic width of a column in pixels
 ## e_hextra = extra horizontal width in pixels
 ##	Width of an N-column Emacs frame in pixels will be
@@ -288,7 +296,8 @@ declare -i \
 
 start-emacs () {
   GDK_NATIVE_WINDOWS=1 run bgclients noip \
-    $emacs -bg black -geometry ${emacsx}x${emacsy}+${XSCR0_X}+${XSCR0_Y}
+    $emacs -bg black -geometry ${emacsx}x${emacsy}+${XSCR0_X}+${XSCR0_Y} \
+    --mdw-splashy-startup
 }
 
 ## Now place some xterms.