From 8eecef62fb4837d42a0e16124d35fce6fc2588ae Mon Sep 17 00:00:00 2001 From: Orestis Date: Sun, 22 Oct 2017 00:15:15 +0300 Subject: [PATCH 1/4] Immediately hide the unlock indicator after ESC / C-u (#145) --- i3lock.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/i3lock.c b/i3lock.c index 945be9f..8538625 100644 --- a/i3lock.c +++ b/i3lock.c @@ -445,14 +445,9 @@ static void handle_key_press(xcb_key_press_event_t *event) { ksym == XKB_KEY_Escape) { DEBUG("C-u pressed\n"); clear_input(); - /* Hide the unlock indicator after a bit if the password buffer is - * empty. */ - if (unlock_indicator) { - START_TIMER(clear_indicator_timeout, 1.0, clear_indicator_cb); - unlock_state = STATE_BACKSPACE_ACTIVE; - redraw_screen(); - unlock_state = STATE_KEY_PRESSED; - } + /* Also hide the unlock indicator */ + if (unlock_indicator) + clear_indicator(); return; } break; From d52cc44605e6df72fe9e50471868417020b2d286 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 22 Oct 2017 00:22:10 +0200 Subject: [PATCH 2/4] =?UTF-8?q?travis:=20wily=20is=20gone,=20so=20take=20l?= =?UTF-8?q?ibxkbcommon=20=E2=89=A5=200.5.0=20from=20xenial=20(#154)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5129c27..23be3b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,9 @@ addons: - libxcb-xkb-dev before_install: - "echo 'APT::Default-Release \"trusty\";' | sudo tee /etc/apt/apt.conf.d/default-release" - - "echo 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' | sudo tee /etc/apt/sources.list.d/wily.list" + - "echo 'deb http://archive.ubuntu.com/ubuntu/ xenial main universe' | sudo tee /etc/apt/sources.list.d/wily.list" - sudo apt-get update - - sudo apt-get --force-yes -y install -t wily libxkbcommon-dev libxkbcommon-x11-dev + - sudo apt-get --force-yes -y install -t xenial libxkbcommon-dev libxkbcommon-x11-dev script: - make -j - clang-format-3.5 -i *.[ch] && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false) From d3636246de11a02bb0d79808436c1edfe80d406b Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 22 Oct 2017 00:32:57 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Measure=20wall-clock=20time=20instead=20of?= =?UTF-8?q?=20CPU=20time=20for=20=E2=80=9Clocking=E2=80=9D=20indicator.=20?= =?UTF-8?q?(#153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit related to https://github.com/i3/i3lock/issues/35 --- xcb.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/xcb.c b/xcb.c index d842310..c384404 100644 --- a/xcb.c +++ b/xcb.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "cursors.h" #include "unlock_indicator.h" @@ -172,11 +173,15 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb xcb_grab_keyboard_cookie_t kcookie; xcb_grab_keyboard_reply_t *kreply; + const suseconds_t screen_redraw_timeout = 100000; /* 100ms */ int tries = 10000; /* Using few variables to trigger a redraw_screen() if too many tries */ bool redrawn = false; - time_t start = clock(); + struct timeval start; + if (gettimeofday(&start, NULL) == -1) { + err(EXIT_FAILURE, "gettimeofday"); + } while (tries-- > 0) { pcookie = xcb_grab_pointer( @@ -199,10 +204,17 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb /* Make this quite a bit slower */ usleep(50); - /* Measure elapsed time and trigger a screen redraw if elapsed > 250000 */ + struct timeval now; + if (gettimeofday(&now, NULL) == -1) { + err(EXIT_FAILURE, "gettimeofday"); + } + + struct timeval elapsed; + timersub(&now, &start, &elapsed); + if (!redrawn && (tries % 100) == 0 && - (clock() - start) > 250000) { + elapsed.tv_usec >= screen_redraw_timeout) { redraw_screen(); redrawn = true; } @@ -226,10 +238,18 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb /* Make this quite a bit slower */ usleep(50); - /* Measure elapsed time and trigger a screen redraw if elapsed > 250000 */ + struct timeval now; + if (gettimeofday(&now, NULL) == -1) { + err(EXIT_FAILURE, "gettimeofday"); + } + + struct timeval elapsed; + timersub(&now, &start, &elapsed); + + /* Trigger a screen redraw if 100ms elapsed */ if (!redrawn && (tries % 100) == 0 && - (clock() - start) > 250000) { + elapsed.tv_usec >= screen_redraw_timeout) { redraw_screen(); redrawn = true; } From 5b4d45a8aff1dacaad364ae6df70c3a6a5067701 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 22 Oct 2017 22:16:34 +0200 Subject: [PATCH 4/4] SetInputFocus to the i3lock window to force-close context menus (#155) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When grabbing the pointer/keyboard fails, a new code path is activated, which: 1. Uses the standards-compliant _NET_ACTIVE_WINDOW root window property to determine the window to restore focus to. 2. Sets the input focus to the i3lock window, thereby possibly force-closing open context menus (works with e.g. Google Chrome, does not work with e.g. thunar, gedit). 3. Upon exiting, restores focus to the window from step ① by sending a _NET_ACTIVE_WINDOW ClientMessage to the root window. Note that this step requires https://github.com/i3/i3/pull/3027 in i3 to not mess up focus. fixes https://github.com/i3/i3lock/issues/35 --- i3lock.c | 40 +++++++++++++++++++++++++--- xcb.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-------- xcb.h | 4 ++- 3 files changed, 110 insertions(+), 15 deletions(-) diff --git a/i3lock.c b/i3lock.c index 8538625..1bb7b0c 100644 --- a/i3lock.c +++ b/i3lock.c @@ -35,6 +35,7 @@ #ifdef __OpenBSD__ #include /* explicit_bzero(3) */ #endif +#include #include "i3lock.h" #include "xcb.h" @@ -278,7 +279,8 @@ static void input_done(void) { DEBUG("successfully authenticated\n"); clear_password_memory(); - exit(0); + ev_break(EV_DEFAULT, EVBREAK_ALL); + return; } #else if (pam_authenticate(pam_handle, 0) == PAM_SUCCESS) { @@ -292,7 +294,8 @@ static void input_done(void) { pam_setcred(pam_handle, PAM_REFRESH_CRED); pam_end(pam_handle, PAM_SUCCESS); - exit(0); + ev_break(EV_DEFAULT, EVBREAK_ALL); + return; } #endif @@ -1010,6 +1013,8 @@ int main(int argc, char *argv[]) { /* Pixmap on which the image is rendered to (if any) */ xcb_pixmap_t bg_pixmap = draw_image(last_resolution); + xcb_window_t stolen_focus = find_focused_window(conn, screen->root); + /* Open the fullscreen window, already with the correct pixmap in place */ win = open_fullscreen_window(conn, screen, color, bg_pixmap); xcb_free_pixmap(conn, bg_pixmap); @@ -1018,7 +1023,23 @@ int main(int argc, char *argv[]) { /* Display the "locking…" message while trying to grab the pointer/keyboard. */ auth_state = STATE_AUTH_LOCK; - grab_pointer_and_keyboard(conn, screen, cursor); + if (!grab_pointer_and_keyboard(conn, screen, cursor, 1000)) { + DEBUG("stole focus from X11 window 0x%08x\n", stolen_focus); + + /* Set the focus to i3lock, possibly closing context menus which would + * otherwise prevent us from grabbing keyboard/pointer. + * + * We cannot use set_focused_window because _NET_ACTIVE_WINDOW only + * works for managed windows, but i3lock uses an unmanaged window + * (override_redirect=1). */ + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT /* revert_to */, win, XCB_CURRENT_TIME); + if (!grab_pointer_and_keyboard(conn, screen, cursor, 9000)) { + auth_state = STATE_I3LOCK_LOCK_FAILED; + redraw_screen(); + sleep(1); + errx(EXIT_FAILURE, "Cannot grab pointer/keyboard"); + } + } pid_t pid = fork(); /* The pid == -1 case is intentionally ignored here: @@ -1065,4 +1086,17 @@ int main(int argc, char *argv[]) { * file descriptor becomes readable). */ ev_invoke(main_loop, xcb_check, 0); ev_loop(main_loop, 0); + + if (stolen_focus == XCB_NONE) { + return 0; + } + + DEBUG("restoring focus to X11 window 0x%08x\n", stolen_focus); + xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); + xcb_ungrab_keyboard(conn, XCB_CURRENT_TIME); + xcb_destroy_window(conn, win); + set_focused_window(conn, screen->root, stolen_focus); + xcb_aux_sync(conn); + + return 0; } diff --git a/xcb.c b/xcb.c index c384404..27a8dae 100644 --- a/xcb.c +++ b/xcb.c @@ -163,10 +163,13 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c } /* - * Repeatedly tries to grab pointer and keyboard (up to 10000 times). + * Repeatedly tries to grab pointer and keyboard (up to the specified number of + * tries). + * + * Returns true if the grab succeeded, false if not. * */ -void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb_cursor_t cursor) { +bool grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb_cursor_t cursor, int tries) { xcb_grab_pointer_cookie_t pcookie; xcb_grab_pointer_reply_t *preply; @@ -174,7 +177,6 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb xcb_grab_keyboard_reply_t *kreply; const suseconds_t screen_redraw_timeout = 100000; /* 100ms */ - int tries = 10000; /* Using few variables to trigger a redraw_screen() if too many tries */ bool redrawn = false; @@ -255,14 +257,7 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb } } - /* After trying for 10000 times, i3lock will display an error message - * for 2 sec prior to terminate. */ - if (tries <= 0) { - auth_state = STATE_I3LOCK_LOCK_FAILED; - redraw_screen(); - sleep(1); - errx(EXIT_FAILURE, "Cannot grab pointer/keyboard"); - } + return (tries > 0); } xcb_cursor_t create_cursor(xcb_connection_t *conn, xcb_screen_t *screen, xcb_window_t win, int choice) { @@ -327,3 +322,67 @@ xcb_cursor_t create_cursor(xcb_connection_t *conn, xcb_screen_t *screen, xcb_win return cursor; } + +static xcb_atom_t _NET_ACTIVE_WINDOW = XCB_NONE; +void _init_net_active_window(xcb_connection_t *conn) { + if (_NET_ACTIVE_WINDOW != XCB_NONE) { + /* already initialized */ + return; + } + xcb_generic_error_t *err; + xcb_intern_atom_reply_t *atom_reply = xcb_intern_atom_reply( + conn, + xcb_intern_atom(conn, 0, strlen("_NET_ACTIVE_WINDOW"), "_NET_ACTIVE_WINDOW"), + &err); + if (atom_reply == NULL) { + fprintf(stderr, "X11 Error %d\n", err->error_code); + free(err); + return; + } + _NET_ACTIVE_WINDOW = atom_reply->atom; + free(atom_reply); +} + +xcb_window_t find_focused_window(xcb_connection_t *conn, const xcb_window_t root) { + xcb_window_t result = XCB_NONE; + + _init_net_active_window(conn); + + xcb_get_property_reply_t *prop_reply = xcb_get_property_reply( + conn, + xcb_get_property_unchecked( + conn, false, root, _NET_ACTIVE_WINDOW, XCB_GET_PROPERTY_TYPE_ANY, 0, 1 /* word */), + NULL); + if (prop_reply == NULL) { + goto out; + } + if (xcb_get_property_value_length(prop_reply) == 0) { + goto out_prop; + } + if (prop_reply->type != XCB_ATOM_WINDOW) { + goto out_prop; + } + + result = *((xcb_window_t *)xcb_get_property_value(prop_reply)); + +out_prop: + free(prop_reply); +out: + return result; +} + +void set_focused_window(xcb_connection_t *conn, const xcb_window_t root, const xcb_window_t window) { + xcb_client_message_event_t ev; + memset(&ev, '\0', sizeof(xcb_client_message_event_t)); + + _init_net_active_window(conn); + + ev.response_type = XCB_CLIENT_MESSAGE; + ev.window = window; + ev.type = _NET_ACTIVE_WINDOW; + ev.format = 32; + ev.data.data32[0] = 2; /* 2 = pager */ + + xcb_send_event(conn, false, root, XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (char *)&ev); + xcb_flush(conn); +} diff --git a/xcb.h b/xcb.h index ffef42f..3555c58 100644 --- a/xcb.h +++ b/xcb.h @@ -9,7 +9,9 @@ extern xcb_screen_t *screen; xcb_visualtype_t *get_root_visual_type(xcb_screen_t *s); xcb_pixmap_t create_bg_pixmap(xcb_connection_t *conn, xcb_screen_t *scr, u_int32_t *resolution, char *color); xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, char *color, xcb_pixmap_t pixmap); -void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb_cursor_t cursor); +bool grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb_cursor_t cursor, int tries); xcb_cursor_t create_cursor(xcb_connection_t *conn, xcb_screen_t *screen, xcb_window_t win, int choice); +xcb_window_t find_focused_window(xcb_connection_t *conn, const xcb_window_t root); +void set_focused_window(xcb_connection_t *conn, const xcb_window_t root, const xcb_window_t window); #endif