X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3lock;a=blobdiff_plain;f=xcb.c;h=4f065542928fc1435d4ee171ebe6c6f22d2b7b78;hp=e3a33b87600e444c27892d63e9a51b5f84f82e99;hb=HEAD;hpb=02f3d44dcf8114a3ac9e3b9dd45326ceb095a8e8 diff --git a/xcb.c b/xcb.c index e3a33b8..4f06554 100644 --- a/xcb.c +++ b/xcb.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -18,8 +18,13 @@ #include #include #include +#include +#include #include "cursors.h" +#include "unlock_indicator.h" + +extern auth_state_t auth_state; xcb_connection_t *conn; xcb_screen_t *screen; @@ -144,6 +149,15 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c strlen(name), name); + xcb_change_property(conn, + XCB_PROP_MODE_REPLACE, + win, + XCB_ATOM_WM_CLASS, + XCB_ATOM_STRING, + 8, + 2 * (strlen("i3lock") + 1), + "i3lock\0i3lock\0"); + /* Map the window (= make it visible) */ xcb_map_window(conn, win); @@ -151,31 +165,34 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c values[0] = XCB_STACK_MODE_ABOVE; xcb_configure_window(conn, win, XCB_CONFIG_WINDOW_STACK_MODE, values); + /* Ensure that the window is created and set up before returning */ + xcb_aux_sync(conn); + return win; } /* - * Set the dpms level to 'mode'. + * Repeatedly tries to grab pointer and keyboard (up to the specified number of + * tries). * - */ -void dpms_set_mode(xcb_connection_t *conn, xcb_dpms_dpms_mode_t mode) { - xcb_dpms_enable(conn); - xcb_dpms_force_level(conn, mode); - xcb_flush(conn); -} - -/* - * Repeatedly tries to grab pointer and keyboard (up to 1000 times). + * 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; xcb_grab_keyboard_cookie_t kcookie; xcb_grab_keyboard_reply_t *kreply; - int tries = 10000; + const suseconds_t screen_redraw_timeout = 100000; /* 100ms */ + + /* Using few variables to trigger a redraw_screen() if too many tries */ + bool redrawn = false; + struct timeval start; + if (gettimeofday(&start, NULL) == -1) { + err(EXIT_FAILURE, "gettimeofday"); + } while (tries-- > 0) { pcookie = xcb_grab_pointer( @@ -195,8 +212,26 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb break; } + /* In case the grab failed, we still need to free the reply */ + free(preply); + /* Make this quite a bit slower */ usleep(50); + + struct timeval now; + if (gettimeofday(&now, NULL) == -1) { + err(EXIT_FAILURE, "gettimeofday"); + } + + struct timeval elapsed; + timersub(&now, &start, &elapsed); + + if (!redrawn && + (tries % 100) == 0 && + elapsed.tv_usec >= screen_redraw_timeout) { + redraw_screen(); + redrawn = true; + } } while (tries-- > 0) { @@ -214,12 +249,30 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb break; } + /* In case the grab failed, we still need to free the reply */ + free(kreply); + /* Make this quite a bit slower */ usleep(50); + + 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 && + elapsed.tv_usec >= screen_redraw_timeout) { + redraw_screen(); + redrawn = true; + } } - if (tries <= 0) - 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) { @@ -284,3 +337,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); +}