X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fxcb.c;h=ee3148ed3b90437fa70a40254b05212f077ec0cd;hb=6e5e2fe5ee7ea92c93207b8f5ff5f8b674d7a72e;hp=f7835d3abffd9fea00fa0d790c23d778d113a064;hpb=36909c6e3bb4a00d673075869768d8300b2d0617;p=i3%2Fi3

diff --git a/src/xcb.c b/src/xcb.c
index f7835d3a..ee3148ed 100644
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -3,7 +3,7 @@
  *
  * i3 - an improved dynamic tiling window manager
  *
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
  *
  * See file LICENSE for license information.
  *
@@ -294,84 +294,42 @@ 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.
- *
- */
-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);
-}
-
-/*
- * Calculate the width of the given text (16-bit characters, UCS) with given
- * real length (amount of glyphs) using the given font.
+ * 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) {
-        xcb_query_font_reply_t *font_info;
-        xcb_charinfo_t *table;
-        xcb_generic_error_t *error;
-        int i, width = 0;
         i3Font *font = load_font(conn, font_pattern);
 
-        font_info = xcb_query_font_reply(conn, xcb_query_font(conn, font->id), &error);
-        if (error != NULL) {
-                fprintf(stderr, "ERROR: query font (X error code %d)\n", error->error_code);
+        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 on his stderr. */
+                 * see the error in his log. */
                 return 7;
         }
 
-        /* If no per-char info is available for this font, we use the default */
-        if (xcb_query_font_char_infos_length(font_info) == 0) {
-                DLOG("Falling back on default char_width of %d pixels\n", font_info->max_bounds.character_width);
-                return (font_info->max_bounds.character_width * length);
-        }
-
-        table = xcb_query_font_char_infos(font_info);
-
-        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;
-        }
-
-        free(font_info);
-
+        width = reply->overall_width;
+        free(reply);
         return width;
 }
+
+/*
+ * Configures the given window to have the size/position specified by given rect
+ *
+ */
+void xcb_set_window_rect(xcb_connection_t *conn, xcb_window_t window, Rect r) {
+        xcb_configure_window(conn, window,
+                             XCB_CONFIG_WINDOW_X |
+                             XCB_CONFIG_WINDOW_Y |
+                             XCB_CONFIG_WINDOW_WIDTH |
+                             XCB_CONFIG_WINDOW_HEIGHT,
+                             &(r.x));
+}