Added better theming infrastructure to HLWM

9 files changed, 98 insertions, 72 deletions

diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 78a81b4..a436283 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -9,37 +9,38 @@ export -f hc
 # The current directory
 export HLWM_CONF_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-#Include the theming script
-source "$HLWM_CONF_DIR/themes/current"
-
-#Detect monitors
-hc set auto_detect_monitors 1
-hc detect_monitors
+source "$HLWM_CONF_DIR/hlwm-theming"
 
-#Panel and window_p
+#Panel and HLWM_WINDOW_PADDING
 monitor_w=($(hc list_monitors | sed 's/^[0-9]: \([0-9]*\)x.*$/\1/'))
-panel_w=$(echo "$monitor_w - (2 * $window_p)" | bc)
-dmenu_opts="-h $panel_h -w $panel_w -x $window_p -y $window_p -p Run: -nb $color_bg -nf $color_fg -sb $color_accent -sf $color_bg"
+panel_w=$(echo "$monitor_w - (2 * $HLWM_WINDOW_PADDING)" | bc)
+dmenu_opts="-h $HLWM_PANEL_HEIGHT -w $panel_w -x $HLWM_WINDOW_PADDING -y $HLWM_WINDOW_PADDING -p Run: -nb $HLWM_BG_COLOR -nf $HLWM_FG_COLOR -sb $HLWM_ACCENT_COLOR -sf $HLWM_BG_COLOR"
 
 # Tags
 tag_names=()
 tag_keys=({1..9} 0)
 for key in ${tag_keys[@]}; do
-    if [ $key -eq 0 ]; then key=10; fi
-    key=$(echo "$key - 1" | bc)
+    if [ $key -eq 0 ]; then 
+        key=10
+    else
+        key=$(echo "$key - 1" | bc)
+    fi
+
     name=$(echo "obase=2;$key" | bc | awk '{ printf "%04d", $0 }')
     tag_names+=($name)
 done;
 
 # Source hlwm-config-files
 source "$HLWM_CONF_DIR/hlwm-keybindings"
-source "$HLWM_CONF_DIR/hlwm-theming"
 source "$HLWM_CONF_DIR/hlwm-rules"
 
 # Unlock, just to be sure
 hc unlock
 
-herbstclient set tree_style '╾│ ├└╼─┐'
+
+#Detect monitors
+hc set auto_detect_monitors 1
+hc detect_monitors
 
 # Start panel in all monitors
 panel=$HLWM_CONF_DIR/start_panel.sh
@@ -51,11 +52,16 @@ done
 pulseaudio --start
 
 $HLWM_CONF_DIR/start.sh "xautolock -time 5 -locker $HLWM_CONF_DIR/lock.sh"
-$HLWM_CONF_DIR/start.sh "feh --bg-fill $wallpaper"
-$HLWM_CONF_DIR/start.sh "compton --config $HOME/.compton"
-$HLWM_CONF_DIR/start.sh "xrdb -load $HOME/.Xresources"
-$HLWM_CONF_DIR/start.sh "xset +fp /usr/share/fonts/local"
-$HLWM_CONF_DIR/start.sh "xset fp rehash"
+
+if $HLWM_COMPOSITING; then
+    $HLWM_CONF_DIR/start.sh "compton --config $HOME/.compton"
+else
+    pkill compton
+fi
+
+xset +fp /usr/share/fonts/local
+xset fp rehash
+
 #$HLWM_CONF_DIR/start.sh "$HLWM_CONF_DIR/notify.sh $HLWM_CONF_DIR/popup.sh"
 
 # vim: set ts=4 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-keybindings b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
index 4a6a614..cc40515 100644
--- a/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
@@ -7,7 +7,7 @@ hc keyunbind --all
 Mod=Mod4   # Use the super key as the main modifier
 
 hc keybind $Mod-Shift-q quit
-hc keybind $Mod-Shift-r reload
+hc keybind $Mod-Shift-r chain , spawn echo "!! HLWM reload config !!" , reload
 hc keybind $Mod-Shift-c close
 hc keybind $Mod-Return spawn xterm
 hc keybind $Mod-grave spawn dmenu_run $dmenu_opts
diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-theming b/herbstluftwm/.config/herbstluftwm/hlwm-theming
index 0ffd366..aca737f 100644
--- a/herbstluftwm/.config/herbstluftwm/hlwm-theming
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-theming
@@ -1,6 +1,29 @@
 #!/usr/bin/env bash
 
+# Add alpha channel to a hexadecimal color
+add_alpha_channel(){
+    echo "$1" | \
+    sed "s/.*#\([0-9a-fA-F]*\).*/#ff\1/"
+}
+
+#Include the theming script
+source "$HLWM_CONF_DIR/themes/current"
+
+feh --bg-scale "$HLWM_WALLPAPER"
+
 # Theme
+xrdb -load $HOME/.Xresources
+
+for color in "${!colors[@]}"; do
+    echo "*$color: ${colors[$color]}" | xrdb -override
+done
+
+echo "XTerm*background: $HLWM_BG_COLOR" | xrdb -override
+
+export HLWM_FG_ACOLOR=$(add_alpha_channel $HLWM_FG_COLOR)
+export HLWM_ACCENT_ACOLOR=$(add_alpha_channel $HLWM_ACCENT_COLOR)
+export HLWM_BG_ACOLOR=$(add_alpha_channel $HLWM_BG_COLOR)
+
 hc attr theme.tiling.reset 1
 hc attr theme.floating.reset 1
 hc set frame_border_width 0
@@ -11,21 +34,24 @@ hc set frame_active_opacity 0
 hc set frame_transparent_width 0
 hc set frame_gap 0
 
-hc attr theme.active.color $color_accent
-hc attr theme.normal.color $color_bg
+hc attr theme.active.color $HLWM_ACCENT_COLOR
+hc attr theme.normal.color $HLWM_BG_COLOR
 hc attr theme.urgent.color orange
 hc attr theme.inner_width 1
-hc attr theme.inner_color $color_bg
+hc attr theme.inner_color $HLWM_BG_COLOR
 hc attr theme.border_width 3
 hc attr theme.floating.border_width 4
 hc attr theme.floating.outer_width 1
-hc attr theme.floating.outer_color $color_bg
-hc attr theme.active.inner_color $color_bg
-hc attr theme.active.outer_color $color_bg
-hc attr theme.background_color $color_bg
+hc attr theme.floating.outer_color $HLWM_BG_COLOR
+hc attr theme.active.inner_color $HLWM_BG_COLOR
+hc attr theme.active.outer_color $HLWM_BG_COLOR
+hc attr theme.background_color $HLWM_BG_COLOR
 
-hc set window_gap $window_p
+hc set window_gap $HLWM_WINDOW_PADDING
 hc set frame_padding 0
 hc set smart_window_surroundings 0
 hc set smart_frame_surroundings 1
 hc set mouse_recenter_gap 1
+hc set tree_style '╾│ ├└╼─┐'
+
+# vim: set ts=4 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
index a9e71da..487cda3 100755
--- a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
@@ -46,11 +46,11 @@ volume()
         if [ -z $vol ] ; then
             vol_status="off"
         elif [ $vol -eq 0 ]; then
-            vol_status="%{F$acolor_fg}${volume_icon[0]} $vol%%{F-}"
+            vol_status="%{F$HLWM_FG_ACOLOR}${volume_icon[0]} $vol%%{F-}"
         elif [ $vol -lt 33 ]; then
-            vol_status="%{F$acolor_fg}${volume_icon[1]} $vol%%{F-}"
+            vol_status="%{F$HLWM_FG_ACOLOR}${volume_icon[1]} $vol%%{F-}"
         else
-            vol_status="%{F$acolor_fg}${volume_icon[2]} $vol%%{F-}"
+            vol_status="%{F$HLWM_FG_ACOLOR}${volume_icon[2]} $vol%%{F-}"
         fi
         echo -e "volume\t$vol_status"
     else
@@ -116,7 +116,7 @@ battery()
         if [ $bat_state == "Charging" ] ; then
             bat_status="${battery_icon[5]}"
         elif [ $bat_lvl -lt 10 ] ; then
-            bat_status="${F$acolor_accent}${battery_icon[0]}${F-}"
+            bat_status="${F$HLWM_ACCENT_ACOLOR}${battery_icon[0]}${F-}"
         elif [ $bat_ -lt 25 ] ; then
             bat_status="${battery_icon[1]}"