bin/logo, profiles/common: must undo each color change on logo printing

like all other status items, fix hardstatus line for "default color"
This commit is contained in:
Dustin Kirkland 2009-12-29 09:58:40 -06:00
commit 79475503ee
3 changed files with 18 additions and 16 deletions

View file

@ -31,63 +31,63 @@ print_logo() {
distro=`echo "$1" | sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ` distro=`echo "$1" | sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' `
case "$distro" in case "$distro" in
*ubuntu*) *ubuntu*)
$MARKUP && printf "$(color b k r)%s$(color k y)%s$(color b k Y)%s" "\\" "o" "/" || printf "\\o/" $MARKUP && printf "$(color b k r)%s$(color -)$(color k y)%s$(color -)$(color b k Y)%s$(color -)" "\\" "o" "/" || printf "\\o/"
;; ;;
*altlinux*) *altlinux*)
logo="alt" logo="alt"
$MARKUP && printf "$(color Y k)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color Y k)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*arch*) *arch*)
logo=" A " logo=" A "
$MARKUP && printf "$(color b w b)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color b w b)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*centos*) *centos*)
logo="****" logo="****"
$MARKUP && printf "$(color g w)*$(color m w)*$(color y w)*$(color b w)*" || printf "$logo" $MARKUP && printf "$(color g w)*$(color -)$(color m w)*$(color -)$(color y w)*$(color -)$(color b w)*$(color -)" || printf "$logo"
;; ;;
*debian*) *debian*)
logo=" @ " logo=" @ "
$MARKUP && printf "$(color w r)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color w r)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*fedora*) *fedora*)
logo=" f " logo=" f "
$MARKUP && printf "$(color b w)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color b w)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*foresight*) *foresight*)
logo="<@>" logo="<@>"
$MARKUP && printf "$(color b W g)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color b W g)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*gentoo*) *gentoo*)
logo=" > " logo=" > "
$MARKUP && printf "$(color b c w)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color b c w)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*mandriva*) *mandriva*)
logo=" (* " logo=" (* "
$MARKUP && printf "$(color b k c) ($(color b k y)* " || printf "$logo" $MARKUP && printf "$(color b k c) ($(color -)$(color b k y)*$(color -) " || printf "$logo"
;; ;;
*redhat*) *redhat*)
logo=" RH " logo=" RH "
$MARKUP && printf "$(color R k)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color R k)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*rockhopper*) *rockhopper*)
logo="palm" logo="palm"
$MARKUP && printf "$(color k w)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color k w)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*slackware*) *slackware*)
logo=".S " logo=".S "
$MARKUP && printf "$(color u B k)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color u B k)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*suse*) *suse*)
logo="SuSE" logo="SuSE"
$MARKUP && printf "$(color W g)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color W g)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*xandros*) *xandros*)
logo=" X " logo=" X "
$MARKUP && printf "$(color W r)%s" "$logo" || printf "$logo" $MARKUP && printf "$(color W r)%s$(color -)" "$logo" || printf "$logo"
;; ;;
*) *)
logo="[B]" logo="[B]"
$MARKUP && printf "$(color b k W)%s" "$logo" || printf " $logo " $MARKUP && printf "$(color b k W)%s$(color -)" "$logo" || printf " $logo "
;; ;;
esac esac
} }

2
debian/changelog vendored
View file

@ -6,6 +6,8 @@ byobu (2.43-0ubuntu1) lucid; urgency=low
* byobu-select-profile, byobu-config: improve color selection with more * byobu-select-profile, byobu-config: improve color selection with more
informative color names and support screen default background/foreground informative color names and support screen default background/foreground
colors, LP: #500669 colors, LP: #500669
* bin/logo, profiles/common: must undo each color change on logo printing
like all other status items, fix hardstatus line for "default color"
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 23 Dec 2009 14:01:55 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 23 Dec 2009 14:01:55 -0600

View file

@ -97,7 +97,7 @@ source $HOME/.byobu/keybindings
caption always "%12`%?%-Lw%50L>%?%{=r }%{+b }%n*%f %t%?(%u)%?%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<" caption always "%12`%?%-Lw%50L>%?%{=r }%{+b }%n*%f %t%?(%u)%?%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<"
# Status string, last line # Status string, last line
hardstatus string '%99`%12` %100`%112`%= %130`%102`%101`%129`%127`%114`%115`%108`%128`%125`%126`%113`%119`%117`%116`%106`%104`%103`%105`%107`%123`%120`%121`' hardstatus string '%99`%{-}%{=r}%12` %100`%112`%= %130`%102`%101`%129`%127`%114`%115`%108`%128`%125`%126`%113`%119`%117`%116`%106`%104`%103`%105`%107`%123`%120`%121`'
# NOTE: Older version of screen have an arbitrary limit of only being able # NOTE: Older version of screen have an arbitrary limit of only being able
# to change colors 16 times in this 'hardstatus string'. # to change colors 16 times in this 'hardstatus string'.