upstream merge
This commit is contained in:
commit
970bdb5810
|
@ -261,9 +261,11 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
|
|||
* (currently verifying, wrong password, or default) */
|
||||
switch (pam_state) {
|
||||
case STATE_PAM_VERIFY:
|
||||
case STATE_PAM_LOCK:
|
||||
cairo_set_source_rgba(ctx, (double)insidever16[0]/255, (double)insidever16[1]/255, (double)insidever16[2]/255, (double)insidever16[3]/255);
|
||||
break;
|
||||
case STATE_PAM_WRONG:
|
||||
case STATE_I3LOCK_LOCK_FAILED:
|
||||
cairo_set_source_rgba(ctx, (double)insidewrong16[0]/255, (double)insidewrong16[1]/255, (double)insidewrong16[2]/255, (double)insidewrong16[3]/255);
|
||||
break;
|
||||
default:
|
||||
|
@ -284,6 +286,7 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
|
|||
}
|
||||
break;
|
||||
case STATE_PAM_WRONG:
|
||||
case STATE_I3LOCK_LOCK_FAILED:
|
||||
cairo_set_source_rgba(ctx, (double)ringwrong16[0]/255, (double)ringwrong16[1]/255, (double)ringwrong16[2]/255, (double)ringwrong16[3]/255);
|
||||
if (internal_line_source == 1) {
|
||||
line16[0] = ringwrong16[0];
|
||||
|
@ -337,6 +340,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) {
|
||||
|
|
|
@ -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);
|
||||
|
|
12
xcb.c
12
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) {
|
||||
|
|
Loading…
Reference in New Issue