diff --git a/src/util/area.c b/src/util/area.c index c1cc949..f19562e 100644 --- a/src/util/area.c +++ b/src/util/area.c @@ -478,14 +478,14 @@ void draw(Area *a) a->_clear(a); } - cairo_surface_t *cs = cairo_xlib_surface_create(server.display, a->pix, server.visual, a->width, a->height); + cairo_surface_t *cs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, a->width, a->height); cairo_t *c = cairo_create(cs); draw_background(a, c); - if (a->_draw_foreground) a->_draw_foreground(a, c); + draw_cairo_surface_to_xpixmap(cs, a->pix); cairo_destroy(c); cairo_surface_destroy(cs); } diff --git a/src/util/common.c b/src/util/common.c index 7d868c1..a22a9bc 100644 --- a/src/util/common.c +++ b/src/util/common.c @@ -1229,3 +1229,19 @@ void dump_image_data(const char *file_name, const char *name) imlib_free_image(); } + +void draw_cairo_surface_to_xpixmap(cairo_surface_t *cs, Pixmap pix) +{ + int w = cairo_image_surface_get_width(cs); + int h = cairo_image_surface_get_height(cs); + cairo_surface_t *cs_xlib = cairo_xlib_surface_create(server.display, pix, server.visual, w, h); + cairo_xlib_surface_set_size(cs_xlib, w, h); + cairo_t *c_xlib = cairo_create(cs_xlib); + + cairo_set_source_surface(c_xlib, cs, 0, 0); + cairo_paint(c_xlib); + cairo_surface_flush(cs_xlib); + + cairo_destroy(c_xlib); + cairo_surface_destroy(cs_xlib); +} diff --git a/src/util/common.h b/src/util/common.h index 8eb2729..b41e020 100644 --- a/src/util/common.h +++ b/src/util/common.h @@ -154,6 +154,8 @@ void get_image_mean_color(const Imlib_Image image, Color *mean_color); void dump_image_data(const char *file_name, const char *name); +void draw_cairo_surface_to_xpixmap(cairo_surface_t *cs, Pixmap pix); + #define free_and_null(p) \ { \ free(p); \