[cluttermm] Wrapped some new functions.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [cluttermm] Wrapped some new functions.
Date: Mon, 2 Aug 2010 17:12:38 +0000 (UTC)
commit 626c6bb7cdf7fd0212604a8c16c0b1978168f410
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Aug 2 16:50:26 2010 +0200

    Wrapped some new functions.
    
    * configure.ac: Depend on atkmm, so we can use Atk::Object in the API.
    (This could be optional at configure time if anybody needs that, as it is
    in gtkmm.)
    * clutter/src/clutter_methods.defs: Regenerated with h2defs.py.
    * clutter/src/filelist.am:
    * clutter/src/actor-meta.[hg|ccg]:
    * clutter/src/action.[hg|ccg]: Added new ActorMeta and Action classes.
    * clutter/src/action.[hg|ccg]: Added get/set_clip_to_allocation(), contains(),
    get_has_allocation(), get_accessible(), add_action(), remove_action(),
    get_action(), clear_actions().
    * clutter/src/animation.hg: set_duration(): Correct the parameter type to
    guint, as corrected in the C API.
    * clutter/src/path.hg: Added foreach().
    * clutter/src/stage.hg: Addef get/set_no_clear_hint().
    * clutter/src/texture.hg: Added get/set_pick_with_alpha().

 ChangeLog                                        |   20 +
 clutter/cluttermm.h                              |    2 +
 clutter/src/action.ccg                           |   26 +
 clutter/src/action.hg                            |   46 +
 clutter/src/actor-meta.ccg                       |   26 +
 clutter/src/actor-meta.hg                        |   54 +
 clutter/src/actor.hg                             |   20 +
 clutter/src/animation.hg                         |    3 +-
 clutter/src/clutter_methods.defs                 | 1404 +++++++++++++++++++---
 clutter/src/filelist.am                          |    2 +
 clutter/src/path.ccg                             |   17 +
 clutter/src/path.hg                              |   12 +
 clutter/src/stage.hg                             |    3 +
 clutter/src/texture.hg                           |    3 +
 codegen/extradefs/generate_extra_defs_clutter.cc |    2 +
 codegen/m4/convert_clutter.m4                    |    6 +
 configure.ac                                     |    3 +-
 17 files changed, 1492 insertions(+), 157 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9c91afd..2525b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-08-02  Murray Cumming  <murrayc murrayc com>
+
+	Wrapped some new functions.
+
+	* configure.ac: Depend on atkmm, so we can use Atk::Object in the API.
+	(This could be optional at configure time if anybody needs that, as it is 
+	in gtkmm.)
+	* clutter/src/clutter_methods.defs: Regenerated with h2defs.py.
+	* clutter/src/filelist.am:
+	* clutter/src/actor-meta.[hg|ccg]:
+	* clutter/src/action.[hg|ccg]: Added new ActorMeta and Action classes.
+	* clutter/src/action.[hg|ccg]: Added get/set_clip_to_allocation(), contains(), 
+	get_has_allocation(), get_accessible(), add_action(), remove_action(), 
+	get_action(), clear_actions().
+	* clutter/src/animation.hg: set_duration(): Correct the parameter type to 
+	guint, as corrected in the C API.
+	* clutter/src/path.hg: Added foreach().
+	* clutter/src/stage.hg: Addef get/set_no_clear_hint().
+	* clutter/src/texture.hg: Added get/set_pick_with_alpha().
+
 0.9.6:
 
 2010-05-05  Murray Cumming  <murrayc murrayc-x61>
diff --git a/clutter/cluttermm.h b/clutter/cluttermm.h
index 2a61ec1..2cc2ad1 100644
--- a/clutter/cluttermm.h
+++ b/clutter/cluttermm.h
@@ -54,7 +54,9 @@
 
 #include <glibmm.h>
 #include <cluttermmconfig.h>
+#include <cluttermm/action.h>
 #include <cluttermm/actor.h>
+#include <cluttermm/actor-meta.h>
 #include <cluttermm/alpha.h>
 #include <cluttermm/animation.h>
 #include <cluttermm/behaviour.h>
