AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 04:10:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix up _gtk_widget_list_devices

Browse Source 
When I rewrote that function to not use GdkDeviceManager,
I overlooked that the window filtering needs to apply
to the master pointer as well, as other code assumes
that _gtk_widget_get_device_window will return non-NULL
on the devices in the list. Fix this.
This commit is contained in:
Matthias Clasen 2017-11-27 12:34:08 -05:00
parent 8747c7a42a
commit 43e59258e4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkwidget.c
View File

@ -10274,6 +10274,9 @@ is_my_window (GtkWidget *widget,
{
gpointer user_data;
if (!window)
return FALSE;
gdk_window_get_user_data (window, &user_data);
return (user_data == widget);
}
@ -10320,6 +10323,7 @@ _gtk_widget_list_devices (GtkWidget *widget)
GList *result = NULL;
GList *devices;
GList *l;
GdkDevice *device;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
@ -10327,14 +10331,15 @@ _gtk_widget_list_devices (GtkWidget *widget)
return NULL;
seat = gdk_display_get_default_seat (gtk_widget_get_display (widget));
result = g_list_prepend (result, gdk_seat_get_pointer (seat));
device = gdk_seat_get_pointer (seat);
if (is_my_window (widget, gdk_device_get_last_event_window (device)))
result = g_list_prepend (result, device);
devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL_POINTING);
for (l = devices; l; l = l->next)
{
GdkDevice *device = l->data;
GdkWindow *window = gdk_device_get_last_event_window (device);
if (window && is_my_window (widget, window))
device = l->data;
if (is_my_window (widget, gdk_device_get_last_event_window (device)))
result = g_list_prepend (result, device);
}
g_list_free (devices);