dot/shell-rc (__mdw_xterm_settitle): Use the correct control code.

[profile] / dot / shell-rc

diff --git a/dot/shell-rc b/dot/shell-rc
index 582b94d..33403cb 100644 (file)
--- a/dot/shell-rc
+++ b/dot/shell-rc
@@ -61,32 +61,56 @@ __mdw_runhook () {
 ###--------------------------------------------------------------------------
 ### Prompt machinery.
 
-__mdw_set_prompt_hacks () { host=$(hostname); dir=""; }
+__mdw_host=$(hostname)
+__mdw_hqual=
+__mdw_hqual=$__mdw_hqual${SCHROOT_CHROOT_NAME+/$SCHROOT_CHROOT_NAME}
+__mdw_hqual=$__mdw_hqual${CROSS_BUILDENV+/$CROSS_BUILDENV}
+__mdw_set_prompt_hacks () { host=$__mdw_host; dir=""; }
+
+__mdw_system=$(uname -s)
+: ${USER-${LOGNAME-$(id -un)}}
+__mdw_user=$USER
+
+case $(id -u) in
+  0)
+    __mdw_rootp=t
+    ;;
+  *)
+    case $__mdw_system in
+      CYGWIN_*)
+       case " $(id -G) " in
+         *" 544 "*) __mdw_rootp=t __mdw_user="$__mdw_user%admin" ;;
+         *) __mdw_rootp=nil ;;
+       esac
+       ;;
+      *)
+       __mdw_rootp=nil
+       ;;
+    esac
+esac
 
 __mdw_set_prompt_pieces () {
-  local hqual
-  hqual=""
 
   ## Fancy highlighting in some terminals.
-  local bold unbold nl gitcolour rccolour uncolour
-  local host dir more
-  bold="" unbold="" nl="" gitcolour="" rccolour="" uncolour="" more=""
+  local bold unbold nl more host dir
+  local gitcolour extracolour rccolour uncolour
+  bold="" unbold="" nl="" more=""
+  gitcolour="" extracolour="" rccolour="" uncolour=""
   __mdw_set_prompt_hacks
 
   ## Choose the right delimiters.  Highlight root prompts specially;
   ## highlight when I'm running as some other user.  Highlight when this
   ## isn't the outermost shell on the terminal.
-  local left right user u tty
-  user=${USER-${LOGNAME-$(id -un)}}
-  case $(id -u) in
-    0)
+  local left right u tty
+  case $__mdw_rootp in
+    t)
       left=$(echo « | iconv -f UTF-8 -t //translit)
       right=$(echo » | iconv -f UTF-8 -t //translit)
       ;;
-    *)
-      case $user in
+    nil)
+      case $USER in
        mdw | mwooding | nemo) u="" left="[" right="]" ;;
-       *) u="$user@" left="{" right="}" ;;
+       *) u="$__mdw_user@" left="{" right="}" ;;
       esac
       tty=$(tty)
       case "$__mdw_tty" in
@@ -107,15 +131,15 @@ __mdw_set_prompt_pieces () {
 
   ## If this is an schroot environment or some other interesting augmented
   ## environment then point this out.
-  hqual="$hqual${SCHROOT_CHROOT_NAME+/$SCHROOT_CHROOT_NAME}"
-  hqual="$hqual${MDW_BUILDENV+/$MDW_BUILDENV}"
 
   ## Put together the main pieces.
-  __mdw_prompt_left="$nl$bold$left$sec_l$u$host$hqual$sec_r$dir"
+  __mdw_prompt_left="$nl$bold$left$sec_l$u$host$__mdw_hqual$sec_r$dir"
   __mdw_prompt_git_left="$unbold$gitcolour"
   __mdw_prompt_git_right="$uncolour$bold"
   __mdw_prompt_rc_left="$unbold$rccolour"
   __mdw_prompt_rc_right="$uncolour$bold"
+  __mdw_prompt_extra_left="$unbold$extracolour"
+  __mdw_prompt_extra_right="$uncolour$bold"
   __mdw_prompt_right="$right$unbold"
   __mdw_prompt_more=" $more$bold>$unbold "
 }