diff --git a/clutter/src/action.ccg b/clutter/src/action.ccg
new file mode 100644
index 0000000..1a3a58f
--- /dev/null
+++ b/clutter/src/action.ccg
@@ -0,0 +1,26 @@
+/* Copyright (C) 2010 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <cluttermm/actor.h>
+#include <clutter/clutter.h>
+
+namespace Clutter
+{
+
+
+} //namespace Clutter
+
diff --git a/clutter/src/action.hg b/clutter/src/action.hg
new file mode 100644
index 0000000..6571cb4
--- /dev/null
+++ b/clutter/src/action.hg
@@ -0,0 +1,46 @@
+/* Copyright (C) 2010 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glibmm/object.h>
+#include <cluttermm/actor-meta.h>
+ 
+_DEFS(cluttermm,clutter)
+_PINCLUDE(cluttermm/private/actor-meta_p.h)
+
+
+namespace Clutter
+{
+
+//TODO: Write a version of the large description from here: http://clutter-project.org/docs/clutter/stable/ClutterAction.html#ClutterAction.description
+class Action : public ActorMeta
+{
+  _CLASS_GOBJECT(Action, ClutterAction, CLUTTER_ACTION, ActorMeta, ClutterActorMeta)
+  _DERIVES_INITIALLY_UNOWNED()
+
+protected:
+  _CTOR_DEFAULT()
+
+public:
+  //There is no create() because this is an abstract base class.
+  //_WRAP_CREATE()
+
+  //There are no functions.
+
+  //TODO: Signals, properties, vfuncs
+};
+
+} // namespace Clutter
diff --git a/clutter/src/actor-meta.ccg b/clutter/src/actor-meta.ccg
new file mode 100644
index 0000000..1a3a58f
--- /dev/null
+++ b/clutter/src/actor-meta.ccg
@@ -0,0 +1,26 @@
+/* Copyright (C) 2010 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <cluttermm/actor.h>
+#include <clutter/clutter.h>
+
+namespace Clutter
+{
+
+
+} //namespace Clutter
+
diff --git a/clutter/src/actor-meta.hg b/clutter/src/actor-meta.hg
new file mode 100644
index 0000000..7565815
--- /dev/null
+++ b/clutter/src/actor-meta.hg
@@ -0,0 +1,54 @@
+/* Copyright (C) 2010 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glibmm/object.h>
+//#include <cluttermm/actor.h>
+ 
+_DEFS(cluttermm,clutter)
+_PINCLUDE(glibmm/private/object_p.h)
+
+
+namespace Clutter
+{
+
+class Actor;
+
+//TODO: Write a version of the large description from here: http://clutter-project.org/docs/clutter/stable/ClutterActorMeta.html#ClutterActorMetaMeta.description
+class ActorMeta : public Glib::Object
+{
+  _CLASS_GOBJECT(ActorMeta, ClutterActorMeta, CLUTTER_ACTOR_META, Glib::Object, GObject)
+  _DERIVES_INITIALLY_UNOWNED()
+
+protected:
+  _CTOR_DEFAULT()
+
+public:
+  //There is no create() because this is an abstract base class.
+  //_WRAP_CREATE()
+
+  _WRAP_METHOD(void set_name(const Glib::ustring& name), clutter_actor_meta_set_name)
+  _WRAP_METHOD(Glib::ustring get_name() const, clutter_actor_meta_get_name)
+  _WRAP_METHOD(void set_enabled(bool is_enabled = true), clutter_actor_meta_set_enabled)
+  _WRAP_METHOD(bool get_enabled() const, clutter_actor_meta_get_enabled)
+
+  _WRAP_METHOD(Glib::RefPtr<Actor> get_actor(), clutter_actor_meta_get_actor, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Actor> get_actor() const, clutter_actor_meta_get_actor, refreturn, constversion)
+  
+  //TODO: Signals, properties, vfuncs
+};
+
+} // namespace Clutter
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index 340dc1b..6b107e1 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -18,6 +18,8 @@
 #include <glibmm/object.h>
 #include <pangomm/context.h>
 #include <pangomm/layout.h>
+#include <atkmm/object.h>
+#include <cluttermm/action.h>
 #include <cluttermm/animation.h>
 #include <cluttermm/color.h>
 #include <cluttermm/scriptable.h>
@@ -150,6 +152,8 @@ public:
   _WRAP_METHOD(guint32 get_gid() const, clutter_actor_get_gid)
   _WRAP_METHOD(void set_clip(float xoff, float yoff, float width, float height), clutter_actor_set_clip)
   _WRAP_METHOD(void get_clip(float& xoff, float& yoff, float& width, float& height), clutter_actor_get_clip)
+  _WRAP_METHOD(void set_clip_to_allocation(bool clip_set = true), clutter_actor_set_clip_to_allocation)
+  _WRAP_METHOD(bool get_clip_to_allocation() const, clutter_actor_get_clip_to_allocation)
   _WRAP_METHOD(void remove_clip(), clutter_actor_remove_clip)
   _WRAP_METHOD(bool has_clip() const, clutter_actor_has_clip)
   _WRAP_METHOD(void set_parent(const Glib::RefPtr<Actor>& parent), clutter_actor_set_parent)
@@ -157,6 +161,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const Actor> get_parent() const, clutter_actor_get_parent, refreturn, constversion)
   _WRAP_METHOD(void reparent(const Glib::RefPtr<Actor>& new_parent), clutter_actor_reparent)
   _WRAP_METHOD(void unparent(), clutter_actor_unparent)
+  _WRAP_METHOD(bool contains(const Glib::RefPtr<const Actor>& descendant) const, clutter_actor_contains)
   _WRAP_METHOD(void raise(const Glib::RefPtr<Actor>& below), clutter_actor_raise)
   _WRAP_METHOD(void lower(const Glib::RefPtr<Actor>& above), clutter_actor_lower)
   _WRAP_METHOD(void raise_top (), clutter_actor_raise_top)
@@ -259,6 +264,21 @@ public:
 
   _WRAP_METHOD(void push_internal(), clutter_actor_push_internal)
   _WRAP_METHOD(void pop_internal(), clutter_actor_pop_internal)
+  
+  _WRAP_METHOD(bool has_allocation() const, clutter_actor_has_allocation)
+
+  _WRAP_METHOD(Glib::RefPtr<Atk::Object> get_accessible(), clutter_actor_get_accessible, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Atk::Object> get_accessible() const, clutter_actor_get_accessible, refreturn, constversion)
+  
+  _WRAP_METHOD(void add_action(const Glib::RefPtr<Action>& action), clutter_actor_add_action)
+  _WRAP_METHOD(void add_action(const Glib::ustring& name, const Glib::RefPtr<Action>& action), clutter_actor_add_action_with_name)
+  _WRAP_METHOD(void remove_action(const Glib::RefPtr<Action>&action), clutter_actor_remove_action)
+  _WRAP_METHOD(void remove_action(const Glib::ustring& name), clutter_actor_remove_action_by_name)
+  _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& name), clutter_actor_get_action, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& name) const, clutter_actor_get_action, refreturn)
+  
+//TODO:   _WRAP_METHOD(GLis* get_actions(), clutter_actor_get_actions)
+  _WRAP_METHOD(void clear_actions(), clutter_actor_clear_actions)
 
 // signals
   _WRAP_SIGNAL(bool button_press_event(ButtonEvent* event), "button_press_event")
diff --git a/clutter/src/animation.hg b/clutter/src/animation.hg
index 6207f6b..7e38924 100644
--- a/clutter/src/animation.hg
+++ b/clutter/src/animation.hg
@@ -45,8 +45,7 @@ public:
   _WRAP_METHOD(void set_mode(gulong mode), clutter_animation_set_mode)
   _WRAP_METHOD(gulong get_mode() const, clutter_animation_get_mode)
 
-  //See http://bugzilla.o-hand.com/show_bug.cgi?id=2089 about the gint/guint difference.
-  _WRAP_METHOD(void set_duration(int msecs), clutter_animation_set_duration)
+  _WRAP_METHOD(void set_duration(guint msecs), clutter_animation_set_duration)
   _WRAP_METHOD(guint get_duration() const, clutter_animation_get_duration)
   
   _WRAP_METHOD(void set_loop(bool loop=true), clutter_animation_set_loop)
diff --git a/clutter/src/clutter_methods.defs b/clutter/src/clutter_methods.defs
index 8899b9b..e2b8029 100644
--- a/clutter/src/clutter_methods.defs
+++ b/clutter/src/clutter_methods.defs
@@ -7,6 +7,20 @@
   (gtype-id "CLUTTER_TYPE_ACTOR")
 )
 
+(define-object ActorMeta
+  (in-module "Clutter")
+  (parent "GInitiallyUnowned")
+  (c-name "ClutterActorMeta")
+  (gtype-id "CLUTTER_TYPE_ACTOR_META")
+)
+
+(define-object Action
+  (in-module "Clutter")
+  (parent "ClutterActorMeta")
+  (c-name "ClutterAction")
+  (gtype-id "CLUTTER_TYPE_ACTION")
+)
+
 (define-object Alpha
   (in-module "Clutter")
   (parent "GInitiallyUnowned")
@@ -104,6 +118,13 @@
   (gtype-id "CLUTTER_TYPE_CHILD_META")
 )
 
+(define-object ClickAction
+  (in-module "Clutter")
+  (parent "ClutterAction")
+  (c-name "ClutterClickAction")
+  (gtype-id "CLUTTER_TYPE_CLICK_ACTION")
+)
+
 (define-object Clone
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -111,6 +132,13 @@
   (gtype-id "CLUTTER_TYPE_CLONE")
 )
 
+(define-object Constraint
+  (in-module "Clutter")
+  (parent "ClutterActorMeta")
+  (c-name "ClutterConstraint")
+  (gtype-id "CLUTTER_TYPE_CONSTRAINT")
+)
+
 (define-object Container
   (in-module "Clutter")
   (c-name "ClutterContainer")
@@ -124,6 +152,20 @@
   (gtype-id "CLUTTER_TYPE_DEVICE_MANAGER")
 )
 
+(define-object DragAction
+  (in-module "Clutter")
+  (parent "ClutterAction")
+  (c-name "ClutterDragAction")
+  (gtype-id "CLUTTER_TYPE_DRAG_ACTION")
+)
+
+(define-object Effect
+  (in-module "Clutter")
+  (parent "ClutterActorMeta")
+  (c-name "ClutterEffect")
+  (gtype-id "CLUTTER_TYPE_EFFECT")
+)
+
 (define-object Group
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -207,6 +249,20 @@
   (gtype-id "CLUTTER_TYPE_MODEL_ITER")
 )
 
+(define-object OffscreenEffect
+  (in-module "Clutter")
+  (parent "ClutterEffect")
+  (c-name "ClutterOffscreenEffect")
+  (gtype-id "CLUTTER_TYPE_OFFSCREEN_EFFECT")
+)
+
+(define-object DeformEffect
+  (in-module "Clutter")
+  (parent "ClutterOffscreenEffect")
+  (c-name "ClutterDeformEffect")
+  (gtype-id "CLUTTER_TYPE_DEFORM_EFFECT")
+)
+
 (define-object Path
   (in-module "Clutter")
   (parent "GInitiallyUnowned")
@@ -248,6 +304,13 @@
   (gtype-id "CLUTTER_TYPE_SHADER")
 )
 
+(define-object ShaderEffect
+  (in-module "Clutter")
+  (parent "ClutterOffscreenEffect")
+  (c-name "ClutterShaderEffect")
+  (gtype-id "CLUTTER_TYPE_SHADER_EFFECT")
+)
+
 (define-object Stage
   (in-module "Clutter")
   (parent "ClutterGroup")
@@ -261,6 +324,13 @@
   (gtype-id "CLUTTER_TYPE_STAGE_WINDOW")
 )
 
+(define-object State
+  (in-module "Clutter")
+  (parent "GObject")
+  (c-name "ClutterState")
+  (gtype-id "CLUTTER_TYPE_STATE")
+)
+
 (define-object Text
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -324,6 +394,16 @@
   )
 )
 
+(define-enum AlignAxis
+  (in-module "Clutter")
+  (c-name "ClutterAlignAxis")
+  (gtype-id "CLUTTER_TYPE_ALIGN_AXIS")
+  (values
+    '("x-axis" "CLUTTER_ALIGN_X_AXIS")
+    '("y-axis" "CLUTTER_ALIGN_Y_AXIS")
+  )
+)
+
 (define-enum Interpolation
   (in-module "Clutter")
   (c-name "ClutterInterpolation")
@@ -334,6 +414,19 @@
   )
 )
 
+(define-enum BindCoordinate
+  (in-module "Clutter")
+  (c-name "ClutterBindCoordinate")
+  (gtype-id "CLUTTER_TYPE_BIND_COORDINATE")
+  (values
+    '("x" "CLUTTER_BIND_X")
+    '("y" "CLUTTER_BIND_Y")
+    '("z" "CLUTTER_BIND_Z")
+    '("width" "CLUTTER_BIND_WIDTH")
+    '("height" "CLUTTER_BIND_HEIGHT")
+  )
+)
+
 (define-enum BinAlignment
   (in-module "Clutter")
   (c-name "ClutterBinAlignment")
@@ -358,48 +451,14 @@
   )
 )
 
-(define-flags DebugFlag
+(define-enum DragAxis
   (in-module "Clutter")
-  (c-name "ClutterDebugFlag")
-  (gtype-id "CLUTTER_TYPE_DEBUG_FLAG")
+  (c-name "ClutterDragAxis")
+  (gtype-id "CLUTTER_TYPE_DRAG_AXIS")
   (values
-    '("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")
-    '("layout" "CLUTTER_DEBUG_LAYOUT")
-  )
-)
-
-(define-flags PickDebugFlag
-  (in-module "Clutter")
-  (c-name "ClutterPickDebugFlag")
-  (gtype-id "CLUTTER_TYPE_PICK_DEBUG_FLAG")
-  (values
-    '("nop-picking" "CLUTTER_DEBUG_NOP_PICKING")
-    '("dump-pick-buffers" "CLUTTER_DEBUG_DUMP_PICK_BUFFERS")
-  )
-)
-
-(define-flags DrawDebugFlag
-  (in-module "Clutter")
-  (c-name "ClutterDrawDebugFlag")
-  (gtype-id "CLUTTER_TYPE_DRAW_DEBUG_FLAG")
-  (values
-    '("disable-swap-events" "CLUTTER_DEBUG_DISABLE_SWAP_EVENTS")
-    '("disable-clipped-redraws" "CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS")
-    '("redraws" "CLUTTER_DEBUG_REDRAWS")
+    '("axis-none" "CLUTTER_DRAG_AXIS_NONE")
+    '("x-axis" "CLUTTER_DRAG_X_AXIS")
+    '("y-axis" "CLUTTER_DRAG_Y_AXIS")
   )
 )
 
@@ -552,33 +611,6 @@
   )
 )
 
-(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")
-    '("stage-in-resize" "CLUTTER_STAGE_IN_RESIZE")
-    '("actor-internal-child" "CLUTTER_ACTOR_INTERNAL_CHILD")
-  )
-)
-
-(define-flags ProfileFlag
-  (in-module "Clutter")
-  (c-name "ClutterProfileFlag")
-  (gtype-id "CLUTTER_TYPE_PROFILE_FLAG")
-  (values
-    '("picking-only" "CLUTTER_PROFILE_PICKING_ONLY")
-    '("disable-report" "CLUTTER_PROFILE_DISABLE_REPORT")
-  )
-)
-
 (define-enum ScriptError
   (in-module "Clutter")
   (c-name "ClutterScriptError")
@@ -767,6 +799,16 @@
   )
 )
 
+(define-enum ShaderType
+  (in-module "Clutter")
+  (c-name "ClutterShaderType")
+  (gtype-id "CLUTTER_TYPE_SHADER_TYPE")
+  (values
+    '("vertex-shader" "CLUTTER_VERTEX_SHADER")
+    '("fragment-shader" "CLUTTER_FRAGMENT_SHADER")
+  )
+)
+
 (define-enum UnitType
   (in-module "Clutter")
   (c-name "ClutterUnitType")
@@ -781,6 +823,73 @@
 )
 
 
+;; From clutter-action.h
+
+(define-function clutter_action_get_type
+  (c-name "clutter_action_get_type")
+  (return-type "GType")
+)
+
+(define-method add_action
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_action")
+  (return-type "none")
+  (parameters
+    '("ClutterAction*" "action")
+  )
+)
+
+(define-method add_action_with_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_action_with_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("ClutterAction*" "action")
+  )
+)
+
+(define-method remove_action
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_action")
+  (return-type "none")
+  (parameters
+    '("ClutterAction*" "action")
+  )
+)
+
+(define-method remove_action_by_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_action_by_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_action
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_action")
+  (return-type "ClutterAction*")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_actions
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_actions")
+  (return-type "GList*")
+)
+
+(define-method clear_actions
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_clear_actions")
+  (return-type "none")
+)
+
+
+
 ;; From clutter-actor.h
 
 (define-function clutter_actor_get_type
@@ -1271,6 +1380,21 @@
   )
 )
 
+(define-method set_clip_to_allocation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_clip_to_allocation")
+  (return-type "none")
+  (parameters
+    '("gboolean" "clip_set")
+  )
+)
+
+(define-method get_clip_to_allocation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_clip_to_allocation")
+  (return-type "gboolean")
+)
+
 (define-method set_parent
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_parent")
@@ -1301,6 +1425,15 @@
   (return-type "none")
 )
 
+(define-method contains
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_contains")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterActor*" "descendant")
+  )
+)
+
 (define-method get_stage
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_stage")
@@ -1688,6 +1821,128 @@
   (return-type "none")
 )
 
+(define-method has_allocation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_has_allocation")
+  (return-type "gboolean")
+)
+
+(define-method get_accessible
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_accessible")
+  (return-type "AtkObject*")
+)
+
+
+
+;; From clutter-actor-meta.h
+
+(define-function clutter_actor_meta_get_type
+  (c-name "clutter_actor_meta_get_type")
+  (return-type "GType")
+)
+
+(define-method set_name
+  (of-object "ClutterActorMeta")
+  (c-name "clutter_actor_meta_set_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_name
+  (of-object "ClutterActorMeta")
+  (c-name "clutter_actor_meta_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_enabled
+  (of-object "ClutterActorMeta")
+  (c-name "clutter_actor_meta_set_enabled")
+  (return-type "none")
+  (parameters
+    '("gboolean" "is_enabled")
+  )
+)
+
+(define-method get_enabled
+  (of-object "ClutterActorMeta")
+  (c-name "clutter_actor_meta_get_enabled")
+  (return-type "gboolean")
+)
+
+(define-method get_actor
+  (of-object "ClutterActorMeta")
+  (c-name "clutter_actor_meta_get_actor")
+  (return-type "ClutterActor*")
+)
+
+
+
+;; From clutter-align-constraint.h
+
+(define-function clutter_align_constraint_get_type
+  (c-name "clutter_align_constraint_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_align_constraint_new
+  (c-name "clutter_align_constraint_new")
+  (is-constructor-of "ClutterAlignConstraint")
+  (return-type "ClutterConstraint*")
+  (parameters
+    '("ClutterActor*" "source")
+    '("ClutterAlignAxis" "axis")
+    '("gfloat" "factor")
+  )
+)
+
+(define-method set_source
+  (of-object "ClutterAlignConstraint")
+  (c-name "clutter_align_constraint_set_source")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "source")
+  )
+)
+
+(define-method get_source
+  (of-object "ClutterAlignConstraint")
+  (c-name "clutter_align_constraint_get_source")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_align_axis
+  (of-object "ClutterAlignConstraint")
+  (c-name "clutter_align_constraint_set_align_axis")
+  (return-type "none")
+  (parameters
+    '("ClutterAlignAxis" "axis")
+  )
+)
+
+(define-method get_align_axis
+  (of-object "ClutterAlignConstraint")
+  (c-name "clutter_align_constraint_get_align_axis")
+  (return-type "ClutterAlignAxis")
+)
+
+(define-method set_factor
+  (of-object "ClutterAlignConstraint")
+  (c-name "clutter_align_constraint_set_factor")
+  (return-type "none")
+  (parameters
+    '("gfloat" "factor")
+  )
+)
+
+(define-method get_factor
+  (of-object "ClutterAlignConstraint")
+  (c-name "clutter_align_constraint_get_factor")
+  (return-type "gfloat")
+)
+
 
 
 ;; From clutter-alpha.h
@@ -1819,6 +2074,35 @@
   )
 )
 
+(define-method find_property
+  (of-object "ClutterAnimatable")
+  (c-name "clutter_animatable_find_property")
+  (return-type "GParamSpec*")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method get_initial_state
+  (of-object "ClutterAnimatable")
+  (c-name "clutter_animatable_get_initial_state")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("GValue*" "value")
+  )
+)
+
+(define-method set_final_state
+  (of-object "ClutterAnimatable")
+  (c-name "clutter_animatable_set_final_state")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("const-GValue*" "value")
+  )
+)
+
 
 
 ;; From clutter-animation.h
@@ -1869,7 +2153,7 @@
   (c-name "clutter_animation_set_duration")
   (return-type "none")
   (parameters
-    '("gint" "msecs")
+    '("guint" "msecs")
   )
 )
 
@@ -2296,12 +2580,6 @@
   )
 )
 
-(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")
@@ -2332,34 +2610,40 @@
   (return-type "guint")
 )
 
-(define-method set_font_options
+(define-method set_font_name
   (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_font_options")
+  (c-name "clutter_backend_set_font_name")
   (return-type "none")
   (parameters
-    '("const-cairo_font_options_t*" "options")
+    '("const-gchar*" "font_name")
   )
 )
 
-(define-method get_font_options
+(define-method get_font_name
   (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_font_options")
-  (return-type "const-cairo_font_options_t*")
+  (c-name "clutter_backend_get_font_name")
+  (return-type "const-gchar*")
 )
 
-(define-method set_font_name
+(define-method get_resolution
   (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_font_name")
+  (c-name "clutter_backend_get_resolution")
+  (return-type "gdouble")
+)
+
+(define-method set_font_options
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_font_options")
   (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
+    '("const-cairo_font_options_t*" "options")
   )
 )
 
-(define-method get_font_name
+(define-method get_font_options
   (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_font_name")
-  (return-type "const-gchar*")
+  (c-name "clutter_backend_get_font_options")
+  (return-type "const-cairo_font_options_t*")
 )
 
 
@@ -2886,7 +3170,68 @@
 
 
 
-;; From clutter-bezier.h
+;; From clutter-bind-constraint.h
+
+(define-function clutter_bind_constraint_get_type
+  (c-name "clutter_bind_constraint_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_bind_constraint_new
+  (c-name "clutter_bind_constraint_new")
+  (is-constructor-of "ClutterBindConstraint")
+  (return-type "ClutterConstraint*")
+  (parameters
+    '("ClutterActor*" "source")
+    '("ClutterBindCoordinate" "coordinate")
+    '("gfloat" "offset")
+  )
+)
+
+(define-method set_source
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_set_source")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "source")
+  )
+)
+
+(define-method get_source
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_get_source")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_coordinate
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_set_coordinate")
+  (return-type "none")
+  (parameters
+    '("ClutterBindCoordinate" "coordinate")
+  )
+)
+
+(define-method get_coordinate
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_get_coordinate")
+  (return-type "ClutterBindCoordinate")
+)
+
+(define-method set_offset
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_set_offset")
+  (return-type "none")
+  (parameters
+    '("gfloat" "offset")
+  )
+)
+
+(define-method get_offset
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_get_offset")
+  (return-type "gfloat")
+)
 
 
 
@@ -3075,6 +3420,21 @@
 
 
 
+;; From clutter-blur-effect.h
+
+(define-function clutter_blur_effect_get_type
+  (c-name "clutter_blur_effect_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_blur_effect_new
+  (c-name "clutter_blur_effect_new")
+  (is-constructor-of "ClutterBlurEffect")
+  (return-type "ClutterEffect*")
+)
+
+
+
 ;; From clutter-box.h
 
 (define-function clutter_box_get_type
@@ -3228,6 +3588,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_homogeneous
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_homogeneous")
+  (return-type "none")
+  (parameters
+    '("gboolean" "homogeneous")
+  )
+)
+
+(define-method get_homogeneous
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_homogeneous")
+  (return-type "gboolean")
+)
+
 (define-method set_pack_start
   (of-object "ClutterBoxLayout")
   (c-name "clutter_box_layout_set_pack_start")
@@ -3460,6 +3835,21 @@
 
 
 
+;; From clutter-click-action.h
+
+(define-function clutter_click_action_get_type
+  (c-name "clutter_click_action_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_click_action_new
+  (c-name "clutter_click_action_new")
+  (is-constructor-of "ClutterClickAction")
+  (return-type "ClutterAction*")
+)
+
+
+
 ;; From clutter-clone.h
 
 (define-function clutter_clone_get_type
@@ -3677,6 +4067,106 @@
 
 
 
+;; From clutter-colorize-effect.h
+
+(define-function clutter_colorize_effect_get_type
+  (c-name "clutter_colorize_effect_get_type")
+  (return-type "GType")
+)
+
+(define-method ize_effect_new
+  (of-object "ClutterColor")
+  (c-name "clutter_colorize_effect_new")
+  (return-type "ClutterEffect*")
+)
+
+(define-method set_tint
+  (of-object "ClutterColorizeEffect")
+  (c-name "clutter_colorize_effect_set_tint")
+  (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "tint")
+  )
+)
+
+(define-method get_tint
+  (of-object "ClutterColorizeEffect")
+  (c-name "clutter_colorize_effect_get_tint")
+  (return-type "none")
+  (parameters
+    '("ClutterColor*" "tint")
+  )
+)
+
+
+
+;; From clutter-constraint.h
+
+(define-function clutter_constraint_get_type
+  (c-name "clutter_constraint_get_type")
+  (return-type "GType")
+)
+
+(define-method add_constraint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_constraint")
+  (return-type "none")
+  (parameters
+    '("ClutterConstraint*" "constraint")
+  )
+)
+
+(define-method add_constraint_with_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_constraint_with_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("ClutterConstraint*" "constraint")
+  )
+)
+
+(define-method remove_constraint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_constraint")
+  (return-type "none")
+  (parameters
+    '("ClutterConstraint*" "constraint")
+  )
+)
+
+(define-method remove_constraint_by_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_constraint_by_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_constraints
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_constraints")
+  (return-type "GList*")
+)
+
+(define-method get_constraint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_constraint")
+  (return-type "ClutterConstraint*")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method clear_constraints
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_clear_constraints")
+  (return-type "none")
+)
+
+
+
 ;; From clutter-container.h
 
 (define-function clutter_container_get_type
@@ -3894,7 +4384,53 @@
 
 
 
-;; From clutter-debug.h
+;; From clutter-deform-effect.h
+
+(define-function clutter_deform_effect_get_type
+  (c-name "clutter_deform_effect_get_type")
+  (return-type "GType")
+)
+
+(define-method set_back_material
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_set_back_material")
+  (return-type "none")
+  (parameters
+    '("CoglHandle" "material")
+  )
+)
+
+(define-method get_back_material
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_get_back_material")
+  (return-type "CoglHandle")
+)
+
+(define-method set_n_tiles
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_set_n_tiles")
+  (return-type "none")
+  (parameters
+    '("guint" "x_tiles")
+    '("guint" "y_tiles")
+  )
+)
+
+(define-method get_n_tiles
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_get_n_tiles")
+  (return-type "none")
+  (parameters
+    '("guint*" "x_tiles")
+    '("guint*" "y_tiles")
+  )
+)
+
+(define-method invalidate
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_invalidate")
+  (return-type "none")
+)
 
 
 
@@ -3902,6 +4438,39 @@
 
 
 
+;; From clutter-desaturate-effect.h
+
+(define-function clutter_desaturate_effect_get_type
+  (c-name "clutter_desaturate_effect_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_desaturate_effect_new
+  (c-name "clutter_desaturate_effect_new")
+  (is-constructor-of "ClutterDesaturateEffect")
+  (return-type "ClutterEffect*")
+  (parameters
+    '("gdouble" "factor")
+  )
+)
+
+(define-method set_factor
+  (of-object "ClutterDesaturateEffect")
+  (c-name "clutter_desaturate_effect_set_factor")
+  (return-type "none")
+  (parameters
+    '("gdouble" "factor")
+  )
+)
+
+(define-method get_factor
+  (of-object "ClutterDesaturateEffect")
+  (c-name "clutter_desaturate_effect_get_factor")
+  (return-type "gdouble")
+)
+
+
+
 ;; From clutter-device-manager.h
 
 (define-function clutter_device_manager_get_type
@@ -3946,6 +4515,153 @@
 
 
 
+;; From clutter-drag-action.h
+
+(define-function clutter_drag_action_get_type
+  (c-name "clutter_drag_action_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_drag_action_new
+  (c-name "clutter_drag_action_new")
+  (is-constructor-of "ClutterDragAction")
+  (return-type "ClutterAction*")
+)
+
+(define-method set_drag_threshold
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_set_drag_threshold")
+  (return-type "none")
+  (parameters
+    '("guint" "threshold")
+  )
+)
+
+(define-method get_drag_threshold
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_drag_threshold")
+  (return-type "guint")
+)
+
+(define-method set_drag_handle
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_set_drag_handle")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "handle")
+  )
+)
+
+(define-method get_drag_handle
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_drag_handle")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_drag_axis
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_set_drag_axis")
+  (return-type "none")
+  (parameters
+    '("ClutterDragAxis" "axis")
+  )
+)
+
+(define-method get_drag_axis
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_drag_axis")
+  (return-type "ClutterDragAxis")
+)
+
+(define-method get_press_coords
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_press_coords")
+  (return-type "none")
+  (parameters
+    '("gfloat*" "press_x")
+    '("gfloat*" "press_y")
+  )
+)
+
+(define-method get_motion_coords
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_motion_coords")
+  (return-type "none")
+  (parameters
+    '("gfloat*" "motion_x")
+    '("gfloat*" "motion_y")
+  )
+)
+
+
+
+;; From clutter-effect.h
+
+(define-function clutter_effect_get_type
+  (c-name "clutter_effect_get_type")
+  (return-type "GType")
+)
+
+(define-method add_effect
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_effect")
+  (return-type "none")
+  (parameters
+    '("ClutterEffect*" "effect")
+  )
+)
+
+(define-method add_effect_with_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_effect_with_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("ClutterEffect*" "effect")
+  )
+)
+
+(define-method remove_effect
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_effect")
+  (return-type "none")
+  (parameters
+    '("ClutterEffect*" "effect")
+  )
+)
+
+(define-method remove_effect_by_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_effect_by_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_effects
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_effects")
+  (return-type "GList*")
+)
+
+(define-method get_effect
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_effect")
+  (return-type "ClutterEffect*")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method clear_effects
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_clear_effects")
+  (return-type "none")
+)
+
+
+
 ;; From clutter-enum-types.h
 
 (define-function clutter_actor_flags_get_type
@@ -3963,11 +4679,21 @@
   (return-type "GType")
 )
 
+(define-function clutter_align_axis_get_type
+  (c-name "clutter_align_axis_get_type")
+  (return-type "GType")
+)
+
 (define-function clutter_interpolation_get_type
   (c-name "clutter_interpolation_get_type")
   (return-type "GType")
 )
 
+(define-function clutter_bind_coordinate_get_type
+  (c-name "clutter_bind_coordinate_get_type")
+  (return-type "GType")
+)
+
 (define-function clutter_bin_alignment_get_type
   (c-name "clutter_bin_alignment_get_type")
   (return-type "GType")
@@ -3978,6 +4704,11 @@
   (return-type "GType")
 )
 
+(define-function clutter_drag_axis_get_type
+  (c-name "clutter_drag_axis_get_type")
+  (return-type "GType")
+)
+
 (define-function clutter_modifier_type_get_type
   (c-name "clutter_modifier_type_get_type")
   (return-type "GType")
@@ -4098,6 +4829,11 @@
   (return-type "GType")
 )
 
+(define-function clutter_shader_type_get_type
+  (c-name "clutter_shader_type_get_type")
+  (return-type "GType")
+)
+
 (define-function clutter_unit_type_get_type
   (c-name "clutter_unit_type_get_type")
   (return-type "GType")
@@ -4536,52 +5272,6 @@
 
 
 
-;; 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 free
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_free")
-  (return-type "none")
-)
-
-(define-method add
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_add")
-  (return-type "guint32")
-  (parameters
-    '("gpointer" "ptr")
-  )
-)
-
-(define-method remove
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_remove")
-  (return-type "none")
-  (parameters
-    '("guint32" "id")
-  )
-)
-
-(define-method lookup
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_lookup")
-  (return-type "gpointer")
-  (parameters
-    '("guint32" "id")
-  )
-)
-
-
-
 ;; From clutter-input-device.h
 
 (define-function clutter_input_device_get_type
@@ -4765,6 +5455,15 @@
   )
 )
 
+(define-method compute
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_compute")
+  (return-type "const-GValue*")
+  (parameters
+    '("gdouble" "factor")
+  )
+)
+
 (define-function clutter_interval_register_progress_func
   (c-name "clutter_interval_register_progress_func")
   (return-type "none")
@@ -4784,10 +5483,6 @@
 
 
 
-;; From clutter-keysyms-table.h
-
-
-
 ;; From clutter-layout-manager.h
 
 (define-function clutter_layout_manager_get_type
@@ -5079,6 +5774,11 @@
   (return-type "gulong")
 )
 
+(define-function clutter_get_accessibility_enabled
+  (c-name "clutter_get_accessibility_enabled")
+  (return-type "gboolean")
+)
+
 (define-function clutter_threads_init
   (c-name "clutter_threads_init")
   (return-type "none")
@@ -5306,15 +6006,6 @@
 
 
 
-;; From clutter-master-clock.h
-
-(define-function clutter_master_clock_get_type
-  (c-name "clutter_master_clock_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From clutter-media.h
 
 (define-function clutter_media_get_type
@@ -5783,6 +6474,103 @@
 )
 
 
+
+;; From clutter-offscreen-effect.h
+
+(define-function clutter_offscreen_effect_get_type
+  (c-name "clutter_offscreen_effect_get_type")
+  (return-type "GType")
+)
+
+(define-method get_target
+  (of-object "ClutterOffscreenEffect")
+  (c-name "clutter_offscreen_effect_get_target")
+  (return-type "CoglHandle")
+)
+
+(define-method paint_target
+  (of-object "ClutterOffscreenEffect")
+  (c-name "clutter_offscreen_effect_paint_target")
+  (return-type "none")
+)
+
+(define-method create_target
+  (of-object "ClutterOffscreenEffect")
+  (c-name "clutter_offscreen_effect_create_target")
+  (return-type "CoglHandle")
+  (parameters
+    '("gfloat" "width")
+    '("gfloat" "height")
+  )
+)
+
+
+
+;; From clutter-page-turn-effect.h
+
+(define-function clutter_page_turn_effect_get_type
+  (c-name "clutter_page_turn_effect_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_page_turn_effect_new
+  (c-name "clutter_page_turn_effect_new")
+  (is-constructor-of "ClutterPageTurnEffect")
+  (return-type "ClutterEffect*")
+  (parameters
+    '("gdouble" "period")
+    '("gdouble" "angle")
+    '("gfloat" "radius")
+  )
+)
+
+(define-method set_period
+  (of-object "ClutterPageTurnEffect")
+  (c-name "clutter_page_turn_effect_set_period")
+  (return-type "none")
+  (parameters
+    '("gdouble" "period")
+  )
+)
+
+(define-method get_period
+  (of-object "ClutterPageTurnEffect")
+  (c-name "clutter_page_turn_effect_get_period")
+  (return-type "gdouble")
+)
+
+(define-method set_angle
+  (of-object "ClutterPageTurnEffect")
+  (c-name "clutter_page_turn_effect_set_angle")
+  (return-type "none")
+  (parameters
+    '("gdouble" "angle")
+  )
+)
+
+(define-method get_angle
+  (of-object "ClutterPageTurnEffect")
+  (c-name "clutter_page_turn_effect_get_angle")
+  (return-type "gdouble")
+)
+
+(define-method set_radius
+  (of-object "ClutterPageTurnEffect")
+  (c-name "clutter_page_turn_effect_set_radius")
+  (return-type "none")
+  (parameters
+    '("gfloat" "radius")
+  )
+)
+
+(define-method get_radius
+  (of-object "ClutterPageTurnEffect")
+  (c-name "clutter_page_turn_effect_get_radius")
+  (return-type "gfloat")
+)
+
+
+
 ;; From clutter-path.h
 
 (define-function clutter_path_get_type
@@ -6039,9 +6827,6 @@
 )
 
 
-;; From clutter-profile.h
-
-
 
 ;; From clutter-rectangle.h
 
@@ -6411,6 +7196,72 @@
 
 
 
+;; From clutter-settings.h
+
+(define-function clutter_settings_get_type
+  (c-name "clutter_settings_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_settings_get_default
+  (c-name "clutter_settings_get_default")
+  (return-type "ClutterSettings*")
+)
+
+
+
+;; From clutter-shader-effect.h
+
+(define-function clutter_shader_effect_get_type
+  (c-name "clutter_shader_effect_get_type")
+  (return-type "GType")
+)
+
+(define-method set_shader_source
+  (of-object "ClutterShaderEffect")
+  (c-name "clutter_shader_effect_set_shader_source")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "source")
+  )
+)
+
+(define-method set_uniform
+  (of-object "ClutterShaderEffect")
+  (c-name "clutter_shader_effect_set_uniform")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("GType" "gtype")
+    '("gsize" "n_values")
+  )
+  (varargs #t)
+)
+
+(define-method set_uniform_value
+  (of-object "ClutterShaderEffect")
+  (c-name "clutter_shader_effect_set_uniform_value")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method get_shader
+  (of-object "ClutterShaderEffect")
+  (c-name "clutter_shader_effect_get_shader")
+  (return-type "CoglHandle")
+)
+
+(define-method get_program
+  (of-object "ClutterShaderEffect")
+  (c-name "clutter_shader_effect_get_program")
+  (return-type "CoglHandle")
+)
+
+
+
 ;; From clutter-shader.h
 
 (define-function clutter_shader_error_quark
@@ -6884,6 +7735,21 @@
   )
 )
 
+(define-method set_no_clear_hint
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_no_clear_hint")
+  (return-type "none")
+  (parameters
+    '("gboolean" "no_clear")
+  )
+)
+
+(define-method get_no_clear_hint
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_no_clear_hint")
+  (return-type "gboolean")
+)
+
 
 
 ;; From clutter-stage-manager.h
@@ -6936,6 +7802,215 @@
 
 
 
+;; From clutter-state.h
+
+(define-function clutter_state_get_type
+  (c-name "clutter_state_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_state_new
+  (c-name "clutter_state_new")
+  (is-constructor-of "ClutterState")
+  (return-type "ClutterState*")
+)
+
+(define-method set_state
+  (of-object "ClutterState")
+  (c-name "clutter_state_set_state")
+  (return-type "ClutterTimeline*")
+  (parameters
+    '("const-gchar*" "target_state_name")
+  )
+)
+
+(define-method warp_to_state
+  (of-object "ClutterState")
+  (c-name "clutter_state_warp_to_state")
+  (return-type "ClutterTimeline*")
+  (parameters
+    '("const-gchar*" "target_state_name")
+  )
+)
+
+(define-method set_key
+  (of-object "ClutterState")
+  (c-name "clutter_state_set_key")
+  (return-type "ClutterState*")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+    '("guint" "mode")
+    '("const-GValue*" "value")
+    '("gdouble" "pre_delay")
+    '("gdouble" "post_delay")
+  )
+)
+
+(define-method set_duration
+  (of-object "ClutterState")
+  (c-name "clutter_state_set_duration")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("guint" "duration")
+  )
+)
+
+(define-method get_duration
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_duration")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+  )
+)
+
+(define-method set
+  (of-object "ClutterState")
+  (c-name "clutter_state_set")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("gpointer" "first_object")
+    '("const-gchar*" "first_property_name")
+    '("gulong" "first_mode")
+  )
+  (varargs #t)
+)
+
+(define-method get_states
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_states")
+  (return-type "GList*")
+)
+
+(define-method get_keys
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_keys")
+  (return-type "GList*")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method remove_key
+  (of-object "ClutterState")
+  (c-name "clutter_state_remove_key")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method get_timeline
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_timeline")
+  (return-type "ClutterTimeline*")
+)
+
+(define-method set_animator
+  (of-object "ClutterState")
+  (c-name "clutter_state_set_animator")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("ClutterAnimator*" "animator")
+  )
+)
+
+(define-method get_animator
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_animator")
+  (return-type "ClutterAnimator*")
+  (parameters
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+  )
+)
+
+(define-method get_state
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_state")
+  (return-type "const-gchar*")
+)
+
+(define-function clutter_state_key_get_type
+  (c-name "clutter_state_key_get_type")
+  (return-type "GType")
+)
+
+(define-method get_pre_delay
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_pre_delay")
+  (return-type "gdouble")
+)
+
+(define-method get_post_delay
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_post_delay")
+  (return-type "gdouble")
+)
+
+(define-method get_mode
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_mode")
+  (return-type "gulong")
+)
+
+(define-method get_value
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_value")
+  (return-type "none")
+  (parameters
+    '("GValue*" "value")
+  )
+)
+
+(define-method get_property_type
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_property_type")
+  (return-type "GType")
+)
+
+(define-method get_object
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_object")
+  (return-type "GObject*")
+)
+
+(define-method get_property_name
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_property_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_source_state_name
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_source_state_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_target_state_name
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_target_state_name")
+  (return-type "const-gchar*")
+)
+
+
+
 ;; From clutter-text.h
 
 (define-function clutter_text_get_type
@@ -7677,6 +8752,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_pick_with_alpha
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_pick_with_alpha")
+  (return-type "none")
+  (parameters
+    '("gboolean" "pick_with_alpha")
+  )
+)
+
+(define-method get_pick_with_alpha
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_pick_with_alpha")
+  (return-type "gboolean")
+)
+
 
 
 ;; From clutter-timeline.h
@@ -7885,10 +8975,6 @@
 
 
 
-;; From clutter-timeout-interval.h
-
-
-
 ;; From clutter-timeout-pool.h
 
 (define-function clutter_timeout_pool_new
@@ -8091,6 +9177,16 @@
   (return-type "GType")
 )
 
+(define-method union
+  (of-object "ClutterGeometry")
+  (c-name "clutter_geometry_union")
+  (return-type "none")
+  (parameters
+    '("const-ClutterGeometry*" "geometry_b")
+    '("ClutterGeometry*" "result")
+  )
+)
+
 (define-function clutter_knot_get_type
   (c-name "clutter_knot_get_type")
   (return-type "GType")
diff --git a/clutter/src/filelist.am b/clutter/src/filelist.am
index d4246ba..a49a5f1 100644
--- a/clutter/src/filelist.am
+++ b/clutter/src/filelist.am
@@ -12,6 +12,8 @@ files_defs =			\
 
 files_hg =			\
 	actor.hg		\
+	actor-meta.hg		\
+	action.hg		\
 	alpha.hg		\
 	animation.hg		\
 	backend.hg		\
diff --git a/clutter/src/path.ccg b/clutter/src/path.ccg
index a40b3a4..b6a075d 100644
--- a/clutter/src/path.ccg
+++ b/clutter/src/path.ccg
@@ -112,4 +112,21 @@ Path::Nodes::const_iterator::reference Path::Nodes::const_iterator::operator[](d
   return node;
 }
 
+namespace {
+
+static void c_foreach_callback(const ClutterPathNode *node,  gpointer data)
+{
+  Clutter::Path::ForEachSlot* slot = static_cast<Clutter::Path::ForEachSlot*>(data);
+  if(slot)
+    (*slot)(Clutter::PathNode(node));
+}
+
+} //anonymous namespace
+
+void Path::foreach(const ForEachSlot& slot)
+{
+  const void* data = &slot;
+  clutter_path_foreach(gobj(), &c_foreach_callback, const_cast<void*>(data));
+}
+  
 } // namespace Clutter
diff --git a/clutter/src/path.hg b/clutter/src/path.hg
index f67d2bd..8dda3ba 100644
--- a/clutter/src/path.hg
+++ b/clutter/src/path.hg
@@ -126,6 +126,18 @@ public:
           clutter_path_get_nodes, clutter_path_insert_node, clutter_path_remove_node,
           clutter_path_replace_node)
 
+  typedef void (* ClutterPathCallback) (const ClutterPathNode *node,
+                                      gpointer               data);
+                     
+  /** For instance,
+   * void on_path_foreach(const Clutter::PathNode& node);
+   */                 
+  typedef sigc::slot<void, PathNode> ForEachSlot;
+  
+  //TODO: Documentation.
+  void foreach(const ForEachSlot& slot);
+  _IGNORE(clutter_path_foreach)
+                                                
   _WRAP_METHOD(Glib::ustring get_description() const, clutter_path_get_description)
   _WRAP_METHOD(void set_description(const Glib::ustring& str), clutter_path_set_description)
 
