/* Maintain the current unlock/PAM state to draw the appropriate unlock
* indicator. */
unlock_state_t unlock_state;
-pam_state_t pam_state;
+auth_state_t auth_state;
/*
* Returns the scaling factor of the current screen. E.g., on a 227 DPI MacBook
cairo_fill(xcb_ctx);
}
- if (unlock_state >= STATE_KEY_PRESSED && unlock_indicator) {
+ 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);
/* 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:
}
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:
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:
+ switch (auth_state) {
+ case STATE_AUTH_VERIFY:
text = "verifying…";
break;
- case STATE_PAM_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 (show_failed_attempts && failed_attempts > 0) {
if (failed_attempts > 999) {
cairo_close_path(ctx);
}
- if (pam_state == STATE_PAM_WRONG && (modifier_string != NULL)) {
+ if (auth_state == STATE_AUTH_WRONG && (modifier_string != NULL)) {
cairo_text_extents_t extents;
double x, y;
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