X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=xcb.c;h=078ddb96fc7bd9eee542d170eae3689d7d6baf8d;hb=5ab19daa5cd3ebb63ecc389fb7d5420e91f8d799;hp=fc27d0bde2d91826113fcf382721d743c81d5da2;hpb=6c34f6aa4057af48d1f68f8721172dd33cb0a7ea;p=i3%2Fi3lock diff --git a/xcb.c b/xcb.c index fc27d0b..078ddb9 100644 --- a/xcb.c +++ b/xcb.c @@ -1,7 +1,7 @@ /* * vim:ts=4:sw=4:expandtab * - * © 2010-2012 Michael Stapelberg + * © 2010 Michael Stapelberg * * xcb.c: contains all functions which use XCB to talk to X11. Mostly wrappers * around the rather complicated/ugly parts of the XCB API. @@ -10,7 +10,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -18,8 +19,12 @@ #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; @@ -28,25 +33,25 @@ xcb_screen_t *screen; #define curs_invisible_height 8 static unsigned char curs_invisible_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; #define curs_windows_width 11 #define curs_windows_height 19 static unsigned char curs_windows_bits[] = { - 0xfe, 0x07, 0xfc, 0x07, 0xfa, 0x07, 0xf6, 0x07, 0xee, 0x07, 0xde, 0x07, - 0xbe, 0x07, 0x7e, 0x07, 0xfe, 0x06, 0xfe, 0x05, 0x3e, 0x00, 0xb6, 0x07, - 0x6a, 0x07, 0x6c, 0x07, 0xde, 0x06, 0xdf, 0x06, 0xbf, 0x05, 0xbf, 0x05, - 0x7f, 0x06 }; + 0xfe, 0x07, 0xfc, 0x07, 0xfa, 0x07, 0xf6, 0x07, 0xee, 0x07, 0xde, 0x07, + 0xbe, 0x07, 0x7e, 0x07, 0xfe, 0x06, 0xfe, 0x05, 0x3e, 0x00, 0xb6, 0x07, + 0x6a, 0x07, 0x6c, 0x07, 0xde, 0x06, 0xdf, 0x06, 0xbf, 0x05, 0xbf, 0x05, + 0x7f, 0x06}; #define mask_windows_width 11 #define mask_windows_height 19 static unsigned char mask_windows_bits[] = { - 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00, - 0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03, 0xff, 0x07, 0x7f, 0x00, - 0xf7, 0x00, 0xf3, 0x00, 0xe1, 0x01, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03, - 0x80, 0x01 }; + 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00, + 0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03, 0xff, 0x07, 0x7f, 0x00, + 0xf7, 0x00, 0xf3, 0x00, 0xe1, 0x01, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03, + 0x80, 0x01}; static uint32_t get_colorpixel(char *hex) { char strgroups[3][3] = {{hex[0], hex[1], '\0'}, @@ -67,7 +72,6 @@ xcb_visualtype_t *get_root_visual_type(xcb_screen_t *screen) { for (depth_iter = xcb_screen_allowed_depths_iterator(screen); depth_iter.rem; xcb_depth_next(&depth_iter)) { - for (visual_iter = xcb_depth_visuals_iterator(depth_iter.data); visual_iter.rem; xcb_visualtype_next(&visual_iter)) { @@ -82,7 +86,7 @@ xcb_visualtype_t *get_root_visual_type(xcb_screen_t *screen) { return NULL; } -xcb_pixmap_t create_bg_pixmap(xcb_connection_t *conn, xcb_screen_t *scr, u_int32_t* resolution, char *color) { +xcb_pixmap_t create_bg_pixmap(xcb_connection_t *conn, xcb_screen_t *scr, u_int32_t *resolution, char *color) { xcb_pixmap_t bg_pixmap = xcb_generate_id(conn); xcb_create_pixmap(conn, scr->root_depth, bg_pixmap, scr->root, resolution[0], resolution[1]); @@ -90,9 +94,9 @@ xcb_pixmap_t create_bg_pixmap(xcb_connection_t *conn, xcb_screen_t *scr, u_int32 /* Generate a Graphics Context and fill the pixmap with background color * (for images that are smaller than your screen) */ xcb_gcontext_t gc = xcb_generate_id(conn); - uint32_t values[] = { get_colorpixel(color) }; + uint32_t values[] = {get_colorpixel(color)}; xcb_create_gc(conn, gc, bg_pixmap, XCB_GC_FOREGROUND, values); - xcb_rectangle_t rect = { 0, 0, resolution[0], resolution[1] }; + xcb_rectangle_t rect = {0, 0, resolution[0], resolution[1]}; xcb_poly_fill_rectangle(conn, bg_pixmap, gc, 1, &rect); xcb_free_gc(conn, gc); @@ -103,6 +107,29 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c uint32_t mask = 0; uint32_t values[3]; xcb_window_t win = xcb_generate_id(conn); + xcb_window_t parent_win = scr->root; + + /* Check whether the composite extension is available */ + const xcb_query_extension_reply_t *extension_query = NULL; + xcb_generic_error_t *error = NULL; + xcb_composite_get_overlay_window_cookie_t cookie; + xcb_composite_get_overlay_window_reply_t *composite_reply = NULL; + + extension_query = xcb_get_extension_data(conn, &xcb_composite_id); + if (extension_query && extension_query->present) { + /* When composition is used, we need to use the composite overlay + * window instead of the normal root window to be able to cover + * composited windows */ + cookie = xcb_composite_get_overlay_window(conn, scr->root); + composite_reply = xcb_composite_get_overlay_window_reply(conn, cookie, &error); + + if (!error && composite_reply) { + parent_win = composite_reply->overlay_win; + } + + free(composite_reply); + free(error); + } if (pixmap == XCB_NONE) { mask |= XCB_CW_BACK_PIXEL; @@ -125,11 +152,11 @@ xcb_window_t open_fullscreen_window(xcb_connection_t *conn, xcb_screen_t *scr, c xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, /* the window id */ - scr->root, /* parent == root */ + parent_win, 0, 0, scr->width_in_pixels, scr->height_in_pixels, /* dimensions */ - 0, /* border = 0, we draw our own */ + 0, /* border = 0, we draw our own */ XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_COPY_FROM_PARENT, /* copy visual from parent */ mask, @@ -152,21 +179,14 @@ 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); - return win; -} + /* Ensure that the window is created and set up before returning */ + xcb_aux_sync(conn); -/* - * Set the dpms level to 'mode'. - * - */ -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); + return win; } /* - * 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) { @@ -178,6 +198,10 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb int tries = 10000; + /* Using few variables to trigger a redraw_screen() if too many tries */ + bool redrawn = false; + time_t start = clock(); + while (tries-- > 0) { pcookie = xcb_grab_pointer( conn, @@ -188,8 +212,7 @@ void grab_pointer_and_keyboard(xcb_connection_t *conn, xcb_screen_t *screen, xcb XCB_GRAB_MODE_ASYNC, /* keyboard mode */ XCB_NONE, /* confine_to = in which window should the cursor stay */ cursor, /* we change the cursor to whatever the user wanted */ - XCB_CURRENT_TIME - ); + XCB_CURRENT_TIME); if ((preply = xcb_grab_pointer_reply(conn, pcookie, NULL)) && preply->status == XCB_GRAB_STATUS_SUCCESS) { @@ -199,17 +222,24 @@ 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 */ + if (!redrawn && + (tries % 100) == 0 && + (clock() - start) > 250000) { + redraw_screen(); + redrawn = true; + } } while (tries-- > 0) { kcookie = xcb_grab_keyboard( conn, - true, /* report events */ - screen->root, /* grab the root window */ + true, /* report events */ + screen->root, /* grab the root window */ XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, /* process events as normal, do not require sync */ - XCB_GRAB_MODE_ASYNC - ); + XCB_GRAB_MODE_ASYNC); if ((kreply = xcb_grab_keyboard_reply(conn, kcookie, NULL)) && kreply->status == XCB_GRAB_STATUS_SUCCESS) { @@ -219,10 +249,24 @@ 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 */ + if (!redrawn && + (tries % 100) == 0 && + (clock() - start) > 250000) { + redraw_screen(); + redrawn = true; + } } - if (tries <= 0) + /* 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"); + } } xcb_cursor_t create_cursor(xcb_connection_t *conn, xcb_screen_t *screen, xcb_window_t win, int choice) { @@ -230,8 +274,8 @@ xcb_cursor_t create_cursor(xcb_connection_t *conn, xcb_screen_t *screen, xcb_win xcb_pixmap_t mask; xcb_cursor_t cursor; - unsigned char* curs_bits; - unsigned char* mask_bits; + unsigned char *curs_bits; + unsigned char *mask_bits; int curs_w, curs_h; switch (choice) { @@ -278,9 +322,9 @@ xcb_cursor_t create_cursor(xcb_connection_t *conn, xcb_screen_t *screen, xcb_win cursor, bitmap, mask, - 65535,65535,65535, - 0,0,0, - 0,0); + 65535, 65535, 65535, + 0, 0, 0, + 0, 0); xcb_free_pixmap(conn, bitmap); xcb_free_pixmap(conn, mask);