From 26a62982eab36ee68608a61306e6fab6447edd8a Mon Sep 17 00:00:00 2001
From: Vasil Zlatanov <vasil.zlatanov@gmail.com>
Date: Sat, 8 Aug 2015 12:38:43 +0200
Subject: Fix many bar bugs and improve ratpoison config

---
 tools/panel/panel     |  6 +++---
 tools/panel/panel_bar | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'tools/panel')

diff --git a/tools/panel/panel b/tools/panel/panel
index 69eb2f2..4260578 100755
--- a/tools/panel/panel
+++ b/tools/panel/panel
@@ -7,8 +7,8 @@ source ~/.colors
 mkfifo -m 777 "$PANEL_FIFO"
 
 
-bspc config top_padding $PANEL_HEIGHT
-bspc control --subscribe > "$PANEL_FIFO" &
+#bspc config top_padding $PANEL_HEIGHT
+#bspc control --subscribe > "$PANEL_FIFO" &
 ./windows > "$PANEL_FIFO" &
 echo "D`rpws current`" > "$PANEL_FIFO" &
 volume -f 'V%i' > "$PANEL_FIFO" &
@@ -23,7 +23,7 @@ unbuffer alsactl monitor | grep --line-buffered 'Headphone Jack' | while read li
 
 source ./panel_colors
 
-cat "$PANEL_FIFO" | ./panel_bar | lemonbar -f "$FONT_FONT" -f "$ICON_FONT" -g x$PANEL_HEIGHT -F "$COLOR11" -B "$COLOR0" &
+cat "$PANEL_FIFO" | ./panel_bar | lemonbar -f "$FONT_FONT" -f "$ICON_FONT" -g x$PANEL_HEIGHT -F "$COLOR11" -B "$COLOR0" -u 3 &
 
 #sleep 1;
 #stalonetray --geometry 1x1-415+2 --icon-gravity E --grow-gravity E  -bg $COLOR0 -i 20 &
diff --git a/tools/panel/panel_bar b/tools/panel/panel_bar
index ab39edf..4bc63f9 100755
--- a/tools/panel/panel_bar
+++ b/tools/panel/panel_bar
@@ -117,20 +117,19 @@ while read -r line ; do
 			desktop="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?}%{B-}%{F-}  "
           		;;
 		Wclear)
-			# focused occupied desktop
-			wm_infos=""
+			wm_infos=''
 			;;
 	
 		\**)
-			# focused occupied desktop
-			wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOCUSED_UG} ${line#?} %{-u}%{B-}%{F-}"
+			# current focused window
+			wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOCUSED_UG}%{+o} ${line#?} %{-o}%{B-}%{F-}%{U-}"
 			;;
 		+*)
-			# occupied desktop
+			# last focused window
 			wm_infos="${wm_infos}%{F$COLOR_OTHER_FG}%{B$COLOR_OTHER_BG} ${line#?} %{B-}%{F-}"
 			;;
         	-*)
-			# free desktop
+			# other windows
 			wm_infos="${wm_infos}%{F$COLOR_ELSE_FG}%{B$COLOR_ELSE_BG} ${line#?} %{B-}%{F-}"
 			;;
 #					u*)
@@ -143,5 +142,5 @@ while read -r line ; do
 #						;;
 	esac
 #	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos}             "
-	printf "%s\n" "%{l}${desktop}${wm_infos}${title}%{r}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}"
+	printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}"
 done
-- 
cgit v1.2.3-54-g00ecf