X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fxcb.c;h=3da1081dd0548ae8463533821fcc0c5f2baee35e;hb=f10a3d9b7571eb4e87e59609a062a9bb20e2b198;hp=07286d0f9b8c6e77baa5ad98ca91af9c7e66d9ce;hpb=6ef0d1fa79776383f2618151e07a20355173826a;p=i3%2Fi3 diff --git a/src/xcb.c b/src/xcb.c index 07286d0f..3da1081d 100644 --- a/src/xcb.c +++ b/src/xcb.c @@ -3,25 +3,15 @@ * * i3 - an improved dynamic tiling window manager * - * © 2009 Michael Stapelberg and contributors + * © 2009-2010 Michael Stapelberg and contributors * * See file LICENSE for license information. * * xcb.c: Helper functions for easier usage of XCB * */ -#include -#include -#include -#include -#include -#include - -#include "i3.h" -#include "util.h" -#include "xcb.h" -#include "log.h" +#include "all.h" TAILQ_HEAD(cached_fonts_head, Font) cached_fonts = TAILQ_HEAD_INITIALIZER(cached_fonts); unsigned int xcb_numlock_mask; @@ -74,7 +64,7 @@ i3Font *load_font(xcb_connection_t *conn, const char *pattern) { * This has to be done by the caller. * */ -uint32_t get_colorpixel(xcb_connection_t *conn, char *hex) { +uint32_t get_colorpixel(char *hex) { char strgroups[3][3] = {{hex[1], hex[2], '\0'}, {hex[3], hex[4], '\0'}, {hex[5], hex[6], '\0'}}; @@ -99,14 +89,6 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl /* 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); - /* Use the default cursor (left pointer) */ - if (cursor > -1) { - i3Font *cursor_font = load_font(conn, "cursor"); - xcb_create_glyph_cursor(conn, cursor_id, cursor_font->id, cursor_font->id, - XCB_CURSOR_LEFT_PTR, XCB_CURSOR_LEFT_PTR + 1, - 0, 0, 0, 65535, 65535, 65535); - } - xcb_create_window(conn, depth, result, /* the window id */ @@ -118,8 +100,14 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl mask, values); - if (cursor > -1) - xcb_change_window_attributes(conn, result, XCB_CW_CURSOR, &cursor_id); + /* Set the cursor */ + i3Font *cursor_font = load_font(conn, "cursor"); + xcb_create_glyph_cursor(conn, cursor_id, cursor_font->id, cursor_font->id, + (cursor == -1 ? XCB_CURSOR_LEFT_PTR : cursor), + (cursor == -1 ? XCB_CURSOR_LEFT_PTR : 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); /* Map the window (= make it visible) */ if (map) @@ -184,6 +172,7 @@ void fake_configure_notify(xcb_connection_t *conn, Rect r, xcb_window_t window) xcb_flush(conn); } +#if 0 /* * Generates a configure_notify_event with absolute coordinates (relative to the X root * window, not to the client’s frame) for the given client. @@ -199,6 +188,7 @@ void fake_absolute_configure_notify(xcb_connection_t *conn, Client *client) { fake_configure_notify(conn, absolute, client->child); } +#endif /* * Finds out which modifier mask is the one for numlock, as the user may change this. @@ -296,69 +286,65 @@ void cached_pixmap_prepare(xcb_connection_t *conn, struct Cached_Pixmap *pixmap) } /* - * Returns the xcb_charinfo_t for the given character (specified by row and - * column in the lookup table) if existing, otherwise the minimum bounds. + * 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(xcb_connection_t *conn, const char *font_pattern, char *text, int length) { + i3Font *font = load_font(conn, font_pattern); + + 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, 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 * */ -static xcb_charinfo_t *get_charinfo(int col, int row, xcb_query_font_reply_t *font_info, - xcb_charinfo_t *table, bool dont_fallback) { - xcb_charinfo_t *result; - - /* Bounds checking */ - if (row < font_info->min_byte1 || row > font_info->max_byte1 || - col < font_info->min_char_or_byte2 || col > font_info->max_char_or_byte2) - return NULL; - - /* If we don’t have a table to lookup the infos per character, return the - * minimum bounds */ - if (table == NULL) - return &font_info->min_bounds; - - result = &table[((row - font_info->min_byte1) * - (font_info->max_char_or_byte2 - font_info->min_char_or_byte2 + 1)) + - (col - font_info->min_char_or_byte2)]; - - /* If the character has an entry in the table, return it */ - if (result->character_width != 0 || - (result->right_side_bearing | - result->left_side_bearing | - result->ascent | - result->descent) != 0) - return result; - - /* Otherwise, get the default character and return its charinfo */ - if (dont_fallback) - return NULL; - - return get_charinfo((font_info->default_char >> 8), - (font_info->default_char & 0xFF), - font_info, - table, - true); +void xcb_set_window_rect(xcb_connection_t *conn, xcb_window_t window, Rect r) { + xcb_void_cookie_t cookie; + cookie = xcb_configure_window(conn, window, + XCB_CONFIG_WINDOW_X | + XCB_CONFIG_WINDOW_Y | + XCB_CONFIG_WINDOW_WIDTH | + XCB_CONFIG_WINDOW_HEIGHT, + &(r.x)); + /* ignore events which are generated because we configured a window */ + add_ignore_event(cookie.sequence); } /* - * Calculate the width of the given text (16-bit characters, UCS) with given - * real length (amount of glyphs) using the given font. + * Returns true if the given reply contains the given atom. * */ -int predict_text_width(xcb_connection_t *conn, const char *font_pattern, char *text, int length) { - xcb_query_font_reply_t *font_info; - xcb_charinfo_t *table; - int i, width = 0; - i3Font *font = load_font(conn, font_pattern); +bool xcb_reply_contains_atom(xcb_get_property_reply_t *prop, xcb_atom_t atom) { + if (prop == NULL || xcb_get_property_value_length(prop) == 0) + return false; - font_info = xcb_query_font_reply(conn, xcb_query_font_unchecked(conn, font->id), NULL); - table = xcb_query_font_char_infos(font_info); + xcb_atom_t *atoms; + if ((atoms = xcb_get_property_value(prop)) == NULL) + return false; - for (i = 0; i < 2 * length; i += 2) { - xcb_charinfo_t *info = get_charinfo(text[i+1], text[i], font_info, table, false); - if (info == NULL) - continue; - width += info->character_width; - } + for (int i = 0; i < xcb_get_property_value_length(prop); i++) + if (atoms[i] == atom) + return true; - free(font_info); + return false; - return width; }