nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Introduce a macro to flush a cairo surface twice. 

Flushing the surface twice is necessary due to a cairo bug. For context,
refer to #1989 and https://bugs.freedesktop.org/show_bug.cgi?id=92455.
This commit is contained in:
Ingo Bürk 2015-10-14 18:57:16 +02:00
parent 54dbbe2f06
commit 8178910f16
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
i3bar/include/cairo_util.h
View File

@ -10,6 +10,14 @@
#include <cairo/cairo-xcb.h> #include <cairo/cairo-xcb.h>
/* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989
* and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */
#define CAIRO_SURFACE_FLUSH(surface) \
do { \
cairo_surface_flush(surface); \
cairo_surface_flush(surface); \
} while (0)
/* Represents a color split by color channel. */ /* Represents a color split by color channel. */
typedef struct color_t { typedef struct color_t {
double red; double red;

8
i3bar/src/cairo_util.c
View File

@ -79,7 +79,7 @@ void cairo_set_source_color(surface_t *surface, color_t color) {
*/ */
void cairo_draw_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width) { void cairo_draw_text(i3String *text, surface_t *surface, color_t fg_color, color_t bg_color, int x, int y, int max_width) {
/* Flush any changes before we draw the text as this might use XCB directly. */ /* Flush any changes before we draw the text as this might use XCB directly. */
cairo_surface_flush(surface->surface); CAIRO_SURFACE_FLUSH(surface->surface);
set_font_colors(surface->gc, fg_color.colorpixel, bg_color.colorpixel); set_font_colors(surface->gc, fg_color.colorpixel, bg_color.colorpixel);
draw_text(text, surface->id, surface->gc, visual_type, x, y, max_width); draw_text(text, surface->id, surface->gc, visual_type, x, y, max_width);
@ -109,7 +109,7 @@ void cairo_draw_rectangle(surface_t *surface, color_t color, double x, double y,
/* Make sure we flush the surface for any text drawing operations that could follow. /* Make sure we flush the surface for any text drawing operations that could follow.
* Since we support drawing text via XCB, we need this. */ * Since we support drawing text via XCB, we need this. */
cairo_surface_flush(surface->surface); CAIRO_SURFACE_FLUSH(surface->surface);
cairo_restore(surface->cr); cairo_restore(surface->cr);
} }
@ -134,7 +134,7 @@ void cairo_copy_surface(surface_t *src, surface_t *dest, double src_x, double sr
/* Make sure we flush the surface for any text drawing operations that could follow. /* Make sure we flush the surface for any text drawing operations that could follow.
* Since we support drawing text via XCB, we need this. */ * Since we support drawing text via XCB, we need this. */
cairo_surface_flush(src->surface); CAIRO_SURFACE_FLUSH(src->surface);
cairo_surface_flush(dest->surface); CAIRO_SURFACE_FLUSH(dest->surface);
cairo_restore(dest->cr); cairo_restore(dest->cr);
} }

4
i3bar/src/xcb.c
View File

@ -248,7 +248,7 @@ void refresh_statusline(bool use_short_text) {
cairo_set_source_color(&statusline_surface, colors.bar_bg); cairo_set_source_color(&statusline_surface, colors.bar_bg);
cairo_set_operator(statusline_surface.cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(statusline_surface.cr, CAIRO_OPERATOR_SOURCE);
cairo_paint(statusline_surface.cr); cairo_paint(statusline_surface.cr);
cairo_surface_flush(statusline_surface.surface); CAIRO_SURFACE_FLUSH(statusline_surface.surface);
cairo_restore(statusline_surface.cr); cairo_restore(statusline_surface.cr);
/* Draw the text of each block. */ /* Draw the text of each block. */
@ -1801,7 +1801,7 @@ void draw_bars(bool unhide) {
cairo_set_source_color(&(outputs_walk->buffer), colors.bar_bg); cairo_set_source_color(&(outputs_walk->buffer), colors.bar_bg);
cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
cairo_paint(outputs_walk->buffer.cr); cairo_paint(outputs_walk->buffer.cr);
cairo_surface_flush(outputs_walk->buffer.surface); CAIRO_SURFACE_FLUSH(outputs_walk->buffer.surface);
cairo_restore(outputs_walk->buffer.cr); cairo_restore(outputs_walk->buffer.cr);
if (!config.disable_ws) { if (!config.disable_ws) {

3
libi3/font.c
View File

@ -133,6 +133,9 @@ static void draw_text_pango(const char *text, size_t text_len,
cairo_move_to(cr, x, y - yoffset); cairo_move_to(cr, x, y - yoffset);
pango_cairo_show_layout(cr, layout); pango_cairo_show_layout(cr, layout);
/* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989
* and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */
cairo_surface_flush(surface);
cairo_surface_flush(surface); cairo_surface_flush(surface);
/* Free resources */ /* Free resources */