Codebase list i3-gaps / c6a4e45
Correct color management for pango fonts Corrects the cases where the colorpixel is not 0xRRGGBB : we have to use the full color_t struct to describe font colors, as Pango expects RGB values and not an XCB colorpixel value. Alex Auvolat 8 years ago
8 changed file(s) with 55 addition(s) and 55 deletion(s). Raw diff Collapse all Expand all
+7
-7
i3-config-wizard/main.c less more
478478
479479 if (current_step == STEP_WELCOME) {
480480 /* restore font color */
481 set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
481 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
482482
483483 txt(logical_px(10), 2, "You have not configured i3 yet.");
484484 txt(logical_px(10), 3, "Do you want me to generate a config at");
492492 txt(logical_px(85), 8, "No, I will use the defaults");
493493
494494 /* green */
495 set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000"));
495 set_font_colors(pixmap_gc, draw_util_hex_to_color("#00FF00"), draw_util_hex_to_color("#000000"));
496496 txt(logical_px(25), 6, "<Enter>");
497497
498498 /* red */
499 set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000"));
499 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FF0000"), draw_util_hex_to_color("#000000"));
500500 txt(logical_px(31), 8, "<ESC>");
501501 }
502502
503503 if (current_step == STEP_GENERATE) {
504 set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
504 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
505505
506506 txt(logical_px(10), 2, "Please choose either:");
507507 txt(logical_px(85), 4, "Win as default modifier");
518518
519519 /* the selected modifier */
520520 set_font(&bold_font);
521 set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
521 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
522522 if (modifier == MOD_Mod4)
523523 txt(logical_px(10), 4, "-> <Win>");
524524 else
526526
527527 /* green */
528528 set_font(&font);
529 set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000"));
529 set_font_colors(pixmap_gc, draw_util_hex_to_color("#00FF00"), draw_util_hex_to_color("#000000"));
530530 txt(logical_px(25), 9, "<Enter>");
531531
532532 /* red */
533 set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000"));
533 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FF0000"), draw_util_hex_to_color("#000000"));
534534 txt(logical_px(31), 10, "<ESC>");
535535 }
536536
+1
-1
i3-input/main.c less more
136136 xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &inner);
137137
138138 /* restore font color */
139 set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
139 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
140140
141141 /* draw the prompt … */
142142 if (prompt != NULL) {
+23
-23
i3-nagbar/main.c less more
5050 static int buttoncnt;
5151
5252 /* Result of get_colorpixel() for the various colors. */
53 static uint32_t color_background; /* background of the bar */
54 static uint32_t color_button_background; /* background for buttons */
55 static uint32_t color_border; /* color of the button border */
56 static uint32_t color_border_bottom; /* color of the bottom border */
57 static uint32_t color_text; /* color of the text */
53 static color_t color_background; /* background of the bar */
54 static color_t color_button_background; /* background for buttons */
55 static color_t color_border; /* color of the button border */
56 static color_t color_border_bottom; /* color of the bottom border */
57 static color_t color_text; /* color of the text */
5858
5959 xcb_window_t root;
6060 xcb_connection_t *conn;
190190 */
191191 static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) {
192192 /* re-draw the background */
193 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_background});
193 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_background.colorpixel});
194194 xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &rect);
195195
196196 /* restore font color */
209209 w += logical_px(8);
210210 int y = rect.width;
211211 uint32_t values[3];
212 values[0] = color_button_background;
212 values[0] = color_button_background.colorpixel;
213213 values[1] = line_width;
214214 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND | XCB_GC_LINE_WIDTH, values);
215215
216216 xcb_rectangle_t close = {y - w - (2 * line_width), 0, w + (2 * line_width), rect.height};
217217 xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &close);
218218
219 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border});
219 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border.colorpixel});
220220 xcb_point_t points[] = {
221221 {y - w - (2 * line_width), line_width / 2},
222222 {y - (line_width / 2), line_width / 2},
244244 /* account for left/right padding, which seems to be set to 12px (total) below */
245245 w += logical_px(12);
246246 y -= logical_px(30);
247 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_button_background});
247 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_button_background.colorpixel});
248248 close = (xcb_rectangle_t){y - w - (2 * line_width), logical_px(2), w + (2 * line_width), rect.height - logical_px(6)};
249249 xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &close);
250250
251 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border});
251 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border.colorpixel});
252252 buttons[c].x = y - w - (2 * line_width);
253253 buttons[c].width = w;
254254 xcb_point_t points2[] = {
259259 {y - w - (2 * line_width), (line_width / 2) + logical_px(2)}};
260260 xcb_poly_line(conn, XCB_COORD_MODE_ORIGIN, pixmap, pixmap_gc, 5, points2);
261261
262 values[0] = color_text;
263 values[1] = color_button_background;
262 values[0] = color_text.colorpixel;
263 values[1] = color_button_background.colorpixel;
264264 set_font_colors(pixmap_gc, color_text, color_button_background);
265265 /* the x term seems to set left/right padding */
266266 draw_text(buttons[c].label, pixmap, pixmap_gc, NULL,
273273
274274 /* border line at the bottom */
275275 line_width = logical_px(2);
276 values[0] = color_border_bottom;
276 values[0] = color_border_bottom.colorpixel;
277277 values[1] = line_width;
278278 xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND | XCB_GC_LINE_WIDTH, values);
279279 xcb_point_t bottom[] = {
447447
448448 if (bar_type == TYPE_ERROR) {
449449 /* Red theme for error messages */
450 color_button_background = get_colorpixel("#680a0a");
451 color_background = get_colorpixel("#900000");
452 color_text = get_colorpixel("#ffffff");
453 color_border = get_colorpixel("#d92424");
454 color_border_bottom = get_colorpixel("#470909");
450 color_button_background = draw_util_hex_to_color("#680a0a");
451 color_background = draw_util_hex_to_color("#900000");
452 color_text = draw_util_hex_to_color("#ffffff");
453 color_border = draw_util_hex_to_color("#d92424");
454 color_border_bottom = draw_util_hex_to_color("#470909");
455455 } else {
456456 /* Yellowish theme for warnings */
457 color_button_background = get_colorpixel("#ffc100");
458 color_background = get_colorpixel("#ffa8000");
459 color_text = get_colorpixel("#000000");
460 color_border = get_colorpixel("#ab7100");
461 color_border_bottom = get_colorpixel("#ab7100");
457 color_button_background = draw_util_hex_to_color("#ffc100");
458 color_background = draw_util_hex_to_color("#ffa8000");
459 color_text = draw_util_hex_to_color("#000000");
460 color_border = draw_util_hex_to_color("#ab7100");
461 color_border_bottom = draw_util_hex_to_color("#ab7100");
462462 }
463463
464464 font = load_font(pattern, true);
+14
-14
include/libi3.h less more
391391 */
392392 xcb_char2b_t *convert_utf8_to_ucs2(char *input, size_t *real_strlen);
393393
394 /* Represents a color split by color channel. */
395 typedef struct color_t {
396 double red;
397 double green;
398 double blue;
399 double alpha;
400
401 /* The colorpixel we use for direct XCB calls. */
402 uint32_t colorpixel;
403 } color_t;
404
405 #define COLOR_TRANSPARENT ((color_t){.red = 0.0, .green = 0.0, .blue = 0.0, .colorpixel = 0})
406
394407 /**
395408 * Defines the colors to be used for the forthcoming draw_text calls.
396409 *
397410 */
398 void set_font_colors(xcb_gcontext_t gc, uint32_t foreground, uint32_t background);
411 void set_font_colors(xcb_gcontext_t gc, color_t foreground, color_t background);
399412
400413 /**
401414 * Returns true if and only if the current font is a pango font.
500513 } while (0)
501514 #endif
502515
503 /* Represents a color split by color channel. */
504 typedef struct color_t {
505 double red;
506 double green;
507 double blue;
508 double alpha;
509
510 /* The colorpixel we use for direct XCB calls. */
511 uint32_t colorpixel;
512 } color_t;
513
514 #define COLOR_TRANSPARENT ((color_t){.red = 0.0, .green = 0.0, .blue = 0.0, .colorpixel = 0})
515
516516 /* A wrapper grouping an XCB drawable and both a graphics context
517517 * and the corresponding cairo objects representing it. */
518518 typedef struct surface_t {
+1
-1
libi3/draw_util.c less more
143143 CAIRO_SURFACE_FLUSH(surface->surface);
144144 #endif
145145
146 set_font_colors(surface->gc, fg_color.colorpixel, bg_color.colorpixel);
146 set_font_colors(surface->gc, fg_color, bg_color);
147147 draw_text(text, surface->id, surface->gc, surface->visual_type, x, y, max_width);
148148
149149 #ifdef CAIRO_SUPPORT
+5
-5
libi3/font.c less more
309309 * Defines the colors to be used for the forthcoming draw_text calls.
310310 *
311311 */
312 void set_font_colors(xcb_gcontext_t gc, uint32_t foreground, uint32_t background) {
312 void set_font_colors(xcb_gcontext_t gc, color_t foreground, color_t background) {
313313 assert(savedFont != NULL);
314314
315315 switch (savedFont->type) {
319319 case FONT_TYPE_XCB: {
320320 /* Change the font and colors in the GC */
321321 uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT;
322 uint32_t values[] = {foreground, background, savedFont->specific.xcb.id};
322 uint32_t values[] = {foreground.colorpixel, background.colorpixel, savedFont->specific.xcb.id};
323323 xcb_change_gc(conn, gc, mask, values);
324324 break;
325325 }
326326 #if PANGO_SUPPORT
327327 case FONT_TYPE_PANGO:
328328 /* Save the foreground font */
329 pango_font_red = ((foreground >> 16) & 0xff) / 255.0;
330 pango_font_green = ((foreground >> 8) & 0xff) / 255.0;
331 pango_font_blue = (foreground & 0xff) / 255.0;
329 pango_font_red = foreground.red;
330 pango_font_green = foreground.green;
331 pango_font_blue = foreground.blue;
332332 break;
333333 #endif
334334 default:
+1
-1
src/restore_layout.c less more
132132 xcb_flush(restore_conn);
133133 xcb_aux_sync(restore_conn);
134134
135 set_font_colors(state->gc, config.client.placeholder.text.colorpixel, config.client.placeholder.background.colorpixel);
135 set_font_colors(state->gc, config.client.placeholder.text, config.client.placeholder.background);
136136
137137 Match *swallows;
138138 int n = 0;
+3
-3
src/sighandler.c less more
140140 xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &inner);
141141
142142 /* restore font color */
143 set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
143 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
144144
145145 char *bt_colour = "#FFFFFF";
146146 if (backtrace_done < 0)
151151 for (int i = 0; crash_text_i3strings[i] != NULL; ++i) {
152152 /* fix the colour for the backtrace line when it finished */
153153 if (i == backtrace_string_index)
154 set_font_colors(pixmap_gc, get_colorpixel(bt_colour), get_colorpixel("#000000"));
154 set_font_colors(pixmap_gc, draw_util_hex_to_color(bt_colour), draw_util_hex_to_color("#000000"));
155155
156156 draw_text(crash_text_i3strings[i], pixmap, pixmap_gc, NULL,
157157 8, 5 + i * font_height, width - 16);
158158
159159 /* and reset the colour again for other lines */
160160 if (i == backtrace_string_index)
161 set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
161 set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
162162 }
163163
164164 /* Copy the contents of the pixmap to the real window */