isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

iconcache: Correctly interpret monochrome icons

Browse Source 
Getting the contents of a depth-1 pixmap through cairo gives us
an alpha pixmap. We need to convert to a monochrome pixmap
as is expected by the ICCCM definition of WM_HINTS.

https://bugzilla.gnome.org/show_bug.cgi?id=641975
This commit is contained in:
Owen W. Taylor 2011-03-21 18:45:20 -04:00
parent 92663c81f5
commit 654d966e6c
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/iconcache.c
View File

@ -323,6 +323,40 @@ get_pixmap_geometry (MetaDisplay *display,
*d = depth; *d = depth;
} }
static void
apply_foreground_background (GdkPixbuf *pixbuf)
{
int w, h;
int i, j;
guchar *pixels;
int stride;
w = gdk_pixbuf_get_width (pixbuf);
h = gdk_pixbuf_get_height (pixbuf);
pixels = gdk_pixbuf_get_pixels (pixbuf);
stride = gdk_pixbuf_get_rowstride (pixbuf);
i = 0;
while (i < h)
{
j = 0;
while (j < w)
{
guchar *p = pixels + i * stride + j * 4;
if (p[3] == 0)
p[0] = p[1] = p[2] = 0xff; /* white background */
else
p[0] = p[1] = p[2] = 0x00; /* black foreground */
p[3] = 0xff;
++j;
}
++i;
}
}
static GdkPixbuf* static GdkPixbuf*
apply_mask (GdkPixbuf *pixbuf, apply_mask (GdkPixbuf *pixbuf,
GdkPixbuf *mask) GdkPixbuf *mask)
@ -379,19 +413,25 @@ try_pixmap_and_mask (MetaDisplay *display,
{ {
GdkPixbuf *unscaled = NULL; GdkPixbuf *unscaled = NULL;
GdkPixbuf *mask = NULL; GdkPixbuf *mask = NULL;
int w, h; int w, h, d;
if (src_pixmap == None) if (src_pixmap == None)
return FALSE; return FALSE;
meta_error_trap_push (display); meta_error_trap_push (display);
get_pixmap_geometry (display, src_pixmap, &w, &h, NULL); get_pixmap_geometry (display, src_pixmap, &w, &h, &d);
unscaled = meta_gdk_pixbuf_get_from_pixmap (src_pixmap, unscaled = meta_gdk_pixbuf_get_from_pixmap (src_pixmap,
0, 0, 0, 0,
w, h); w, h);
/* A depth 1 pixmap has 0 background, and 1 foreground, but
* cairo and meta_gdk_pixbuf_get_from_pixmap consider it
* to be 0 transparent, 1 opaque */
if (d == 1)
apply_foreground_background (unscaled);
if (unscaled && src_mask != None) if (unscaled && src_mask != None)
{ {
get_pixmap_geometry (display, src_mask, &w, &h, NULL); get_pixmap_geometry (display, src_mask, &w, &h, NULL);