diff options
Diffstat (limited to 'unlock_indicator.c')
-rw-r--r-- | unlock_indicator.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/unlock_indicator.c b/unlock_indicator.c index ddad957..4c7d0e9 100644 --- a/unlock_indicator.c +++ b/unlock_indicator.c @@ -78,7 +78,7 @@ static xcb_visualtype_t *vistype; /* Maintain the current unlock/PAM state to draw the appropriate unlock * indicator. */ unlock_state_t unlock_state; -pam_state_t pam_state; +auth_state_t auth_state; /* * Returns the scaling factor of the current screen. E.g., on a 227 DPI MacBook @@ -141,7 +141,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { } if (unlock_indicator && - (unlock_state >= STATE_KEY_PRESSED || pam_state > STATE_PAM_IDLE)) { + (unlock_state >= STATE_KEY_PRESSED || auth_state > STATE_AUTH_IDLE)) { cairo_scale(ctx, scaling_factor(), scaling_factor()); /* Draw a (centered) circle with transparent background. */ cairo_set_line_width(ctx, 10.0); @@ -154,12 +154,12 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { /* Use the appropriate color for the different PAM states * (currently verifying, wrong password, or default) */ - switch (pam_state) { - case STATE_PAM_VERIFY: - case STATE_PAM_LOCK: + switch (auth_state) { + case STATE_AUTH_VERIFY: + case STATE_AUTH_LOCK: cairo_set_source_rgba(ctx, 0, 114.0 / 255, 255.0 / 255, 0.75); break; - case STATE_PAM_WRONG: + case STATE_AUTH_WRONG: case STATE_I3LOCK_LOCK_FAILED: cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75); break; @@ -169,16 +169,16 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { } cairo_fill_preserve(ctx); - switch (pam_state) { - case STATE_PAM_VERIFY: - case STATE_PAM_LOCK: + switch (auth_state) { + case STATE_AUTH_VERIFY: + case STATE_AUTH_LOCK: cairo_set_source_rgb(ctx, 51.0 / 255, 0, 250.0 / 255); break; - case STATE_PAM_WRONG: + case STATE_AUTH_WRONG: case STATE_I3LOCK_LOCK_FAILED: cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0); break; - case STATE_PAM_IDLE: + case STATE_AUTH_IDLE: cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0); break; } @@ -205,14 +205,14 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_set_source_rgb(ctx, 0, 0, 0); cairo_select_font_face(ctx, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); cairo_set_font_size(ctx, 28.0); - switch (pam_state) { - case STATE_PAM_VERIFY: + switch (auth_state) { + case STATE_AUTH_VERIFY: text = "verifying…"; break; - case STATE_PAM_LOCK: + case STATE_AUTH_LOCK: text = "locking…"; break; - case STATE_PAM_WRONG: + case STATE_AUTH_WRONG: text = "wrong!"; break; case STATE_I3LOCK_LOCK_FAILED: @@ -245,7 +245,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_close_path(ctx); } - if (pam_state == STATE_PAM_WRONG && (modifier_string != NULL)) { + if (auth_state == STATE_AUTH_WRONG && (modifier_string != NULL)) { cairo_text_extents_t extents; double x, y; @@ -334,7 +334,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { * */ void redraw_screen(void) { - DEBUG("redraw_screen(unlock_state = %d, pam_state = %d)\n", unlock_state, pam_state); + DEBUG("redraw_screen(unlock_state = %d, auth_state = %d)\n", unlock_state, auth_state); xcb_pixmap_t bg_pixmap = draw_image(last_resolution); 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 |