mirrors
/
i3lock
mirror of https://github.com/i3/i3lock.git
1
0
Fork 0
Code Issues Releases Wiki Activity

unlock automatically after authentication failure (#90) 

This will make i3 unlock automatically after authentication failure and
correct input without pressing <Enter> again after the "wrong"-indicator
is gone.
pull/93/head
koebi 2016-09-04 18:22:49 +02:00 committed by Michael Stapelberg
parent 893aff1bd0
commit 17b7b77893
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
i3lock.c
View File

@ -43,6 +43,7 @@
timer_obj = stop_timer(timer_obj)
typedef void (*ev_callback_t)(EV_P_ ev_timer *w, int revents);
static void input_done(void);
char color[7] = "ffffff";
uint32_t last_resolution[2];
@ -65,6 +66,7 @@ extern unlock_state_t unlock_state;
extern pam_state_t pam_state;
int failed_attempts = 0;
bool show_failed_attempts = false;
bool retry_verification = false;
static struct xkb_state *xkb_state;
static struct xkb_context *xkb_context;
@ -192,6 +194,17 @@ ev_timer *stop_timer(ev_timer *timer_obj) {
return NULL;
}
/*
* Neccessary calls after ending input via enter or others
*
*/
static void finish_input(void) {
password[input_position] = '\0';
unlock_state = STATE_KEY_PRESSED;
redraw_screen();
input_done();
}
/*
* Resets pam_state to STATE_PAM_IDLE 2 seconds after an unsuccessful
* authentication event.
@ -210,6 +223,12 @@ static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) {
/* Now free this timeout. */
STOP_TIMER(clear_pam_wrong_timeout);
/* retry with input done during pam verification */
if (retry_verification) {
retry_verification = false;
finish_input();
}
}
static void clear_indicator_cb(EV_P_ ev_timer *w, int revents) {
@ -373,17 +392,16 @@ static void handle_key_press(xcb_key_press_event_t *event) {
if (ksym == XKB_KEY_j && !ctrl)
break;
if (pam_state == STATE_PAM_WRONG)
if (pam_state == STATE_PAM_WRONG) {
retry_verification = true;
return;
}
if (skip_without_validation()) {
clear_input();
return;
}
password[input_position] = '\0';
unlock_state = STATE_KEY_PRESSED;
redraw_screen();
input_done();
finish_input();
skip_repeated_empty_password = true;
return;
default: