X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Ftty%2Fterminal_titler.sh;h=8bc6ccd36d3c31b1145b3df0c1c401d58414beba;hb=da39fcf691a8479cffd74b31e66425225b26fa1c;hp=3c01d611faf1bd5ab430e4a7896de45e828ec34c;hpb=f9a2a21830b0ea5f803c17cae56573a6b18e43db;p=feisty_meow.git

diff --git a/scripts/tty/terminal_titler.sh b/scripts/tty/terminal_titler.sh
index 3c01d611..8bc6ccd3 100644
--- a/scripts/tty/terminal_titler.sh
+++ b/scripts/tty/terminal_titler.sh
@@ -1,65 +1,58 @@
 #!/bin/bash
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/common.alias"
 
-# just saying this is an array...
-declare -a PRIOR_TERMINAL_TITLES
-# set the stack position if not already set.
-if [ -z "$PTT_STACK_INDEX" ]; then
-  # this variable records where we will push new items on the stack.
-  PTT_STACK_INDEX=0
-fi
-
-# adds an entry into the stack of terminal titles.
-function push_ptt_stack()
-{
-  PRIOR_TERMINAL_TITLES[$PTT_STACK_INDEX]="$*"
-echo now list has:
-echo ${PRIOR_TERMINAL_TITLES[@]}
-  ((PTT_STACK_INDEX++))
-echo stack index incremented and now at $PTT_STACK_INDEX
-}
-
-function pop_ptt_stack()
-{
-  if [ $PTT_STACK_INDEX -le 0 ]; then
-    echo nothing to pop from prior terminal titles stack.
-  else
-    ((PTT_STACK_INDEX--))
-echo stack index decremented and now at $PTT_STACK_INDEX
-    CURRENT_TERM_TITLE="${PRIOR_TERMINAL_TITLES[$PTT_STACK_INDEX]}"
-  fi
-}
-
-# returns okay (0) if the stack is empty, or non-zero if not empty.
-function ptt_stack_empty()
-{
-  test $PTT_STACK_INDEX -le 0
-}
+# 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.
 # the title may not be visible in some window managers.
-function set_terminal_title()
+function apply_title_to_terminal()
 {
   title="$*"
   # if we weren't given a title, then use just the hostname.  this is the degraded functionality.
   if [ -z "${title}" ]; then
     title="$(hostname)"
   fi
-  echo -n -e "\033]0;${title}\007"
+  
+  if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" -a ! -z "$PS1" ]; then
+    echo -n -e "\033]0;${title}\007"
+  else
+    # not running interactively, so just echo the title.
+    sep
+    echo ${title}
+    sep
+  fi
 }
 
-# reads the current terminal title, if possible, and saves it to our stack of titles.
+# user friendly version that saves the title being added.
+function set_terminal_title()
+{
+  apply_title_to_terminal $*
+  save_terminal_title
+}
+
+# reads the current terminal title, if possible, and saves it to our record.
 function save_terminal_title()
 {
   # save the former terminal title if we're running in X with xterm.
   which xprop &>/dev/null
   if [ $? -eq 0 ]; then
-    if [[ "$TERM" =~ .*"xterm".* ]]; 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.+= \"(.*)\"$/')"
-echo "saving prior terminal title as '$prior_title'"
-      push_ptt_stack "$prior_title"
+      if [ ! -z "$prior_title" ]; then
+        if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+          echo "saving prior terminal title as '$prior_title'"
+        fi
+        export PRIOR_TERMINAL_TITLE="$prior_title"
+      else
+        if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+          echo "not saving prior terminal title which was empty"
+        fi
+      fi
     fi
   fi
 }
@@ -72,12 +65,11 @@ function restore_terminal_title()
 #  if [ -z "$(echo $* | grep git)" ]; then
 
   # run the terminal labeller to restore the prior title, if there was one.
-  if ptt_stack_empty; then
-echo prior titles were empty, so doing nothing.
-  else
-    pop_ptt_stack
-echo "restoring prior terminal title of '$CURRENT_TERM_TITLE'"
-    set_terminal_title "$CURRENT_TERM_TITLE"
+  if [ ! -z "$PRIOR_TERMINAL_TITLE" ]; then
+    if [ ! -z "$DEBUG_TERM_TITLE" ]; then
+      echo "restoring prior terminal title of '$PRIOR_TERMINAL_TITLE'"
+    fi
+    apply_title_to_terminal "$PRIOR_TERMINAL_TITLE"
   fi
 }
 
@@ -85,8 +77,10 @@ echo "restoring prior terminal title of '$CURRENT_TERM_TITLE'"
 function label_terminal_with_info()
 {
   # we only label the terminal anew if there's no saved title.
-#  if [ -z "$PRIOR_TERMINAL_TITLE" ]; then
-  if ptt_stack_empty; then
+  if [ -z "$PRIOR_TERMINAL_TITLE" ]; then
+    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
@@ -95,10 +89,15 @@ function label_terminal_with_info()
       user=$USERNAME
     fi
     new_title="-- $user@$pruned_host -- [$date_string]"
-    set_terminal_title "$new_title"
+    apply_title_to_terminal "$new_title"
+    save_terminal_title
   else
-    # restore the former title.
-    restore_terminal_title
+    # use the former title; paste it back up there just in case.
+    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
 }