widget: Remove controller sequence-state-changed signal connection

We can avoid a signal connection per event controller (and the
EventControllerData struct) since every event controller knows the
widget it's attached to.

diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index 66bb04fc3862abac32498dbd44a4e166ee27d6d3..f9673ebf141082f2fe5e5cae1ce946f4c9b8eef9 100644 (file)
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -1046,6 +1046,8 @@ gtk_gesture_set_sequence_state (GtkGesture            *gesture,
     return FALSE;
 
   data->state = state;
+  gtk_widget_cancel_event_sequence (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)),
+                                    gesture, sequence, state);
   g_signal_emit (gesture, signals[SEQUENCE_STATE_CHANGED], 0,
                  sequence, state);
 

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index a52c0563ca69c86e356a84fca5515d44a1817921..4727e37b4d9412c6bacb7435657ef632906da575 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -455,11 +455,6 @@ typedef struct {
   GDestroyNotify        destroy_notify;
 } GtkWidgetTemplate;
 
-typedef struct {
-  GtkEventController *controller;
-  guint sequence_state_changed_id;
-} EventControllerData;
-
 struct _GtkWidgetClassPrivate
 {
   GtkWidgetTemplate *template;
@@ -853,16 +848,16 @@ gtk_widget_real_grab_notify (GtkWidget *widget,
 
   for (l = g_list_last (priv->event_controllers); l; l = l->prev)
     {
-      EventControllerData *data = l->data;
+      GtkEventController *controller = l->data;
       GdkDevice *device = NULL;
 
-      if (GTK_IS_GESTURE (data->controller))
-        device = gtk_gesture_get_device (GTK_GESTURE (data->controller));
+      if (GTK_IS_GESTURE (controller))
+        device = gtk_gesture_get_device (GTK_GESTURE (controller));
 
       if (!device || !gtk_widget_device_is_shadowed (widget, device))
         continue;
 
-      gtk_event_controller_reset (data->controller);
+      gtk_event_controller_reset (controller);
     }
 }
 
@@ -2667,18 +2662,18 @@ _gtk_widget_get_last_event (GtkWidget        *widget,
                             GdkEventSequence *sequence)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  EventControllerData *data;
+  GtkEventController *controller;
   const GdkEvent *event;
   GList *l;
 
   for (l = priv->event_controllers; l; l = l->next)
     {
-      data = l->data;
+      controller = l->data;
 
-      if (!GTK_IS_GESTURE (data->controller))
+      if (!GTK_IS_GESTURE (controller))
         continue;
 
-      event = gtk_gesture_get_last_event (GTK_GESTURE (data->controller),
+      event = gtk_gesture_get_last_event (GTK_GESTURE (controller),
                                           sequence);
       if (event)
         return event;
@@ -2715,12 +2710,12 @@ _gtk_widget_get_emulating_sequence (GtkWidget         *widget,
       /* For a NULL(pointer) sequence, find the pointer emulating one */
       for (l = priv->event_controllers; l; l = l->next)
         {
-          EventControllerData *data = l->data;
+          GtkEventController *controller = l->data;
 
-          if (!GTK_IS_GESTURE (data->controller))
+          if (!GTK_IS_GESTURE (controller))
             continue;
 
-          if (_gtk_gesture_get_pointer_emulating_sequence (GTK_GESTURE (data->controller),
+          if (_gtk_gesture_get_pointer_emulating_sequence (GTK_GESTURE (controller),
                                                            sequence_out))
             return TRUE;
         }
@@ -2742,19 +2737,18 @@ gtk_widget_needs_press_emulation (GtkWidget        *widget,
    */
   for (l = priv->event_controllers; l; l = l->next)
     {
-      EventControllerData *data;
+      GtkEventController *controller = l->data;
       GtkPropagationPhase phase;
       GtkGesture *gesture;
 
-      data = l->data;
-      phase = gtk_event_controller_get_propagation_phase (data->controller);
+      phase = gtk_event_controller_get_propagation_phase (controller);
 
       if (phase != GTK_PHASE_CAPTURE)
         continue;
-      if (!GTK_IS_GESTURE (data->controller))
+      if (!GTK_IS_GESTURE (controller))
         continue;
 
-      gesture = GTK_GESTURE (data->controller);
+      gesture = GTK_GESTURE (controller);
       sequence_press_handled |=
         (gtk_gesture_handles_sequence (gesture, sequence) &&
          _gtk_gesture_handled_sequence_press (gesture, sequence));
@@ -2788,18 +2782,18 @@ _gtk_widget_set_sequence_state_internal (GtkWidget             *widget,
   for (l = priv->event_controllers; l; l = l->next)
     {
       GtkEventSequenceState gesture_state;
-      EventControllerData *data;
+      GtkEventController *controller;
       GtkGesture *gesture;
       gboolean retval;
 
       seq = sequence;
-      data = l->data;
+      controller = l->data;
       gesture_state = state;
 
-      if (!GTK_IS_GESTURE (data->controller))
+      if (!GTK_IS_GESTURE (controller))
         continue;
 
-      gesture = GTK_GESTURE (data->controller);
+      gesture = GTK_GESTURE (controller);
 
       if (gesture == emitter)
         {
@@ -2813,7 +2807,7 @@ _gtk_widget_set_sequence_state_internal (GtkWidget             *widget,
           !gtk_gesture_handles_sequence (gesture, seq))
         seq = NULL;
 
-      if (group && !g_list_find (group, data->controller))
+      if (group && !g_list_find (group, controller))
         {
           /* If a group is provided, ensure only gestures pertaining to the group
            * get a "claimed" state, all other claiming gestures must deny the sequence.
@@ -2828,9 +2822,7 @@ _gtk_widget_set_sequence_state_internal (GtkWidget             *widget,
                gtk_gesture_get_sequence_state (gesture, sequence) != GTK_EVENT_SEQUENCE_CLAIMED)
         continue;
 
-      g_signal_handler_block (data->controller, data->sequence_state_changed_id);
       retval = gtk_gesture_set_sequence_state (gesture, seq, gesture_state);
-      g_signal_handler_unblock (data->controller, data->sequence_state_changed_id);
 
       if (retval || gesture == emitter)
         {
@@ -2869,16 +2861,16 @@ _gtk_widget_cancel_sequence (GtkWidget        *widget,
 
   for (l = priv->event_controllers; l; l = l->next)
     {
-      EventControllerData *data;
+      GtkEventController *controller;
       GtkGesture *gesture;
 
       seq = sequence;
-      data = l->data;
+      controller = l->data;
 
-      if (!GTK_IS_GESTURE (data->controller))
+      if (!GTK_IS_GESTURE (controller))
         continue;
 
-      gesture = GTK_GESTURE (data->controller);
+      gesture = GTK_GESTURE (controller);
 
       if (seq && emulates_pointer &&
           !gtk_gesture_handles_sequence (gesture, seq))
@@ -5199,7 +5191,7 @@ _gtk_widget_run_controllers (GtkWidget           *widget,
                              GtkPropagationPhase  phase)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  EventControllerData *data;
+  GtkEventController *controller;
   gboolean handled = FALSE;
   GList *l;
 
@@ -5213,27 +5205,26 @@ _gtk_widget_run_controllers (GtkWidget           *widget,
       if (!WIDGET_REALIZED_FOR_EVENT (widget, event))
         break;
 
-      data = l->data;
+      controller = l->data;
 
-      if (data->controller == NULL)
+      if (controller == NULL)
         {
           priv->event_controllers = g_list_delete_link (priv->event_controllers, l);
-          g_free (data);
         }
       else
         {
           GtkPropagationPhase controller_phase;
 
-          controller_phase = gtk_event_controller_get_propagation_phase (data->controller);
+          controller_phase = gtk_event_controller_get_propagation_phase (controller);
 
           if (controller_phase == phase)
-            handled |= gtk_event_controller_handle_event (data->controller, event);
+            handled |= gtk_event_controller_handle_event (controller, event);
 
           /* Non-gesture controllers are basically unique entities not meant
            * to collaborate with anything else. Break early if any such event
            * controller handled the event.
            */
-          if (handled && !GTK_IS_GESTURE (data->controller))
+          if (handled && !GTK_IS_GESTURE (controller))
             break;
         }
 
@@ -5245,28 +5236,6 @@ _gtk_widget_run_controllers (GtkWidget           *widget,
   return handled;
 }
 
-static void
-cancel_event_sequence_on_hierarchy (GtkWidget        *widget,
-                                    GtkWidget        *event_widget,
-                                    GdkEventSequence *sequence)
-{
-  gboolean cancel = TRUE;
-
-  while (event_widget)
-    {
-      if (event_widget == widget)
-        cancel = FALSE;
-      else if (cancel)
-        _gtk_widget_cancel_sequence (event_widget, sequence);
-      else
-        _gtk_widget_set_sequence_state_internal (event_widget, sequence,
-                                                 GTK_EVENT_SEQUENCE_DENIED,
-                                                 NULL);
-
-      event_widget = _gtk_widget_get_parent (event_widget);
-    }
-}
-
 static void
 translate_event_coordinates (GdkEvent  *event,
                        GtkWidget *widget);
@@ -8605,13 +8574,12 @@ gtk_widget_finalize (GObject *object)
 
   for (l = priv->event_controllers; l; l = l->next)
     {
-      EventControllerData *data = l->data;
-      if (data->controller)
-        {
-          gtk_widget_remove_controller (widget, data->controller);
-        }
+      GtkEventController *controller = l->data;
+
+      if (controller)
+        gtk_widget_remove_controller (widget, controller);
     }
-  g_list_free_full (priv->event_controllers, g_free);
+  g_list_free (priv->event_controllers);
   priv->event_controllers = NULL;
 
   if (_gtk_widget_get_first_child (widget) != NULL)
@@ -12867,14 +12835,15 @@ gtk_widget_get_action_group (GtkWidget   *widget,
   return NULL;
 }
 
-static void
-event_controller_sequence_state_changed (GtkGesture            *gesture,
-                                         GdkEventSequence      *sequence,
-                                         GtkEventSequenceState  state,
-                                         GtkWidget             *widget)
+void
+gtk_widget_cancel_event_sequence (GtkWidget             *widget,
+                                  GtkGesture            *gesture,
+                                  GdkEventSequence      *sequence,
+                                  GtkEventSequenceState  state)
 {
   gboolean handled = FALSE;
   GtkWidget *event_widget;
+  gboolean cancel = TRUE;
   const GdkEvent *event;
 
   handled = _gtk_widget_set_sequence_state_internal (widget, sequence,
@@ -12889,7 +12858,21 @@ event_controller_sequence_state_changed (GtkGesture            *gesture,
     return;
 
   event_widget = gtk_get_event_target ((GdkEvent *) event);
-  cancel_event_sequence_on_hierarchy (widget, event_widget, sequence);
+
+  while (event_widget)
+    {
+      if (event_widget == widget)
+        cancel = FALSE;
+      else if (cancel)
+        _gtk_widget_cancel_sequence (event_widget, sequence);
+      else
+        _gtk_widget_set_sequence_state_internal (event_widget, sequence,
+                                                 GTK_EVENT_SEQUENCE_DENIED,
+                                                 NULL);
+
+      event_widget = _gtk_widget_get_parent (event_widget);
+    }
+
 }
 
 /**
@@ -12907,7 +12890,6 @@ gtk_widget_add_controller (GtkWidget          *widget,
                            GtkEventController *controller)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  EventControllerData *data;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
@@ -12915,20 +12897,7 @@ gtk_widget_add_controller (GtkWidget          *widget,
 
   GTK_EVENT_CONTROLLER_GET_CLASS (controller)->set_widget (controller, widget);
 
-  data = g_new0 (EventControllerData, 1);
-  data->controller = controller;
-
-  g_object_add_weak_pointer (G_OBJECT (data->controller), (gpointer *) &data->controller);
-
-  if (GTK_IS_GESTURE (controller))
-    {
-      data->sequence_state_changed_id =
-        g_signal_connect (controller, "sequence-state-changed",
-                          G_CALLBACK (event_controller_sequence_state_changed),
-                          widget);
-    }
-
-  priv->event_controllers = g_list_prepend (priv->event_controllers, data);
+  priv->event_controllers = g_list_prepend (priv->event_controllers, controller);
 }
 
 /**
@@ -12947,31 +12916,14 @@ gtk_widget_remove_controller (GtkWidget          *widget,
                               GtkEventController *controller)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  EventControllerData *data = NULL;
-  GList *l;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
   g_return_if_fail (gtk_event_controller_get_widget (controller) == widget);
 
-  for (l = priv->event_controllers; l; l = l->next)
-    {
-      data = l->data;
-
-      if (data->controller == controller)
-        break;
-    }
-
-  g_assert (data);
-
   GTK_EVENT_CONTROLLER_GET_CLASS (controller)->unset_widget (controller);
 
-  g_object_remove_weak_pointer (G_OBJECT (data->controller), (gpointer *) &data->controller);
-
-  if (data->sequence_state_changed_id)
-    g_signal_handler_disconnect (data->controller, data->sequence_state_changed_id);
-
-  data->controller = NULL;
+  priv->event_controllers = g_list_remove (priv->event_controllers, controller);
   g_object_unref (controller);
 }
 
@@ -12980,18 +12932,17 @@ _gtk_widget_list_controllers (GtkWidget           *widget,
                               GtkPropagationPhase  phase)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  EventControllerData *data;
   GList *l, *retval = NULL;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
   for (l = priv->event_controllers; l; l = l->next)
     {
-      data = l->data;
+      GtkEventController *controller = l->data;
 
-      if (data->controller != NULL &&
-          phase == gtk_event_controller_get_propagation_phase (data->controller))
-        retval = g_list_prepend (retval, data->controller);
+      if (controller != NULL &&
+          phase == gtk_event_controller_get_propagation_phase (controller))
+        retval = g_list_prepend (retval, controller);
     }
 
   return retval;
@@ -13002,23 +12953,22 @@ _gtk_widget_consumes_motion (GtkWidget        *widget,
                              GdkEventSequence *sequence)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  EventControllerData *data;
   GList *l;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
 
   for (l = priv->event_controllers; l; l = l->next)
     {
-      data = l->data;
+      GtkEventController *controller = l->data;
 
-      if (data->controller == NULL ||
-          !GTK_IS_GESTURE (data->controller))
+      if (controller == NULL ||
+          !GTK_IS_GESTURE (controller))
         continue;
 
-      if ((!GTK_IS_GESTURE_SINGLE (data->controller) ||
-           GTK_IS_GESTURE_DRAG (data->controller) ||
-           GTK_IS_GESTURE_SWIPE (data->controller)) &&
-          gtk_gesture_handles_sequence (GTK_GESTURE (data->controller), sequence))
+      if ((!GTK_IS_GESTURE_SINGLE (controller) ||
+           GTK_IS_GESTURE_DRAG (controller) ||
+           GTK_IS_GESTURE_SWIPE (controller)) &&
+          gtk_gesture_handles_sequence (GTK_GESTURE (controller), sequence))
         return TRUE;
     }
 
@@ -13029,18 +12979,17 @@ void
 gtk_widget_reset_controllers (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  EventControllerData *controller_data;
   GList *l;
 
   /* Reset all controllers */
   for (l = priv->event_controllers; l; l = l->next)
     {
-      controller_data = l->data;
+      GtkEventController *controller = l->data;
 
-      if (controller_data->controller == NULL)
+      if (controller == NULL)
         continue;
 
-      gtk_event_controller_reset (controller_data->controller);
+      gtk_event_controller_reset (controller);
     }
 }
 

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 1fec8a82b37b1e899d5e2947cae9214ce551ba4c..c5768a29d3247bbc590d67b36cc3f6ba1c189b4d 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -34,6 +34,7 @@
 #include "gtksizerequestcacheprivate.h"
 #include "gtkwindowprivate.h"
 #include "gtkinvisible.h"
+#include "gtkgesture.h"
 
 G_BEGIN_DECLS
 
@@ -331,6 +332,12 @@ void              gtk_widget_get_origin_relative_to_parent (GtkWidget        *wi
                                                             int              *origin_x,
                                                             int              *origin_y);
 
+void              gtk_widget_cancel_event_sequence         (GtkWidget             *widget,
+                                                            GtkGesture            *gesture,
+                                                            GdkEventSequence      *sequence,
+                                                            GtkEventSequenceState  state);
+
+
 
 
 

diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index 4bcdd8dbb4cc08a5fb40749afc953baa890b174f..08f3aa85afa588b9ce155f40ef0d0ea1e544c349 100644 (file)
--- a/gtk/inspector/object-tree.c
+++ b/gtk/inspector/object-tree.c
@@ -789,6 +789,12 @@ key_pressed (GtkEventController     *controller,
   return GDK_EVENT_PROPAGATE;
 }
 
+static void
+destroy_controller (GtkEventController *controller)
+{
+  gtk_widget_remove_controller (gtk_event_controller_get_widget (controller), controller);
+}
+
 static void
 on_hierarchy_changed (GtkWidget *widget,
                       GtkWidget *previous_toplevel)
@@ -806,7 +812,7 @@ on_hierarchy_changed (GtkWidget *widget,
     return;
 
   controller = gtk_event_controller_key_new ();
-  g_object_set_data_full (G_OBJECT (toplevel), "object-controller", controller, g_object_unref);
+  g_object_set_data_full (G_OBJECT (toplevel), "object-controller", controller, (GDestroyNotify)destroy_controller);
   g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget);
   gtk_widget_add_controller (toplevel, controller);
 

diff --git a/gtk/inspector/prop-list.c b/gtk/inspector/prop-list.c
index 292ed77d8c58e7ecd884fb5756a0e9a3df49a674..286c4e2ab1c3d3cfb535208bd2f9192fb21af50f 100644 (file)
--- a/gtk/inspector/prop-list.c
+++ b/gtk/inspector/prop-list.c
@@ -103,6 +103,12 @@ key_pressed (GtkEventController   *controller,
   return GDK_EVENT_PROPAGATE;
 }
 
+static void
+destroy_controller (GtkEventController *controller)
+{
+  gtk_widget_remove_controller (gtk_event_controller_get_widget (controller), controller);
+}
+
 static void
 hierarchy_changed (GtkWidget *widget,
                    GtkWidget *previous_toplevel)
@@ -119,7 +125,7 @@ hierarchy_changed (GtkWidget *widget,
     return;
 
   controller = gtk_event_controller_key_new ();
-  g_object_set_data_full (G_OBJECT (toplevel), "prop-controller", controller, g_object_unref);
+  g_object_set_data_full (G_OBJECT (toplevel), "prop-controller", controller, (GDestroyNotify)destroy_controller);
   g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget);
   gtk_widget_add_controller (toplevel, controller);
 }

diff --git a/gtk/inspector/resource-list.c b/gtk/inspector/resource-list.c
index c6f1a1ed6410bdf48e150e8289023705e9b05506..78e116a9923a56b7212da4a876a62b32427c9235 100644 (file)
--- a/gtk/inspector/resource-list.c
+++ b/gtk/inspector/resource-list.c
@@ -469,6 +469,12 @@ key_pressed (GtkEventController       *controller,
   return GDK_EVENT_PROPAGATE;
 }
 
+static void
+destroy_controller (GtkEventController *controller)
+{
+  gtk_widget_remove_controller (gtk_event_controller_get_widget (controller), controller);
+}
+
 static void
 on_hierarchy_changed (GtkWidget *widget,
                       GtkWidget *previous_toplevel)
@@ -486,7 +492,7 @@ on_hierarchy_changed (GtkWidget *widget,
     return;
 
   controller = gtk_event_controller_key_new ();
-  g_object_set_data_full (G_OBJECT (toplevel), "resource-controller", controller, g_object_unref);
+  g_object_set_data_full (G_OBJECT (toplevel), "resource-controller", controller, (GDestroyNotify)destroy_controller);
   g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget);
   gtk_widget_add_controller (toplevel, controller);
 

diff --git a/gtk/inspector/statistics.c b/gtk/inspector/statistics.c
index e48b1ac46dba0acecdac03a9e6f34cca85c8bc9e..ad988be72f0205ed33d7bc1678e2e538d403e7a9 100644 (file)
--- a/gtk/inspector/statistics.c
+++ b/gtk/inspector/statistics.c
@@ -320,6 +320,12 @@ match_row (GtkTreeModel *model,
   return !match;
 }
 
+static void
+destroy_controller (GtkEventController *controller)
+{
+  gtk_widget_remove_controller (gtk_event_controller_get_widget (controller), controller);
+}
+
 static void
 hierarchy_changed (GtkWidget *widget,
                    GtkWidget *previous_toplevel)
@@ -337,7 +343,7 @@ hierarchy_changed (GtkWidget *widget,
     return;
 
   controller = gtk_event_controller_key_new ();
-  g_object_set_data_full (G_OBJECT (toplevel), "statistics-controller", controller, g_object_unref);
+  g_object_set_data_full (G_OBJECT (toplevel), "statistics-controller", controller, (GDestroyNotify)destroy_controller);
   g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), widget);
   gtk_widget_add_controller (toplevel, controller);