zsh/rc: window_title() optimization, only check TERM on startup.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 50291513fb67ca0aa7490dbfe22d82446354ebcd..c0a453e4b01e026f6e10f4f4e95f567822d8c414 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -52,7 +52,7 @@ if [[ -d ~/.zsh/functions ]]; then
 fi
 
 # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At
-# the moment only precmd() and preexec() are simulated.
+# the moment only precmd(), preexec() and chpwd() are simulated.
 #
 # At least 4.3.4 (not sure about later versions) has an error in add-zsh-hook
 # so the compatibility version is used there too.
@@ -60,7 +60,8 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then
     # Provide add-zsh-hook which was added in 4.3.4.
     fpath=(~/.zsh/functions/compatibility $fpath)
 
-    # Run all functions defined in the ${precmd,preexec}_functions arrays.
+    # Run all functions defined in the ${precmd,preexec,chpwd}_functions
+    # arrays.
     function precmd() {
         for function in $precmd_functions; do
             $function $@
@@ -71,6 +72,11 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then
             $function $@
         done
     }
+    function chpwd() {
+        for function in $chpwd_functions; do
+            $function $@
+        done
+    }
 fi
 
 # Autoload add-zsh-hook to add/remove zsh hook functions easily.
@@ -79,6 +85,7 @@ autoload -Uz add-zsh-hook
 # Load zmv (zsh move) which is powerful to rename files.
 autoload zmv
 
+
 # HISTORY SETTINGS
 
 # Use history and store it in ~/.zsh/history.
@@ -93,7 +100,7 @@ setopt incappendhistory
 setopt histignoredups
 # Vim like completions of previous executed commands (also enter Vi-mode). If
 # called at the beginning it just recalls old commands (like cursor up), if
-# called after typing something only lines starting with the typed are
+# called after typing something, only lines starting with the typed are
 # returned. Very useful to get old commands quickly. Thanks to Mikachu in #zsh
 # on Freenode (2010-01-17 12:47) for the information how to a use function
 # with bindkey.
@@ -134,7 +141,8 @@ local default="%{${fg[default]}%}"
 
 # Set the default prompt. The current host and working directory is displayed,
 # the exit code of the last command if it wasn't 0, the number of running jobs
-# if not 0 and a + if this shell is running inside another shell.
+# if not 0.
+#
 # The prompt is in green and blue to make easily detectable, the error exit
 # code in red and bold and the job count in yellow.
 PROMPT="$green%B%m%b$default:$blue%B%~%b$default \
@@ -219,8 +227,10 @@ unset red blue green yellow default
 #
 # If a command is run with sudo or if the shell is running as root then a ! is
 # added at the beginning of the command to make this clear. If a command is
-# running on a different computer with ssh a @ is added at the beginning. This
-# only works if the .zshrc on the server also uses this command.
+# running on a different computer with ssh a @ is added at the beginning. If
+# screen is running on the remote machine instead of @screen @:hostname
+# (hostname replaced by the machine's hostname) is displayed. This only works
+# if the .zshrc on the server also uses this command.
 if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
     # Is set to a non empty value to reset the window name in the next
     # precmd() call.
@@ -275,6 +285,12 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         # different computer.
         if [[ -n $SSH_CONNECTION ]]; then
             program_name="@$program_name"
+
+            # If screen is running in SSH then display "@:hostname" as title
+            # in the term/outer screen.
+            if [[ $program_name == @screen ]]; then
+                program_name="@:${$(hostname)//.*/}"
+            fi
         fi
 
         # Set the window name to the currently running program.
@@ -310,14 +326,15 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
     }
 
     # Sets the window title. Works with screen, xterm and rxvt.
-    window_title() {
-        if [[ $TERM == screen* ]]; then
+    if [[ $TERM == screen* ]]; then
+        window_title() {
             print -n "\ek$1\e\\"
-
-        elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
+        }
+    elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
+        window_title() {
             print -n "\e]2;$1\e\\"
-        fi
-    }
+        }
+    fi
 
     # Add the preexec() and precmd() hooks.
     add-zsh-hook preexec window_preexec
@@ -389,7 +406,7 @@ TRAPINT() {
     # Store the current buffer in the history.
     zle && print -s -- $BUFFER
 
-    # Return the default exit code so zsh aborts the current command.
+    # Return the default exit code so Zsh aborts the current command.
     return $1
 }
 
@@ -418,6 +435,8 @@ alias -g D='E | colordiff L'
 alias -g G='| grep'
 alias -g S='| sort'
 alias -g U='| uniq'
+alias -g H='| head'
+alias -g T='| tail'
 
 # Make going up directories simple.
 alias -g ...='../..'