Revert "herbstluftwm/autostart: start screen locker message in the background"

[config/dotfiles.git] / herbstluftwm / autostart

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 18377756bdfeea534ab995ddba4500d510225a99..1fbb591559330c29233aa95b5946cf7fbb6f9f48 100755 (executable)
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -66,7 +66,7 @@ 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
+for locker in xscreensaver xtrlock ''; do
     if installed "$locker"; then
         break
     fi
@@ -74,9 +74,17 @@ done
 if test -z "$locker"; then
     echo 'No screen locker found!' | notify 60
 fi
+# Additional options.
+locker_pre=
+if test x"$locker" = xxscreensaver; then
+    # Start xscreensaver if it's not already running. xscreensaver-command
+    # ensures xscreensaver is availble for the current X session.
+    locker_pre='xscreensaver-command -time >/dev/null 2>&1 || xscreensaver &'
+    locker='xscreensaver-command -lock'
+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 $locker"
+hc keybind $mod-z spawn sh -c "$locker_pre sleep 1; exec $locker"
 
 # Tag key bindings. Create tags 1 to 9 with bindings to switch and move
 # windows to them.
@@ -123,6 +131,8 @@ hc mouseunbind --all
 
 # 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
@@ -170,6 +180,12 @@ 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