herbstluftwm/autostart: fix notify() with dzen2

[config/dotfiles.git] / herbstluftwm / autostart

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 3c4fcd7c2d75afa040e09413f603055eaaf17100..f8b7c3a560d73841e34c6b2ec626d279624ea86b 100755 (executable)
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -30,7 +30,9 @@ installed() {
 # $1: timeout
 notify() {
     if installed dzen2; then
-        sed 's/\^/^^/g' | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$1"
+        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
@@ -66,7 +68,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 +76,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.