diff --git a/clutter/src/stage.hg b/clutter/src/stage.hg
index 5b54214..551d488 100644
--- a/clutter/src/stage.hg
+++ b/clutter/src/stage.hg
@@ -123,6 +123,9 @@ public:
   _WRAP_METHOD(void set_minimum_size(guint width, guint height), clutter_stage_set_minimum_size)
   _WRAP_METHOD(void get_minimum_size(guint& width, guint& height), clutter_stage_get_minimum_size)
 
+  _WRAP_METHOD(void set_no_clear_hint(bool no_clear = true), clutter_stage_set_no_clear_hint)
+  _WRAP_METHOD(bool get_no_clear_hint() const, clutter_stage_get_no_clear_hint)
+  
   _WRAP_SIGNAL(void fullscreen(), "fullscreen")
   _WRAP_SIGNAL(void unfullscreen(), "unfullscreen")
   _WRAP_SIGNAL(void activate(), "activate")
diff --git a/clutter/src/texture.hg b/clutter/src/texture.hg
index e4c8664..50e0160 100644
--- a/clutter/src/texture.hg
+++ b/clutter/src/texture.hg
@@ -91,6 +91,9 @@ public:
 
   _WRAP_METHOD(bool get_load_data_async() const, clutter_texture_get_load_data_async)
   _WRAP_METHOD(void set_load_data_async(bool load_async=true), clutter_texture_set_load_data_async)
