Fix many bar bugs and improve ratpoison config

3 files changed, 18 insertions, 20 deletions

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
diff --git a/tools/ratpoisonrc.conf b/tools/ratpoisonrc.conf
index a40ce54..f441830 100644
--- a/tools/ratpoisonrc.conf
+++ b/tools/ratpoisonrc.conf
@@ -20,8 +20,8 @@ bind Tab nextscreen
 #have windows centered
 set wingravity center
 
-# Use the name of the program rather than the title in the window list
-set winname class
+# Set name to be title
+set winname title
 
 #Pest control.
 banish
@@ -61,7 +61,7 @@ unmanage stalonetray
 
 # hooks
 addhook switchwin barsend
-addhook deletewindow barsend
+#addhook deletewindow barsend
 addhook switchframe barsend
 addhook switchgroup barsend
 #addhook titlechanged barsend
@@ -86,7 +86,7 @@ definekey top F3 exec rpws 3 && echo "D3" > /tmp/panel-fifo #&& ratpoison -c bor
 definekey top F4 exec rpws 4 && echo "D4" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F5 exec rpws 5 && echo "D5" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F6 exec rpws 6 && echo "D6" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F7 exec rpws 7 && echo "D8" > /tmp/panel-fifo #&& ratpoison -c bordscript
+definekey top F7 exec rpws 7 && echo "D7" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F8 exec rpws 8 && echo "D8" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F10 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" #&& ratpoison -c bordscript
@@ -155,7 +155,8 @@ bind K exchangeup
 
 bind w window_menu
 bind a exec ratpoison -i -c 'title' && ratpoison -c 'barsend'                                                                                                                              
-bind t time
+bind t exec ~/bin/passenter
+bind T exec ~/bin/passmake
 definekey top s-l exec i3lock -n -i ~/.wallpaper.png
 definekey top s-s exec ~/bin/sus
 definekey top s-L redisplay
@@ -176,9 +177,8 @@ bind Escape abort
 bind m exec xfce4-popup-applicationsmenu
 
 #Paste goodness
-bind g exec ~/bin/imgur
-bind P exec xclip -o | curl -F 'sprunge=<-' http://sprunge.us | xclip 
- 
+bind g exec ~/bin/safeimg
+bind P exec ~/bin/safepaste
 
 alias bordtoggle exec ~/.tools/bordtoggle
 alias bordscript exec ~/.tools/borderscript
@@ -200,7 +200,7 @@ alias browse colon browse_cmd
 bind b browse
 # B : open a new firefox tab and browse to the X clipboard selection
 alias browse_selection exec .tools/exec_to_workspace 2 vimb `ratpoison -c getsel`
-bind B browse_selection
+bind B banish
 
 # Paste with X selection
 alias insert_X_selection meta S-Insert
@@ -213,7 +213,6 @@ bind i insert_X_selection
 
 definekey top s-f exec firefox
 definekey top s-u exec uzbl-browser
-definekey top s-m exec /home/vasko/.tools/pentfocus
 definekey top s-v exec vimb
 definekey top s-g exec gvim
 #definekey top s-l exec libreoffice