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

x11: Try harder to find a core pointer

Browse Source 
We currently just look for a master device with input source MOUSE.
After recent changes to the way input devices are classified, xwayland
on my system comes up with a virtual core pointer that has input
source TOUCHSCREEN. This was causing assertion failures. Be a little
more careful and accept a touchscreen as core pointer, if there is
no mouse.
This commit is contained in:
Matthias Clasen
2015-11-16 18:31:37 -05:00
parent e24c248013
commit c659292940
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gdk/x11/gdkdisplay-x11.c
View File

@ -1342,6 +1342,7 @@ gdk_x11_display_init_input (GdkDisplay *display)
GdkDeviceManager *device_manager; GdkDeviceManager *device_manager;
GdkDevice *device; GdkDevice *device;
GList *list, *l; GList *list, *l;
gint pass;
display_x11 = GDK_X11_DISPLAY (display); display_x11 = GDK_X11_DISPLAY (display);
device_manager = gdk_display_get_device_manager (display); device_manager = gdk_display_get_device_manager (display);
@ -1365,25 +1366,31 @@ gdk_x11_display_init_input (GdkDisplay *display)
g_list_free (list); g_list_free (list);
/* Now set "core" pointer to the first /* Now set "core" pointer to the first
* master device that is a pointer. * master device that is a pointer,
* preferring mice over touchscreens.
*/ */
list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER); list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
for (l = list; l; l = l->next) for (pass = 0; pass < 2; pass++)
{ {
device = l->data; for (l = list; l; l = l->next)
{
device = l->data;
if (gdk_device_get_source (device) != GDK_SOURCE_MOUSE) if ((pass == 0 && gdk_device_get_source (device) == GDK_SOURCE_MOUSE) ||
continue; (pass == 1 && gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN))
{
display->core_pointer = device;
display->core_pointer = device; /* Add the core pointer to the devices list */
break; display_x11->input_devices = g_list_prepend (display_x11->input_devices,
g_object_ref (display->core_pointer));
goto out;
}
}
} }
/* Add the core pointer to the devices list */ out:
display_x11->input_devices = g_list_prepend (display_x11->input_devices,
g_object_ref (display->core_pointer));
g_list_free (list); g_list_free (list);
} }