diff options
author | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2015-03-29 22:59:39 +0200 |
---|---|---|
committer | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2015-03-29 22:59:39 +0200 |
commit | cb1b06f351c8b7225fd8115b468ddd270f0adb7e (patch) | |
tree | e442a97b150c497eac88a83ae03a0167995ee123 /unlock_indicator.c | |
parent | fe99346fb15c79fff43033e8295ac6c83ff6ab15 (diff) | |
parent | b4f6dae10e82aa95e5e8ae84a07520d3fec0057e (diff) |
Merge pull request #10 from Deiz/modifiers
List generic pressed modifiers on failure
Diffstat (limited to 'unlock_indicator.c')
-rw-r--r-- | unlock_indicator.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/unlock_indicator.c b/unlock_indicator.c index f1cdfb4..c2eeafd 100644 --- a/unlock_indicator.c +++ b/unlock_indicator.c @@ -9,6 +9,7 @@ #include <stdbool.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> #include <math.h> #include <xcb/xcb.h> #include <ev.h> @@ -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; @@ -229,6 +233,21 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_close_path(ctx); } + if (pam_state == STATE_PAM_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. */ |