os/arch (panel): fix bspwm desktop/monitor display

This commit is contained in:
Henrik Lissner 2016-12-24 16:20:43 -05:00
parent cda1d542ef
commit baba5ca61e

View file

@ -68,7 +68,7 @@ parse() {
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
do do
id=$1 id=$1
name=${id#???} name=${id#?}
case $id in case $id in
[mM]*) [mM]*)
[ "$num_mon" -lt 2 ] && shift && continue [ "$num_mon" -lt 2 ] && shift && continue
@ -82,7 +82,7 @@ parse() {
_BG=$COLOR_FOCUSED_MONITOR_BG _BG=$COLOR_FOCUSED_MONITOR_BG
;; ;;
esac esac
wm="${wm}%{F$_FG}%{B$_BG}%{A:bspc monitor -f ${id#?}:} ${id#?} %{A}%{B-}%{F-}" wm="${wm}%{F$_FG}%{B$_BG}%{A:bspc monitor -f ${name}:} ${name} %{A}%{B-}%{F-}"
;; ;;
[fFoOuU]*) [fFoOuU]*)
case $id in case $id in
@ -111,8 +111,8 @@ parse() {
_BG=$COLOR_FOCUSED_URGENT_BG _BG=$COLOR_FOCUSED_URGENT_BG
;; ;;
esac esac
eval "icon=\$ICON_$(echo $name | tr '[:lower:]' '[:upper:]')" eval "icon=\$ICON_$(echo ${name#??} | tr '[:lower:]' '[:upper:]')"
wm="${wm}%{F$_FG}%{B$_BG}%{A:bspc desktop -f ${id#?}:} ${icon:-$name} %{A}%{B-}%{F-}" wm="${wm}%{F$_FG}%{B$_BG}%{A:bspc desktop -f ${name}:} ${icon:-$name} %{A}%{B-}%{F-}"
;; ;;
esac esac
shift shift