X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=src%2Fxcb.c;h=3039b030ce5b44eae5ea77cfbc3974a13c43a633;hb=87c855f85121df98909636def91583d121aed8ae;hp=2b9ad7bf63c1e73e4e1324109c48ffe76efd5ac8;hpb=8da6049ca9e16d4988e09a334ab8be5e09ee96cc;p=i3%2Fi3 diff --git a/src/xcb.c b/src/xcb.c index 2b9ad7bf..3039b030 100644 --- a/src/xcb.c +++ b/src/xcb.c @@ -1,3 +1,5 @@ +#undef I3__FILE__ +#define I3__FILE__ "xcb.c" /* * vim:ts=4:sw=4:expandtab * @@ -9,71 +11,24 @@ */ #include "all.h" -TAILQ_HEAD(cached_fonts_head, Font) cached_fonts = TAILQ_HEAD_INITIALIZER(cached_fonts); unsigned int xcb_numlock_mask; -/* - * Loads a font for usage, also getting its height. If fallback is true, - * i3 loads 'fixed' or '-misc-*' if the font cannot be found instead of - * exiting. - * - */ -i3Font load_font(const char *pattern, bool fallback) { - i3Font new; - xcb_void_cookie_t font_cookie; - xcb_list_fonts_with_info_cookie_t info_cookie; - - /* Send all our requests first */ - new.id = xcb_generate_id(conn); - font_cookie = xcb_open_font_checked(conn, new.id, strlen(pattern), pattern); - info_cookie = xcb_list_fonts_with_info(conn, 1, strlen(pattern), pattern); - - /* Check for errors. If errors, fall back to default font. */ - xcb_generic_error_t *error = xcb_request_check(conn, font_cookie); - - /* If we fail to open font, fall back to 'fixed'. If opening 'fixed' fails fall back to '-misc-*' */ - if (fallback && error != NULL) { - ELOG("Could not open font %s (X error %d). Reverting to backup font.\n", pattern, error->error_code); - pattern = "fixed"; - font_cookie = xcb_open_font_checked(conn, new.id, strlen(pattern), pattern); - info_cookie = xcb_list_fonts_with_info(conn, 1, strlen(pattern), pattern); - - /* Check if we managed to open 'fixed' */ - xcb_generic_error_t *error = xcb_request_check(conn, font_cookie); - - /* Fall back to '-misc-*' if opening 'fixed' fails. */ - if (error != NULL) { - ELOG("Could not open fallback font '%s', trying with '-misc-*'\n",pattern); - pattern = "-misc-*"; - font_cookie = xcb_open_font_checked(conn, new.id, strlen(pattern), pattern); - info_cookie = xcb_list_fonts_with_info(conn, 1, strlen(pattern), pattern); - - check_error(conn, font_cookie, "Could open neither requested font nor fallback (fixed or -misc-*"); - } - } - - /* Get information (height/name) for this font */ - xcb_list_fonts_with_info_reply_t *reply = xcb_list_fonts_with_info_reply(conn, info_cookie, NULL); - exit_if_null(reply, "Could not load font \"%s\"\n", pattern); - - new.height = reply->font_ascent + reply->font_descent; - - free(reply); - - return new; -} - /* * Convenience wrapper around xcb_create_window which takes care of depth, generating an ID and checking * for errors. * */ -xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_class, +xcb_window_t create_window(xcb_connection_t *conn, Rect dims, + uint16_t depth, xcb_visualid_t visual, uint16_t window_class, enum xcursor_cursor_t cursor, bool map, uint32_t mask, uint32_t *values) { xcb_window_t result = xcb_generate_id(conn); - /* If the window class is XCB_WINDOW_CLASS_INPUT_ONLY, depth has to be 0 */ - uint16_t depth = (window_class == XCB_WINDOW_CLASS_INPUT_ONLY ? 0 : XCB_COPY_FROM_PARENT); + /* If the window class is XCB_WINDOW_CLASS_INPUT_ONLY, we copy depth and + * visual id from the parent window. */ + if (window_class == XCB_WINDOW_CLASS_INPUT_ONLY) { + depth = XCB_COPY_FROM_PARENT; + visual = XCB_COPY_FROM_PARENT; + } xcb_create_window(conn, depth, @@ -82,7 +37,7 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl dims.x, dims.y, dims.width, dims.height, /* dimensions */ 0, /* border = 0, we draw our own */ window_class, - XCB_WINDOW_CLASS_COPY_FROM_PARENT, /* copy visual from parent */ + visual, mask, values); @@ -95,8 +50,9 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl xcb_cursor_t cursor_id = xcb_generate_id(conn); i3Font cursor_font = load_font("cursor", false); int xcb_cursor = xcursor_get_xcb_cursor(cursor); - xcb_create_glyph_cursor(conn, cursor_id, cursor_font.id, cursor_font.id, - xcb_cursor, xcb_cursor + 1, 0, 0, 0, 65535, 65535, 65535); + xcb_create_glyph_cursor(conn, cursor_id, cursor_font.specific.xcb.id, + cursor_font.specific.xcb.id, xcb_cursor, xcb_cursor + 1, 0, 0, 0, + 65535, 65535, 65535); xcb_change_window_attributes(conn, result, XCB_CW_CURSOR, &cursor_id); xcb_free_cursor(conn, cursor_id); } @@ -154,7 +110,7 @@ void fake_absolute_configure_notify(Con *con) { * Sends the WM_TAKE_FOCUS ClientMessage to the given window * */ -void send_take_focus(xcb_window_t window) { +void send_take_focus(xcb_window_t window, xcb_timestamp_t timestamp) { /* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes. * In order to properly initialize these bytes, we allocate 32 bytes even * though we only need less for an xcb_configure_notify_event_t */ @@ -166,7 +122,7 @@ void send_take_focus(xcb_window_t window) { ev->type = A_WM_PROTOCOLS; ev->format = 32; ev->data.data32[0] = A_WM_TAKE_FOCUS; - ev->data.data32[1] = XCB_CURRENT_TIME; + ev->data.data32[1] = timestamp; DLOG("Sending WM_TAKE_FOCUS to the client\n"); xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev); @@ -182,32 +138,6 @@ void xcb_raise_window(xcb_connection_t *conn, xcb_window_t window) { xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, values); } -/* - * Query the width of the given text (16-bit characters, UCS) with given real - * length (amount of glyphs) using the given font. - * - */ -int predict_text_width(char *text, int length) { - xcb_query_text_extents_cookie_t cookie; - xcb_query_text_extents_reply_t *reply; - xcb_generic_error_t *error; - int width; - - cookie = xcb_query_text_extents(conn, config.font.id, length, (xcb_char2b_t*)text); - if ((reply = xcb_query_text_extents_reply(conn, cookie, &error)) == NULL) { - ELOG("Could not get text extents (X error code %d)\n", - error->error_code); - /* We return the rather safe guess of 7 pixels, because a - * rendering error is better than a crash. Plus, the user will - * see the error in his log. */ - return 7; - } - - width = reply->overall_width; - free(reply); - return width; -} - /* * Configures the given window to have the size/position specified by given rect * @@ -266,9 +196,53 @@ void xcb_set_root_cursor(int cursor) { xcb_cursor_t cursor_id = xcb_generate_id(conn); i3Font cursor_font = load_font("cursor", false); int xcb_cursor = xcursor_get_xcb_cursor(cursor); - xcb_create_glyph_cursor(conn, cursor_id, cursor_font.id, cursor_font.id, - xcb_cursor, xcb_cursor + 1, 0, 0, 0, 65535, 65535, 65535); + xcb_create_glyph_cursor(conn, cursor_id, cursor_font.specific.xcb.id, + cursor_font.specific.xcb.id, xcb_cursor, xcb_cursor + 1, 0, 0, 0, + 65535, 65535, 65535); xcb_change_window_attributes(conn, root, XCB_CW_CURSOR, &cursor_id); xcb_free_cursor(conn, cursor_id); xcb_flush(conn); } + +/* + * Get depth of visual specified by visualid + * + */ +uint16_t get_visual_depth(xcb_visualid_t visual_id){ + xcb_depth_iterator_t depth_iter; + + depth_iter = xcb_screen_allowed_depths_iterator(root_screen); + for (; depth_iter.rem; xcb_depth_next(&depth_iter)) { + xcb_visualtype_iterator_t visual_iter; + + visual_iter = xcb_depth_visuals_iterator(depth_iter.data); + for (; visual_iter.rem; xcb_visualtype_next(&visual_iter)) { + if (visual_id == visual_iter.data->visual_id) { + return depth_iter.data->depth; + } + } + } + return 0; +} + +/* + * Get visualid with specified depth + * + */ +xcb_visualid_t get_visualid_by_depth(uint16_t depth){ + xcb_depth_iterator_t depth_iter; + + depth_iter = xcb_screen_allowed_depths_iterator(root_screen); + for (; depth_iter.rem; xcb_depth_next(&depth_iter)) { + if (depth_iter.data->depth != depth) + continue; + + xcb_visualtype_iterator_t visual_iter; + + visual_iter = xcb_depth_visuals_iterator(depth_iter.data); + if (!visual_iter.rem) + continue; + return visual_iter.data->visual_id; + } + return 0; +}