diff options
author | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2015-04-25 00:27:06 +0200 |
---|---|---|
committer | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2015-04-25 00:27:06 +0200 |
commit | 8a49effade98ff41bb5a34185c4cfd5590ab5483 (patch) | |
tree | e15d7237651e5da68419b95d46ebe47f6c6db196 | |
parent | 02f3d44dcf8114a3ac9e3b9dd45326ceb095a8e8 (diff) | |
parent | b4c97bddf794122aa601f7dd4b0082ac465fecec (diff) |
Merge pull request #13 from Airblader/feature-12
Only redraw the screen if the unlock indicator is actually used.
-rw-r--r-- | i3lock.c | 28 |
1 files changed, 17 insertions, 11 deletions
@@ -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); } |