unify screen locking

[config/dotfiles.git] / herbstluftwm / autostart

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 3c4fcd7c2d75afa040e09413f603055eaaf17100..d58ff9ed6dab4d184b43ac486def88cce78154ae 100755 (executable)
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -18,7 +18,7 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 
 hc() {
@@ -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
@@ -65,18 +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
-# 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 $locker"
+# 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.
@@ -183,6 +175,6 @@ hc rule instance=Navigator class=Iceweasel tag=2
 hc unlock
 
 
-# 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