[gtk/wip/ebassi/shortcut: 1/85] bindings: Replace GtkBindingArg arguments with GVariant

[Emmanuele Bassi <ebassi src gnome org>]

commit 4ca3914d8d5dbdaac98c9c6a504a63aad13913fb
Author: Benjamin Otte <otte redhat com>
Date:   Tue Jul 31 20:09:03 2018 +0200

    bindings: Replace GtkBindingArg arguments with GVariant
    
    This only replaces invocation, not yet parsing.

 gtk/gtkbindings.c | 178 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 92 insertions(+), 86 deletions(-)
---
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index fd4d62b0b0..3a8b4f60ee 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -159,16 +159,9 @@ typedef enum
  */
 struct _GtkBindingSignal
 {
-  GtkBindingSignal     *next;
-  GtkBindingActionType  action_type;
-};
-
-struct _GtkBindingSignalSignal
-{
-  GtkBindingSignal  parent;
-  const gchar      *signal_name;
-  guint             n_args;
-  GtkBindingArg    *args;
+  GtkBindingSignal *next;
+  gchar            *signal_name;
+  GVariant         *args;
 };
 
 struct _GtkBindingSignalAction
@@ -198,17 +191,15 @@ static GQuark            key_id_class_binding_set = 0;
 /* --- functions --- */
 
 static GtkBindingSignal*
-binding_signal_new_signal (const gchar *signal_name,
-                           guint        n_args)
+binding_signal_new (const gchar *signal_name,
+                    GVariant    *args)
 {
   GtkBindingSignalSignal *signal;
 
-  signal = (GtkBindingSignalSignal *) g_slice_alloc0 (sizeof (GtkBindingSignalSignal) + n_args * sizeof 
(GtkBindingArg));
-  signal->parent.next = NULL;
-  signal->parent.action_type = GTK_BINDING_SIGNAL;
-  signal->signal_name = g_intern_string (signal_name);
-  signal->n_args = n_args;
-  signal->args = (GtkBindingArg *)(signal + 1);
+  signal = g_slice_new0 (GtkBindingSignal);
+  signal->next = NULL;
+  signal->signal_name = (gchar *)g_intern_string (signal_name);
+  signal->args = g_variant_ref_sink (args);
 
   return &signal->parent;
 }
