nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "do not draw text with cairo directly on xlib pixmap (workaround for intel graphics bug, see emacs implementation) (issue #731, issue #732)"

Browse source 
This reverts commit e1211a929f.
This commit is contained in:
Chris Lee 2019-03-09 12:23:20 +01:00
parent 2f372364f0
commit bff1a337f3
3 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/util/area.c
View file

@ -478,14 +478,14 @@ void draw(Area *a)
a->_clear(a);
}
cairo_surface_t *cs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, a->width, a->height);
cairo_surface_t *cs = cairo_xlib_surface_create(server.display, a->pix, server.visual, 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);
}

16
src/util/common.c
View file

@ -1229,19 +1229,3 @@ 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);
}

2
src/util/common.h
View file

@ -154,8 +154,6 @@ 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); \