X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=9dd47a49795fa36538169d996a331b5a3f7cc9aa;hb=056def611aff9eb03503133c9e7a84efb9218355;hp=80178e0cdc57194f6c66d6db910b97055ec68e04;hpb=acfeea45e718eeecec36fea55f0ea8037ee6aef5;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 80178e0..9dd47a4 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -244,31 +244,55 @@ else
     RUN_VCS_INFO=
 fi
 
-# 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.
+# Set the prompt. A two line prompt is used. On the top left the current
+# working directory is displayed, on the right vcs_info (if available). On the
+# bottom left current username and host is shown, the exit code of the last
+# command if it wasn't 0, the number of running jobs 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.
+#
+# Thanks to Adam's prompt for the basic idea of this prompt.
 prompt_precmd() {
+    # Regex to remove elements which take no space. Used to calculate the
+    # width of the top prompt. Thanks to Bart's and Adam's prompt code in
+    # Functions/Prompts/prompt_*_setup.
+    local zero='%([BSUbfksu]|([FB]|){*})'
+
     # Call vcs_info before every prompt.
     if [[ -n $RUN_VCS_INFO ]]; then
         vcs_info
+    else
+        vcs_info_msg_0_=
+    fi
 
-        # Display the VCS information in the right prompt.
-        if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
-            RPROMPT="${vcs_info_msg_0_}"
-        # There is a bug in Zsh below 4.3.9 which displays a wrong symbol when
-        # ${vcs_info_msg_0_} is empty. Provide a workaround for those
-        # versions, thanks to Frank Terbeck <ft@bewatermyfriend.org> for it.
-        else
-            RPROMPT="${vcs_info_msg_0_:- }"
-        fi
+    local width width_left width_right
+    local top_left top_right
+
+    # Display vcs_info (if used) on the right in the top prompt.
+    top_right="${vcs_info_msg_0_}"
+    width_right=${#${(S%%)top_right//$~zero/}}
+    # Remove vcs_info if it would get too long.
+    if [[ $(( COLUMNS - 4 - 1 - width_right )) -lt 0 ]]; then
+        top_right=
+        width_right=0
     fi
 
-    PROMPT="$green%B%m%b$default:$blue%B%~%b$default \
-%(1j.$yellow%j$default.)%# \
+    # Display current directory on the left in the top prompt. Truncate the
+    # directory if necessary.
+    width=$(( COLUMNS - 4 - 1 - width_right ))
+    top_left=".-$default%b($yellow%$width<..<%~%<<$default)%B$blue"
+
+    # Calculate the width of the top prompt to fill the middle with "-".
+    width_left=${#${(S%%)top_left//$~zero/}}
+    width_right=${#${(S%%)top_right//$~zero/}}
+    width=$(( COLUMNS - width_left - width_right ))
+
+    PROMPT="$blue%B$top_left${(l:$width::-:)}%b$default$top_right
+$blue%B'%b$default\
+$green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \
 %(?..($red%B%?%b$default%) )"
+
 }
 add-zsh-hook precmd prompt_precmd