From ce97e23913b2fbd278b2079821e7c1e6d7b83d43 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 20 Jun 2009 18:05:24 +0200 Subject: [PATCH] Remove getting colorpixels from the X server, saves code and round-trips. Requires truecolor displays. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If anyone has a serious (!) use for non-truecolor displays and problems with i3’s colors after this commit, please send a mail. --- src/xcb.c | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/src/xcb.c b/src/xcb.c index db38a7bb..4062f648 100644 --- 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))}; + uint32_t rgb16[3] = {(strtol(strgroups[0], NULL, 16)), + (strtol(strgroups[1], NULL, 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); - - return pixel; + return (rgb16[0] << 16) + (rgb16[1] << 8) + rgb16[2]; } /*