From a9ecf1e0c9063594ff9c4a782b4181788e4374a8 Mon Sep 17 00:00:00 2001 From: Alexandre Boeglin Date: Wed, 11 Feb 2015 20:52:07 +0100 Subject: [PATCH 1/2] Add capslock and numlock indicators When the unlock indicator warns the user that a password was typed wrong, it now also reports the state of the capslock and numlock modifiers. Signed-off-by: Alexandre Boeglin --- i3lock.c | 9 ++++++++- unlock_indicator.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/i3lock.c b/i3lock.c index d971f0d..4c52e30 100644 --- a/i3lock.c +++ b/i3lock.c @@ -59,6 +59,8 @@ static bool beep = false; bool debug_mode = false; static bool dpms = false; bool unlock_indicator = true; +bool capslock_active = false; +bool numlock_active = false; static bool dont_fork = false; struct ev_loop *main_loop; static struct ev_timer *clear_pam_wrong_timeout; @@ -277,6 +279,11 @@ static void input_done(void) { if (debug_mode) fprintf(stderr, "Authentication failure\n"); + /* Get state of Caps and Num lock modifiers, to be displayed in + * STATE_PAM_WRONG state */ + capslock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_EFFECTIVE); + numlock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_NUM, XKB_STATE_MODS_EFFECTIVE); + pam_state = STATE_PAM_WRONG; failed_attempts += 1; clear_input(); @@ -327,7 +334,7 @@ static void handle_key_press(xcb_key_press_event_t *event) { bool composed = false; ksym = xkb_state_key_get_one_sym(xkb_state, event->detail); - ctrl = xkb_state_mod_name_is_active(xkb_state, "Control", XKB_STATE_MODS_DEPRESSED); + ctrl = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_CTRL, XKB_STATE_MODS_DEPRESSED); /* The buffer will be null-terminated, so n >= 2 for 1 actual character. */ memset(buffer, '\0', sizeof(buffer)); diff --git a/unlock_indicator.c b/unlock_indicator.c index f1cdfb4..8834f00 100644 --- a/unlock_indicator.c +++ b/unlock_indicator.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,10 @@ 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; + /* A Cairo surface containing the specified image (-i), if any. */ extern cairo_surface_t *img; @@ -229,6 +234,29 @@ xcb_pixmap_t draw_image(uint32_t *resolution) { cairo_close_path(ctx); } + if (pam_state == STATE_PAM_WRONG && (capslock_active || numlock_active)) { + 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_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); + + free(lock_text); + } + } + /* After the user pressed any valid key or the backspace key, we * highlight a random part of the unlock indicator to confirm this * keypress. */ From b4f6dae10e82aa95e5e8ae84a07520d3fec0057e Mon Sep 17 00:00:00 2001 From: Deiz Date: Thu, 26 Mar 2015 03:06:18 -0400 Subject: [PATCH 2/2] List generic pressed modifiers on failure --- i3lock.c | 43 +++++++++++++++++++++++++++++++++++++++---- unlock_indicator.c | 29 ++++++++++------------------- 2 files changed, 49 insertions(+), 23 deletions(-) diff --git a/i3lock.c b/i3lock.c index 4c52e30..bd2e138 100644 --- a/i3lock.c +++ b/i3lock.c @@ -59,8 +59,7 @@ static bool beep = false; bool debug_mode = false; static bool dpms = false; bool unlock_indicator = true; -bool capslock_active = false; -bool numlock_active = false; +char *modifier_string = NULL; static bool dont_fork = false; struct ev_loop *main_loop; static struct ev_timer *clear_pam_wrong_timeout; @@ -219,6 +218,12 @@ static void clear_pam_wrong(EV_P_ ev_timer *w, int revents) { unlock_state = STATE_STARTED; redraw_screen(); + /* Clear modifier string. */ + if (modifier_string != NULL) { + free(modifier_string); + modifier_string = NULL; + } + /* Now free this timeout. */ STOP_TIMER(clear_pam_wrong_timeout); } @@ -281,8 +286,38 @@ static void input_done(void) { /* Get state of Caps and Num lock modifiers, to be displayed in * STATE_PAM_WRONG state */ - capslock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_EFFECTIVE); - numlock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_NUM, XKB_STATE_MODS_EFFECTIVE); + xkb_mod_index_t idx, num_mods; + const char *mod_name; + + num_mods = xkb_keymap_num_mods(xkb_keymap); + + for (idx = 0; idx < num_mods; idx++) { + if (!xkb_state_mod_index_is_active(xkb_state, idx, XKB_STATE_MODS_EFFECTIVE)) + continue; + + mod_name = xkb_keymap_mod_get_name(xkb_keymap, idx); + if (mod_name == NULL) + continue; + + /* Replace certain xkb names with nicer, human-readable ones. */ + if (strcmp(mod_name, XKB_MOD_NAME_CAPS) == 0) + mod_name = "Caps Lock"; + else if (strcmp(mod_name, XKB_MOD_NAME_ALT) == 0) + mod_name = "Alt"; + else if (strcmp(mod_name, XKB_MOD_NAME_NUM) == 0) + mod_name = "Num Lock"; + else if (strcmp(mod_name, XKB_MOD_NAME_LOGO) == 0) + mod_name = "Win"; + + char *tmp; + if (modifier_string == NULL) { + if (asprintf(&tmp, "%s", mod_name) != -1) + modifier_string = tmp; + } else if (asprintf(&tmp, "%s, %s", modifier_string, mod_name) != -1) { + free(modifier_string); + modifier_string = tmp; + } + } pam_state = STATE_PAM_WRONG; failed_attempts += 1; 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_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, lock_text); - cairo_close_path(ctx); - - 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