applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Flush cairo surface after drawing text.

Browse Source 
This is necessary to avoid a bug where a cairo assertion fails because no snapshot is available.

fixes #1989
This commit is contained in:
Ingo Bürk 2015-10-13 11:08:10 +02:00
parent d24964ff6a
commit 54dbbe2f06
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
i3bar/src/cairo_util.c
View File

@ -78,9 +78,13 @@ 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. */
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);
/* Notify cairo that we (possibly) used another way to draw on the surface. */
cairo_surface_mark_dirty(surface->surface); cairo_surface_mark_dirty(surface->surface);
} }
@ -130,6 +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(dest->surface); cairo_surface_flush(dest->surface);
cairo_restore(dest->cr); cairo_restore(dest->cr);
} }

2
libi3/font.c
View File

@ -133,6 +133,8 @@ 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);
cairo_surface_flush(surface);
/* Free resources */ /* Free resources */
g_object_unref(layout); g_object_unref(layout);
cairo_destroy(cr); cairo_destroy(cr);