diff --git a/debian/changelog b/debian/changelog index 22ac35a2..3059a68e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ byobu (4.31) unreleased; urgency=low - * UNRELEASED + * usr/bin/byobu, usr/lib/byobu/.shutil: + - fix bold color printing -- Dustin Kirkland Sun, 21 Aug 2011 21:12:43 -0700 diff --git a/usr/bin/byobu b/usr/bin/byobu index bf7a5127..3cfdfb95 100755 --- a/usr/bin/byobu +++ b/usr/bin/byobu @@ -61,7 +61,7 @@ case $BYOBU_BACKEND in # Check if our terminfo supports 256 colors if command -v tput >/dev/null; then if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then - export TERM="screen-256color" BYOBU_COLOR=256 + export TERM="screen-256color" fi fi PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc" @@ -85,7 +85,7 @@ case $BYOBU_BACKEND in # Check if our terminfo supports 256 colors if command -v tput >/dev/null; then if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then - export SCREEN_TERM="-T screen-256color" BYOBU_COLOR=256 + export SCREEN_TERM="-T screen-256color" fi fi # Some users want to maintain separate configurations diff --git a/usr/lib/byobu/.shutil b/usr/lib/byobu/.shutil index 0ead1128..c7b5f541 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 "$BYOBU_COLOR" ] && printf "$ESC{=b }" || printf "$ESC{= }" ;; - bold2) [ -n "$BYOBU_COLOR" ] && printf "$ESC{+b }" || printf "$ESC{= }" ;; + bold1) printf "$ESC{=b }" || printf "$ESC{= }" ;; + bold2) printf "$ESC{+b }" || printf "$ESC{= }" ;; none) printf "$ESC{= }" ;; invert) printf "$ESC{=r }" ;; *) @@ -38,29 +38,26 @@ color_screen() { attr= ; fg=$1 ; bg=$2 ;; 3) - attr= ; fg=$2 ; bg=$3 + attr=$1 ; fg=$2 ; bg=$3 ;; esac [ "$MONOCHROME" = "1" ] && (fg= ; bg= ) - [ -n "$BYOBU_COLOR" ] || attr= printf "$ESC{=$attr $fg$bg}" ;; esac } color_map() { - local mod= - [ -n "$BYOBU_COLOR" ] && mod=",dim" case "$1" in - k) _RET="black$mod" ;; - r) _RET="red$mod" ;; - g) _RET="green$mod" ;; - y) _RET="yellow$mod" ;; - b) _RET="blue$mod" ;; - m) _RET="magenta$mod" ;; - c) _RET="cyan$mod" ;; - w) _RET="white$mod" ;; - d) _RET="color0$mod" ;; + k) _RET="black" ;; + r) _RET="red" ;; + g) _RET="green" ;; + y) _RET="yellow" ;; + b) _RET="blue" ;; + m) _RET="magenta" ;; + c) _RET="cyan" ;; + w) _RET="white" ;; + d) _RET="color0" ;; K) _RET="#555555" ;; R) _RET="#FF0000" ;; G) _RET="#00FF00" ;; @@ -85,7 +82,6 @@ attr_map() { i) _RET=,italics ;; *) _RET= ;; esac - [ -n "$BYOBU_COLOR" ] || _RET= } color_tmux() { @@ -95,7 +91,7 @@ color_tmux() { -) printf "#[default]" ;; --) printf "#[default] " ;; esc) printf "" ;; - bold*) [ -n "$BYOBU_COLOR" ] && printf "#[fg=bold]" ;; + bold*) printf "#[fg=bold]" ;; none) printf "#[default]" ;; invert) printf "#[reverse]" ;; *)