stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feature #25 : unicode chars only for utf-8 charset, else latin

Browse Source
This commit is contained in:
nojhan 2012-08-13 22:23:43 +02:00
parent ee7514bb1e
commit 45fddb4517
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
liquidprompt
View File

@ -74,6 +74,14 @@ LP_PATH_KEEP=${LP_PATH_KEEP:-2}
LP_REVERSE=${LP_REVERSE:-0} LP_REVERSE=${LP_REVERSE:-0}
LP_HOSTNAME_ALWAYS=${LP_HOSTNAME_ALWAYS:-0} LP_HOSTNAME_ALWAYS=${LP_HOSTNAME_ALWAYS:-0}
LP_PS1=${LP_PS1:-""} LP_PS1=${LP_PS1:-""}
LP_BATTERY_MARK=${LP_BATTERY_MARK:-"⌁"}
LP_ADAPTER_MARK=${LP_ADAPTER_MARK:-""}
LP_LOAD_MARK=${LP_LOAD_MARK:-"⌂"}
LP_PROXY_MARK=${LP_PROXY_MARK:-"↥"}
LP_GIT_MARK=${LP_GIT_MARK:-"±"}
LP_MERCURIAL_MARK=${LP_MERCURIAL_MARK:-"☿"}
LP_SUBVERSION_MARK=${LP_SUBVERSION_MARK:-"‡"}
# Default config file may be the XDG standard ~/.config/liquidpromptrc, # Default config file may be the XDG standard ~/.config/liquidpromptrc,
# but heirloom dotfile has priority. # but heirloom dotfile has priority.
@ -312,7 +320,7 @@ __host_color()
__proxy() __proxy()
{ {
if [[ ! -z "$http_proxy" ]] ; then if [[ ! -z "$http_proxy" ]] ; then
echo -ne "↥" echo -ne $LP_PROXY_MARK
fi fi
} }
@ -666,7 +674,7 @@ __battery()
# a red ⌁ if the battery is discharging but above threshold # a red ⌁ if the battery is discharging but above threshold
__battery_color() __battery_color()
{ {
local mark="⌁" local mark=$LP_BATTERY_MARK
local bat local bat
local ret local ret
bat=$(__battery) bat=$(__battery)
@ -740,7 +748,7 @@ __load_color()
if [[ $load -ge $LP_LOAD_THRESHOLD ]] if [[ $load -ge $LP_LOAD_THRESHOLD ]]
then then
ret="⌂${NO_COL}" ret="${LP_LOAD_MARK}${NO_COL}"
if [[ $load -lt 70 ]] ; then if [[ $load -lt 70 ]] ; then
ret="${ret}${FG}" ret="${ret}${FG}"
elif [[ $load -ge 1 ]] && [[ $load -lt 80 ]] ; then elif [[ $load -ge 1 ]] && [[ $load -lt 80 ]] ; then
@ -778,11 +786,11 @@ __smart_mark()
mark="%(!.#.$)" mark="%(!.#.$)"
fi fi
if [[ ! -z $(__git_branch) ]] ; then if [[ ! -z $(__git_branch) ]] ; then
mark="±" mark=$LP_GIT_MARK
elif [[ ! -z $(__hg_branch) ]] ; then elif [[ ! -z $(__hg_branch) ]] ; then
mark="☿" mark=$LP_MERCURIAL_MARK
elif [[ ! -z $(__svn_branch) ]] ; then elif [[ ! -z $(__svn_branch) ]] ; then
mark="‡" mark=$LP_SUBVERSION_MARK
fi fi
echo -ne "${COL}${mark}${NO_COL}" echo -ne "${COL}${mark}${NO_COL}"
} }

18
liquidpromptrc-dist
View File

@ -29,3 +29,21 @@ LP_REVERSE=0
# set to 1 if you want to always see the hostname # set to 1 if you want to always see the hostname
LP_HOSTNAME_ALWAYS=0 LP_HOSTNAME_ALWAYS=0
# If charset is UTF-8
if [[ $(locale -k LC_CTYPE | sed -n 's/^charmap="\(.*\)"/\1/p') == *"UTF-8"* ]] ; then
LP_BATTERY_MARK="⌁"
LP_ADAPTER_MARK=""
LP_LOAD_MARK="⌂"
LP_PROXY_MARK="↥"
LP_GIT_MARK="±"
LP_MERCURIAL_MARK="☿"
LP_SUBVERSION_MARK="‡"
else
LP_BATTERY_MARK="b"
LP_ADAPTER_MARK="p"
LP_LOAD_MARK="c"
LP_PROXY_MARK="^"
LP_GIT_MARK="+"
LP_MERCURIAL_MARK="m"
LP_SUBVERSION_MARK="="
fi