X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=blobdiff_plain;f=scripts%2Ftty%2Fterminal_titler.sh;h=7ced5c9fc83caa8093a303fb5406a936b29c39aa;hp=0203b9ae7fd771bbacbc80b1c2d2319e34462e3f;hb=564408342570fb0cb291d7a0680f90297f24b7bd;hpb=51356b493613a783d95f8ba5f6ef7777c8e50f5a

diff --git a/scripts/tty/terminal_titler.sh b/scripts/tty/terminal_titler.sh
index 0203b9ae..7ced5c9f 100644
--- a/scripts/tty/terminal_titler.sh
+++ b/scripts/tty/terminal_titler.sh
@@ -33,7 +33,7 @@ function set_terminal_title()
 {
   apply_title_to_terminal $*
 
-#tricky tries to get it to be available when we ask for it in get_terminal_title
+#tricky attempts to get it to be available when we ask for it in get_terminal_title
   sync
 #  echo -n
 
@@ -50,8 +50,12 @@ function get_terminal_title()
   # 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
+    # gnome-terminal doesn't set WINDOWID currently, but we can work around this.
+    if [[ -z "$WINDOWID" && ! -z "$(which xwininfo)" ]]; then
+#not good solution.      term_title_found="$(xprop -id $(xdotool getactivewindow) | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')"
+      term_title_found=$(xwininfo -id $(xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }') | awk -F\" '/xwininfo:/ { print $2; exit }')
+    # check if we're actually using xterm *and* that we have a window ID.
+    elif [[ "$TERM" =~ .*"xterm".* && ! -z "$WINDOWID" ]]; then
       term_title_found="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')"
     fi
   fi
@@ -102,7 +106,7 @@ function label_terminal_with_info()
     fi
     pruned_host=$(echo $HOSTNAME | sed -e 's/^\([^\.]*\)\..*$/\1/')
     date_string=$(date +"%Y %b %e @ %T")
-    user=$(logname)
+    user="$(logname)"
     if [ -z "$user" ]; then
       # try snagging the windoze name.
       user=$USERNAME