bin/xlockscreen: fix lock timeout

Also set xscreensaver.lock property to force lock independently from the
current settings.

diff --git a/Xresources.in b/Xresources.in
index d9f4a9e425fbc807105511083fdd8a09c5ffec72..d544083b14fe0df96d812b5fd503cfb72e9361d2 100644 (file)
--- a/Xresources.in
+++ b/Xresources.in
@@ -98,9 +98,9 @@ xscreensaver.mode: blank
 
 ! Blank after x time (h:mm:ss).
 xscreensaver.timeout: 0:10:00
-! Lock screen after x time.
+! Lock screen after x time _after_ blank.
 xscreensaver.lockTimeout: 2:00:00
-! Immediately lock when timeout is reached.
+! Require password to unlock after blank.
 xscreensaver.lock: True
 
 ! No fade effects, enable/disable monitor immediately.

diff --git a/bin/xlockscreen b/bin/xlockscreen
index 88c4a48874d324830147137bbb4e94dad73f0c1c..741d6f12cb8980f8c7c0895ee8a5079740d4b0cc 100755 (executable)
--- a/bin/xlockscreen
+++ b/bin/xlockscreen
@@ -50,7 +50,10 @@ if test x"$1" = xstart; then
     # [1]: https://stackoverflow.com/questions/3748432/insane-crond-behavior-keeps-making-defunct-bash-processes/3750028#3750028
 
     if installed xscreensaver; then
-        echo "xscreensaver.lockTimeout: $lock_time_minutes" | xrdb -merge
+        printf 'xscreensaver.timeout: %d
+                xscreensaver.lock: True
+                xscreensaver.lockTimeout: 0
+               ' "$lock_time_minutes" | xrdb -merge
         xscreensaver >/dev/null &
         echo xscreensaver
     elif installed xautolock; then