wayland: Ensure that _get_client_pointer returns a pointer

[~andy/gtk] / gdk / wayland / gdkdevice-wayland.c

diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 074f56fdcae03638a6ab5d4302468a344bec6215..6bd993a5d12171f9024437a85f8439552e0f1706 100644 (file)
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -1320,9 +1320,20 @@ static GdkDevice *
 gdk_device_manager_core_get_client_pointer (GdkDeviceManager *device_manager)
 {
   GdkDeviceManagerCore *device_manager_core;
+  GList *l;
 
   device_manager_core = (GdkDeviceManagerCore *) device_manager;
-  return device_manager_core->devices->data;
+
+  /* Find the first pointer device */
+  for (l = device_manager_core->devices; l != NULL; l = l->next)
+    {
+      GdkDevice *device = l->data;
+
+      if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE)
+        return device;
+    }
+
+  return NULL;
 }
 
 static void