isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-20 03:54:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename MetaCursorReference to MetaCursorSprite

Browse Source 
It isn't really a reference to a MetaCursor enum, but a reference
counted cursor sprite, and enum value.

https://bugzilla.gnome.org/show_bug.cgi?id=744932
This commit is contained in:
Jonas Ådahl
2015-03-10 11:23:00 +08:00
parent fe8454d13f
commit 4b667d1e09
12 changed files with 172 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/wayland/meta-wayland-pointer.c
View File

@ -735,22 +735,23 @@ meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer)
if (pointer->current)
{
MetaCursorReference *cursor;
MetaCursorSprite *cursor_sprite;
if (pointer->cursor_surface && pointer->cursor_surface->buffer)
{
struct wl_resource *buffer = pointer->cursor_surface->buffer->resource;
cursor = meta_cursor_reference_from_buffer (buffer,
pointer->hotspot_x,
pointer->hotspot_y);
cursor_sprite = meta_cursor_sprite_from_buffer (buffer,
pointer->hotspot_x,
pointer->hotspot_y);
}
else
cursor = NULL;
cursor_sprite = NULL;
meta_cursor_tracker_set_window_cursor (pointer->cursor_tracker, cursor);
meta_cursor_tracker_set_window_cursor (pointer->cursor_tracker,
cursor_sprite);
if (cursor)
meta_cursor_reference_unref (cursor);
if (cursor_sprite)
meta_cursor_sprite_unref (cursor_sprite);
}
else
{