X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=88eb6b4f546c7c9e0fbb80ef6300e0340264db31;hb=d6b57a3d60648fecb848a223e4cdcee6cfdb8eb5;hp=f3bebe89faed8b340388cb1371fd149de2ceec44;hpb=c3b6dab30c7ca45350c4928d489074e2b6068aed;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index f3bebe8..88eb6b4 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -66,30 +66,92 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
 %(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \
 %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )"
 
-# Allow substitutions and expansions in the prompt, necessary for vcs_info.
-setopt promptsubst
-# Load vcs_info to display information about version control repositories.
-autoload -Uz vcs_info
-# Only look for git and mercurial repositories; the only I use.
-zstyle ':vcs_info:*' enable git hg
-# Set style of vcs_info display. The current branch (green) and vcs (blue) is
-# displayed. If there is an special action going on (merge, rebase) it's also
-# displayed (red).
-zstyle ':vcs_info:*' formats \
-"(%{${fg[green]}%}%b%{${fg[default]}%}:\
+# VCS_Info was added in 4.3.9.
+if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
+    # Allow substitutions and expansions in the prompt, necessary for
+    # vcs_info.
+    setopt promptsubst
+    # Load vcs_info to display information about version control repositories.
+    autoload -Uz vcs_info
+    # Only look for git and mercurial repositories; the only I use.
+    zstyle ':vcs_info:*' enable git hg
+    # Set style of vcs_info display. The current branch (green) and vcs (blue)
+    # is displayed. If there is an special action going on (merge, rebase)
+    # it's also displayed (red).
+    zstyle ':vcs_info:*' formats \
+    "(%{${fg[green]}%}%b%{${fg[default]}%}:\
 %{${fg[blue]}%}%s%{${fg[default]}%})"
-zstyle ':vcs_info:*' actionformats \
-"(%{${fg[green]}%}%b%{${fg[default]}%}/\
+    zstyle ':vcs_info:*' actionformats \
+    "(%{${fg[green]}%}%b%{${fg[default]}%}/\
 %{${fg[red]}%}%a%{${fg[default]}%}:\
 %{${fg[blue]}%}%s%{${fg[default]}%})"
-# Call vcs_info as precmd before every prompt.
-prompt_precmd() {
-    vcs_info
-}
-add-zsh-hook precmd prompt_precmd
+    # Call vcs_info as precmd before every prompt.
+    prompt_precmd() {
+        vcs_info
+    }
+    add-zsh-hook precmd prompt_precmd
+
+    # Display the vcs information in the right prompt.
+    RPROMPT='${vcs_info_msg_0_}'
+fi
 
-# Display the vcs information in the right prompt.
-RPROMPT='${vcs_info_msg_0_}'
+# When screen is used set the name of the window to the currently running
+# program.
+#
+# When a program is started preexec() sets the window's name to it; when it
+# stops precmd() resets the windows' name to 'zsh'.
+if [[ $TERM == screen ]]; then
+    # Set to a non empty value to reset the window name in the next precmd()
+    # call.
+    screen_name_reset=yes
+
+    screen_preexec() {
+        # Get the application name excluding any arguments.
+        local program_name=${1%% *}
+
+        # Ignore often used commands which are only running for a very short
+        # time. This prevents a "blinking" name when it's changed to "cd" for
+        # example and then some milliseconds later back to "zsh".
+        [[ $program_name == (cd*|ls|la|ll|clear) ]] && return
+
+        # Change my shortcuts so the real name of the program is displayed.
+        case $program_name in
+            e)
+                program_name=elinks
+                ;;
+            g)
+                program_name=git
+                ;;
+            m)
+                program_name=mutt
+                ;;
+            v|vi)
+                program_name=vim
+                ;;
+        esac
+
+        # Set the window name to the currently running program.
+        print -n "\ek$program_name\e\\"
+
+        # Tell precmd() to reset the window name when the program stops.
+        screen_name_reset=yes
+    }
+
+    screen_precmd() {
+        # Abort if no window name reset is necessary.
+        [[ -z $screen_name_reset ]] && return
+
+        # Reset the window name to 'zsh'.
+        print -n "\ekzsh\e\\"
+
+        # Just reset the name, so no screen reset necessary for the moment.
+        screen_name_reset=
+    }
+
+    # Add the preexec() and precmd() hooks.
+    add-zsh-hook preexec screen_preexec
+    add-zsh-hook precmd screen_precmd
+fi
 
 
 # COMPLETION SETTINGS
@@ -143,13 +205,19 @@ alias diff='diff -u'
 # Display all files and use human readable sizes.
 alias du='du -sh'
 
-# Multiple files given to Vim are opened in tabs.
-alias vim='vim -p'
-# Shortcuts for Vim.
+# Multiple files given to Vim are opened in tabs, supported since Vim 7.
+if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then
+    alias vim='vim -p'
+fi
+
+# Shortcuts for often used programs.
+alias e='elinks'
+alias g='git'
+alias m='mutt'
 alias v='vim'
 alias vi='vim'
 
-# Exit binding like in Vim.
+# Exit binding like in Vim; I sometimes confuse editor and shell.
 alias :q='exit'
 
 # Edit the mercurial patch queue series file for the current mercurial
@@ -160,6 +228,7 @@ alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
 # Make going up directories simple.
 alias -g ...='../..'
 alias -g ....='../../..'
+alias -g .....='../../../..'
 
 # Improved ls which displays the files in columns (-C), visualizes directories,
 # links and other special files (-F) and pages everything through less (L).
@@ -198,16 +267,12 @@ TRAPINT() {
     return $1
 }
 
-# Execute all periodic functions every hour.
-PERIOD=3600
-# Display TODOs stored in ~/.todo if this file exists. Run every hour to make
-# clear they should be completed ;-).
+# Display TODOs stored in ~/.todo if this file exists.
 todo() {
     if [[ -f ~/.todo ]]; then
         cat ~/.todo | $PAGER
     fi
 }
-add-zsh-hook periodic todo
 
 
 # Load rc file for current OS.