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

cursor-tracker: Rearrange code

Browse Source 
Move take_texture closer to where it's used, and add hot_x / hot_y args.
This commit is contained in:
Jasper St. Pierre 2014-03-31 14:26:28 -04:00
parent 08a8254deb
commit b64d14ff4a
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,19 +341,6 @@ meta_cursor_reference_from_theme (MetaCursorTracker *tracker,
return self; return self;
} }
static MetaCursorReference *
meta_cursor_reference_take_texture (CoglTexture2D *texture)
{
MetaCursorReference *self;
self = g_slice_new0 (MetaCursorReference);
self->ref_count = 1;
self->texture = texture;
return self;
}
static MetaCursorReference * static MetaCursorReference *
meta_cursor_reference_from_buffer (MetaCursorTracker *tracker, meta_cursor_reference_from_buffer (MetaCursorTracker *tracker,
struct wl_resource *buffer, struct wl_resource *buffer,
@ -659,6 +646,22 @@ meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
return TRUE; return TRUE;
} }
static MetaCursorReference *
meta_cursor_reference_take_texture (CoglTexture2D *texture,
int hot_x,
int hot_y)
{
MetaCursorReference *self;
self = g_slice_new0 (MetaCursorReference);
self->ref_count = 1;
self->texture = texture;
self->hot_x = hot_x;
self->hot_y = hot_y;
return self;
}
static void static void
ensure_xfixes_cursor (MetaCursorTracker *tracker) ensure_xfixes_cursor (MetaCursorTracker *tracker)
{ {
@ -715,10 +718,9 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
if (sprite != NULL) if (sprite != NULL)
{ {
MetaCursorReference *cursor = meta_cursor_reference_take_texture (sprite); MetaCursorReference *cursor = meta_cursor_reference_take_texture (sprite,
cursor->hot_x = cursor_image->xhot; cursor_image->xhot,
cursor->hot_y = cursor_image->yhot; cursor_image->yhot);
set_window_cursor (tracker, TRUE, cursor); set_window_cursor (tracker, TRUE, cursor);
} }
XFree (cursor_image); XFree (cursor_image);