/*
* vim:ts=4:sw=4:expandtab
*
- * © 2010-2014 Michael Stapelberg
+ * © 2010 Michael Stapelberg
*
* See LICENSE for licensing information
*
/* 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;
cairo_fill(xcb_ctx);
}
- if (unlock_state >= STATE_KEY_PRESSED && unlock_indicator) {
+ if (unlock_indicator &&
+ (unlock_state >= STATE_KEY_PRESSED || pam_state > STATE_PAM_IDLE)) {
cairo_scale(ctx, scaling_factor(), scaling_factor());
/* Draw a (centered) circle with transparent background. */
cairo_set_line_width(ctx, 10.0);
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
*
*/
void redraw_screen(void) {
+ DEBUG("redraw_screen(unlock_state = %d, pam_state = %d)\n", unlock_state, pam_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});
/* XXX: Possible optimization: Only update the area in the middle of the