koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for 32-bit visuals and RGBA colors.

Browse Source 
fixes #1984
This commit is contained in:
Ingo Bürk
2015-10-10 21:27:23 +02:00
parent 73289a7394
commit 21c0c20843
5 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libi3/font.c
View File

@ -29,7 +29,6 @@ static xcb_visualtype_t *root_visual_type;
static double pango_font_red;
static double pango_font_green;
static double pango_font_blue;
static double pango_font_alpha;
/* Necessary to track whether the dpi changes and trigger a LOG() message,
* which is more easily visible to users. */
@ -124,8 +123,8 @@ static void draw_text_pango(const char *text, size_t text_len,
pango_layout_set_text(layout, text, text_len);
/* Do the drawing */
cairo_set_source_rgba(cr, pango_font_red, pango_font_green, pango_font_blue, pango_font_alpha);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgb(cr, pango_font_red, pango_font_green, pango_font_blue);
pango_cairo_update_layout(cr, layout);
pango_layout_get_pixel_size(layout, NULL, &height);
/* Center the piece of text vertically if its height is smaller than the
@ -334,7 +333,6 @@ void set_font_colors(xcb_gcontext_t gc, uint32_t foreground, uint32_t background
pango_font_red = ((foreground >> 16) & 0xff) / 255.0;
pango_font_green = ((foreground >> 8) & 0xff) / 255.0;
pango_font_blue = (foreground & 0xff) / 255.0;
pango_font_alpha = ((foreground >> 24) & 0xff) / 255.0;
break;
#endif
default:

16
libi3/get_colorpixel.c
View File

@ -26,23 +26,13 @@
*
*/
uint32_t get_colorpixel(const char *hex) {
char alpha[2];
if (strlen(hex) == strlen("#rrggbbaa")) {
alpha[0] = hex[7];
alpha[1] = hex[8];
} else {
alpha[0] = alpha[1] = 'F';
}
char strgroups[4][3] = {
char strgroups[3][3] = {
{hex[1], hex[2], '\0'},
{hex[3], hex[4], '\0'},
{hex[5], hex[6], '\0'},
{alpha[0], alpha[1], '\0'}};
{hex[5], hex[6], '\0'}};
uint8_t r = strtol(strgroups[0], NULL, 16);
uint8_t g = strtol(strgroups[1], NULL, 16);
uint8_t b = strtol(strgroups[2], NULL, 16);
uint8_t a = strtol(strgroups[3], NULL, 16);
return (a << 24) | (r << 16 | g << 8 | b);
return (0xFF << 24) | (r << 16 | g << 8 | b);
}