@@ -254,43 +245,8 @@ binding_signal_new_callback (GtkBindingCallback  callback,
 static void
 binding_signal_free (GtkBindingSignal *signal)
 {
-  guint i;
-
-  switch (signal->action_type)
-    {
-    case GTK_BINDING_SIGNAL:
-      {
-        GtkBindingSignalSignal *sig = (GtkBindingSignalSignal *) signal;
-        for (i = 0; i < sig->n_args; i++)
-          {
-            if (G_TYPE_FUNDAMENTAL (sig->args[i].arg_type) == G_TYPE_STRING)
-              g_free (sig->args[i].d.string_data);
-          }
-        g_slice_free1 (sizeof (GtkBindingSignalSignal) + sig->n_args * sizeof (GtkBindingArg), sig);
-      }
-      break;
-
-    case GTK_BINDING_ACTION:
-      {
-        GtkBindingSignalAction *sig = (GtkBindingSignalAction *) signal;
-        g_clear_pointer (&sig->variant, g_variant_unref);
-        g_slice_free (GtkBindingSignalAction, sig);
-      }
-      break;
-
-    case GTK_BINDING_CALLBACK:
-      {
-        GtkBindingSignalCallback *sig = (GtkBindingSignalCallback *) signal;
-        if (sig->user_destroy)
-          sig->user_destroy (sig->user_data);
-        g_slice_free (GtkBindingSignalCallback, sig);
-      }
-      break;
-
-    default:
-      g_assert_not_reached ();
-      break;
-    }
+  g_variant_unref (sig->args);
+  g_slice_free (GtkBindingSignal, sig);
 }
 
 static guint
@@ -536,7 +492,7 @@ binding_ht_lookup_entry (GtkBindingSet  *set,
 
 static gboolean
 binding_compose_params (GObject         *object,
-                        GtkBindingArg   *args,
+                        GVariantIter    *args,
                         GSignalQuery    *query,
                         GValue         **params_p)
 {
@@ -559,20 +515,22 @@ binding_compose_params (GObject         *object,
   for (i = 1; i < query->n_params + 1 && valid; i++)
     {
       GValue tmp_value = G_VALUE_INIT;
+      GVariant *tmp_variant;
 
       g_value_init (params, *types);
+      tmp_variant = g_variant_iter_next_value (args);
 
-      switch (G_TYPE_FUNDAMENTAL (args->arg_type))
+      switch ((guint) g_variant_classify (tmp_variant))
         {
-        case G_TYPE_DOUBLE:
+        case G_VARIANT_CLASS_DOUBLE:
           g_value_init (&tmp_value, G_TYPE_DOUBLE);
-          g_value_set_double (&tmp_value, args->d.double_data);
+          g_value_set_double (&tmp_value, g_variant_get_double (tmp_variant));
           break;
-        case G_TYPE_LONG:
+        case G_VARIANT_CLASS_INT64:
           g_value_init (&tmp_value, G_TYPE_LONG);
-          g_value_set_long (&tmp_value, args->d.long_data);
+          g_value_set_long (&tmp_value, g_variant_get_int64 (tmp_variant));
           break;
-        case G_TYPE_STRING:
+        case G_VARIANT_CLASS_STRING:
           /* gtk_rc_parse_flags/enum() has fancier parsing for this; we can't call
            * that since we don't have a GParamSpec, so just do something simple
            */
@@ -580,12 +538,13 @@ binding_compose_params (GObject         *object,
             {
               GEnumClass *class = G_ENUM_CLASS (g_type_class_ref (*types));
               GEnumValue *enum_value;
+              const char *s = g_variant_get_string (tmp_variant, NULL);
 
               valid = FALSE;
 
-              enum_value = g_enum_get_value_by_name (class, args->d.string_data);
+              enum_value = g_enum_get_value_by_name (class, s);
               if (!enum_value)
-                enum_value = g_enum_get_value_by_nick (class, args->d.string_data);
+                enum_value = g_enum_get_value_by_nick (class, s);
 
               if (enum_value)
                 {
@@ -604,12 +563,13 @@ binding_compose_params (GObject         *object,
             {
               GFlagsClass *class = G_FLAGS_CLASS (g_type_class_ref (*types));
               GFlagsValue *flags_value;
+              const char *s = g_variant_get_string (tmp_variant, NULL);
 
               valid = FALSE;
 
-              flags_value = g_flags_get_value_by_name (class, args->d.string_data);
+              flags_value = g_flags_get_value_by_name (class, s);
               if (!flags_value)
-                flags_value = g_flags_get_value_by_nick (class, args->d.string_data);
+                flags_value = g_flags_get_value_by_nick (class, s);
               if (flags_value)
                 {
                   g_value_init (&tmp_value, *types);
@@ -622,7 +582,7 @@ binding_compose_params (GObject         *object,
           else
             {
               g_value_init (&tmp_value, G_TYPE_STRING);
-              g_value_set_static_string (&tmp_value, args->d.string_data);
+              g_value_set_static_string (&tmp_value, g_variant_get_string (tmp_variant, NULL));
             }
           break;
         default:
@@ -638,9 +598,9 @@ binding_compose_params (GObject         *object,
           g_value_unset (&tmp_value);
         }
 
+      g_variant_unref (tmp_variant);
       types++;
       params++;
-      args++;
     }
 
   if (!valid)
@@ -780,7 +740,46 @@ gtk_binding_entry_activate (GtkBindingEntry *entry,
 
   for (sig = entry->signals; sig; sig = sig->next)
     {
-      switch (sig->action_type)
+      GSignalQuery query;
+      guint signal_id;
+      GValue *params = NULL;
+      GValue return_val = G_VALUE_INIT;
+      gchar *accelerator = NULL;
+      GVariantIter args_iter;
+      gsize n_args;
+
+      signal_id = g_signal_lookup (sig->signal_name, G_OBJECT_TYPE (object));
+      if (!signal_id)
+        {
+          accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers);
+          g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": "
+                     "could not find signal \"%s\" in the '%s' class ancestry",
+                     entry->binding_set->set_name,
+                     accelerator,
+                     sig->signal_name,
+                     g_type_name (G_OBJECT_TYPE (object)));
+          g_free (accelerator);
+          continue;
+        }
+
+      g_signal_query (signal_id, &query);
+      if (sig->args)
+        n_args = g_variant_iter_init (&args_iter, sig->args);
+      else
+        n_args = 0;
+      if (query.n_params != n_args ||
+          (query.return_type != G_TYPE_NONE && query.return_type != G_TYPE_BOOLEAN) ||
+          !binding_compose_params (object, &args_iter, &query, &params))
+        {
+          accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers);
+          g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": "
+                     "signature mismatch for signal \"%s\" in the '%s' class ancestry",
+                     entry->binding_set->set_name,
+                     accelerator,
+                     sig->signal_name,
+                     g_type_name (G_OBJECT_TYPE (object)));
+        }
+      else if (!(query.signal_flags & G_SIGNAL_ACTION))
         {
         case GTK_BINDING_SIGNAL:
           handled = binding_signal_activate_signal ((GtkBindingSignalSignal *) sig, object);
@@ -1059,14 +1058,16 @@ gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
   GtkBindingSignal *signal;
   GSList *slist;
   guint n = 0;
-  GtkBindingArg *arg;
+  GVariantBuilder builder;
 
   g_return_if_fail (binding_set != NULL);
   g_return_if_fail (signal_name != NULL);
 
-  signal = binding_signal_new_signal (signal_name, g_slist_length (binding_args));
+  keyval = gdk_keyval_to_lower (keyval);
+  modifiers = modifiers & BINDING_MOD_MASK ();
+
+  g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
 
-  arg = ((GtkBindingSignalSignal *) signal)->args;
   for (slist = binding_args; slist; slist = slist->next)
     {
       GtkBindingArg *tmp_arg;
@@ -1075,40 +1076,45 @@ gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
       if (!tmp_arg)
         {
           g_warning ("gtk_binding_entry_add_signall(): arg[%u] is 'NULL'", n);
-          binding_signal_free (signal);
           return;
         }
       switch (G_TYPE_FUNDAMENTAL (tmp_arg->arg_type))
         {
         case  G_TYPE_LONG:
-          arg->arg_type = G_TYPE_LONG;
-          arg->d.long_data = tmp_arg->d.long_data;
+          g_variant_builder_add (&builder, "x", (gint64) tmp_arg->d.long_data);
           break;
         case  G_TYPE_DOUBLE:
-          arg->arg_type = G_TYPE_DOUBLE;
-          arg->d.double_data = tmp_arg->d.double_data;
+          g_variant_builder_add (&builder, "d", (double) tmp_arg->d.double_data);
           break;
         case  G_TYPE_STRING:
-          arg->arg_type = G_TYPE_STRING;
-          arg->d.string_data = g_strdup (tmp_arg->d.string_data);
-          if (!arg->d.string_data)
+          if (!tmp_arg->d.string_data)
             {
               g_warning ("gtk_binding_entry_add_signall(): value of 'string' arg[%u] is 'NULL'", n);
-              binding_signal_free (signal);
+              g_variant_builder_clear (&builder);
               return;
             }
+          g_variant_builder_add (&builder, "s", (gint64) tmp_arg->d.string_data);
           break;
         default:
           g_warning ("gtk_binding_entry_add_signall(): unsupported type '%s' for arg[%u]",
-                     g_type_name (arg->arg_type), n);
-          binding_signal_free (signal);
+                     g_type_name (tmp_arg->arg_type), n);
+          g_variant_builder_clear (&builder);
           return;
         }
-      arg++;
-      n++;
     }
 
-  gtk_binding_entry_add_binding_signal (binding_set, keyval, modifiers, signal);
+  signal = binding_signal_new (signal_name, g_variant_builder_end (&builder));
+
+  entry = binding_ht_lookup_entry (binding_set, keyval, modifiers);
+  if (!entry)
+    {
+      gtk_binding_entry_clear_internal (binding_set, keyval, modifiers);
+      entry = binding_ht_lookup_entry (binding_set, keyval, modifiers);
+    }
+  signal_p = &entry->signals;
+  while (*signal_p)
+    signal_p = &(*signal_p)->next;
+  *signal_p = signal;
 }
 
 /**