X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=herbstluftwm%2Fautostart;h=22dbd0fb4b38f64dbf50fe44eeeffbcf20c9d5f6;hb=ba31b019ce0cb3e1d8115fe38f440344ba770dbb;hp=2dcf5fd34e9aae4efbb7f4b34755ce760436e303;hpb=836d90a706afe7f3f86331375b28390f2a43e372;p=config%2Fdotfiles.git

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 2dcf5fd..22dbd0f 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -20,14 +20,23 @@
 
 set -e
 
-# Log all output to catch errors in the configuration file.
-logfile="$HOME/.config/herbstluftwm/log"
-exec >"$logfile" 2>&1
-
 
 hc() {
     herbstclient "$@"
 }
+installed() {
+    type "$1" >/dev/null 2>&1
+}
+# $1: timeout
+notify() {
+    if installed dzen2; then
+        sed 's/\^/^^/g' | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$1"
+    elif installed xmessage; then
+        # Fallback solution, display first line of stdin.
+        read x
+        xmessage -timeout "$1" "$x" &
+    fi
+}
 
 # Tell all clients the configuration file was reloaded. Should be the first
 # command in the autostart file.
@@ -36,7 +45,8 @@ hc emit_hook reload
 
 # KEY BINDINGS
 
-# Modifier used for all herbstluftwm key bindings.
+# Use Super (= "Windows") key as modifier which is used for all herbstluftwm
+# key bindings.
 mod=Mod4
 
 # Remove all existing key bindings.
@@ -47,9 +57,18 @@ hc keybind $mod-Shift-Return spawn urxvt
 hc keybind $mod-Shift-c close
 hc keybind $mod-q reload
 hc keybind $mod-Shift-q quit
+# Find an existing screen locker.
+for locker in xtrlock ''; do
+    if installed "$locker"; then
+        break
+    fi
+done
+if test -z "$locker"; then
+    echo 'No screen locker found!' | notify 60
+fi
 # Lock the screen. The sleep is necessary to allow xtrlock to grab the
 # keyboard input.
-hc keybind $mod-z spawn sh -c 'sleep 1 && exec xtrlock'
+hc keybind $mod-z spawn sh -c "sleep 1 && exec $locker"
 
 # Tag key bindings. Create tags 1 to 9 with bindings to switch and move
 # windows to them.
@@ -69,6 +88,8 @@ hc keybind $mod-o split horizontal 0.5
 hc keybind $mod-r remove                            # remove a split
 # Change window state.
 hc keybind $mod-f fullscreen toggle
+# Reset fullscreen and layout. Just in case I get confused.
+hc keybind $mod-Shift-space chain , fullscreen off , set_layout horizontal
 
 # Focus key bindings.
 hc keybind $mod-h focus left
@@ -80,6 +101,8 @@ hc keybind $mod-Shift-h shift left
 hc keybind $mod-Shift-j shift down
 hc keybind $mod-Shift-k shift up
 hc keybind $mod-Shift-l shift right
+# Swap top and bottom frame (only works with two frames).
+hc keybind $mod-s chain , lock , rotate , rotate , unlock
 
 
 # MOUSE BINDINGS
@@ -88,6 +111,12 @@ hc keybind $mod-Shift-l shift right
 hc mouseunbind --all
 
 
+# GENERAL SETTINGS
+
+# Necessary for Java so it recognizes herbstluftwm as tiling window manager.
+hc set wmname LG3D
+
+
 # WINDOW and FRAME SETTINGS
 
 # No border for frames, only for windows.
@@ -138,15 +167,6 @@ hc rule focus=off \
 hc unlock
 
 
-# $1: timeout
-notify() {
-    sed 's/\^/^^/g' | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$@"
-}
-
-if test -s "$logfile"; then
-    echo "hlwm: errors in autostart, check log '$logfile'" | notify 3
-else
-    # To notify me if set -e has terminated the script.
-    echo 'hlwm restarted' | notify 1
-    rm "$logfile"
-fi
+# To notify me if set -e has terminated the script (then this part won't get
+# executed).
+echo 'hlwm restarted' | notify 1