switching back to ratpoison

3 files changed, 37 insertions, 82 deletions

diff --git a/tools/panel/panel b/tools/panel/panel
index 472b180..69eb2f2 100755
--- a/tools/panel/panel
+++ b/tools/panel/panel
@@ -9,7 +9,8 @@ mkfifo -m 777 "$PANEL_FIFO"
 
 bspc config top_padding $PANEL_HEIGHT
 bspc control --subscribe > "$PANEL_FIFO" &
-xtitle -sf 'T%s' > "$PANEL_FIFO" &
+./windows > "$PANEL_FIFO" &
+echo "D`rpws current`" > "$PANEL_FIFO" &
 volume -f 'V%i' > "$PANEL_FIFO" &
 battery -i 60 -sf 'B%s %i' > "$PANEL_FIFO" &
 clock -i 60 -sf 'Z%d %a %H:%M' > "$PANEL_FIFO" &
@@ -22,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 "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" &
+cat "$PANEL_FIFO" | ./panel_bar | lemonbar -f "$FONT_FONT" -f "$ICON_FONT" -g x$PANEL_HEIGHT -F "$COLOR11" -B "$COLOR0" &
 
-sleep 1;
-stalonetray --geometry 1x1-415+2 --icon-gravity E --grow-gravity E  -bg $COLOR0 -i 18 &
+#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 779c5bb..ab39edf 100755
--- a/tools/panel/panel_bar
+++ b/tools/panel/panel_bar
@@ -1,7 +1,4 @@
 #! /bin/sh
-#
-# Example panel for LemonBoy's bar
-
 
 num_mon=$(bspc query -M | wc -l)
 
@@ -111,51 +108,31 @@ while read -r line ; do
 			# clock output
 			time_infos="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?} %{B-}%{F-}"
 			;;
-		T*)
-			# xtitle output
-			title="%{F$COLOR_TITLE_FG}%{B$COLOR_TITLE_BG} ${line#?} %{B-}%{F-}"
-			;;
-		W*)
-			# bspwm internal state
+#		T*)
+#			# xtitle output
+#			title="%{F$COLOR_TITLE_FG}%{B$COLOR_TITLE_BG} ${line#?} %{B-}%{F-}"
+#			;;
+		D*)
+			# active desktop
+			desktop="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?}%{B-}%{F-}  "
+          		;;
+		Wclear)
+			# focused occupied desktop
 			wm_infos=""
-			IFS=':'
-			set -- ${line#?}
-			while [ $# -gt 0 ] ; do
-				item=$1
-				name=${item#?}
-				case $item in
-					M*)
-						# active monitor
-						if [ $num_mon -gt 1 ] ; then
-							wm_infos="$wm_infos %{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG} ${name} %{B-}%{F-}  "
-						fi
-						;;
-#					m*)
-#						# inactive monitor
-#						if [ $num_mon -gt 1 ] ; then
-#							wm_infos="$wm_infos %{F$COLOR_INACTIVE_MONITOR_FG}%{B$COLOR_INACTIVE_MONITOR_BG} ${name} %{B-}%{F-}  "
-#						fi
-#						;;
-					O*)
-						# focused occupied desktop
-						wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOREGROUND} ${name} %{-u}%{B-}%{F-}"
-						;;
-					F*)
-						# focused free desktop
-						wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOREGROUND} ${name} %{-u}%{B-}%{F-}"
-						;;
-					U*)
-						# focused urgent desktop
-						wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOREGROUND} ${name} %{-u}%{B-}%{F-}"
-						;;
-#					o*)
-#						# occupied desktop
-#						wm_infos="${wm_infos}%{F$COLOR_OCCUPIED_FG}%{B$COLOR_OCCUPIED_BG} ${name} %{B-}%{F-}"
-#						;;
-#					f*)
-#						# free desktop
-#						wm_infos="${wm_infos}%{F$COLOR_FREE_FG}%{B$COLOR_FREE_BG} ${name} %{B-}%{F-}"
-#						;;
+			;;
+	
+		\**)
+			# focused occupied desktop
+			wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOCUSED_UG} ${line#?} %{-u}%{B-}%{F-}"
+			;;
+		+*)
+			# occupied desktop
+			wm_infos="${wm_infos}%{F$COLOR_OTHER_FG}%{B$COLOR_OTHER_BG} ${line#?} %{B-}%{F-}"
+			;;
+        	-*)
+			# free desktop
+			wm_infos="${wm_infos}%{F$COLOR_ELSE_FG}%{B$COLOR_ELSE_BG} ${line#?} %{B-}%{F-}"
+			;;
 #					u*)
 #						# urgent desktop
 #						wm_infos="${wm_infos}%{F$COLOR_URGENT_FG}%{B$COLOR_URGENT_BG} ${name} %{B-}%{F-}"
