cursor-tracker: Split out the code that updates the new cursor

This commit is contained in:
Jasper St. Pierre 2014-03-31 15:04:49 -04:00
parent 5f52f55916
commit 863569b702

View File

@ -886,6 +886,20 @@ get_displayed_cursor (MetaCursorTracker *tracker)
return tracker->root_cursor; return tracker->root_cursor;
} }
static void
update_displayed_cursor (MetaCursorTracker *tracker)
{
if (meta_is_wayland_compositor ())
{
if (tracker->displayed_cursor)
cogl_pipeline_set_layer_texture (tracker->pipeline, 0, COGL_TEXTURE (displayed_cursor->texture));
else
cogl_pipeline_set_layer_texture (tracker->pipeline, 0, NULL);
update_hw_cursor (tracker);
}
}
static void static void
sync_displayed_cursor (MetaCursorTracker *tracker) sync_displayed_cursor (MetaCursorTracker *tracker)
{ {
@ -898,16 +912,7 @@ sync_displayed_cursor (MetaCursorTracker *tracker)
if (displayed_cursor) if (displayed_cursor)
tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor); tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor);
if (meta_is_wayland_compositor ()) update_displayed_cursor (tracker);
{
if (displayed_cursor)
cogl_pipeline_set_layer_texture (tracker->pipeline, 0, COGL_TEXTURE (displayed_cursor->texture));
else
cogl_pipeline_set_layer_texture (tracker->pipeline, 0, NULL);
update_hw_cursor (tracker);
}
g_signal_emit (tracker, signals[CURSOR_CHANGED], 0); g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
} }