Bugfix: Repeatedly try to find screens if none are available (Thanks mxf)

[i3/i3] / src / xcb.c

diff --git a/src/xcb.c b/src/xcb.c
index b9ba009e17e1029f99ed84b181eca90ec4bb86fc..4062f648e35254125bf448b90c044165e1e1af48 100644 (file)
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -22,7 +22,6 @@
 #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 +73,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;
-
-        SLIST_INSERT_HEAD(&(colorpixels), cache_pixel, colorpixels);
+        uint32_t rgb16[3] = {(strtol(strgroups[0], NULL, 16)),
+                             (strtol(strgroups[1], NULL, 16)),
+                             (strtol(strgroups[2], NULL, 16))};
 
-        return pixel;
+        return (rgb16[0] << 16) + (rgb16[1] << 8) + rgb16[2];
 }
 
 /*
@@ -220,10 +191,10 @@ void fake_configure_notify(xcb_connection_t *conn, Rect r, xcb_window_t window)
 void fake_absolute_configure_notify(xcb_connection_t *conn, Client *client) {
         Rect absolute;
 
-        absolute.x = client->rect.x;
-        absolute.y = client->rect.y;
+        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 - (2 * client->child_rect.y);
+        absolute.height = client->rect.height - client->child_rect.y - 1;
 
         fake_configure_notify(conn, absolute, client->child);
 }
@@ -236,7 +207,7 @@ void xcb_get_numlock_mask(xcb_connection_t *conn) {
         xcb_key_symbols_t *keysyms;
         xcb_get_modifier_mapping_cookie_t cookie;
         xcb_get_modifier_mapping_reply_t *reply;
-        xcb_keycode_t *modmap, numlock;
+        xcb_keycode_t *modmap;
         int mask, i;
         const int masks[8] = { XCB_MOD_MASK_SHIFT,
                                XCB_MOD_MASK_LOCK,
@@ -261,10 +232,17 @@ void xcb_get_numlock_mask(xcb_connection_t *conn) {
         modmap = xcb_get_modifier_mapping_keycodes(reply);
 
         /* Get the keycode for numlock */
-        numlock = xcb_key_symbols_get_keycode(keysyms, XCB_NUM_LOCK);
+#ifdef OLD_XCB_KEYSYMS_API
+        xcb_keycode_t numlock = xcb_key_symbols_get_keycode(keysyms, XCB_NUM_LOCK);
+#else
+        /* For now, we only use the first keysymbol. */
+        xcb_keycode_t *numlock_syms = xcb_key_symbols_get_keycode(keysyms, XCB_NUM_LOCK);
+        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];
@@ -272,3 +250,12 @@ 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);
+}