mirror of https://github.com/i3/i3lock.git
parent
0bdc0c644d
commit
59705b05b5
27
i3lock.c
27
i3lock.c
|
@ -201,7 +201,6 @@ ev_timer *stop_timer(ev_timer *timer_obj) {
|
||||||
static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) {
|
static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) {
|
||||||
DEBUG("clearing pam wrong\n");
|
DEBUG("clearing pam wrong\n");
|
||||||
pam_state = STATE_PAM_IDLE;
|
pam_state = STATE_PAM_IDLE;
|
||||||
unlock_state = STATE_STARTED;
|
|
||||||
redraw_screen();
|
redraw_screen();
|
||||||
|
|
||||||
/* Clear modifier string. */
|
/* Clear modifier string. */
|
||||||
|
@ -223,15 +222,6 @@ static void clear_input(void) {
|
||||||
input_position = 0;
|
input_position = 0;
|
||||||
clear_password_memory();
|
clear_password_memory();
|
||||||
password[input_position] = '\0';
|
password[input_position] = '\0';
|
||||||
|
|
||||||
/* Hide the unlock indicator after a bit if the password buffer is
|
|
||||||
* empty. */
|
|
||||||
if (unlock_indicator) {
|
|
||||||
START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb);
|
|
||||||
unlock_state = STATE_BACKSPACE_ACTIVE;
|
|
||||||
redraw_screen();
|
|
||||||
unlock_state = STATE_KEY_PRESSED;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void discard_passwd_cb(EV_P_ ev_timer *w, int revents) {
|
static void discard_passwd_cb(EV_P_ ev_timer *w, int revents) {
|
||||||
|
@ -242,6 +232,7 @@ static void discard_passwd_cb(EV_P_ ev_timer *w, int revents) {
|
||||||
static void input_done(void) {
|
static void input_done(void) {
|
||||||
STOP_TIMER(clear_pam_wrong_timeout);
|
STOP_TIMER(clear_pam_wrong_timeout);
|
||||||
pam_state = STATE_PAM_VERIFY;
|
pam_state = STATE_PAM_VERIFY;
|
||||||
|
unlock_state = STATE_STARTED;
|
||||||
redraw_screen();
|
redraw_screen();
|
||||||
|
|
||||||
if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) {
|
if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) {
|
||||||
|
@ -398,17 +389,23 @@ static void handle_key_press(xcb_key_press_event_t *event) {
|
||||||
|
|
||||||
switch (ksym) {
|
switch (ksym) {
|
||||||
case XKB_KEY_u:
|
case XKB_KEY_u:
|
||||||
if (ctrl) {
|
case XKB_KEY_Escape:
|
||||||
|
if ((ksym == XKB_KEY_u && ctrl) ||
|
||||||
|
ksym == XKB_KEY_Escape) {
|
||||||
DEBUG("C-u pressed\n");
|
DEBUG("C-u pressed\n");
|
||||||
clear_input();
|
clear_input();
|
||||||
|
/* Hide the unlock indicator after a bit if the password buffer is
|
||||||
|
* empty. */
|
||||||
|
if (unlock_indicator) {
|
||||||
|
START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb);
|
||||||
|
unlock_state = STATE_BACKSPACE_ACTIVE;
|
||||||
|
redraw_screen();
|
||||||
|
unlock_state = STATE_KEY_PRESSED;
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case XKB_KEY_Escape:
|
|
||||||
clear_input();
|
|
||||||
return;
|
|
||||||
|
|
||||||
case XKB_KEY_Delete:
|
case XKB_KEY_Delete:
|
||||||
case XKB_KEY_KP_Delete:
|
case XKB_KEY_KP_Delete:
|
||||||
/* Deleting forward doesn’t make sense, as i3lock doesn’t allow you
|
/* Deleting forward doesn’t make sense, as i3lock doesn’t allow you
|
||||||
|
|
|
@ -140,7 +140,8 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
|
||||||
cairo_fill(xcb_ctx);
|
cairo_fill(xcb_ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unlock_state >= STATE_KEY_PRESSED && unlock_indicator) {
|
if (unlock_indicator &&
|
||||||
|
(unlock_state >= STATE_KEY_PRESSED || pam_state > STATE_PAM_IDLE)) {
|
||||||
cairo_scale(ctx, scaling_factor(), scaling_factor());
|
cairo_scale(ctx, scaling_factor(), scaling_factor());
|
||||||
/* Draw a (centered) circle with transparent background. */
|
/* Draw a (centered) circle with transparent background. */
|
||||||
cairo_set_line_width(ctx, 10.0);
|
cairo_set_line_width(ctx, 10.0);
|
||||||
|
@ -322,6 +323,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
void redraw_screen(void) {
|
void redraw_screen(void) {
|
||||||
|
DEBUG("redraw_screen(unlock_state = %d, pam_state = %d)\n", unlock_state, pam_state);
|
||||||
xcb_pixmap_t bg_pixmap = draw_image(last_resolution);
|
xcb_pixmap_t bg_pixmap = draw_image(last_resolution);
|
||||||
xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){bg_pixmap});
|
xcb_change_window_attributes(conn, win, XCB_CW_BACK_PIXMAP, (uint32_t[1]){bg_pixmap});
|
||||||
/* XXX: Possible optimization: Only update the area in the middle of the
|
/* XXX: Possible optimization: Only update the area in the middle of the
|
||||||
|
|
Loading…
Reference in New Issue