From cca7d4e6c39d4fd36ca4cd7dd8333bb1cc313a62 Mon Sep 17 00:00:00 2001 From: Florian Zipperle Date: Wed, 20 Jul 2016 08:50:07 +0200 Subject: [PATCH] Removed obsolete inactivity timeout (#84) * Removed obsolete inactivity timeout --- i3lock.1 | 11 ++--------- i3lock.c | 6 +----- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/i3lock.1 b/i3lock.1 index eca7f97..55af52d 100644 --- a/i3lock.1 +++ b/i3lock.1 @@ -27,8 +27,6 @@ i3lock \- improved screen locker .IR pointer\|] .RB [\|\-u\|] .RB [\|\-e\|] -.RB [\|\-I -.IR timeout\|] .RB [\|\-f\|] .SH DESCRIPTION @@ -64,13 +62,6 @@ Don't fork after starting. Enable beeping. Be sure to not do this when you are about to annoy other people, like when opening your laptop in a boring lecture. -.TP -.BI \-I\ seconds \fR,\ \fB\-\-inactivity-timeout= seconds -Specifies the number of seconds i3lock will wait for another password before -turning off the monitors, in case you entered a wrong password or canceled by -pressing Escape. Only makes sense together with \-d. If omitted, the default is -30 seconds. - .TP .B \-u, \-\-no-unlock-indicator Disable the unlock indicator. i3lock will by default show an unlock indicator @@ -140,6 +131,8 @@ use a wrapper script around i3lock like the following: \& revert .Ve +The \-I (-\-inactivity-timeout=seconds) was removed because it only makes sense with DPMS. + .SH SEE ALSO .IR xautolock(1) \- use i3lock as your screen saver diff --git a/i3lock.c b/i3lock.c index 0383ebe..380cab4 100644 --- a/i3lock.c +++ b/i3lock.c @@ -45,7 +45,6 @@ typedef void (*ev_callback_t)(EV_P_ ev_timer *w, int revents); char color[7] = "ffffff"; -int inactivity_timeout = 30; uint32_t last_resolution[2]; xcb_window_t win; static xcb_cursor_t cursor; @@ -806,10 +805,7 @@ int main(int argc, char *argv[]) { fprintf(stderr, "DPMS support has been removed from i3lock. Please see the manpage i3lock(1).\n"); break; case 'I': { - int time = 0; - if (sscanf(optarg, "%d", &time) != 1 || time < 0) - errx(EXIT_FAILURE, "invalid timeout, it must be a positive integer\n"); - inactivity_timeout = time; + fprintf(stderr, "Inactivity timeout only makes sense with DPMS, which was removed. Please see the manpage i3lock(1).\n"); break; } case 'c': { -- 2.39.2