Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkWindow: Avoid GdkDeviceManager API

Browse Source 
We can iterate over the seats' pointers, instead of over master pointers.
This commit is contained in:
Carlos Garnacho
2015-12-16 19:26:21 +01:00
parent 0f98f225d1
commit 4a7589ea12
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkwindow.c
View File

@@ -8124,35 +8124,29 @@ do_focus_change (GtkWidget *widget,
static gboolean
gtk_window_has_mnemonic_modifier_pressed (GtkWindow *window)
{
GList *devices, *d;
GdkDeviceManager *device_manager;
GList *seats, *s;
gboolean retval = FALSE;
if (!window->priv->mnemonic_modifier)
return FALSE;
device_manager = gdk_display_get_device_manager (gtk_widget_get_display (GTK_WIDGET (window)));
devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
seats = gdk_display_list_seats (gtk_widget_get_display (GTK_WIDGET (window)));
for (d = devices; d; d = d->next)
for (s = seats; s; s = s->next)
{
GdkDevice *dev = d->data;
GdkDevice *dev = gdk_seat_get_pointer (s->data);
GdkModifierType mask;
if (gdk_device_get_source (dev) == GDK_SOURCE_MOUSE)
gdk_device_get_state (dev, _gtk_widget_get_window (GTK_WIDGET (window)),
NULL, &mask);
if (window->priv->mnemonic_modifier == (mask & gtk_accelerator_get_default_mod_mask ()))
{
GdkModifierType mask;
gdk_device_get_state (dev, _gtk_widget_get_window (GTK_WIDGET (window)),
NULL, &mask);
if (window->priv->mnemonic_modifier == (mask & gtk_accelerator_get_default_mod_mask ()))
{
retval = TRUE;
break;
}
retval = TRUE;
break;
}
}
g_list_free (devices);
g_list_free (seats);
return retval;
}