@@ -164,11 +141,7 @@ while read -r line ; do
 #						# layout
 #						wm_infos="$wm_infos  %{F$COLOR_LAYOUT_FG}%{B$COLOR_LAYOUT_BG} ${name} %{B-}%{F-}"
 #						;;
-				esac
-				shift
-			done
-			;;
 	esac
 #	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos}             "
-	printf "%s\n" "%{l}${wm_infos}${title}%{r}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${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}"
 done
diff --git a/tools/panel/panel_colors b/tools/panel/panel_colors
index f436113..f04ddbb 100644
--- a/tools/panel/panel_colors
+++ b/tools/panel/panel_colors
@@ -1,33 +1,14 @@
 source ~/.colors
 
-
-COLOR_FOREGROUND="#FF`echo $COLOR11 | cut -c 2-`"
-COLOR_BACKGROUND="#FF`echo $COLOR0 | cut -c 2-`"
-COLOR_ACTIVE_MONITOR_FG='#FF34322E'
-COLOR_ACTIVE_MONITOR_BG='#FF58C5F1'
-COLOR_INACTIVE_MONITOR_FG='#FF58C5F1'
-COLOR_INACTIVE_MONITOR_BG='#FF34322E'
-COLOR_FOCUSED_OCCUPIED_FG='#FFF6F9FF'
-COLOR_FOCUSED_OCCUPIED_BG='#FF5C5955'
-COLOR_FOCUSED_FREE_FG='#FFF6F9FF'
-COLOR_FOCUSED_FREE_BG='#FF6D561C'
-COLOR_FOCUSED_URGENT_FG='#FF34322E'
-COLOR_FOCUSED_URGENT_BG='#FFF9A299'
-COLOR_OCCUPIED_FG='#FFA3A6AB'
-COLOR_OCCUPIED_BG='#FF34322E'
-COLOR_FREE_FG='#FF6F7277'
-COLOR_FREE_BG='#FF34322E'
-COLOR_URGENT_FG='#FFF9A299'
-COLOR_URGENT_BG='#FF34322E'
-COLOR_LAYOUT_FG='#FFA3A6AB'
-COLOR_LAYOUT_BG='#FF34322E'
-
-
-COLOR_FOCUSED_FG="#FF`echo $COLOR10 | cut -c 2-`"
+COLOR_FOCUSED_FG="#FF`echo $COLOR4 | cut -c 2-`"
 COLOR_FOCUSED_BG="#FF`echo $COLOR0 | cut -c 2-`"
+COLOR_FOCUSED_UG="#FF`echo $COLOR1 | cut -c 2-`"
 
-COLOR_TITLE_FG="#FF`echo $COLOR11 | cut -c 2-`"
-COLOR_TITLE_BG="#FF`echo $COLOR0 | cut -c 2-`"
+COLOR_OTHER_FG="#FF`echo $COLOR10 | cut -c 2-`"
+COLOR_OTHER_BG="#FF`echo $COLOR0 | cut -c 2-`"
 
 COLOR_STATUS_FG="#FF`echo $COLOR12 | cut -c 2-`"
 COLOR_STATUS_BG="#FF`echo $COLOR0 | cut -c 2-`"
+
+COLOR_ELSE_FG="#FF`echo $COLOR11 | cut -c 2-`"
+COLOR_ELSE_BG="#FF`echo $COLOR0 | cut -c 2-`"