mirror of https://github.com/i3/i3lock.git
List generic pressed modifiers on failure
parent
a9ecf1e0c9
commit
b4f6dae10e
43
i3lock.c
43
i3lock.c
|
@ -59,8 +59,7 @@ static bool beep = false;
|
||||||
bool debug_mode = false;
|
bool debug_mode = false;
|
||||||
static bool dpms = false;
|
static bool dpms = false;
|
||||||
bool unlock_indicator = true;
|
bool unlock_indicator = true;
|
||||||
bool capslock_active = false;
|
char *modifier_string = NULL;
|
||||||
bool numlock_active = false;
|
|
||||||
static bool dont_fork = false;
|
static bool dont_fork = false;
|
||||||
struct ev_loop *main_loop;
|
struct ev_loop *main_loop;
|
||||||
static struct ev_timer *clear_pam_wrong_timeout;
|
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;
|
unlock_state = STATE_STARTED;
|
||||||
redraw_screen();
|
redraw_screen();
|
||||||
|
|
||||||
|
/* Clear modifier string. */
|
||||||
|
if (modifier_string != NULL) {
|
||||||
|
free(modifier_string);
|
||||||
|
modifier_string = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/* Now free this timeout. */
|
/* Now free this timeout. */
|
||||||
STOP_TIMER(clear_pam_wrong_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
|
/* Get state of Caps and Num lock modifiers, to be displayed in
|
||||||
* STATE_PAM_WRONG state */
|
* STATE_PAM_WRONG state */
|
||||||
capslock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_EFFECTIVE);
|
xkb_mod_index_t idx, num_mods;
|
||||||
numlock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_NUM, XKB_STATE_MODS_EFFECTIVE);
|
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;
|
pam_state = STATE_PAM_WRONG;
|
||||||
failed_attempts += 1;
|
failed_attempts += 1;
|
||||||
|
|
|
@ -45,9 +45,8 @@ extern uint32_t last_resolution[2];
|
||||||
/* Whether the unlock indicator is enabled (defaults to true). */
|
/* Whether the unlock indicator is enabled (defaults to true). */
|
||||||
extern bool unlock_indicator;
|
extern bool unlock_indicator;
|
||||||
|
|
||||||
/* Whether the capslock and numlock mods are active or not. */
|
/* List of pressed modifiers, or NULL if none are pressed. */
|
||||||
extern bool capslock_active;
|
extern char *modifier_string;
|
||||||
extern bool numlock_active;
|
|
||||||
|
|
||||||
/* A Cairo surface containing the specified image (-i), if any. */
|
/* A Cairo surface containing the specified image (-i), if any. */
|
||||||
extern cairo_surface_t *img;
|
extern cairo_surface_t *img;
|
||||||
|
@ -234,27 +233,19 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
|
||||||
cairo_close_path(ctx);
|
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;
|
cairo_text_extents_t extents;
|
||||||
double x, y;
|
double x, y;
|
||||||
char *lock_text = NULL;
|
|
||||||
|
|
||||||
if (asprintf(&lock_text, "%s%s%s locked",
|
cairo_set_font_size(ctx, 14.0);
|
||||||
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);
|
cairo_text_extents(ctx, modifier_string, &extents);
|
||||||
x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing);
|
x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing);
|
||||||
y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing) + 28.0;
|
y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing) + 28.0;
|
||||||
|
|
||||||
cairo_move_to(ctx, x, y);
|
cairo_move_to(ctx, x, y);
|
||||||
cairo_show_text(ctx, lock_text);
|
cairo_show_text(ctx, modifier_string);
|
||||||
cairo_close_path(ctx);
|
cairo_close_path(ctx);
|
||||||
|
|
||||||
free(lock_text);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* After the user pressed any valid key or the backspace key, we
|
/* After the user pressed any valid key or the backspace key, we
|
||||||
|
|
Loading…
Reference in New Issue