diff options
| author | Deiz <silverwraithii@gmail.com> | 2015-03-26 03:06:18 -0400 |
|---|---|---|
| committer | Deiz <silverwraithii@gmail.com> | 2015-03-29 16:22:31 -0400 |
| commit | b4f6dae10e82aa95e5e8ae84a07520d3fec0057e (patch) | |
| tree | e442a97b150c497eac88a83ae03a0167995ee123 /unlock_indicator.c | |
| parent | a9ecf1e0c9063594ff9c4a782b4181788e4374a8 (diff) | |
List generic pressed modifiers on failure
Diffstat (limited to 'unlock_indicator.c')
| -rw-r--r-- | unlock_indicator.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/unlock_indicator.c b/unlock_indicator.c index 8834f00..c2eeafd 100644 --- a/unlock_indicator.c +++ b/unlock_indicator.c @@ -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; @@ -234,27 +233,19 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_close_path(ctx); } - if (pam_state == STATE_PAM_WRONG && (capslock_active || numlock_active)) { + if (pam_state == STATE_PAM_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 |