unify screen locking

[config/dotfiles.git] / herbstluftwm / autostart

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 2b048abf20c9641054113e8366fb279b517776ee..d58ff9ed6dab4d184b43ac486def88cce78154ae 100755 (executable)
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -67,28 +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 xscreensaver xtrlock ''; do
-    if installed "$locker"; then
-        break
-    fi
-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 available for the current X session.
-    locker_pre='xscreensaver-command -time >/dev/null 2>&1 || xscreensaver &'
-    locker='xscreensaver-command -lock'
-elif test x"$locker" = xxtrlock; then
-    # Sleep is necessary to allow xtrlock to grab the keyboard input.
-    locker_pre='sleep 1;'
-fi
 # Lock the screen.
-hc keybind $mod-z spawn sh -c "$locker_pre exec $locker"
+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.