diff --git a/debian/changelog b/debian/changelog index 9fd2b99b..35361b22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,9 @@ byobu (4.30) unreleased; urgency=low - add session selection support for tmux * usr/bin/byobu, usr/bin/byobu-janitor, usr/lib/byobu/.shutil: - flatten bold/dim/bright modifiers when in 8-color mode + * usr/lib/byobu/ip_address, usr/lib/byobu/.shutil, + usr/share/byobu/profiles/common: + - fix bold printing -- Dustin Kirkland Thu, 11 Aug 2011 10:31:31 -0500 diff --git a/usr/lib/byobu/.shutil b/usr/lib/byobu/.shutil index 9d1de475..06ca3e5d 100755 --- a/usr/lib/byobu/.shutil +++ b/usr/lib/byobu/.shutil @@ -27,8 +27,8 @@ color_screen() { -) printf "$ESC{-}" ;; --) printf "$ESC{-} " ;; esc) printf "$ESC" ;; - bold1) [ -n "$SCREEN_TERM" ] && printf "$ESC{=b }" ;; - bold2) [ -n "$SCREEN_TERM" ] && printf "$ESC{+b }" ;; + bold1) [ -n "$SCREEN_TERM" ] && printf "$ESC{=b }" || printf "$ESC{= }" ;; + bold2) [ -n "$SCREEN_TERM" ] && printf "$ESC{+b }" || printf "$ESC{= }" ;; none) printf "$ESC{= }" ;; invert) printf "$ESC{=r }" ;; *) @@ -49,7 +49,7 @@ color_screen() { } color_map() { - local mod + local mod= [ -n "$SCREEN_TERM" ] && mod=",dim" case "$1" in k) _RET="black$mod" ;; diff --git a/usr/lib/byobu/ip_address b/usr/lib/byobu/ip_address index 64308cb7..e026f722 100755 --- a/usr/lib/byobu/ip_address +++ b/usr/lib/byobu/ip_address @@ -55,7 +55,9 @@ __ip_address() { fi ;; esac - color bold2; printf "%s" "$ipaddr"; color -- + if [ -n "$ipaddr" ]; then + color bold2; printf "%s" "$ipaddr"; color -- + fi } # vi: syntax=sh ts=4 noexpandtab diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common index e5268608..c0146602 100644 --- a/usr/share/byobu/profiles/common +++ b/usr/share/byobu/profiles/common @@ -79,7 +79,7 @@ setenv SSH_AUTH_SOCK $BYOBU_CONFIG_DIR/.ssh-agent caption always "%1001`%?%-Lw%50L>%?%{=r}%n*%f %t%?(%u)%?%{-}%12`%?%+Lw%?%11` %=%12`%1002`%10`%<" # Status string, last line -hardstatus string '%1003`%=%1004`' +hardstatus string '%12`%1003`%=%1004`' # NOTE: Older version of Screen have an arbitrary limit of only being able # to change colors 16 times in this 'hardstatus string'.