/*
* vim:ts=4:sw=4:expandtab
*
- * © 2010-2014 Michael Stapelberg
+ * © 2010 Michael Stapelberg
*
* See LICENSE for licensing information
*
#include "i3lock.h"
#include "xcb.h"
#include "unlock_indicator.h"
-#include "xinerama.h"
+#include "randr.h"
+#include "dpi.h"
#define BUTTON_RADIUS 90
#define BUTTON_SPACE (BUTTON_RADIUS + 5)
/* 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;
/* Maintain the current unlock/PAM state to draw the appropriate unlock
* indicator. */
unlock_state_t unlock_state;
-pam_state_t pam_state;
-
-/*
- * Returns the scaling factor of the current screen. E.g., on a 227 DPI MacBook
- * Pro 13" Retina screen, the scaling factor is 227/96 = 2.36.
- *
- */
-static double scaling_factor(void) {
- const int dpi = (double)screen->height_in_pixels * 25.4 /
- (double)screen->height_in_millimeters;
- return (dpi / 96.0);
-}
+auth_state_t auth_state;
/*
* Draws global image with fill color onto a pixmap with the given
*/
xcb_pixmap_t draw_image(uint32_t *resolution) {
xcb_pixmap_t bg_pixmap = XCB_NONE;
- int button_diameter_physical = ceil(scaling_factor() * BUTTON_DIAMETER);
+ const double scaling_factor = get_dpi_value() / 96.0;
+ int button_diameter_physical = ceil(scaling_factor * BUTTON_DIAMETER);
DEBUG("scaling_factor is %.f, physical diameter is %d px\n",
- scaling_factor(), button_diameter_physical);
+ scaling_factor, button_diameter_physical);
if (!vistype)
vistype = get_root_visual_type(screen);
cairo_fill(xcb_ctx);
}
- if (unlock_state >= STATE_KEY_PRESSED && unlock_indicator) {
- cairo_scale(ctx, scaling_factor(), scaling_factor());
+ if (unlock_indicator &&
+ (unlock_state >= STATE_KEY_PRESSED || auth_state > STATE_AUTH_IDLE)) {
+ cairo_scale(ctx, scaling_factor, scaling_factor);
/* Draw a (centered) circle with transparent background. */
cairo_set_line_width(ctx, 10.0);
cairo_arc(ctx,
/* Use the appropriate color for the different PAM states
* (currently verifying, wrong password, or default) */
- switch (pam_state) {
- case STATE_PAM_VERIFY:
+ switch (auth_state) {
+ case STATE_AUTH_VERIFY:
+ case STATE_AUTH_LOCK:
cairo_set_source_rgba(ctx, 0, 114.0 / 255, 255.0 / 255, 0.75);
break;
- case STATE_PAM_WRONG:
+ case STATE_AUTH_WRONG:
+ case STATE_I3LOCK_LOCK_FAILED:
cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75);
break;
default:
+ if (unlock_state == STATE_NOTHING_TO_DELETE) {
+ cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75);
+ break;
+ }
cairo_set_source_rgba(ctx, 0, 0, 0, 0.75);
break;
}
cairo_fill_preserve(ctx);
- switch (pam_state) {
- case STATE_PAM_VERIFY:
+ switch (auth_state) {
+ case STATE_AUTH_VERIFY:
+ case STATE_AUTH_LOCK:
cairo_set_source_rgb(ctx, 51.0 / 255, 0, 250.0 / 255);
break;
- case STATE_PAM_WRONG:
+ case STATE_AUTH_WRONG:
+ case STATE_I3LOCK_LOCK_FAILED:
cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0);
break;
- case STATE_PAM_IDLE:
+ case STATE_AUTH_IDLE:
+ if (unlock_state == STATE_NOTHING_TO_DELETE) {
+ cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0);
+ break;
+ }
+
cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0);
break;
}
char buf[4];
cairo_set_source_rgb(ctx, 0, 0, 0);
+ cairo_select_font_face(ctx, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
cairo_set_font_size(ctx, 28.0);
- switch (pam_state) {
- case STATE_PAM_VERIFY:
- text = "verifying…";
+ switch (auth_state) {
+ case STATE_AUTH_VERIFY:
+ text = "Verifying…";
break;
- case STATE_PAM_WRONG:
- text = "wrong!";
+ case STATE_AUTH_LOCK:
+ text = "Locking…";
+ break;
+ case STATE_AUTH_WRONG:
+ text = "Wrong!";
+ break;
+ case STATE_I3LOCK_LOCK_FAILED:
+ text = "Lock failed!";
break;
default:
+ if (unlock_state == STATE_NOTHING_TO_DELETE) {
+ text = "No input";
+ }
if (show_failed_attempts && failed_attempts > 0) {
if (failed_attempts > 999) {
text = "> 999";
cairo_close_path(ctx);
}
- if (pam_state == STATE_PAM_WRONG && (capslock_active || numlock_active)) {
+ if (auth_state == STATE_AUTH_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_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_set_font_size(ctx, 14.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
BUTTON_CENTER /* x */,
BUTTON_CENTER /* y */,
BUTTON_RADIUS /* radius */,
- highlight_start + (M_PI / 3.0) /* start */,
- (highlight_start + (M_PI / 3.0)) + (M_PI / 128.0) /* end */);
+ (highlight_start + (M_PI / 3.0)) - (M_PI / 128.0) /* start */,
+ highlight_start + (M_PI / 3.0) /* end */);
cairo_stroke(ctx);
}
}
*
*/
void redraw_screen(void) {
+ DEBUG("redraw_screen(unlock_state = %d, auth_state = %d)\n", unlock_state, auth_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
projects / i3 / i3lock / blobdiff