diff --git a/debian/changelog b/debian/changelog index 41bac5aa..6703cdf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ byobu (5.42) unreleased; urgency=low - clear wifi status indicator when there is no wifi connection * usr/bin/byobu-select-session: LP: #1182776 - skip sessions that are just whitespace + * usr/lib/byobu/include/shutil, usr/lib/byobu/wifi_quality, + usr/share/man/man1/byobu.1: LP: #1182528 + - fix status colors on Red Hat, Mac OS X, and elsewhere + - seems that the #nnnnnn style coloring isn't working everywhere + + should probably get to the bottom of this... -- Dustin Kirkland Thu, 09 May 2013 09:06:07 -0500 diff --git a/usr/lib/byobu/include/shutil b/usr/lib/byobu/include/shutil index 5aa9ca69..7dbb917e 100755 --- a/usr/lib/byobu/include/shutil +++ b/usr/lib/byobu/include/shutil @@ -60,15 +60,15 @@ color_map() { "m") _RET="magenta" ;; "c") _RET="cyan" ;; "w") _RET="white" ;; - "d") _RET="color0" ;; - "K") _RET="#555555" ;; - "R") _RET="#FF0000" ;; - "G") _RET="#00FF00" ;; - "Y") _RET="#FFFF00" ;; - "B") _RET="#0000FF" ;; - "M") _RET="#FF00FF" ;; - "C") _RET="#00FFFF" ;; - "W") _RET="#FFFFFF" ;; + "d") _RET="black" ;; + "K") _RET="brightblack" ;; + "R") _RET="brightred" ;; + "G") _RET="brightgreen" ;; + "Y") _RET="brightyellow" ;; + "B") _RET="brightblue" ;; + "M") _RET="brightmagenta" ;; + "C") _RET="brightcyan" ;; + "W") _RET="brightwhite" ;; *) _RET= ;; esac } diff --git a/usr/lib/byobu/wifi_quality b/usr/lib/byobu/wifi_quality index bf34e5ed..36c3cd65 100755 --- a/usr/lib/byobu/wifi_quality +++ b/usr/lib/byobu/wifi_quality @@ -44,7 +44,7 @@ __wifi_quality() { rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/wifi_quality"* return fi - 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 -- + printf "${ICON_WIFI}"; color b C w; printf "%s" "$bitrate"; color -; color C w; printf "%s" "$ICON_MBPS"; color -; color b C w; printf "%s" "$quality"; color -; color C w; printf "%s" "$PCT"; color -- } # vi: syntax=sh ts=4 noexpandtab diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1 index d84dd3d4..2ffc2104 100644 --- a/usr/share/man/man1/byobu.1 +++ b/usr/share/man/man1/byobu.1 @@ -107,7 +107,7 @@ The background colors of the \fBbyobu\fP status lines can be adjusted by editing \fBwhoami\fP \- the name of the user who owns the screen session; displayed in the upper bar toward the far right in bold black text on a grey background -\fBwifi_quality\fP \- the connection rate and signal quality of the wifi connection; displayed in the lower bar toward the right in black text on a cyan background; the connection rate is in 'Mb/s' and the signal quality is as a percentage with a trailing '%'; override the default interface by specifying an alternate interface with MONITORED_NETWORK=wlan0 in \fI$BYOBU_CONFIG_DIR/statusrc\fP +\fBwifi_quality\fP \- the connection rate and signal quality of the wifi connection; displayed in the lower bar toward the right in white text on a cyan background; the connection rate is in 'Mb/s' and the signal quality is as a percentage with a trailing '%'; override the default interface by specifying an alternate interface with MONITORED_NETWORK=wlan0 in \fI$BYOBU_CONFIG_DIR/statusrc\fP .SH SESSIONS