isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11: Change the iconcache / window icons to being cairo surfaces

Browse Source 
This simplifies the drawing codepath and makes us able to delete
a bunch of GdkPixbuf manipulation.
This commit is contained in:
Jasper St. Pierre
2014-12-31 20:39:36 -08:00
parent f3d30d897f
commit af7f51b992
11 changed files with 154 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.c
View File

@ -120,7 +120,7 @@ meta_core_get (Display *xdisplay,
*((MetaFrameType*)answer) = meta_window_get_frame_type (window);
break;
case META_CORE_GET_MINI_ICON:
*((GdkPixbuf**)answer) = window->mini_icon;
*((cairo_surface_t**)answer) = window->mini_icon;
break;
case META_CORE_GET_FRAME_RECT:
meta_window_get_frame_rect (window, ((MetaRectangle*)answer));

10
src/core/window-private.h
View File

@ -106,8 +106,8 @@ struct _MetaWindow
char *desc; /* used in debug spew */
char *title;
GdkPixbuf *icon;
GdkPixbuf *mini_icon;
cairo_surface_t *icon;
cairo_surface_t *mini_icon;
MetaWindowType type;
@ -479,9 +479,9 @@ struct _MetaWindowClass
void (*get_default_skip_hints) (MetaWindow *window,
gboolean *skip_taskbar_out,
gboolean *skip_pager_out);
gboolean (*update_icon) (MetaWindow *window,
GdkPixbuf **icon,
GdkPixbuf **mini_icon);
gboolean (*update_icon) (MetaWindow *window,
cairo_surface_t **icon,
cairo_surface_t **mini_icon);
};
/* These differ from window->has_foo_func in that they consider

36
src/core/window.c
View File

@ -244,9 +244,9 @@ meta_window_real_get_default_skip_hints (MetaWindow *window,
}
static gboolean
meta_window_real_update_icon (MetaWindow *window,
GdkPixbuf **icon,
GdkPixbuf **mini_icon)
meta_window_real_update_icon (MetaWindow *window,
cairo_surface_t **icon,
cairo_surface_t **mini_icon)
{
*icon = NULL;
*mini_icon = NULL;
@ -259,10 +259,10 @@ meta_window_finalize (GObject *object)
MetaWindow *window = META_WINDOW (object);
if (window->icon)
g_object_unref (G_OBJECT (window->icon));
cairo_surface_destroy (window->icon);
if (window->mini_icon)
g_object_unref (G_OBJECT (window->mini_icon));
cairo_surface_destroy (window->mini_icon);
if (window->frame_bounds)
cairo_region_destroy (window->frame_bounds);
@ -4890,10 +4890,11 @@ redraw_icon (MetaWindow *window)
meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow);
}
static GdkPixbuf *
static cairo_surface_t *
load_default_window_icon (int size)
{
GtkIconTheme *theme = gtk_icon_theme_get_default ();
GdkPixbuf *pixbuf;
const char *icon_name;
if (gtk_icon_theme_has_icon (theme, META_DEFAULT_ICON_NAME))
@ -4901,13 +4902,14 @@ load_default_window_icon (int size)
else
icon_name = "image-missing";
return gtk_icon_theme_load_icon (theme, icon_name, size, 0, NULL);
pixbuf = gtk_icon_theme_load_icon (theme, icon_name, size, 0, NULL);
return gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, NULL);
}
static GdkPixbuf *
static cairo_surface_t *
get_default_window_icon (void)
{
static GdkPixbuf *default_icon = NULL;
static cairo_surface_t *default_icon = NULL;
if (default_icon == NULL)
{
@ -4915,13 +4917,13 @@ get_default_window_icon (void)
g_assert (default_icon);
}
return g_object_ref (default_icon);
return cairo_surface_reference (default_icon);
}
static GdkPixbuf *
static cairo_surface_t *
get_default_mini_icon (void)
{
static GdkPixbuf *default_icon = NULL;
static cairo_surface_t *default_icon = NULL;
if (default_icon == NULL)
{
@ -4929,7 +4931,7 @@ get_default_mini_icon (void)
g_assert (default_icon);
}
return g_object_ref (default_icon);
return cairo_surface_reference (default_icon);
}
static void
@ -4937,8 +4939,8 @@ meta_window_update_icon_now (MetaWindow *window,
gboolean force)
{
gboolean changed;
GdkPixbuf *icon = NULL;
GdkPixbuf *mini_icon;
cairo_surface_t *icon = NULL;
cairo_surface_t *mini_icon;
g_return_if_fail (!window->override_redirect);
@ -4947,14 +4949,14 @@ meta_window_update_icon_now (MetaWindow *window,
if (changed || force)
{
if (window->icon)
g_object_unref (window->icon);
cairo_surface_destroy (window->icon);
if (icon)
window->icon = icon;
else
window->icon = get_default_window_icon ();
if (window->mini_icon)
g_object_unref (window->mini_icon);
cairo_surface_destroy (window->mini_icon);
if (mini_icon)
window->mini_icon = mini_icon;
else