From 8e08f81479e23b3450c872432545290b3b2cd7f9 Mon Sep 17 00:00:00 2001 Message-Id: <8e08f81479e23b3450c872432545290b3b2cd7f9.1719114994.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 23 Mar 2008 16:30:01 +0000 Subject: [PATCH] xinitrc, setup: Overhaul of X session handling. Organization: Straylight/Edgeware From: Mark Wooding Requires 1.4.0 of xtoys. The xinitrc now waits for and processes commands when it's finished. This involves a major restructuring of the code. Also tweak window manager bindings to match, and provide useful support scripts. The inclusion of movemail-hack is sneaky: while we're moving things into the collection, we might as well add this too. --- e-keybindings.cfg | 8 +- e16-bindings | 4 +- movemail-hack | 5 + setup | 13 +- vncsession | 7 +- xinitrc | 362 +++++++++++++++++++++++++++++++++------------- xrun | 3 + xsession | 2 +- xshutdown | 9 ++ 9 files changed, 297 insertions(+), 116 deletions(-) create mode 100755 movemail-hack create mode 100755 xrun create mode 100755 xshutdown diff --git a/e-keybindings.cfg b/e-keybindings.cfg index 875b2cb..b0e49b5 100644 --- a/e-keybindings.cfg +++ b/e-keybindings.cfg @@ -205,7 +205,7 @@ __ACLASS __BGN __KEY Insert __EVENT __KEY_PRESS __MODIFIER_KEY __CTRL_ALT - __ACTION __A_EXEC pterm + __ACTION __A_EXEC xatom set XINIT_COMMAND :terminal __NEXT_ACTION __KEY v __MODIFIER_KEY __CTRL_ALT @@ -290,7 +290,7 @@ __ACLASS __BGN __KEY F8 __EVENT __KEY_PRESS __MODIFIER_KEY __ALT - __ACTION __A_EXEC pterm + __ACTION __A_EXEC xatom set XINIT_COMMAND :terminal __NEXT_ACTION __KEY F9 __EVENT __KEY_PRESS @@ -300,7 +300,7 @@ __ACLASS __BGN __KEY F10 __EVENT __KEY_PRESS __MODIFIER_KEY __ALT - __ACTION __A_EXEC panel + __ACTION __A_EXEC xatom set XINIT_COMMAND gnome-panel __NEXT_ACTION __KEY F11 __EVENT __KEY_PRESS @@ -310,7 +310,7 @@ __ACLASS __BGN __KEY F12 __EVENT __KEY_PRESS __MODIFIER_KEY __ALT - __ACTION __A_EXEC xshutdown -a XWAIT_DIE -m XWAIT_DIE_NOW + __ACTION __A_EXEC xshutdown __NEXT_ACTION __KEY Tab __MODIFIER_KEY __ALT diff --git a/e16-bindings b/e16-bindings index 01277a1..6b92e6c 100644 --- a/e16-bindings +++ b/e16-bindings @@ -34,7 +34,9 @@ KeyDown SA Down area move 0 1 KeyDown SA Up area move 0 -1 KeyDown SA Left area move -1 0 KeyDown SA Right area move 1 0 -KeyDown A F8 exec pterm +KeyDown A F8 exec xatom set XINIT_COMMAND :terminal +KeyDown A F9 exec xrun +KeyDown A F12 exec xshutdown KeyDown A Tab focus next KeyDown CA Up wop * raise KeyDown CA Down wop * lower diff --git a/movemail-hack b/movemail-hack new file mode 100755 index 0000000..a2916eb --- /dev/null +++ b/movemail-hack @@ -0,0 +1,5 @@ +#! /bin/sh + +set -e +unset LD_PRELOAD +exec ${REAL_MOVEMAIL-movemail} "$@" diff --git a/setup b/setup index c52e700..dde5264 100755 --- a/setup +++ b/setup @@ -68,9 +68,7 @@ fi echo "Installing useful scripts..." scripts=" - lesspipe.sh start-ssh-agent svnwrap movemail-hack" -[ "$xstuff" ] && scripts="$scripts - xrun" + lesspipe.sh start-ssh-agent svnwrap" for script in $scripts; do $echon " $script:$echoc" found= @@ -95,12 +93,11 @@ echo " all done." ### Install some more complicated programs echo "Installing packages..." systems=" - mLib:2.0.3:mLib-config + mlib:2.0.4:crc-mktab chkpath:1.1.0:tmpdir " [ "$xstuff" ] && systems="$systems - mgLib:1.1.0:mgLib-config - xtoys:1.3.0:xscsize + xtoys:1.4.0:xatom " for system in $systems; do set -- $(echo $system | tr : ' ') @@ -181,7 +178,11 @@ echo " all done." ### Install useful scripts included in this package scripts=" mdw-editor + movemail-hack emerge-hack" +[ "$xstuff" ] && scripts="$scripts + xrun + xshutdown" echo "Installing scripts..." mkdir -p $HOME$sub/bin for s in $scripts; do diff --git a/vncsession b/vncsession index 3e4d0fb..479ca46 100755 --- a/vncsession +++ b/vncsession @@ -3,13 +3,8 @@ # --- Lots of sensible initialisation --- exec >$HOME/.vnc-errors 2>&1 -set -vx __mdw_force_secure_session=yes . $HOME/.bash_profile -EOPTS="-econfdir $HOME/.enlightenment-vnc" -VNCSESSION=true -xmodmap -e 'keysym Alt_L = Meta_L' -xmodmap -e 'keysym Alt_R = Meta_R' -. $HOME/.xinitrc +$HOME/.xinitrc vnc . $HOME/.bash_logout diff --git a/xinitrc b/xinitrc index 43ca142..60a11e6 100755 --- a/xinitrc +++ b/xinitrc @@ -1,63 +1,147 @@ #! /bin/bash +### +### X startup script -xx= tt=:; if [ "$XINIT_TEST" != "" ]; then xx=: tt=echo; set -x; fi -$xx xrdb -override $HOME/.Xdefaults -: ${VNCSESSION=false} -export __mdw_sechost="`hostname`" - -# --- Do some fiddling --- +###-------------------------------------------------------------------------- +### Utility functions. -cleanup=":" -xset b 10 2000 50 -xset r rate 500 50 -xset m 1 1 -$xx mail-notification& -$xx $VNCSESSION || $xx gkrellm& -if [ "$XINIT_TEST" = "" ] || [ "$XWIDTH" = "" ] || [ "$XHEIGHT" = "" ]; then - eval `xscsize -bx` -fi +## Progress indicators. +info=yes +info () { + case $info in yes) echo "- $*" >&2 ;; esac +} -# --- Crank up ESD --- +run=yes +run () { + local what=$1; shift + local bg=no -if ! $xx [ -r /tmp/.esd/socket ]; then - esd -nobeeps -as 10& - cleanup="$cleanup; kill $!" -fi + case $what in bg*) bg=yes what=${what#bg} ;; esac + info "run $what: $*" -# --- Picking appropriate programs --- + case "$run,$bg" in + yes,no) "$@" ;; + yes,yes) "$@" & ;; + esac +} +## Program choice pick_program () { + local what=$1; shift + local choice=false for i in "$@"; do - if type -t >/dev/null "$i"; then echo "$i"; return; fi + if type -t >/dev/null "$i"; then choice=$i; break; fi done - echo false + info "pick $what = $choice" + echo "$choice" } -# --- Start a nice window manager --- +###-------------------------------------------------------------------------- +### Parse arguments. -: ${wm=$(pick_program enlightenment e16)} -$tt Window manager is $wm. -$xx $wm $EOPTS& +vnc=no +atomtag= +start=yes +wait=yes -# --- Crank up a screenlock program --- +for opt; do + case "$opt" in + help) + cat <&2; exit 1 ;; + esac +done + +###-------------------------------------------------------------------------- +### Iniitial settings. + +## Assume X sessions are secure. +export __mdw_sechost="`hostname`" + +## Obtain the screen dimensions. +case ",$XWIDTH,$XHEIGHT," in + *,,*) eval $(xscsize -bx) ;; +esac +info "screen size = $XWIDTH x $XHEIGHT" + +initialize () { + ## Load the X resource database. + run init xrdb -override $HOME/.Xdefaults + + ## Random xsettery. + run init xset b 10 2000 50 + run init xset r rate 500 50 + run init xset m 2 1 + + ## Gnome settings. + case $vnc in no) run bginit gnome-settings-daemon ;; esac +} + +###-------------------------------------------------------------------------- +### Start a window manager. + +wm=$(pick_program window-manager enlightenment e16 twm) +wmopts="" +case "$wm,$vnc" in + enlightenment,yes | e16,yes) + wmopts="$eopts -econfdir $HOME/.enlightenment-vnc" + ;; +esac + +start-window-manager () { + run bginit $wm $wmopts +} + +###-------------------------------------------------------------------------- +### Random useful clients. + +start-clients () { + ## Mail notification. + run bginit mail-notification + + ## 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 +} + +###-------------------------------------------------------------------------- +### Main screen layout. -# --- Emacs window measurements --- -# -# Horizontal column pixel width = 492; window manager overhead = 34 -# Column character width = 82; Emacs magic overhead = -2 -# Vertical line pixel height = 13; misc overhead = 52 +## Choose appropriate clients. +emacs=$(pick_program emacs emacs22 emacs21 emacs) +term=$(pick_program terminal pterm Eterm xterm) -: ${emacs=$(pick_program emacs22 emacs21)} -$tt Using editor $emacs. +## Emacs window measurements. case "$emacs" in - emacs21) + emacs21 | emacs) e_colwd=492 e_hextra=34 e_colchars=82 e_cextra=-2 e_lineht=13 e_vextra=52 @@ -69,33 +153,24 @@ case "$emacs" in ;; esac -# --- Xterm window measurements --- -# -# Window width is 503 (fixed). -# Vertical line pixel height = 13; misc overhead = 23 - -: ${term=$(pick_program pterm Eterm xterm)} -$tt Using terminal $tt +## Terminal window measurements. case "$term" in pterm) t_wd=503 t_lineht=13 t_vextra=23 geom=-geometry;; Eterm) t_wd=504 t_lineht=13 t_vextra=23 geom=-g;; xterm) t_wd=507 t_lineht=13 t_vextra=27 geom=-geometry;; esac -# --- GNOME stuff measurements --- -# -# GNOME panel width = 113 - +## GNOME stuff measurements. declare -i xbound="XWIDTH - 113" -# --- Choose a width for Emacs --- -# -# We'd like it to be as wide as possible, allowing for a column of xterms -# down the right hand side. However, I'd prefer a double-width Emacs to a -# single-width Emacs and xterms. If it's not going to work at all, a single -# Emacs column will have to do. Also, there's a strange thing with Emacs21 -# and the toolbar, so we add on some rows which are later mysteriously -# subtracted. +## Choose a width for Emacs. +## +## We'd like it to be as wide as possible, allowing for a column of xterms +## down the right hand side. However, I'd prefer a double-width Emacs to a +## single-width Emacs and xterms. If it's not going to work at all, a single +## Emacs column will have to do. Also, there's a strange thing with Emacs21 +## and the toolbar, so we add on some rows which are later mysteriously +## subtracted. declare -i ecols="(xbound - t_wd - e_hextra)/e_colwd" if (( ecols < 2 && xbound > e_colwd * 2 + e_hextra )); then @@ -104,43 +179,134 @@ elif (( ecols < 1 )); then ecols=1 fi -declare -i x="ecols * e_colwd + e_hextra" -noip $emacs -geometry $((ecols * e_colchars + e_cextra))x$(((XHEIGHT - e_vextra)/e_lineht))+0+0& - -# --- Now place some xterms --- -# -# A few smaller xterms are in general better than one great big one. 35 -# lines is a good height for most terminals. 25 lines is a minimum. The -# strategy for doling out xterms into a column is to make as many 35-liners -# as we can, until the remaining space would be too small for a 25-liner. If -# we can get two 25s out of that then we do (largest first); otherwise just -# make one big one. We stop at the end of a page, once we've made three -# xterms. - -declare -i n=0 pgx=0 l h y ht -declare -i hstd="35 * t_lineht + t_vextra" hmin="25 * t_lineht + t_vextra" -while true; do - if ((x + t_wd > xbound)); then - if ((n >= 3)); then break; fi - x="pgx + XWIDTH" pgx="pgx + XWIDTH" xbound="xbound + XWIDTH" - fi - y=0 ht=XHEIGHT - while ((ht - hstd >= hmin)); do - $term $geom 80x35+$x+$y& - y="y + hstd" ht="ht - hstd" n="n + 1" +declare -i \ + emacsx="ecols * e_colchars + e_cextra" \ + emacsy="(XHEIGHT - e_vextra)/e_lineht" + +start-emacs () { + run bgclients noip $emacs -geometry ${emacsx}x${emacsy}+0+0 +} + +## Now place some xterms. +## +## A few smaller xterms are in general better than one great big one. 35 +## lines is a good height for most terminals. 25 lines is a minimum. The +## strategy for doling out xterms into a column is to make as many 35-liners +## as we can, until the remaining space would be too small for a 25-liner. +## If we can get two 25s out of that then we do (largest first); otherwise +## just make one big one. We stop at the end of a page, once we've made +## three xterms. + +start-xterms () { + + ## Initialize some parameters. + declare -i x="ecols * e_colwd + e_hextra" + declare -i n=0 pgx=0 l h y ht + declare -i hstd="35 * t_lineht + t_vextra" hmin="25 * t_lineht + t_vextra" + + ## Do the placement. + while :; do + + ## Start a new iteration. + if ((x + t_wd > xbound)); then + if ((n >= 3)); then break; fi + x="pgx + XWIDTH" pgx="pgx + XWIDTH" xbound="xbound + XWIDTH" + fi + + ## Make large xterms. + y=0 ht=XHEIGHT + while ((ht - hstd >= hmin)); do + run bgclients $term $geom 80x35+$x+$y + y="y + hstd" ht="ht - hstd" n="n + 1" + done + + ## Fill the remaining space. + if ((ht >= 2 * hmin)); then h="ht - hmin"; else h=ht; fi + l="(h - t_vextra)/t_lineht" h="l * t_lineht + t_vextra" + run bgclients $term $geom 80x$l+$x+$y + y="y + h" ht="ht - h" n="n + 1" + if ((ht >= hmin)); then + run bgclients $term $geom 80x25+$x+$y + n="n + 1" + fi + x="x + t_wd" done - if ((ht >= 2 * hmin)); then h="ht - hmin"; else h=ht; fi - l="(h - t_vextra)/t_lineht" h="l * t_lineht + t_vextra" - $term $geom 80x$l+$x+$y& - y="y + h" ht="ht - h" n="n + 1" - if ((ht >= hmin)); then - $term $geom 80x25+$x+$y& - n="n + 1" - fi - x="x + t_wd" -done +} -# --- Wait for the world to end --- +###-------------------------------------------------------------------------- +### Final waiting. + +atom=XINIT_COMMAND$atomtag + +xwait () { + while :; do + xatom delete $atom + info "waiting on $atom" + line=$(xatom wait $atom) + info "xatom: $line" + + case "$line" in + :help) + xmsg -I -t "xinitrc help" -d "xinitrc commands" - <