X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=unlock_indicator.c;h=4c7d0e90503cfd7a2c5657420e56453a597e0298;hb=5b4d45a8aff1dacaad364ae6df70c3a6a5067701;hp=8834f0012d58906eae8b3937de9161ac956e1f41;hpb=a9ecf1e0c9063594ff9c4a782b4181788e4374a8;p=i3%2Fi3lock diff --git a/unlock_indicator.c b/unlock_indicator.c index 8834f00..4c7d0e9 100644 --- a/unlock_indicator.c +++ b/unlock_indicator.c @@ -1,7 +1,7 @@ /* * vim:ts=4:sw=4:expandtab * - * © 2010-2014 Michael Stapelberg + * © 2010 Michael Stapelberg * * See LICENSE for licensing information * @@ -45,9 +45,8 @@ extern uint32_t last_resolution[2]; /* Whether the unlock indicator is enabled (defaults to true). */ extern bool unlock_indicator; -/* Whether the capslock and numlock mods are active or not. */ -extern bool capslock_active; -extern bool numlock_active; +/* List of pressed modifiers, or NULL if none are pressed. */ +extern char *modifier_string; /* A Cairo surface containing the specified image (-i), if any. */ extern cairo_surface_t *img; @@ -79,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 +140,8 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_fill(xcb_ctx); } - if (unlock_state >= STATE_KEY_PRESSED && unlock_indicator) { + if (unlock_indicator && + (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,11 +154,13 @@ 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: + 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; default: @@ -167,14 +169,16 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { } cairo_fill_preserve(ctx); - switch (pam_state) { - case STATE_PAM_VERIFY: + 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; } @@ -199,14 +203,21 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { char buf[4]; 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_WRONG: + case STATE_AUTH_LOCK: + text = "locking…"; + break; + case STATE_AUTH_WRONG: text = "wrong!"; break; + case STATE_I3LOCK_LOCK_FAILED: + text = "lock failed!"; + break; default: if (show_failed_attempts && failed_attempts > 0) { if (failed_attempts > 999) { @@ -234,27 +245,19 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_close_path(ctx); } - if (pam_state == STATE_PAM_WRONG && (capslock_active || numlock_active)) { + if (auth_state == STATE_AUTH_WRONG && (modifier_string != NULL)) { cairo_text_extents_t extents; double x, y; - char *lock_text = NULL; - if (asprintf(&lock_text, "%s%s%s locked", - capslock_active ? "Caps" : "", - capslock_active && numlock_active ? ", " : "", - numlock_active ? "Num" : "") != -1) { - cairo_set_font_size(ctx, 14.0); + cairo_set_font_size(ctx, 14.0); - cairo_text_extents(ctx, lock_text, &extents); - x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing); - y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing) + 28.0; - - cairo_move_to(ctx, x, y); - cairo_show_text(ctx, lock_text); - cairo_close_path(ctx); + cairo_text_extents(ctx, modifier_string, &extents); + x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing); + y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing) + 28.0; - free(lock_text); - } + cairo_move_to(ctx, x, y); + cairo_show_text(ctx, modifier_string); + cairo_close_path(ctx); } /* After the user pressed any valid key or the backspace key, we @@ -293,8 +296,8 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { BUTTON_CENTER /* x */, BUTTON_CENTER /* y */, BUTTON_RADIUS /* radius */, - highlight_start + (M_PI / 3.0) /* start */, - (highlight_start + (M_PI / 3.0)) + (M_PI / 128.0) /* end */); + (highlight_start + (M_PI / 3.0)) - (M_PI / 128.0) /* start */, + highlight_start + (M_PI / 3.0) /* end */); cairo_stroke(ctx); } } @@ -331,6 +334,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { * */ void redraw_screen(void) { + 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