From b4c97bddf794122aa601f7dd4b0082ac465fecec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Fri, 24 Apr 2015 23:36:24 +0200 Subject: [PATCH] Only redraw the screen if the unlock indicator is actually used. fixes #12 --- i3lock.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/i3lock.c b/i3lock.c index 0909dd0..5d90924 100644 --- a/i3lock.c +++ b/i3lock.c @@ -240,10 +240,12 @@ static void clear_input(void) { /* Hide the unlock indicator after a bit if the password buffer is * empty. */ - START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); - unlock_state = STATE_BACKSPACE_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; + 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 turn_off_monitors_cb(EV_P_ ev_timer *w, int revents) { @@ -322,7 +324,8 @@ static void input_done(void) { pam_state = STATE_PAM_WRONG; failed_attempts += 1; clear_input(); - redraw_screen(); + if (unlock_indicator) + redraw_screen(); /* Clear this state after 2 seconds (unless the user enters another * password during that time). */ @@ -470,13 +473,16 @@ static void handle_key_press(xcb_key_press_event_t *event) { input_position += n - 1; DEBUG("current password = %.*s\n", input_position, password); - unlock_state = STATE_KEY_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; + if (unlock_indicator) { + unlock_state = STATE_KEY_ACTIVE; + redraw_screen(); + unlock_state = STATE_KEY_PRESSED; + + struct ev_timer *timeout = NULL; + START_TIMER(timeout, TSTAMP_N_SECS(0.25), redraw_timeout); + STOP_TIMER(clear_indicator_timeout); + } - struct ev_timer *timeout = NULL; - START_TIMER(timeout, TSTAMP_N_SECS(0.25), redraw_timeout); - STOP_TIMER(clear_indicator_timeout); START_TIMER(discard_passwd_timeout, TSTAMP_N_MINS(3), discard_passwd_cb); }