Removed obsolete inactivity timeout (#84)

* Removed obsolete inactivity timeout
pull/85/head
Florian Zipperle 2016-07-20 08:50:07 +02:00 committed by Michael Stapelberg
parent 679fb57acc
commit cca7d4e6c3
2 changed files with 3 additions and 14 deletions

View File

@ -27,8 +27,6 @@ i3lock \- improved screen locker
.IR pointer\|] .IR pointer\|]
.RB [\|\-u\|] .RB [\|\-u\|]
.RB [\|\-e\|] .RB [\|\-e\|]
.RB [\|\-I
.IR timeout\|]
.RB [\|\-f\|] .RB [\|\-f\|]
.SH DESCRIPTION .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, 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. 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 .TP
.B \-u, \-\-no-unlock-indicator .B \-u, \-\-no-unlock-indicator
Disable the unlock indicator. i3lock will by default show an 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 \& revert
.Ve .Ve
The \-I (-\-inactivity-timeout=seconds) was removed because it only makes sense with DPMS.
.SH SEE ALSO .SH SEE ALSO
.IR xautolock(1) .IR xautolock(1)
\- use i3lock as your screen saver \- use i3lock as your screen saver

View File

@ -45,7 +45,6 @@
typedef void (*ev_callback_t)(EV_P_ ev_timer *w, int revents); typedef void (*ev_callback_t)(EV_P_ ev_timer *w, int revents);
char color[7] = "ffffff"; char color[7] = "ffffff";
int inactivity_timeout = 30;
uint32_t last_resolution[2]; uint32_t last_resolution[2];
xcb_window_t win; xcb_window_t win;
static xcb_cursor_t cursor; 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"); fprintf(stderr, "DPMS support has been removed from i3lock. Please see the manpage i3lock(1).\n");
break; break;
case 'I': { case 'I': {
int time = 0; fprintf(stderr, "Inactivity timeout only makes sense with DPMS, which was removed. Please see the manpage i3lock(1).\n");
if (sscanf(optarg, "%d", &time) != 1 || time < 0)
errx(EXIT_FAILURE, "invalid timeout, it must be a positive integer\n");
inactivity_timeout = time;
break; break;
} }
case 'c': { case 'c': {