From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 9 May 2020 23:46:45 +0000 (+0100)
Subject: dot/shell-rc: Factor out the terminal and screen title-setting.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/1e8b505fee84d2952bd24f7a04b1cd8ed1300ee2

dot/shell-rc: Factor out the terminal and screen title-setting.

This is getting even more complicated as time goes on.
---

diff --git a/dot/shell-rc b/dot/shell-rc
index 2478edb..d6a218a 100644
--- a/dot/shell-rc
+++ b/dot/shell-rc
@@ -145,11 +145,22 @@ __mdw_set_prompt () {
   esac
 }
 
-__mdw_xterm_precmd () { printf >/dev/tty "]2;%s@%s:%s – %s\\" "$USER" "$__mdw_host" "$PWD" "$__mdw_shell"; }
-__mdw_xterm_preexec () { printf >/dev/tty "]2;%s@%s:%s – %s\\" "$USER" "$__mdw_host" "$PWD" "$1"; }
+__mdw_xterm_settitle () {
+  printf >/dev/tty \
+    "]2;%s@%s:%s – %s\\" \
+    "$USER" "$__mdw_host" "$PWD" \
+    "$1"
+}
+__mdw_xterm_precmd () { __mdw_xterm_settitle "$__mdw_shell"; }
+__mdw_xterm_preexec () { __mdw_xterm_settitle "$1"; }
 
-__mdw_screen_precmd () { printf >/dev/tty "k%s\\" "$__mdw_shell"; }
-__mdw_screen_preexec () { printf >/dev/tty "k%s\\" "$1"; }
+__mdw_screen_settitle () {
+  printf >/dev/tty \
+    "k%s\\" \
+    "$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},${TERM} in