X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Ftty%2Fterminal_titler.sh;h=9ef4f1c10c15347dd116745aa4260d4ddd257b98;hb=79562d8c24ba1d79fb91ab22ca0d534bc77efac0;hp=1856f7265074af8a7961d130569c32d7796150bf;hpb=c9d0d4b7ef552b0aab4c7a031f3a5a309843ec5d;p=feisty_meow.git

diff --git a/scripts/tty/terminal_titler.sh b/scripts/tty/terminal_titler.sh
index 1856f726..9ef4f1c1 100644
--- a/scripts/tty/terminal_titler.sh
+++ b/scripts/tty/terminal_titler.sh
@@ -3,7 +3,8 @@
 source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 source "$FEISTY_MEOW_SCRIPTS/core/common.alias"
 
-#export PRIOR_TERMINAL_TITLE
+# uncomment this to get extra noisy debugging.
+#export DEBUG_TERM_TITLE=true
 
 # puts a specific textual label on the terminal title bar.
 # this doesn't consider any previous titles; it just labels the terminal.
@@ -16,7 +17,8 @@ function apply_title_to_terminal()
     title="$(hostname)"
   fi
   
-  if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" -a ! -z "$PS1" ]; then
+  if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" -a \
+        ! -z "$PS1" -a "${TERM}" != "linux" ]; then
     echo -n -e "\033]0;${title}\007"
   else
     # not running interactively, so just echo the title.
@@ -30,27 +32,46 @@ function apply_title_to_terminal()
 function set_terminal_title()
 {
   apply_title_to_terminal $*
-  # an echo or some interaction with terminal seems needed to get terminal to respond
-  # so we will see the current title when we query for it.
-  echo
+
+#tricky tries to get it to be available when we ask for it in get_terminal_title
+  sync
+#  echo -n
+
+#  # we're enforcing a new title from here on.
+#  unset PRIOR_TERMINAL_TITLE
   save_terminal_title
 }
 
-# reads the current terminal title, if possible, and saves it to our record.
-function save_terminal_title()
+# echoes back the current title on the terminal window, if we can acquire it.
+function get_terminal_title()
 {
+  # this is an important value now; it is checked for in save_terminal_title.
+  local term_title_found="unknown"
   # save the former terminal title if we're running in X with xterm.
   which xprop &>/dev/null
   if [ $? -eq 0 ]; then
     # make sure we're actually using xterm *and* that we have a window ID.
     if [[ "$TERM" =~ .*"xterm".* && ! -z "$WINDOWID" ]]; then
-      local prior_title="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')"
-      if [ ! -z "$prior_title" ]; then
-echo "saving prior terminal title as '$prior_title'"
-        export PRIOR_TERMINAL_TITLE="$prior_title"
-      else
-echo "not saving prior terminal title which was empty"
-      fi
+      term_title_found="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')"
+    fi
+  fi
+  echo -n "$term_title_found"
+}
+
+# reads the current terminal title, if possible, and saves it to our record.
+function save_terminal_title()
+{
+  local title="$(get_terminal_title)"
+  if [ "$title" != "unknown" ]; then
+    # there was a title, so save it.
+    if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+      echo "saving prior terminal title as '$title'"
+    fi
+    export PRIOR_TERMINAL_TITLE="$title"
+  else
+    # the terminal had no title, or we couldn't access it, or there's no terminal.
+    if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+      echo "not saving prior terminal title which was empty"
     fi
   fi
 }
@@ -64,7 +85,9 @@ function restore_terminal_title()
 
   # run the terminal labeller to restore the prior title, if there was one.
   if [ ! -z "$PRIOR_TERMINAL_TITLE" ]; then
-echo "restoring prior terminal title of '$PRIOR_TERMINAL_TITLE'"
+    if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+      echo "restoring prior terminal title of '$PRIOR_TERMINAL_TITLE'"
+    fi
     apply_title_to_terminal "$PRIOR_TERMINAL_TITLE"
   fi
 }
@@ -74,23 +97,25 @@ function label_terminal_with_info()
 {
   # we only label the terminal anew if there's no saved title.
   if [ -z "$PRIOR_TERMINAL_TITLE" ]; then
-echo "showing new generated title since prior title was empty"
+    if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+      echo "showing new generated title since prior title was empty"
+    fi
     pruned_host=$(echo $HOSTNAME | sed -e 's/^\([^\.]*\)\..*$/\1/')
     date_string=$(date +"%Y %b %e @ %T")
-    user=$USER
+    user="$(logname)"
     if [ -z "$user" ]; then
       # try snagging the windoze name.
       user=$USERNAME
     fi
     new_title="-- $user@$pruned_host -- [$date_string]"
     apply_title_to_terminal "$new_title"
-#needing this extra echo is awful.  is there a better way?
-    echo
     save_terminal_title
   else
     # use the former title; paste it back up there just in case.
-echo "showing prior terminal title since there was a prior title!"
-echo "using prior terminal title of '$PRIOR_TERMINAL_TITLE'"
+    if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+      echo "showing prior terminal title since there was a prior title!"
+      echo "using prior terminal title of '$PRIOR_TERMINAL_TITLE'"
+    fi
     apply_title_to_terminal "$PRIOR_TERMINAL_TITLE"
   fi
 }