* usr/lib/byobu/.constants, usr/lib/byobu/cpu_freq,

usr/lib/byobu/disk, usr/lib/byobu/memory, usr/lib/byobu/swap,
  usr/lib/byobu/wifi_quality:
  - add unicode characters for KB/MB/GB/GHz
This commit is contained in:
Dustin Kirkland 2011-10-20 12:49:10 -05:00
commit b1546408ce
7 changed files with 39 additions and 12 deletions

4
debian/changelog vendored
View file

@ -7,6 +7,10 @@ byobu (4.42) unreleased; urgency=low
- enhance shell history syncronization across shells
* usr/lib/byobu/.constants, usr/lib/byobu/updates_available:
- use unicode double-bang for security updates where possible
* usr/lib/byobu/.constants, usr/lib/byobu/cpu_freq,
usr/lib/byobu/disk, usr/lib/byobu/memory, usr/lib/byobu/swap,
usr/lib/byobu/wifi_quality:
- add unicode characters for KB/MB/GB/GHz
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 14 Oct 2011 14:53:51 -0500

View file

@ -30,10 +30,19 @@ if [ "$UTF8" = "1" ] || [ "$BYOBU_BACKEND" = "tmux" ]; then
ICON_UP="▴"
ICON_DN="▾"
ICON_TRASH="♸"
ICON_WIFI="⚚"
ICON_WIFI=
ICON_REBOOT="⟳"
ICON_UPDATES="!"
ICON_SECURITY="‼"
ICON_KB="㎅"
ICON_MB="㎆"
ICON_GB="㎇"
ICON_TB="TB"
ICON_KHz="㎑"
ICON_MHz="㎒"
ICON_GHz="㎓"
#ICON_MBPS="㏔㎰"
ICON_MBPS="Mbps"
else
ICON_C="C"
ICON_F="F"
@ -47,6 +56,14 @@ else
ICON_REBOOT="(R)"
ICON_UPDATES="!"
ICON_SECURITY="!!"
ICON_KB="KB"
ICON_MB="MB"
ICON_GB="GB"
ICON_TB="TB"
ICON_KHz="kHz"
ICON_MHz="MHz"
ICON_GHz="GHz"
ICON_MBPS="Mbps"
fi
PCT="%%"

View file

@ -39,7 +39,7 @@ __cpu_freq() {
freq=$(echo "$freq" "$count" | awk '{printf "%.1f\n", $1/$2/1000}')
fi
fi
color b c W; printf "%s" "$freq"; color -; color c W; printf "%s" "Gz"; color --
color b c W; printf "%s" "$freq"; color -; color c W; printf "%s" "$ICON_GHz"; color --
}
# vi: syntax=sh ts=4 noexpandtab

View file

@ -38,8 +38,14 @@ __disk() {
unit=${size#${size%?}} # get the unit (last char)
size=${size%?}; # take the unit off
pct=${pct%?}; # take off the '%'
case "$unit" in
k*|K*) unit="$ICON_KB" ;;
m*|M*) unit="$ICON_MB" ;;
g*|G*) unit="$ICON_GB" ;;
t*|T*) unit="$ICON_TB" ;;
esac
_UNIT=${unit}; _SIZE=${size}; _PCT=${pct};
color b M W; echo -n "$_SIZE"; color -; color M W; echo -n "${_UNIT},"; color -;
color b M W; echo -n "$_SIZE"; color -; color M W; echo -n "${_UNIT}"; color -;
color b M W; echo -n "$_PCT"; color -; color M W; echo -n "$PCT" ; color --;
}

View file

@ -45,15 +45,15 @@ __memory() {
if [ $total -ge 1048576 ]; then
fpdiv "$total" 1048567 1
total=${_RET}
unit="G"
unit="$ICON_GB"
elif [ $total -ge 1024 ]; then
fpdiv "$total" 1024 0
total=${_RET}
unit="M"
unit="$ICON_MB"
else
unit="K"
unit="$ICON_KB"
fi
color b g W; printf "%s" "$total"; color -; color g W; printf "%s," "$unit"; color -; color b g W; printf "%s" "$f"; color -; color g W; printf "%s" "$PCT"; color --
color b g W; printf "%s" "$total"; color -; color g W; printf "%s" "$unit"; color -; color b g W; printf "%s" "$f"; color -; color g W; printf "%s" "$PCT"; color --
}
# vi: syntax=sh ts=4 noexpandtab

View file

@ -41,16 +41,16 @@ __swap() {
if [ $mem -ge 1048576 ]; then
fpdiv "${mem}" 1048576 1
mem=${_RET}
unit="GB"
unit="$ICON_GB"
elif [ $mem -ge 1024 ]; then
fpdiv "${mem}" 1024 0
mem=${_RET}
unit="MB"
unit="$ICON_MB"
else
mem="$mem"
unit="KB"
unit="$ICON_KB"
fi
color b G W; printf "s%s" "$mem"; color -; color G W; printf "%s," "$unit"; color -;
color b G W; printf "s%s" "$mem"; color -; color G W; printf "%s" "$unit"; color -;
color b G W; printf "%s" "$f"; color -; color G W; printf "%s" "$PCT"; color --
}

View file

@ -41,7 +41,7 @@ __wifi_quality() {
quality="0"
fi
[ "$quality" = "0" ] && return
printf "${ICON_WIFI}"; color b C k; printf "%s" "$bitrate"; color -; color C k; printf "%s," "Mbps"; color -; color b C k; printf "%s" "$quality"; color -; color C k; printf "%s" "$PCT"; color --
printf "${ICON_WIFI}"; color b C k; printf "%s" "$bitrate"; color -; color C k; printf "%s," "$ICON_MBPS"; color -; color b C k; printf "%s" "$quality"; color -; color C k; printf "%s" "$PCT"; color --
}
# vi: syntax=sh ts=4 noexpandtab