commit 38a70376f23c508650b0462ba1c4cc7a1ebb58bd
parent 70d26486391e8a607608510e74237f5835796c46
Author: Chris Guillott <chris@techfo.xyz>
Date: Wed, 20 Jul 2016 13:02:06 -0500
resolve merge conflict with upstream
Diffstat:
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/i3lock.1 b/i3lock.1
@@ -27,8 +27,6 @@ i3lock-color \- improved screen locker
.IR pointer\|]
.RB [\|\-u\|]
.RB [\|\-e\|]
-.RB [\|\-I
-.IR timeout\|]
.RB [\|\-f\|]
.SH DESCRIPTION
@@ -65,13 +63,6 @@ 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
after pressing keys. This will give feedback for every keypress and it will
@@ -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
@@ -64,8 +64,6 @@ char separatorcolor[9] = "000000ff";
int screen_number = -1;
/* default is to use the supplied line color, 1 will be ring color, 2 will be to use the inside color for ver/wrong/etc */
int internal_line_source = 0;
-
-int inactivity_timeout = 30;
uint32_t last_resolution[2];
xcb_window_t win;
static xcb_cursor_t cursor;
@@ -854,10 +852,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': {
@@ -1036,7 +1031,7 @@ int main(int argc, char *argv[]) {
srand(time(NULL));
/* Initialize PAM */
- if ((ret = pam_start("i3lock-color", username, &conv, &pam_handle)) != PAM_SUCCESS)
+ if ((ret = pam_start("i3lock", username, &conv, &pam_handle)) != PAM_SUCCESS)
errx(EXIT_FAILURE, "PAM: %s", pam_strerror(pam_handle, ret));
if ((ret = pam_set_item(pam_handle, PAM_TTY, getenv("DISPLAY"))) != PAM_SUCCESS)
