commit d2130092cf588c02d7a0e74c0de85dc261b6823b
parent 1c97a8484723b7db6c96c3b7bfa4c86c26f47b5a
Author: eplanet <emeric.planet@gmail.com>
Date: Tue, 11 Oct 2016 22:40:51 +0200
Display error message when locking failed (#99)
To give a feedback for when the pointer couldn't be grabbed,
displaying an error message before exiting.
Diffstat:
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/unlock_indicator.c b/unlock_indicator.c
@@ -160,6 +160,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
cairo_set_source_rgba(ctx, 0, 114.0 / 255, 255.0 / 255, 0.75);
break;
case STATE_PAM_WRONG:
+ case STATE_I3LOCK_LOCK_FAILED:
cairo_set_source_rgba(ctx, 250.0 / 255, 0, 0, 0.75);
break;
default:
@@ -174,6 +175,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
cairo_set_source_rgb(ctx, 51.0 / 255, 0, 250.0 / 255);
break;
case STATE_PAM_WRONG:
+ case STATE_I3LOCK_LOCK_FAILED:
cairo_set_source_rgb(ctx, 125.0 / 255, 51.0 / 255, 0);
break;
case STATE_PAM_IDLE:
@@ -213,6 +215,9 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
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) {
diff --git a/unlock_indicator.h b/unlock_indicator.h
@@ -11,10 +11,11 @@ typedef enum {
} unlock_state_t;
typedef enum {
- STATE_PAM_IDLE = 0, /* no PAM interaction at the moment */
- STATE_PAM_VERIFY = 1, /* currently verifying the password via PAM */
- STATE_PAM_LOCK = 2, /* currently locking the screen */
- STATE_PAM_WRONG = 3 /* the password was wrong */
+ STATE_PAM_IDLE = 0, /* no PAM interaction at the moment */
+ STATE_PAM_VERIFY = 1, /* currently verifying the password via PAM */
+ STATE_PAM_LOCK = 2, /* currently locking the screen */
+ STATE_PAM_WRONG = 3, /* the password was wrong */
+ STATE_I3LOCK_LOCK_FAILED = 4 /* i3lock failed to load */
} pam_state_t;
xcb_pixmap_t draw_image(uint32_t* resolution);
diff --git a/xcb.c b/xcb.c
@@ -23,6 +23,8 @@
#include "cursors.h"
#include "unlock_indicator.h"
+extern pam_state_t pam_state;
+
xcb_connection_t *conn;
xcb_screen_t *screen;
@@ -160,7 +162,7 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c
}
/*
- * Repeatedly tries to grab pointer and keyboard (up to 1000 times).
+ * Repeatedly tries to grab pointer and keyboard (up to 10000 times).
*
*/
void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb_cursor_t cursor) {
@@ -233,8 +235,14 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb
}
}
- if (tries <= 0)
+ /* After trying for 10000 times, i3lock will display an error message
+ * for 2 sec prior to terminate. */
+ if (tries <= 0) {
+ pam_state = STATE_I3LOCK_LOCK_FAILED;
+ redraw_screen();
+ sleep(1);
errx(EXIT_FAILURE, "Cannot grab pointer/keyboard");
+ }
}
xcb_cursor_t create_cursor(xcb_connection_t *conn, xcb_screen_t *screen, xcb_window_t win, int choice) {
