Attachment 1600715 Details for Bug 1737326 – iconcache: Avoid xrender picture formats when creating cairo surface

[patch] iconcache: Avoid xrender picture formats when creating cairo surface

0001-iconcache-Avoid-xrender-picture-formats-when-creatin.patch (text/plain), 2.52 KB, created by Ray Strode [halfline] on 2019-08-05 18:48:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2019-08-05 18:48:27 UTC

Size: 2.52 KB

patch

obsolete

>From 4901b6ee8fe4359f9642fc44315b37adcd13fd97 Mon Sep 17 00:00:00 2001
>From: Ray Strode <rstrode@redhat.com>
>Date: Mon, 5 Aug 2019 14:39:21 -0400
>Subject: [PATCH] iconcache: Avoid xrender picture formats when creating cairo
> surface
>
>If an application provides its window icon via wmhints, then mutter
>loads the pixmap specified by the application into a cairo xlib surface. When
>creating the surface it specifies the visual, indirectly, via an XRender
>picture format.
>
>This is suboptimal, since XRender picture formats don't have a way to specify
>16bpp depth, which an application may be using.
>
>In particular, applications are likely to use 16bpp depth pixmaps for their
>icons, if the video card offers a 16bpp framebuffer/root window.
>
>This commit drops the XRender middleman, and just tells cairo a visual to use
>directly.
>---
> src/x11/iconcache.c | 32 ++++++--------------------------
> 1 file changed, 6 insertions(+), 26 deletions(-)
>
>diff --git a/src/x11/iconcache.c b/src/x11/iconcache.c
>index 69d4d14..521c77b 100644
>--- a/src/x11/iconcache.c
>+++ b/src/x11/iconcache.c
>@@ -288,35 +288,12 @@ get_pixmap_geometry (MetaX11Display *x11_display,
>     *d = depth;
> }
> 
>-static int
>-standard_pict_format_for_depth (int depth)
>-{
>-  switch (depth)
>-    {
>-    case 1:
>-      return PictStandardA1;
>-    case 24:
>-      return PictStandardRGB24;
>-    case 16:
>-    case 32:
>-      return PictStandardARGB32;
>-    default:
>-      g_assert_not_reached ();
>-    }
>-  return 0;
>-}
>-
>-static XRenderPictFormat *
>-pict_format_for_depth (Display *xdisplay, int depth)
>-{
>-  return XRenderFindStandardFormat (xdisplay, standard_pict_format_for_depth (depth));
>-}
>-
> static cairo_surface_t *
> surface_from_pixmap (Display *xdisplay, Pixmap xpixmap,
>                      int width, int height)
> {
>   Window root_return;
>+  XVisualInfo visual_info;
>   int x_ret, y_ret;
>   unsigned int w_ret, h_ret, bw_ret, depth_ret;
> 
>@@ -324,8 +301,11 @@ surface_from_pixmap (Display *xdisplay, Pixmap xpixmap,
>                      &x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
>     return NULL;
> 
>-  return cairo_xlib_surface_create_with_xrender_format (xdisplay, xpixmap, DefaultScreenOfDisplay (xdisplay),
>-                                                        pict_format_for_depth (xdisplay, depth_ret), w_ret, h_ret);
>+  if (!XMatchVisualInfo (xdisplay, DefaultScreen (xdisplay),
>+                         depth_ret, TrueColor, &visual_info))
>+    return NULL;
>+
>+  return cairo_xlib_surface_create (xdisplay, xpixmap, visual_info.visual, w_ret, h_ret);
> }
> 
> static gboolean
>-- 
>2.18.1
>

Actions: View | Diff

Attachments on bug 1737326: 1600715