diff --git a/src/backends/meta-backend-private.h b/src/backends/meta-backend-private.h index 39b42c4b5..211e341c9 100644 --- a/src/backends/meta-backend-private.h +++ b/src/backends/meta-backend-private.h @@ -150,4 +150,6 @@ gboolean meta_is_stage_views_enabled (void); MetaInputSettings *meta_backend_get_input_settings (MetaBackend *backend); +void meta_backend_update_cursor_position (MetaBackend *backend, int x, int y); + #endif /* META_BACKEND_PRIVATE_H */ diff --git a/src/backends/meta-cursor-tracker-private.h b/src/backends/meta-cursor-tracker-private.h index 24f8b85cb..8698b9866 100644 --- a/src/backends/meta-cursor-tracker-private.h +++ b/src/backends/meta-cursor-tracker-private.h @@ -61,10 +61,6 @@ void meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker); void meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker, MetaCursorSprite *cursor_sprite); -void meta_cursor_tracker_update_position (MetaCursorTracker *tracker, - int new_x, - int new_y); - MetaCursorSprite * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker); #endif diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c index 3e1d76bd7..d0c523726 100644 --- a/src/backends/meta-cursor-tracker.c +++ b/src/backends/meta-cursor-tracker.c @@ -348,20 +348,6 @@ meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker, sync_cursor (tracker); } -void -meta_cursor_tracker_update_position (MetaCursorTracker *tracker, - int new_x, - int new_y) -{ - MetaBackend *backend = meta_get_backend (); - MetaCursorRenderer *cursor_renderer = - meta_backend_get_cursor_renderer (backend); - - g_assert (meta_is_wayland_compositor ()); - - meta_cursor_renderer_set_position (cursor_renderer, new_x, new_y); -} - static void get_pointer_position_gdk (int *x, int *y, diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 83060d1d2..eb752b840 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -322,7 +322,6 @@ meta_backend_native_warp_pointer (MetaBackend *backend, { ClutterDeviceManager *manager = clutter_device_manager_get_default (); ClutterInputDevice *device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE); - MetaCursorTracker *cursor_tracker = meta_backend_get_cursor_tracker (backend); /* XXX */ guint32 time_ = 0; @@ -331,7 +330,7 @@ meta_backend_native_warp_pointer (MetaBackend *backend, clutter_evdev_warp_pointer (device, time_, x, y); /* Warp displayed pointer cursor. */ - meta_cursor_tracker_update_position (cursor_tracker, x, y); + meta_backend_set_cursor_position (backend, x, y); } static MetaLogicalMonitor * diff --git a/src/core/events.c b/src/core/events.c index c8c2a7d74..6f1a8a1ee 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -251,10 +251,7 @@ meta_display_handle_event (MetaDisplay *display, } else { - MetaCursorTracker *cursor_tracker = - meta_backend_get_cursor_tracker (backend); - - meta_cursor_tracker_update_position (cursor_tracker, + meta_backend_update_cursor_position (cursor_tracker, event->motion.x, event->motion.y); }