unify screen locking

[config/dotfiles.git] / herbstluftwm / autostart

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 7217ba448854d0501626d5d59db63b912e65da74..d58ff9ed6dab4d184b43ac486def88cce78154ae 100755 (executable)
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -18,12 +18,35 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 
 hc() {
     herbstclient "$@"
 }
+installed() {
+    type "$1" >/dev/null 2>&1
+}
+# $1: timeout
+notify() {
+    if installed dzen2; then
+        read x
+        printf '%s\n' "$x" | 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" &
+    else
+        # Last way to send a "message", create a stupid window layout so I
+        # notice something is up and look at the logs.
+        hc fullscreen off
+        hc floating off
+        hc pseudotile off
+        hc split vertical 0.1
+        hc unlock # or we might not see the changes
+    fi
+}
 
 # Tell all clients the configuration file was reloaded. Should be the first
 # command in the autostart file.
@@ -44,9 +67,8 @@ hc keybind $mod-Shift-Return spawn urxvt
 hc keybind $mod-Shift-c close
 hc keybind $mod-q reload
 hc keybind $mod-Shift-q quit
-# 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'
+# Lock the screen.
+hc keybind $mod-z spawn "$HOME/.xlockscreen" lock
 
 # Tag key bindings. Create tags 1 to 9 with bindings to switch and move
 # windows to them.
@@ -89,6 +111,14 @@ hc keybind $mod-s chain , lock , rotate , rotate , unlock
 hc mouseunbind --all
 
 
+# GENERAL SETTINGS
+
+# Necessary for Java so it recognizes herbstluftwm as tiling window manager.
+hc set wmname LG3D
+# Auto-detect new monitors.
+hc set auto_detect_monitors 1
+
+
 # WINDOW and FRAME SETTINGS
 
 # No border for frames, only for windows.
@@ -134,16 +164,17 @@ hc rule focus=off \
         ewmhrequests=off \
         index=1
 
+# Focus important windows when they are opened.
+hc rule instance=xmessage focus=on
+
+# Move Iceweasel to tag 2.
+hc rule instance=Navigator class=Iceweasel tag=2
+
 
 # After everything is done, allow redrawing of the windows.
 hc unlock
 
 
-# $1: timeout
-notify() {
-    sed 's/\^/^^/g' | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$@"
-}
-
-# To notify me if set -e has terminated the script (then this part won't get
+# To notify me if set -eu has terminated the script (then this part won't get
 # executed).
 echo 'hlwm restarted' | notify 1