@@ -128,7 +152,7 @@ __mdw_set_prompt () {
       ;;
     *)
       __mdw_last_rc=$?
-      local git rc
+      local git extra rc
       if type __git_ps1 >/dev/null 2>&1; then
        git="$__mdw_prompt_git_left$(__git_ps1)$__mdw_prompt_git_right"
       else
@@ -138,19 +162,41 @@ __mdw_set_prompt () {
        0) rc="" ;;
        *) rc="$__mdw_prompt_rc_left rc=$__mdw_last_rc$__mdw_prompt_rc_right" ;;
       esac
-      PS1="$__mdw_prompt_left$git$rc$__mdw_prompt_right"
+      case $__mdw_prompt_extra in
+       ?*) extra="$__mdw_prompt_extra_left [$__mdw_prompt_extra]$__mdw_prompt_extra_right" ;;
+       *) extra="" ;;
+      esac
+      PS1="$__mdw_prompt_left$git$extra$rc$__mdw_prompt_right"
       PS2="$PS1$__mdw_prompt_more"
       unset __mdw_last_rc
       ;;
   esac
 }
 
-__mdw_screen_precmd () { printf "\ek%s\e\\" "$__mdw_shell"; }
-__mdw_screen_preexec () { printf "\ek%s\e\\" "$1"; }
+__mdw_xterm_settitle () {
+  printf >/dev/tty \
+    "\e]0;%s@%s:%s – %s\e\\" \
+    "$__mdw_user" "$__mdw_host$__mdw_hqual" "$PWD" \
+    "$1"
+}
+__mdw_xterm_precmd () { __mdw_xterm_settitle "$__mdw_shell"; }
+__mdw_xterm_preexec () { __mdw_xterm_settitle "$1"; }
+
+__mdw_screen_settitle () {
+  printf >/dev/tty \
+    "\ek%s\e\\" \
+    "$1"
+}
+__mdw_screen_precmd () { __mdw_screen_settitle "$__mdw_shell"; }
+__mdw_screen_preexec () { __mdw_screen_settitle "$1"; }
 
 if [ -t 0 ]; then
-  case ${STY+t},${__mdw_precmd_hook+t},${__mdw_preexec_hook+t} in
-    t,t,t)
+  case ${STY+t},${__mdw_precmd_hook+t},${__mdw_preexec_hook+t},${TERM} in
+    ,t,t,xterm*)
+      __mdw_addhook __mdw_precmd_hook __mdw_xterm_precmd
+      __mdw_addhook __mdw_preexec_hook __mdw_xterm_preexec
+      ;;
+    t,t,t,*)
       __mdw_addhook __mdw_precmd_hook __mdw_screen_precmd
       __mdw_addhook __mdw_preexec_hook __mdw_screen_preexec
       ;;
@@ -179,8 +225,19 @@ alias e="$EDITOR"
 alias svn="svnwrap svn"
 alias @="ssh"
 alias make="nice make"
+alias cross-run="nice cross-run"
 alias gdb="gdb -q"
 
+## Shut up Lisp interpreters.
+alias clisp="clisp -q -q"
+alias cmucl="rlwrap cmucl -quiet"
+alias ecl="rlwrap ecl"
+alias sbcl="rlwrap sbcl --noinform"
+alias ccl="rlwrap ccl"
+alias ccl32="rlwrap ccl32"
+alias ccl64="rlwrap ccl64"
+alias abcl="rlwrap abcl --noinform"
+
 ###--------------------------------------------------------------------------
 ### Colour output.
 
@@ -416,6 +473,13 @@ case $(id -u) in
     ;;
 esac
 
+## Install wakeup machinery for long-running programs.
+case ${DISPLAY+t},${WINDOWID+t},${__mdw_precmd_hook+t},${__mdw_preexec_hook+t} in
+  t,t,t,t)
+    if [ -t 0 ] && __mdw_programp notify-send; then . $HOME/bin/wakey.sh; fi
+    ;;
+esac
+
 ## Run any local hooks.
 __mdw_source_if_exists "$HOME/.shell-local"