1 files changed, 21 insertions, 16 deletions
diff --git a/xterms.zsh b/xterms.zsh
index 17c6a104b..fef978748 100644
--- a/xterms.zsh
+++ b/xterms.zsh
@@ -1,16 +1,21 @@
-# Specific to xterms, such as OS X terminal
-
-if [[ "${TERM}" == xterm* ]]; then
-  unset TMOUT
-
-  precmd () {
-    print -Pn  "\033]0;%n@%m %~\007"
-    #print -Pn "\033]0;%n@%m%#  %~ %l  %w :: %T\a" ## or use this
-  }
-
-  preexec () {
-    print -Pn "\033]0;%n@%m <$1> %~\007"
-    #print -Pn "\033]0;%n@%m%#  <$1>  %~ %l  %w :: %T\a" ## or use this
-  }
-
-fi
-\ No newline at end of file
+case "$TERM" in
+  xterm*|rxvt*)
+    preexec () {
+      print -Pn "\e]0;%n@%m: $1\a"  # xterm
+    }
+    precmd () {
+      print -Pn "\e]0;%n@%m: %~\a"  # xterm
+    }
+    ;;
+  screen*)
+    preexec () {
+      local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]}
+      echo -ne "\ek$CMD\e\\"
+      print -Pn "\e]0;%n@%m: $1\a"  # xterm
+    }
+    precmd () {
+      echo -ne "\ekzsh\e\\"
+      print -Pn "\e]0;%n@%m: %~\a"  # xterm
+    }
+    ;;
+esac
+\ No newline at end of file