/*
* vim:ts=4:sw=4:expandtab
*
- * © 2010-2012 Michael Stapelberg
+ * © 2010 Michael Stapelberg
*
* See LICENSE for licensing information
*
*/
#include <stdbool.h>
#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
#include <math.h>
#include <xcb/xcb.h>
#include <ev.h>
-
-#ifndef NOLIBCAIRO
#include <cairo.h>
#include <cairo/cairo-xcb.h>
-#endif
+#include "i3lock.h"
#include "xcb.h"
#include "unlock_indicator.h"
#include "xinerama.h"
* Variables defined in i3lock.c.
******************************************************************************/
+extern bool debug_mode;
+
/* The current position in the input buffer. Useful to determine if any
* characters of the password have already been entered or not. */
int input_position;
-/* The ev main loop. */
-struct ev_loop *main_loop;
-
/* The lock window. */
extern xcb_window_t win;
/* Whether the unlock indicator is enabled (defaults to true). */
extern bool unlock_indicator;
-#ifndef NOLIBCAIRO
+/* 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;
-#endif
/* Whether the image should be tiled. */
extern bool tile;
/* The background color to use (in hex). */
extern char color[7];
+/* Whether the failed attempts should be displayed. */
+extern bool show_failed_attempts;
+/* Number of failed unlock attempts. */
+extern int failed_attempts;
+
/*******************************************************************************
- * Local variables.
+ * Variables defined in xcb.c.
******************************************************************************/
-static struct ev_timer *clear_indicator_timeout;
+/* The root screen, to determine the DPI. */
+extern xcb_screen_t *screen;
+
+/*******************************************************************************
+ * Local variables.
+ ******************************************************************************/
/* Cache the screen’s visual, necessary for creating a Cairo context. */
static xcb_visualtype_t *vistype;
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);
+}
+
/*
* Draws global image with fill color onto a pixmap with the given
* resolution and returns it.
*/
xcb_pixmap_t draw_image(uint32_t *resolution) {
xcb_pixmap_t bg_pixmap = XCB_NONE;
+ 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);
-#ifndef NOLIBCAIRO
if (!vistype)
vistype = get_root_visual_type(screen);
bg_pixmap = create_bg_pixmap(conn, screen, resolution, color);
/* Initialize cairo: Create one in-memory surface to render the unlock
* indicator on, create one XCB surface to actually draw (one or more,
* depending on the amount of screens) unlock indicators on. */
- cairo_surface_t *output = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, BUTTON_DIAMETER, BUTTON_DIAMETER);
+ cairo_surface_t *output = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, button_diameter_physical, button_diameter_physical);
cairo_t *ctx = cairo_create(output);
cairo_surface_t *xcb_output = cairo_xcb_surface_create(conn, bg_pixmap, vistype, resolution[0], resolution[1]);
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_arc(ctx,
* (currently verifying, wrong password, or default) */
switch (pam_state) {
case STATE_PAM_VERIFY:
- cairo_set_source_rgba(ctx, 0, 114.0/255, 255.0/255, 0.75);
+ case STATE_PAM_LOCK:
+ cairo_set_source_rgba(ctx, 0, 114.0 / 255, 255.0 / 255, 0.75);
break;
case STATE_PAM_WRONG:
- cairo_set_source_rgba(ctx, 250.0/255, 0, 0, 0.75);
+ case STATE_I3LOCK_LOCK_FAILED:
+ cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75);
break;
default:
cairo_set_source_rgba(ctx, 0, 0, 0, 0.75);
switch (pam_state) {
case STATE_PAM_VERIFY:
- cairo_set_source_rgb(ctx, 51.0/255, 0, 250.0/255);
+ case STATE_PAM_LOCK:
+ cairo_set_source_rgb(ctx, 51.0 / 255, 0, 250.0 / 255);
break;
case STATE_PAM_WRONG:
- cairo_set_source_rgb(ctx, 125.0/255, 51.0/255, 0);
+ case STATE_I3LOCK_LOCK_FAILED:
+ cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0);
break;
case STATE_PAM_IDLE:
- cairo_set_source_rgb(ctx, 51.0/255, 125.0/255, 0);
+ cairo_set_source_rgb(ctx, 51.0 / 255, 125.0 / 255, 0);
break;
}
cairo_stroke(ctx);
/* Display a (centered) text of the current PAM state. */
char *text = NULL;
+ /* We don't want to show more than a 3-digit number. */
+ 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…";
break;
+ case STATE_PAM_LOCK:
+ text = "locking…";
+ break;
case STATE_PAM_WRONG:
text = "wrong!";
break;
+ case STATE_I3LOCK_LOCK_FAILED:
+ text = "lock failed!";
+ break;
default:
+ if (show_failed_attempts && failed_attempts > 0) {
+ if (failed_attempts > 999) {
+ text = "> 999";
+ } else {
+ snprintf(buf, sizeof(buf), "%d", failed_attempts);
+ text = buf;
+ }
+ cairo_set_source_rgb(ctx, 1, 0, 0);
+ cairo_set_font_size(ctx, 32.0);
+ }
break;
}
cairo_text_extents_t extents;
double x, y;
- cairo_set_source_rgb(ctx, 0, 0, 0);
- cairo_set_font_size(ctx, 28.0);
-
cairo_text_extents(ctx, text, &extents);
x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing);
y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing);
cairo_close_path(ctx);
}
+ if (pam_state == STATE_PAM_WRONG && (modifier_string != NULL)) {
+ cairo_text_extents_t extents;
+ double x, y;
+
+ cairo_set_font_size(ctx, 14.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, modifier_string);
+ cairo_close_path(ctx);
+ }
+
/* After the user pressed any valid key or the backspace key, we
* highlight a random part of the unlock indicator to confirm this
* keypress. */
highlight_start + (M_PI / 3.0));
if (unlock_state == STATE_KEY_ACTIVE) {
/* For normal keys, we use a lighter green. */
- cairo_set_source_rgb(ctx, 51.0/255, 219.0/255, 0);
+ cairo_set_source_rgb(ctx, 51.0 / 255, 219.0 / 255, 0);
} else {
/* For backspace, we use red. */
- cairo_set_source_rgb(ctx, 219.0/255, 51.0/255, 0);
+ cairo_set_source_rgb(ctx, 219.0 / 255, 51.0 / 255, 0);
}
cairo_stroke(ctx);
if (xr_screens > 0) {
/* Composite the unlock indicator in the middle of each screen. */
for (int screen = 0; screen < xr_screens; screen++) {
- int x = (xr_resolutions[screen].x + ((xr_resolutions[screen].width / 2) - (BUTTON_DIAMETER / 2)));
- int y = (xr_resolutions[screen].y + ((xr_resolutions[screen].height / 2) - (BUTTON_DIAMETER / 2)));
+ int x = (xr_resolutions[screen].x + ((xr_resolutions[screen].width / 2) - (button_diameter_physical / 2)));
+ int y = (xr_resolutions[screen].y + ((xr_resolutions[screen].height / 2) - (button_diameter_physical / 2)));
cairo_set_source_surface(xcb_ctx, output, x, y);
- cairo_rectangle(xcb_ctx, x, y, BUTTON_DIAMETER, BUTTON_DIAMETER);
+ cairo_rectangle(xcb_ctx, x, y, button_diameter_physical, button_diameter_physical);
cairo_fill(xcb_ctx);
}
} else {
/* We have no information about the screen sizes/positions, so we just
* place the unlock indicator in the middle of the X root window and
* hope for the best. */
- int x = (last_resolution[0] / 2);
- int y = (last_resolution[1] / 2);
+ int x = (last_resolution[0] / 2) - (button_diameter_physical / 2);
+ int y = (last_resolution[1] / 2) - (button_diameter_physical / 2);
cairo_set_source_surface(xcb_ctx, output, x, y);
- cairo_rectangle(xcb_ctx, x, y, BUTTON_DIAMETER, BUTTON_DIAMETER);
+ cairo_rectangle(xcb_ctx, x, y, button_diameter_physical, button_diameter_physical);
cairo_fill(xcb_ctx);
}
cairo_surface_destroy(output);
cairo_destroy(ctx);
cairo_destroy(xcb_ctx);
-#endif
return bg_pixmap;
}
*
*/
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 });
+ 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
* screen instead of the whole screen. */
xcb_clear_area(conn, 0, win, 0, 0, last_resolution[0], last_resolution[1]);
* password buffer.
*
*/
-static void clear_indicator(EV_P_ ev_timer *w, int revents) {
+void clear_indicator(void) {
if (input_position == 0) {
unlock_state = STATE_STARTED;
- } else unlock_state = STATE_KEY_PRESSED;
+ } else
+ unlock_state = STATE_KEY_PRESSED;
redraw_screen();
-
- ev_timer_stop(main_loop, clear_indicator_timeout);
- free(clear_indicator_timeout);
- clear_indicator_timeout = NULL;
-}
-
-/*
- * (Re-)starts the clear_indicator timeout. Called after pressing backspace or
- * after an unsuccessful authentication attempt.
- *
- */
-void start_clear_indicator_timeout(void) {
- if (clear_indicator_timeout) {
- ev_timer_stop(main_loop, clear_indicator_timeout);
- ev_timer_set(clear_indicator_timeout, 1.0, 0.);
- ev_timer_start(main_loop, clear_indicator_timeout);
- } else {
- /* When there is no memory, we just don’t have a timeout. We cannot
- * exit() here, since that would effectively unlock the screen. */
- if (!(clear_indicator_timeout = calloc(sizeof(struct ev_timer), 1)))
- return;
- ev_timer_init(clear_indicator_timeout, clear_indicator, 1.0, 0.);
- ev_timer_start(main_loop, clear_indicator_timeout);
- }
-}
-
-/*
- * Stops the clear_indicator timeout.
- *
- */
-void stop_clear_indicator_timeout(void) {
- if (clear_indicator_timeout) {
- ev_timer_stop(main_loop, clear_indicator_timeout);
- free(clear_indicator_timeout);
- clear_indicator_timeout = NULL;
- }
}
projects / i3 / i3lock / blobdiff