+  
+  _WRAP_METHOD(void set_pick_with_alpha(bool pick_with_alpha = true), clutter_texture_set_pick_with_alpha)
+  _WRAP_METHOD(bool get_pick_with_alpha() const, clutter_texture_get_pick_with_alpha)
 
   // TODO: figure out what to do with this GError parameter
   //_WRAP_SIGNAL(void load_finished(GError* error), "load_finished")
diff --git a/codegen/extradefs/generate_extra_defs_clutter.cc b/codegen/extradefs/generate_extra_defs_clutter.cc
index 423198d..9ce0f45 100644
--- a/codegen/extradefs/generate_extra_defs_clutter.cc
+++ b/codegen/extradefs/generate_extra_defs_clutter.cc
@@ -26,6 +26,8 @@ int main(int argc, char** argv)
 
   std::cout
     << get_defs(CLUTTER_TYPE_ACTOR)
+    << get_defs(CLUTTER_TYPE_ACTOR_META)
+    << get_defs(CLUTTER_TYPE_ACTION)
     << get_defs(CLUTTER_TYPE_ALPHA)
     << get_defs(CLUTTER_TYPE_ANIMATION)
     << get_defs(CLUTTER_TYPE_BACKEND)
diff --git a/codegen/m4/convert_clutter.m4 b/codegen/m4/convert_clutter.m4
index 7d259e2..fc39210 100644
--- a/codegen/m4/convert_clutter.m4
+++ b/codegen/m4/convert_clutter.m4
@@ -4,6 +4,12 @@ _CONVERSION(`const Glib::RefPtr<const Actor>&',`ClutterActor*',__CONVERT_CONST_R
 _CONVERSION(`ClutterActor*',`Glib::RefPtr<Actor>',`Glib::wrap($3)')
 _CONVERSION(`ClutterActor*',`Glib::RefPtr<const Actor>',`Glib::wrap($3)')
 
+_CONVERSION(`const Glib::RefPtr<Action>&',`ClutterAction*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<const Action>&',`ClutterAction*',__CONVERT_CONST_REFPTR_TO_P)
+
+_CONVERSION(`ClutterAction*',`Glib::RefPtr<Action>',`Glib::wrap($3)')
+_CONVERSION(`ClutterAction*',`Glib::RefPtr<const Action>',`Glib::wrap($3)')
+
 _CONVERSION(`const Glib::RefPtr<ActorBox>&',`ClutterActorBox*',__CONVERT_REFPTR_TO_P)
 
 _CONVERSION(`const Glib::RefPtr<Shader>&',`ClutterShader*',__CONVERT_REFPTR_TO_P)
diff --git a/configure.ac b/configure.ac
index 8e1086a..c844ebd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.2.0 pangomm-1.4 >= 2.24'])
+AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.3.8 pangomm-1.4 >= 2.24 atkmm-1.6 >= 2.20'])
 PKG_CHECK_MODULES([CLUTTERMM], [$CLUTTERMM_MODULES])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
@@ -51,6 +51,7 @@ MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
 MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 MM_ARG_WITH_TAGFILE_DOC([cairomm-1.0.tag], [cairomm-1.0])
 MM_ARG_WITH_TAGFILE_DOC([pangomm-1.4.tag], [pangomm-1.4])
+MM_ARG_WITH_TAGFILE_DOC([atkmm-1.6.tag], [atkmm-1.6])
 
 AC_LANG([C++])
 MM_ARG_ENABLE_WARNINGS([CLUTTERMM_WXXFLAGS],
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]