Merge remote-tracking branch 'ryuslash/master' into phoenix

Conflicts:
	.config/herbstluftwm/autostart
	.xbindkeysrc.scm
	.xinitrc

2 files changed, 23 insertions, 20 deletions

diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 8567bea..9f6d187 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -32,10 +32,14 @@ hc unrule -F
 hc rule focus=on
 hc rule windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on
 hc rule class=Xephyr pseudotile=on
+hc rule instance=Xine\ Window pseudotile=on
 
 # Panel
 ~/.config/herbstluftwm/panel.sh &
 
+# Prep default
+hc load default "(split horizontal:0.550000:0 (split vertical:0.850000:0 (split horizontal:0.180000:1 (clients max:0) (clients max:0 0x140001a)) (clients max:0)) (clients max:0 0xc00077))"
+
 # Local Variables:
 # eval: (git-auto-commit-mode 1)
 # End:
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 1438974..ae5aedd 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -113,8 +113,6 @@ function emacs_running()
     ps ax | awk '{ print $5 " " $6 }' | grep -E "^emacs --daemon"
 }
 
-herbstclient pad $monitor $(expr -5 + $height) -5 -5 -5
-herbstclient pad $monitor2 -5 -5 -5 -5
 {
     childpid=$!
     herbstclient --idle
@@ -122,27 +120,28 @@ herbstclient pad $monitor2 -5 -5 -5 -5
 } 2> /dev/null | {
     TAGS=( $(herbstclient tag_status $monitor) )
     TAGS2=( $(herbstclient tag_status $monitor2) )
-    while true ; do
-        separator="^fg($bgcolor)^ro(1x$height)^fg()"
-        print_tags
-        print_services
-        print_mailboxes
 
-        echo
+    separator="^fg($bgcolor)^ro(1x$height)^fg()"
+    print_tags
+    print_services
+    print_mailboxes
+
+    echo
         # wait for next event
-        read line || break
-        cmd=( $line )
+    read line || break
+    cmd=( $line )
         # find out event origin
-        case "${cmd[0]}" in
-            tag*)
-                TAGS=( $(herbstclient tag_status $monitor) )
-                TAGS2=( $(herbstclient tag_status $monitor2) )
-                ;;
-            quit_panel)
-                exit
-                ;;
-        esac
-    done
+    case "${cmd[0]}" in
+        tag*)
+            TAGS=( $(herbstclient tag_status $monitor) )
+            TAGS2=( $(herbstclient tag_status $monitor2) )
+            ;;
+        quit_panel)
+            exit
+            ;;
+    esac
+
+    sleep 1s
 } 2> /dev/null | dzen2 -w $width -x $x -y $y -fn "$font" -h $height \
     -ta l -bg "$bgcolor"