From 6af944fe2c9b9d9b7cd1c1710aa885ba0b3d37ff Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 27 May 2014 14:21:54 -0400 Subject: [PATCH] native: Add a warp_pointer implementation Use the new clutter_evdev_warp_pointer method to implement it. --- src/backends/meta-backend.c | 9 --------- src/backends/native/meta-backend-native.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c index 24da0ddcf..3cfb95110 100644 --- a/src/backends/meta-backend.c +++ b/src/backends/meta-backend.c @@ -103,14 +103,6 @@ meta_backend_real_ungrab_device (MetaBackend *backend, return TRUE; } -static void -meta_backend_real_warp_pointer (MetaBackend *backend, - int x, - int y) -{ - /* Do nothing */ -} - static void meta_backend_class_init (MetaBackendClass *klass) { @@ -122,7 +114,6 @@ meta_backend_class_init (MetaBackendClass *klass) klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer; klass->grab_device = meta_backend_real_grab_device; klass->ungrab_device = meta_backend_real_ungrab_device; - klass->warp_pointer = meta_backend_real_warp_pointer; } static void diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index ea40d55ae..e21788020 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -174,6 +174,20 @@ meta_backend_native_create_cursor_renderer (MetaBackend *backend) return g_object_new (META_TYPE_CURSOR_RENDERER_NATIVE, NULL); } +static void +meta_backend_native_warp_pointer (MetaBackend *backend, + int x, + int y) +{ + ClutterDeviceManager *manager = clutter_device_manager_get_default (); + ClutterInputDevice *device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE); + + /* XXX */ + guint32 time_ = 0; + + clutter_evdev_warp_pointer (device, time_, x, y); +} + static void meta_backend_native_class_init (MetaBackendNativeClass *klass) { @@ -183,6 +197,8 @@ meta_backend_native_class_init (MetaBackendNativeClass *klass) backend_class->create_idle_monitor = meta_backend_native_create_idle_monitor; backend_class->create_monitor_manager = meta_backend_native_create_monitor_manager; backend_class->create_cursor_renderer = meta_backend_native_create_cursor_renderer; + + backend_class->warp_pointer = meta_backend_native_warp_pointer; } static void