X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/74bd743a2f7a7b36d5947a8b1a623aca33f40c9d..35f728b266da77d378a3b352aee35d508bd95089:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index 7aba2b9..9b4ab28 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -206,10 +206,22 @@ start-clients () {
 ### Main screen layout.
 
 ## Choose appropriate clients.
-emacs=$(pick_program emacs emacs23 emacs22 emacs21 emacs)
+emacs=$(pick_program emacs emacs23 emacs24 emacs22 emacs21 emacs)
 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.
+##
+## 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
+##	N*e_colwd + e_hextra
+## e_colchars = width of a column in Emacs `-geometry' units
+## e_cextra = extra horizontal width in Emacs `-geometry' units
+##	So an N-column frame should be reported to Emacs as being
+##	N*e_colchars + e_cextra geometry units wide
+## e_lineht = height of a character line in pixels
+## e_vextra = number of additional vertical cruft pixels
+##	So an N-line Emacs frame takes N*e_lineht + e_vextra pixels
 case "$emacs" in
   emacs21 | emacs)
     e_colwd=492 e_hextra=34
@@ -221,9 +233,18 @@ case "$emacs" in
     e_colchars=82 e_cextra=-6
     e_lineht=13 e_vextra=46
     ;;
+  emacs24)
+    e_colwd=492 e_hextra=5
+    e_colchars=82 e_cextra=-6
+    e_lineht=13 e_vextra=42
+    ;;
 esac
 
 ## Terminal window measurements.
+##
+## t_wd = the window width, in pixels
+## t_lineht, t_vextra = height parameters: if the window is N lines high,
+##	then it will be N*t_lineht + t_vextra pixels high
 case "$term" in
   pterm) t_wd=504 t_lineht=13 t_vextra=23 geom=-geometry;;
   Eterm) t_wd=504 t_lineht=13 t_vextra=23 geom=-g;;
@@ -255,7 +276,7 @@ declare -i \
 
 start-emacs () {
   GDK_NATIVE_WINDOWS=1 run bgclients noip \
-    $emacs -geometry ${emacsx}x${emacsy}+0+0
+    $emacs -bg black -geometry ${emacsx}x${emacsy}+0+0
 }
 
 ## Now place some xterms.
@@ -351,7 +372,7 @@ EOF
 	exec "$0" wait nostart
 	;;
       :ask-run)
-	req "Shell command" .cmd.hist xcatch -FMiscFixed6x13 -- sh -c&
+	req "Shell command" .cmd.hist xcatch -F"Fixed 13" -- sh -c&
 	;;
       :ask-command)
 	req "xinit command" .xinit.hist xatom set XINIT_COMMAND$atomtag&