isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-11 00:26:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

cursor-tracker: Don't assume we're a Wayland compositor

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-12-05 15:36:46 -05:00
parent 29197d40c6
commit c36aa5e696
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -696,7 +696,6 @@ meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
return FALSE; return FALSE;
set_window_cursor (tracker, FALSE, NULL); set_window_cursor (tracker, FALSE, NULL);
g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
return TRUE; return TRUE;
} }
@ -970,12 +969,15 @@ 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 (displayed_cursor) if (meta_is_wayland_compositor ())
cogl_pipeline_set_layer_texture (tracker->pipeline, 0, COGL_TEXTURE (displayed_cursor->texture)); {
else if (displayed_cursor)
cogl_pipeline_set_layer_texture (tracker->pipeline, 0, NULL); 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); update_hw_cursor (tracker);
}
g_signal_emit (tracker, signals[CURSOR_CHANGED], 0); g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
} }
@ -1034,10 +1036,13 @@ sync_cursor (MetaCursorTracker *tracker)
tracker->current_rect.height = 0; tracker->current_rect.height = 0;
} }
if (tracker->has_hw_cursor) if (meta_is_wayland_compositor ())
move_hw_cursor (tracker); {
else if (tracker->has_hw_cursor)
meta_cursor_tracker_queue_redraw (tracker); move_hw_cursor (tracker);
else
meta_cursor_tracker_queue_redraw (tracker);
}
} }
void void