zsh: Display @ in window name when running ssh.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 858f5fc9b54dc0af76a6790bd755b3cdb49133bc..1ae1ab87837cb7978fc3c604142118ee3f8b0923 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -41,9 +41,12 @@ autoload ${fpath[1]}/^_*(^/:t)
 
 # Simulate hooks using _functions arrays for Zsh versions older then 4.3.4. At
 # the moment only precmd() and preexec() are simulated.
-if [[ $ZSH_VERSION != (4.3.<4->|4.<4->*|<5->*) ]]; then
+#
+# 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.
+if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then
     # Provide add-zsh-hook which was added in 4.3.4.
-    fpath=($fpath ~/.zsh/functions/compatibility)
+    fpath=(~/.zsh/functions/compatibility $fpath)
 
     # Run all functions defined in the ${precmd,preexec}_functions arrays.
     function precmd() {
@@ -132,7 +135,7 @@ fi
 # It works with screen and xterm. If screen is running in X11 (DISPLAY is set)
 # and stumpwm is used (it's tested if stumpish is available) then the window
 # title is also set in stumpwm using stumpish.
-if [[ $TERM == screen || $TERM == xterm* ]]; then
+if [[ $TERM == screen* || $TERM == xterm* ]]; then
     # Set to a non empty value to reset the window name in the next precmd()
     # call.
     window_reset=yes
@@ -145,10 +148,13 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
     window_preexec() {
         # Get the program name with its arguments.
         local program_name=$1
+
         # When sudo is used use real program name instead, but with an
         # exclamation mark at the beginning.
+        local program_sudo=
         if [[ $program_name == sudo* ]]; then
-            program_name=!${program_name#sudo }
+            program_name=${program_name#sudo }
+            program_sudo=yes
         fi
         # Remove all arguments from the program name.
         program_name=${program_name%% *}
@@ -174,6 +180,17 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
                 ;;
         esac
 
+        # Add an exclamation mark at the beginning if running with sudo.
+        if [[ $program_sudo == yes ]]; then
+            program_sudo=!$program_sudo
+        fi
+
+        # Add an at mark at the beginning if running ssh on a different
+        # computer.
+        if [[ -n $SSH_CONNECTION ]]; then
+            program_name="@$program_name"
+        fi
+
         # Set the window name to the currently running program.
         window_title "$program_name"
 
@@ -186,7 +203,11 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
         [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
-        window_title "zsh"
+        if [[ -n $SSH_CONNECTION ]]; then
+            window_title "@zsh"
+        else
+            window_title "zsh"
+        fi
 
         # Just reset the name, so no screen reset necessary for the moment.
         window_reset=
@@ -194,7 +215,7 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
 
     # Sets the window title. Works with screen and xterm.
     window_title() {
-        if [[ $TERM == screen ]]; then
+        if [[ $TERM == screen* ]]; then
             print -n "\ek$1\e\\"
 
             # Update window name in stumpwm if running screen in X11 and when
@@ -227,6 +248,9 @@ autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump
 zstyle ':completion:*' use-cache on
 zstyle ':completion:*' cache-path ~/.zsh/cache
 
+# Complete arguments and fix spelling mistakes when possible.
+zstyle ':completion:*' completer _complete _match _correct _approximate
+
 # Make sure the list of possible completions is displayed after pressing <TAB>
 # the first time.
 setopt nolistambiguous
@@ -362,7 +386,10 @@ exec 2>>(while read line; do
 # RUN COMMANDS
 
 # If not already in screen reattach to a running session or create a new one.
-if [[ $TERM != 'screen' && $TERM != 'dumb' ]]; then
+#
+# screen* is necessary as `screen` uses screen.linux for example for a linux
+# console which would otherwise cause an infinite loop.
+if [[ $TERM != screen* && $TERM != 'dumb' ]]; then
     # Create a new session if none is running.
     if [[ $(screen -list | grep "Detached" | wc -l) == 0 ]]; then
         screen