gnomemm r2040 - in cluttermm/trunk: . clutter clutter/cluttermm clutter/src examples tests tools/extra_defs_gen



Author: murrayc
Date: Fri Feb 13 11:30:48 2009
New Revision: 2040
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2040&view=rev

Log:
2009-02-13  Murray Cumming  <murrayc murrayc com>

* tools/extra_defs_gen/generate_defs_clutter.cc: Add new types.
* clutter/src/clutter_methods.defs: Regenerated.

* clutter/src/clutter_enums.defs:
* clutter/src/clutter_vfuncs.defs: Hand-changed some parts.

* clutter/src/Makefile_list_of_hg.am_fragment:
* clutter/cluttermm.h: Adjusted for removed files.

* clutter/src/types.hg: Added FontFlags.
* clutter/cluttermm/main.[h|cc]: Replaced get/set_use_mipmapped_text() 
with get/set_font_flags().

* clutter/src/alpha.[hg|ccg]: Added a constructor and create() to take 
the animation mode.
* clutter/src/behaviour.hg: Replace some guints with doubles.
* clutter/src/clone.hg: Renamed from clone-texture.hg (CloneTexture).

* clutter/src/media.hg: Remove vfuncs, which have been removed from 
the C API.

* clutter/src/effectstemplate.[hg|ccg|: Removed.
* examples/Makefile.am: Remove effects example. We must replace this 
with an example of the new animation API.

* examples/test-actors.cc:
* tests/test-alpha-creation.cc: Use the AnimationMode instead of 
standard callback functions (now removed).

Added:
   cluttermm/trunk/clutter/src/clone.ccg   (props changed)
      - copied unchanged from r2039, /cluttermm/trunk/clutter/src/clone-texture.ccg
   cluttermm/trunk/clutter/src/clone.hg   (contents, props changed)
      - copied, changed from r2039, /cluttermm/trunk/clutter/src/clone-texture.hg
Removed:
   cluttermm/trunk/clutter/src/clone-texture.ccg
   cluttermm/trunk/clutter/src/clone-texture.hg
   cluttermm/trunk/clutter/src/effecttemplate.ccg
   cluttermm/trunk/clutter/src/effecttemplate.hg
   cluttermm/trunk/examples/effect.cc
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/cluttermm.h
   cluttermm/trunk/clutter/cluttermm/main.cc
   cluttermm/trunk/clutter/cluttermm/main.h
   cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
   cluttermm/trunk/clutter/src/alpha.ccg
   cluttermm/trunk/clutter/src/alpha.hg
   cluttermm/trunk/clutter/src/behaviour.hg
   cluttermm/trunk/clutter/src/clutter_enums.defs
   cluttermm/trunk/clutter/src/clutter_methods.defs
   cluttermm/trunk/clutter/src/clutter_vfuncs.defs
   cluttermm/trunk/clutter/src/media.hg
   cluttermm/trunk/clutter/src/types.hg
   cluttermm/trunk/examples/Makefile.am
   cluttermm/trunk/examples/test-actors.cc
   cluttermm/trunk/tests/test-alpha-creation.cc
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc

Modified: cluttermm/trunk/clutter/cluttermm.h
==============================================================================
--- cluttermm/trunk/clutter/cluttermm.h	(original)
+++ cluttermm/trunk/clutter/cluttermm.h	Fri Feb 13 11:30:48 2009
@@ -36,9 +36,8 @@
 #include <cluttermm/behaviour-path.h>
 #include <cluttermm/behaviour-rotate.h>
 #include <cluttermm/behaviour-scale.h>
-#include <cluttermm/clone-texture.h>
+#include <cluttermm/clone.h>
 #include <cluttermm/color.h>
-#include <cluttermm/effecttemplate.h>
 #include <cluttermm/event.h>
 #include <cluttermm/frame-source.h>
 #include <cluttermm/group.h>

Modified: cluttermm/trunk/clutter/cluttermm/main.cc
==============================================================================
--- cluttermm/trunk/clutter/cluttermm/main.cc	(original)
+++ cluttermm/trunk/clutter/cluttermm/main.cc	Fri Feb 13 11:30:48 2009
@@ -93,14 +93,14 @@
   clutter_clear_glyph_cache();
 }
 
-void set_use_mipmapped_text(bool value)
+void set_font_flags(FontFlags flags)
 {
-  clutter_set_use_mipmapped_text(value);
+  clutter_set_font_flags((ClutterFontFlags)flags);
 }
 
-bool get_use_mipmapped_text()
+FontFlags get_font_flags()
 {
-  return clutter_get_use_mipmapped_text();
+  return (FontFlags)clutter_get_font_flags();
 }
 
 Glib::RefPtr<Actor> get_keyboard_grab()

Modified: cluttermm/trunk/clutter/cluttermm/main.h
==============================================================================
--- cluttermm/trunk/clutter/cluttermm/main.h	(original)
+++ cluttermm/trunk/clutter/cluttermm/main.h	Fri Feb 13 11:30:48 2009
@@ -122,18 +122,12 @@
  */
 void clear_glyph_cache();
 
-/** Sets whether subsequent text rendering operations will use mipmapped
- * textures or not. Using mipmapped textures will improve the quality for
- * scaled down text but will use more texture memory.
- * @param value true to enable mipmapping or false to disable.
- */
-void set_use_mipmapped_text(bool value);
-
-/** Gets whether mipmapped textures are used in text operations. See
- * set_use_mipmapped_text().
- * @return true if text operations should use mipmapped textures
- */
-bool get_use_mipmapped_text();
+//TODO: Documentation:
+
+void set_font_flags(FontFlags flags);
+
+FontFlags get_font_flags();
+
 
 /** Queries the current keyboard grab of clutter.
  * @return the actor currently holding the keyboard grab, or an empty

Modified: cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	(original)
+++ cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	Fri Feb 13 11:30:48 2009
@@ -13,10 +13,9 @@
 behaviour-rotate.hg \
 behaviour-scale.hg \
 childmeta.hg \
-clone-texture.hg \
+clone.hg \
 color.hg \
 container.hg \
-effecttemplate.hg \
 group.hg \
 media.hg \
 path.hg \

Modified: cluttermm/trunk/clutter/src/alpha.ccg
==============================================================================
--- cluttermm/trunk/clutter/src/alpha.ccg	(original)
+++ cluttermm/trunk/clutter/src/alpha.ccg	Fri Feb 13 11:30:48 2009
@@ -20,9 +20,9 @@
 namespace
 {
 
-static guint32 SignalProxy_Alpha_callback(ClutterAlpha *alpha, gpointer user_data)
+static double SignalProxy_Alpha_callback(ClutterAlpha *alpha, gpointer user_data)
 {
-  guint32 value;
+  double value = 0;
   Clutter::Alpha::SlotAlphaFunc* the_slot = static_cast<Clutter::Alpha::SlotAlphaFunc*>(user_data);
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -51,6 +51,8 @@
 namespace Clutter
 {
 
+/* TODO: What's the clutter-0.10 equivalent?
+
 guint32 Alpha::ramp_inc_func(const Glib::RefPtr<Alpha>& alpha)
 {
   return clutter_ramp_inc_func(alpha->gobj(), 0);
@@ -141,6 +143,8 @@
   return clutter_ease_in_out_func(alpha->gobj(), 0);
 }
 
+*/
+
 Alpha::Alpha(const Glib::RefPtr<Timeline>& timeline, const SlotAlphaFunc& slot)
 :
   _CONSTRUCT()

Modified: cluttermm/trunk/clutter/src/alpha.hg
==============================================================================
--- cluttermm/trunk/clutter/src/alpha.hg	(original)
+++ cluttermm/trunk/clutter/src/alpha.hg	Fri Feb 13 11:30:48 2009
@@ -34,32 +34,11 @@
   /** For instance,
    * guint32 on_alpha(const Glib::RefPtr<Alpha>& alpha);
    */
-  typedef sigc::slot<guint32, const Glib::RefPtr<Alpha>&> SlotAlphaFunc;
-
-  //! @name Pre-defined Alpha Functions
-  //! @{
-  static guint32 ramp_inc_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 ramp_dec_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 ramp_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 sine_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 sine_inc_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 sine_dec_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 sine_half_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 sine_in_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 sine_out_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 sine_in_out_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 square_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 smoothstep_inc_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 smoothstep_dec_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 exp_inc_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 exp_dec_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 ease_in_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 ease_out_func(const Glib::RefPtr<Alpha>& alpha);
-  static guint32 ease_in_out_func(const Glib::RefPtr<Alpha>& alpha);
-  //! @}
+  typedef sigc::slot<double, const Glib::RefPtr<Alpha>&> SlotAlphaFunc;
 
 protected:
   _CTOR_DEFAULT()
