declare LOGCHECK global

[etc/zsh.git] / .zsh / zshrc / 10-xterm_title

diff --git a/.zsh/zshrc/10-xterm_title b/.zsh/zshrc/10-xterm_title
index b6958111f45cfa73c7c4dffacebd20bd934fdbc5..82f311a24c5182563e9f2290dcd3f84e2ef2eb00 100644 (file)
--- a/.zsh/zshrc/10-xterm_title
+++ b/.zsh/zshrc/10-xterm_title
@@ -13,14 +13,20 @@ autoload -U add-zsh-hook
 
 __set_xterm_title() {
   emulate -L zsh
 
 __set_xterm_title() {
   emulate -L zsh

+  local typ

   case $TERM in
   case $TERM in

-    screen)
-      print -nR $'\033k'$1$'\033'\\ 
+    (tmux|tmux-*) typ=tmux;;
+    (screen|screen-*) if [ -n "$TMUX" ]; then typ=tmux else typ=screen fi;;
+    (*) typ=xterm
+  esac
+
+  case "$typ" in
+    (xterm) print -nR $'\033]0;'$*$'\a';;
+    (screen)
+      print -nR $'\033k'$1$'\033'\\

       print -nR $'\033]0;'$2$'\a'
       ;;
       print -nR $'\033]0;'$2$'\a'
       ;;

-    xterm|rxvt*)
-      print -nR $'\033]0;'$*$'\a'
-      ;;
+    (tmux) print -nR $'\033]2;'$*$'\a';;

   esac
 }
 
   esac
 }
 


@@ -37,7 +43,7 @@ __get_session_flags() {
 __get_standard_prompt() {
   emulate -L zsh
   [[ -z $SSH_CLIENT ]] || print -nP "%m"
 __get_standard_prompt() {
   emulate -L zsh
   [[ -z $SSH_CLIENT ]] || print -nP "%m"

-  print -P "%#%25\<..\<%~ $(__get_session_flags)"
+  print -P "@${${(%):-%l}#pts/}%#%25\<..\<%~ $(__get_session_flags)"

 }
 
 _set_plain_xterm_title() {
 }
 
 _set_plain_xterm_title() {