From cc5842463d2777ad0b8043f4d179bcd6faa7fab9 Mon Sep 17 00:00:00 2001 From: o9000 Date: Thu, 23 Nov 2017 22:38:55 +0100 Subject: [PATCH] Simplify get_text_size --- src/util/common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/util/common.c b/src/util/common.c index 08c2826..b0ae1d6 100644 --- a/src/util/common.c +++ b/src/util/common.c @@ -937,10 +937,9 @@ void get_text_size2(const PangoFontDescription *font, available_width = MAX(0, available_width); available_height = MAX(0, available_height); - Pixmap pmap = XCreatePixmap(server.display, server.root_win, available_height, available_width, server.depth); cairo_surface_t *cs = - cairo_xlib_surface_create(server.display, pmap, server.visual, available_height, available_width); + cairo_image_surface_create(CAIRO_FORMAT_ARGB32, available_height, available_width); cairo_t *c = cairo_create(cs); PangoLayout *layout = pango_cairo_create_layout(c); @@ -964,7 +963,6 @@ void get_text_size2(const PangoFontDescription *font, g_object_unref(layout); cairo_destroy(c); cairo_surface_destroy(cs); - XFreePixmap(server.display, pmap); } #if !GLIB_CHECK_VERSION(2, 34, 0)