]> git.sur5r.net Git - i3/i3/blobdiff - src/xcb.c
Implement horizontal resize
[i3/i3] / src / xcb.c
index 10608ac4fc733e5f367512d54d26830afcfb31b2..a2f813b06898ff2932d93baf7a04c6257273988f 100644 (file)
--- a/src/xcb.c
+++ b/src/xcb.c
 #include <xcb/xcb.h>
 #include <xcb/xcb_keysyms.h>
 
+#include "i3.h"
 #include "util.h"
 #include "xcb.h"
 
 TAILQ_HEAD(cached_fonts_head, Font) cached_fonts = TAILQ_HEAD_INITIALIZER(cached_fonts);
-SLIST_HEAD(colorpixel_head, Colorpixel) colorpixels;
 unsigned int xcb_numlock_mask;
 
 /*
@@ -74,42 +74,14 @@ i3Font *load_font(xcb_connection_t *conn, const char *pattern) {
  *
  */
 uint32_t get_colorpixel(xcb_connection_t *conn, char *hex) {
-        /* Lookup this colorpixel in the cache */
-        struct Colorpixel *colorpixel;
-        SLIST_FOREACH(colorpixel, &(colorpixels), colorpixels)
-                if (strcmp(colorpixel->hex, hex) == 0)
-                        return colorpixel->pixel;
-
-        #define RGB_8_TO_16(i) (65535 * ((i) & 0xFF) / 255)
         char strgroups[3][3] = {{hex[1], hex[2], '\0'},
                                 {hex[3], hex[4], '\0'},
                                 {hex[5], hex[6], '\0'}};
-        int rgb16[3] = {RGB_8_TO_16(strtol(strgroups[0], NULL, 16)),
-                        RGB_8_TO_16(strtol(strgroups[1], NULL, 16)),
-                        RGB_8_TO_16(strtol(strgroups[2], NULL, 16))};
-
-        xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
-        xcb_alloc_color_reply_t *reply;
-        
-        reply = xcb_alloc_color_reply(conn, xcb_alloc_color(conn, root_screen->default_colormap,
-                                                            rgb16[0], rgb16[1], rgb16[2]), NULL);
-
-        if (!reply) {
-                LOG("Could not allocate color\n");
-                exit(1);
-        }
-
-        uint32_t pixel = reply->pixel;
-        free(reply);
-
-        /* Store the result in the cache */
-        struct Colorpixel *cache_pixel = scalloc(sizeof(struct Colorpixel));
-        cache_pixel->hex = sstrdup(hex);
-        cache_pixel->pixel = pixel;
+        uint32_t rgb16[3] = {(strtol(strgroups[0], NULL, 16)),
+                             (strtol(strgroups[1], NULL, 16)),
+                             (strtol(strgroups[2], NULL, 16))};
 
-        SLIST_INSERT_HEAD(&(colorpixels), cache_pixel, colorpixels);
-
-        return pixel;
+        return (rgb16[0] << 16) + (rgb16[1] << 8) + rgb16[2];
 }
 
 /*
@@ -118,7 +90,7 @@ uint32_t get_colorpixel(xcb_connection_t *conn, char *hex) {
  *
  */
 xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_class, int cursor,
-                           uint32_t mask, uint32_t *values) {
+                           bool map, uint32_t mask, uint32_t *values) {
         xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
         xcb_window_t result = xcb_generate_id(conn);
         xcb_cursor_t cursor_id = xcb_generate_id(conn);
@@ -149,7 +121,8 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl
                 xcb_change_window_attributes(conn, result, XCB_CW_CURSOR, &cursor_id);
 
         /* Map the window (= make it visible) */
-        xcb_map_window(conn, result);
+        if (map)
+                xcb_map_window(conn, result);
 
         return result;
 }
@@ -208,8 +181,6 @@ void fake_configure_notify(xcb_connection_t *conn, Rect r, xcb_window_t window)
 
         xcb_send_event(conn, false, window, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)&generated_event);
         xcb_flush(conn);
-
-        LOG("Told the client it is at %dx%d with %dx%d\n", r.x, r.y, r.width, r.height);
 }
 
 /*
@@ -222,8 +193,8 @@ void fake_absolute_configure_notify(xcb_connection_t *conn, Client *client) {
 
         absolute.x = client->rect.x + client->child_rect.x;
         absolute.y = client->rect.y + client->child_rect.y;
-        absolute.width = client->rect.width - (2 * client->child_rect.x);
-        absolute.height = client->rect.height - client->child_rect.y - 1;
+        absolute.width = client->child_rect.width;
+        absolute.height = client->child_rect.height;
 
         fake_configure_notify(conn, absolute, client->child);
 }
@@ -266,11 +237,14 @@ void xcb_get_numlock_mask(xcb_connection_t *conn) {
 #else
         /* For now, we only use the first keysymbol. */
         xcb_keycode_t *numlock_syms = xcb_key_symbols_get_keycode(keysyms, XCB_NUM_LOCK);
+        if (numlock_syms == NULL)
+                return;
         xcb_keycode_t numlock = *numlock_syms;
+        free(numlock_syms);
 #endif
 
         /* Check all modifiers (Mod1-Mod5, Shift, Control, Lock) */
-        for (mask = 0; mask < sizeof(masks); mask++)
+        for (mask = 0; mask < 8; mask++)
                 for (i = 0; i < reply->keycodes_per_modifier; i++)
                         if (modmap[(mask * reply->keycodes_per_modifier) + i] == numlock)
                                 xcb_numlock_mask = masks[mask];
@@ -278,3 +252,112 @@ void xcb_get_numlock_mask(xcb_connection_t *conn) {
         xcb_key_symbols_free(keysyms);
         free(reply);
 }
+
+/*
+ * Raises the given window (typically client->frame) above all other windows
+ *
+ */
+void xcb_raise_window(xcb_connection_t *conn, xcb_window_t window) {
+        uint32_t values[] = { XCB_STACK_MODE_ABOVE };
+        xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, values);
+}
+
+/*
+ *
+ * Prepares the given Cached_Pixmap for usage (checks whether the size of the
+ * object this pixmap is related to (e.g. a window) has changed and re-creates
+ * the pixmap if so).
+ *
+ */
+void cached_pixmap_prepare(xcb_connection_t *conn, struct Cached_Pixmap *pixmap) {
+        LOG("preparing pixmap\n");
+
+        /* If the Rect did not change, the pixmap does not need to be recreated */
+        if (memcmp(&(pixmap->rect), pixmap->referred_rect, sizeof(Rect)) == 0)
+                return;
+
+        memcpy(&(pixmap->rect), pixmap->referred_rect, sizeof(Rect));
+
+        if (pixmap->id == 0 || pixmap->gc == 0) {
+                LOG("Creating new pixmap...\n");
+                pixmap->id = xcb_generate_id(conn);
+                pixmap->gc = xcb_generate_id(conn);
+        } else {
+                LOG("Re-creating this pixmap...\n");
+                xcb_free_gc(conn, pixmap->gc);
+                xcb_free_pixmap(conn, pixmap->id);
+        }
+
+        xcb_create_pixmap(conn, root_depth, pixmap->id,
+                          pixmap->referred_drawable, pixmap->rect.width, pixmap->rect.height);
+
+        xcb_create_gc(conn, pixmap->gc, pixmap->id, 0, 0);
+}
+
+/*
+ * 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.
+ *
+ */
+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);
+
+        font_info = xcb_query_font_reply(conn, xcb_query_font_unchecked(conn, font->id), NULL);
+        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);
+
+        return width;
+}