X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3lock;a=blobdiff_plain;f=unlock_indicator.c;h=8ff8173c333334d03291bd6416a1b431c41ab3dc;hp=ac7db09dbfaf55f68f8482221cdd24c886a59748;hb=HEAD;hpb=6191590e5c207803df211b74a714daf92c69c28f diff --git a/unlock_indicator.c b/unlock_indicator.c index ac7db09..8ff8173 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 @@ -18,7 +19,8 @@ #include "i3lock.h" #include "xcb.h" #include "unlock_indicator.h" -#include "xinerama.h" +#include "randr.h" +#include "dpi.h" #define BUTTON_RADIUS 90 #define BUTTON_SPACE (BUTTON_RADIUS + 5) @@ -44,6 +46,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; @@ -52,6 +57,11 @@ extern bool tile; /* The background color to use (in hex). */ extern char color[7]; +/* Whether the failed attempts should be displayed. */ +extern bool show_failed_attempts; +/* Number of failed unlock attempts. */ +extern int failed_attempts; + /******************************************************************************* * Variables defined in xcb.c. ******************************************************************************/ @@ -69,18 +79,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; - -/* - * Returns the scaling factor of the current screen. E.g., on a 227 DPI MacBook - * Pro 13" Retina screen, the scaling factor is 227/96 = 2.36. - * - */ -static double scaling_factor(void) { - const int dpi = (double)screen->height_in_pixels * 25.4 / - (double)screen->height_in_millimeters; - return (dpi / 96.0); -} +auth_state_t auth_state; /* * Draws global image with fill color onto a pixmap with the given @@ -89,9 +88,10 @@ static double scaling_factor(void) { */ xcb_pixmap_t draw_image(uint32_t *resolution) { xcb_pixmap_t bg_pixmap = XCB_NONE; - int button_diameter_physical = ceil(scaling_factor() * BUTTON_DIAMETER); + const double scaling_factor = get_dpi_value() / 96.0; + int button_diameter_physical = ceil(scaling_factor * BUTTON_DIAMETER); DEBUG("scaling_factor is %.f, physical diameter is %d px\n", - scaling_factor(), button_diameter_physical); + scaling_factor, button_diameter_physical); if (!vistype) vistype = get_root_visual_type(screen); @@ -131,8 +131,9 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_fill(xcb_ctx); } - if (unlock_state >= STATE_KEY_PRESSED && unlock_indicator) { - cairo_scale(ctx, scaling_factor(), scaling_factor()); + 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); cairo_arc(ctx, @@ -144,28 +145,41 @@ 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: + if (unlock_state == STATE_NOTHING_TO_DELETE) { + cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75); + break; + } cairo_set_source_rgba(ctx, 0, 0, 0, 0.75); break; } 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: + if (unlock_state == STATE_NOTHING_TO_DELETE) { + cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0); + break; + } + + cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0); break; } cairo_stroke(ctx); @@ -185,14 +199,39 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { /* Display a (centered) text of the current PAM state. */ char *text = NULL; - switch (pam_state) { - case STATE_PAM_VERIFY: - text = "verifying…"; + /* We don't want to show more than a 3-digit number. */ + 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 (auth_state) { + case STATE_AUTH_VERIFY: + text = "Verifying…"; + break; + case STATE_AUTH_LOCK: + text = "Locking…"; + break; + case STATE_AUTH_WRONG: + text = "Wrong!"; break; - case STATE_PAM_WRONG: - text = "wrong!"; + case STATE_I3LOCK_LOCK_FAILED: + text = "Lock failed!"; break; default: + if (unlock_state == STATE_NOTHING_TO_DELETE) { + text = "No input"; + } + if (show_failed_attempts && failed_attempts > 0) { + if (failed_attempts > 999) { + text = "> 999"; + } else { + snprintf(buf, sizeof(buf), "%d", failed_attempts); + text = buf; + } + cairo_set_source_rgb(ctx, 1, 0, 0); + cairo_set_font_size(ctx, 32.0); + } break; } @@ -200,9 +239,6 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_text_extents_t extents; double x, y; - cairo_set_source_rgb(ctx, 0, 0, 0); - cairo_set_font_size(ctx, 28.0); - cairo_text_extents(ctx, text, &extents); x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing); y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing); @@ -212,6 +248,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. */ @@ -227,10 +278,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); @@ -248,8 +299,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); } } @@ -286,8 +337,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]); @@ -303,6 +355,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(); }