Remove getting colorpixels from the X server, saves code and round-trips. Requires truecolor displays.
If anyone has a serious (!) use for non-truecolor displays and problems with i3’s colors after this commit, please send a mail.
This commit is contained in:
parent
83d3146b65
commit
ce97e23913
37
src/xcb.c
37
src/xcb.c
|
@ -22,7 +22,6 @@
|
||||||
#include "xcb.h"
|
#include "xcb.h"
|
||||||
|
|
||||||
TAILQ_HEAD(cached_fonts_head, Font) cached_fonts = TAILQ_HEAD_INITIALIZER(cached_fonts);
|
TAILQ_HEAD(cached_fonts_head, Font) cached_fonts = TAILQ_HEAD_INITIALIZER(cached_fonts);
|
||||||
SLIST_HEAD(colorpixel_head, Colorpixel) colorpixels;
|
|
||||||
unsigned int xcb_numlock_mask;
|
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) {
|
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'},
|
char strgroups[3][3] = {{hex[1], hex[2], '\0'},
|
||||||
{hex[3], hex[4], '\0'},
|
{hex[3], hex[4], '\0'},
|
||||||
{hex[5], hex[6], '\0'}};
|
{hex[5], hex[6], '\0'}};
|
||||||
int rgb16[3] = {RGB_8_TO_16(strtol(strgroups[0], NULL, 16)),
|
uint32_t rgb16[3] = {(strtol(strgroups[0], NULL, 16)),
|
||||||
RGB_8_TO_16(strtol(strgroups[1], NULL, 16)),
|
(strtol(strgroups[1], NULL, 16)),
|
||||||
RGB_8_TO_16(strtol(strgroups[2], NULL, 16))};
|
(strtol(strgroups[2], NULL, 16))};
|
||||||
|
|
||||||
xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
|
return (rgb16[0] << 16) + (rgb16[1] << 8) + rgb16[2];
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue