2007-10-25 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/Makefile.am:
	* clutter/clutter.h:
	* clutter/clutter-scriptable.[ch]: Add the ClutterScriptable
	interface; by implementing this interface, a class can
	override the UI definition parsing and transform complex data
	types into GObject properties, or allow custom properties.

	* clutter/clutter-script.c:
	* clutter/clutter-script-parser.c:
	* clutter/clutter-script-private.h: Rearrange the code and
	use the ClutterScriptable interface to parse and build the
	custom properties. This cleans up the code and also it makes
	it more reliable (the complex type parsing is now done using
	the target type and not just the name of the property).
This commit is contained in:
Emmanuele Bassi
2007-10-25 14:34:54 +00:00
parent 9c38eead46
commit 6c01499abf
8 changed files with 1520 additions and 823 deletions

View File

@ -27,6 +27,8 @@
#define __CLUTTER_SCRIPT_PRIVATE_H__
#include <glib-object.h>
#include "json/json-types.h"
#include "clutter-types.h"
#include "clutter-script.h"
G_BEGIN_DECLS
@ -52,11 +54,25 @@ typedef struct {
guint is_unmerged : 1;
} ObjectInfo;
void object_info_free (gpointer data);
typedef struct {
gchar *property_name;
GValue value;
gchar *name;
JsonNode *node;
GParamSpec *pspec;
} PropertyInfo;
void property_info_free (gpointer data);
gboolean clutter_script_parse_node (ClutterScript *script,
GValue *value,
const gchar *name,
JsonNode *node,
GParamSpec *pspec);
GType clutter_script_get_type_from_symbol (const gchar *symbol);
GType clutter_script_get_type_from_class (const gchar *name);
GObject *clutter_script_construct_object (ClutterScript *script,
ObjectInfo *info);
@ -67,6 +83,21 @@ gboolean clutter_script_flags_from_string (GType gtype,
const gchar *string,
gint *flags_value);
gboolean clutter_script_parse_knot (ClutterScript *script,
JsonNode *node,
ClutterKnot *knot);
gboolean clutter_script_parse_padding (ClutterScript *script,
JsonNode *node,
ClutterPadding *padding);
gboolean clutter_script_parse_margin (ClutterScript *script,
JsonNode *node,
ClutterMargin *margin);
gboolean clutter_script_parse_geometry (ClutterScript *script,
JsonNode *node,
ClutterGeometry *geometry);
GObject *clutter_script_parse_alpha (ClutterScript *script,
JsonNode *node);
G_END_DECLS
#endif /* __CLUTTER_SCRIPT_PRIVATE_H__ */