X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Ffunctions;h=458a69bbb653735a5b45e44b4c8252ff762cb49e;hb=6a057f8fcf6e86496975b2e4d0e94609d277bd67;hp=18012885c8c281113734f72fba299e1a42b3768d;hpb=770456d66964bcfce681b0190203737b48511541;p=clearscm.git

diff --git a/rc/functions b/rc/functions
index 1801288..458a69b 100644
--- a/rc/functions
+++ b/rc/functions
@@ -19,7 +19,13 @@ view_name=
 
 # Function to set the title bar. Works on the terminal emulators listed.
 function title_bar {
+  if [ $# -gt 1 ]; then
+    ROOT=shift
+    ROOT="${NORMAL}\($ROOT\)"
+  fi
+
   prefix="$@"
+
   # Change $HOME -> ~
   if [ "${PWD#$HOME*}" != "$PWD" ]; then
     current_dir="~${PWD#$HOME*}"
@@ -39,8 +45,8 @@ function title_bar {
   fi
 
   # Add GIT info if available
-  if [ -d .git ]; then
-    current_dir="git: $(git branch | sed -n -e 's/^\* \(.*\)/\1/p') $current_dir"
+  if in_git_repo; then
+    current_dir="$current_dir [git: $(git branch | sed -n -e 's/^\* \(.*\)/\1/p')]"
   fi
 
   if [ "$TERM" = "hpterm" -o \
@@ -53,7 +59,7 @@ function title_bar {
     string=$(echo "${SYSNAME##*:}:$@")
     echo -n "${ESC}]2;$string\007"
   elif [ "$TERM" = "cygwin" -o "$TERM" = "vt100" -o "$TERM" = "xterm" ]; then
-    PS1="\[\e]0;$prefix$current_dir\a\e[01;33m\]$SYSNAME:\[\e[0m\]"
+    PS1="\[\e]0;$prefix$current_dir\a$ROOT\e[01;33m\]$SYSNAME:\[\e[0m\]"
   fi
 } # title_bar
 
@@ -96,7 +102,7 @@ function set_title {
     view_name=""
     title_bar "$ROOT"
   else
-    title_bar "${ROOT}View: $view_name: "
+    title_bar "$ROOT" "View: $view_name: "
   fi
 
   icon_name "${SYSNAME##*:}"