brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cursor: Move cursor caching layer to meta_cursor_reference_from_theme

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-03-31 16:10:58 -04:00
parent 0f810a4e21
commit 0efb0b47eb
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/meta-cursor-tracker-private.h
View File

@ -61,7 +61,7 @@ struct _MetaCursorTracker {
MetaCursorReference *root_cursor; MetaCursorReference *root_cursor;
MetaCursorReference *default_cursors[META_CURSOR_LAST]; MetaCursorReference *theme_cursors[META_CURSOR_LAST];
int current_x, current_y; int current_x, current_y;
MetaRectangle current_rect; MetaRectangle current_rect;

22
src/core/meta-cursor-tracker.c
View File

@ -85,8 +85,8 @@ meta_cursor_tracker_finalize (GObject *object)
meta_cursor_reference_unref (self->root_cursor); meta_cursor_reference_unref (self->root_cursor);
for (i = 0; i < META_CURSOR_LAST; i++) for (i = 0; i < META_CURSOR_LAST; i++)
if (self->default_cursors[i]) if (self->theme_cursors[i])
meta_cursor_reference_unref (self->default_cursors[i]); meta_cursor_reference_unref (self->theme_cursors[i]);
if (self->pipeline) if (self->pipeline)
cogl_object_unref (self->pipeline); cogl_object_unref (self->pipeline);
@ -371,27 +371,13 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
} }
} }
static MetaCursorReference *
ensure_wayland_cursor (MetaCursorTracker *tracker,
MetaCursor cursor)
{
if (!tracker->default_cursors[cursor])
{
tracker->default_cursors[cursor] = meta_cursor_reference_from_theme (tracker, cursor);
if (!tracker->default_cursors[cursor])
meta_warning ("Failed to load cursor from theme\n");
}
return meta_cursor_reference_ref (tracker->default_cursors[cursor]);
}
void void
meta_cursor_tracker_set_grab_cursor (MetaCursorTracker *tracker, meta_cursor_tracker_set_grab_cursor (MetaCursorTracker *tracker,
MetaCursor cursor) MetaCursor cursor)
{ {
g_clear_pointer (&tracker->grab_cursor, meta_cursor_reference_unref); g_clear_pointer (&tracker->grab_cursor, meta_cursor_reference_unref);
if (cursor != META_CURSOR_DEFAULT) if (cursor != META_CURSOR_DEFAULT)
tracker->grab_cursor = ensure_wayland_cursor (tracker, cursor); tracker->grab_cursor = meta_cursor_reference_from_theme (tracker, cursor);
sync_cursor (tracker); sync_cursor (tracker);
} }
@ -435,7 +421,7 @@ meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
if (meta_is_wayland_compositor ()) if (meta_is_wayland_compositor ())
{ {
g_clear_pointer (&tracker->root_cursor, meta_cursor_reference_unref); g_clear_pointer (&tracker->root_cursor, meta_cursor_reference_unref);
tracker->root_cursor = ensure_wayland_cursor (tracker, cursor); tracker->root_cursor = meta_cursor_reference_from_theme (tracker, cursor);
sync_cursor (tracker); sync_cursor (tracker);
} }
} }

3
src/core/meta-cursor.c
View File

@ -255,6 +255,9 @@ meta_cursor_reference_from_theme (MetaCursorTracker *tracker,
MetaCursorReference *self; MetaCursorReference *self;
XcursorImage *image; XcursorImage *image;
if (tracker->theme_cursors[cursor])
return meta_cursor_reference_ref (tracker->theme_cursors[cursor]);
image = load_cursor_on_client (tracker->screen->display, cursor); image = load_cursor_on_client (tracker->screen->display, cursor);
if (!image) if (!image)
return NULL; return NULL;