AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-06 02:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Refactor gtk_widget_set_device_enabled_internal

Browse Source 
Instead of constructing a single list of all windows associated
to a widget, just iterate the children lists recursively, avoiding
allocations.
This commit is contained in:
Matthias Clasen 2015-09-26 10:12:16 -04:00
parent ce8616f44c
commit 1cac30b6f3
1 changed files with 43 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
gtk/gtkwidget.c
View File

@ -4983,90 +4983,74 @@ _gtk_widget_enable_device_events (GtkWidget *widget)
} }
} }
static GList * typedef struct {
get_widget_windows (GtkWidget *widget) GtkWidget *widget;
{ GdkDevice *device;
GList *window_list, *last, *l, *children, *ret; gboolean enabled;
} DeviceEnableData;
if (_gtk_widget_get_has_window (widget))
window_list = g_list_prepend (NULL, gtk_widget_get_window (widget));
else
window_list = gdk_window_get_children (gtk_widget_get_window (widget));
last = g_list_last (window_list);
ret = NULL;
for (l = window_list; l; l = l->next)
{
GtkWidget *window_widget = NULL;
gdk_window_get_user_data (l->data, (gpointer *) &window_widget);
if (widget != window_widget)
continue;
ret = g_list_prepend (ret, l->data);
children = gdk_window_get_children (GDK_WINDOW (l->data));
if (children)
{
last = g_list_concat (last, children);
last = g_list_last (last);
}
}
g_list_free (window_list);
return ret;
}
static void static void
device_enable_foreach (GtkWidget *widget, device_enable_foreach (GtkWidget *widget,
gpointer user_data) gpointer user_data)
{ {
GdkDevice *device = user_data; DeviceEnableData *data = user_data;
gtk_widget_set_device_enabled_internal (widget, device, TRUE, TRUE); gtk_widget_set_device_enabled_internal (widget, data->device, TRUE, data->enabled);
} }
static void static void
device_disable_foreach (GtkWidget *widget, device_enable_foreach_window (gpointer win,
gpointer user_data) gpointer user_data)
{ {
GdkDevice *device = user_data; GdkWindow *window = win;
gtk_widget_set_device_enabled_internal (widget, device, TRUE, FALSE); DeviceEnableData *data = user_data;
GdkEventMask events;
GtkWidget *window_widget;
GList *window_list;
gdk_window_get_user_data (window, (gpointer *) &window_widget);
if (data->widget != window_widget)
return;
if (data->enabled)
events = gdk_window_get_events (window);
else
events = 0;
gdk_window_set_device_events (window, data->device, events);
window_list = gdk_window_peek_children (window);
g_list_foreach (window_list, device_enable_foreach_window, data);
} }
static void void
gtk_widget_set_device_enabled_internal (GtkWidget *widget, gtk_widget_set_device_enabled_internal (GtkWidget *widget,
GdkDevice *device, GdkDevice *device,
gboolean recurse, gboolean recurse,
gboolean enabled) gboolean enabled)
{ {
GList *window_list, *l; DeviceEnableData data;
window_list = get_widget_windows (widget); data.widget = widget;
data.device = device;
data.enabled = enabled;
for (l = window_list; l; l = l->next) if (_gtk_widget_get_has_window (widget))
{ {
GdkEventMask events = 0;
GdkWindow *window; GdkWindow *window;
window = l->data; window = gtk_widget_get_window (widget);
device_enable_foreach_window (window, &data);
}
else
{
GList *window_list;
if (enabled) window_list = gdk_window_peek_children (gtk_widget_get_window (widget));
events = gdk_window_get_events (window); g_list_foreach (window_list, device_enable_foreach_window, &data);
gdk_window_set_device_events (window, device, events);
} }
if (recurse && GTK_IS_CONTAINER (widget)) if (recurse && GTK_IS_CONTAINER (widget))
{ gtk_container_forall (GTK_CONTAINER (widget), device_enable_foreach, &data);
if (enabled)
gtk_container_forall (GTK_CONTAINER (widget), device_enable_foreach, device);
else
gtk_container_forall (GTK_CONTAINER (widget), device_disable_foreach, device);
}
g_list_free (window_list);
} }
static void static void