logaritmisk/pure
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #144 from zmwangx/rename-prompt-to-preprompt

Browse Source 
prompt_pure_preprompt_render: rename prompt to preprompt
This commit is contained in:
Mathias Fredriksson
2015-07-15 03:23:58 +03:00
parent a94ff2ff6b 5f5c4d4856
commit b1b44b3204
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pure.zsh
View File

@@ -81,45 +81,45 @@ prompt_pure_string_length() {
} }
prompt_pure_preprompt_render() { prompt_pure_preprompt_render() {
# check that no command is currently running, the prompt will otherwise be rendered in the wrong place # check that no command is currently running, the preprompt will otherwise be rendered in the wrong place
[[ -n ${prompt_pure_cmd_timestamp+x} && "$1" != "precmd" ]] && return [[ -n ${prompt_pure_cmd_timestamp+x} && "$1" != "precmd" ]] && return
# set color for git branch/dirty status, change color if dirty checking has been delayed # set color for git branch/dirty status, change color if dirty checking has been delayed
local git_color=242 local git_color=242
[[ -n ${prompt_pure_git_last_dirty_check_timestamp+x} ]] && git_color=red [[ -n ${prompt_pure_git_last_dirty_check_timestamp+x} ]] && git_color=red
# construct prompt, beginning with path # construct preprompt, beginning with path
local prompt="%F{blue}%~%f" local preprompt="%F{blue}%~%f"
# git info # git info
prompt+="%F{$git_color}${vcs_info_msg_0_}${prompt_pure_git_dirty}%f" preprompt+="%F{$git_color}${vcs_info_msg_0_}${prompt_pure_git_dirty}%f"
# git pull/push arrows # git pull/push arrows
prompt+="%F{cyan}${prompt_pure_git_arrows}%f" preprompt+="%F{cyan}${prompt_pure_git_arrows}%f"
# username and machine if applicable # username and machine if applicable
prompt+=$prompt_pure_username preprompt+=$prompt_pure_username
# execution time # execution time
prompt+="%F{yellow}${prompt_pure_cmd_exec_time}%f" preprompt+="%F{yellow}${prompt_pure_cmd_exec_time}%f"
# if executing through precmd, do not perform fancy terminal editing # if executing through precmd, do not perform fancy terminal editing
if [[ "$1" == "precmd" ]]; then if [[ "$1" == "precmd" ]]; then
print -P "\n${prompt}" print -P "\n${preprompt}"
else else
# only redraw if prompt has changed # only redraw if preprompt has changed
[[ "${prompt_pure_last_preprompt}" != "${prompt}" ]] || return [[ "${prompt_pure_last_preprompt}" != "${preprompt}" ]] || return
# calculate length of prompt for redraw purposes # calculate length of preprompt for redraw purposes
local prompt_length=$(prompt_pure_string_length $prompt) local preprompt_length=$(prompt_pure_string_length $preprompt)
local lines=$(( $prompt_length / $COLUMNS + 1 )) local lines=$(( $preprompt_length / $COLUMNS + 1 ))
# disable clearing of line if last char of prompt is last column of terminal # disable clearing of line if last char of preprompt is last column of terminal
local clr="\e[K" local clr="\e[K"
(( $prompt_length * $lines == $COLUMNS - 1 )) && clr="" (( $preprompt_length * $lines == $COLUMNS - 1 )) && clr=""
# modify previous prompt # modify previous preprompt
print -Pn "\e7\e[${lines}A\e[1G${prompt}${clr}\e8" print -Pn "\e7\e[${lines}A\e[1G${preprompt}${clr}\e8"
fi fi
# store previous prompt for comparison # store previous preprompt for comparison
prompt_pure_last_preprompt=$prompt prompt_pure_last_preprompt=$preprompt
} }
prompt_pure_precmd() { prompt_pure_precmd() {