X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=unlock_indicator.c;h=4c7d0e90503cfd7a2c5657420e56453a597e0298;hb=14667d8304382bb766ddbab5c58c2c81bfe16b6c;hp=e543f96a6c509666bf388e4cfb4943282ba2e786;hpb=0cbf483cb4a1597343df90642ac475b288ae9e80;p=i3%2Fi3lock diff --git a/unlock_indicator.c b/unlock_indicator.c index e543f96..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 * @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,9 @@ extern uint32_t last_resolution[2]; /* Whether the unlock indicator is enabled (defaults to true). */ extern bool unlock_indicator; +/* 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; @@ -74,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 @@ -136,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); @@ -149,12 +154,14 @@ 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: - cairo_set_source_rgba(ctx, 0, 114.0/255, 255.0/255, 0.75); + 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: - cairo_set_source_rgba(ctx, 250.0/255, 0, 0, 0.75); + case STATE_AUTH_WRONG: + case STATE_I3LOCK_LOCK_FAILED: + cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75); break; default: cairo_set_source_rgba(ctx, 0, 0, 0, 0.75); @@ -162,15 +169,17 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { } cairo_fill_preserve(ctx); - switch (pam_state) { - case STATE_PAM_VERIFY: - cairo_set_source_rgb(ctx, 51.0/255, 0, 250.0/255); + 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: - cairo_set_source_rgb(ctx, 125.0/255, 51.0/255, 0); + 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: - cairo_set_source_rgb(ctx, 51.0/255, 125.0/255, 0); + case STATE_AUTH_IDLE: + cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0); break; } cairo_stroke(ctx); @@ -194,16 +203,23 @@ 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 (show_failed_attempts && failed_attempts > 0) { if (failed_attempts > 999) { text = "> 999"; } else { @@ -229,6 +245,21 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_close_path(ctx); } + if (auth_state == STATE_AUTH_WRONG && (modifier_string != NULL)) { + cairo_text_extents_t extents; + double x, y; + + cairo_set_font_size(ctx, 14.0); + + 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; + + 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 * highlight a random part of the unlock indicator to confirm this * keypress. */ @@ -244,10 +275,10 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { highlight_start + (M_PI / 3.0)); if (unlock_state == STATE_KEY_ACTIVE) { /* For normal keys, we use a lighter green. */ - cairo_set_source_rgb(ctx, 51.0/255, 219.0/255, 0); + cairo_set_source_rgb(ctx, 51.0 / 255, 219.0 / 255, 0); } else { /* For backspace, we use red. */ - cairo_set_source_rgb(ctx, 219.0/255, 51.0/255, 0); + cairo_set_source_rgb(ctx, 219.0 / 255, 51.0 / 255, 0); } cairo_stroke(ctx); @@ -265,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); } } @@ -303,8 +334,9 @@ 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 }); + 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 * screen instead of the whole screen. */ xcb_clear_area(conn, 0, win, 0, 0, last_resolution[0], last_resolution[1]); @@ -320,6 +352,7 @@ void redraw_screen(void) { void clear_indicator(void) { if (input_position == 0) { unlock_state = STATE_STARTED; - } else unlock_state = STATE_KEY_PRESSED; + } else + unlock_state = STATE_KEY_PRESSED; redraw_screen(); }