+  _WRAP_CTOR(Alpha(const Glib::RefPtr<Timeline>& timeline, gulong mode), clutter_alpha_new_full)
 
   /** Creates a new Alpha instance and sets the timeline and the alpha function.
    * @param timeline Timeline.
@@ -72,18 +51,20 @@
 
   _WRAP_CREATE()
   _WRAP_CREATE(const Glib::RefPtr<Timeline>& timeline, const SlotAlphaFunc& slot)
+  _WRAP_CREATE(const Glib::RefPtr<Timeline>& timeline, gulong mode)
 
   _WRAP_METHOD(void set_timeline(const Glib::RefPtr<Timeline>& timeline), clutter_alpha_set_timeline)
   _WRAP_METHOD(Glib::RefPtr<Timeline> get_timeline() const, clutter_alpha_get_timeline)
-  _WRAP_METHOD(guint32 get_alpha() const, clutter_alpha_get_alpha)
+  _WRAP_METHOD(double get_alpha() const, clutter_alpha_get_alpha)
 
   _IGNORE(clutter_alpha_set_func)
   void set_func(const SlotAlphaFunc& slot);
 
-  _WRAP_METHOD(void set_mode(AnimationMode mode), clutter_alpha_set_mode)
-  _WRAP_METHOD(AnimationMode get_mode() const, clutter_alpha_get_mode)
+  //TODO: Special methods that take AnimationMode?
+  _WRAP_METHOD(void set_mode(gulong mode), clutter_alpha_set_mode)
+  _WRAP_METHOD(gulong get_mode() const, clutter_alpha_get_mode)
 
-  _WRAP_PROPERTY("alpha", guint)
+  _WRAP_PROPERTY("alpha", double)
   _WRAP_PROPERTY("timeline", Glib::RefPtr<Timeline>)
 
   // We don't need the GClosure stuff in C++:

Modified: cluttermm/trunk/clutter/src/behaviour.hg
==============================================================================
--- cluttermm/trunk/clutter/src/behaviour.hg	(original)
+++ cluttermm/trunk/clutter/src/behaviour.hg	Fri Feb 13 11:30:48 2009
@@ -72,7 +72,7 @@
   _WRAP_SIGNAL(void removed(const Glib::RefPtr<Actor>& actor), "removed")
 
 protected:
-  _WRAP_VFUNC(void alpha_notify(guint32 alpha_value), alpha_notify)
+  _WRAP_VFUNC(void alpha_notify(double alpha_value), alpha_notify)
 
 };
 

Copied: cluttermm/trunk/clutter/src/clone.hg (from r2039, /cluttermm/trunk/clutter/src/clone-texture.hg)
==============================================================================
--- /cluttermm/trunk/clutter/src/clone-texture.hg	(original)
+++ cluttermm/trunk/clutter/src/clone.hg	Fri Feb 13 11:30:48 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 The cluttermm Development Team
+/* Copyright (C) 2007-2009 The cluttermm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,21 +25,22 @@
 namespace Clutter
 {
 
-class CloneTexture :
+class Clone :
   public Actor
 {
-  _CLASS_GOBJECT(CloneTexture, ClutterCloneTexture, CLUTTER_CLONE_TEXTURE, Actor, ClutterActor)
+  _CLASS_GOBJECT(Clone, ClutterClone, CLUTTER_CLONE, Actor, ClutterActor)
 
 protected:
-  _WRAP_CTOR(CloneTexture(const Glib::RefPtr<Texture>& parent_texture), clutter_clone_texture_new)
+  _WRAP_CTOR(Clone(const Glib::RefPtr<Actor>& source), clutter_clone_new)
 
 public:
-#m4 _CONVERSION(`ClutterActor*',`Glib::RefPtr<CloneTexture>',`Glib::wrap((ClutterCloneTexture*)$3)')
+#m4 _CONVERSION(`ClutterActor*',`Glib::RefPtr<Clone>',`Glib::wrap((ClutterCloneTexture*)$3)')
 
-  _WRAP_CREATE(const Glib::RefPtr<Texture>& parent_texture);
+  _WRAP_CREATE(const Glib::RefPtr<Actor>& source);
 
-  _WRAP_METHOD(Glib::RefPtr<Texture> get_parent_texture() const, clutter_clone_texture_get_parent_texture)
-  _WRAP_METHOD(void get_parent_texture(const Glib::RefPtr<Texture>& texture), clutter_clone_texture_set_parent_texture)
+  _WRAP_METHOD(Glib::RefPtr<Actor> get_source(), clutter_clone_get_source)
+  _WRAP_METHOD(Glib::RefPtr<const Actor> get_source() const, clutter_clone_get_source, refreturn)
+  _WRAP_METHOD(void get_source(const Glib::RefPtr<Actor>& source), clutter_clone_set_source)
 
 };
 

Modified: cluttermm/trunk/clutter/src/clutter_enums.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_enums.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_enums.defs	Fri Feb 13 11:30:48 2009
@@ -1,48 +1,40 @@
-;; From clutter-main.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-actor.h
 
-(define-enum-extended InitError
-  (in-module "Clutter")
-  (c-name "ClutterInitError")
-  (values
-    '("success" "CLUTTER_INIT_SUCCESS" "1")
-    '("error-unknown" "CLUTTER_INIT_ERROR_UNKNOWN" "0")
-    '("error-threads" "CLUTTER_INIT_ERROR_THREADS" "-1")
-    '("error-backend" "CLUTTER_INIT_ERROR_BACKEND" "-2")
-    '("error-internal" "CLUTTER_INIT_ERROR_INTERNAL" "-3")
-  )
-)
-
-;; From clutter-path.h
-
-;; Hand-edited to deal with CLUTTER_PATH_RELATIVE flag
-(define-flags-extended PathNodeType
+(define-flags-extended ActorFlags
   (in-module "Clutter")
-  (c-name "ClutterPathNodeType")
+  (c-name "ClutterActorFlags")
   (values
-    '("move-to" "CLUTTER_PATH_MOVE_TO" "0")
-    '("line-to" "CLUTTER_PATH_LINE_TO" "1")
-    '("curve-to" "CLUTTER_PATH_CURVE_TO" "2")
-    '("close" "CLUTTER_PATH_CLOSE" "3")
-    '("relative" "CLUTTER_PATH_RELATIVE" "32")
-    '("rel-move-to" "CLUTTER_PATH_REL_MOVE_TO" "PATH_RELATIVE | PATH_MOVE_TO")
-    '("rel-line-to" "CLUTTER_PATH_REL_LINE_TO" "PATH_RELATIVE | PATH_LINE_TO")
-    '("rel-curve-to" "CLUTTER_PATH_REL_CURVE_TO" "PATH_RELATIVE | PATH_CURVE_TO")
+    '("mapped" "CLUTTER_ACTOR_MAPPED" "1 << 1")
+    '("realized" "CLUTTER_ACTOR_REALIZED" "1 << 2")
+    '("reactive" "CLUTTER_ACTOR_REACTIVE" "1 << 3")
   )
 )
 
-;; From clutter-shader.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-debug.h
 
-(define-enum-extended ShaderError
+(define-flags-extended DebugFlag
   (in-module "Clutter")
-  (c-name "ClutterShaderError")
+  (c-name "ClutterDebugFlag")
   (values
-    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM" "0")
-    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL" "1")
-    '("compile" "CLUTTER_SHADER_ERROR_COMPILE" "2")
+    '("misc" "CLUTTER_DEBUG_MISC" "1 << 0")
+    '("actor" "CLUTTER_DEBUG_ACTOR" "1 << 1")
+    '("texture" "CLUTTER_DEBUG_TEXTURE" "1 << 2")
+    '("event" "CLUTTER_DEBUG_EVENT" "1 << 3")
+    '("paint" "CLUTTER_DEBUG_PAINT" "1 << 4")
+    '("gl" "CLUTTER_DEBUG_GL" "1 << 5")
+    '("alpha" "CLUTTER_DEBUG_ALPHA" "1 << 6")
+    '("behaviour" "CLUTTER_DEBUG_BEHAVIOUR" "1 << 7")
+    '("pango" "CLUTTER_DEBUG_PANGO" "1 << 8")
+    '("backend" "CLUTTER_DEBUG_BACKEND" "1 << 9")
+    '("scheduler" "CLUTTER_DEBUG_SCHEDULER" "1 << 10")
+    '("script" "CLUTTER_DEBUG_SCRIPT" "1 << 11")
+    '("shader" "CLUTTER_DEBUG_SHADER" "1 << 12")
+    '("multistage" "CLUTTER_DEBUG_MULTISTAGE" "1 << 13")
+    '("animation" "CLUTTER_DEBUG_ANIMATION" "1 << 14")
   )
 )
 
-;; From clutter-event.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-event.h
 
 (define-flags-extended ModifierType
   (in-module "Clutter")
@@ -69,12 +61,11 @@
   )
 )
 
-;; Hand-edited because enum.pl failed to find the correct common prefix
 (define-flags-extended EventFlags
   (in-module "Clutter")
   (c-name "ClutterEventFlags")
   (values
-    '("synthetic" "CLUTTER_EVENT_FLAG_SYNTHETIC" "1 << 0")
+    '("c" "CLUTTER_EVENT_FLAG_SYNTHETIC" "1 << 0")
   )
 )
 
@@ -119,39 +110,82 @@
   )
 )
 
-;; From clutter-texture.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-feature.h
 
-(define-enum-extended TextureError
+(define-flags-extended FeatureFlags
   (in-module "Clutter")
-  (c-name "ClutterTextureError")
+  (c-name "ClutterFeatureFlags")
   (values
-    '("out-of-memory" "CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY" "0")
-    '("no-yuv" "CLUTTER_TEXTURE_ERROR_NO_YUV" "1")
-    '("bad-format" "CLUTTER_TEXTURE_ERROR_BAD_FORMAT" "2")
+    '("texture-npot" "CLUTTER_FEATURE_TEXTURE_NPOT" "1 << 2")
+    '("sync-to-vblank" "CLUTTER_FEATURE_SYNC_TO_VBLANK" "1 << 3")
+    '("texture-yuv" "CLUTTER_FEATURE_TEXTURE_YUV" "1 << 4")
+    '("texture-read-pixels" "CLUTTER_FEATURE_TEXTURE_READ_PIXELS" "1 << 5")
+    '("stage-static" "CLUTTER_FEATURE_STAGE_STATIC" "1 << 6")
+    '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE" "1 << 7")
+    '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR" "1 << 8")
+    '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL" "1 << 9")
+    '("offscreen" "CLUTTER_FEATURE_OFFSCREEN" "1 << 10")
+    '("stage-multiple" "CLUTTER_FEATURE_STAGE_MULTIPLE" "1 << 11")
   )
 )
 
-(define-flags-extended TextureFlags
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-main.h
+
+(define-enum-extended InitError
   (in-module "Clutter")
-  (c-name "ClutterTextureFlags")
+  (c-name "ClutterInitError")
   (values
-    '("rgb-flag-bgr" "CLUTTER_TEXTURE_RGB_FLAG_BGR" "1 << 1")
-    '("rgb-flag-premult" "CLUTTER_TEXTURE_RGB_FLAG_PREMULT" "1 << 2")
-    '("yuv-flag-yuv2" "CLUTTER_TEXTURE_YUV_FLAG_YUV2" "1 << 3")
+    '("success" "CLUTTER_INIT_SUCCESS" "1")
+    '("error-unknown" "CLUTTER_INIT_ERROR_UNKNOWN" "0")
+    '("error-threads" "CLUTTER_INIT_ERROR_THREADS" "-1")
+    '("error-backend" "CLUTTER_INIT_ERROR_BACKEND" "-2")
+    '("error-internal" "CLUTTER_INIT_ERROR_INTERNAL" "-3")
   )
 )
 
-(define-enum-extended TextureQuality
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-path.h
+
+(define-enum-extended PathNodeType
   (in-module "Clutter")
-  (c-name "ClutterTextureQuality")
+  (c-name "ClutterPathNodeType")
   (values
-    '("low" "CLUTTER_TEXTURE_QUALITY_LOW" "0")
-    '("medium" "CLUTTER_TEXTURE_QUALITY_MEDIUM" "1")
-    '("high" "CLUTTER_TEXTURE_QUALITY_HIGH" "2")
+    '("move-to" "CLUTTER_PATH_MOVE_TO" "0")
+    '("line-to" "CLUTTER_PATH_LINE_TO" "1")
+    '("curve-to" "CLUTTER_PATH_CURVE_TO" "2")
+    '("close" "CLUTTER_PATH_CLOSE" "3")
+    '("rel-move-to" "CLUTTER_PATH_REL_MOVE_TO" "#error")
+    '("rel-line-to" "CLUTTER_PATH_REL_LINE_TO" "1")
+    '("rel-curve-to" "CLUTTER_PATH_REL_CURVE_TO" "2")
   )
 )
 
-;; From clutter-script.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-private.h
+
+(define-flags-extended PrivateFlags
+  (in-module "Clutter")
+  (c-name "ClutterPrivateFlags")
+  (values
+    '("actor-unused-flag" "CLUTTER_ACTOR_UNUSED_FLAG" "0")
+    '("actor-in-destruction" "CLUTTER_ACTOR_IN_DESTRUCTION" "1 << 0")
+    '("actor-is-toplevel" "CLUTTER_ACTOR_IS_TOPLEVEL" "1 << 1")
+    '("actor-in-reparent" "CLUTTER_ACTOR_IN_REPARENT" "1 << 2")
+    '("actor-in-paint" "CLUTTER_ACTOR_IN_PAINT" "1 << 4")
+    '("actor-in-relayout" "CLUTTER_ACTOR_IN_RELAYOUT" "1 << 5")
+    '("texture-in-clone-paint" "CLUTTER_TEXTURE_IN_CLONE_PAINT" "1 << 6")
+  )
+)
+
+(define-enum-extended PickMode
+  (in-module "Clutter")
+  (c-name "ClutterPickMode")
+  (values
+    '("none" "CLUTTER_PICK_NONE" "0")
+    '("reactive" "CLUTTER_PICK_REACTIVE" "1")
+    '("all" "CLUTTER_PICK_ALL" "2")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-script.h
 
 (define-enum-extended ScriptError
   (in-module "Clutter")
@@ -163,19 +197,51 @@
   )
 )
 
-;; From clutter-actor.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-shader.h
 
-(define-flags-extended ActorFlags
+(define-enum-extended ShaderError
   (in-module "Clutter")
-  (c-name "ClutterActorFlags")
+  (c-name "ClutterShaderError")
   (values
-    '("mapped" "CLUTTER_ACTOR_MAPPED" "1 << 1")
-    '("realized" "CLUTTER_ACTOR_REALIZED" "1 << 2")
-    '("reactive" "CLUTTER_ACTOR_REACTIVE" "1 << 3")
+    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM" "0")
+    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL" "1")
+    '("compile" "CLUTTER_SHADER_ERROR_COMPILE" "2")
   )
 )
 
-;; From clutter-timeline.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-texture.h
+
+(define-enum-extended TextureError
+  (in-module "Clutter")
+  (c-name "ClutterTextureError")
+  (values
+    '("out-of-memory" "CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY" "0")
+    '("no-yuv" "CLUTTER_TEXTURE_ERROR_NO_YUV" "1")
+    '("bad-format" "CLUTTER_TEXTURE_ERROR_BAD_FORMAT" "2")
+  )
+)
+
+(define-flags-extended TextureFlags
+  (in-module "Clutter")
+  (c-name "ClutterTextureFlags")
+  (values
+    '("rgb-flag-bgr" "CLUTTER_TEXTURE_RGB_FLAG_BGR" "1 << 1")
+    '("rgb-flag-premult" "CLUTTER_TEXTURE_RGB_FLAG_PREMULT" "1 << 2")
+    '("yuv-flag-yuv2" "CLUTTER_TEXTURE_YUV_FLAG_YUV2" "1 << 3")
+  )
+)
+
+(define-enum-extended TextureQuality
+  (in-module "Clutter")
+  (c-name "ClutterTextureQuality")
+  (values
+    '("low" "CLUTTER_TEXTURE_QUALITY_LOW" "0")
+    '("medium" "CLUTTER_TEXTURE_QUALITY_MEDIUM" "1")
+    '("high" "CLUTTER_TEXTURE_QUALITY_HIGH" "2")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-timeline.h
 
 (define-enum-extended TimelineDirection
   (in-module "Clutter")
@@ -186,7 +252,7 @@
   )
 )
 
-;; From clutter-types.h
+;; From /home/murrayc/svn/gnome220/branches/clutter/clutter/clutter-types.h
 
 (define-enum-extended Gravity
   (in-module "Clutter")
@@ -239,35 +305,46 @@
   (values
     '("custom-mode" "CLUTTER_CUSTOM_MODE" "0")
     '("linear" "CLUTTER_LINEAR" "1")
-    '("sine-in" "CLUTTER_SINE_IN" "2")
-    '("sine-out" "CLUTTER_SINE_OUT" "3")
-    '("sine-in-out" "CLUTTER_SINE_IN_OUT" "4")
-    '("ease-in" "CLUTTER_EASE_IN" "5")
-    '("ease-out" "CLUTTER_EASE_OUT" "6")
-    '("ease-in-out" "CLUTTER_EASE_IN_OUT" "7")
-    '("expo-in" "CLUTTER_EXPO_IN" "8")
-    '("expo-out" "CLUTTER_EXPO_OUT" "9")
-    '("expo-in-out" "CLUTTER_EXPO_IN_OUT" "10")
-    '("smooth-in-out" "CLUTTER_SMOOTH_IN_OUT" "11")
+    '("ease-in-quad" "CLUTTER_EASE_IN_QUAD" "2")
+    '("ease-out-quad" "CLUTTER_EASE_OUT_QUAD" "3")
+    '("ease-in-out-quad" "CLUTTER_EASE_IN_OUT_QUAD" "4")
+    '("ease-in-cubic" "CLUTTER_EASE_IN_CUBIC" "5")
+    '("ease-out-cubic" "CLUTTER_EASE_OUT_CUBIC" "6")
+    '("ease-in-out-cubic" "CLUTTER_EASE_IN_OUT_CUBIC" "7")
+    '("ease-in-quart" "CLUTTER_EASE_IN_QUART" "8")
+    '("ease-out-quart" "CLUTTER_EASE_OUT_QUART" "9")
+    '("ease-in-out-quart" "CLUTTER_EASE_IN_OUT_QUART" "10")
+    '("ease-in-quint" "CLUTTER_EASE_IN_QUINT" "11")
+    '("ease-out-quint" "CLUTTER_EASE_OUT_QUINT" "12")
+    '("ease-in-out-quint" "CLUTTER_EASE_IN_OUT_QUINT" "13")
+    '("ease-in-sine" "CLUTTER_EASE_IN_SINE" "14")
+    '("ease-out-sine" "CLUTTER_EASE_OUT_SINE" "15")
+    '("ease-in-out-sine" "CLUTTER_EASE_IN_OUT_SINE" "16")
+    '("ease-in-expo" "CLUTTER_EASE_IN_EXPO" "17")
+    '("ease-out-expo" "CLUTTER_EASE_OUT_EXPO" "18")
+    '("ease-in-out-expo" "CLUTTER_EASE_IN_OUT_EXPO" "19")
+    '("ease-in-circ" "CLUTTER_EASE_IN_CIRC" "20")
+    '("ease-out-circ" "CLUTTER_EASE_OUT_CIRC" "21")
+    '("ease-in-out-circ" "CLUTTER_EASE_IN_OUT_CIRC" "22")
+    '("ease-in-elastic" "CLUTTER_EASE_IN_ELASTIC" "23")
+    '("ease-out-elastic" "CLUTTER_EASE_OUT_ELASTIC" "24")
+    '("ease-in-out-elastic" "CLUTTER_EASE_IN_OUT_ELASTIC" "25")
+    '("ease-in-back" "CLUTTER_EASE_IN_BACK" "26")
+    '("ease-out-back" "CLUTTER_EASE_OUT_BACK" "27")
+    '("ease-in-out-back" "CLUTTER_EASE_IN_OUT_BACK" "28")
+    '("ease-in-bounce" "CLUTTER_EASE_IN_BOUNCE" "29")
+    '("ease-out-bounce" "CLUTTER_EASE_OUT_BOUNCE" "30")
+    '("ease-in-out-bounce" "CLUTTER_EASE_IN_OUT_BOUNCE" "31")
+    '("animation-last" "CLUTTER_ANIMATION_LAST" "32")
   )
 )
 
-;; From clutter-feature.h
-
-(define-flags-extended FeatureFlags
+(define-flags-extended FontFlags
   (in-module "Clutter")
-  (c-name "ClutterFeatureFlags")
+  (c-name "ClutterFontFlags")
   (values
-    '("texture-npot" "CLUTTER_FEATURE_TEXTURE_NPOT" "1 << 2")
-    '("sync-to-vblank" "CLUTTER_FEATURE_SYNC_TO_VBLANK" "1 << 3")
-    '("texture-yuv" "CLUTTER_FEATURE_TEXTURE_YUV" "1 << 4")
-    '("texture-read-pixels" "CLUTTER_FEATURE_TEXTURE_READ_PIXELS" "1 << 5")
-    '("stage-static" "CLUTTER_FEATURE_STAGE_STATIC" "1 << 6")
-    '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE" "1 << 7")
-    '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR" "1 << 8")
-    '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL" "1 << 9")
-    '("offscreen" "CLUTTER_FEATURE_OFFSCREEN" "1 << 10")
-    '("stage-multiple" "CLUTTER_FEATURE_STAGE_MULTIPLE" "1 << 11")
+    '("mipmapping" "CLUTTER_FONT_MIPMAPPING" "1 << 0")
+    '("hinting" "CLUTTER_FONT_HINTING" "1 << 1")
   )
 )
 

Modified: cluttermm/trunk/clutter/src/clutter_methods.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_methods.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_methods.defs	Fri Feb 13 11:30:48 2009
@@ -14,6 +14,12 @@
   (gtype-id "CLUTTER_TYPE_ALPHA")
 )
 
+(define-object Animatable
+  (in-module "Clutter")
+  (c-name "ClutterAnimatable")
+  (gtype-id "CLUTTER_TYPE_ANIMATABLE")
+)
+
 (define-object Animation
   (in-module "Clutter")
   (parent "GInitiallyUnowned")
@@ -84,11 +90,11 @@
   (gtype-id "CLUTTER_TYPE_CHILD_META")
 )
 
-(define-object CloneTexture
+(define-object Clone
   (in-module "Clutter")
   (parent "ClutterActor")
-  (c-name "ClutterCloneTexture")
-  (gtype-id "CLUTTER_TYPE_CLONE_TEXTURE")
+  (c-name "ClutterClone")
+  (gtype-id "CLUTTER_TYPE_CLONE")
 )
 
 (define-object Container
@@ -97,13 +103,6 @@
   (gtype-id "CLUTTER_TYPE_CONTAINER")
 )
 
-(define-object EffectTemplate
-  (in-module "Clutter")
-  (parent "GObject")
-  (c-name "ClutterEffectTemplate")
-  (gtype-id "CLUTTER_TYPE_EFFECT_TEMPLATE")
-)
-
 (define-object Group
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -118,6 +117,12 @@
   (gtype-id "CLUTTER_TYPE_INTERVAL")
 )
 
+(define-object Media
+  (in-module "Clutter")
+  (c-name "ClutterMedia")
+  (gtype-id "CLUTTER_TYPE_MEDIA")
+)
+
 (define-object Model
   (in-module "Clutter")
   (parent "GObject")
@@ -180,6 +185,12 @@
   (gtype-id "CLUTTER_TYPE_STAGE")
 )
 
+(define-object StageWindow
+  (in-module "Clutter")
+  (c-name "ClutterStageWindow")
+  (gtype-id "CLUTTER_TYPE_STAGE_WINDOW")
+)
+
 (define-object Text
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -210,42 +221,37 @@
 
 ;; Enumerations and flags ...
 
-(define-enum InitError
-  (in-module "Clutter")
-  (c-name "ClutterInitError")
-  (gtype-id "CLUTTER_TYPE_INIT_ERROR")
-  (values
-    '("success" "CLUTTER_INIT_SUCCESS")
-    '("error-unknown" "CLUTTER_INIT_ERROR_UNKNOWN")
-    '("error-threads" "CLUTTER_INIT_ERROR_THREADS")
-    '("error-backend" "CLUTTER_INIT_ERROR_BACKEND")
-    '("error-internal" "CLUTTER_INIT_ERROR_INTERNAL")
-  )
-)
-
-(define-enum PathNodeType
+(define-flags ActorFlags
   (in-module "Clutter")
-  (c-name "ClutterPathNodeType")
-  (gtype-id "CLUTTER_TYPE_PATH_NODE_TYPE")
+  (c-name "ClutterActorFlags")
+  (gtype-id "CLUTTER_TYPE_ACTOR_FLAGS")
   (values
-    '("move-to" "CLUTTER_PATH_MOVE_TO")
-    '("line-to" "CLUTTER_PATH_LINE_TO")
-    '("curve-to" "CLUTTER_PATH_CURVE_TO")
-    '("close" "CLUTTER_PATH_CLOSE")
-    '("rel-move-to" "CLUTTER_PATH_REL_MOVE_TO")
-    '("rel-line-to" "CLUTTER_PATH_REL_LINE_TO")
-    '("rel-curve-to" "CLUTTER_PATH_REL_CURVE_TO")
+    '("mapped" "CLUTTER_ACTOR_MAPPED")
+    '("realized" "CLUTTER_ACTOR_REALIZED")
+    '("reactive" "CLUTTER_ACTOR_REACTIVE")
   )
 )
 
-(define-enum ShaderError
+(define-flags DebugFlag
   (in-module "Clutter")
-  (c-name "ClutterShaderError")
-  (gtype-id "CLUTTER_TYPE_SHADER_ERROR")
+  (c-name "ClutterDebugFlag")
+  (gtype-id "CLUTTER_TYPE_DEBUG_FLAG")
   (values
-    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM")
-    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL")
-    '("compile" "CLUTTER_SHADER_ERROR_COMPILE")
+    '("misc" "CLUTTER_DEBUG_MISC")
+    '("actor" "CLUTTER_DEBUG_ACTOR")
+    '("texture" "CLUTTER_DEBUG_TEXTURE")
+    '("event" "CLUTTER_DEBUG_EVENT")
+    '("paint" "CLUTTER_DEBUG_PAINT")
+    '("gl" "CLUTTER_DEBUG_GL")
+    '("alpha" "CLUTTER_DEBUG_ALPHA")
+    '("behaviour" "CLUTTER_DEBUG_BEHAVIOUR")
+    '("pango" "CLUTTER_DEBUG_PANGO")
+    '("backend" "CLUTTER_DEBUG_BACKEND")
+    '("scheduler" "CLUTTER_DEBUG_SCHEDULER")
+    '("script" "CLUTTER_DEBUG_SCRIPT")
+    '("shader" "CLUTTER_DEBUG_SHADER")
+    '("multistage" "CLUTTER_DEBUG_MULTISTAGE")
+    '("animation" "CLUTTER_DEBUG_ANIMATION")
   )
 )
 
@@ -328,6 +334,101 @@
   )
 )
 
+(define-flags FeatureFlags
+  (in-module "Clutter")
+  (c-name "ClutterFeatureFlags")
+  (gtype-id "CLUTTER_TYPE_FEATURE_FLAGS")
+  (values
+    '("texture-npot" "CLUTTER_FEATURE_TEXTURE_NPOT")
+    '("sync-to-vblank" "CLUTTER_FEATURE_SYNC_TO_VBLANK")
+    '("texture-yuv" "CLUTTER_FEATURE_TEXTURE_YUV")
+    '("texture-read-pixels" "CLUTTER_FEATURE_TEXTURE_READ_PIXELS")
+    '("stage-static" "CLUTTER_FEATURE_STAGE_STATIC")
+    '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE")
+    '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR")
+    '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL")
+    '("offscreen" "CLUTTER_FEATURE_OFFSCREEN")
+    '("stage-multiple" "CLUTTER_FEATURE_STAGE_MULTIPLE")
+  )
+)
+
+(define-enum InitError
+  (in-module "Clutter")
+  (c-name "ClutterInitError")
+  (gtype-id "CLUTTER_TYPE_INIT_ERROR")
+  (values
+    '("success" "CLUTTER_INIT_SUCCESS")
+    '("error-unknown" "CLUTTER_INIT_ERROR_UNKNOWN")
+    '("error-threads" "CLUTTER_INIT_ERROR_THREADS")
+    '("error-backend" "CLUTTER_INIT_ERROR_BACKEND")
+    '("error-internal" "CLUTTER_INIT_ERROR_INTERNAL")
+  )
+)
+
+(define-enum PathNodeType
+  (in-module "Clutter")
+  (c-name "ClutterPathNodeType")
+  (gtype-id "CLUTTER_TYPE_PATH_NODE_TYPE")
+  (values
+    '("move-to" "CLUTTER_PATH_MOVE_TO")
+    '("line-to" "CLUTTER_PATH_LINE_TO")
+    '("curve-to" "CLUTTER_PATH_CURVE_TO")
+    '("close" "CLUTTER_PATH_CLOSE")
+    '("rel-move-to" "CLUTTER_PATH_REL_MOVE_TO")
+    '("rel-line-to" "CLUTTER_PATH_REL_LINE_TO")
+    '("rel-curve-to" "CLUTTER_PATH_REL_CURVE_TO")
+  )
+)
+
+(define-flags PrivateFlags
+  (in-module "Clutter")
+  (c-name "ClutterPrivateFlags")
+  (gtype-id "CLUTTER_TYPE_PRIVATE_FLAGS")
+  (values
+    '("actor-unused-flag" "CLUTTER_ACTOR_UNUSED_FLAG")
+    '("actor-in-destruction" "CLUTTER_ACTOR_IN_DESTRUCTION")
+    '("actor-is-toplevel" "CLUTTER_ACTOR_IS_TOPLEVEL")
+    '("actor-in-reparent" "CLUTTER_ACTOR_IN_REPARENT")
+    '("actor-sync-matrices" "CLUTTER_ACTOR_SYNC_MATRICES")
+    '("actor-in-paint" "CLUTTER_ACTOR_IN_PAINT")
+    '("actor-in-relayout" "CLUTTER_ACTOR_IN_RELAYOUT")
+    '("texture-in-clone-paint" "CLUTTER_TEXTURE_IN_CLONE_PAINT")
+  )
+)
+
+(define-enum PickMode
+  (in-module "Clutter")
+  (c-name "ClutterPickMode")
+  (gtype-id "CLUTTER_TYPE_PICK_MODE")
+  (values
+    '("none" "CLUTTER_PICK_NONE")
+    '("reactive" "CLUTTER_PICK_REACTIVE")
+    '("all" "CLUTTER_PICK_ALL")
+  )
+)
+
+(define-enum ScriptError
+  (in-module "Clutter")
+  (c-name "ClutterScriptError")
+  (gtype-id "CLUTTER_TYPE_SCRIPT_ERROR")
+  (values
+    '("type-function" "CLUTTER_SCRIPT_ERROR_INVALID_TYPE_FUNCTION")
+    '("property" "CLUTTER_SCRIPT_ERROR_INVALID_PROPERTY")
+    '("value" "CLUTTER_SCRIPT_ERROR_INVALID_VALUE")
+  )
+)
+
+(define-enum ShaderError
+  (in-module "Clutter")
+  (c-name "ClutterShaderError")
+  (gtype-id "CLUTTER_TYPE_SHADER_ERROR")
+  (values
+    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM")
+    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL")
+    '("compile" "CLUTTER_SHADER_ERROR_COMPILE")
+  )
+)
+
 (define-enum TextureError
   (in-module "Clutter")
   (c-name "ClutterTextureError")
@@ -361,28 +462,6 @@
   )
 )
 
-(define-enum ScriptError
-  (in-module "Clutter")
-  (c-name "ClutterScriptError")
-  (gtype-id "CLUTTER_TYPE_SCRIPT_ERROR")
-  (values
-    '("type-function" "CLUTTER_SCRIPT_ERROR_INVALID_TYPE_FUNCTION")
-    '("property" "CLUTTER_SCRIPT_ERROR_INVALID_PROPERTY")
-    '("value" "CLUTTER_SCRIPT_ERROR_INVALID_VALUE")
-  )
-)
-
-(define-flags ActorFlags
-  (in-module "Clutter")
-  (c-name "ClutterActorFlags")
-  (gtype-id "CLUTTER_TYPE_ACTOR_FLAGS")
-  (values
-    '("mapped" "CLUTTER_ACTOR_MAPPED")
-    '("realized" "CLUTTER_ACTOR_REALIZED")
-    '("reactive" "CLUTTER_ACTOR_REACTIVE")
-  )
-)
-
 (define-enum TimelineDirection
   (in-module "Clutter")
   (c-name "ClutterTimelineDirection")
@@ -449,3769 +528,3822 @@
   (values
     '("custom-mode" "CLUTTER_CUSTOM_MODE")
     '("linear" "CLUTTER_LINEAR")
-    '("sine-in" "CLUTTER_SINE_IN")
-    '("sine-out" "CLUTTER_SINE_OUT")
-    '("sine-in-out" "CLUTTER_SINE_IN_OUT")
-    '("ease-in" "CLUTTER_EASE_IN")
-    '("ease-out" "CLUTTER_EASE_OUT")
-    '("ease-in-out" "CLUTTER_EASE_IN_OUT")
-    '("expo-in" "CLUTTER_EXPO_IN")
-    '("expo-out" "CLUTTER_EXPO_OUT")
-    '("expo-in-out" "CLUTTER_EXPO_IN_OUT")
-    '("smooth-in-out" "CLUTTER_SMOOTH_IN_OUT")
+    '("ease-in-quad" "CLUTTER_EASE_IN_QUAD")
+    '("ease-out-quad" "CLUTTER_EASE_OUT_QUAD")
+    '("ease-in-out-quad" "CLUTTER_EASE_IN_OUT_QUAD")
+    '("ease-in-cubic" "CLUTTER_EASE_IN_CUBIC")
+    '("ease-out-cubic" "CLUTTER_EASE_OUT_CUBIC")
+    '("ease-in-out-cubic" "CLUTTER_EASE_IN_OUT_CUBIC")
+    '("ease-in-quart" "CLUTTER_EASE_IN_QUART")
+    '("ease-out-quart" "CLUTTER_EASE_OUT_QUART")
+    '("ease-in-out-quart" "CLUTTER_EASE_IN_OUT_QUART")
+    '("ease-in-quint" "CLUTTER_EASE_IN_QUINT")
+    '("ease-out-quint" "CLUTTER_EASE_OUT_QUINT")
+    '("ease-in-out-quint" "CLUTTER_EASE_IN_OUT_QUINT")
+    '("ease-in-sine" "CLUTTER_EASE_IN_SINE")
+    '("ease-out-sine" "CLUTTER_EASE_OUT_SINE")
+    '("ease-in-out-sine" "CLUTTER_EASE_IN_OUT_SINE")
+    '("ease-in-expo" "CLUTTER_EASE_IN_EXPO")
+    '("ease-out-expo" "CLUTTER_EASE_OUT_EXPO")
+    '("ease-in-out-expo" "CLUTTER_EASE_IN_OUT_EXPO")
+    '("ease-in-circ" "CLUTTER_EASE_IN_CIRC")
+    '("ease-out-circ" "CLUTTER_EASE_OUT_CIRC")
+    '("ease-in-out-circ" "CLUTTER_EASE_IN_OUT_CIRC")
+    '("ease-in-elastic" "CLUTTER_EASE_IN_ELASTIC")
+    '("ease-out-elastic" "CLUTTER_EASE_OUT_ELASTIC")
+    '("ease-in-out-elastic" "CLUTTER_EASE_IN_OUT_ELASTIC")
+    '("ease-in-back" "CLUTTER_EASE_IN_BACK")
+    '("ease-out-back" "CLUTTER_EASE_OUT_BACK")
+    '("ease-in-out-back" "CLUTTER_EASE_IN_OUT_BACK")
+    '("ease-in-bounce" "CLUTTER_EASE_IN_BOUNCE")
+    '("ease-out-bounce" "CLUTTER_EASE_OUT_BOUNCE")
+    '("ease-in-out-bounce" "CLUTTER_EASE_IN_OUT_BOUNCE")
+    '("animation-last" "CLUTTER_ANIMATION_LAST")
   )
 )
 
-(define-flags FeatureFlags
+(define-flags FontFlags
   (in-module "Clutter")
-  (c-name "ClutterFeatureFlags")
-  (gtype-id "CLUTTER_TYPE_FEATURE_FLAGS")
+  (c-name "ClutterFontFlags")
+  (gtype-id "CLUTTER_TYPE_FONT_FLAGS")
   (values
-    '("texture-npot" "CLUTTER_FEATURE_TEXTURE_NPOT")
-    '("sync-to-vblank" "CLUTTER_FEATURE_SYNC_TO_VBLANK")
-    '("texture-yuv" "CLUTTER_FEATURE_TEXTURE_YUV")
-    '("texture-read-pixels" "CLUTTER_FEATURE_TEXTURE_READ_PIXELS")
-    '("stage-static" "CLUTTER_FEATURE_STAGE_STATIC")
-    '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE")
-    '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR")
-    '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL")
-    '("offscreen" "CLUTTER_FEATURE_OFFSCREEN")
-    '("stage-multiple" "CLUTTER_FEATURE_STAGE_MULTIPLE")
+    '("mipmapping" "CLUTTER_FONT_MIPMAPPING")
+    '("hinting" "CLUTTER_FONT_HINTING")
   )
 )
 
 
-;; From clutter-backend.h
+;; From clutter-actor.h
 
-(define-function clutter_backend_get_type
-  (c-name "clutter_backend_get_type")
+(define-function clutter_actor_box_get_type
+  (c-name "clutter_actor_box_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_get_default_backend
-  (c-name "clutter_get_default_backend")
-  (return-type "ClutterBackend*")
+(define-function clutter_actor_get_type
+  (c-name "clutter_actor_get_type")
+  (return-type "GType")
 )
 
-(define-method set_resolution
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_resolution")
+(define-method show
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_show")
   (return-type "none")
-  (parameters
-    '("gdouble" "dpi")
-  )
-)
-
-(define-method get_resolution
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_resolution")
-  (return-type "gdouble")
 )
 
-(define-method set_double_click_time
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_double_click_time")
+(define-method show_all
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_show_all")
   (return-type "none")
-  (parameters
-    '("guint" "msec")
-  )
 )
 
-(define-method get_double_click_time
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_double_click_time")
-  (return-type "guint")
+(define-method hide
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_hide")
+  (return-type "none")
 )
 
-(define-method set_double_click_distance
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_double_click_distance")
+(define-method hide_all
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_hide_all")
   (return-type "none")
-  (parameters
-    '("guint" "distance")
-  )
 )
 
-(define-method get_double_click_distance
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_double_click_distance")
-  (return-type "guint")
+(define-method realize
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_realize")
+  (return-type "none")
 )
 
-(define-method set_font_options
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_font_options")
+(define-method unrealize
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_unrealize")
   (return-type "none")
-  (parameters
-    '("cairo_font_options_t*" "options")
-  )
 )
 
-(define-method get_font_options
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_font_options")
-  (return-type "cairo_font_options_t*")
+(define-method paint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_paint")
+  (return-type "none")
 )
 
-(define-method set_font_name
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_font_name")
+(define-method pick
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_pick")
   (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_font_name
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_font_name")
-  (return-type "const-gchar*")
+(define-method queue_redraw
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_queue_redraw")
+  (return-type "none")
 )
 
-
-
-;; From clutter-text.h
-
-(define-function clutter_text_get_type
-  (c-name "clutter_text_get_type")
-  (return-type "GType")
+(define-method queue_relayout
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_queue_relayout")
+  (return-type "none")
 )
 
-(define-function clutter_text_new
-  (c-name "clutter_text_new")
-  (is-constructor-of "ClutterText")
-  (return-type "ClutterActor*")
+(define-method destroy
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_destroy")
+  (return-type "none")
 )
 
-(define-function clutter_text_new_full
-  (c-name "clutter_text_new_full")
-  (return-type "ClutterActor*")
+(define-method get_preferred_width
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_preferred_width")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
-    '("const-gchar*" "text")
-    '("const-ClutterColor*" "color")
+    '("ClutterUnit" "for_height")
+    '("ClutterUnit*" "min_width_p")
+    '("ClutterUnit*" "natural_width_p")
   )
 )
 
-(define-function clutter_text_new_with_text
-  (c-name "clutter_text_new_with_text")
-  (return-type "ClutterActor*")
+(define-method get_preferred_height
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_preferred_height")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
-    '("const-gchar*" "text")
+    '("ClutterUnit" "for_width")
+    '("ClutterUnit*" "min_height_p")
+    '("ClutterUnit*" "natural_height_p")
   )
 )
 
-(define-method get_text
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_text")
-  (return-type "const-gchar*")
-)
-
-(define-method set_text
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_text")
+(define-method get_preferred_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_preferred_size")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
+    '("ClutterUnit*" "min_width_p")
+    '("ClutterUnit*" "min_height_p")
+    '("ClutterUnit*" "natural_width_p")
+    '("ClutterUnit*" "natural_height_p")
   )
 )
 
-(define-method get_layout
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_layout")
-  (return-type "PangoLayout*")
-)
-
-(define-method set_color
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_color")
+(define-method allocate
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_allocate")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("const-ClutterActorBox*" "box")
+    '("gboolean" "absolute_origin_changed")
   )
 )
 
-(define-method get_color
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_color")
+(define-method allocate_preferred_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_allocate_preferred_size")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "color")
+    '("gboolean" "absolute_origin_changed")
   )
 )
 
-(define-method set_font_name
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_font_name")
+(define-method get_allocation_coords
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_coords")
   (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
+    '("gint*" "x_1")
+    '("gint*" "y_1")
+    '("gint*" "x_2")
+    '("gint*" "y_2")
   )
 )
 
-(define-method get_font_name
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_font_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_ellipsize
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_ellipsize")
+(define-method get_allocation_box
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_box")
   (return-type "none")
   (parameters
-    '("PangoEllipsizeMode" "mode")
+    '("ClutterActorBox*" "box")
   )
 )
 
-(define-method get_ellipsize
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_ellipsize")
-  (return-type "PangoEllipsizeMode")
-)
-
-(define-method set_line_wrap
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_line_wrap")
+(define-method get_allocation_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_geometry")
   (return-type "none")
   (parameters
-    '("gboolean" "line_wrap")
+    '("ClutterGeometry*" "geom")
   )
 )
 
-(define-method get_line_wrap
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_line_wrap")
-  (return-type "gboolean")
-)
-
-(define-method set_line_wrap_mode
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_line_wrap_mode")
+(define-method get_allocation_vertices
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_vertices")
   (return-type "none")
   (parameters
-    '("PangoWrapMode" "wrap_mode")
+    '("ClutterActor*" "ancestor")
+    '("ClutterVertex" "verts[4]")
   )
 )
 
-(define-method get_line_wrap_mode
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_line_wrap_mode")
-  (return-type "PangoWrapMode")
-)
-
-(define-method get_layout
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_layout")
-  (return-type "PangoLayout*")
-)
-
-(define-method set_attributes
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_attributes")
+(define-method set_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_geometry")
   (return-type "none")
   (parameters
-    '("PangoAttrList*" "attrs")
+    '("const-ClutterGeometry*" "geometry")
   )
 )
 
-(define-method get_attributes
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_attributes")
-  (return-type "PangoAttrList*")
-)
-
-(define-method set_use_markup
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_use_markup")
+(define-method get_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_geometry")
   (return-type "none")
   (parameters
-    '("gboolean" "setting")
+    '("ClutterGeometry*" "geometry")
   )
 )
 
-(define-method get_use_markup
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_use_markup")
-  (return-type "gboolean")
-)
-
-(define-method set_alignment
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_alignment")
+(define-method set_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_size")
   (return-type "none")
   (parameters
-    '("PangoAlignment" "alignment")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-method get_alignment
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_alignment")
-  (return-type "PangoAlignment")
-)
-
-(define-method set_justify
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_justify")
+(define-method set_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_sizeu")
   (return-type "none")
   (parameters
-    '("gboolean" "justify")
+    '("ClutterUnit" "width")
+    '("ClutterUnit" "height")
   )
 )
 
-(define-method get_justify
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_justify")
-  (return-type "gboolean")
-)
-
-(define-method insert_unichar
-  (of-object "ClutterText")
-  (c-name "clutter_text_insert_unichar")
+(define-method get_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_size")
   (return-type "none")
   (parameters
-    '("gunichar" "wc")
+    '("guint*" "width")
+    '("guint*" "height")
   )
 )
 
-(define-method delete_chars
-  (of-object "ClutterText")
-  (c-name "clutter_text_delete_chars")
+(define-method get_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_sizeu")
   (return-type "none")
   (parameters
-    '("guint" "n_chars")
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
   )
 )
 
-(define-method insert_text
-  (of-object "ClutterText")
-  (c-name "clutter_text_insert_text")
+(define-method get_transformed_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_size")
   (return-type "none")
   (parameters
-    '("const-gchar*" "text")
-    '("gssize" "position")
+    '("guint*" "width")
+    '("guint*" "height")
   )
 )
 
-(define-method delete_text
-  (of-object "ClutterText")
-  (c-name "clutter_text_delete_text")
+(define-method get_transformed_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_sizeu")
   (return-type "none")
   (parameters
-    '("gssize" "start_pos")
-    '("gssize" "end_pos")
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
   )
 )
 
-(define-method get_chars
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_chars")
-  (return-type "gchar*")
+(define-method set_position
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_position")
+  (return-type "none")
   (parameters
-    '("gssize" "start_pos")
-    '("gssize" "end_pos")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method set_editable
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_editable")
+(define-method set_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_positionu")
   (return-type "none")
   (parameters
-    '("gboolean" "editable")
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
   )
 )
 
-(define-method get_editable
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_editable")
-  (return-type "gboolean")
-)
-
-(define-method set_activatable
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_activatable")
+(define-method get_position
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_position")
   (return-type "none")
   (parameters
-    '("gboolean" "activatable")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method get_activatable
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_activatable")
-  (return-type "gboolean")
-)
-
-(define-method get_cursor_position
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_cursor_position")
-  (return-type "gint")
+(define-method get_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_positionu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "x")
+    '("ClutterUnit*" "y")
+  )
 )
 
-(define-method set_cursor_position
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_cursor_position")
+(define-method get_transformed_position
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_position")
   (return-type "none")
   (parameters
-    '("gint" "position")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method set_cursor_visible
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_cursor_visible")
+(define-method get_transformed_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformed_positionu")
   (return-type "none")
   (parameters
-    '("gboolean" "cursor_visible")
+    '("ClutterUnit*" "x")
+    '("ClutterUnit*" "y")
   )
 )
 
-(define-method get_cursor_visible
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_cursor_visible")
+(define-method get_fixed_position_set
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_fixed_position_set")
   (return-type "gboolean")
 )
 
-(define-method set_cursor_color
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_cursor_color")
+(define-method set_fixed_position_set
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_fixed_position_set")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("gboolean" "is_set")
   )
 )
 
-(define-method get_cursor_color
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_cursor_color")
+(define-method get_width
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_width")
+  (return-type "guint")
+)
+
+(define-method get_widthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_widthu")
+  (return-type "ClutterUnit")
+)
+
+(define-method get_height
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_height")
+  (return-type "guint")
+)
+
+(define-method get_heightu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_heightu")
+  (return-type "ClutterUnit")
+)
+
+(define-method set_width
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_width")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "color")
+    '("guint" "width")
   )
 )
 
-(define-method set_cursor_size
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_cursor_size")
+(define-method set_widthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_widthu")
   (return-type "none")
   (parameters
-    '("gint" "size")
+    '("ClutterUnit" "width")
   )
 )
 
-(define-method get_cursor_size
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_cursor_size")
-  (return-type "guint")
-)
-
-(define-method set_selectable
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_selectable")
+(define-method set_height
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_height")
   (return-type "none")
   (parameters
-    '("gboolean" "selectable")
+    '("guint" "height")
   )
 )
 
-(define-method get_selectable
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_selectable")
-  (return-type "gboolean")
-)
-
-(define-method set_selection_bound
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_selection_bound")
+(define-method set_heightu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_heightu")
   (return-type "none")
   (parameters
-    '("gint" "selection_bound")
+    '("ClutterUnit" "height")
   )
 )
 
-(define-method get_selection_bound
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_selection_bound")
+(define-method get_x
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_x")
   (return-type "gint")
 )
 
-(define-method set_selection
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_selection")
-  (return-type "none")
-  (parameters
-    '("gssize" "start_pos")
-    '("gssize" "end_pos")
-  )
+(define-method get_xu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_xu")
+  (return-type "ClutterUnit")
 )
 
-(define-method get_selection
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_selection")
-  (return-type "gchar*")
+(define-method get_y
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_y")
+  (return-type "gint")
 )
 
-(define-method set_password_char
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_password_char")
+(define-method get_yu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_yu")
+  (return-type "ClutterUnit")
+)
+
+(define-method set_x
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_x")
   (return-type "none")
   (parameters
-    '("gunichar" "wc")
+    '("gint" "x")
   )
 )
 
-(define-method get_password_char
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_password_char")
-  (return-type "gunichar")
-)
-
-(define-method set_max_length
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_max_length")
+(define-method set_xu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_xu")
   (return-type "none")
   (parameters
-    '("gint" "max")
+    '("ClutterUnit" "x")
   )
 )
 
-(define-method get_max_length
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_max_length")
-  (return-type "gint")
+(define-method set_y
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_y")
+  (return-type "none")
+  (parameters
+    '("gint" "y")
+  )
 )
 
-(define-method set_single_line_mode
-  (of-object "ClutterText")
-  (c-name "clutter_text_set_single_line_mode")
+(define-method set_yu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_yu")
   (return-type "none")
   (parameters
-    '("gboolean" "single_line")
+    '("ClutterUnit" "y")
   )
 )
 
-(define-method get_single_line_mode
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_single_line_mode")
-  (return-type "gboolean")
+(define-method set_rotation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_rotation")
+  (return-type "none")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "z")
+  )
 )
 
-(define-method activate
-  (of-object "ClutterText")
-  (c-name "clutter_text_activate")
-  (return-type "gboolean")
+(define-method set_rotationu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_rotationu")
+  (return-type "none")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
+    '("ClutterUnit" "z")
+  )
 )
 
-
-
-;; From clutter-frame-source.h
-
-(define-function clutter_frame_source_add
-  (c-name "clutter_frame_source_add")
-  (return-type "guint")
+(define-method set_z_rotation_from_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_z_rotation_from_gravity")
+  (return-type "none")
   (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("gdouble" "angle")
+    '("ClutterGravity" "gravity")
   )
 )
 
-(define-function clutter_frame_source_add_full
-  (c-name "clutter_frame_source_add_full")
-  (return-type "guint")
+(define-method get_rotation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_rotation")
+  (return-type "gdouble")
   (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("ClutterRotateAxis" "axis")
+    '("gint*" "x")
+    '("gint*" "y")
+    '("gint*" "z")
   )
 )
 
-
-
-;; From clutter-enum-types.h
-
-(define-function clutter_actor_flags_get_type
-  (c-name "clutter_actor_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_modifier_type_get_type
-  (c-name "clutter_modifier_type_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_event_flags_get_type
-  (c-name "clutter_event_flags_get_type")
-  (return-type "GType")
+(define-method get_rotationu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_rotationu")
+  (return-type "gdouble")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+    '("ClutterUnit*" "x")
+    '("ClutterUnit*" "y")
+    '("ClutterUnit*" "z")
+  )
 )
 
-(define-function clutter_event_type_get_type
-  (c-name "clutter_event_type_get_type")
-  (return-type "GType")
+(define-method get_z_rotation_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_z_rotation_gravity")
+  (return-type "ClutterGravity")
 )
 
-(define-function clutter_scroll_direction_get_type
-  (c-name "clutter_scroll_direction_get_type")
-  (return-type "GType")
+(define-method set_opacity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_opacity")
+  (return-type "none")
+  (parameters
+    '("guint8" "opacity")
+  )
 )
 
-(define-function clutter_stage_state_get_type
-  (c-name "clutter_stage_state_get_type")
-  (return-type "GType")
+(define-method get_opacity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_opacity")
+  (return-type "guint8")
 )
 
-(define-function clutter_feature_flags_get_type
-  (c-name "clutter_feature_flags_get_type")
-  (return-type "GType")
+(define-method get_paint_opacity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_paint_opacity")
+  (return-type "guint8")
 )
 
-(define-function clutter_init_error_get_type
-  (c-name "clutter_init_error_get_type")
-  (return-type "GType")
+(define-method get_paint_visibility
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_paint_visibility")
+  (return-type "gboolean")
 )
 
-(define-function clutter_path_node_type_get_type
-  (c-name "clutter_path_node_type_get_type")
-  (return-type "GType")
+(define-method set_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
 )
 
-(define-function clutter_script_error_get_type
-  (c-name "clutter_script_error_get_type")
-  (return-type "GType")
+(define-method get_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_name")
+  (return-type "const-gchar*")
 )
 
-(define-function clutter_shader_error_get_type
-  (c-name "clutter_shader_error_get_type")
-  (return-type "GType")
+(define-method get_gid
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_gid")
+  (return-type "guint32")
 )
 
-(define-function clutter_texture_error_get_type
-  (c-name "clutter_texture_error_get_type")
-  (return-type "GType")
+(define-method set_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_clip")
+  (return-type "none")
+  (parameters
+    '("gint" "xoff")
+    '("gint" "yoff")
+    '("gint" "width")
+    '("gint" "height")
+  )
 )
 
-(define-function clutter_texture_flags_get_type
-  (c-name "clutter_texture_flags_get_type")
-  (return-type "GType")
+(define-method set_clipu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_clipu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "xoff")
+    '("ClutterUnit" "yoff")
+    '("ClutterUnit" "width")
+    '("ClutterUnit" "height")
+  )
 )
 
-(define-function clutter_texture_quality_get_type
-  (c-name "clutter_texture_quality_get_type")
-  (return-type "GType")
+(define-method remove_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_clip")
+  (return-type "none")
 )
 
-(define-function clutter_timeline_direction_get_type
-  (c-name "clutter_timeline_direction_get_type")
-  (return-type "GType")
+(define-method has_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_has_clip")
+  (return-type "gboolean")
 )
 
-(define-function clutter_gravity_get_type
-  (c-name "clutter_gravity_get_type")
-  (return-type "GType")
+(define-method get_clip
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_clip")
+  (return-type "none")
+  (parameters
+    '("gint*" "xoff")
+    '("gint*" "yoff")
+    '("gint*" "width")
+    '("gint*" "height")
+  )
 )
 
-(define-function clutter_rotate_axis_get_type
-  (c-name "clutter_rotate_axis_get_type")
-  (return-type "GType")
+(define-method get_clipu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_clipu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "xoff")
+    '("ClutterUnit*" "yoff")
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
+  )
 )
 
-(define-function clutter_rotate_direction_get_type
-  (c-name "clutter_rotate_direction_get_type")
-  (return-type "GType")
+(define-method set_parent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_parent")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "parent")
+  )
 )
 
-(define-function clutter_request_mode_get_type
-  (c-name "clutter_request_mode_get_type")
-  (return-type "GType")
+(define-method get_parent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_parent")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_animation_mode_get_type
-  (c-name "clutter_animation_mode_get_type")
-  (return-type "GType")
+(define-method reparent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_reparent")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "new_parent")
+  )
 )
 
-
-
-;; From clutter-fixed.h
-
-(define-function clutter_fixed_get_type
-  (c-name "clutter_fixed_get_type")
-  (return-type "GType")
+(define-method unparent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_unparent")
+  (return-type "none")
 )
 
-(define-function clutter_param_fixed_get_type
-  (c-name "clutter_param_fixed_get_type")
-  (return-type "GType")
+(define-method get_stage
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_stage")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_value_set_fixed
-  (c-name "clutter_value_set_fixed")
+(define-method raise
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_raise")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("ClutterFixed" "fixed_")
-  )
-)
-
-(define-function clutter_value_get_fixed
-  (c-name "clutter_value_get_fixed")
-  (return-type "ClutterFixed")
-  (parameters
-    '("const-GValue*" "value")
+    '("ClutterActor*" "below")
   )
 )
 
-(define-function clutter_param_spec_fixed
-  (c-name "clutter_param_spec_fixed")
-  (return-type "GParamSpec*")
+(define-method lower
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_lower")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("ClutterFixed" "minimum")
-    '("ClutterFixed" "maximum")
-    '("ClutterFixed" "default_value")
-    '("GParamFlags" "flags")
+    '("ClutterActor*" "above")
   )
 )
 
-
-
-;; From clutter-main.h
-
-(define-function clutter_init_error_quark
-  (c-name "clutter_init_error_quark")
-  (return-type "GQuark")
+(define-method raise_top
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_raise_top")
+  (return-type "none")
 )
 
-(define-function clutter_base_init
-  (c-name "clutter_base_init")
+(define-method lower_bottom
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_lower_bottom")
   (return-type "none")
 )
 
-(define-function clutter_init
-  (c-name "clutter_init")
-  (return-type "ClutterInitError")
+(define-method set_depth
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_depth")
+  (return-type "none")
   (parameters
-    '("int*" "argc")
-    '("char***" "argv")
+    '("gint" "depth")
   )
 )
 
-(define-function clutter_init_with_args
-  (c-name "clutter_init_with_args")
-  (return-type "ClutterInitError")
+(define-method get_depth
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_depth")
+  (return-type "gint")
+)
+
+(define-method set_depthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_depthu")
+  (return-type "none")
   (parameters
-    '("int*" "argc")
-    '("char***" "argv")
-    '("const-char*" "parameter_string")
-    '("GOptionEntry*" "entries")
-    '("const-char*" "translation_domain")
-    '("GError**" "error")
+    '("ClutterUnit" "depth")
   )
 )
 
-(define-function clutter_get_option_group
-  (c-name "clutter_get_option_group")
-  (return-type "GOptionGroup*")
+(define-method get_depthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_depthu")
+  (return-type "ClutterUnit")
 )
 
-(define-function clutter_get_option_group_without_init
-  (c-name "clutter_get_option_group_without_init")
-  (return-type "GOptionGroup*")
+(define-method set_scale
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_scale")
+  (return-type "none")
+  (parameters
+    '("gdouble" "scale_x")
+    '("gdouble" "scale_y")
+  )
 )
 
-(define-function clutter_main
-  (c-name "clutter_main")
+(define-method set_scale_full
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_scale_full")
   (return-type "none")
+  (parameters
+    '("gdouble" "scale_x")
+    '("gdouble" "scale_y")
+    '("int" "center_x")
+    '("int" "center_y")
+  )
 )
 
-(define-function clutter_main_quit
-  (c-name "clutter_main_quit")
+(define-method set_scale_fullu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_scale_fullu")
   (return-type "none")
+  (parameters
+    '("gdouble" "scale_x")
+    '("gdouble" "scale_y")
+    '("ClutterUnit" "center_x")
+    '("ClutterUnit" "center_y")
+  )
 )
 
-(define-function clutter_main_level
-  (c-name "clutter_main_level")
-  (return-type "gint")
+(define-method set_scale_with_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_scale_with_gravity")
+  (return-type "none")
+  (parameters
+    '("gdouble" "scale_x")
+    '("gdouble" "scale_y")
+    '("ClutterGravity" "gravity")
+  )
 )
 
-(define-function clutter_redraw
-  (c-name "clutter_redraw")
+(define-method get_scale
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scale")
   (return-type "none")
   (parameters
-    '("ClutterStage*" "stage")
+    '("gdouble*" "scale_x")
+    '("gdouble*" "scale_y")
   )
 )
 
-(define-function clutter_do_event
-  (c-name "clutter_do_event")
+(define-method get_scale_center
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scale_center")
   (return-type "none")
   (parameters
-    '("ClutterEvent*" "event")
+    '("gint*" "center_x")
+    '("gint*" "center_y")
   )
 )
 
-(define-function clutter_get_debug_enabled
-  (c-name "clutter_get_debug_enabled")
-  (return-type "gboolean")
+(define-method get_scale_centeru
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scale_centeru")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "center_x")
+    '("ClutterUnit*" "center_y")
+  )
 )
 
-(define-function clutter_get_show_fps
-  (c-name "clutter_get_show_fps")
-  (return-type "gboolean")
+(define-method get_scale_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scale_gravity")
+  (return-type "ClutterGravity")
 )
 
-(define-function clutter_get_timestamp
-  (c-name "clutter_get_timestamp")
-  (return-type "gulong")
+(define-method move_by
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_by")
+  (return-type "none")
+  (parameters
+    '("gint" "dx")
+    '("gint" "dy")
+  )
 )
 
-(define-function clutter_threads_init
-  (c-name "clutter_threads_init")
+(define-method move_byu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_byu")
   (return-type "none")
+  (parameters
+    '("ClutterUnit" "dx")
+    '("ClutterUnit" "dy")
+  )
 )
 
-(define-function clutter_threads_enter
-  (c-name "clutter_threads_enter")
+(define-method set_reactive
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_reactive")
   (return-type "none")
+  (parameters
+    '("gboolean" "reactive")
+  )
 )
 
-(define-function clutter_threads_leave
-  (c-name "clutter_threads_leave")
-  (return-type "none")
+(define-method get_reactive
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_reactive")
+  (return-type "gboolean")
 )
 
-(define-function clutter_threads_set_lock_functions
-  (c-name "clutter_threads_set_lock_functions")
-  (return-type "none")
+(define-method event
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_event")
+  (return-type "gboolean")
   (parameters
-    '("GCallback" "enter_fn")
-    '("GCallback" "leave_fn")
+    '("ClutterEvent*" "event")
+    '("gboolean" "capture")
   )
 )
 
-(define-function clutter_threads_add_idle
-  (c-name "clutter_threads_add_idle")
-  (return-type "guint")
+(define-function clutter_get_actor_by_gid
+  (c-name "clutter_get_actor_by_gid")
+  (return-type "ClutterActor*")
   (parameters
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("guint32" "id")
   )
 )
 
-(define-function clutter_threads_add_idle_full
-  (c-name "clutter_threads_add_idle_full")
-  (return-type "guint")
+(define-method set_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader")
+  (return-type "gboolean")
   (parameters
-    '("gint" "priority")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("ClutterShader*" "shader")
   )
 )
 
-(define-function clutter_threads_add_timeout
-  (c-name "clutter_threads_add_timeout")
-  (return-type "guint")
-  (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-  )
+(define-method get_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_shader")
+  (return-type "ClutterShader*")
 )
 
-(define-function clutter_threads_add_timeout_full
-  (c-name "clutter_threads_add_timeout_full")
-  (return-type "guint")
+(define-method set_shader_param
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param")
+  (return-type "none")
   (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("const-gchar*" "param")
+    '("const-GValue*" "value")
   )
 )
 
-(define-function clutter_threads_add_frame_source
-  (c-name "clutter_threads_add_frame_source")
-  (return-type "guint")
+(define-method set_shader_param_int
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param_int")
+  (return-type "none")
   (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("const-gchar*" "param")
+    '("gint" "value")
   )
 )
 
-(define-function clutter_threads_add_frame_source_full
-  (c-name "clutter_threads_add_frame_source_full")
-  (return-type "guint")
+(define-method set_shader_param_float
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param_float")
+  (return-type "none")
   (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("const-gchar*" "param")
+    '("gfloat" "value")
   )
 )
 
-(define-function clutter_set_motion_events_enabled
-  (c-name "clutter_set_motion_events_enabled")
+(define-method set_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_point")
   (return-type "none")
   (parameters
-    '("gboolean" "enable")
+    '("gint" "anchor_x")
+    '("gint" "anchor_y")
   )
 )
 
-(define-function clutter_get_motion_events_enabled
-  (c-name "clutter_get_motion_events_enabled")
-  (return-type "gboolean")
+(define-method move_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_point")
+  (return-type "none")
+  (parameters
+    '("gint" "anchor_x")
+    '("gint" "anchor_y")
+  )
 )
 
-(define-function clutter_set_motion_events_frequency
-  (c-name "clutter_set_motion_events_frequency")
+(define-method get_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_point")
   (return-type "none")
   (parameters
-    '("guint" "frequency")
+    '("gint*" "anchor_x")
+    '("gint*" "anchor_y")
   )
 )
 
-(define-function clutter_get_motion_events_frequency
-  (c-name "clutter_get_motion_events_frequency")
-  (return-type "guint")
+(define-method get_anchor_point_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_point_gravity")
+  (return-type "ClutterGravity")
 )
 
-(define-function clutter_set_default_frame_rate
-  (c-name "clutter_set_default_frame_rate")
+(define-method set_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_pointu")
   (return-type "none")
   (parameters
-    '("guint" "frames_per_sec")
+    '("ClutterUnit" "anchor_x")
+    '("ClutterUnit" "anchor_y")
   )
 )
 
-(define-function clutter_get_default_frame_rate
-  (c-name "clutter_get_default_frame_rate")
-  (return-type "guint")
+(define-method move_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_pointu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "anchor_x")
+    '("ClutterUnit" "anchor_y")
+  )
 )
 
-(define-function clutter_grab_pointer
-  (c-name "clutter_grab_pointer")
+(define-method get_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_pointu")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("ClutterUnit*" "anchor_x")
+    '("ClutterUnit*" "anchor_y")
   )
 )
 
-(define-function clutter_ungrab_pointer
-  (c-name "clutter_ungrab_pointer")
+(define-method set_anchor_point_from_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_point_from_gravity")
   (return-type "none")
+  (parameters
+    '("ClutterGravity" "gravity")
+  )
 )
 
-(define-function clutter_get_pointer_grab
-  (c-name "clutter_get_pointer_grab")
-  (return-type "ClutterActor*")
+(define-method move_anchor_point_from_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_point_from_gravity")
+  (return-type "none")
+  (parameters
+    '("ClutterGravity" "gravity")
+  )
 )
 
-(define-function clutter_grab_keyboard
-  (c-name "clutter_grab_keyboard")
-  (return-type "none")
+(define-method transform_stage_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_transform_stage_point")
+  (return-type "gboolean")
   (parameters
-    '("ClutterActor*" "actor")
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
+    '("ClutterUnit*" "x_out")
+    '("ClutterUnit*" "y_out")
   )
 )
 
-(define-function clutter_ungrab_keyboard
-  (c-name "clutter_ungrab_keyboard")
-  (return-type "none")
+(define-method is_rotated
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_is_rotated")
+  (return-type "gboolean")
 )
 
-(define-function clutter_get_keyboard_grab
-  (c-name "clutter_get_keyboard_grab")
-  (return-type "ClutterActor*")
+(define-method is_scaled
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_is_scaled")
+  (return-type "gboolean")
 )
 
-(define-function clutter_clear_glyph_cache
-  (c-name "clutter_clear_glyph_cache")
-  (return-type "none")
+(define-method should_pick_paint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_should_pick_paint")
+  (return-type "gboolean")
 )
 
-(define-function clutter_set_use_mipmapped_text
-  (c-name "clutter_set_use_mipmapped_text")
+(define-function clutter_actor_box_get_from_vertices
+  (c-name "clutter_actor_box_get_from_vertices")
   (return-type "none")
   (parameters
-    '("gboolean" "value")
+    '("ClutterVertex" "vtx[4]")
+    '("ClutterActorBox*" "box")
   )
 )
 
-(define-function clutter_get_use_mipmapped_text
-  (c-name "clutter_get_use_mipmapped_text")
-  (return-type "gboolean")
+(define-method get_abs_allocation_vertices
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_abs_allocation_vertices")
+  (return-type "none")
+  (parameters
+    '("ClutterVertex" "verts[4]")
+  )
 )
 
-(define-function clutter_get_input_device_for_id
-  (c-name "clutter_get_input_device_for_id")
-  (return-type "ClutterInputDevice*")
+(define-method apply_transform_to_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_apply_transform_to_point")
+  (return-type "none")
   (parameters
-    '("gint" "id")
+    '("const-ClutterVertex*" "point")
+    '("ClutterVertex*" "vertex")
   )
 )
 
-(define-function clutter_grab_pointer_for_device
-  (c-name "clutter_grab_pointer_for_device")
+(define-method apply_relative_transform_to_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_apply_relative_transform_to_point")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("gint" "id")
+    '("ClutterActor*" "ancestor")
+    '("const-ClutterVertex*" "point")
+    '("ClutterVertex*" "vertex")
   )
 )
 
-(define-function clutter_ungrab_pointer_for_device
-  (c-name "clutter_ungrab_pointer_for_device")
+(define-method grab_key_focus
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_grab_key_focus")
   (return-type "none")
-  (parameters
-    '("gint" "id")
-  )
 )
 
-(define-function clutter_get_font_map
-  (c-name "clutter_get_font_map")
-  (return-type "PangoFontMap*")
+(define-method get_pango_context
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_pango_context")
+  (return-type "PangoContext*")
+)
+
+(define-method create_pango_context
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_create_pango_context")
+  (return-type "PangoContext*")
 )
 
+(define-method create_pango_layout
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_create_pango_layout")
+  (return-type "PangoLayout*")
+  (parameters
+    '("const-gchar*" "text")
+  )
+)
 
 
-;; From clutter-path.h
 
-(define-function clutter_path_get_type
-  (c-name "clutter_path_get_type")
-  (return-type "GType")
-)
+;; From clutter-alpha.h
 
-(define-function clutter_path_node_get_type
-  (c-name "clutter_path_node_get_type")
+(define-function clutter_alpha_get_type
+  (c-name "clutter_alpha_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_path_new
-  (c-name "clutter_path_new")
-  (is-constructor-of "ClutterPath")
-  (return-type "ClutterPath*")
+(define-function clutter_alpha_new
+  (c-name "clutter_alpha_new")
+  (is-constructor-of "ClutterAlpha")
+  (return-type "ClutterAlpha*")
 )
 
-(define-function clutter_path_new_with_description
-  (c-name "clutter_path_new_with_description")
-  (return-type "ClutterPath*")
+(define-function clutter_alpha_new_full
+  (c-name "clutter_alpha_new_full")
+  (return-type "ClutterAlpha*")
   (parameters
-    '("const-gchar*" "desc")
+    '("ClutterTimeline*" "timeline")
+    '("gulong" "mode")
   )
 )
 
-(define-method add_move_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_move_to")
-  (return-type "none")
+(define-function clutter_alpha_new_with_func
+  (c-name "clutter_alpha_new_with_func")
+  (return-type "ClutterAlpha*")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("ClutterTimeline*" "timeline")
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
   )
 )
 
-(define-method add_rel_move_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_rel_move_to")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
+(define-method get_alpha
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_alpha")
+  (return-type "gdouble")
 )
 
-(define-method add_line_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_line_to")
+(define-method set_func
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_func")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
   )
 )
 
-(define-method add_rel_line_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_rel_line_to")
+(define-method set_closure
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_closure")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("GClosure*" "closure")
   )
 )
 
-(define-method add_curve_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_curve_to")
+(define-method set_timeline
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_timeline")
   (return-type "none")
   (parameters
-    '("gint" "x_1")
-    '("gint" "y_1")
-    '("gint" "x_2")
-    '("gint" "y_2")
-    '("gint" "x_3")
-    '("gint" "y_3")
+    '("ClutterTimeline*" "timeline")
   )
 )
 
-(define-method add_rel_curve_to
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_rel_curve_to")
+(define-method get_timeline
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_timeline")
+  (return-type "ClutterTimeline*")
+)
+
+(define-method set_mode
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_mode")
   (return-type "none")
   (parameters
-    '("gint" "x_1")
-    '("gint" "y_1")
-    '("gint" "x_2")
-    '("gint" "y_2")
-    '("gint" "x_3")
-    '("gint" "y_3")
+    '("gulong" "mode")
   )
 )
 
-(define-method add_close
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_close")
-  (return-type "none")
+(define-method get_mode
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_mode")
+  (return-type "gulong")
 )
 
-(define-method add_string
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_string")
-  (return-type "gboolean")
+(define-function clutter_alpha_register_func
+  (c-name "clutter_alpha_register_func")
+  (return-type "gulong")
   (parameters
-    '("const-gchar*" "str")
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-method add_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_node")
-  (return-type "none")
+(define-function clutter_alpha_register_closure
+  (c-name "clutter_alpha_register_closure")
+  (return-type "gulong")
   (parameters
-    '("const-ClutterPathNode*" "node")
+    '("GClosure*" "closure")
   )
 )
 
-(define-method add_cairo_path
-  (of-object "ClutterPath")
-  (c-name "clutter_path_add_cairo_path")
+
+
+;; From clutter-animatable.h
+
+(define-function clutter_animatable_get_type
+  (c-name "clutter_animatable_get_type")
+  (return-type "GType")
+)
+
+(define-method animate_property
+  (of-object "ClutterAnimatable")
+  (c-name "clutter_animatable_animate_property")
   (return-type "none")
   (parameters
-    '("const-cairo_path_t*" "cpath")
+    '("ClutterAnimation*" "animation")
+    '("const-gchar*" "property_name")
+    '("const-GValue*" "initial_value")
+    '("const-GValue*" "final_value")
+    '("gdouble" "progress")
+    '("GValue*" "value")
   )
 )
 
-(define-method get_n_nodes
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_n_nodes")
-  (return-type "guint")
+
+
+;; From clutter-animation.h
+
+(define-function clutter_animation_get_type
+  (c-name "clutter_animation_get_type")
+  (return-type "GType")
 )
 
-(define-method get_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_node")
+(define-function clutter_animation_new
+  (c-name "clutter_animation_new")
+  (is-constructor-of "ClutterAnimation")
+  (return-type "ClutterAnimation*")
+)
+
+(define-method set_object
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_object")
   (return-type "none")
   (parameters
-    '("guint" "index_")
-    '("ClutterPathNode*" "node")
+    '("GObject*" "object")
   )
 )
 
-(define-method get_nodes
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_nodes")
-  (return-type "GSList*")
+(define-method get_object
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_object")
+  (return-type "GObject*")
 )
 
-(define-method foreach
-  (of-object "ClutterPath")
-  (c-name "clutter_path_foreach")
+(define-method set_mode
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_mode")
   (return-type "none")
   (parameters
-    '("ClutterPathCallback" "callback")
-    '("gpointer" "user_data")
+    '("gulong" "mode")
   )
 )
 
-(define-method insert_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_insert_node")
+(define-method get_mode
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_mode")
+  (return-type "gulong")
+)
+
+(define-method set_duration
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_duration")
   (return-type "none")
   (parameters
-    '("gint" "index_")
-    '("const-ClutterPathNode*" "node")
+    '("gint" "msecs")
   )
 )
 
-(define-method remove_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_remove_node")
+(define-method get_duration
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_duration")
+  (return-type "guint")
+)
+
+(define-method set_loop
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_loop")
   (return-type "none")
   (parameters
-    '("guint" "index_")
+    '("gboolean" "loop")
   )
 )
 
-(define-method replace_node
-  (of-object "ClutterPath")
-  (c-name "clutter_path_replace_node")
+(define-method get_loop
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_loop")
+  (return-type "gboolean")
+)
+
+(define-method set_timeline
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_timeline")
   (return-type "none")
   (parameters
-    '("guint" "index_")
-    '("const-ClutterPathNode*" "node")
+    '("ClutterTimeline*" "timeline")
   )
 )
 
-(define-method get_description
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_description")
-  (return-type "gchar*")
+(define-method get_timeline
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_timeline")
+  (return-type "ClutterTimeline*")
 )
 
-(define-method set_description
-  (of-object "ClutterPath")
-  (c-name "clutter_path_set_description")
-  (return-type "gboolean")
+(define-method set_alpha
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_alpha")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "str")
+    '("ClutterAlpha*" "alpha")
   )
 )
 
-(define-method clear
-  (of-object "ClutterPath")
-  (c-name "clutter_path_clear")
-  (return-type "none")
+(define-method get_alpha
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_alpha")
+  (return-type "ClutterAlpha*")
 )
 
-(define-method to_cairo_path
-  (of-object "ClutterPath")
-  (c-name "clutter_path_to_cairo_path")
+(define-method bind_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_bind_property")
   (return-type "none")
   (parameters
-    '("cairo_t*" "cr")
+    '("const-gchar*" "property_name")
+    '("ClutterInterval*" "interval")
   )
 )
 
-(define-method get_position
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_position")
-  (return-type "guint")
+(define-method has_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_has_property")
+  (return-type "gboolean")
   (parameters
-    '("gdouble" "progress")
-    '("ClutterKnot*" "position")
+    '("const-gchar*" "property_name")
   )
 )
 
-(define-method get_length
-  (of-object "ClutterPath")
-  (c-name "clutter_path_get_length")
-  (return-type "guint")
-)
-
-(define-method copy
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_copy")
-  (return-type "ClutterPathNode*")
+(define-method update_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_update_property")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("ClutterInterval*" "interval")
+  )
 )
 
-(define-method free
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_free")
+(define-method unbind_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_unbind_property")
   (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
 )
 
-(define-method equal
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_equal")
-  (return-type "gboolean")
+(define-method get_interval
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_interval")
+  (return-type "ClutterInterval*")
   (parameters
-    '("const-ClutterPathNode*" "node_b")
+    '("const-gchar*" "property_name")
   )
 )
 
-
-
-;; From clutter-interval.h
-
-(define-function clutter_interval_get_type
-  (c-name "clutter_interval_get_type")
-  (return-type "GType")
+(define-method animate
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("gulong" "mode")
+    '("guint" "duration")
+    '("const-gchar*" "first_property_name")
+  )
+  (varargs #t)
 )
 
-(define-function clutter_interval_new
-  (c-name "clutter_interval_new")
-  (is-constructor-of "ClutterInterval")
-  (return-type "ClutterInterval*")
+(define-method animate_with_timeline
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_timeline")
+  (return-type "ClutterAnimation*")
   (parameters
-    '("GType" "gtype")
+    '("gulong" "mode")
+    '("ClutterTimeline*" "timeline")
+    '("const-gchar*" "first_property_name")
   )
   (varargs #t)
 )
 
-(define-function clutter_interval_new_with_values
-  (c-name "clutter_interval_new_with_values")
-  (return-type "ClutterInterval*")
+(define-method animate_with_alpha
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_alpha")
+  (return-type "ClutterAnimation*")
   (parameters
-    '("GType" "gtype")
-    '("const-GValue*" "initial")
-    '("const-GValue*" "final")
+    '("ClutterAlpha*" "alpha")
+    '("const-gchar*" "first_property_name")
   )
+  (varargs #t)
 )
 
-(define-method clone
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_clone")
-  (return-type "ClutterInterval*")
-)
 
-(define-method get_value_type
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_value_type")
+
+;; From clutter-backend.h
+
+(define-function clutter_backend_get_type
+  (c-name "clutter_backend_get_type")
   (return-type "GType")
 )
 
-(define-method set_initial_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_set_initial_value")
-  (return-type "none")
-  (parameters
-    '("const-GValue*" "value")
-  )
+(define-function clutter_get_default_backend
+  (c-name "clutter_get_default_backend")
+  (return-type "ClutterBackend*")
 )
 
-(define-method get_initial_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_initial_value")
+(define-method set_resolution
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_resolution")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
+    '("gdouble" "dpi")
   )
 )
 
-(define-method peek_initial_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_peek_initial_value")
-  (return-type "GValue*")
-)
-
-(define-method set_final_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_set_final_value")
-  (return-type "none")
-  (parameters
-    '("const-GValue*" "value")
-  )
+(define-method get_resolution
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_resolution")
+  (return-type "gdouble")
 )
 
-(define-method get_final_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_final_value")
+(define-method set_double_click_time
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_double_click_time")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
+    '("guint" "msec")
   )
 )
 
-(define-method peek_final_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_peek_final_value")
-  (return-type "GValue*")
+(define-method get_double_click_time
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_double_click_time")
+  (return-type "guint")
 )
 
-(define-method set_interval
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_set_interval")
+(define-method set_double_click_distance
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_double_click_distance")
   (return-type "none")
   (parameters
+    '("guint" "distance")
   )
-  (varargs #t)
 )
 
-(define-method get_interval
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_get_interval")
+(define-method get_double_click_distance
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_double_click_distance")
+  (return-type "guint")
+)
+
+(define-method set_font_options
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_font_options")
   (return-type "none")
   (parameters
+    '("cairo_font_options_t*" "options")
   )
-  (varargs #t)
 )
 
-(define-method validate
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_validate")
-  (return-type "gboolean")
-  (parameters
-    '("GParamSpec*" "pspec")
-  )
+(define-method get_font_options
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_font_options")
+  (return-type "cairo_font_options_t*")
 )
 
-(define-method compute_value
-  (of-object "ClutterInterval")
-  (c-name "clutter_interval_compute_value")
+(define-method set_font_name
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_font_name")
   (return-type "none")
   (parameters
-    '("gdouble" "factor")
-    '("GValue*" "value")
+    '("const-gchar*" "font_name")
   )
 )
 
+(define-method get_font_name
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_font_name")
+  (return-type "const-gchar*")
+)
 
 
-;; From clutter-color.h
-
-(define-function clutter_color_new
-  (c-name "clutter_color_new")
-  (is-constructor-of "ClutterColor")
-  (return-type "ClutterColor*")
-  (parameters
-    '("guint8" "red")
-    '("guint8" "green")
-    '("guint8" "blue")
-    '("guint8" "alpha")
-  )
-)
 
-(define-method copy
-  (of-object "ClutterColor")
-  (c-name "clutter_color_copy")
-  (return-type "ClutterColor*")
-)
+;; From clutter-behaviour-depth.h
 
-(define-method free
-  (of-object "ClutterColor")
-  (c-name "clutter_color_free")
-  (return-type "none")
+(define-function clutter_behaviour_depth_get_type
+  (c-name "clutter_behaviour_depth_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_color_parse
-  (c-name "clutter_color_parse")
-  (return-type "gboolean")
+(define-function clutter_behaviour_depth_new
+  (c-name "clutter_behaviour_depth_new")
+  (is-constructor-of "ClutterBehaviourDepth")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("const-gchar*" "color")
-    '("ClutterColor*" "dest")
+    '("ClutterAlpha*" "alpha")
+    '("gint" "depth_start")
+    '("gint" "depth_end")
   )
 )
 
-(define-method equal
-  (of-object "ClutterColor")
-  (c-name "clutter_color_equal")
-  (return-type "gboolean")
+(define-method set_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_set_bounds")
+  (return-type "none")
   (parameters
-    '("const-ClutterColor*" "b")
+    '("gint" "depth_start")
+    '("gint" "depth_end")
   )
 )
 
-(define-method to_string
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_string")
-  (return-type "gchar*")
+(define-method get_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_get_bounds")
+  (return-type "none")
+  (parameters
+    '("gint*" "depth_start")
+    '("gint*" "depth_end")
+  )
 )
 
-(define-function clutter_color_get_type
-  (c-name "clutter_color_get_type")
+
+
+;; From clutter-behaviour-ellipse.h
+
+(define-function clutter_behaviour_ellipse_get_type
+  (c-name "clutter_behaviour_ellipse_get_type")
   (return-type "GType")
 )
 
-(define-method add
-  (of-object "ClutterColor")
-  (c-name "clutter_color_add")
-  (return-type "none")
+(define-function clutter_behaviour_ellipse_new
+  (c-name "clutter_behaviour_ellipse_new")
+  (is-constructor-of "ClutterBehaviourEllipse")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("const-ClutterColor*" "src2")
-    '("ClutterColor*" "dest")
+    '("ClutterAlpha*" "alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("ClutterRotateDirection" "direction")
+    '("gdouble" "start")
+    '("gdouble" "end")
   )
 )
 
-(define-method subtract
-  (of-object "ClutterColor")
-  (c-name "clutter_color_subtract")
-  (return-type "none")
+(define-function clutter_behaviour_ellipse_newx
+  (c-name "clutter_behaviour_ellipse_newx")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("const-ClutterColor*" "src2")
-    '("ClutterColor*" "dest")
+    '("ClutterAlpha*" "alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("ClutterRotateDirection" "direction")
+    '("ClutterFixed" "start")
+    '("ClutterFixed" "end")
   )
 )
 
-(define-method lighten
-  (of-object "ClutterColor")
-  (c-name "clutter_color_lighten")
+(define-method set_center
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_center")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "dest")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method darken
-  (of-object "ClutterColor")
-  (c-name "clutter_color_darken")
+(define-method get_center
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_center")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "dest")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method shade
-  (of-object "ClutterColor")
-  (c-name "clutter_color_shade")
+(define-method set_width
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_width")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "dest")
-    '("gdouble" "shade")
+    '("gint" "width")
   )
 )
 
-(define-method shadex
-  (of-object "ClutterColor")
-  (c-name "clutter_color_shadex")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "dest")
-    '("ClutterFixed" "shade")
-  )
+(define-method get_width
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_width")
+  (return-type "gint")
 )
 
-(define-method to_hlsx
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_hlsx")
+(define-method set_height
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_height")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "hue")
-    '("ClutterFixed*" "luminance")
-    '("ClutterFixed*" "saturation")
+    '("gint" "height")
   )
 )
 
-(define-method from_hlsx
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_hlsx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "hue")
-    '("ClutterFixed" "luminance")
-    '("ClutterFixed" "saturation")
-  )
+(define-method get_height
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_height")
+  (return-type "gint")
 )
 
-(define-method to_hls
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_hls")
+(define-method set_angle_start
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_start")
   (return-type "none")
   (parameters
-    '("guint8*" "hue")
-    '("guint8*" "luminance")
-    '("guint8*" "saturation")
+    '("gdouble" "angle_start")
   )
 )
 
-(define-method from_hls
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_hls")
+(define-method set_angle_startx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_startx")
   (return-type "none")
   (parameters
-    '("guint8" "hue")
-    '("guint8" "luminance")
-    '("guint8" "saturation")
+    '("ClutterFixed" "angle_start")
   )
 )
 
-(define-method to_pixel
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_pixel")
-  (return-type "guint32")
+(define-method get_angle_startx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_startx")
+  (return-type "ClutterFixed")
 )
 
-(define-method from_pixel
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_pixel")
+(define-method get_angle_start
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_start")
+  (return-type "gdouble")
+)
+
+(define-method set_angle_endx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_endx")
   (return-type "none")
   (parameters
-    '("guint32" "pixel")
+    '("ClutterFixed" "angle_end")
   )
 )
 
-(define-function clutter_value_set_color
-  (c-name "clutter_value_set_color")
+(define-method set_angle_end
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_end")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("const-ClutterColor*" "color")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-function clutter_value_get_color
-  (c-name "clutter_value_get_color")
-  (return-type "const-ClutterColor*")
-  (parameters
-    '("const-GValue*" "value")
-  )
+(define-method get_angle_endx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_endx")
+  (return-type "ClutterFixed")
 )
 
-(define-function clutter_param_color_get_type
-  (c-name "clutter_param_color_get_type")
-  (return-type "GType")
+(define-method get_angle_end
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_end")
+  (return-type "gdouble")
 )
 
-(define-function clutter_param_spec_color
-  (c-name "clutter_param_spec_color")
-  (return-type "GParamSpec*")
+(define-method set_angle_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_tiltx")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("const-ClutterColor*" "default_value")
-    '("GParamFlags" "flags")
+    '("ClutterRotateAxis" "axis")
+    '("ClutterFixed" "angle_tilt")
   )
 )
 
+(define-method set_angle_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_tilt")
+  (return-type "none")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle_tilt")
+  )
+)
 
-
-;; From clutter-cairo-texture.h
-
-(define-function clutter_cairo_texture_get_type
-  (c-name "clutter_cairo_texture_get_type")
-  (return-type "GType")
+(define-method get_angle_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_tiltx")
+  (return-type "ClutterFixed")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+  )
 )
 
-(define-function clutter_cairo_texture_new
-  (c-name "clutter_cairo_texture_new")
-  (is-constructor-of "ClutterCairoTexture")
-  (return-type "ClutterActor*")
+(define-method get_angle_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_tilt")
+  (return-type "gdouble")
   (parameters
-    '("guint" "width")
-    '("guint" "height")
+    '("ClutterRotateAxis" "axis")
   )
 )
 
-(define-method create_region
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_create_region")
-  (return-type "cairo_t*")
+(define-method set_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_tilt")
+  (return-type "none")
   (parameters
-    '("gint" "x_offset")
-    '("gint" "y_offset")
-    '("gint" "width")
-    '("gint" "height")
+    '("gdouble" "angle_tilt_x")
+    '("gdouble" "angle_tilt_y")
+    '("gdouble" "angle_tilt_z")
   )
 )
 
-(define-method create
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_create")
-  (return-type "cairo_t*")
+(define-method set_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_tiltx")
+  (return-type "none")
+  (parameters
+    '("ClutterFixed" "angle_tilt_x")
+    '("ClutterFixed" "angle_tilt_y")
+    '("ClutterFixed" "angle_tilt_z")
+  )
 )
 
-(define-method set_surface_size
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_set_surface_size")
+(define-method get_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_tilt")
   (return-type "none")
   (parameters
-    '("guint" "width")
-    '("guint" "height")
+    '("gdouble*" "angle_tilt_x")
+    '("gdouble*" "angle_tilt_y")
+    '("gdouble*" "angle_tilt_z")
   )
 )
 
-(define-method get_surface_size
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_get_surface_size")
+(define-method get_tiltx
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_tiltx")
   (return-type "none")
   (parameters
-    '("guint*" "width")
-    '("guint*" "height")
+    '("ClutterFixed*" "angle_tilt_x")
+    '("ClutterFixed*" "angle_tilt_y")
+    '("ClutterFixed*" "angle_tilt_z")
   )
 )
 
-(define-function clutter_cairo_set_source_color
-  (c-name "clutter_cairo_set_source_color")
+(define-method get_direction
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_direction")
+  (return-type "ClutterRotateDirection")
+)
+
+(define-method set_direction
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_direction")
   (return-type "none")
   (parameters
-    '("cairo_t*" "cr")
-    '("const-ClutterColor*" "color")
+    '("ClutterRotateDirection" "direction")
   )
 )
 
 
 
-;; From clutter-container.h
+;; From clutter-behaviour.h
 
-(define-function clutter_container_get_type
-  (c-name "clutter_container_get_type")
+(define-function clutter_behaviour_get_type
+  (c-name "clutter_behaviour_get_type")
   (return-type "GType")
 )
 
-(define-method add
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add")
+(define-method apply
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_apply")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "first_actor")
+    '("ClutterActor*" "actor")
   )
-  (varargs #t)
 )
 
-(define-method add_actor
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add_actor")
+(define-method remove
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove")
   (return-type "none")
   (parameters
     '("ClutterActor*" "actor")
   )
 )
 
-(define-method add_valist
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add_valist")
+(define-method remove_all
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove_all")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
-  )
 )
 
-(define-method remove
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove")
+(define-method actors_foreach
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_actors_foreach")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "first_actor")
+    '("ClutterBehaviourForeachFunc" "func")
+    '("gpointer" "data")
   )
-  (varargs #t)
 )
 
-(define-method remove_actor
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove_actor")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
+(define-method get_n_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_n_actors")
+  (return-type "gint")
 )
 
-(define-method remove_valist
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove_valist")
-  (return-type "none")
+(define-method get_nth_actor
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_nth_actor")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
+    '("gint" "index_")
   )
 )
 
-(define-method get_children
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_get_children")
-  (return-type "GList*")
-)
-
-(define-method foreach
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_foreach")
-  (return-type "none")
-  (parameters
-    '("ClutterCallback" "callback")
-    '("gpointer" "user_data")
-  )
+(define-method get_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_actors")
+  (return-type "GSList*")
 )
 
-(define-method find_child_by_name
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_find_child_by_name")
-  (return-type "ClutterActor*")
-  (parameters
-    '("const-gchar*" "child_name")
-  )
+(define-method get_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_alpha")
+  (return-type "ClutterAlpha*")
 )
 
-(define-method raise_child
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_raise_child")
+(define-method set_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_set_alpha")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
+    '("ClutterAlpha*" "alpha")
   )
 )
 
-(define-method lower_child
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_lower_child")
-  (return-type "none")
+(define-method is_applied
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_is_applied")
+  (return-type "gboolean")
   (parameters
     '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
   )
 )
 
-(define-method sort_depth_order
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_sort_depth_order")
-  (return-type "none")
+
+
+;; From clutter-behaviour-opacity.h
+
+(define-function clutter_behaviour_opacity_get_type
+  (c-name "clutter_behaviour_opacity_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_container_class_find_child_property
-  (c-name "clutter_container_class_find_child_property")
-  (return-type "GParamSpec*")
+(define-function clutter_behaviour_opacity_new
+  (c-name "clutter_behaviour_opacity_new")
+  (is-constructor-of "ClutterBehaviourOpacity")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("GObjectClass*" "klass")
-    '("const-gchar*" "property_name")
+    '("ClutterAlpha*" "alpha")
+    '("guint8" "opacity_start")
+    '("guint8" "opacity_end")
   )
 )
 
-(define-function clutter_container_class_list_child_properties
-  (c-name "clutter_container_class_list_child_properties")
-  (return-type "GParamSpec**")
+(define-method set_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_set_bounds")
+  (return-type "none")
   (parameters
-    '("GObjectClass*" "klass")
-    '("guint*" "n_properties")
+    '("guint8" "opacity_start")
+    '("guint8" "opacity_end")
   )
 )
 
-(define-method get_child_meta
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_get_child_meta")
-  (return-type "ClutterChildMeta*")
+(define-method get_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_get_bounds")
+  (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("guint8*" "opacity_start")
+    '("guint8*" "opacity_end")
   )
 )
 
-(define-method child_set_property
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_set_property")
-  (return-type "none")
+
+
+;; From clutter-behaviour-path.h
+
+(define-function clutter_behaviour_path_get_type
+  (c-name "clutter_behaviour_path_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_behaviour_path_new
+  (c-name "clutter_behaviour_path_new")
+  (is-constructor-of "ClutterBehaviourPath")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterActor*" "child")
-    '("const-gchar*" "property")
-    '("const-GValue*" "value")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterPath*" "path")
   )
 )
 
-(define-method child_get_property
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_get_property")
-  (return-type "none")
+(define-function clutter_behaviour_path_new_with_description
+  (c-name "clutter_behaviour_path_new_with_description")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterActor*" "child")
-    '("const-gchar*" "property")
-    '("GValue*" "value")
+    '("ClutterAlpha*" "alpha")
+    '("const-gchar*" "desc")
   )
 )
 
-(define-method child_set
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_set")
-  (return-type "none")
+(define-function clutter_behaviour_path_new_with_knots
+  (c-name "clutter_behaviour_path_new_with_knots")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterActor*" "actor")
-    '("const-gchar*" "first_prop")
+    '("ClutterAlpha*" "alpha")
+    '("const-ClutterKnot*" "knots")
+    '("guint" "n_knots")
   )
-  (varargs #t)
 )
-
-(define-method child_get
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_get")
+
+(define-method set_path
+  (of-object "ClutterBehaviourPath")
+  (c-name "clutter_behaviour_path_set_path")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("const-gchar*" "first_prop")
+    '("ClutterPath*" "path")
   )
-  (varargs #t)
 )
 
-
-
-;; From clutter-json.h
+(define-method get_path
+  (of-object "ClutterBehaviourPath")
+  (c-name "clutter_behaviour_path_get_path")
+  (return-type "ClutterPath*")
+)
 
 
 
-;; From clutter-animation.h
+;; From clutter-behaviour-rotate.h
 
-(define-function clutter_animation_get_type
-  (c-name "clutter_animation_get_type")
+(define-function clutter_behaviour_rotate_get_type
+  (c-name "clutter_behaviour_rotate_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_animation_new
-  (c-name "clutter_animation_new")
-  (is-constructor-of "ClutterAnimation")
-  (return-type "ClutterAnimation*")
-)
-
-(define-method set_actor
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_actor")
-  (return-type "none")
+(define-function clutter_behaviour_rotate_new
+  (c-name "clutter_behaviour_rotate_new")
+  (is-constructor-of "ClutterBehaviourRotate")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterActor*" "actor")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterRotateAxis" "axis")
+    '("ClutterRotateDirection" "direction")
+    '("gdouble" "angle_start")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-method get_actor
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_actor")
-  (return-type "ClutterActor*")
-)
-
-(define-method set_mode
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_mode")
-  (return-type "none")
+(define-function clutter_behaviour_rotate_newx
+  (c-name "clutter_behaviour_rotate_newx")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterAnimationMode" "mode")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterRotateAxis" "axis")
+    '("ClutterRotateDirection" "direction")
+    '("ClutterFixed" "angle_start")
+    '("ClutterFixed" "angle_end")
   )
 )
 
-(define-method get_mode
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_mode")
-  (return-type "ClutterAnimationMode")
-)
-
-(define-method set_duration
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_duration")
+(define-method get_center
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_center")
   (return-type "none")
   (parameters
-    '("gint" "msecs")
+    '("gint*" "x")
+    '("gint*" "y")
+    '("gint*" "z")
   )
 )
 
-(define-method get_duration
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_duration")
-  (return-type "guint")
-)
-
-(define-method set_loop
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_loop")
+(define-method set_center
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_center")
   (return-type "none")
   (parameters
-    '("gboolean" "loop")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "z")
   )
 )
 
-(define-method get_loop
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_loop")
-  (return-type "gboolean")
+(define-method get_axis
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_axis")
+  (return-type "ClutterRotateAxis")
 )
 
-(define-method set_timeline
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_timeline")
+(define-method set_axis
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_axis")
   (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
+    '("ClutterRotateAxis" "axis")
   )
 )
 
-(define-method get_timeline
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-method get_direction
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_direction")
+  (return-type "ClutterRotateDirection")
 )
 
-(define-method set_alpha
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_alpha")
+(define-method set_direction
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_direction")
   (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
+    '("ClutterRotateDirection" "direction")
   )
 )
 
-(define-method get_alpha
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_alpha")
-  (return-type "ClutterAlpha*")
-)
-
-(define-method bind_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_bind_property")
+(define-method get_bounds
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_bounds")
   (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
-    '("ClutterInterval*" "interval")
+    '("gdouble*" "angle_start")
+    '("gdouble*" "angle_end")
   )
 )
 
-(define-method has_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_has_property")
-  (return-type "gboolean")
+(define-method set_bounds
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_bounds")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
+    '("gdouble" "angle_start")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-method update_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_update_property")
+(define-method get_boundsx
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_boundsx")
   (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
-    '("ClutterInterval*" "interval")
+    '("ClutterFixed*" "angle_start")
+    '("ClutterFixed*" "angle_end")
   )
 )
 
-(define-method unbind_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_unbind_property")
+(define-method set_boundsx
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_boundsx")
   (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
+    '("ClutterFixed" "angle_start")
+    '("ClutterFixed" "angle_end")
   )
 )
 
-(define-method get_interval
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_interval")
-  (return-type "ClutterInterval*")
-  (parameters
-    '("const-gchar*" "property_name")
-  )
+
+
+;; From clutter-behaviour-scale.h
+
+(define-function clutter_behaviour_scale_get_type
+  (c-name "clutter_behaviour_scale_get_type")
+  (return-type "GType")
 )
 
-(define-method animate
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate")
-  (return-type "ClutterAnimation*")
+(define-function clutter_behaviour_scale_new
+  (c-name "clutter_behaviour_scale_new")
+  (is-constructor-of "ClutterBehaviourScale")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterAnimationMode" "mode")
-    '("guint" "duration")
-    '("const-gchar*" "first_property_name")
+    '("ClutterAlpha*" "alpha")
+    '("gdouble" "x_scale_start")
+    '("gdouble" "y_scale_start")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
   )
-  (varargs #t)
 )
 
-(define-method animate_with_timeline
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_timeline")
-  (return-type "ClutterAnimation*")
+(define-function clutter_behaviour_scale_newx
+  (c-name "clutter_behaviour_scale_newx")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterAnimationMode" "mode")
-    '("ClutterTimeline*" "timeline")
-    '("const-gchar*" "first_property_name")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterFixed" "x_scale_start")
+    '("ClutterFixed" "y_scale_start")
+    '("ClutterFixed" "x_scale_end")
+    '("ClutterFixed" "y_scale_end")
   )
-  (varargs #t)
 )
 
-(define-method animate_with_alpha
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_alpha")
-  (return-type "ClutterAnimation*")
+(define-method set_bounds
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_bounds")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-gchar*" "first_property_name")
+    '("gdouble" "x_scale_start")
+    '("gdouble" "y_scale_start")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
   )
-  (varargs #t)
 )
 
-
-
-;; From clutter-stage-manager.h
-
-(define-function clutter_stage_manager_get_type
-  (c-name "clutter_stage_manager_get_type")
-  (return-type "GType")
+(define-method set_boundsx
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_boundsx")
+  (return-type "none")
+  (parameters
+    '("ClutterFixed" "x_scale_start")
+    '("ClutterFixed" "y_scale_start")
+    '("ClutterFixed" "x_scale_end")
+    '("ClutterFixed" "y_scale_end")
+  )
 )
 
-(define-function clutter_stage_manager_get_default
-  (c-name "clutter_stage_manager_get_default")
-  (return-type "ClutterStageManager*")
+(define-method get_bounds
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_get_bounds")
+  (return-type "none")
+  (parameters
+    '("gdouble*" "x_scale_start")
+    '("gdouble*" "y_scale_start")
+    '("gdouble*" "x_scale_end")
+    '("gdouble*" "y_scale_end")
+  )
 )
 
-(define-method set_default_stage
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_set_default_stage")
+(define-method get_boundsx
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_get_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterStage*" "stage")
+    '("ClutterFixed*" "x_scale_start")
+    '("ClutterFixed*" "y_scale_start")
+    '("ClutterFixed*" "x_scale_end")
+    '("ClutterFixed*" "y_scale_end")
   )
 )
 
-(define-method get_default_stage
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_get_default_stage")
-  (return-type "ClutterStage*")
-)
 
-(define-method list_stages
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_list_stages")
-  (return-type "GSList*")
-)
 
+;; From clutter-bezier.h
 
 
-;; From clutter-shader.h
 
-(define-function clutter_shader_error_quark
-  (c-name "clutter_shader_error_quark")
-  (return-type "GQuark")
-)
+;; From clutter-binding-pool.h
 
-(define-function clutter_shader_get_type
-  (c-name "clutter_shader_get_type")
+(define-function clutter_binding_pool_get_type
+  (c-name "clutter_binding_pool_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_shader_new
-  (c-name "clutter_shader_new")
-  (is-constructor-of "ClutterShader")
-  (return-type "ClutterShader*")
-)
-
-(define-method set_is_enabled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_is_enabled")
-  (return-type "none")
+(define-function clutter_binding_pool_new
+  (c-name "clutter_binding_pool_new")
+  (is-constructor-of "ClutterBindingPool")
+  (return-type "ClutterBindingPool*")
   (parameters
-    '("gboolean" "enabled")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_is_enabled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_is_enabled")
-  (return-type "gboolean")
+(define-function clutter_binding_pool_get_for_class
+  (c-name "clutter_binding_pool_get_for_class")
+  (return-type "ClutterBindingPool*")
+  (parameters
+    '("gpointer" "klass")
+  )
 )
 
-(define-method compile
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_compile")
-  (return-type "gboolean")
+(define-function clutter_binding_pool_find
+  (c-name "clutter_binding_pool_find")
+  (return-type "ClutterBindingPool*")
   (parameters
-    '("GError**" "error")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method release
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_release")
+(define-method install_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_install_action")
   (return-type "none")
+  (parameters
+    '("const-gchar*" "action_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GCallback" "callback")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
 )
 
-(define-method is_compiled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_is_compiled")
-  (return-type "gboolean")
-)
-
-(define-method set_vertex_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_vertex_source")
+(define-method install_closure
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_install_closure")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
+    '("const-gchar*" "action_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GClosure*" "closure")
   )
 )
 
-(define-method set_fragment_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_fragment_source")
+(define-method override_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_override_action")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GCallback" "callback")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method get_vertex_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_vertex_source")
-  (return-type "const-gchar*")
+(define-method override_closure
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_override_closure")
+  (return-type "none")
+  (parameters
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GClosure*" "closure")
+  )
 )
 
-(define-method get_fragment_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_fragment_source")
+(define-method find_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_find_action")
   (return-type "const-gchar*")
+  (parameters
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+  )
 )
 
-(define-method set_uniform
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_uniform")
+(define-method remove_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_remove_action")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-GValue*" "value")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
   )
 )
 
-(define-method get_cogl_program
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_cogl_program")
-  (return-type "CoglHandle")
-)
-
-(define-method get_cogl_fragment_shader
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_cogl_fragment_shader")
-  (return-type "CoglHandle")
+(define-method activate
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_activate")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GObject*" "gobject")
+  )
 )
 
-(define-method get_cogl_vertex_shader
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_cogl_vertex_shader")
-  (return-type "CoglHandle")
+(define-method block_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_block_action")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "action_name")
+  )
 )
 
-(define-method set_uniform_1f
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_uniform_1f")
+(define-method unblock_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_unblock_action")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("gfloat" "value")
+    '("const-gchar*" "action_name")
   )
 )
 
 
 
-;; From clutter-event.h
+;; From clutter-cairo-texture.h
 
-(define-function clutter_event_get_type
-  (c-name "clutter_event_get_type")
+(define-function clutter_cairo_texture_get_type
+  (c-name "clutter_cairo_texture_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_events_pending
-  (c-name "clutter_events_pending")
-  (return-type "gboolean")
+(define-function clutter_cairo_texture_new
+  (c-name "clutter_cairo_texture_new")
+  (is-constructor-of "ClutterCairoTexture")
+  (return-type "ClutterActor*")
+  (parameters
+    '("guint" "width")
+    '("guint" "height")
+  )
 )
 
-(define-function clutter_event_get
-  (c-name "clutter_event_get")
-  (return-type "ClutterEvent*")
+(define-method create_region
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_create_region")
+  (return-type "cairo_t*")
+  (parameters
+    '("gint" "x_offset")
+    '("gint" "y_offset")
+    '("gint" "width")
+    '("gint" "height")
+  )
 )
 
-(define-function clutter_event_peek
-  (c-name "clutter_event_peek")
-  (return-type "ClutterEvent*")
+(define-method create
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_create")
+  (return-type "cairo_t*")
 )
 
-(define-method put
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_put")
+(define-method set_surface_size
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_set_surface_size")
   (return-type "none")
+  (parameters
+    '("guint" "width")
+    '("guint" "height")
+  )
 )
 
-(define-function clutter_event_new
-  (c-name "clutter_event_new")
-  (is-constructor-of "ClutterEvent")
-  (return-type "ClutterEvent*")
+(define-method get_surface_size
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_get_surface_size")
+  (return-type "none")
   (parameters
-    '("ClutterEventType" "type")
+    '("guint*" "width")
+    '("guint*" "height")
+  )
+)
+
+(define-function clutter_cairo_set_source_color
+  (c-name "clutter_cairo_set_source_color")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method copy
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_copy")
-  (return-type "ClutterEvent*")
+
+
+;; From clutter-child-meta.h
+
+(define-function clutter_child_meta_get_type
+  (c-name "clutter_child_meta_get_type")
+  (return-type "GType")
+)
+
+(define-method get_container
+  (of-object "ClutterChildMeta")
+  (c-name "clutter_child_meta_get_container")
+  (return-type "ClutterContainer*")
 )
 
-(define-method free
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_free")
-  (return-type "none")
+(define-method get_actor
+  (of-object "ClutterChildMeta")
+  (c-name "clutter_child_meta_get_actor")
+  (return-type "ClutterActor*")
 )
 
-(define-method type
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_type")
-  (return-type "ClutterEventType")
-)
 
-(define-method get_time
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_time")
-  (return-type "guint32")
-)
 
-(define-method get_state
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_state")
-  (return-type "ClutterModifierType")
+;; From clutter-clone.h
+
+(define-function clutter_clone_get_type
+  (c-name "clutter_clone_get_type")
+  (return-type "GType")
 )
 
-(define-method get_coords
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_coords")
-  (return-type "none")
+(define-function clutter_clone_new
+  (c-name "clutter_clone_new")
+  (is-constructor-of "ClutterClone")
+  (return-type "ClutterActor*")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("ClutterActor*" "source")
   )
 )
 
-(define-method get_device_id
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_device_id")
-  (return-type "gint")
+(define-method set_source
+  (of-object "ClutterClone")
+  (c-name "clutter_clone_set_source")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "source")
+  )
 )
 
 (define-method get_source
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_source")
+  (of-object "ClutterClone")
+  (c-name "clutter_clone_get_source")
   (return-type "ClutterActor*")
 )
 
-(define-method symbol
-  (of-object "ClutterKeyEvent")
-  (c-name "clutter_key_event_symbol")
-  (return-type "guint")
-)
 
-(define-method code
-  (of-object "ClutterKeyEvent")
-  (c-name "clutter_key_event_code")
-  (return-type "guint16")
+
+;; From clutter-color.h
+
+(define-function clutter_color_new
+  (c-name "clutter_color_new")
+  (is-constructor-of "ClutterColor")
+  (return-type "ClutterColor*")
+  (parameters
+    '("guint8" "red")
+    '("guint8" "green")
+    '("guint8" "blue")
+    '("guint8" "alpha")
+  )
 )
 
-(define-method unicode
-  (of-object "ClutterKeyEvent")
-  (c-name "clutter_key_event_unicode")
-  (return-type "guint32")
+(define-method copy
+  (of-object "ClutterColor")
+  (c-name "clutter_color_copy")
+  (return-type "ClutterColor*")
 )
 
-(define-method button
-  (of-object "ClutterButtonEvent")
-  (c-name "clutter_button_event_button")
-  (return-type "guint32")
+(define-method free
+  (of-object "ClutterColor")
+  (c-name "clutter_color_free")
+  (return-type "none")
 )
 
-(define-function clutter_keysym_to_unicode
-  (c-name "clutter_keysym_to_unicode")
-  (return-type "guint32")
+(define-function clutter_color_parse
+  (c-name "clutter_color_parse")
+  (return-type "gboolean")
   (parameters
-    '("guint" "keyval")
+    '("const-gchar*" "color")
+    '("ClutterColor*" "dest")
   )
 )
 
-(define-method get_stage
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_stage")
-  (return-type "ClutterStage*")
+(define-method equal
+  (of-object "ClutterColor")
+  (c-name "clutter_color_equal")
+  (return-type "gboolean")
+  (parameters
+    '("const-ClutterColor*" "b")
+  )
 )
 
+(define-method to_string
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_string")
+  (return-type "gchar*")
+)
 
-
-;; From clutter-behaviour-depth.h
-
-(define-function clutter_behaviour_depth_get_type
-  (c-name "clutter_behaviour_depth_get_type")
+(define-function clutter_color_get_type
+  (c-name "clutter_color_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_behaviour_depth_new
-  (c-name "clutter_behaviour_depth_new")
-  (is-constructor-of "ClutterBehaviourDepth")
-  (return-type "ClutterBehaviour*")
+(define-method add
+  (of-object "ClutterColor")
+  (c-name "clutter_color_add")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "depth_start")
-    '("gint" "depth_end")
+    '("const-ClutterColor*" "src2")
+    '("ClutterColor*" "dest")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourDepth")
-  (c-name "clutter_behaviour_depth_set_bounds")
+(define-method subtract
+  (of-object "ClutterColor")
+  (c-name "clutter_color_subtract")
   (return-type "none")
   (parameters
-    '("gint" "depth_start")
-    '("gint" "depth_end")
+    '("const-ClutterColor*" "src2")
+    '("ClutterColor*" "dest")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourDepth")
-  (c-name "clutter_behaviour_depth_get_bounds")
+(define-method lighten
+  (of-object "ClutterColor")
+  (c-name "clutter_color_lighten")
   (return-type "none")
   (parameters
-    '("gint*" "depth_start")
-    '("gint*" "depth_end")
+    '("ClutterColor*" "dest")
   )
 )
 
-
-
-;; From clutter-model.h
-
-(define-function clutter_model_get_type
-  (c-name "clutter_model_get_type")
-  (return-type "GType")
-)
-
-(define-method set_types
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_types")
+(define-method darken
+  (of-object "ClutterColor")
+  (c-name "clutter_color_darken")
   (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("GType*" "types")
+    '("ClutterColor*" "dest")
   )
 )
 
-(define-method set_names
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_names")
+(define-method shade
+  (of-object "ClutterColor")
+  (c-name "clutter_color_shade")
   (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("const-gchar*-const[]" "names")
+    '("ClutterColor*" "dest")
+    '("gdouble" "shade")
   )
 )
 
-(define-method append
-  (of-object "ClutterModel")
-  (c-name "clutter_model_append")
+(define-method shadex
+  (of-object "ClutterColor")
+  (c-name "clutter_color_shadex")
   (return-type "none")
   (parameters
+    '("ClutterColor*" "dest")
+    '("ClutterFixed" "shade")
   )
-  (varargs #t)
 )
 
-(define-method appendv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_appendv")
+(define-method to_hlsx
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_hlsx")
   (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
+    '("ClutterFixed*" "hue")
+    '("ClutterFixed*" "luminance")
+    '("ClutterFixed*" "saturation")
   )
 )
 
-(define-method prepend
-  (of-object "ClutterModel")
-  (c-name "clutter_model_prepend")
+(define-method from_hlsx
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_hlsx")
   (return-type "none")
   (parameters
+    '("ClutterFixed" "hue")
+    '("ClutterFixed" "luminance")
+    '("ClutterFixed" "saturation")
   )
-  (varargs #t)
 )
 
-(define-method prependv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_prependv")
+(define-method to_hls
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_hls")
   (return-type "none")
   (parameters
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
+    '("guint8*" "hue")
+    '("guint8*" "luminance")
+    '("guint8*" "saturation")
   )
 )
 
-(define-method insert
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insert")
+(define-method from_hls
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_hls")
   (return-type "none")
   (parameters
-    '("guint" "row")
+    '("guint8" "hue")
+    '("guint8" "luminance")
+    '("guint8" "saturation")
   )
-  (varargs #t)
 )
 
-(define-method insertv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insertv")
-  (return-type "none")
-  (parameters
-    '("guint" "row")
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
-  )
+(define-method to_pixel
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_pixel")
+  (return-type "guint32")
 )
 
-(define-method insert_value
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insert_value")
+(define-method from_pixel
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_pixel")
   (return-type "none")
   (parameters
-    '("guint" "row")
-    '("guint" "column")
-    '("const-GValue*" "value")
+    '("guint32" "pixel")
   )
 )
 
-(define-method remove
-  (of-object "ClutterModel")
-  (c-name "clutter_model_remove")
+(define-function clutter_value_set_color
+  (c-name "clutter_value_set_color")
   (return-type "none")
   (parameters
-    '("guint" "row")
+    '("GValue*" "value")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_n_rows
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_n_rows")
-  (return-type "guint")
-)
-
-(define-method get_n_columns
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_n_columns")
-  (return-type "guint")
-)
-
-(define-method get_column_name
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_column_name")
-  (return-type "const-gchar*")
+(define-function clutter_value_get_color
+  (c-name "clutter_value_get_color")
+  (return-type "const-ClutterColor*")
   (parameters
-    '("guint" "column")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_column_type
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_column_type")
+(define-function clutter_param_color_get_type
+  (c-name "clutter_param_color_get_type")
   (return-type "GType")
+)
+
+(define-function clutter_param_spec_color
+  (c-name "clutter_param_spec_color")
+  (return-type "GParamSpec*")
   (parameters
-    '("guint" "column")
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("const-ClutterColor*" "default_value")
+    '("GParamFlags" "flags")
   )
 )
 
-(define-method get_first_iter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_first_iter")
-  (return-type "ClutterModelIter*")
-)
 
-(define-method get_last_iter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_last_iter")
-  (return-type "ClutterModelIter*")
+
+;; From clutter-container.h
+
+(define-function clutter_container_get_type
+  (c-name "clutter_container_get_type")
+  (return-type "GType")
 )
 
-(define-method get_iter_at_row
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_iter_at_row")
-  (return-type "ClutterModelIter*")
+(define-method add
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add")
+  (return-type "none")
   (parameters
-    '("guint" "row")
+    '("ClutterActor*" "first_actor")
   )
+  (varargs #t)
 )
 
-(define-method set_sorting_column
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_sorting_column")
+(define-method add_actor
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add_actor")
   (return-type "none")
   (parameters
-    '("gint" "column")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_sorting_column
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_sorting_column")
-  (return-type "gint")
+(define-method add_valist
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add_valist")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
+  )
 )
 
-(define-method foreach
-  (of-object "ClutterModel")
-  (c-name "clutter_model_foreach")
+(define-method remove
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove")
   (return-type "none")
   (parameters
-    '("ClutterModelForeachFunc" "func")
-    '("gpointer" "user_data")
+    '("ClutterActor*" "first_actor")
   )
+  (varargs #t)
 )
 
-(define-method set_sort
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_sort")
+(define-method remove_actor
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove_actor")
   (return-type "none")
   (parameters
-    '("guint" "column")
-    '("ClutterModelSortFunc" "func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method set_filter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_filter")
+(define-method remove_valist
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove_valist")
   (return-type "none")
   (parameters
-    '("ClutterModelFilterFunc" "func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
   )
 )
 
-(define-method resort
-  (of-object "ClutterModel")
-  (c-name "clutter_model_resort")
-  (return-type "none")
+(define-method get_children
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_get_children")
+  (return-type "GList*")
 )
 
-(define-method filter_row
-  (of-object "ClutterModel")
-  (c-name "clutter_model_filter_row")
-  (return-type "gboolean")
+(define-method foreach
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_foreach")
+  (return-type "none")
   (parameters
-    '("guint" "row")
+    '("ClutterCallback" "callback")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method filter_iter
-  (of-object "ClutterModel")
-  (c-name "clutter_model_filter_iter")
-  (return-type "gboolean")
+(define-method find_child_by_name
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_find_child_by_name")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterModelIter*" "iter")
+    '("const-gchar*" "child_name")
   )
 )
 
-(define-function clutter_model_iter_get_type
-  (c-name "clutter_model_iter_get_type")
-  (return-type "GType")
-)
-
-(define-method get
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get")
+(define-method raise_child
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_raise_child")
   (return-type "none")
   (parameters
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
-  (varargs #t)
 )
 
-(define-method get_valist
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_valist")
+(define-method lower_child
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_lower_child")
   (return-type "none")
   (parameters
-    '("va_list" "args")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-(define-method get_value
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_value")
+(define-method sort_depth_order
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_sort_depth_order")
   (return-type "none")
+)
+
+(define-function clutter_container_class_find_child_property
+  (c-name "clutter_container_class_find_child_property")
+  (return-type "GParamSpec*")
   (parameters
-    '("guint" "column")
-    '("GValue*" "value")
+    '("GObjectClass*" "klass")
+    '("const-gchar*" "property_name")
   )
 )
 
-(define-method set
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_set")
-  (return-type "none")
+(define-function clutter_container_class_list_child_properties
+  (c-name "clutter_container_class_list_child_properties")
+  (return-type "GParamSpec**")
   (parameters
+    '("GObjectClass*" "klass")
+    '("guint*" "n_properties")
   )
-  (varargs #t)
 )
 
-(define-method set_valist
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_set_valist")
-  (return-type "none")
+(define-method get_child_meta
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_get_child_meta")
+  (return-type "ClutterChildMeta*")
   (parameters
-    '("va_list" "args")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method set_value
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_set_value")
+(define-method child_set_property
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_set_property")
   (return-type "none")
   (parameters
-    '("guint" "column")
+    '("ClutterActor*" "child")
+    '("const-gchar*" "property")
     '("const-GValue*" "value")
   )
 )
 
-(define-method is_first
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_is_first")
-  (return-type "gboolean")
-)
-
-(define-method is_last
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_is_last")
-  (return-type "gboolean")
-)
-
-(define-method next
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_next")
-  (return-type "ClutterModelIter*")
+(define-method child_get_property
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_get_property")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "child")
+    '("const-gchar*" "property")
+    '("GValue*" "value")
+  )
 )
 
-(define-method prev
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_prev")
-  (return-type "ClutterModelIter*")
+(define-method child_set
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_set")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("const-gchar*" "first_prop")
+  )
+  (varargs #t)
 )
 
-(define-method get_model
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_model")
-  (return-type "ClutterModel*")
+(define-method child_get
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_get")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("const-gchar*" "first_prop")
+  )
+  (varargs #t)
 )
 
-(define-method get_row
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_get_row")
-  (return-type "guint")
-)
 
-(define-method copy
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_copy")
-  (return-type "ClutterModelIter*")
-)
 
+;; From clutter-debug.h
 
 
-;; From clutter-util.h
 
-(define-function clutter_util_next_p2
-  (c-name "clutter_util_next_p2")
-  (return-type "int")
-  (parameters
-    '("int" "a")
-  )
-)
+;; From clutter-deprecated.h
 
 
 
-;; From clutter-shader-types.h
+;; From clutter-enum-types.h
 
-(define-function clutter_shader_float_get_type
-  (c-name "clutter_shader_float_get_type")
+(define-function clutter_actor_flags_get_type
+  (c-name "clutter_actor_flags_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_shader_int_get_type
-  (c-name "clutter_shader_int_get_type")
+(define-function clutter_modifier_type_get_type
+  (c-name "clutter_modifier_type_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_shader_matrix_get_type
-  (c-name "clutter_shader_matrix_get_type")
+(define-function clutter_event_flags_get_type
+  (c-name "clutter_event_flags_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_value_set_shader_float
-  (c-name "clutter_value_set_shader_float")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gfloat*" "floats")
-  )
+(define-function clutter_event_type_get_type
+  (c-name "clutter_event_type_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_value_set_shader_int
-  (c-name "clutter_value_set_shader_int")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gint*" "ints")
-  )
+(define-function clutter_scroll_direction_get_type
+  (c-name "clutter_scroll_direction_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_value_set_shader_matrix
-  (c-name "clutter_value_set_shader_matrix")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gfloat*" "matrix")
-  )
+(define-function clutter_stage_state_get_type
+  (c-name "clutter_stage_state_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_value_get_shader_float
-  (c-name "clutter_value_get_shader_float")
-  (return-type "const-gfloat*")
-  (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
-  )
+(define-function clutter_feature_flags_get_type
+  (c-name "clutter_feature_flags_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_value_get_shader_int
-  (c-name "clutter_value_get_shader_int")
-  (return-type "const-COGLint*")
-  (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
-  )
+(define-function clutter_init_error_get_type
+  (c-name "clutter_init_error_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_value_get_shader_matrix
-  (c-name "clutter_value_get_shader_matrix")
-  (return-type "const-GLfloat*")
-  (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
-  )
+(define-function clutter_path_node_type_get_type
+  (c-name "clutter_path_node_type_get_type")
+  (return-type "GType")
 )
 
+(define-function clutter_script_error_get_type
+  (c-name "clutter_script_error_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_shader_error_get_type
+  (c-name "clutter_shader_error_get_type")
+  (return-type "GType")
+)
 
-;; From clutter-stage.h
+(define-function clutter_texture_error_get_type
+  (c-name "clutter_texture_error_get_type")
+  (return-type "GType")
+)
 
-(define-function clutter_perspective_get_type
-  (c-name "clutter_perspective_get_type")
+(define-function clutter_texture_flags_get_type
+  (c-name "clutter_texture_flags_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_fog_get_type
-  (c-name "clutter_fog_get_type")
+(define-function clutter_texture_quality_get_type
+  (c-name "clutter_texture_quality_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_stage_get_type
-  (c-name "clutter_stage_get_type")
+(define-function clutter_timeline_direction_get_type
+  (c-name "clutter_timeline_direction_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_stage_get_default
-  (c-name "clutter_stage_get_default")
-  (return-type "ClutterActor*")
+(define-function clutter_gravity_get_type
+  (c-name "clutter_gravity_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_stage_new
-  (c-name "clutter_stage_new")
-  (is-constructor-of "ClutterStage")
-  (return-type "ClutterActor*")
+(define-function clutter_rotate_axis_get_type
+  (c-name "clutter_rotate_axis_get_type")
+  (return-type "GType")
 )
 
-(define-method set_color
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_color")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
+(define-function clutter_rotate_direction_get_type
+  (c-name "clutter_rotate_direction_get_type")
+  (return-type "GType")
 )
 
-(define-method get_color
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_color")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "color")
-  )
+(define-function clutter_request_mode_get_type
+  (c-name "clutter_request_mode_get_type")
+  (return-type "GType")
 )
 
-(define-method set_perspectivex
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_perspectivex")
-  (return-type "none")
-  (parameters
-    '("ClutterPerspective*" "perspective")
-  )
+(define-function clutter_animation_mode_get_type
+  (c-name "clutter_animation_mode_get_type")
+  (return-type "GType")
 )
 
-(define-method get_perspectivex
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_perspectivex")
-  (return-type "none")
-  (parameters
-    '("ClutterPerspective*" "perspective")
-  )
+(define-function clutter_font_flags_get_type
+  (c-name "clutter_font_flags_get_type")
+  (return-type "GType")
 )
 
-(define-method set_perspective
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_perspective")
-  (return-type "none")
-  (parameters
-    '("gfloat" "fovy")
-    '("gfloat" "aspect")
-    '("gfloat" "z_near")
-    '("gfloat" "z_far")
-  )
+
+
+;; From clutter-event.h
+
+(define-function clutter_event_get_type
+  (c-name "clutter_event_get_type")
+  (return-type "GType")
 )
 
-(define-method get_perspective
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_perspective")
-  (return-type "none")
-  (parameters
-    '("gfloat*" "fovy")
-    '("gfloat*" "aspect")
-    '("gfloat*" "z_near")
-    '("gfloat*" "z_far")
-  )
+(define-function clutter_events_pending
+  (c-name "clutter_events_pending")
+  (return-type "gboolean")
 )
 
-(define-method fullscreen
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_fullscreen")
-  (return-type "none")
+(define-function clutter_event_get
+  (c-name "clutter_event_get")
+  (return-type "ClutterEvent*")
 )
 
-(define-method unfullscreen
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_unfullscreen")
-  (return-type "none")
+(define-function clutter_event_peek
+  (c-name "clutter_event_peek")
+  (return-type "ClutterEvent*")
 )
 
-(define-method show_cursor
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_show_cursor")
+(define-method put
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_put")
   (return-type "none")
 )
 
-(define-method hide_cursor
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_hide_cursor")
+(define-function clutter_event_new
+  (c-name "clutter_event_new")
+  (is-constructor-of "ClutterEvent")
+  (return-type "ClutterEvent*")
+  (parameters
+    '("ClutterEventType" "type")
+  )
+)
+
+(define-method copy
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_copy")
+  (return-type "ClutterEvent*")
+)
+
+(define-method free
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_free")
   (return-type "none")
 )
 
-(define-method get_actor_at_pos
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_actor_at_pos")
-  (return-type "ClutterActor*")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
+(define-method type
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_type")
+  (return-type "ClutterEventType")
 )
 
-(define-method read_pixels
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_read_pixels")
-  (return-type "guchar*")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-  )
+(define-method get_time
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_time")
+  (return-type "guint32")
 )
 
-(define-method event
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_event")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterEvent*" "event")
-  )
+(define-method get_state
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_state")
+  (return-type "ClutterModifierType")
 )
 
-(define-method set_title
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_title")
+(define-method get_coords
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_coords")
   (return-type "none")
   (parameters
-    '("const-gchar*" "title")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method get_title
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_title")
-  (return-type "const-gchar*")
+(define-method get_device_id
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_device_id")
+  (return-type "gint")
 )
 
-(define-method set_user_resizable
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_user_resizable")
-  (return-type "none")
-  (parameters
-    '("gboolean" "resizable")
-  )
+(define-method get_source
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_source")
+  (return-type "ClutterActor*")
 )
 
-(define-method get_user_resizable
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_user_resizable")
-  (return-type "gboolean")
+(define-method symbol
+  (of-object "ClutterKeyEvent")
+  (c-name "clutter_key_event_symbol")
+  (return-type "guint")
 )
 
-(define-method set_use_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_use_fog")
-  (return-type "none")
-  (parameters
-    '("gboolean" "fog")
-  )
+(define-method code
+  (of-object "ClutterKeyEvent")
+  (c-name "clutter_key_event_code")
+  (return-type "guint16")
 )
 
-(define-method get_use_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_use_fog")
-  (return-type "gboolean")
+(define-method unicode
+  (of-object "ClutterKeyEvent")
+  (c-name "clutter_key_event_unicode")
+  (return-type "guint32")
 )
 
-(define-method set_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_fog")
-  (return-type "none")
-  (parameters
-    '("gdouble" "density")
-    '("gdouble" "z_near")
-    '("gdouble" "z_far")
-  )
+(define-method button
+  (of-object "ClutterButtonEvent")
+  (c-name "clutter_button_event_button")
+  (return-type "guint32")
 )
 
-(define-method get_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_fog")
-  (return-type "none")
+(define-function clutter_keysym_to_unicode
+  (c-name "clutter_keysym_to_unicode")
+  (return-type "guint32")
   (parameters
-    '("gdouble*" "density")
-    '("gdouble*" "z_near")
-    '("gdouble*" "z_far")
+    '("guint" "keyval")
   )
 )
 
-(define-method set_fogx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_fogx")
-  (return-type "none")
-  (parameters
-    '("ClutterFog*" "fog")
-  )
+(define-method get_stage
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_stage")
+  (return-type "ClutterStage*")
 )
 
-(define-method get_fogx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_fogx")
-  (return-type "none")
+
+
+;; From clutter-feature.h
+
+(define-function clutter_feature_available
+  (c-name "clutter_feature_available")
+  (return-type "gboolean")
   (parameters
-    '("ClutterFog*" "fog")
+    '("ClutterFeatureFlags" "feature")
   )
 )
 
-(define-method get_resolution
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_resolution")
-  (return-type "gdouble")
+(define-function clutter_feature_get_all
+  (c-name "clutter_feature_get_all")
+  (return-type "ClutterFeatureFlags")
 )
 
-(define-method get_resolutionx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_resolutionx")
-  (return-type "ClutterFixed")
-)
 
-(define-method set_key_focus
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_key_focus")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
 
-(define-method get_key_focus
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_key_focus")
-  (return-type "ClutterActor*")
+;; From clutter-fixed.h
+
+(define-function clutter_fixed_get_type
+  (c-name "clutter_fixed_get_type")
+  (return-type "GType")
 )
 
-(define-method ensure_current
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_ensure_current")
-  (return-type "none")
+(define-function clutter_param_fixed_get_type
+  (c-name "clutter_param_fixed_get_type")
+  (return-type "GType")
 )
 
-(define-method queue_redraw
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_queue_redraw")
+(define-function clutter_value_set_fixed
+  (c-name "clutter_value_set_fixed")
   (return-type "none")
+  (parameters
+    '("GValue*" "value")
+    '("ClutterFixed" "fixed_")
+  )
 )
 
-(define-method is_default
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_is_default")
-  (return-type "gboolean")
+(define-function clutter_value_get_fixed
+  (c-name "clutter_value_get_fixed")
+  (return-type "ClutterFixed")
+  (parameters
+    '("const-GValue*" "value")
+  )
 )
 
-(define-method ensure_viewport
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_ensure_viewport")
-  (return-type "none")
+(define-function clutter_param_spec_fixed
+  (c-name "clutter_param_spec_fixed")
+  (return-type "GParamSpec*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("ClutterFixed" "minimum")
+    '("ClutterFixed" "maximum")
+    '("ClutterFixed" "default_value")
+    '("GParamFlags" "flags")
+  )
 )
 
 
 
-;; From clutter-child-meta.h
-
-(define-function clutter_child_meta_get_type
-  (c-name "clutter_child_meta_get_type")
-  (return-type "GType")
-)
+;; From clutter-frame-source.h
 
-(define-method get_container
-  (of-object "ClutterChildMeta")
-  (c-name "clutter_child_meta_get_container")
-  (return-type "ClutterContainer*")
+(define-function clutter_frame_source_add
+  (c-name "clutter_frame_source_add")
+  (return-type "guint")
+  (parameters
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+  )
 )
 
-(define-method get_actor
-  (of-object "ClutterChildMeta")
-  (c-name "clutter_child_meta_get_actor")
-  (return-type "ClutterActor*")
+(define-function clutter_frame_source_add_full
+  (c-name "clutter_frame_source_add_full")
+  (return-type "guint")
+  (parameters
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
 )
 
 
 
-;; From clutter-score.h
+;; From clutter-group.h
 
-(define-function clutter_score_get_type
-  (c-name "clutter_score_get_type")
+(define-function clutter_group_get_type
+  (c-name "clutter_group_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_score_new
-  (c-name "clutter_score_new")
-  (is-constructor-of "ClutterScore")
-  (return-type "ClutterScore*")
+(define-function clutter_group_new
+  (c-name "clutter_group_new")
+  (is-constructor-of "ClutterGroup")
+  (return-type "ClutterActor*")
 )
 
-(define-method set_loop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_set_loop")
-  (return-type "none")
+(define-method get_nth_child
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_get_nth_child")
+  (return-type "ClutterActor*")
   (parameters
-    '("gboolean" "loop")
+    '("gint" "index_")
   )
 )
 
-(define-method get_loop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_get_loop")
-  (return-type "gboolean")
+(define-method get_n_children
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_get_n_children")
+  (return-type "gint")
 )
 
-(define-method append
-  (of-object "ClutterScore")
-  (c-name "clutter_score_append")
-  (return-type "gulong")
+(define-method remove_all
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_remove_all")
+  (return-type "none")
+)
+
+(define-method add_many
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_add_many")
+  (return-type "none")
   (parameters
-    '("ClutterTimeline*" "parent")
-    '("ClutterTimeline*" "timeline")
+    '("ClutterActor*" "first_actor")
   )
+  (varargs #t)
 )
 
-(define-method append_at_marker
-  (of-object "ClutterScore")
-  (c-name "clutter_score_append_at_marker")
-  (return-type "gulong")
+(define-method add_many_valist
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_add_many_valist")
+  (return-type "none")
   (parameters
-    '("ClutterTimeline*" "parent")
-    '("const-gchar*" "marker_name")
-    '("ClutterTimeline*" "timeline")
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
   )
 )
 
 (define-method remove
-  (of-object "ClutterScore")
-  (c-name "clutter_score_remove")
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_remove")
   (return-type "none")
   (parameters
-    '("gulong" "id")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method remove_all
-  (of-object "ClutterScore")
-  (c-name "clutter_score_remove_all")
+(define-method raise
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_raise")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
+  )
 )
 
-(define-method get_timeline
-  (of-object "ClutterScore")
-  (c-name "clutter_score_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-method lower
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_lower")
+  (return-type "none")
   (parameters
-    '("gulong" "id")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-(define-method list_timelines
-  (of-object "ClutterScore")
-  (c-name "clutter_score_list_timelines")
-  (return-type "GSList*")
+(define-method sort_depth_order
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_sort_depth_order")
+  (return-type "none")
 )
 
-(define-method start
-  (of-object "ClutterScore")
-  (c-name "clutter_score_start")
-  (return-type "none")
+
+
+;; From clutter.h
+
+
+
+;; From clutter-id-pool.h
+
+(define-function clutter_id_pool_new
+  (c-name "clutter_id_pool_new")
+  (is-constructor-of "ClutterIdPool")
+  (return-type "ClutterIDPool*")
+  (parameters
+    '("guint" "initial_size")
+  )
 )
 
-(define-method stop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_stop")
+(define-method free
+  (of-object "ClutterIDPool")
+  (c-name "clutter_id_pool_free")
   (return-type "none")
 )
 
-(define-method pause
-  (of-object "ClutterScore")
-  (c-name "clutter_score_pause")
-  (return-type "none")
+(define-method add
+  (of-object "ClutterIDPool")
+  (c-name "clutter_id_pool_add")
+  (return-type "guint32")
+  (parameters
+    '("gpointer" "ptr")
+  )
 )
 
-(define-method rewind
-  (of-object "ClutterScore")
-  (c-name "clutter_score_rewind")
+(define-method remove
+  (of-object "ClutterIDPool")
+  (c-name "clutter_id_pool_remove")
   (return-type "none")
+  (parameters
+    '("guint32" "id")
+  )
 )
 
-(define-method is_playing
-  (of-object "ClutterScore")
-  (c-name "clutter_score_is_playing")
-  (return-type "gboolean")
+(define-method lookup
+  (of-object "ClutterIDPool")
+  (c-name "clutter_id_pool_lookup")
+  (return-type "gpointer")
+  (parameters
+    '("guint32" "id")
+  )
 )
 
 
 
-;; From clutter-effect.h
+;; From clutter-interval.h
 
-(define-function clutter_effect_template_get_type
-  (c-name "clutter_effect_template_get_type")
+(define-function clutter_interval_get_type
+  (c-name "clutter_interval_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_effect_template_new
-  (c-name "clutter_effect_template_new")
-  (is-constructor-of "ClutterEffectTemplate")
-  (return-type "ClutterEffectTemplate*")
+(define-function clutter_interval_new
+  (c-name "clutter_interval_new")
+  (is-constructor-of "ClutterInterval")
+  (return-type "ClutterInterval*")
   (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "alpha_func")
+    '("GType" "gtype")
   )
+  (varargs #t)
 )
 
-(define-function clutter_effect_template_new_full
-  (c-name "clutter_effect_template_new_full")
-  (return-type "ClutterEffectTemplate*")
+(define-function clutter_interval_new_with_values
+  (c-name "clutter_interval_new_with_values")
+  (return-type "ClutterInterval*")
   (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "alpha_func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
+    '("GType" "gtype")
+    '("const-GValue*" "initial")
+    '("const-GValue*" "final")
   )
 )
 
-(define-function clutter_effect_template_new_for_duration
-  (c-name "clutter_effect_template_new_for_duration")
-  (return-type "ClutterEffectTemplate*")
-  (parameters
-    '("guint" "msecs")
-    '("ClutterAlphaFunc" "alpha_func")
-  )
+(define-method clone
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_clone")
+  (return-type "ClutterInterval*")
+)
+
+(define-method get_value_type
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_value_type")
+  (return-type "GType")
 )
 
-(define-method construct
-  (of-object "ClutterEffectTemplate")
-  (c-name "clutter_effect_template_construct")
+(define-method set_initial_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_set_initial_value")
   (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "alpha_func")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method set_timeline_clone
-  (of-object "ClutterEffectTemplate")
-  (c-name "clutter_effect_template_set_timeline_clone")
+(define-method get_initial_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_initial_value")
   (return-type "none")
   (parameters
-    '("gboolean" "setting")
+    '("GValue*" "value")
   )
 )
 
-(define-method get_timeline_clone
-  (of-object "ClutterEffectTemplate")
-  (c-name "clutter_effect_template_get_timeline_clone")
-  (return-type "gboolean")
+(define-method peek_initial_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_peek_initial_value")
+  (return-type "GValue*")
 )
 
-(define-function clutter_effect_fade
-  (c-name "clutter_effect_fade")
-  (return-type "ClutterTimeline*")
+(define-method set_final_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_set_final_value")
+  (return-type "none")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("guint8" "opacity_end")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+    '("const-GValue*" "value")
   )
 )
 
-(define-function clutter_effect_depth
-  (c-name "clutter_effect_depth")
-  (return-type "ClutterTimeline*")
+(define-method get_final_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_final_value")
+  (return-type "none")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("gint" "depth_end")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+    '("GValue*" "value")
   )
 )
 
-(define-function clutter_effect_move
-  (c-name "clutter_effect_move")
-  (return-type "ClutterTimeline*")
+(define-method peek_final_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_peek_final_value")
+  (return-type "GValue*")
+)
+
+(define-method set_interval
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_set_interval")
+  (return-type "none")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("gint" "x")
-    '("gint" "y")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
   )
+  (varargs #t)
 )
 
-(define-function clutter_effect_path
-  (c-name "clutter_effect_path")
-  (return-type "ClutterTimeline*")
+(define-method get_interval
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_get_interval")
+  (return-type "none")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("const-ClutterKnot*" "knots")
-    '("guint" "n_knots")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
   )
+  (varargs #t)
 )
 
-(define-function clutter_effect_scale
-  (c-name "clutter_effect_scale")
-  (return-type "ClutterTimeline*")
+(define-method validate
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_validate")
+  (return-type "gboolean")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+    '("GParamSpec*" "pspec")
   )
 )
 
-(define-function clutter_effect_rotate
-  (c-name "clutter_effect_rotate")
-  (return-type "ClutterTimeline*")
+(define-method compute_value
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_compute_value")
+  (return-type "gboolean")
   (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle")
-    '("gint" "center_x")
-    '("gint" "center_y")
-    '("gint" "center_z")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterEffectCompleteFunc" "func")
-    '("gpointer" "data")
+    '("gdouble" "factor")
+    '("GValue*" "value")
+  )
+)
+
+(define-function clutter_interval_register_progress_func
+  (c-name "clutter_interval_register_progress_func")
+  (return-type "none")
+  (parameters
+    '("GType" "value_type")
+    '("ClutterProgressFunc" "func")
   )
 )
 
 
 
-;; From clutter-group.h
+;; From clutter-json.h
+
+
+
+;; From clutter-keysyms.h
+
+
+
+;; From clutter-keysyms-table.h
+
+
+
+;; From clutter-list-model.h
 
-(define-function clutter_group_get_type
-  (c-name "clutter_group_get_type")
+(define-function clutter_list_model_get_type
+  (c-name "clutter_list_model_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_group_new
-  (c-name "clutter_group_new")
-  (is-constructor-of "ClutterGroup")
-  (return-type "ClutterActor*")
+(define-function clutter_list_model_new
+  (c-name "clutter_list_model_new")
+  (is-constructor-of "ClutterListModel")
+  (return-type "ClutterModel*")
+  (parameters
+    '("guint" "n_columns")
+  )
+  (varargs #t)
 )
 
-(define-method get_nth_child
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_get_nth_child")
-  (return-type "ClutterActor*")
+(define-function clutter_list_model_newv
+  (c-name "clutter_list_model_newv")
+  (return-type "ClutterModel*")
   (parameters
-    '("gint" "index_")
+    '("guint" "n_columns")
+    '("GType*" "types")
+    '("const-gchar*-const[]" "names")
   )
 )
 
-(define-method get_n_children
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_get_n_children")
-  (return-type "gint")
-)
 
-(define-method remove_all
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_remove_all")
-  (return-type "none")
+
+;; From clutter-main.h
+
+(define-function clutter_init_error_quark
+  (c-name "clutter_init_error_quark")
+  (return-type "GQuark")
 )
 
-(define-method add_many
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_add_many")
+(define-function clutter_base_init
+  (c-name "clutter_base_init")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "first_actor")
-  )
-  (varargs #t)
 )
 
-(define-method add_many_valist
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_add_many_valist")
-  (return-type "none")
+(define-function clutter_init
+  (c-name "clutter_init")
+  (return-type "ClutterInitError")
   (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
+    '("int*" "argc")
+    '("char***" "argv")
   )
 )
 
-(define-method remove
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_remove")
-  (return-type "none")
+(define-function clutter_init_with_args
+  (c-name "clutter_init_with_args")
+  (return-type "ClutterInitError")
   (parameters
-    '("ClutterActor*" "actor")
+    '("int*" "argc")
+    '("char***" "argv")
+    '("const-char*" "parameter_string")
+    '("GOptionEntry*" "entries")
+    '("const-char*" "translation_domain")
+    '("GError**" "error")
   )
 )
 
-(define-method raise
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_raise")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
+(define-function clutter_get_option_group
+  (c-name "clutter_get_option_group")
+  (return-type "GOptionGroup*")
 )
 
-(define-method lower
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_lower")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
+(define-function clutter_get_option_group_without_init
+  (c-name "clutter_get_option_group_without_init")
+  (return-type "GOptionGroup*")
 )
 
-(define-method sort_depth_order
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_sort_depth_order")
+(define-function clutter_main
+  (c-name "clutter_main")
   (return-type "none")
 )
 
-
-
-;; From clutter-units.h
-
-(define-function clutter_unit_get_type
-  (c-name "clutter_unit_get_type")
-  (return-type "GType")
+(define-function clutter_main_quit
+  (c-name "clutter_main_quit")
+  (return-type "none")
 )
 
-(define-function clutter_param_unit_get_type
-  (c-name "clutter_param_unit_get_type")
-  (return-type "GType")
+(define-function clutter_main_level
+  (c-name "clutter_main_level")
+  (return-type "gint")
 )
 
-(define-function clutter_value_set_unit
-  (c-name "clutter_value_set_unit")
+(define-function clutter_redraw
+  (c-name "clutter_redraw")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("ClutterUnit" "units")
+    '("ClutterStage*" "stage")
   )
 )
 
-(define-function clutter_value_get_unit
-  (c-name "clutter_value_get_unit")
-  (return-type "ClutterUnit")
+(define-function clutter_do_event
+  (c-name "clutter_do_event")
+  (return-type "none")
   (parameters
-    '("const-GValue*" "value")
+    '("ClutterEvent*" "event")
   )
 )
 
-(define-function clutter_param_spec_unit
-  (c-name "clutter_param_spec_unit")
-  (return-type "GParamSpec*")
-  (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("ClutterUnit" "minimum")
-    '("ClutterUnit" "maximum")
-    '("ClutterUnit" "default_value")
-    '("GParamFlags" "flags")
-  )
+(define-function clutter_get_debug_enabled
+  (c-name "clutter_get_debug_enabled")
+  (return-type "gboolean")
 )
 
+(define-function clutter_get_show_fps
+  (c-name "clutter_get_show_fps")
+  (return-type "gboolean")
+)
 
-
-;; From clutter-texture.h
-
-(define-function clutter_texture_error_quark
-  (c-name "clutter_texture_error_quark")
-  (return-type "GQuark")
+(define-function clutter_get_timestamp
+  (c-name "clutter_get_timestamp")
+  (return-type "gulong")
 )
 
-(define-function clutter_texture_get_type
-  (c-name "clutter_texture_get_type")
-  (return-type "GType")
+(define-function clutter_threads_init
+  (c-name "clutter_threads_init")
+  (return-type "none")
 )
 
-(define-function clutter_texture_handle_get_type
-  (c-name "clutter_texture_handle_get_type")
-  (return-type "GType")
+(define-function clutter_threads_enter
+  (c-name "clutter_threads_enter")
+  (return-type "none")
 )
 
-(define-function clutter_texture_new
-  (c-name "clutter_texture_new")
-  (is-constructor-of "ClutterTexture")
-  (return-type "ClutterActor*")
+(define-function clutter_threads_leave
+  (c-name "clutter_threads_leave")
+  (return-type "none")
 )
 
-(define-function clutter_texture_new_from_file
-  (c-name "clutter_texture_new_from_file")
-  (return-type "ClutterActor*")
+(define-function clutter_threads_set_lock_functions
+  (c-name "clutter_threads_set_lock_functions")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("GCallback" "enter_fn")
+    '("GCallback" "leave_fn")
   )
 )
 
-(define-function clutter_texture_new_from_actor
-  (c-name "clutter_texture_new_from_actor")
-  (return-type "ClutterActor*")
+(define-function clutter_threads_add_idle
+  (c-name "clutter_threads_add_idle")
+  (return-type "guint")
   (parameters
-    '("ClutterActor*" "actor")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-method set_from_file
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_file")
-  (return-type "gboolean")
+(define-function clutter_threads_add_idle_full
+  (c-name "clutter_threads_add_idle_full")
+  (return-type "guint")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("gint" "priority")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method set_from_rgb_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_rgb_data")
-  (return-type "gboolean")
+(define-function clutter_threads_add_timeout
+  (c-name "clutter_threads_add_timeout")
+  (return-type "guint")
   (parameters
-    '("const-guchar*" "data")
-    '("gboolean" "has_alpha")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "rowstride")
-    '("gint" "bpp")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-method set_from_yuv_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_yuv_data")
-  (return-type "gboolean")
+(define-function clutter_threads_add_timeout_full
+  (c-name "clutter_threads_add_timeout_full")
+  (return-type "guint")
   (parameters
-    '("const-guchar*" "data")
-    '("gint" "width")
-    '("gint" "height")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method set_area_from_rgb_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_area_from_rgb_data")
-  (return-type "gboolean")
+(define-function clutter_threads_add_frame_source
+  (c-name "clutter_threads_add_frame_source")
+  (return-type "guint")
   (parameters
-    '("const-guchar*" "data")
-    '("gboolean" "has_alpha")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "rowstride")
-    '("gint" "bpp")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-method get_base_size
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_base_size")
-  (return-type "none")
+(define-function clutter_threads_add_frame_source_full
+  (c-name "clutter_threads_add_frame_source_full")
+  (return-type "guint")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method set_filter_quality
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_filter_quality")
+(define-function clutter_set_motion_events_enabled
+  (c-name "clutter_set_motion_events_enabled")
   (return-type "none")
   (parameters
-    '("ClutterTextureQuality" "filter_quality")
+    '("gboolean" "enable")
   )
 )
 
-(define-method get_filter_quality
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_filter_quality")
-  (return-type "ClutterTextureQuality")
+(define-function clutter_get_motion_events_enabled
+  (c-name "clutter_get_motion_events_enabled")
+  (return-type "gboolean")
 )
 
-(define-method set_max_tile_waste
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_max_tile_waste")
+(define-function clutter_set_motion_events_frequency
+  (c-name "clutter_set_motion_events_frequency")
   (return-type "none")
   (parameters
-    '("gint" "max_tile_waste")
+    '("guint" "frequency")
   )
 )
 
-(define-method get_max_tile_waste
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_max_tile_waste")
-  (return-type "gint")
-)
-
-(define-method get_cogl_texture
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_cogl_texture")
-  (return-type "CoglHandle")
+(define-function clutter_get_motion_events_frequency
+  (c-name "clutter_get_motion_events_frequency")
+  (return-type "guint")
 )
 
-(define-method set_cogl_texture
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_cogl_texture")
+(define-function clutter_set_default_frame_rate
+  (c-name "clutter_set_default_frame_rate")
   (return-type "none")
   (parameters
-    '("CoglHandle" "cogl_tex")
+    '("guint" "frames_per_sec")
   )
 )
 
-
-
-;; From clutter-behaviour.h
-
-(define-function clutter_behaviour_get_type
-  (c-name "clutter_behaviour_get_type")
-  (return-type "GType")
+(define-function clutter_get_default_frame_rate
+  (c-name "clutter_get_default_frame_rate")
+  (return-type "guint")
 )
 
-(define-method apply
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_apply")
+(define-function clutter_grab_pointer
+  (c-name "clutter_grab_pointer")
   (return-type "none")
   (parameters
     '("ClutterActor*" "actor")
   )
 )
 
-(define-method remove
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove")
+(define-function clutter_ungrab_pointer
+  (c-name "clutter_ungrab_pointer")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
 )
 
-(define-method remove_all
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove_all")
-  (return-type "none")
+(define-function clutter_get_pointer_grab
+  (c-name "clutter_get_pointer_grab")
+  (return-type "ClutterActor*")
 )
 
-(define-method actors_foreach
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_actors_foreach")
+(define-function clutter_grab_keyboard
+  (c-name "clutter_grab_keyboard")
   (return-type "none")
   (parameters
-    '("ClutterBehaviourForeachFunc" "func")
-    '("gpointer" "data")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_n_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_n_actors")
-  (return-type "gint")
+(define-function clutter_ungrab_keyboard
+  (c-name "clutter_ungrab_keyboard")
+  (return-type "none")
 )
 
-(define-method get_nth_actor
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_nth_actor")
+(define-function clutter_get_keyboard_grab
+  (c-name "clutter_get_keyboard_grab")
   (return-type "ClutterActor*")
+)
+
+(define-function clutter_clear_glyph_cache
+  (c-name "clutter_clear_glyph_cache")
+  (return-type "none")
+)
+
+(define-function clutter_set_font_flags
+  (c-name "clutter_set_font_flags")
+  (return-type "none")
   (parameters
-    '("gint" "index_")
+    '("ClutterFontFlags" "flags")
   )
 )
 
-(define-method get_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_actors")
-  (return-type "GSList*")
+(define-function clutter_get_font_flags
+  (c-name "clutter_get_font_flags")
+  (return-type "ClutterFontFlags")
 )
 
-(define-method get_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_alpha")
-  (return-type "ClutterAlpha*")
+(define-function clutter_get_input_device_for_id
+  (c-name "clutter_get_input_device_for_id")
+  (return-type "ClutterInputDevice*")
+  (parameters
+    '("gint" "id")
+  )
 )
 
-(define-method set_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_set_alpha")
+(define-function clutter_grab_pointer_for_device
+  (c-name "clutter_grab_pointer_for_device")
   (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
+    '("ClutterActor*" "actor")
+    '("gint" "id")
   )
 )
 
-(define-method is_applied
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_is_applied")
-  (return-type "gboolean")
+(define-function clutter_ungrab_pointer_for_device
+  (c-name "clutter_ungrab_pointer_for_device")
+  (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("gint" "id")
   )
 )
 
+(define-function clutter_get_font_map
+  (c-name "clutter_get_font_map")
+  (return-type "PangoFontMap*")
+)
+
+
+
+;; From clutter-marshal.h
+
 
 
 ;; From clutter-media.h
@@ -4226,14 +4358,23 @@
   (c-name "clutter_media_set_uri")
   (return-type "none")
   (parameters
-    '("const-char*" "uri")
+    '("const-gchar*" "uri")
   )
 )
 
 (define-method get_uri
   (of-object "ClutterMedia")
   (c-name "clutter_media_get_uri")
-  (return-type "const-char*")
+  (return-type "gchar*")
+)
+
+(define-method set_filename
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_filename")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "filename")
+  )
 )
 
 (define-method set_playing
@@ -4251,34 +4392,34 @@
   (return-type "gboolean")
 )
 
-(define-method set_position
+(define-method set_progress
   (of-object "ClutterMedia")
-  (c-name "clutter_media_set_position")
+  (c-name "clutter_media_set_progress")
   (return-type "none")
   (parameters
-    '("int" "position")
+    '("gdouble" "progress")
   )
 )
 
-(define-method get_position
+(define-method get_progress
   (of-object "ClutterMedia")
-  (c-name "clutter_media_get_position")
-  (return-type "int")
+  (c-name "clutter_media_get_progress")
+  (return-type "gdouble")
 )
 
-(define-method set_volume
+(define-method set_audio_volume
   (of-object "ClutterMedia")
-  (c-name "clutter_media_set_volume")
+  (c-name "clutter_media_set_audio_volume")
   (return-type "none")
   (parameters
-    '("double" "volume")
+    '("gdouble" "volume")
   )
 )
 
-(define-method get_volume
+(define-method get_audio_volume
   (of-object "ClutterMedia")
-  (c-name "clutter_media_get_volume")
-  (return-type "double")
+  (c-name "clutter_media_get_audio_volume")
+  (return-type "gdouble")
 )
 
 (define-method get_can_seek
@@ -4287,2692 +4428,2695 @@
   (return-type "gboolean")
 )
 
-(define-method get_buffer_percent
+(define-method get_buffer_fill
   (of-object "ClutterMedia")
-  (c-name "clutter_media_get_buffer_percent")
-  (return-type "int")
+  (c-name "clutter_media_get_buffer_fill")
+  (return-type "gdouble")
 )
 
 (define-method get_duration
   (of-object "ClutterMedia")
   (c-name "clutter_media_get_duration")
-  (return-type "int")
-)
-
-(define-method set_filename
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_filename")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "filename")
-  )
+  (return-type "guint")
 )
 
 
 
-;; From clutter-script.h
-
-(define-function clutter_script_error_quark
-  (c-name "clutter_script_error_quark")
-  (return-type "GQuark")
-)
+;; From clutter-model.h
 
-(define-function clutter_script_get_type
-  (c-name "clutter_script_get_type")
+(define-function clutter_model_get_type
+  (c-name "clutter_model_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_script_new
-  (c-name "clutter_script_new")
-  (is-constructor-of "ClutterScript")
-  (return-type "ClutterScript*")
-)
-
-(define-method load_from_file
-  (of-object "ClutterScript")
-  (c-name "clutter_script_load_from_file")
-  (return-type "guint")
-  (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
-  )
-)
-
-(define-method load_from_data
-  (of-object "ClutterScript")
-  (c-name "clutter_script_load_from_data")
-  (return-type "guint")
-  (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_object
-  (of-object "ClutterScript")
-  (c-name "clutter_script_get_object")
-  (return-type "GObject*")
+(define-method set_types
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_types")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("guint" "n_columns")
+    '("GType*" "types")
   )
 )
 
-(define-method get_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_get_objects")
-  (return-type "gint")
+(define-method set_names
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_names")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "first_name")
+    '("guint" "n_columns")
+    '("const-gchar*-const[]" "names")
   )
-  (varargs #t)
-)
-
-(define-method list_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_list_objects")
-  (return-type "GList*")
 )
 
-(define-method unmerge_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_unmerge_objects")
+(define-method append
+  (of-object "ClutterModel")
+  (c-name "clutter_model_append")
   (return-type "none")
   (parameters
-    '("guint" "merge_id")
   )
+  (varargs #t)
 )
 
-(define-method ensure_objects
-  (of-object "ClutterScript")
-  (c-name "clutter_script_ensure_objects")
+(define-method appendv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_appendv")
   (return-type "none")
+  (parameters
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
+  )
 )
 
-(define-method get_type_from_name
-  (of-object "ClutterScript")
-  (c-name "clutter_script_get_type_from_name")
-  (return-type "GType")
+(define-method prepend
+  (of-object "ClutterModel")
+  (c-name "clutter_model_prepend")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "type_name")
   )
+  (varargs #t)
 )
 
-(define-function clutter_get_script_id
-  (c-name "clutter_get_script_id")
-  (return-type "const-gchar*")
+(define-method prependv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_prependv")
+  (return-type "none")
   (parameters
-    '("GObject*" "gobject")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method connect_signals
-  (of-object "ClutterScript")
-  (c-name "clutter_script_connect_signals")
+(define-method insert
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insert")
   (return-type "none")
   (parameters
-    '("gpointer" "user_data")
+    '("guint" "row")
   )
+  (varargs #t)
 )
 
-(define-method connect_signals_full
-  (of-object "ClutterScript")
-  (c-name "clutter_script_connect_signals_full")
+(define-method insertv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insertv")
   (return-type "none")
   (parameters
-    '("ClutterScriptConnectFunc" "func")
-    '("gpointer" "user_data")
+    '("guint" "row")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method add_search_paths
-  (of-object "ClutterScript")
-  (c-name "clutter_script_add_search_paths")
+(define-method insert_value
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insert_value")
   (return-type "none")
   (parameters
-    '("const-gchar*-const[]" "paths")
-    '("gsize" "n_paths")
+    '("guint" "row")
+    '("guint" "column")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method lookup_filename
-  (of-object "ClutterScript")
-  (c-name "clutter_script_lookup_filename")
-  (return-type "gchar*")
+(define-method remove
+  (of-object "ClutterModel")
+  (c-name "clutter_model_remove")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("guint" "row")
   )
 )
 
+(define-method get_n_rows
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_n_rows")
+  (return-type "guint")
+)
 
-
-;; From clutter-behaviour-rotate.h
-
-(define-function clutter_behaviour_rotate_get_type
-  (c-name "clutter_behaviour_rotate_get_type")
-  (return-type "GType")
+(define-method get_n_columns
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_n_columns")
+  (return-type "guint")
 )
 
-(define-function clutter_behaviour_rotate_new
-  (c-name "clutter_behaviour_rotate_new")
-  (is-constructor-of "ClutterBehaviourRotate")
-  (return-type "ClutterBehaviour*")
+(define-method get_column_name
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_column_name")
+  (return-type "const-gchar*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterRotateAxis" "axis")
-    '("ClutterRotateDirection" "direction")
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
+    '("guint" "column")
   )
 )
 
-(define-function clutter_behaviour_rotate_newx
-  (c-name "clutter_behaviour_rotate_newx")
-  (return-type "ClutterBehaviour*")
+(define-method get_column_type
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_column_type")
+  (return-type "GType")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterRotateAxis" "axis")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterFixed" "angle_start")
-    '("ClutterFixed" "angle_end")
+    '("guint" "column")
   )
 )
 
-(define-method get_center
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_center")
-  (return-type "none")
-  (parameters
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "z")
-  )
+(define-method get_first_iter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_first_iter")
+  (return-type "ClutterModelIter*")
 )
 
-(define-method set_center
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_center")
-  (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
-  )
+(define-method get_last_iter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_last_iter")
+  (return-type "ClutterModelIter*")
 )
 
-(define-method get_axis
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_axis")
-  (return-type "ClutterRotateAxis")
+(define-method get_iter_at_row
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_iter_at_row")
+  (return-type "ClutterModelIter*")
+  (parameters
+    '("guint" "row")
+  )
 )
 
-(define-method set_axis
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_axis")
+(define-method set_sorting_column
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_sorting_column")
   (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
+    '("gint" "column")
   )
 )
 
-(define-method get_direction
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_direction")
-  (return-type "ClutterRotateDirection")
+(define-method get_sorting_column
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_sorting_column")
+  (return-type "gint")
 )
 
-(define-method set_direction
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_direction")
+(define-method foreach
+  (of-object "ClutterModel")
+  (c-name "clutter_model_foreach")
   (return-type "none")
   (parameters
-    '("ClutterRotateDirection" "direction")
+    '("ClutterModelForeachFunc" "func")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_bounds")
+(define-method set_sort
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_sort")
   (return-type "none")
   (parameters
-    '("gdouble*" "angle_start")
-    '("gdouble*" "angle_end")
+    '("guint" "column")
+    '("ClutterModelSortFunc" "func")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_bounds")
+(define-method set_filter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_filter")
   (return-type "none")
   (parameters
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
+    '("ClutterModelFilterFunc" "func")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method get_boundsx
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_boundsx")
+(define-method resort
+  (of-object "ClutterModel")
+  (c-name "clutter_model_resort")
   (return-type "none")
+)
+
+(define-method filter_row
+  (of-object "ClutterModel")
+  (c-name "clutter_model_filter_row")
+  (return-type "gboolean")
   (parameters
-    '("ClutterFixed*" "angle_start")
-    '("ClutterFixed*" "angle_end")
+    '("guint" "row")
   )
 )
 
-(define-method set_boundsx
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_boundsx")
-  (return-type "none")
+(define-method filter_iter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_filter_iter")
+  (return-type "gboolean")
   (parameters
-    '("ClutterFixed" "angle_start")
-    '("ClutterFixed" "angle_end")
+    '("ClutterModelIter*" "iter")
   )
 )
 
-
-
-;; From clutter-scriptable.h
-
-(define-function clutter_scriptable_get_type
-  (c-name "clutter_scriptable_get_type")
+(define-function clutter_model_iter_get_type
+  (c-name "clutter_model_iter_get_type")
   (return-type "GType")
 )
 
-(define-method set_id
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_set_id")
+(define-method get
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get")
   (return-type "none")
   (parameters
-    '("const-gchar*" "id")
   )
+  (varargs #t)
 )
 
-(define-method get_id
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_get_id")
-  (return-type "const-gchar*")
-)
-
-(define-method parse_custom_node
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_parse_custom_node")
-  (return-type "gboolean")
+(define-method get_valist
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_valist")
+  (return-type "none")
   (parameters
-    '("ClutterScript*" "script")
-    '("GValue*" "value")
-    '("const-gchar*" "name")
-    '("JsonNode*" "node")
+    '("va_list" "args")
   )
 )
 
-(define-method set_custom_property
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_set_custom_property")
+(define-method get_value
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_value")
   (return-type "none")
   (parameters
-    '("ClutterScript*" "script")
-    '("const-gchar*" "name")
-    '("const-GValue*" "value")
+    '("guint" "column")
+    '("GValue*" "value")
   )
 )
 
-
-
-;; From clutter-behaviour-opacity.h
-
-(define-function clutter_behaviour_opacity_get_type
-  (c-name "clutter_behaviour_opacity_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_behaviour_opacity_new
-  (c-name "clutter_behaviour_opacity_new")
-  (is-constructor-of "ClutterBehaviourOpacity")
-  (return-type "ClutterBehaviour*")
+(define-method set
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_set")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("guint8" "opacity_start")
-    '("guint8" "opacity_end")
   )
+  (varargs #t)
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourOpacity")
-  (c-name "clutter_behaviour_opacity_set_bounds")
+(define-method set_valist
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_set_valist")
   (return-type "none")
   (parameters
-    '("guint8" "opacity_start")
-    '("guint8" "opacity_end")
+    '("va_list" "args")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourOpacity")
-  (c-name "clutter_behaviour_opacity_get_bounds")
+(define-method set_value
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_set_value")
   (return-type "none")
   (parameters
-    '("guint8*" "opacity_start")
-    '("guint8*" "opacity_end")
+    '("guint" "column")
+    '("const-GValue*" "value")
   )
 )
 
+(define-method is_first
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_is_first")
+  (return-type "gboolean")
+)
 
+(define-method is_last
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_is_last")
+  (return-type "gboolean")
+)
 
-;; From clutter.h
+(define-method next
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_next")
+  (return-type "ClutterModelIter*")
+)
 
+(define-method prev
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_prev")
+  (return-type "ClutterModelIter*")
+)
 
+(define-method get_model
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_model")
+  (return-type "ClutterModel*")
+)
 
-;; From clutter-behaviour-path.h
+(define-method get_row
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_get_row")
+  (return-type "guint")
+)
 
-(define-function clutter_behaviour_path_get_type
-  (c-name "clutter_behaviour_path_get_type")
-  (return-type "GType")
+(define-method copy
+  (of-object "ClutterModelIter")
+  (c-name "clutter_model_iter_copy")
+  (return-type "ClutterModelIter*")
 )
 
-(define-function clutter_behaviour_path_new
-  (c-name "clutter_behaviour_path_new")
-  (is-constructor-of "ClutterBehaviourPath")
-  (return-type "ClutterBehaviour*")
+
+
+;; From clutter-model-private.h
+
+(define-method set_n_columns
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_n_columns")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterPath*" "path")
+    '("gint" "n_columns")
+    '("gboolean" "set_types")
+    '("gboolean" "set_names")
   )
 )
 
-(define-function clutter_behaviour_path_new_with_description
-  (c-name "clutter_behaviour_path_new_with_description")
-  (return-type "ClutterBehaviour*")
+(define-function clutter_model_check_type
+  (c-name "clutter_model_check_type")
+  (return-type "gboolean")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-gchar*" "desc")
+    '("GType" "gtype")
   )
 )
 
-(define-function clutter_behaviour_path_new_with_knots
-  (c-name "clutter_behaviour_path_new_with_knots")
-  (return-type "ClutterBehaviour*")
+(define-method set_column_type
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_column_type")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-ClutterKnot*" "knots")
-    '("guint" "n_knots")
+    '("gint" "column")
+    '("GType" "gtype")
   )
 )
 
-(define-method set_path
-  (of-object "ClutterBehaviourPath")
-  (c-name "clutter_behaviour_path_set_path")
+(define-method set_column_name
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_column_name")
   (return-type "none")
   (parameters
-    '("ClutterPath*" "path")
+    '("gint" "column")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_path
-  (of-object "ClutterBehaviourPath")
-  (c-name "clutter_behaviour_path_get_path")
-  (return-type "ClutterPath*")
-)
 
 
+;; From clutter-path.h
 
-;; From clutter-clone-texture.h
+(define-function clutter_path_get_type
+  (c-name "clutter_path_get_type")
+  (return-type "GType")
+)
 
-(define-function clutter_clone_texture_get_type
-  (c-name "clutter_clone_texture_get_type")
+(define-function clutter_path_node_get_type
+  (c-name "clutter_path_node_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_clone_texture_new
-  (c-name "clutter_clone_texture_new")
-  (is-constructor-of "ClutterCloneTexture")
-  (return-type "ClutterActor*")
+(define-function clutter_path_new
+  (c-name "clutter_path_new")
+  (is-constructor-of "ClutterPath")
+  (return-type "ClutterPath*")
+)
+
+(define-function clutter_path_new_with_description
+  (c-name "clutter_path_new_with_description")
+  (return-type "ClutterPath*")
   (parameters
-    '("ClutterTexture*" "texture")
+    '("const-gchar*" "desc")
   )
 )
 
-(define-method get_parent_texture
-  (of-object "ClutterCloneTexture")
-  (c-name "clutter_clone_texture_get_parent_texture")
-  (return-type "ClutterTexture*")
+(define-method add_move_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_move_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
 )
 
-(define-method set_parent_texture
-  (of-object "ClutterCloneTexture")
-  (c-name "clutter_clone_texture_set_parent_texture")
+(define-method add_rel_move_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_rel_move_to")
   (return-type "none")
   (parameters
-    '("ClutterTexture*" "texture")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-
-
-;; From clutter-alpha.h
-
-(define-function clutter_alpha_get_type
-  (c-name "clutter_alpha_get_type")
-  (return-type "GType")
+(define-method add_line_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_line_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
 )
 
-(define-function clutter_alpha_new
-  (c-name "clutter_alpha_new")
-  (is-constructor-of "ClutterAlpha")
-  (return-type "ClutterAlpha*")
+(define-method add_rel_line_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_rel_line_to")
+  (return-type "none")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
 )
 
-(define-function clutter_alpha_new_full
-  (c-name "clutter_alpha_new_full")
-  (return-type "ClutterAlpha*")
+(define-method add_curve_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_curve_to")
+  (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
+    '("gint" "x_1")
+    '("gint" "y_1")
+    '("gint" "x_2")
+    '("gint" "y_2")
+    '("gint" "x_3")
+    '("gint" "y_3")
   )
 )
 
-(define-function clutter_alpha_new_for_mode
-  (c-name "clutter_alpha_new_for_mode")
-  (return-type "ClutterAlpha*")
+(define-method add_rel_curve_to
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_rel_curve_to")
+  (return-type "none")
   (parameters
-    '("ClutterAnimationMode" "mode")
+    '("gint" "x_1")
+    '("gint" "y_1")
+    '("gint" "x_2")
+    '("gint" "y_2")
+    '("gint" "x_3")
+    '("gint" "y_3")
   )
 )
 
-(define-method get_alpha
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_alpha")
-  (return-type "guint32")
+(define-method add_close
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_close")
+  (return-type "none")
 )
 
-(define-method set_func
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_func")
-  (return-type "none")
+(define-method add_string
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_string")
+  (return-type "gboolean")
   (parameters
-    '("ClutterAlphaFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
+    '("const-gchar*" "str")
   )
 )
 
-(define-method set_closure
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_closure")
+(define-method add_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_node")
   (return-type "none")
   (parameters
-    '("GClosure*" "closure")
+    '("const-ClutterPathNode*" "node")
   )
 )
 
-(define-method set_timeline
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_timeline")
+(define-method add_cairo_path
+  (of-object "ClutterPath")
+  (c-name "clutter_path_add_cairo_path")
   (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
+    '("const-cairo_path_t*" "cpath")
   )
 )
 
-(define-method get_timeline
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-method get_n_nodes
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_n_nodes")
+  (return-type "guint")
 )
 
-(define-method set_mode
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_mode")
+(define-method get_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_node")
   (return-type "none")
   (parameters
-    '("ClutterAnimationMode" "mode")
+    '("guint" "index_")
+    '("ClutterPathNode*" "node")
   )
 )
 
-(define-method get_mode
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_mode")
-  (return-type "ClutterAnimationMode")
+(define-method get_nodes
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_nodes")
+  (return-type "GSList*")
 )
 
-(define-function clutter_ramp_inc_func
-  (c-name "clutter_ramp_inc_func")
-  (return-type "guint32")
+(define-method foreach
+  (of-object "ClutterPath")
+  (c-name "clutter_path_foreach")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterPathCallback" "callback")
+    '("gpointer" "user_data")
   )
 )
 
-(define-function clutter_ramp_dec_func
-  (c-name "clutter_ramp_dec_func")
-  (return-type "guint32")
+(define-method insert_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_insert_node")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("gint" "index_")
+    '("const-ClutterPathNode*" "node")
   )
 )
 
-(define-function clutter_ramp_func
-  (c-name "clutter_ramp_func")
-  (return-type "guint32")
+(define-method remove_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_remove_node")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("guint" "index_")
   )
 )
 
-(define-function clutter_sine_func
-  (c-name "clutter_sine_func")
-  (return-type "guint32")
+(define-method replace_node
+  (of-object "ClutterPath")
+  (c-name "clutter_path_replace_node")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("guint" "index_")
+    '("const-ClutterPathNode*" "node")
   )
 )
 
-(define-function clutter_sine_inc_func
-  (c-name "clutter_sine_inc_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-method get_description
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_description")
+  (return-type "gchar*")
 )
 
-(define-function clutter_sine_dec_func
-  (c-name "clutter_sine_dec_func")
-  (return-type "guint32")
+(define-method set_description
+  (of-object "ClutterPath")
+  (c-name "clutter_path_set_description")
+  (return-type "gboolean")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("const-gchar*" "str")
   )
 )
 
-(define-function clutter_sine_half_func
-  (c-name "clutter_sine_half_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-method clear
+  (of-object "ClutterPath")
+  (c-name "clutter_path_clear")
+  (return-type "none")
 )
 
-(define-function clutter_sine_in_func
-  (c-name "clutter_sine_in_func")
-  (return-type "guint32")
+(define-method to_cairo_path
+  (of-object "ClutterPath")
+  (c-name "clutter_path_to_cairo_path")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("cairo_t*" "cr")
   )
 )
 
-(define-function clutter_sine_out_func
-  (c-name "clutter_sine_out_func")
-  (return-type "guint32")
+(define-method get_position
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_position")
+  (return-type "guint")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("gdouble" "progress")
+    '("ClutterKnot*" "position")
   )
 )
 
-(define-function clutter_sine_in_out_func
-  (c-name "clutter_sine_in_out_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-method get_length
+  (of-object "ClutterPath")
+  (c-name "clutter_path_get_length")
+  (return-type "guint")
 )
 
-(define-function clutter_square_func
-  (c-name "clutter_square_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-method copy
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_copy")
+  (return-type "ClutterPathNode*")
 )
 
-(define-function clutter_smoothstep_inc_func
-  (c-name "clutter_smoothstep_inc_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+(define-method free
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_free")
+  (return-type "none")
 )
 
-(define-function clutter_smoothstep_dec_func
-  (c-name "clutter_smoothstep_dec_func")
-  (return-type "guint32")
+(define-method equal
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_equal")
+  (return-type "gboolean")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("const-ClutterPathNode*" "node_b")
   )
 )
 
-(define-function clutter_exp_inc_func
-  (c-name "clutter_exp_inc_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+
+
+;; From clutter-private.h
+
+(define-function clutter_context_get_default
+  (c-name "clutter_context_get_default")
+  (return-type "ClutterMainContext*")
 )
 
-(define-function clutter_exp_dec_func
-  (c-name "clutter_exp_dec_func")
-  (return-type "guint32")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
-  )
+
+
+;; From clutter-rectangle.h
+
+(define-function clutter_rectangle_get_type
+  (c-name "clutter_rectangle_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_ease_in_func
-  (c-name "clutter_ease_in_func")
-  (return-type "guint32")
+(define-function clutter_rectangle_new
+  (c-name "clutter_rectangle_new")
+  (is-constructor-of "ClutterRectangle")
+  (return-type "ClutterActor*")
+)
+
+(define-function clutter_rectangle_new_with_color
+  (c-name "clutter_rectangle_new_with_color")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-function clutter_ease_out_func
-  (c-name "clutter_ease_out_func")
-  (return-type "guint32")
+(define-method get_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_color")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-function clutter_ease_in_out_func
-  (c-name "clutter_ease_in_out_func")
-  (return-type "guint32")
+(define-method set_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_color")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-function clutter_exp_in_func
-  (c-name "clutter_exp_in_func")
-  (return-type "guint32")
+(define-method get_border_width
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_border_width")
+  (return-type "guint")
+)
+
+(define-method set_border_width
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_border_width")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("guint" "width")
   )
 )
 
-(define-function clutter_exp_out_func
-  (c-name "clutter_exp_out_func")
-  (return-type "guint32")
+(define-method get_border_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_border_color")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-function clutter_exp_in_out_func
-  (c-name "clutter_exp_in_out_func")
-  (return-type "guint32")
+(define-method set_border_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_border_color")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gpointer" "dummy")
+    '("const-ClutterColor*" "color")
   )
 )
 
 
 
-;; From clutter-deprecated.h
-
-
-
-;; From clutter-actor.h
-
-(define-function clutter_actor_box_get_type
-  (c-name "clutter_actor_box_get_type")
-  (return-type "GType")
-)
+;; From clutter-score.h
 
-(define-function clutter_actor_get_type
-  (c-name "clutter_actor_get_type")
+(define-function clutter_score_get_type
+  (c-name "clutter_score_get_type")
   (return-type "GType")
 )
 
-(define-method show
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_show")
-  (return-type "none")
+(define-function clutter_score_new
+  (c-name "clutter_score_new")
+  (is-constructor-of "ClutterScore")
+  (return-type "ClutterScore*")
 )
 
-(define-method show_all
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_show_all")
+(define-method set_loop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_set_loop")
   (return-type "none")
+  (parameters
+    '("gboolean" "loop")
+  )
 )
 
-(define-method hide
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_hide")
-  (return-type "none")
+(define-method get_loop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_get_loop")
+  (return-type "gboolean")
 )
 
-(define-method hide_all
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_hide_all")
-  (return-type "none")
+(define-method append
+  (of-object "ClutterScore")
+  (c-name "clutter_score_append")
+  (return-type "gulong")
+  (parameters
+    '("ClutterTimeline*" "parent")
+    '("ClutterTimeline*" "timeline")
+  )
 )
 
-(define-method realize
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_realize")
-  (return-type "none")
+(define-method append_at_marker
+  (of-object "ClutterScore")
+  (c-name "clutter_score_append_at_marker")
+  (return-type "gulong")
+  (parameters
+    '("ClutterTimeline*" "parent")
+    '("const-gchar*" "marker_name")
+    '("ClutterTimeline*" "timeline")
+  )
 )
 
-(define-method unrealize
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_unrealize")
+(define-method remove
+  (of-object "ClutterScore")
+  (c-name "clutter_score_remove")
   (return-type "none")
+  (parameters
+    '("gulong" "id")
+  )
 )
 
-(define-method paint
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_paint")
+(define-method remove_all
+  (of-object "ClutterScore")
+  (c-name "clutter_score_remove_all")
   (return-type "none")
 )
 
-(define-method pick
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_pick")
-  (return-type "none")
+(define-method get_timeline
+  (of-object "ClutterScore")
+  (c-name "clutter_score_get_timeline")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("gulong" "id")
   )
 )
 
-(define-method queue_redraw
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_queue_redraw")
-  (return-type "none")
+(define-method list_timelines
+  (of-object "ClutterScore")
+  (c-name "clutter_score_list_timelines")
+  (return-type "GSList*")
 )
 
-(define-method queue_relayout
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_queue_relayout")
+(define-method start
+  (of-object "ClutterScore")
+  (c-name "clutter_score_start")
   (return-type "none")
 )
 
-(define-method destroy
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_destroy")
+(define-method stop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_stop")
   (return-type "none")
 )
 
-(define-method get_preferred_width
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_preferred_width")
+(define-method pause
+  (of-object "ClutterScore")
+  (c-name "clutter_score_pause")
   (return-type "none")
-  (parameters
-    '("ClutterUnit" "for_height")
-    '("ClutterUnit*" "min_width_p")
-    '("ClutterUnit*" "natural_width_p")
-  )
 )
 
-(define-method get_preferred_height
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_preferred_height")
+(define-method rewind
+  (of-object "ClutterScore")
+  (c-name "clutter_score_rewind")
   (return-type "none")
-  (parameters
-    '("ClutterUnit" "for_width")
-    '("ClutterUnit*" "min_height_p")
-    '("ClutterUnit*" "natural_height_p")
-  )
 )
 
-(define-method get_preferred_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_preferred_size")
-  (return-type "none")
-  (parameters
-    '("ClutterUnit*" "min_width_p")
-    '("ClutterUnit*" "min_height_p")
-    '("ClutterUnit*" "natural_width_p")
-    '("ClutterUnit*" "natural_height_p")
-  )
+(define-method is_playing
+  (of-object "ClutterScore")
+  (c-name "clutter_score_is_playing")
+  (return-type "gboolean")
 )
 
-(define-method allocate
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_allocate")
-  (return-type "none")
-  (parameters
-    '("const-ClutterActorBox*" "box")
-    '("gboolean" "absolute_origin_changed")
-  )
+
+
+;; From clutter-scriptable.h
+
+(define-function clutter_scriptable_get_type
+  (c-name "clutter_scriptable_get_type")
+  (return-type "GType")
 )
 
-(define-method allocate_preferred_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_allocate_preferred_size")
+(define-method set_id
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_set_id")
   (return-type "none")
   (parameters
-    '("gboolean" "absolute_origin_changed")
+    '("const-gchar*" "id")
   )
 )
 
-(define-method get_allocation_coords
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_coords")
-  (return-type "none")
-  (parameters
-    '("gint*" "x_1")
-    '("gint*" "y_1")
-    '("gint*" "x_2")
-    '("gint*" "y_2")
-  )
+(define-method get_id
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_get_id")
+  (return-type "const-gchar*")
 )
 
-(define-method get_allocation_box
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_box")
-  (return-type "none")
+(define-method parse_custom_node
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_parse_custom_node")
+  (return-type "gboolean")
   (parameters
-    '("ClutterActorBox*" "box")
+    '("ClutterScript*" "script")
+    '("GValue*" "value")
+    '("const-gchar*" "name")
+    '("JsonNode*" "node")
   )
 )
 
-(define-method get_allocation_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_geometry")
+(define-method set_custom_property
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_set_custom_property")
   (return-type "none")
   (parameters
-    '("ClutterGeometry*" "geom")
+    '("ClutterScript*" "script")
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_allocation_vertices
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_vertices")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "ancestor")
-    '("ClutterVertex" "verts[4]")
-  )
+
+
+;; From clutter-script.h
+
+(define-function clutter_script_error_quark
+  (c-name "clutter_script_error_quark")
+  (return-type "GQuark")
 )
 
-(define-method set_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_geometry")
-  (return-type "none")
-  (parameters
-    '("const-ClutterGeometry*" "geometry")
-  )
+(define-function clutter_script_get_type
+  (c-name "clutter_script_get_type")
+  (return-type "GType")
 )
 
-(define-method get_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_geometry")
-  (return-type "none")
-  (parameters
-    '("ClutterGeometry*" "geometry")
-  )
+(define-function clutter_script_new
+  (c-name "clutter_script_new")
+  (is-constructor-of "ClutterScript")
+  (return-type "ClutterScript*")
 )
 
-(define-method set_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_size")
-  (return-type "none")
+(define-method load_from_file
+  (of-object "ClutterScript")
+  (c-name "clutter_script_load_from_file")
+  (return-type "guint")
   (parameters
-    '("gint" "width")
-    '("gint" "height")
+    '("const-gchar*" "filename")
+    '("GError**" "error")
   )
 )
 
-(define-method set_sizeu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_sizeu")
-  (return-type "none")
+(define-method load_from_data
+  (of-object "ClutterScript")
+  (c-name "clutter_script_load_from_data")
+  (return-type "guint")
   (parameters
-    '("ClutterUnit" "width")
-    '("ClutterUnit" "height")
+    '("const-gchar*" "data")
+    '("gssize" "length")
+    '("GError**" "error")
   )
 )
 
-(define-method get_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_size")
-  (return-type "none")
+(define-method get_object
+  (of-object "ClutterScript")
+  (c-name "clutter_script_get_object")
+  (return-type "GObject*")
   (parameters
-    '("guint*" "width")
-    '("guint*" "height")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_sizeu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_sizeu")
-  (return-type "none")
+(define-method get_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_get_objects")
+  (return-type "gint")
   (parameters
-    '("ClutterUnit*" "width")
-    '("ClutterUnit*" "height")
+    '("const-gchar*" "first_name")
   )
+  (varargs #t)
 )
 
-(define-method get_transformed_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_size")
-  (return-type "none")
-  (parameters
-    '("guint*" "width")
-    '("guint*" "height")
-  )
+(define-method list_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_list_objects")
+  (return-type "GList*")
 )
 
-(define-method get_transformed_sizeu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_sizeu")
+(define-method unmerge_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_unmerge_objects")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "width")
-    '("ClutterUnit*" "height")
+    '("guint" "merge_id")
   )
 )
 
-(define-method set_position
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_position")
+(define-method ensure_objects
+  (of-object "ClutterScript")
+  (c-name "clutter_script_ensure_objects")
   (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
 )
 
-(define-method set_positionu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_positionu")
-  (return-type "none")
+(define-method get_type_from_name
+  (of-object "ClutterScript")
+  (c-name "clutter_script_get_type_from_name")
+  (return-type "GType")
   (parameters
-    '("ClutterUnit" "x")
-    '("ClutterUnit" "y")
+    '("const-gchar*" "type_name")
   )
 )
 
-(define-method get_position
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_position")
-  (return-type "none")
+(define-function clutter_get_script_id
+  (c-name "clutter_get_script_id")
+  (return-type "const-gchar*")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("GObject*" "gobject")
   )
 )
 
-(define-method get_positionu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_positionu")
+(define-method connect_signals
+  (of-object "ClutterScript")
+  (c-name "clutter_script_connect_signals")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "x")
-    '("ClutterUnit*" "y")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method get_transformed_position
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_position")
+(define-method connect_signals_full
+  (of-object "ClutterScript")
+  (c-name "clutter_script_connect_signals_full")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("ClutterScriptConnectFunc" "func")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method get_transformed_positionu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformed_positionu")
+(define-method add_search_paths
+  (of-object "ClutterScript")
+  (c-name "clutter_script_add_search_paths")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "x")
-    '("ClutterUnit*" "y")
+    '("const-gchar*-const[]" "paths")
+    '("gsize" "n_paths")
   )
 )
 
-(define-method get_fixed_position_set
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_fixed_position_set")
-  (return-type "gboolean")
-)
-
-(define-method set_fixed_position_set
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_fixed_position_set")
-  (return-type "none")
+(define-method lookup_filename
+  (of-object "ClutterScript")
+  (c-name "clutter_script_lookup_filename")
+  (return-type "gchar*")
   (parameters
-    '("gboolean" "is_set")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method get_width
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_width")
-  (return-type "guint")
-)
-
-(define-method get_widthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_widthu")
-  (return-type "ClutterUnit")
-)
 
-(define-method get_height
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_height")
-  (return-type "guint")
-)
 
-(define-method get_heightu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_heightu")
-  (return-type "ClutterUnit")
-)
+;; From clutter-script-private.h
 
-(define-method set_width
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_width")
+(define-function object_info_free
+  (c-name "object_info_free")
   (return-type "none")
   (parameters
-    '("guint" "width")
+    '("gpointer" "data")
   )
 )
 
-(define-method set_widthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_widthu")
+(define-function property_info_free
+  (c-name "property_info_free")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "width")
+    '("gpointer" "data")
   )
 )
 
-(define-method set_height
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_height")
-  (return-type "none")
+(define-method parse_node
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_node")
+  (return-type "gboolean")
   (parameters
-    '("guint" "height")
+    '("GValue*" "value")
+    '("const-gchar*" "name")
+    '("JsonNode*" "node")
+    '("GParamSpec*" "pspec")
   )
 )
 
-(define-method set_heightu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_heightu")
-  (return-type "none")
+(define-function clutter_script_get_type_from_symbol
+  (c-name "clutter_script_get_type_from_symbol")
+  (return-type "GType")
   (parameters
-    '("ClutterUnit" "height")
+    '("const-gchar*" "symbol")
   )
 )
 
-(define-method get_x
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_x")
-  (return-type "gint")
-)
-
-(define-method get_xu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_xu")
-  (return-type "ClutterUnit")
-)
-
-(define-method get_y
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_y")
-  (return-type "gint")
-)
-
-(define-method get_yu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_yu")
-  (return-type "ClutterUnit")
+(define-function clutter_script_get_type_from_class
+  (c-name "clutter_script_get_type_from_class")
+  (return-type "GType")
+  (parameters
+    '("const-gchar*" "name")
+  )
 )
 
-(define-method set_x
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_x")
-  (return-type "none")
+(define-method construct_object
+  (of-object "ClutterScript")
+  (c-name "clutter_script_construct_object")
+  (return-type "GObject*")
   (parameters
-    '("gint" "x")
+    '("ObjectInfo*" "info")
   )
 )
 
-(define-method set_xu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_xu")
-  (return-type "none")
+(define-function clutter_script_enum_from_string
+  (c-name "clutter_script_enum_from_string")
+  (return-type "gboolean")
   (parameters
-    '("ClutterUnit" "x")
+    '("GType" "gtype")
+    '("const-gchar*" "string")
+    '("gint*" "enum_value")
   )
 )
 
-(define-method set_y
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_y")
-  (return-type "none")
+(define-function clutter_script_flags_from_string
+  (c-name "clutter_script_flags_from_string")
+  (return-type "gboolean")
   (parameters
-    '("gint" "y")
+    '("GType" "gtype")
+    '("const-gchar*" "string")
+    '("gint*" "flags_value")
   )
 )
 
-(define-method set_yu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_yu")
-  (return-type "none")
+(define-method parse_knot
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_knot")
+  (return-type "gboolean")
   (parameters
-    '("ClutterUnit" "y")
+    '("JsonNode*" "node")
+    '("ClutterKnot*" "knot")
   )
 )
 
-(define-method set_rotation
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_rotation")
-  (return-type "none")
+(define-method parse_geometry
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_geometry")
+  (return-type "gboolean")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
+    '("JsonNode*" "node")
+    '("ClutterGeometry*" "geometry")
   )
 )
 
-(define-method set_rotationx
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_rotationx")
-  (return-type "none")
+(define-method parse_color
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_color")
+  (return-type "gboolean")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("ClutterFixed" "angle")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
+    '("JsonNode*" "node")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-method set_rotationu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_rotationu")
-  (return-type "none")
+(define-method parse_alpha
+  (of-object "ClutterScript")
+  (c-name "clutter_script_parse_alpha")
+  (return-type "GObject*")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle")
-    '("ClutterUnit" "x")
-    '("ClutterUnit" "y")
-    '("ClutterUnit" "z")
+    '("JsonNode*" "node")
   )
 )
 
-(define-method get_rotation
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_rotation")
-  (return-type "gdouble")
+
+
+;; From clutter-shader.h
+
+(define-function clutter_shader_error_quark
+  (c-name "clutter_shader_error_quark")
+  (return-type "GQuark")
+)
+
+(define-function clutter_shader_get_type
+  (c-name "clutter_shader_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_shader_new
+  (c-name "clutter_shader_new")
+  (is-constructor-of "ClutterShader")
+  (return-type "ClutterShader*")
+)
+
+(define-method set_is_enabled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_is_enabled")
+  (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "z")
+    '("gboolean" "enabled")
   )
 )
 
-(define-method get_rotationx
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_rotationx")
-  (return-type "ClutterFixed")
-  (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "z")
-  )
+(define-method get_is_enabled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_is_enabled")
+  (return-type "gboolean")
 )
 
-(define-method get_rotationu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_rotationu")
-  (return-type "gdouble")
+(define-method compile
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_compile")
+  (return-type "gboolean")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("ClutterUnit*" "x")
-    '("ClutterUnit*" "y")
-    '("ClutterUnit*" "z")
+    '("GError**" "error")
   )
 )
 
-(define-method set_opacity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_opacity")
+(define-method release
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_release")
+  (return-type "none")
+)
+
+(define-method is_compiled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_is_compiled")
+  (return-type "gboolean")
+)
+
+(define-method set_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_vertex_source")
   (return-type "none")
   (parameters
-    '("guint8" "opacity")
+    '("const-gchar*" "data")
+    '("gssize" "length")
   )
 )
 
-(define-method get_opacity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_opacity")
-  (return-type "guint8")
+(define-method set_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_fragment_source")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "data")
+    '("gssize" "length")
+  )
 )
 
-(define-method get_paint_opacity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_paint_opacity")
-  (return-type "guint8")
+(define-method get_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_vertex_source")
+  (return-type "const-gchar*")
 )
 
-(define-method get_paint_visibility
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_paint_visibility")
-  (return-type "gboolean")
+(define-method get_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_fragment_source")
+  (return-type "const-gchar*")
 )
 
-(define-method set_name
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_name")
+(define-method set_uniform
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_uniform")
   (return-type "none")
   (parameters
     '("const-gchar*" "name")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_name
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_name")
-  (return-type "const-gchar*")
+(define-method get_cogl_program
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_program")
+  (return-type "CoglHandle")
 )
 
-(define-method get_gid
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_gid")
-  (return-type "guint32")
+(define-method get_cogl_fragment_shader
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_fragment_shader")
+  (return-type "CoglHandle")
 )
 
-(define-method set_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_clip")
-  (return-type "none")
-  (parameters
-    '("gint" "xoff")
-    '("gint" "yoff")
-    '("gint" "width")
-    '("gint" "height")
-  )
+(define-method get_cogl_vertex_shader
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_vertex_shader")
+  (return-type "CoglHandle")
 )
 
-(define-method set_clipu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_clipu")
+(define-method set_uniform_1f
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_uniform_1f")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "xoff")
-    '("ClutterUnit" "yoff")
-    '("ClutterUnit" "width")
-    '("ClutterUnit" "height")
+    '("const-gchar*" "name")
+    '("gfloat" "value")
   )
 )
 
-(define-method remove_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_remove_clip")
-  (return-type "none")
+
+
+;; From clutter-shader-types.h
+
+(define-function clutter_shader_float_get_type
+  (c-name "clutter_shader_float_get_type")
+  (return-type "GType")
 )
 
-(define-method has_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_has_clip")
-  (return-type "gboolean")
+(define-function clutter_shader_int_get_type
+  (c-name "clutter_shader_int_get_type")
+  (return-type "GType")
 )
 
-(define-method get_clip
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_clip")
-  (return-type "none")
-  (parameters
-    '("gint*" "xoff")
-    '("gint*" "yoff")
-    '("gint*" "width")
-    '("gint*" "height")
-  )
+(define-function clutter_shader_matrix_get_type
+  (c-name "clutter_shader_matrix_get_type")
+  (return-type "GType")
 )
 
-(define-method get_clipu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_clipu")
+(define-function clutter_value_set_shader_float
+  (c-name "clutter_value_set_shader_float")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "xoff")
-    '("ClutterUnit*" "yoff")
-    '("ClutterUnit*" "width")
-    '("ClutterUnit*" "height")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gfloat*" "floats")
   )
 )
 
-(define-method set_parent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_parent")
+(define-function clutter_value_set_shader_int
+  (c-name "clutter_value_set_shader_int")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "parent")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gint*" "ints")
   )
 )
 
-(define-method get_parent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_parent")
-  (return-type "ClutterActor*")
-)
-
-(define-method reparent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_reparent")
+(define-function clutter_value_set_shader_matrix
+  (c-name "clutter_value_set_shader_matrix")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "new_parent")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gfloat*" "matrix")
   )
 )
 
-(define-method unparent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_unparent")
-  (return-type "none")
-)
-
-(define-method get_stage
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_stage")
-  (return-type "ClutterActor*")
+(define-function clutter_value_get_shader_float
+  (c-name "clutter_value_get_shader_float")
+  (return-type "const-gfloat*")
+  (parameters
+    '("const-GValue*" "value")
+    '("gsize*" "length")
+  )
 )
 
-(define-method raise
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_raise")
-  (return-type "none")
+(define-function clutter_value_get_shader_int
+  (c-name "clutter_value_get_shader_int")
+  (return-type "const-COGLint*")
   (parameters
-    '("ClutterActor*" "below")
+    '("const-GValue*" "value")
+    '("gsize*" "length")
   )
 )
 
-(define-method lower
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_lower")
-  (return-type "none")
+(define-function clutter_value_get_shader_matrix
+  (c-name "clutter_value_get_shader_matrix")
+  (return-type "const-GLfloat*")
   (parameters
-    '("ClutterActor*" "above")
+    '("const-GValue*" "value")
+    '("gsize*" "length")
   )
 )
 
-(define-method raise_top
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_raise_top")
-  (return-type "none")
+
+
+;; From clutter-stage.h
+
+(define-function clutter_perspective_get_type
+  (c-name "clutter_perspective_get_type")
+  (return-type "GType")
 )
 
-(define-method lower_bottom
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_lower_bottom")
-  (return-type "none")
+(define-function clutter_fog_get_type
+  (c-name "clutter_fog_get_type")
+  (return-type "GType")
 )
 
-(define-method set_depth
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_depth")
-  (return-type "none")
-  (parameters
-    '("gint" "depth")
-  )
+(define-function clutter_stage_get_type
+  (c-name "clutter_stage_get_type")
+  (return-type "GType")
 )
 
-(define-method get_depth
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_depth")
-  (return-type "gint")
+(define-function clutter_stage_get_default
+  (c-name "clutter_stage_get_default")
+  (return-type "ClutterActor*")
 )
 
-(define-method set_depthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_depthu")
+(define-function clutter_stage_new
+  (c-name "clutter_stage_new")
+  (is-constructor-of "ClutterStage")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_color
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_color")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "depth")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_depthu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_depthu")
-  (return-type "ClutterUnit")
-)
-
-(define-method set_scalex
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scalex")
+(define-method get_color
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_color")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "scale_x")
-    '("ClutterFixed" "scale_y")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-method set_scale
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scale")
+(define-method set_perspectivex
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_perspectivex")
   (return-type "none")
   (parameters
-    '("gdouble" "scale_x")
-    '("gdouble" "scale_y")
+    '("ClutterPerspective*" "perspective")
   )
 )
 
-(define-method get_scalex
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_scalex")
+(define-method get_perspectivex
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_perspectivex")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "scale_x")
-    '("ClutterFixed*" "scale_y")
+    '("ClutterPerspective*" "perspective")
   )
 )
 
-(define-method get_scale
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_scale")
+(define-method set_perspective
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_perspective")
   (return-type "none")
   (parameters
-    '("gdouble*" "scale_x")
-    '("gdouble*" "scale_y")
+    '("gfloat" "fovy")
+    '("gfloat" "aspect")
+    '("gfloat" "z_near")
+    '("gfloat" "z_far")
   )
 )
 
-(define-method move_by
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_by")
+(define-method get_perspective
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_perspective")
   (return-type "none")
   (parameters
-    '("gint" "dx")
-    '("gint" "dy")
+    '("gfloat*" "fovy")
+    '("gfloat*" "aspect")
+    '("gfloat*" "z_near")
+    '("gfloat*" "z_far")
   )
 )
 
-(define-method move_byu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_byu")
+(define-method fullscreen
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_fullscreen")
   (return-type "none")
-  (parameters
-    '("ClutterUnit" "dx")
-    '("ClutterUnit" "dy")
-  )
 )
 
-(define-method set_reactive
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_reactive")
+(define-method unfullscreen
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_unfullscreen")
   (return-type "none")
-  (parameters
-    '("gboolean" "reactive")
-  )
 )
 
-(define-method get_reactive
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_reactive")
-  (return-type "gboolean")
+(define-method show_cursor
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_show_cursor")
+  (return-type "none")
 )
 
-(define-method event
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_event")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterEvent*" "event")
-    '("gboolean" "capture")
-  )
+(define-method hide_cursor
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_hide_cursor")
+  (return-type "none")
 )
 
-(define-function clutter_get_actor_by_gid
-  (c-name "clutter_get_actor_by_gid")
+(define-method get_actor_at_pos
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_actor_at_pos")
   (return-type "ClutterActor*")
   (parameters
-    '("guint32" "id")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method set_shader
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader")
-  (return-type "gboolean")
+(define-method read_pixels
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_read_pixels")
+  (return-type "guchar*")
   (parameters
-    '("ClutterShader*" "shader")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-method get_shader
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_shader")
-  (return-type "ClutterShader*")
-)
-
-(define-method set_shader_param
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param")
-  (return-type "none")
+(define-method event
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_event")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "param")
-    '("const-GValue*" "value")
+    '("ClutterEvent*" "event")
   )
 )
 
-(define-method set_shader_param_int
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param_int")
+(define-method set_title
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_title")
   (return-type "none")
   (parameters
-    '("const-gchar*" "param")
-    '("gint" "value")
+    '("const-gchar*" "title")
   )
 )
 
-(define-method set_shader_param_float
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param_float")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "param")
-    '("gfloat" "value")
-  )
+(define-method get_title
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_title")
+  (return-type "const-gchar*")
 )
 
-(define-method set_anchor_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_point")
+(define-method set_user_resizable
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_user_resizable")
   (return-type "none")
   (parameters
-    '("gint" "anchor_x")
-    '("gint" "anchor_y")
+    '("gboolean" "resizable")
   )
 )
 
-(define-method move_anchor_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_point")
-  (return-type "none")
-  (parameters
-    '("gint" "anchor_x")
-    '("gint" "anchor_y")
-  )
+(define-method get_user_resizable
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_user_resizable")
+  (return-type "gboolean")
 )
 
-(define-method get_anchor_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_anchor_point")
+(define-method set_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_use_fog")
   (return-type "none")
   (parameters
-    '("gint*" "anchor_x")
-    '("gint*" "anchor_y")
+    '("gboolean" "fog")
   )
 )
 
-(define-method set_anchor_pointu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_pointu")
-  (return-type "none")
-  (parameters
-    '("ClutterUnit" "anchor_x")
-    '("ClutterUnit" "anchor_y")
-  )
+(define-method get_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_use_fog")
+  (return-type "gboolean")
 )
 
-(define-method move_anchor_pointu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_pointu")
+(define-method set_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_fog")
   (return-type "none")
   (parameters
-    '("ClutterUnit" "anchor_x")
-    '("ClutterUnit" "anchor_y")
+    '("gdouble" "density")
+    '("gdouble" "z_near")
+    '("gdouble" "z_far")
   )
 )
 
-(define-method get_anchor_pointu
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_anchor_pointu")
+(define-method get_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_fog")
   (return-type "none")
   (parameters
-    '("ClutterUnit*" "anchor_x")
-    '("ClutterUnit*" "anchor_y")
+    '("gdouble*" "density")
+    '("gdouble*" "z_near")
+    '("gdouble*" "z_far")
   )
 )
 
-(define-method set_anchor_point_from_gravity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_point_from_gravity")
+(define-method set_fogx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_fogx")
   (return-type "none")
   (parameters
-    '("ClutterGravity" "gravity")
+    '("ClutterFog*" "fog")
   )
 )
 
-(define-method move_anchor_point_from_gravity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_point_from_gravity")
+(define-method get_fogx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_fogx")
   (return-type "none")
   (parameters
-    '("ClutterGravity" "gravity")
+    '("ClutterFog*" "fog")
   )
 )
 
-(define-method transform_stage_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_transform_stage_point")
-  (return-type "gboolean")
+(define-method set_key_focus
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_key_focus")
+  (return-type "none")
   (parameters
-    '("ClutterUnit" "x")
-    '("ClutterUnit" "y")
-    '("ClutterUnit*" "x_out")
-    '("ClutterUnit*" "y_out")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method is_rotated
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_is_rotated")
-  (return-type "gboolean")
+(define-method get_key_focus
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_key_focus")
+  (return-type "ClutterActor*")
 )
 
-(define-method is_scaled
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_is_scaled")
-  (return-type "gboolean")
+(define-method ensure_current
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_ensure_current")
+  (return-type "none")
 )
 
-(define-method should_pick_paint
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_should_pick_paint")
+(define-method queue_redraw
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_queue_redraw")
+  (return-type "none")
+)
+
+(define-method is_default
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_is_default")
   (return-type "gboolean")
 )
 
-(define-function clutter_actor_box_get_from_vertices
-  (c-name "clutter_actor_box_get_from_vertices")
+(define-method ensure_viewport
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_ensure_viewport")
   (return-type "none")
-  (parameters
-    '("ClutterVertex" "vtx[4]")
-    '("ClutterActorBox*" "box")
-  )
 )
 
-(define-method get_abs_allocation_vertices
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_abs_allocation_vertices")
-  (return-type "none")
-  (parameters
-    '("ClutterVertex" "verts[4]")
-  )
+
+
+;; From clutter-stage-manager.h
+
+(define-function clutter_stage_manager_get_type
+  (c-name "clutter_stage_manager_get_type")
+  (return-type "GType")
 )
 
-(define-method apply_transform_to_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_apply_transform_to_point")
-  (return-type "none")
-  (parameters
-    '("const-ClutterVertex*" "point")
-    '("ClutterVertex*" "vertex")
-  )
+(define-function clutter_stage_manager_get_default
+  (c-name "clutter_stage_manager_get_default")
+  (return-type "ClutterStageManager*")
 )
 
-(define-method apply_relative_transform_to_point
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_apply_relative_transform_to_point")
+(define-method set_default_stage
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_set_default_stage")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "ancestor")
-    '("const-ClutterVertex*" "point")
-    '("ClutterVertex*" "vertex")
+    '("ClutterStage*" "stage")
   )
 )
 
-(define-method grab_key_focus
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_grab_key_focus")
-  (return-type "none")
+(define-method get_default_stage
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_get_default_stage")
+  (return-type "ClutterStage*")
 )
 
-(define-method get_pango_context
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_pango_context")
-  (return-type "PangoContext*")
+(define-method list_stages
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_list_stages")
+  (return-type "GSList*")
 )
 
-(define-method create_pango_context
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_create_pango_context")
-  (return-type "PangoContext*")
-)
 
 
+;; From clutter-stage-window.h
 
-;; From clutter-keysyms.h
+(define-function clutter_stage_window_get_type
+  (c-name "clutter_stage_window_get_type")
+  (return-type "GType")
+)
 
 
 
-;; From clutter-rectangle.h
+;; From clutter-text.h
 
-(define-function clutter_rectangle_get_type
-  (c-name "clutter_rectangle_get_type")
+(define-function clutter_text_get_type
+  (c-name "clutter_text_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_rectangle_new
-  (c-name "clutter_rectangle_new")
-  (is-constructor-of "ClutterRectangle")
+(define-function clutter_text_new
+  (c-name "clutter_text_new")
+  (is-constructor-of "ClutterText")
   (return-type "ClutterActor*")
 )
 
-(define-function clutter_rectangle_new_with_color
-  (c-name "clutter_rectangle_new_with_color")
+(define-function clutter_text_new_full
+  (c-name "clutter_text_new_full")
   (return-type "ClutterActor*")
   (parameters
+    '("const-gchar*" "font_name")
+    '("const-gchar*" "text")
     '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_color")
+(define-function clutter_text_new_with_text
+  (c-name "clutter_text_new_with_text")
+  (return-type "ClutterActor*")
+  (parameters
+    '("const-gchar*" "font_name")
+    '("const-gchar*" "text")
+  )
+)
+
+(define-method get_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_text")
+  (return-type "const-gchar*")
+)
+
+(define-method set_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_text")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "color")
+    '("const-gchar*" "text")
   )
 )
 
-(define-method set_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_color")
+(define-method set_markup
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_markup")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("const-gchar*" "markup")
   )
 )
 
-(define-method get_border_width
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_border_width")
-  (return-type "guint")
+(define-method get_layout
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_layout")
+  (return-type "PangoLayout*")
 )
 
-(define-method set_border_width
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_border_width")
+(define-method set_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_color")
   (return-type "none")
   (parameters
-    '("guint" "width")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_border_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_border_color")
+(define-method get_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_color")
   (return-type "none")
   (parameters
     '("ClutterColor*" "color")
   )
 )
 
-(define-method set_border_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_border_color")
+(define-method set_font_name
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_font_name")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("const-gchar*" "font_name")
   )
 )
 
+(define-method get_font_name
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_font_name")
+  (return-type "const-gchar*")
+)
 
+(define-method set_ellipsize
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_ellipsize")
+  (return-type "none")
+  (parameters
+    '("PangoEllipsizeMode" "mode")
+  )
+)
 
-;; From clutter-behaviour-scale.h
+(define-method get_ellipsize
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_ellipsize")
+  (return-type "PangoEllipsizeMode")
+)
 
-(define-function clutter_behaviour_scale_get_type
-  (c-name "clutter_behaviour_scale_get_type")
-  (return-type "GType")
+(define-method set_line_wrap
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_line_wrap")
+  (return-type "none")
+  (parameters
+    '("gboolean" "line_wrap")
+  )
 )
 
-(define-function clutter_behaviour_scale_new
-  (c-name "clutter_behaviour_scale_new")
-  (is-constructor-of "ClutterBehaviourScale")
-  (return-type "ClutterBehaviour*")
+(define-method get_line_wrap
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_line_wrap")
+  (return-type "gboolean")
+)
+
+(define-method set_line_wrap_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_line_wrap_mode")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gdouble" "x_scale_start")
-    '("gdouble" "y_scale_start")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
+    '("PangoWrapMode" "wrap_mode")
   )
 )
 
-(define-function clutter_behaviour_scale_newx
-  (c-name "clutter_behaviour_scale_newx")
-  (return-type "ClutterBehaviour*")
+(define-method get_line_wrap_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_line_wrap_mode")
+  (return-type "PangoWrapMode")
+)
+
+(define-method get_layout
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_layout")
+  (return-type "PangoLayout*")
+)
+
+(define-method set_attributes
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_attributes")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterFixed" "x_scale_start")
-    '("ClutterFixed" "y_scale_start")
-    '("ClutterFixed" "x_scale_end")
-    '("ClutterFixed" "y_scale_end")
+    '("PangoAttrList*" "attrs")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_set_bounds")
+(define-method get_attributes
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_attributes")
+  (return-type "PangoAttrList*")
+)
+
+(define-method set_use_markup
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_use_markup")
   (return-type "none")
   (parameters
-    '("gdouble" "x_scale_start")
-    '("gdouble" "y_scale_start")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
+    '("gboolean" "setting")
   )
 )
 
-(define-method set_boundsx
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_set_boundsx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "x_scale_start")
-    '("ClutterFixed" "y_scale_start")
-    '("ClutterFixed" "x_scale_end")
-    '("ClutterFixed" "y_scale_end")
-  )
+(define-method get_use_markup
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_use_markup")
+  (return-type "gboolean")
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_get_bounds")
+(define-method set_line_alignment
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_line_alignment")
   (return-type "none")
   (parameters
-    '("gdouble*" "x_scale_start")
-    '("gdouble*" "y_scale_start")
-    '("gdouble*" "x_scale_end")
-    '("gdouble*" "y_scale_end")
+    '("PangoAlignment" "alignment")
   )
 )
 
-(define-method get_boundsx
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_get_boundsx")
+(define-method get_line_alignment
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_line_alignment")
+  (return-type "PangoAlignment")
+)
+
+(define-method set_justify
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_justify")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "x_scale_start")
-    '("ClutterFixed*" "y_scale_start")
-    '("ClutterFixed*" "x_scale_end")
-    '("ClutterFixed*" "y_scale_end")
+    '("gboolean" "justify")
   )
 )
 
-
-
-;; From clutter-timeline.h
-
-(define-function clutter_timeline_get_type
-  (c-name "clutter_timeline_get_type")
-  (return-type "GType")
+(define-method get_justify
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_justify")
+  (return-type "gboolean")
 )
 
-(define-function clutter_timeline_new
-  (c-name "clutter_timeline_new")
-  (is-constructor-of "ClutterTimeline")
-  (return-type "ClutterTimeline*")
+(define-method insert_unichar
+  (of-object "ClutterText")
+  (c-name "clutter_text_insert_unichar")
+  (return-type "none")
   (parameters
-    '("guint" "n_frames")
-    '("guint" "fps")
+    '("gunichar" "wc")
   )
 )
 
-(define-function clutter_timeline_new_for_duration
-  (c-name "clutter_timeline_new_for_duration")
-  (return-type "ClutterTimeline*")
+(define-method delete_chars
+  (of-object "ClutterText")
+  (c-name "clutter_text_delete_chars")
+  (return-type "none")
   (parameters
-    '("guint" "msecs")
+    '("guint" "n_chars")
   )
 )
 
-(define-method clone
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_clone")
-  (return-type "ClutterTimeline*")
-)
-
-(define-method get_duration
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_duration")
-  (return-type "guint")
+(define-method insert_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_insert_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+    '("gssize" "position")
+  )
 )
 
-(define-method set_duration
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_duration")
+(define-method delete_text
+  (of-object "ClutterText")
+  (c-name "clutter_text_delete_text")
   (return-type "none")
   (parameters
-    '("guint" "msecs")
+    '("gssize" "start_pos")
+    '("gssize" "end_pos")
   )
 )
 
-(define-method get_speed
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_speed")
-  (return-type "guint")
+(define-method get_chars
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_chars")
+  (return-type "gchar*")
+  (parameters
+    '("gssize" "start_pos")
+    '("gssize" "end_pos")
+  )
 )
 
-(define-method set_speed
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_speed")
+(define-method set_editable
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_editable")
   (return-type "none")
   (parameters
-    '("guint" "fps")
+    '("gboolean" "editable")
   )
 )
 
-(define-method get_direction
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_direction")
-  (return-type "ClutterTimelineDirection")
+(define-method get_editable
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_editable")
+  (return-type "gboolean")
 )
 
-(define-method set_direction
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_direction")
+(define-method set_activatable
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_activatable")
   (return-type "none")
   (parameters
-    '("ClutterTimelineDirection" "direction")
+    '("gboolean" "activatable")
   )
 )
 
-(define-method start
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_start")
-  (return-type "none")
+(define-method get_activatable
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_activatable")
+  (return-type "gboolean")
 )
 
-(define-method pause
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_pause")
-  (return-type "none")
+(define-method get_cursor_position
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_position")
+  (return-type "gint")
 )
 
-(define-method stop
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_stop")
+(define-method set_cursor_position
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_position")
   (return-type "none")
+  (parameters
+    '("gint" "position")
+  )
 )
 
-(define-method set_loop
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_loop")
+(define-method set_cursor_visible
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_visible")
   (return-type "none")
   (parameters
-    '("gboolean" "loop")
+    '("gboolean" "cursor_visible")
   )
 )
 
-(define-method get_loop
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_loop")
+(define-method get_cursor_visible
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_visible")
   (return-type "gboolean")
 )
 
-(define-method rewind
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_rewind")
+(define-method set_cursor_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_color")
   (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "color")
+  )
 )
 
-(define-method skip
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_skip")
+(define-method get_cursor_color
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_color")
   (return-type "none")
   (parameters
-    '("guint" "n_frames")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-method advance
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_advance")
+(define-method set_cursor_size
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_cursor_size")
   (return-type "none")
   (parameters
-    '("guint" "frame_num")
+    '("gint" "size")
   )
 )
 
-(define-method get_current_frame
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_current_frame")
-  (return-type "gint")
+(define-method get_cursor_size
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_cursor_size")
+  (return-type "guint")
 )
 
-(define-method get_progress
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_progress")
-  (return-type "gdouble")
+(define-method set_selectable
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_selectable")
+  (return-type "none")
+  (parameters
+    '("gboolean" "selectable")
+  )
 )
 
-(define-method get_progressx
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_progressx")
-  (return-type "ClutterFixed")
+(define-method get_selectable
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_selectable")
+  (return-type "gboolean")
 )
 
-(define-method set_n_frames
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_n_frames")
+(define-method set_selection_bound
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_selection_bound")
   (return-type "none")
   (parameters
-    '("guint" "n_frames")
+    '("gint" "selection_bound")
   )
 )
 
-(define-method get_n_frames
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_n_frames")
-  (return-type "guint")
-)
-
-(define-method is_playing
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_is_playing")
-  (return-type "gboolean")
+(define-method get_selection_bound
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_selection_bound")
+  (return-type "gint")
 )
 
-(define-method set_delay
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_set_delay")
+(define-method set_selection
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_selection")
   (return-type "none")
   (parameters
-    '("guint" "msecs")
+    '("gssize" "start_pos")
+    '("gssize" "end_pos")
   )
 )
 
-(define-method get_delay
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_delay")
-  (return-type "guint")
+(define-method get_selection
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_selection")
+  (return-type "gchar*")
 )
 
-(define-method get_delta
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_get_delta")
-  (return-type "guint")
+(define-method set_password_char
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_password_char")
+  (return-type "none")
   (parameters
-    '("guint*" "msecs")
+    '("gunichar" "wc")
   )
 )
 
-(define-method add_marker_at_frame
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_add_marker_at_frame")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "marker_name")
-    '("guint" "frame_num")
-  )
+(define-method get_password_char
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_password_char")
+  (return-type "gunichar")
 )
 
-(define-method add_marker_at_time
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_add_marker_at_time")
+(define-method set_max_length
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_max_length")
   (return-type "none")
   (parameters
-    '("const-gchar*" "marker_name")
-    '("guint" "msecs")
+    '("gint" "max")
   )
 )
 
-(define-method remove_marker
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_remove_marker")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "marker_name")
-  )
+(define-method get_max_length
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_max_length")
+  (return-type "gint")
 )
 
-(define-method list_markers
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_list_markers")
-  (return-type "gchar**")
+(define-method set_single_line_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_set_single_line_mode")
+  (return-type "none")
   (parameters
-    '("gint" "frame_num")
-    '("gsize*" "n_markers")
+    '("gboolean" "single_line")
   )
 )
 
-(define-method has_marker
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_has_marker")
+(define-method get_single_line_mode
+  (of-object "ClutterText")
+  (c-name "clutter_text_get_single_line_mode")
   (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "marker_name")
-  )
 )
 
-(define-method advance_to_marker
-  (of-object "ClutterTimeline")
-  (c-name "clutter_timeline_advance_to_marker")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "marker_name")
-  )
+(define-method activate
+  (of-object "ClutterText")
+  (c-name "clutter_text_activate")
+  (return-type "gboolean")
 )
 
 
 
-;; From clutter-types.h
+;; From clutter-texture.h
 
-(define-function clutter_geometry_get_type
-  (c-name "clutter_geometry_get_type")
-  (return-type "GType")
+(define-function clutter_texture_error_quark
+  (c-name "clutter_texture_error_quark")
+  (return-type "GQuark")
 )
 
-(define-function clutter_vertex_get_type
-  (c-name "clutter_vertex_get_type")
+(define-function clutter_texture_get_type
+  (c-name "clutter_texture_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_knot_get_type
-  (c-name "clutter_knot_get_type")
+(define-function clutter_texture_handle_get_type
+  (c-name "clutter_texture_handle_get_type")
   (return-type "GType")
 )
 
-(define-method copy
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_copy")
-  (return-type "ClutterKnot*")
+(define-function clutter_material_handle_get_type
+  (c-name "clutter_material_handle_get_type")
+  (return-type "GType")
 )
 
-(define-method free
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_free")
-  (return-type "none")
+(define-function clutter_texture_new
+  (c-name "clutter_texture_new")
+  (is-constructor-of "ClutterTexture")
+  (return-type "ClutterActor*")
 )
 
-(define-method equal
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_equal")
-  (return-type "gboolean")
+(define-function clutter_texture_new_from_file
+  (c-name "clutter_texture_new_from_file")
+  (return-type "ClutterActor*")
   (parameters
-    '("const-ClutterKnot*" "knot_b")
+    '("const-gchar*" "filename")
+    '("GError**" "error")
   )
 )
 
-
-
-;; From clutter-list-model.h
-
-(define-function clutter_list_model_get_type
-  (c-name "clutter_list_model_get_type")
-  (return-type "GType")
+(define-function clutter_texture_new_from_actor
+  (c-name "clutter_texture_new_from_actor")
+  (return-type "ClutterActor*")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
 )
 
-(define-function clutter_list_model_new
-  (c-name "clutter_list_model_new")
-  (is-constructor-of "ClutterListModel")
-  (return-type "ClutterModel*")
+(define-method set_from_file
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_file")
+  (return-type "gboolean")
   (parameters
-    '("guint" "n_columns")
+    '("const-gchar*" "filename")
+    '("GError**" "error")
   )
-  (varargs #t)
 )
 
-(define-function clutter_list_model_newv
-  (c-name "clutter_list_model_newv")
-  (return-type "ClutterModel*")
+(define-method set_from_rgb_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_rgb_data")
+  (return-type "gboolean")
   (parameters
-    '("guint" "n_columns")
-    '("GType*" "types")
-    '("const-gchar*-const[]" "names")
+    '("const-guchar*" "data")
+    '("gboolean" "has_alpha")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "rowstride")
+    '("gint" "bpp")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
   )
 )
 
+(define-method set_from_yuv_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_yuv_data")
+  (return-type "gboolean")
+  (parameters
+    '("const-guchar*" "data")
+    '("gint" "width")
+    '("gint" "height")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
+  )
+)
 
-
-;; From clutter-binding-pool.h
-
-(define-function clutter_binding_pool_new
-  (c-name "clutter_binding_pool_new")
-  (is-constructor-of "ClutterBindingPool")
-  (return-type "ClutterBindingPool*")
+(define-method set_area_from_rgb_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_area_from_rgb_data")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "name")
+    '("const-guchar*" "data")
+    '("gboolean" "has_alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "rowstride")
+    '("gint" "bpp")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
   )
 )
 
-(define-function clutter_binding_pool_get_for_class
-  (c-name "clutter_binding_pool_get_for_class")
-  (return-type "ClutterBindingPool*")
+(define-method get_base_size
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_base_size")
+  (return-type "none")
   (parameters
-    '("gpointer" "klass")
+    '("gint*" "width")
+    '("gint*" "height")
   )
 )
 
-(define-function clutter_binding_pool_find
-  (c-name "clutter_binding_pool_find")
-  (return-type "ClutterBindingPool*")
+(define-method set_filter_quality
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_filter_quality")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("ClutterTextureQuality" "filter_quality")
   )
 )
 
-(define-method install_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_install_action")
+(define-method get_filter_quality
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_filter_quality")
+  (return-type "ClutterTextureQuality")
+)
+
+(define-method set_max_tile_waste
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_max_tile_waste")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GCallback" "callback")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("gint" "max_tile_waste")
   )
 )
 
-(define-method install_closure
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_install_closure")
+(define-method get_max_tile_waste
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_max_tile_waste")
+  (return-type "gint")
+)
+
+(define-method get_cogl_texture
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_cogl_texture")
+  (return-type "CoglHandle")
+)
+
+(define-method set_cogl_texture
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_cogl_texture")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GClosure*" "closure")
+    '("CoglHandle" "cogl_tex")
   )
 )
 
-(define-method override_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_override_action")
+(define-method get_cogl_material
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_cogl_material")
+  (return-type "CoglHandle")
+)
+
+(define-method set_cogl_material
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_cogl_material")
   (return-type "none")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GCallback" "callback")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("CoglHandle" "cogl_material")
   )
 )
 
-(define-method override_closure
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_override_closure")
-  (return-type "none")
+
+
+;; From clutter-timeline.h
+
+(define-function clutter_timeline_get_type
+  (c-name "clutter_timeline_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_timeline_new
+  (c-name "clutter_timeline_new")
+  (is-constructor-of "ClutterTimeline")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GClosure*" "closure")
+    '("guint" "n_frames")
+    '("guint" "fps")
   )
 )
 
-(define-method find_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_find_action")
-  (return-type "const-gchar*")
+(define-function clutter_timeline_new_for_duration
+  (c-name "clutter_timeline_new_for_duration")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
+    '("guint" "msecs")
   )
 )
 
-(define-method remove_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_remove_action")
+(define-method clone
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_clone")
+  (return-type "ClutterTimeline*")
+)
+
+(define-method get_duration
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_duration")
+  (return-type "guint")
+)
+
+(define-method set_duration
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_duration")
   (return-type "none")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
+    '("guint" "msecs")
   )
 )
 
-(define-method activate
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_activate")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GObject*" "gobject")
-  )
+(define-method get_speed
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_speed")
+  (return-type "guint")
 )
 
-(define-method block_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_block_action")
+(define-method set_speed
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_speed")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
+    '("guint" "fps")
   )
 )
 
-(define-method unblock_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_unblock_action")
+(define-method get_direction
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_direction")
+  (return-type "ClutterTimelineDirection")
+)
+
+(define-method set_direction
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_direction")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
+    '("ClutterTimelineDirection" "direction")
   )
 )
 
+(define-method start
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_start")
+  (return-type "none")
+)
 
+(define-method pause
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_pause")
+  (return-type "none")
+)
 
-;; From clutter-timeout-pool.h
+(define-method stop
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_stop")
+  (return-type "none")
+)
 
-(define-function clutter_timeout_pool_new
-  (c-name "clutter_timeout_pool_new")
-  (is-constructor-of "ClutterTimeoutPool")
-  (return-type "ClutterTimeoutPool*")
+(define-method set_loop
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_loop")
+  (return-type "none")
   (parameters
-    '("gint" "priority")
+    '("gboolean" "loop")
   )
 )
 
-(define-method add
-  (of-object "ClutterTimeoutPool")
-  (c-name "clutter_timeout_pool_add")
-  (return-type "guint")
+(define-method get_loop
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_loop")
+  (return-type "gboolean")
+)
+
+(define-method rewind
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_rewind")
+  (return-type "none")
+)
+
+(define-method skip
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_skip")
+  (return-type "none")
   (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("guint" "n_frames")
   )
 )
 
-(define-method remove
-  (of-object "ClutterTimeoutPool")
-  (c-name "clutter_timeout_pool_remove")
+(define-method advance
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_advance")
   (return-type "none")
   (parameters
-    '("guint" "id")
+    '("guint" "frame_num")
   )
 )
 
+(define-method get_current_frame
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_current_frame")
+  (return-type "gint")
+)
 
+(define-method get_progress
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_progress")
+  (return-type "gdouble")
+)
 
-;; From clutter-feature.h
+(define-method get_progressx
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_progressx")
+  (return-type "ClutterFixed")
+)
 
-(define-function clutter_feature_available
-  (c-name "clutter_feature_available")
-  (return-type "gboolean")
+(define-method set_n_frames
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_n_frames")
+  (return-type "none")
   (parameters
-    '("ClutterFeatureFlags" "feature")
+    '("guint" "n_frames")
   )
 )
 
-(define-function clutter_feature_get_all
-  (c-name "clutter_feature_get_all")
-  (return-type "ClutterFeatureFlags")
+(define-method get_n_frames
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_n_frames")
+  (return-type "guint")
 )
 
-
-
-;; From clutter-version.h
-
-
-
-;; From clutter-behaviour-ellipse.h
-
-(define-function clutter_behaviour_ellipse_get_type
-  (c-name "clutter_behaviour_ellipse_get_type")
-  (return-type "GType")
+(define-method is_playing
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_is_playing")
+  (return-type "gboolean")
 )
 
-(define-function clutter_behaviour_ellipse_new
-  (c-name "clutter_behaviour_ellipse_new")
-  (is-constructor-of "ClutterBehaviourEllipse")
-  (return-type "ClutterBehaviour*")
+(define-method set_delay
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_delay")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("ClutterRotateDirection" "direction")
-    '("gdouble" "start")
-    '("gdouble" "end")
+    '("guint" "msecs")
   )
 )
 
-(define-function clutter_behaviour_ellipse_newx
-  (c-name "clutter_behaviour_ellipse_newx")
-  (return-type "ClutterBehaviour*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterFixed" "start")
-    '("ClutterFixed" "end")
+(define-method get_delay
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_delay")
+  (return-type "guint")
+)
+
+(define-method get_delta
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_delta")
+  (return-type "guint")
+  (parameters
+    '("guint*" "msecs")
   )
 )
 
-(define-method set_center
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_center")
+(define-method add_marker_at_frame
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_add_marker_at_frame")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("const-gchar*" "marker_name")
+    '("guint" "frame_num")
   )
 )
 
-(define-method get_center
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_center")
+(define-method add_marker_at_time
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_add_marker_at_time")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("const-gchar*" "marker_name")
+    '("guint" "msecs")
   )
 )
 
-(define-method set_width
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_width")
+(define-method remove_marker
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_remove_marker")
   (return-type "none")
   (parameters
-    '("gint" "width")
+    '("const-gchar*" "marker_name")
   )
 )
 
-(define-method get_width
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_width")
-  (return-type "gint")
-)
-
-(define-method set_height
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_height")
-  (return-type "none")
+(define-method list_markers
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_list_markers")
+  (return-type "gchar**")
   (parameters
-    '("gint" "height")
+    '("gint" "frame_num")
+    '("gsize*" "n_markers")
   )
 )
 
-(define-method get_height
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_height")
-  (return-type "gint")
-)
-
-(define-method set_angle_start
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_start")
-  (return-type "none")
+(define-method has_marker
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_has_marker")
+  (return-type "gboolean")
   (parameters
-    '("gdouble" "angle_start")
+    '("const-gchar*" "marker_name")
   )
 )
 
-(define-method set_angle_startx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_startx")
+(define-method advance_to_marker
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_advance_to_marker")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_start")
+    '("const-gchar*" "marker_name")
   )
 )
 
-(define-method get_angle_startx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_startx")
-  (return-type "ClutterFixed")
-)
 
-(define-method get_angle_start
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_start")
-  (return-type "gdouble")
+
+;; From clutter-timeout-pool.h
+
+(define-function clutter_timeout_pool_new
+  (c-name "clutter_timeout_pool_new")
+  (is-constructor-of "ClutterTimeoutPool")
+  (return-type "ClutterTimeoutPool*")
+  (parameters
+    '("gint" "priority")
+  )
 )
 
-(define-method set_angle_endx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_endx")
-  (return-type "none")
+(define-method add
+  (of-object "ClutterTimeoutPool")
+  (c-name "clutter_timeout_pool_add")
+  (return-type "guint")
   (parameters
-    '("ClutterFixed" "angle_end")
+    '("guint" "interval")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method set_angle_end
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_end")
+(define-method remove
+  (of-object "ClutterTimeoutPool")
+  (c-name "clutter_timeout_pool_remove")
   (return-type "none")
   (parameters
-    '("gdouble" "angle_end")
+    '("guint" "id")
   )
 )
 
-(define-method get_angle_endx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_endx")
-  (return-type "ClutterFixed")
+
+
+;; From clutter-types.h
+
+(define-function clutter_geometry_get_type
+  (c-name "clutter_geometry_get_type")
+  (return-type "GType")
 )
 
-(define-method get_angle_end
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_end")
-  (return-type "gdouble")
+(define-function clutter_vertex_get_type
+  (c-name "clutter_vertex_get_type")
+  (return-type "GType")
 )
 
-(define-method set_angle_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_tiltx")
-  (return-type "none")
-  (parameters
-    '("ClutterRotateAxis" "axis")
-    '("ClutterFixed" "angle_tilt")
-  )
+(define-function clutter_knot_get_type
+  (c-name "clutter_knot_get_type")
+  (return-type "GType")
 )
 
-(define-method set_angle_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_tilt")
+(define-method copy
+  (of-object "ClutterKnot")
+  (c-name "clutter_knot_copy")
+  (return-type "ClutterKnot*")
+)
+
+(define-method free
+  (of-object "ClutterKnot")
+  (c-name "clutter_knot_free")
   (return-type "none")
+)
+
+(define-method equal
+  (of-object "ClutterKnot")
+  (c-name "clutter_knot_equal")
+  (return-type "gboolean")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle_tilt")
+    '("const-ClutterKnot*" "knot_b")
   )
 )
 
-(define-method get_angle_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_tiltx")
-  (return-type "ClutterFixed")
+
+
+;; From clutter-units.h
+
+(define-function clutter_units_mm
+  (c-name "clutter_units_mm")
+  (return-type "ClutterUnit")
   (parameters
-    '("ClutterRotateAxis" "axis")
+    '("gdouble" "mm")
   )
 )
 
-(define-method get_angle_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_tilt")
-  (return-type "gdouble")
+(define-function clutter_units_pt
+  (c-name "clutter_units_pt")
+  (return-type "ClutterUnit")
   (parameters
-    '("ClutterRotateAxis" "axis")
+    '("gdouble" "pt")
   )
 )
 
-(define-method set_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_tilt")
-  (return-type "none")
+(define-function clutter_units_em
+  (c-name "clutter_units_em")
+  (return-type "ClutterUnit")
   (parameters
-    '("gdouble" "angle_tilt_x")
-    '("gdouble" "angle_tilt_y")
-    '("gdouble" "angle_tilt_z")
+    '("gdouble" "em")
   )
 )
 
-(define-method set_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_tiltx")
+(define-function clutter_unit_get_type
+  (c-name "clutter_unit_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_param_unit_get_type
+  (c-name "clutter_param_unit_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_value_set_unit
+  (c-name "clutter_value_set_unit")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_tilt_x")
-    '("ClutterFixed" "angle_tilt_y")
-    '("ClutterFixed" "angle_tilt_z")
+    '("GValue*" "value")
+    '("ClutterUnit" "units")
   )
 )
 
-(define-method get_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_tilt")
-  (return-type "none")
+(define-function clutter_value_get_unit
+  (c-name "clutter_value_get_unit")
+  (return-type "ClutterUnit")
   (parameters
-    '("gdouble*" "angle_tilt_x")
-    '("gdouble*" "angle_tilt_y")
-    '("gdouble*" "angle_tilt_z")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_tiltx
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_tiltx")
-  (return-type "none")
+(define-function clutter_param_spec_unit
+  (c-name "clutter_param_spec_unit")
+  (return-type "GParamSpec*")
   (parameters
-    '("ClutterFixed*" "angle_tilt_x")
-    '("ClutterFixed*" "angle_tilt_y")
-    '("ClutterFixed*" "angle_tilt_z")
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("ClutterUnit" "minimum")
+    '("ClutterUnit" "maximum")
+    '("ClutterUnit" "default_value")
+    '("GParamFlags" "flags")
   )
 )
 
-(define-method get_direction
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_direction")
-  (return-type "ClutterRotateDirection")
-)
 
-(define-method set_direction
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_direction")
-  (return-type "none")
+
+;; From clutter-util.h
+
+(define-function clutter_util_next_p2
+  (c-name "clutter_util_next_p2")
+  (return-type "int")
   (parameters
-    '("ClutterRotateDirection" "direction")
+    '("int" "a")
   )
 )
 
 
+
+;; From clutter-version.h
+
+

Modified: cluttermm/trunk/clutter/src/clutter_vfuncs.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_vfuncs.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_vfuncs.defs	Fri Feb 13 11:30:48 2009
@@ -136,7 +136,7 @@
   (of-object "ClutterBehaviour")
   (return-type "void")
   (parameters
-    '("guint32" "alpha_value")
+    '("double" "alpha_value")
   )
 )
 

Modified: cluttermm/trunk/clutter/src/media.hg
==============================================================================
--- cluttermm/trunk/clutter/src/media.hg	(original)
+++ cluttermm/trunk/clutter/src/media.hg	Fri Feb 13 11:30:48 2009
@@ -28,7 +28,7 @@
 
 class Media : public Glib::Interface
 {
-  _CLASS_INTERFACE(Media, ClutterMedia, CLUTTER_MEDIA, ClutterMediaInterface)
+  _CLASS_INTERFACE(Media, ClutterMedia, CLUTTER_MEDIA, ClutterMediaIface)
 
 public:
 
@@ -43,7 +43,7 @@
   _WRAP_METHOD(int get_buffer_percent() const, clutter_media_get_buffer_percent)
   _WRAP_METHOD(void set_filename(const Glib::ustring& filename), clutter_media_set_filename)
   _WRAP_METHOD(bool get_can_seek() const, clutter_media_get_can_seek)
-  _WRAP_METHOD(int get_duration() const, clutter_media_get_duration)
+  _WRAP_METHOD(guint get_duration() const, clutter_media_get_duration)
 
 
   _WRAP_SIGNAL(void eos(), "eos")
@@ -52,35 +52,13 @@
 
   _WRAP_PROPERTY("buffer-percent", int)
   _WRAP_PROPERTY("can-seek", bool)
-  _WRAP_PROPERTY("duration", int)
+  _WRAP_PROPERTY("duration", guint)
   _WRAP_PROPERTY("playing", bool)
   _WRAP_PROPERTY("position", int)
   _WRAP_PROPERTY("uri", Glib::ustring)
   _WRAP_PROPERTY("volume", double)
 
-protected:
-
-#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
-  _WRAP_VFUNC(void set_uri(const Glib::ustring& uri), set_uri)
-
-  // Note: We cannot return a Glib::ustring here since the C API expects a
-  // const gchar* as return value. const gchar* however means that the returned
-  // value is not supposed to be freed by the caller. If we would want to return
-  // Glib::ustring here, what should we pass to the underlying C API then?
-  // ustring.c_str() doesn't work since the ustring destroys the data upon
-  // destruction (which means, we would effectively return an invalid pointer).
-  // We also can't copy the ustring's content since we would leak that copy
-  // otherwise.
-  _WRAP_VFUNC(const char* get_uri() const, get_uri)
-  _WRAP_VFUNC(void set_playing(bool playing), set_playing)
-  _WRAP_VFUNC(bool get_playing() const, get_playing)
-  _WRAP_VFUNC(void set_position(int position), set_position)
-  _WRAP_VFUNC(int get_position() const, get_position)
-  _WRAP_VFUNC(void set_volume(double volume), set_volume)
-  _WRAP_VFUNC(double get_volume() const, get_volume)
-  _WRAP_VFUNC(bool can_seek() const, can_seek)
-  _WRAP_VFUNC(int get_buffer_percent() const, get_buffer_percent)
-  _WRAP_VFUNC(int get_duration() const, get_duration)
+  //TODO: There are probably some extra propertys in clutter-0.10.
 
 };
 

Modified: cluttermm/trunk/clutter/src/types.hg
==============================================================================
--- cluttermm/trunk/clutter/src/types.hg	(original)
+++ cluttermm/trunk/clutter/src/types.hg	Fri Feb 13 11:30:48 2009
@@ -41,6 +41,7 @@
 _WRAP_ENUM(RotateAxis, ClutterRotateAxis)
 _WRAP_ENUM(Gravity, ClutterGravity)
 _WRAP_ENUM(RequestMode, ClutterRequestMode)
+_WRAP_ENUM(FontFlags, ClutterFontFlags)
 
 class Knot
 {

Modified: cluttermm/trunk/examples/Makefile.am
==============================================================================
--- cluttermm/trunk/examples/Makefile.am	(original)
+++ cluttermm/trunk/examples/Makefile.am	Fri Feb 13 11:30:48 2009
@@ -2,9 +2,8 @@
 
 include Makefile.am_fragment
 
-noinst_PROGRAMS = actors effect
+noinst_PROGRAMS = actors
 actors_SOURCES = test-actors.cc
-effect_SOURCES = effect.cc
 #boxes_SOURCES = test-boxes.cc
 
 EXTRA_DIST = actor.png

Modified: cluttermm/trunk/examples/test-actors.cc
==============================================================================
--- cluttermm/trunk/examples/test-actors.cc	(original)
+++ cluttermm/trunk/examples/test-actors.cc	Fri Feb 13 11:30:48 2009
@@ -128,7 +128,7 @@
 
   // Set up some behaviours to handle scaling
   Glib::RefPtr<Clutter::Alpha> alpha =
-    Clutter::Alpha::create(timeline, &Clutter::Alpha::sine_func);
+    Clutter::Alpha::create(timeline, Clutter::EASE_IN_SINE);
 
   Glib::RefPtr<Clutter::BehaviourScale> scaler_1 =
     Clutter::BehaviourScale::create(alpha,
@@ -165,7 +165,7 @@
     }
     else
     {
-      oh.hands.push_back(Clutter::CloneTexture::create
+      oh.hands.push_back(Clutter::Clone::create
         (Glib::RefPtr<Clutter::Texture>::cast_dynamic
           (oh.hands[0])));
     }

Modified: cluttermm/trunk/tests/test-alpha-creation.cc
==============================================================================
--- cluttermm/trunk/tests/test-alpha-creation.cc	(original)
+++ cluttermm/trunk/tests/test-alpha-creation.cc	Fri Feb 13 11:30:48 2009
@@ -13,7 +13,7 @@
 
   // Set up some behaviours to handle scaling
   Glib::RefPtr<Clutter::Alpha> alpha =
-      Clutter::Alpha::create(timeline, &Clutter::Alpha::sine_func);
+      Clutter::Alpha::create(timeline, Clutter::EASE_IN_SINE);
 
   Glib::RefPtr<Clutter::BehaviourScale> scaler_1 =
       Clutter::BehaviourScale::create(alpha, 0.5, 0.5, 1.0, 1.0);

Modified: cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	Fri Feb 13 11:30:48 2009
@@ -35,12 +35,13 @@
     << get_defs(CLUTTER_TYPE_BEHAVIOUR_ROTATE)
     << get_defs(CLUTTER_TYPE_BEHAVIOUR_SCALE)
 //    << get_defs(CLUTTER_TYPE_BOX)
+    << get_defs(CLUTTER_TYPE_CAIRO_TEXTURE)
     << get_defs(CLUTTER_TYPE_CHILD_META)
-    << get_defs(CLUTTER_TYPE_CLONE_TEXTURE)
+    << get_defs(CLUTTER_TYPE_CLONE)
     << get_defs(CLUTTER_TYPE_COLOR)
-//    << get_defs(CLUTTER_TYPE_CONTAINER)
-    << get_defs(CLUTTER_TYPE_EFFECT_TEMPLATE)
+    << get_defs(CLUTTER_TYPE_CONTAINER)
     << get_defs(CLUTTER_TYPE_EVENT)
+    << get_defs(CLUTTER_TYPE_FIXED)
     << get_defs(CLUTTER_TYPE_GROUP)
 //    << get_defs(CLUTTER_TYPE_HBOX)
 //    << get_defs(CLUTTER_TYPE_LAYOUT)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]