clutter/script-parser: Drop support for child properties

Which means ClutterContainer is no longer special cased, removing one of
it's final users.

In practice ClutterScript is unused anyway.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3377>

clutter/clutter/clutter-script-parser.c

@@ -32,10 +32,8 @@
 #include <glib.h>
 #include <gmodule.h>
 
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "clutter/deprecated/clutter-container.h"
-
 #include "clutter/clutter-actor.h"
+#include "clutter/clutter-container.h"
 #include "clutter/clutter-debug.h"
 #include "clutter/clutter-enum-types.h"
 
@@ -943,7 +941,6 @@ clutter_script_parser_object_end (JsonParser *json_parser,
       pinfo->name = g_strdup (name);
       pinfo->node = json_node_copy (node);
       pinfo->pspec = NULL;
-      pinfo->is_child = g_str_has_prefix (name, "child::") ? TRUE : FALSE;
       pinfo->is_layout = g_str_has_prefix (name, "layout::") ? TRUE : FALSE;
 
       oinfo->properties = g_list_prepend (oinfo->properties, pinfo);
@@ -1439,10 +1436,9 @@ clutter_script_translate_parameters (ClutterScript  *script,
       GValue value = G_VALUE_INIT;
       gboolean res = FALSE;
 
-      if (pinfo->is_child || pinfo->is_layout)
+      if (pinfo->is_layout)
         {
-          CLUTTER_NOTE (SCRIPT, "Skipping %s property '%s'",
+          CLUTTER_NOTE (SCRIPT, "Skipping layout property '%s'",
-                        pinfo->is_child ? "child" : "layout",
                         pinfo->name);
           unparsed = g_list_prepend (unparsed, pinfo);
           continue;
@@ -1655,110 +1651,11 @@ apply_layout_properties (ClutterScript    *script,
   oinfo->properties = unresolved;
 }
 
-static void
-apply_child_properties (ClutterScript    *script,
-                        ClutterContainer *container,
-                        ClutterActor     *actor,
-                        ObjectInfo       *oinfo)
-{
-  ClutterScriptable *scriptable = NULL;
-  ClutterScriptableIface *iface = NULL;
-  gboolean parse_custom_node = FALSE;
-  GList *l, *unresolved, *properties;
-  GObjectClass *klass;
-  GType meta_type;
-
-  meta_type = CLUTTER_CONTAINER_GET_IFACE (container)->child_meta_type;
-  if (meta_type == G_TYPE_INVALID)
-    return;
-
-  klass = G_OBJECT_GET_CLASS (container);
-
-  /* shortcut, to avoid typechecking every time */
-  if (CLUTTER_IS_SCRIPTABLE (container))
-    {
-      scriptable = CLUTTER_SCRIPTABLE (container);
-      iface = CLUTTER_SCRIPTABLE_GET_IFACE (scriptable);
-
-      parse_custom_node = iface->parse_custom_node != NULL ? TRUE : FALSE;
-    }
-
-  properties = oinfo->properties;
-  oinfo->properties = NULL;
-
-  unresolved = NULL;
-  for (l = properties; l != NULL; l = l->next)
-    {
-      PropertyInfo *pinfo = l->data;
-      GValue value = G_VALUE_INIT;
-      gboolean res = FALSE;
-      const gchar *name;
-
-      if (!pinfo->is_child)
-        {
-          unresolved = g_list_prepend (unresolved, pinfo);
-          continue;
-        }
-
-      name = pinfo->name + strlen ("child::");
-
-      pinfo->pspec =
-        clutter_container_class_find_child_property (klass, name);
-
-      if (pinfo->pspec != NULL)
-        g_param_spec_ref (pinfo->pspec);
-
-      CLUTTER_NOTE (SCRIPT, "Parsing %s child property (id:%s)",
-                    pinfo->pspec != NULL ? "regular" : "custom",
-                    name);
-
-      if (parse_custom_node)
-        res = iface->parse_custom_node (scriptable, script, &value,
-                                        name,
-                                        pinfo->node);
-
-      if (!res)
-        res = _clutter_script_parse_node (script, &value,
-                                          name,
-                                          pinfo->node,
-                                          pinfo->pspec);
-
-      if (!res)
-        {
-          CLUTTER_NOTE (SCRIPT, "Child property '%s' ignored", name);
-          unresolved = g_list_prepend (unresolved, pinfo);
-          continue;
-        }
-
-      
-      CLUTTER_NOTE (SCRIPT,
-                    "Setting %s child property '%s' (type:%s) to "
-                    "object '%s' (id:%s)",
-                    iface->set_custom_property != NULL ? "custom" : "regular",
-                    name,
-                    g_type_name (G_VALUE_TYPE (&value)),
-                    g_type_name (oinfo->gtype),
-                    oinfo->id);
-
-      clutter_container_child_set_property (container, actor,
-                                            name,
-                                            &value);
-
-      g_value_unset (&value);
-
-      property_info_free (pinfo);
-    }
-
-  g_list_free (properties);
-
-  oinfo->properties = unresolved;
-}
-
 static void
 add_children (ClutterScript *script,
               ObjectInfo    *oinfo)
 {
-  ClutterContainer *container = CLUTTER_CONTAINER (oinfo->object);
+  ClutterActor *container = CLUTTER_ACTOR (oinfo->object);
   GList *l, *unresolved;
 
   unresolved = NULL;
@@ -1797,7 +1694,7 @@ add_children (ClutterScript *script,
                     name,
                     g_type_name (G_OBJECT_TYPE (container)));
 
-      clutter_container_add_actor (container, CLUTTER_ACTOR (object));
+      clutter_actor_add_child (container, CLUTTER_ACTOR (object));
     }
 
   g_list_free_full (oinfo->children, g_free);
@@ -1809,7 +1706,7 @@ static inline void
 _clutter_script_check_unresolved (ClutterScript *script,
                                   ObjectInfo    *oinfo)
 {
-  if (oinfo->children != NULL && CLUTTER_IS_CONTAINER (oinfo->object))
+  if (oinfo->children != NULL && CLUTTER_IS_ACTOR (oinfo->object))
     add_children (script, oinfo);
 
   /* this is a bit *eugh*, but it allows us to effectively make sure
@@ -1823,7 +1720,6 @@ _clutter_script_check_unresolved (ClutterScript *script,
       parent = clutter_actor_get_parent (CLUTTER_ACTOR (oinfo->object));
       if (parent != NULL)
         {
-          ClutterContainer *container = CLUTTER_CONTAINER (parent);
           ClutterActor *child;
 
           for (child = clutter_actor_get_first_child (parent);
@@ -1841,10 +1737,7 @@ _clutter_script_check_unresolved (ClutterScript *script,
               if (child_info == NULL)
                 continue;
 
-              apply_child_properties (script, container,
+              apply_layout_properties (script, CLUTTER_CONTAINER (parent),
-                                      child,
-                                      child_info);
-              apply_layout_properties (script, container,
                                        child,
                                        child_info);
             }

clutter/clutter/clutter-script-private.h

@@ -79,7 +79,6 @@ typedef struct {
   JsonNode *node;
   GParamSpec *pspec;
 
-  guint is_child : 1;
   guint is_layout : 1;
 } PropertyInfo;
 

src/tests/clutter/conform/script-parser.c

@@ -6,109 +6,15 @@
 
 #include "tests/clutter-test-utils.h"
 
-#define TEST_TYPE_GROUP                 (test_group_get_type ())
+#define TEST_TYPE_GROUP (test_group_get_type ())
-#define TEST_TYPE_GROUP_META            (test_group_meta_get_type ())
+G_DECLARE_FINAL_TYPE (TestGroup, test_group, TEST, GROUP, ClutterActor)
 
-#define TEST_GROUP(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_GROUP, TestGroup))
+struct _TestGroup
-#define TEST_IS_GROUP(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_GROUP))
-
-#define TEST_GROUP_META(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_GROUP_META, TestGroupMeta))
-#define TEST_IS_GROUP_META(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_TYPE_GROUP_META))
-
-typedef struct _ClutterActor            TestGroup;
-typedef struct _ClutterActorClass       TestGroupClass;
-
-typedef struct _TestGroupMeta {
-  ClutterChildMeta parent_instance;
-
-  guint is_focus : 1;
-} TestGroupMeta;
-
-typedef struct _ClutterChildMetaClass   TestGroupMetaClass;
-
-GType test_group_meta_get_type (void);
-
-G_DEFINE_TYPE (TestGroupMeta, test_group_meta, CLUTTER_TYPE_CHILD_META)
-
-enum
 {
-  PROP_META_0,
+  ClutterActor parent;
-
-  PROP_META_FOCUS
 };
 
-static void
+G_DEFINE_TYPE (TestGroup, test_group, CLUTTER_TYPE_ACTOR)
-test_group_meta_set_property (GObject      *gobject,
-                              guint         prop_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
-{
-  TestGroupMeta *self = TEST_GROUP_META (gobject);
-
-  switch (prop_id)
-    {
-    case PROP_META_FOCUS:
-      self->is_focus = g_value_get_boolean (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-test_group_meta_get_property (GObject    *gobject,
-                              guint       prop_id,
-                              GValue     *value,
-                              GParamSpec *pspec)
-{
-  TestGroupMeta *self = TEST_GROUP_META (gobject);
-
-  switch (prop_id)
-    {
-    case PROP_META_FOCUS:
-      g_value_set_boolean (value, self->is_focus);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-test_group_meta_class_init (TestGroupMetaClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GParamSpec *pspec;
-
-  gobject_class->set_property = test_group_meta_set_property;
-  gobject_class->get_property = test_group_meta_get_property;
-
-  pspec = g_param_spec_boolean ("focus", NULL, NULL,
-                                FALSE,
-                                G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_META_FOCUS, pspec);
-}
-
-static void
-test_group_meta_init (TestGroupMeta *meta)
-{
-  meta->is_focus = FALSE;
-}
-
-static void
-clutter_container_iface_init (ClutterContainerIface *iface)
-{
-  iface->child_meta_type = TEST_TYPE_GROUP_META;
-}
-
-GType test_group_get_type (void);
-
-G_DEFINE_TYPE_WITH_CODE (TestGroup, test_group, CLUTTER_TYPE_ACTOR,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
-                                                clutter_container_iface_init))
 
 static void
 test_group_class_init (TestGroupClass *klass)
@@ -126,7 +32,6 @@ script_child (void)
   ClutterScript *script = clutter_script_new ();
   GObject *container, *actor;
   GError *error = NULL;
-  gboolean focus_ret;
   gchar *test_file;
 
   test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-child.json", NULL);
@@ -144,23 +49,9 @@ script_child (void)
   g_assert (TEST_IS_GROUP (container));
   g_assert (CLUTTER_IS_ACTOR (actor));
 
-  focus_ret = FALSE;
-  clutter_container_child_get (CLUTTER_CONTAINER (container),
-                               CLUTTER_ACTOR (actor),
-                               "focus", &focus_ret,
-                               NULL);
-  g_assert (focus_ret);
-
   actor = clutter_script_get_object (script, "test-rect-2");
   g_assert (CLUTTER_IS_ACTOR (actor));
 
-  focus_ret = FALSE;
-  clutter_container_child_get (CLUTTER_CONTAINER (container),
-                               CLUTTER_ACTOR (actor),
-                               "focus", &focus_ret,
-                               NULL);
-  g_assert (!focus_ret);
-
   g_object_unref (script);
   g_free (test_file);
 }

src/tests/clutter/conform/scripts/test-script-child.json

@@ -7,8 +7,7 @@
       "id" : "test-rect-1",
       "width" : 100.0,
       "height" : 100.0,
-      "background-color" : [ 255, 0, 0, 255 ],
+      "background-color" : [ 255, 0, 0, 255 ]
-      "child::focus" : true
     },
     {
       "type" : "ClutterActor",