callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Ensure we get the master pointer on GdkDeviceManager::get_client_pointer

Browse Source 
Now that we have multiple master pointers, this call may pick the wrong one.
Instead, pick the GdkWaylandDeviceData from the first device, and pick the
master pointer from there.
This commit is contained in:
Carlos Garnacho
2015-11-19 20:04:46 +01:00
parent 04ecffa238
commit a72974252f
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gdk/wayland/gdkdevice-wayland.c
View File

@ -2412,21 +2412,16 @@ static GdkDevice *
gdk_wayland_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
{
GdkWaylandDeviceManager *wayland_device_manager;
GList *l;
GdkWaylandDeviceData *wd;
GdkDevice *device;
wayland_device_manager = GDK_WAYLAND_DEVICE_MANAGER (device_manager);
/* Find the first master pointer device */
for (l = wayland_device_manager->devices; l != NULL; l = l->next)
{
GdkDevice *device = l->data;
/* Find the master pointer of the first GdkWaylandDeviceData we find */
device = wayland_device_manager->devices->data;
wd = GDK_WAYLAND_DEVICE (device)->device;
if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE &&
gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_MASTER)
return device;
}
return NULL;
return wd->master_pointer;
}
static void