unofficial mirror of guile-devel@gnu.org 
 help / color / mirror / Atom feed
From: David Pirotte <david@altosw.be>
To: guile-devel <guile-devel@gnu.org>
Subject: guile-clutter, clutter-devel: some more patches
Date: Fri, 10 Oct 2014 17:24:39 -0300	[thread overview]
Message-ID: <20141010172439.26c3302d@capac> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 544 bytes --]

Hello,

	guile-clutter
	  clutter-devel:
		update generated .defs files for clutter 1.12
		remove types deprecated in 1.12
		fix some more files should not be tracked by git
		CoglPixelFormat must become visible from guile-clutter
		clutter_image_set_data special wrapper, plus some deprecated fixes

From now on, who checkout clutter-devel and apply the 12 patches I sent will have a
perfectly usable guile-clutter 1.12.2.  Note that you'd first need to checkout and
compile the guile-gnome devel branch.

Happy hacking,
David

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0008-update-generated-.defs-files-for-clutter-1.12.patch --]
[-- Type: text/x-patch, Size: 301627 bytes --]

From ed560c4e5a675da2a71120cccbf311d2e682648b Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Thu, 9 Oct 2014 17:36:44 -0300
Subject: [PATCH 08/12] update generated .defs files for clutter 1.12

* clutter/gnome/defs/clutter-types.defs:
* clutter/gnome/defs/clutter-x11.defs:
* clutter/gnome/defs/clutter.defs: These files are generated.  This
  update brings them up-to-date with clutter version 1.12.
---
 clutter/gnome/defs/clutter-types.defs |  137 +
 clutter/gnome/defs/clutter-x11.defs   |    8 +
 clutter/gnome/defs/clutter.defs       | 9240 +++++++++++++++++++--------------
 3 files changed, 5461 insertions(+), 3924 deletions(-)

diff --git a/clutter/gnome/defs/clutter-types.defs b/clutter/gnome/defs/clutter-types.defs
index f01dc14..d75eab4 100644
--- a/clutter/gnome/defs/clutter-types.defs
+++ b/clutter/gnome/defs/clutter-types.defs
@@ -87,6 +87,14 @@
     '("ease-in-bounce" "CLUTTER_EASE_IN_BOUNCE")
     '("ease-out-bounce" "CLUTTER_EASE_OUT_BOUNCE")
     '("ease-in-out-bounce" "CLUTTER_EASE_IN_OUT_BOUNCE")
+    '("steps" "CLUTTER_STEPS")
+    '("step-start" "CLUTTER_STEP_START")
+    '("step-end" "CLUTTER_STEP_END")
+    '("cubic-bezier" "CLUTTER_CUBIC_BEZIER")
+    '("ease" "CLUTTER_EASE")
+    '("ease-in" "CLUTTER_EASE_IN")
+    '("ease-out" "CLUTTER_EASE_OUT")
+    '("ease-in-out" "CLUTTER_EASE_IN_OUT")
     '("animation-last" "CLUTTER_ANIMATION_LAST")
   )
 )
@@ -471,6 +479,8 @@
     '("xtilt" "CLUTTER_INPUT_AXIS_XTILT")
     '("ytilt" "CLUTTER_INPUT_AXIS_YTILT")
     '("wheel" "CLUTTER_INPUT_AXIS_WHEEL")
+    '("distance" "CLUTTER_INPUT_AXIS_DISTANCE")
+    '("last" "CLUTTER_INPUT_AXIS_LAST")
   )
 )
 
@@ -509,6 +519,17 @@
   )
 )
 
+(define-enum PanAxis
+  (in-module "Clutter")
+  (c-name "ClutterPanAxis")
+  (gtype-id "CLUTTER_TYPE_PAN_AXIS")
+  (values
+    '("axis-none" "CLUTTER_PAN_AXIS_NONE")
+    '("x-axis" "CLUTTER_PAN_X_AXIS")
+    '("y-axis" "CLUTTER_PAN_Y_AXIS")
+  )
+)
+
 (define-enum TableAlignment
   (in-module "Clutter")
   (c-name "ClutterTableAlignment")
@@ -634,6 +655,73 @@
   )
 )
 
+(define-enum Orientation
+  (in-module "Clutter")
+  (c-name "ClutterOrientation")
+  (gtype-id "CLUTTER_TYPE_ORIENTATION")
+  (values
+    '("horizontal" "CLUTTER_ORIENTATION_HORIZONTAL")
+    '("vertical" "CLUTTER_ORIENTATION_VERTICAL")
+  )
+)
+
+(define-flags ScrollMode
+  (in-module "Clutter")
+  (c-name "ClutterScrollMode")
+  (gtype-id "CLUTTER_TYPE_SCROLL_MODE")
+  (values
+    '("none" "CLUTTER_SCROLL_NONE")
+    '("horizontally" "CLUTTER_SCROLL_HORIZONTALLY")
+    '("vertically" "CLUTTER_SCROLL_VERTICALLY")
+    '("both" "CLUTTER_SCROLL_BOTH")
+  )
+)
+
+(define-enum GridPosition
+  (in-module "Clutter")
+  (c-name "ClutterGridPosition")
+  (gtype-id "CLUTTER_TYPE_GRID_POSITION")
+  (values
+    '("left" "CLUTTER_GRID_POSITION_LEFT")
+    '("right" "CLUTTER_GRID_POSITION_RIGHT")
+    '("top" "CLUTTER_GRID_POSITION_TOP")
+    '("bottom" "CLUTTER_GRID_POSITION_BOTTOM")
+  )
+)
+
+(define-flags ContentRepeat
+  (in-module "Clutter")
+  (c-name "ClutterContentRepeat")
+  (gtype-id "CLUTTER_TYPE_CONTENT_REPEAT")
+  (values
+    '("none" "CLUTTER_REPEAT_NONE")
+    '("x-axis" "CLUTTER_REPEAT_X_AXIS")
+    '("y-axis" "CLUTTER_REPEAT_Y_AXIS")
+    '("both" "CLUTTER_REPEAT_BOTH")
+  )
+)
+
+(define-enum StepMode
+  (in-module "Clutter")
+  (c-name "ClutterStepMode")
+  (gtype-id "CLUTTER_TYPE_STEP_MODE")
+  (values
+    '("start" "CLUTTER_STEP_MODE_START")
+    '("end" "CLUTTER_STEP_MODE_END")
+  )
+)
+
+(define-enum ZoomAxis
+  (in-module "Clutter")
+  (c-name "ClutterZoomAxis")
+  (gtype-id "CLUTTER_TYPE_ZOOM_AXIS")
+  (values
+    '("x-axis" "CLUTTER_ZOOM_X_AXIS")
+    '("y-axis" "CLUTTER_ZOOM_Y_AXIS")
+    '("both" "CLUTTER_ZOOM_BOTH")
+  )
+)
+
 (define-enum ImageError
   (in-module "Clutter")
   (c-name "ClutterImageError")
@@ -887,6 +975,13 @@
   (gtype-id "CLUTTER_TYPE_LAYOUT_MANAGER")
 )
 
+(define-object GridLayout
+  (in-module "Clutter")
+  (parent "ClutterLayoutManager")
+  (c-name "ClutterGridLayout")
+  (gtype-id "CLUTTER_TYPE_GRID_LAYOUT")
+)
+
 (define-object FlowLayout
   (in-module "Clutter")
   (parent "ClutterLayoutManager")
@@ -957,6 +1052,13 @@
   (gtype-id "CLUTTER_TYPE_DEFORM_EFFECT")
 )
 
+(define-object PanAction
+  (in-module "Clutter")
+  (parent "ClutterGestureAction")
+  (c-name "ClutterPanAction")
+  (gtype-id "CLUTTER_TYPE_PAN_ACTION")
+)
+
 (define-object Path
   (in-module "Clutter")
   (parent "GInitiallyUnowned")
@@ -971,6 +1073,13 @@
   (gtype-id "CLUTTER_TYPE_RECTANGLE")
 )
 
+(define-object RotateAction
+  (in-module "Clutter")
+  (parent "ClutterGestureAction")
+  (c-name "ClutterRotateAction")
+  (gtype-id "CLUTTER_TYPE_ROTATE_ACTION")
+)
+
 (define-object Score
   (in-module "Clutter")
   (parent "GObject")
@@ -985,6 +1094,13 @@
   (gtype-id "CLUTTER_TYPE_SCRIPT")
 )
 
+(define-object ScrollActor
+  (in-module "Clutter")
+  (parent "ClutterActor")
+  (c-name "ClutterScrollActor")
+  (gtype-id "CLUTTER_TYPE_SCROLL_ACTOR")
+)
+
 (define-object Shader
   (in-module "Clutter")
   (parent "GObject")
@@ -1076,3 +1192,24 @@
   (gtype-id "CLUTTER_TYPE_PROPERTY_TRANSITION")
 )
 
+(define-object KeyframeTransition
+  (in-module "Clutter")
+  (parent "ClutterPropertyTransition")
+  (c-name "ClutterKeyframeTransition")
+  (gtype-id "CLUTTER_TYPE_KEYFRAME_TRANSITION")
+)
+
+(define-object TransitionGroup
+  (in-module "Clutter")
+  (parent "ClutterTransition")
+  (c-name "ClutterTransitionGroup")
+  (gtype-id "CLUTTER_TYPE_TRANSITION_GROUP")
+)
+
+(define-object ZoomAction
+  (in-module "Clutter")
+  (parent "ClutterGestureAction")
+  (c-name "ClutterZoomAction")
+  (gtype-id "CLUTTER_TYPE_ZOOM_ACTION")
+)
+
diff --git a/clutter/gnome/defs/clutter-x11.defs b/clutter/gnome/defs/clutter-x11.defs
index 44885cb..9e523ad 100644
--- a/clutter/gnome/defs/clutter-x11.defs
+++ b/clutter/gnome/defs/clutter-x11.defs
@@ -143,6 +143,14 @@
   )
 )
 
+(define-function clutter_x11_event_sequence_get_touch_detail
+  (c-name "clutter_x11_event_sequence_get_touch_detail")
+  (return-type "guint")
+  (parameters
+    '("const-ClutterEventSequence*" "sequence")
+  )
+)
+
 
 
 ;; From /opt/clutter/include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h
diff --git a/clutter/gnome/defs/clutter.defs b/clutter/gnome/defs/clutter.defs
index 736c433..4e35c89 100644
--- a/clutter/gnome/defs/clutter.defs
+++ b/clutter/gnome/defs/clutter.defs
@@ -1,5 +1,5 @@
 ;; -*- scheme -*-
-(include type-ignores) (include "clutter-types.defs") (include overrides)
+(include type-ignores) (include "cogl-types.defs") (include "clutter-types.defs") (include overrides)
 
 ;; From /opt/clutter/include/clutter-1.0/clutter/clutter-action.h
 
@@ -349,15 +349,6 @@
   )
 )
 
-(define-method get_allocation_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_allocation_geometry")
-  (return-type "none")
-  (parameters
-    '("ClutterGeometry*" "geom")
-  )
-)
-
 (define-method get_allocation_vertices
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_allocation_vertices")
@@ -499,18 +490,18 @@
   )
 )
 
-(define-method set_depth
+(define-method set_z_position
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_depth")
+  (c-name "clutter_actor_set_z_position")
   (return-type "none")
   (parameters
-    '("gfloat" "depth")
+    '("gfloat" "z_position")
   )
 )
 
-(define-method get_depth
+(define-method get_z_position
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_depth")
+  (c-name "clutter_actor_get_z_position")
   (return-type "gfloat")
 )
 
@@ -637,6 +628,45 @@
   )
 )
 
+(define-method set_x_expand
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_x_expand")
+  (return-type "none")
+  (parameters
+    '("gboolean" "expand")
+  )
+)
+
+(define-method get_x_expand
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_x_expand")
+  (return-type "gboolean")
+)
+
+(define-method set_y_expand
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_y_expand")
+  (return-type "none")
+  (parameters
+    '("gboolean" "expand")
+  )
+)
+
+(define-method get_y_expand
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_y_expand")
+  (return-type "gboolean")
+)
+
+(define-method needs_expand
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_needs_expand")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterOrientation" "orientation")
+  )
+)
+
 (define-method set_clip
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_clip")
@@ -807,6 +837,21 @@
   )
 )
 
+(define-method set_content_repeat
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_content_repeat")
+  (return-type "none")
+  (parameters
+    '("ClutterContentRepeat" "repeat")
+  )
+)
+
+(define-method get_content_repeat
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_content_repeat")
+  (return-type "ClutterContentRepeat")
+)
+
 (define-method get_content_box
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_content_box")
@@ -887,7 +932,7 @@
   (c-name "clutter_actor_event")
   (return-type "gboolean")
   (parameters
-    '("ClutterEvent*" "event")
+    '("const-ClutterEvent*" "event")
     '("gboolean" "capture")
   )
 )
@@ -1139,6 +1184,12 @@
   (return-type "none")
 )
 
+(define-method is_valid
+  (of-object "ClutterActorIter")
+  (c-name "clutter_actor_iter_is_valid")
+  (return-type "gboolean")
+)
+
 (define-method is_rotated
   (of-object "ClutterActor")
   (c-name "clutter_actor_is_rotated")
@@ -1151,77 +1202,67 @@
   (return-type "gboolean")
 )
 
-(define-method set_rotation
+(define-method set_pivot_point
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_rotation")
+  (c-name "clutter_actor_set_pivot_point")
   (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle")
-    '("gfloat" "x")
-    '("gfloat" "y")
-    '("gfloat" "z")
+    '("gfloat" "pivot_x")
+    '("gfloat" "pivot_y")
   )
 )
 
-(define-method set_z_rotation_from_gravity
+(define-method get_pivot_point
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_z_rotation_from_gravity")
+  (c-name "clutter_actor_get_pivot_point")
   (return-type "none")
   (parameters
-    '("gdouble" "angle")
-    '("ClutterGravity" "gravity")
+    '("gfloat*" "pivot_x")
+    '("gfloat*" "pivot_y")
   )
 )
 
-(define-method get_rotation
+(define-method set_pivot_point_z
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_rotation")
-  (return-type "gdouble")
+  (c-name "clutter_actor_set_pivot_point_z")
+  (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gfloat*" "x")
-    '("gfloat*" "y")
-    '("gfloat*" "z")
+    '("gfloat" "pivot_z")
   )
 )
 
-(define-method get_z_rotation_gravity
+(define-method get_pivot_point_z
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_z_rotation_gravity")
-  (return-type "ClutterGravity")
+  (c-name "clutter_actor_get_pivot_point_z")
+  (return-type "gfloat")
 )
 
-(define-method set_scale
+(define-method set_rotation_angle
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scale")
+  (c-name "clutter_actor_set_rotation_angle")
   (return-type "none")
   (parameters
-    '("gdouble" "scale_x")
-    '("gdouble" "scale_y")
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
   )
 )
 
-(define-method set_scale_full
+(define-method get_rotation_angle
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scale_full")
-  (return-type "none")
+  (c-name "clutter_actor_get_rotation_angle")
+  (return-type "gdouble")
   (parameters
-    '("gdouble" "scale_x")
-    '("gdouble" "scale_y")
-    '("gfloat" "center_x")
-    '("gfloat" "center_y")
+    '("ClutterRotateAxis" "axis")
   )
 )
 
-(define-method set_scale_with_gravity
+(define-method set_scale
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scale_with_gravity")
+  (c-name "clutter_actor_set_scale")
   (return-type "none")
   (parameters
     '("gdouble" "scale_x")
     '("gdouble" "scale_y")
-    '("ClutterGravity" "gravity")
   )
 )
 
@@ -1235,73 +1276,76 @@
   )
 )
 
-(define-method get_scale_center
+(define-method set_scale_z
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_scale_center")
+  (c-name "clutter_actor_set_scale_z")
   (return-type "none")
   (parameters
-    '("gfloat*" "center_x")
-    '("gfloat*" "center_y")
+    '("gdouble" "scale_z")
   )
 )
 
-(define-method get_scale_gravity
+(define-method get_scale_z
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_scale_gravity")
-  (return-type "ClutterGravity")
+  (c-name "clutter_actor_get_scale_z")
+  (return-type "gdouble")
 )
 
-(define-method set_anchor_point
+(define-method set_translation
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_point")
+  (c-name "clutter_actor_set_translation")
   (return-type "none")
   (parameters
-    '("gfloat" "anchor_x")
-    '("gfloat" "anchor_y")
+    '("gfloat" "translate_x")
+    '("gfloat" "translate_y")
+    '("gfloat" "translate_z")
   )
 )
 
-(define-method move_anchor_point
+(define-method get_translation
   (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_point")
+  (c-name "clutter_actor_get_translation")
   (return-type "none")
   (parameters
-    '("gfloat" "anchor_x")
-    '("gfloat" "anchor_y")
+    '("gfloat*" "translate_x")
+    '("gfloat*" "translate_y")
+    '("gfloat*" "translate_z")
   )
 )
 
-(define-method get_anchor_point
+(define-method set_transform
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_anchor_point")
+  (c-name "clutter_actor_set_transform")
   (return-type "none")
   (parameters
-    '("gfloat*" "anchor_x")
-    '("gfloat*" "anchor_y")
+    '("const-ClutterMatrix*" "transform")
   )
 )
 
-(define-method get_anchor_point_gravity
+(define-method get_transform
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_anchor_point_gravity")
-  (return-type "ClutterGravity")
+  (c-name "clutter_actor_get_transform")
+  (return-type "none")
+  (parameters
+    '("ClutterMatrix*" "transform")
+  )
 )
 
-(define-method set_anchor_point_from_gravity
+(define-method set_child_transform
   (of-object "ClutterActor")
-  (c-name "clutter_actor_set_anchor_point_from_gravity")
+  (c-name "clutter_actor_set_child_transform")
   (return-type "none")
   (parameters
-    '("ClutterGravity" "gravity")
+    '("const-ClutterMatrix*" "transform")
   )
 )
 
-(define-method move_anchor_point_from_gravity
+(define-method get_child_transform
   (of-object "ClutterActor")
-  (c-name "clutter_actor_move_anchor_point_from_gravity")
+  (c-name "clutter_actor_get_child_transform")
   (return-type "none")
   (parameters
-    '("ClutterGravity" "gravity")
+    '("ClutterMatrix*" "transform")
   )
 )
 
@@ -1367,15 +1411,6 @@
   )
 )
 
-(define-method get_transformation_matrix
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_transformation_matrix")
-  (return-type "none")
-  (parameters
-    '("CoglMatrix*" "matrix")
-  )
-)
-
 (define-method save_easing_state
   (of-object "ClutterActor")
   (c-name "clutter_actor_save_easing_state")
@@ -1579,114 +1614,6 @@
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-alpha.h
-
-(define-function clutter_alpha_get_type
-  (c-name "clutter_alpha_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_alpha_new
-  (c-name "clutter_alpha_new")
-  (is-constructor-of "ClutterAlpha")
-  (return-type "ClutterAlpha*")
-)
-
-(define-function clutter_alpha_new_full
-  (c-name "clutter_alpha_new_full")
-  (return-type "ClutterAlpha*")
-  (parameters
-    '("ClutterTimeline*" "timeline")
-    '("gulong" "mode")
-  )
-)
-
-(define-function clutter_alpha_new_with_func
-  (c-name "clutter_alpha_new_with_func")
-  (return-type "ClutterAlpha*")
-  (parameters
-    '("ClutterTimeline*" "timeline")
-    '("ClutterAlphaFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
-(define-method get_alpha
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_alpha")
-  (return-type "gdouble")
-)
-
-(define-method set_func
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_func")
-  (return-type "none")
-  (parameters
-    '("ClutterAlphaFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
-(define-method set_closure
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_closure")
-  (return-type "none")
-  (parameters
-    '("GClosure*" "closure")
-  )
-)
-
-(define-method set_timeline
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_set_timeline")
-  (return-type "none")
-  (parameters
-    '("ClutterTimeline*" "timeline")
-  )
-)
-
-(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
-    '("gulong" "mode")
-  )
-)
-
-(define-method get_mode
-  (of-object "ClutterAlpha")
-  (c-name "clutter_alpha_get_mode")
-  (return-type "gulong")
-)
-
-(define-function clutter_alpha_register_func
-  (c-name "clutter_alpha_register_func")
-  (return-type "gulong")
-  (parameters
-    '("ClutterAlphaFunc" "func")
-    '("gpointer" "data")
-  )
-)
-
-(define-function clutter_alpha_register_closure
-  (c-name "clutter_alpha_register_closure")
-  (return-type "gulong")
-  (parameters
-    '("GClosure*" "closure")
-  )
-)
-
-
-
 ;; From /opt/clutter/include/clutter-1.0/clutter/clutter-animatable.h
 
 (define-function clutter_animatable_get_type
@@ -1737,2568 +1664,2180 @@
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-animation.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-backend.h
 
-(define-function clutter_animation_get_type
-  (c-name "clutter_animation_get_type")
+(define-function clutter_backend_get_type
+  (c-name "clutter_backend_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_animation_new
-  (c-name "clutter_animation_new")
-  (is-constructor-of "ClutterAnimation")
-  (return-type "ClutterAnimation*")
-)
+(define-function clutter_get_default_backend
+  (c-name "clutter_get_default_backend")
+  (return-type "ClutterBackend*")
+)
 
-(define-method set_object
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_object")
+(define-method get_resolution
+  (of-object "ClutterBackend")
+  (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
-    '("GObject*" "object")
+    '("const-cairo_font_options_t*" "options")
   )
 )
 
-(define-method get_object
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_object")
-  (return-type "GObject*")
+(define-method get_font_options
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_font_options")
+  (return-type "const-cairo_font_options_t*")
 )
 
-(define-method set_mode
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_mode")
-  (return-type "none")
-  (parameters
-    '("gulong" "mode")
-  )
+(define-method get_cogl_context
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_cogl_context")
+  (return-type "CoglContext*")
 )
 
-(define-method get_mode
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_mode")
-  (return-type "gulong")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-bind-constraint.h
+
+(define-function clutter_bind_constraint_get_type
+  (c-name "clutter_bind_constraint_get_type")
+  (return-type "GType")
 )
 
-(define-method set_duration
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_duration")
+(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
-    '("guint" "msecs")
+    '("ClutterActor*" "source")
   )
 )
 
-(define-method get_duration
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_duration")
-  (return-type "guint")
+(define-method get_source
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_get_source")
+  (return-type "ClutterActor*")
 )
 
-(define-method set_loop
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_loop")
+(define-method set_coordinate
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_set_coordinate")
   (return-type "none")
   (parameters
-    '("gboolean" "loop")
+    '("ClutterBindCoordinate" "coordinate")
   )
 )
 
-(define-method get_loop
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_loop")
-  (return-type "gboolean")
+(define-method get_coordinate
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_get_coordinate")
+  (return-type "ClutterBindCoordinate")
 )
 
-(define-method set_timeline
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_timeline")
+(define-method set_offset
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_set_offset")
   (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
+    '("gfloat" "offset")
   )
 )
 
-(define-method get_timeline
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-method get_offset
+  (of-object "ClutterBindConstraint")
+  (c-name "clutter_bind_constraint_get_offset")
+  (return-type "gfloat")
 )
 
-(define-method bind
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_bind")
-  (return-type "ClutterAnimation*")
-  (parameters
-    '("const-gchar*" "property_name")
-    '("const-GValue*" "final")
-  )
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-binding-pool.h
+
+(define-function clutter_binding_pool_get_type
+  (c-name "clutter_binding_pool_get_type")
+  (return-type "GType")
 )
 
-(define-method bind_interval
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_bind_interval")
-  (return-type "ClutterAnimation*")
+(define-function clutter_binding_pool_new
+  (c-name "clutter_binding_pool_new")
+  (is-constructor-of "ClutterBindingPool")
+  (return-type "ClutterBindingPool*")
   (parameters
-    '("const-gchar*" "property_name")
-    '("ClutterInterval*" "interval")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method has_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_has_property")
-  (return-type "gboolean")
+(define-function clutter_binding_pool_get_for_class
+  (c-name "clutter_binding_pool_get_for_class")
+  (return-type "ClutterBindingPool*")
   (parameters
-    '("const-gchar*" "property_name")
+    '("gpointer" "klass")
   )
 )
 
-(define-method update
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_update")
-  (return-type "ClutterAnimation*")
+(define-function clutter_binding_pool_find
+  (c-name "clutter_binding_pool_find")
+  (return-type "ClutterBindingPool*")
   (parameters
-    '("const-gchar*" "property_name")
-    '("const-GValue*" "final")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method update_interval
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_update_interval")
+(define-method install_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_install_action")
   (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
-    '("ClutterInterval*" "interval")
+    '("const-gchar*" "action_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GCallback" "callback")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method unbind_property
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_unbind_property")
+(define-method install_closure
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_install_closure")
   (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
+    '("const-gchar*" "action_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GClosure*" "closure")
   )
 )
 
-(define-method get_interval
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_interval")
-  (return-type "ClutterInterval*")
+(define-method override_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_override_action")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "property_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GCallback" "callback")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method completed
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_completed")
+(define-method override_closure
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_override_closure")
   (return-type "none")
-)
-
-(define-method animate
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate")
-  (return-type "ClutterAnimation*")
   (parameters
-    '("gulong" "mode")
-    '("guint" "duration")
-    '("const-gchar*" "first_property_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GClosure*" "closure")
   )
-  (varargs #t)
 )
 
-(define-method animate_with_timeline
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_timeline")
-  (return-type "ClutterAnimation*")
+(define-method find_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_find_action")
+  (return-type "const-gchar*")
   (parameters
-    '("gulong" "mode")
-    '("ClutterTimeline*" "timeline")
-    '("const-gchar*" "first_property_name")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
   )
-  (varargs #t)
 )
 
-(define-method animatev
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animatev")
-  (return-type "ClutterAnimation*")
+(define-method remove_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_remove_action")
+  (return-type "none")
   (parameters
-    '("gulong" "mode")
-    '("guint" "duration")
-    '("gint" "n_properties")
-    '("const-gchar*-const[]" "properties")
-    '("const-GValue*" "values")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
   )
 )
 
-(define-method animate_with_timelinev
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_timelinev")
-  (return-type "ClutterAnimation*")
+(define-method activate
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_activate")
+  (return-type "gboolean")
   (parameters
-    '("gulong" "mode")
-    '("ClutterTimeline*" "timeline")
-    '("gint" "n_properties")
-    '("const-gchar*-const[]" "properties")
-    '("const-GValue*" "values")
+    '("guint" "key_val")
+    '("ClutterModifierType" "modifiers")
+    '("GObject*" "gobject")
   )
 )
 
-(define-method get_animation
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_animation")
-  (return-type "ClutterAnimation*")
+(define-method block_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_block_action")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "action_name")
+  )
 )
 
-(define-method detach_animation
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_detach_animation")
+(define-method unblock_action
+  (of-object "ClutterBindingPool")
+  (c-name "clutter_binding_pool_unblock_action")
   (return-type "none")
+  (parameters
+    '("const-gchar*" "action_name")
+  )
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-animator.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-bin-layout.h
 
-(define-function clutter_animator_get_type
-  (c-name "clutter_animator_get_type")
+(define-function clutter_bin_layout_get_type
+  (c-name "clutter_bin_layout_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_animator_new
-  (c-name "clutter_animator_new")
-  (is-constructor-of "ClutterAnimator")
-  (return-type "ClutterAnimator*")
-)
-
-(define-method set_key
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_set_key")
-  (return-type "ClutterAnimator*")
+(define-function clutter_bin_layout_new
+  (c-name "clutter_bin_layout_new")
+  (is-constructor-of "ClutterBinLayout")
+  (return-type "ClutterLayoutManager*")
   (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
-    '("guint" "mode")
-    '("gdouble" "progress")
-    '("const-GValue*" "value")
+    '("ClutterBinAlignment" "x_align")
+    '("ClutterBinAlignment" "y_align")
   )
 )
 
-(define-method set
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_set")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/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 /opt/clutter/include/clutter-1.0/clutter/clutter-box-layout.h
+
+(define-function clutter_box_layout_get_type
+  (c-name "clutter_box_layout_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_box_layout_new
+  (c-name "clutter_box_layout_new")
+  (is-constructor-of "ClutterBoxLayout")
+  (return-type "ClutterLayoutManager*")
+)
+
+(define-method set_orientation
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_orientation")
   (return-type "none")
   (parameters
-    '("gpointer" "first_object")
-    '("const-gchar*" "first_property_name")
-    '("guint" "first_mode")
-    '("gdouble" "first_progress")
+    '("ClutterOrientation" "orientation")
   )
-  (varargs #t)
 )
 
-(define-method get_keys
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_get_keys")
-  (return-type "GList*")
-  (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
-    '("gdouble" "progress")
-  )
+(define-method get_orientation
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_orientation")
+  (return-type "ClutterOrientation")
 )
 
-(define-method remove_key
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_remove_key")
+(define-method set_spacing
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_spacing")
   (return-type "none")
   (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
-    '("gdouble" "progress")
+    '("guint" "spacing")
   )
 )
 
-(define-method start
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_start")
-  (return-type "ClutterTimeline*")
+(define-method get_spacing
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_spacing")
+  (return-type "guint")
 )
 
-(define-method compute_value
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_compute_value")
-  (return-type "gboolean")
+(define-method set_homogeneous
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_homogeneous")
+  (return-type "none")
   (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
-    '("gdouble" "progress")
-    '("GValue*" "value")
+    '("gboolean" "homogeneous")
   )
 )
 
-(define-method get_timeline
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_get_timeline")
-  (return-type "ClutterTimeline*")
+(define-method get_homogeneous
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_homogeneous")
+  (return-type "gboolean")
 )
 
-(define-method set_timeline
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_set_timeline")
+(define-method set_pack_start
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_pack_start")
   (return-type "none")
   (parameters
-    '("ClutterTimeline*" "timeline")
+    '("gboolean" "pack_start")
   )
 )
 
-(define-method get_duration
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_get_duration")
-  (return-type "guint")
+(define-method get_pack_start
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_pack_start")
+  (return-type "gboolean")
 )
 
-(define-method set_duration
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_set_duration")
+(define-method set_vertical
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_vertical")
   (return-type "none")
   (parameters
-    '("guint" "duration")
+    '("gboolean" "vertical")
   )
 )
 
-(define-method property_get_ease_in
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_property_get_ease_in")
+(define-method get_vertical
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_vertical")
   (return-type "gboolean")
+)
+
+(define-method pack
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_pack")
+  (return-type "none")
   (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
+    '("ClutterActor*" "actor")
+    '("gboolean" "expand")
+    '("gboolean" "x_fill")
+    '("gboolean" "y_fill")
+    '("ClutterBoxAlignment" "x_align")
+    '("ClutterBoxAlignment" "y_align")
   )
 )
 
-(define-method property_set_ease_in
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_property_set_ease_in")
+(define-method set_alignment
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_alignment")
   (return-type "none")
   (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
-    '("gboolean" "ease_in")
+    '("ClutterActor*" "actor")
+    '("ClutterBoxAlignment" "x_align")
+    '("ClutterBoxAlignment" "y_align")
   )
 )
 
-(define-method property_get_interpolation
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_property_get_interpolation")
-  (return-type "ClutterInterpolation")
+(define-method get_alignment
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_alignment")
+  (return-type "none")
   (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
+    '("ClutterActor*" "actor")
+    '("ClutterBoxAlignment*" "x_align")
+    '("ClutterBoxAlignment*" "y_align")
   )
 )
 
-(define-method property_set_interpolation
-  (of-object "ClutterAnimator")
-  (c-name "clutter_animator_property_set_interpolation")
+(define-method set_fill
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_fill")
   (return-type "none")
   (parameters
-    '("GObject*" "object")
-    '("const-gchar*" "property_name")
-    '("ClutterInterpolation" "interpolation")
+    '("ClutterActor*" "actor")
+    '("gboolean" "x_fill")
+    '("gboolean" "y_fill")
   )
 )
 
-(define-function clutter_animator_key_get_type
-  (c-name "clutter_animator_key_get_type")
-  (return-type "GType")
+(define-method get_fill
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_fill")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("gboolean*" "x_fill")
+    '("gboolean*" "y_fill")
+  )
 )
 
-(define-method get_object
-  (of-object "ClutterAnimatorKey")
-  (c-name "clutter_animator_key_get_object")
-  (return-type "GObject*")
+(define-method set_expand
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_expand")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("gboolean" "expand")
+  )
 )
 
-(define-method get_property_name
-  (of-object "ClutterAnimatorKey")
-  (c-name "clutter_animator_key_get_property_name")
-  (return-type "const-gchar*")
+(define-method get_expand
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_expand")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
 )
 
-(define-method get_property_type
-  (of-object "ClutterAnimatorKey")
-  (c-name "clutter_animator_key_get_property_type")
-  (return-type "GType")
-)
-
-(define-method get_mode
-  (of-object "ClutterAnimatorKey")
-  (c-name "clutter_animator_key_get_mode")
-  (return-type "gulong")
-)
-
-(define-method get_progress
-  (of-object "ClutterAnimatorKey")
-  (c-name "clutter_animator_key_get_progress")
-  (return-type "gdouble")
-)
-
-(define-method get_value
-  (of-object "ClutterAnimatorKey")
-  (c-name "clutter_animator_key_get_value")
-  (return-type "gboolean")
+(define-method set_use_animations
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_use_animations")
+  (return-type "none")
   (parameters
-    '("GValue*" "value")
+    '("gboolean" "animate")
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-backend.h
-
-(define-function clutter_backend_get_type
-  (c-name "clutter_backend_get_type")
-  (return-type "GType")
+(define-method get_use_animations
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_use_animations")
+  (return-type "gboolean")
 )
 
-(define-function clutter_get_default_backend
-  (c-name "clutter_get_default_backend")
-  (return-type "ClutterBackend*")
+(define-method set_easing_mode
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_easing_mode")
+  (return-type "none")
+  (parameters
+    '("gulong" "mode")
+  )
 )
 
-(define-method get_resolution
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_resolution")
-  (return-type "gdouble")
+(define-method get_easing_mode
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_easing_mode")
+  (return-type "gulong")
 )
 
-(define-method set_font_options
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_font_options")
+(define-method set_easing_duration
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_set_easing_duration")
   (return-type "none")
   (parameters
-    '("const-cairo_font_options_t*" "options")
+    '("guint" "msecs")
   )
 )
 
-(define-method get_font_options
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_font_options")
-  (return-type "const-cairo_font_options_t*")
-)
-
-(define-method get_cogl_context
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_cogl_context")
-  (return-type "CoglContext*")
+(define-method get_easing_duration
+  (of-object "ClutterBoxLayout")
+  (c-name "clutter_box_layout_get_easing_duration")
+  (return-type "guint")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-bind-constraint.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-brightness-contrast-effect.h
 
-(define-function clutter_bind_constraint_get_type
-  (c-name "clutter_bind_constraint_get_type")
+(define-function clutter_brightness_contrast_effect_get_type
+  (c-name "clutter_brightness_contrast_effect_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-function clutter_brightness_contrast_effect_new
+  (c-name "clutter_brightness_contrast_effect_new")
+  (is-constructor-of "ClutterBrightnessContrastEffect")
+  (return-type "ClutterEffect*")
 )
 
-(define-method set_source
-  (of-object "ClutterBindConstraint")
-  (c-name "clutter_bind_constraint_set_source")
+(define-method set_brightness_full
+  (of-object "ClutterBrightnessContrastEffect")
+  (c-name "clutter_brightness_contrast_effect_set_brightness_full")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "source")
+    '("float" "red")
+    '("float" "green")
+    '("float" "blue")
   )
 )
 
-(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")
+(define-method set_brightness
+  (of-object "ClutterBrightnessContrastEffect")
+  (c-name "clutter_brightness_contrast_effect_set_brightness")
   (return-type "none")
   (parameters
-    '("ClutterBindCoordinate" "coordinate")
+    '("float" "brightness")
   )
 )
 
-(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")
+(define-method get_brightness
+  (of-object "ClutterBrightnessContrastEffect")
+  (c-name "clutter_brightness_contrast_effect_get_brightness")
   (return-type "none")
   (parameters
-    '("gfloat" "offset")
-  )
-)
-
-(define-method get_offset
-  (of-object "ClutterBindConstraint")
-  (c-name "clutter_bind_constraint_get_offset")
-  (return-type "gfloat")
-)
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-binding-pool.h
-
-(define-function clutter_binding_pool_get_type
-  (c-name "clutter_binding_pool_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_binding_pool_new
-  (c-name "clutter_binding_pool_new")
-  (is-constructor-of "ClutterBindingPool")
-  (return-type "ClutterBindingPool*")
-  (parameters
-    '("const-gchar*" "name")
+    '("float*" "red")
+    '("float*" "green")
+    '("float*" "blue")
   )
 )
 
-(define-function clutter_binding_pool_get_for_class
-  (c-name "clutter_binding_pool_get_for_class")
-  (return-type "ClutterBindingPool*")
+(define-method set_contrast_full
+  (of-object "ClutterBrightnessContrastEffect")
+  (c-name "clutter_brightness_contrast_effect_set_contrast_full")
+  (return-type "none")
   (parameters
-    '("gpointer" "klass")
+    '("float" "red")
+    '("float" "green")
+    '("float" "blue")
   )
 )
 
-(define-function clutter_binding_pool_find
-  (c-name "clutter_binding_pool_find")
-  (return-type "ClutterBindingPool*")
+(define-method set_contrast
+  (of-object "ClutterBrightnessContrastEffect")
+  (c-name "clutter_brightness_contrast_effect_set_contrast")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("float" "contrast")
   )
 )
 
-(define-method install_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_install_action")
+(define-method get_contrast
+  (of-object "ClutterBrightnessContrastEffect")
+  (c-name "clutter_brightness_contrast_effect_get_contrast")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GCallback" "callback")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("float*" "red")
+    '("float*" "green")
+    '("float*" "blue")
   )
 )
 
-(define-method install_closure
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_install_closure")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-cairo.h
+
+(define-function clutter_cairo_clear
+  (c-name "clutter_cairo_clear")
   (return-type "none")
   (parameters
-    '("const-gchar*" "action_name")
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GClosure*" "closure")
+    '("cairo_t*" "cr")
   )
 )
 
-(define-method override_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_override_action")
+(define-function clutter_cairo_set_source_color
+  (c-name "clutter_cairo_set_source_color")
   (return-type "none")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GCallback" "callback")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("cairo_t*" "cr")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(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")
-  )
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-canvas.h
+
+(define-function clutter_canvas_get_type
+  (c-name "clutter_canvas_get_type")
+  (return-type "GType")
 )
 
-(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-function clutter_canvas_new
+  (c-name "clutter_canvas_new")
+  (is-constructor-of "ClutterCanvas")
+  (return-type "ClutterContent*")
 )
 
-(define-method remove_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_remove_action")
+(define-method set_size
+  (of-object "ClutterCanvas")
+  (c-name "clutter_canvas_set_size")
   (return-type "none")
   (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
+    '("int" "width")
+    '("int" "height")
   )
 )
 
-(define-method activate
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_activate")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "key_val")
-    '("ClutterModifierType" "modifiers")
-    '("GObject*" "gobject")
-  )
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-child-meta.h
+
+(define-function clutter_child_meta_get_type
+  (c-name "clutter_child_meta_get_type")
+  (return-type "GType")
 )
 
-(define-method block_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_block_action")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "action_name")
-  )
+(define-method get_container
+  (of-object "ClutterChildMeta")
+  (c-name "clutter_child_meta_get_container")
+  (return-type "ClutterContainer*")
 )
 
-(define-method unblock_action
-  (of-object "ClutterBindingPool")
-  (c-name "clutter_binding_pool_unblock_action")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "action_name")
-  )
+(define-method get_actor
+  (of-object "ClutterChildMeta")
+  (c-name "clutter_child_meta_get_actor")
+  (return-type "ClutterActor*")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-bin-layout.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-click-action.h
 
-(define-function clutter_bin_layout_get_type
-  (c-name "clutter_bin_layout_get_type")
+(define-function clutter_click_action_get_type
+  (c-name "clutter_click_action_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_bin_layout_new
-  (c-name "clutter_bin_layout_new")
-  (is-constructor-of "ClutterBinLayout")
-  (return-type "ClutterLayoutManager*")
-  (parameters
-    '("ClutterBinAlignment" "x_align")
-    '("ClutterBinAlignment" "y_align")
-  )
+(define-function clutter_click_action_new
+  (c-name "clutter_click_action_new")
+  (is-constructor-of "ClutterClickAction")
+  (return-type "ClutterAction*")
 )
 
-(define-method set_alignment
-  (of-object "ClutterBinLayout")
-  (c-name "clutter_bin_layout_set_alignment")
+(define-method get_button
+  (of-object "ClutterClickAction")
+  (c-name "clutter_click_action_get_button")
+  (return-type "guint")
+)
+
+(define-method get_state
+  (of-object "ClutterClickAction")
+  (c-name "clutter_click_action_get_state")
+  (return-type "ClutterModifierType")
+)
+
+(define-method get_coords
+  (of-object "ClutterClickAction")
+  (c-name "clutter_click_action_get_coords")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "child")
-    '("ClutterBinAlignment" "x_align")
-    '("ClutterBinAlignment" "y_align")
+    '("gfloat*" "press_x")
+    '("gfloat*" "press_y")
   )
 )
 
-(define-method get_alignment
-  (of-object "ClutterBinLayout")
-  (c-name "clutter_bin_layout_get_alignment")
+(define-method release
+  (of-object "ClutterClickAction")
+  (c-name "clutter_click_action_release")
   (return-type "none")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-clone.h
+
+(define-function clutter_clone_get_type
+  (c-name "clutter_clone_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_clone_new
+  (c-name "clutter_clone_new")
+  (is-constructor-of "ClutterClone")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterActor*" "child")
-    '("ClutterBinAlignment*" "x_align")
-    '("ClutterBinAlignment*" "y_align")
+    '("ClutterActor*" "source")
   )
 )
 
-(define-method add
-  (of-object "ClutterBinLayout")
-  (c-name "clutter_bin_layout_add")
+(define-method set_source
+  (of-object "ClutterClone")
+  (c-name "clutter_clone_set_source")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "child")
-    '("ClutterBinAlignment" "x_align")
-    '("ClutterBinAlignment" "y_align")
+    '("ClutterActor*" "source")
   )
 )
 
+(define-method get_source
+  (of-object "ClutterClone")
+  (c-name "clutter_clone_get_source")
+  (return-type "ClutterActor*")
+)
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/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 /opt/clutter/include/clutter-1.0/clutter/clutter-cogl-compat.h
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-box-layout.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-color.h
 
-(define-function clutter_box_layout_get_type
-  (c-name "clutter_box_layout_get_type")
+(define-function clutter_color_get_type
+  (c-name "clutter_color_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_box_layout_new
-  (c-name "clutter_box_layout_new")
-  (is-constructor-of "ClutterBoxLayout")
-  (return-type "ClutterLayoutManager*")
-)
-
-(define-method set_spacing
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_spacing")
-  (return-type "none")
+(define-function clutter_color_new
+  (c-name "clutter_color_new")
+  (is-constructor-of "ClutterColor")
+  (return-type "ClutterColor*")
   (parameters
-    '("guint" "spacing")
+    '("guint8" "red")
+    '("guint8" "green")
+    '("guint8" "blue")
+    '("guint8" "alpha")
   )
 )
 
-(define-method get_spacing
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_spacing")
-  (return-type "guint")
+(define-function clutter_color_alloc
+  (c-name "clutter_color_alloc")
+  (return-type "ClutterColor*")
 )
 
-(define-method set_vertical
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_vertical")
-  (return-type "none")
+(define-method init
+  (of-object "ClutterColor")
+  (c-name "clutter_color_init")
+  (return-type "ClutterColor*")
   (parameters
-    '("gboolean" "vertical")
+    '("guint8" "red")
+    '("guint8" "green")
+    '("guint8" "blue")
+    '("guint8" "alpha")
   )
 )
 
-(define-method get_vertical
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_vertical")
-  (return-type "gboolean")
+(define-method copy
+  (of-object "ClutterColor")
+  (c-name "clutter_color_copy")
+  (return-type "ClutterColor*")
 )
 
-(define-method set_homogeneous
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_homogeneous")
+(define-method free
+  (of-object "ClutterColor")
+  (c-name "clutter_color_free")
   (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")
+(define-method add
+  (of-object "ClutterColor")
+  (c-name "clutter_color_add")
   (return-type "none")
   (parameters
-    '("gboolean" "pack_start")
+    '("const-ClutterColor*" "b")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method get_pack_start
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_pack_start")
-  (return-type "gboolean")
-)
-
-(define-method pack
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_pack")
+(define-method subtract
+  (of-object "ClutterColor")
+  (c-name "clutter_color_subtract")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("gboolean" "expand")
-    '("gboolean" "x_fill")
-    '("gboolean" "y_fill")
-    '("ClutterBoxAlignment" "x_align")
-    '("ClutterBoxAlignment" "y_align")
+    '("const-ClutterColor*" "b")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method set_alignment
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_alignment")
+(define-method lighten
+  (of-object "ClutterColor")
+  (c-name "clutter_color_lighten")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterBoxAlignment" "x_align")
-    '("ClutterBoxAlignment" "y_align")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method get_alignment
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_alignment")
+(define-method darken
+  (of-object "ClutterColor")
+  (c-name "clutter_color_darken")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterBoxAlignment*" "x_align")
-    '("ClutterBoxAlignment*" "y_align")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method set_fill
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_fill")
+(define-method shade
+  (of-object "ClutterColor")
+  (c-name "clutter_color_shade")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("gboolean" "x_fill")
-    '("gboolean" "y_fill")
+    '("gdouble" "factor")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method get_fill
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_fill")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("gboolean*" "x_fill")
-    '("gboolean*" "y_fill")
-  )
-)
-
-(define-method set_expand
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_expand")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("gboolean" "expand")
-  )
+(define-method to_string
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_string")
+  (return-type "gchar*")
 )
 
-(define-method get_expand
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_expand")
+(define-method from_string
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_string")
   (return-type "gboolean")
   (parameters
-    '("ClutterActor*" "actor")
+    '("const-gchar*" "str")
   )
 )
 
-(define-method set_use_animations
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_use_animations")
+(define-method to_hls
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_hls")
   (return-type "none")
   (parameters
-    '("gboolean" "animate")
+    '("gfloat*" "hue")
+    '("gfloat*" "luminance")
+    '("gfloat*" "saturation")
   )
 )
 
-(define-method get_use_animations
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_use_animations")
-  (return-type "gboolean")
-)
-
-(define-method set_easing_mode
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_easing_mode")
+(define-method from_hls
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_hls")
   (return-type "none")
   (parameters
-    '("gulong" "mode")
+    '("gfloat" "hue")
+    '("gfloat" "luminance")
+    '("gfloat" "saturation")
   )
 )
 
-(define-method get_easing_mode
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_easing_mode")
-  (return-type "gulong")
+(define-method to_pixel
+  (of-object "ClutterColor")
+  (c-name "clutter_color_to_pixel")
+  (return-type "guint32")
 )
 
-(define-method set_easing_duration
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_set_easing_duration")
+(define-method from_pixel
+  (of-object "ClutterColor")
+  (c-name "clutter_color_from_pixel")
   (return-type "none")
   (parameters
-    '("guint" "msecs")
+    '("guint32" "pixel")
   )
 )
 
-(define-method get_easing_duration
-  (of-object "ClutterBoxLayout")
-  (c-name "clutter_box_layout_get_easing_duration")
+(define-function clutter_color_hash
+  (c-name "clutter_color_hash")
   (return-type "guint")
+  (parameters
+    '("gconstpointer" "v")
+  )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-brightness-contrast-effect.h
-
-(define-function clutter_brightness_contrast_effect_get_type
-  (c-name "clutter_brightness_contrast_effect_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_brightness_contrast_effect_new
-  (c-name "clutter_brightness_contrast_effect_new")
-  (is-constructor-of "ClutterBrightnessContrastEffect")
-  (return-type "ClutterEffect*")
-)
-
-(define-method set_brightness_full
-  (of-object "ClutterBrightnessContrastEffect")
-  (c-name "clutter_brightness_contrast_effect_set_brightness_full")
-  (return-type "none")
+(define-function clutter_color_equal
+  (c-name "clutter_color_equal")
+  (return-type "gboolean")
   (parameters
-    '("float" "red")
-    '("float" "green")
-    '("float" "blue")
+    '("gconstpointer" "v1")
+    '("gconstpointer" "v2")
   )
 )
 
-(define-method set_brightness
-  (of-object "ClutterBrightnessContrastEffect")
-  (c-name "clutter_brightness_contrast_effect_set_brightness")
+(define-method interpolate
+  (of-object "ClutterColor")
+  (c-name "clutter_color_interpolate")
   (return-type "none")
   (parameters
-    '("float" "brightness")
+    '("const-ClutterColor*" "final")
+    '("gdouble" "progress")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method get_brightness
-  (of-object "ClutterBrightnessContrastEffect")
-  (c-name "clutter_brightness_contrast_effect_get_brightness")
+(define-function clutter_value_set_color
+  (c-name "clutter_value_set_color")
   (return-type "none")
   (parameters
-    '("float*" "red")
-    '("float*" "green")
-    '("float*" "blue")
+    '("GValue*" "value")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method set_contrast_full
-  (of-object "ClutterBrightnessContrastEffect")
-  (c-name "clutter_brightness_contrast_effect_set_contrast_full")
-  (return-type "none")
+(define-function clutter_value_get_color
+  (c-name "clutter_value_get_color")
+  (return-type "const-ClutterColor*")
   (parameters
-    '("float" "red")
-    '("float" "green")
-    '("float" "blue")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method set_contrast
-  (of-object "ClutterBrightnessContrastEffect")
-  (c-name "clutter_brightness_contrast_effect_set_contrast")
-  (return-type "none")
+(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
-    '("float" "contrast")
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("const-ClutterColor*" "default_value")
+    '("GParamFlags" "flags")
   )
 )
 
-(define-method get_contrast
-  (of-object "ClutterBrightnessContrastEffect")
-  (c-name "clutter_brightness_contrast_effect_get_contrast")
-  (return-type "none")
+(define-function clutter_color_get_static
+  (c-name "clutter_color_get_static")
+  (return-type "const-ClutterColor*")
   (parameters
-    '("float*" "red")
-    '("float*" "green")
-    '("float*" "blue")
+    '("ClutterStaticColor" "color")
   )
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-cairo-texture.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-colorize-effect.h
 
-(define-function clutter_cairo_texture_get_type
-  (c-name "clutter_cairo_texture_get_type")
+(define-function clutter_colorize_effect_get_type
+  (c-name "clutter_colorize_effect_get_type")
   (return-type "GType")
 )
 
-(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-method ize_effect_new
+  (of-object "ClutterColor")
+  (c-name "clutter_colorize_effect_new")
+  (return-type "ClutterEffect*")
 )
 
-(define-method set_surface_size
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_set_surface_size")
+(define-method set_tint
+  (of-object "ClutterColorizeEffect")
+  (c-name "clutter_colorize_effect_set_tint")
   (return-type "none")
   (parameters
-    '("guint" "width")
-    '("guint" "height")
+    '("const-ClutterColor*" "tint")
   )
 )
 
-(define-method get_surface_size
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_get_surface_size")
+(define-method get_tint
+  (of-object "ClutterColorizeEffect")
+  (c-name "clutter_colorize_effect_get_tint")
   (return-type "none")
   (parameters
-    '("guint*" "width")
-    '("guint*" "height")
+    '("ClutterColor*" "tint")
   )
 )
 
-(define-method set_auto_resize
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_set_auto_resize")
-  (return-type "none")
-  (parameters
-    '("gboolean" "value")
-  )
-)
 
-(define-method get_auto_resize
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_get_auto_resize")
-  (return-type "gboolean")
-)
 
-(define-method clear
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_clear")
-  (return-type "none")
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-color-static.h
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-config.h
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-constraint.h
+
+(define-function clutter_constraint_get_type
+  (c-name "clutter_constraint_get_type")
+  (return-type "GType")
 )
 
-(define-method invalidate_rectangle
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_invalidate_rectangle")
+(define-method add_constraint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_constraint")
   (return-type "none")
   (parameters
-    '("cairo_rectangle_int_t*" "rect")
+    '("ClutterConstraint*" "constraint")
   )
 )
 
-(define-method invalidate
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_invalidate")
+(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-function clutter_cairo_set_source_color
-  (c-name "clutter_cairo_set_source_color")
+(define-method remove_constraint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_constraint")
   (return-type "none")
   (parameters
-    '("cairo_t*" "cr")
-    '("const-ClutterColor*" "color")
+    '("ClutterConstraint*" "constraint")
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-canvas.h
-
-(define-function clutter_canvas_get_type
-  (c-name "clutter_canvas_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_canvas_new
-  (c-name "clutter_canvas_new")
-  (is-constructor-of "ClutterCanvas")
-  (return-type "ClutterContent*")
-)
-
-(define-method set_size
-  (of-object "ClutterCanvas")
-  (c-name "clutter_canvas_set_size")
+(define-method remove_constraint_by_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_constraint_by_name")
   (return-type "none")
   (parameters
-    '("int" "width")
-    '("int" "height")
+    '("const-gchar*" "name")
   )
 )
 
+(define-method get_constraints
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_constraints")
+  (return-type "GList*")
+)
 
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-child-meta.h
-
-(define-function clutter_child_meta_get_type
-  (c-name "clutter_child_meta_get_type")
-  (return-type "GType")
+(define-method get_constraint
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_constraint")
+  (return-type "ClutterConstraint*")
+  (parameters
+    '("const-gchar*" "name")
+  )
 )
 
-(define-method get_container
-  (of-object "ClutterChildMeta")
-  (c-name "clutter_child_meta_get_container")
-  (return-type "ClutterContainer*")
+(define-method clear_constraints
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_clear_constraints")
+  (return-type "none")
 )
 
-(define-method get_actor
-  (of-object "ClutterChildMeta")
-  (c-name "clutter_child_meta_get_actor")
-  (return-type "ClutterActor*")
+(define-method has_constraints
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_has_constraints")
+  (return-type "gboolean")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-click-action.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-container.h
 
-(define-function clutter_click_action_get_type
-  (c-name "clutter_click_action_get_type")
+(define-function clutter_container_get_type
+  (c-name "clutter_container_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_click_action_new
-  (c-name "clutter_click_action_new")
-  (is-constructor-of "ClutterClickAction")
-  (return-type "ClutterAction*")
-)
-
-(define-method get_button
-  (of-object "ClutterClickAction")
-  (c-name "clutter_click_action_get_button")
-  (return-type "guint")
+(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_state
-  (of-object "ClutterClickAction")
-  (c-name "clutter_click_action_get_state")
-  (return-type "ClutterModifierType")
+(define-function clutter_container_class_find_child_property
+  (c-name "clutter_container_class_find_child_property")
+  (return-type "GParamSpec*")
+  (parameters
+    '("GObjectClass*" "klass")
+    '("const-gchar*" "property_name")
+  )
 )
 
-(define-method get_coords
-  (of-object "ClutterClickAction")
-  (c-name "clutter_click_action_get_coords")
-  (return-type "none")
+(define-function clutter_container_class_list_child_properties
+  (c-name "clutter_container_class_list_child_properties")
+  (return-type "GParamSpec**")
   (parameters
-    '("gfloat*" "press_x")
-    '("gfloat*" "press_y")
+    '("GObjectClass*" "klass")
+    '("guint*" "n_properties")
   )
 )
 
-(define-method release
-  (of-object "ClutterClickAction")
-  (c-name "clutter_click_action_release")
+(define-method create_child_meta
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_create_child_meta")
   (return-type "none")
-)
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-clone.h
-
-(define-function clutter_clone_get_type
-  (c-name "clutter_clone_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_clone_new
-  (c-name "clutter_clone_new")
-  (is-constructor-of "ClutterClone")
-  (return-type "ClutterActor*")
   (parameters
-    '("ClutterActor*" "source")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method set_source
-  (of-object "ClutterClone")
-  (c-name "clutter_clone_set_source")
+(define-method destroy_child_meta
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_destroy_child_meta")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "source")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_source
-  (of-object "ClutterClone")
-  (c-name "clutter_clone_get_source")
-  (return-type "ClutterActor*")
-)
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-cogl-compat.h
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-color.h
-
-(define-function clutter_color_get_type
-  (c-name "clutter_color_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_color_new
-  (c-name "clutter_color_new")
-  (is-constructor-of "ClutterColor")
-  (return-type "ClutterColor*")
+(define-method get_child_meta
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_get_child_meta")
+  (return-type "ClutterChildMeta*")
   (parameters
-    '("guint8" "red")
-    '("guint8" "green")
-    '("guint8" "blue")
-    '("guint8" "alpha")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method copy
-  (of-object "ClutterColor")
-  (c-name "clutter_color_copy")
-  (return-type "ClutterColor*")
-)
-
-(define-method free
-  (of-object "ClutterColor")
-  (c-name "clutter_color_free")
-  (return-type "none")
-)
-
-(define-method add
-  (of-object "ClutterColor")
-  (c-name "clutter_color_add")
+(define-method child_set_property
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_set_property")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "b")
-    '("ClutterColor*" "result")
+    '("ClutterActor*" "child")
+    '("const-gchar*" "property")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method subtract
-  (of-object "ClutterColor")
-  (c-name "clutter_color_subtract")
+(define-method child_get_property
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_get_property")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "b")
-    '("ClutterColor*" "result")
+    '("ClutterActor*" "child")
+    '("const-gchar*" "property")
+    '("GValue*" "value")
   )
 )
 
-(define-method lighten
-  (of-object "ClutterColor")
-  (c-name "clutter_color_lighten")
+(define-method child_set
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_set")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "result")
+    '("ClutterActor*" "actor")
+    '("const-gchar*" "first_prop")
   )
+  (varargs #t)
 )
 
-(define-method darken
-  (of-object "ClutterColor")
-  (c-name "clutter_color_darken")
+(define-method child_get
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_get")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "result")
+    '("ClutterActor*" "actor")
+    '("const-gchar*" "first_prop")
   )
+  (varargs #t)
 )
 
-(define-method shade
-  (of-object "ClutterColor")
-  (c-name "clutter_color_shade")
+(define-method child_notify
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_child_notify")
   (return-type "none")
   (parameters
-    '("gdouble" "factor")
-    '("ClutterColor*" "result")
+    '("ClutterActor*" "child")
+    '("GParamSpec*" "pspec")
   )
 )
 
-(define-method to_string
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_string")
-  (return-type "gchar*")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-content.h
+
+(define-function clutter_content_get_type
+  (c-name "clutter_content_get_type")
+  (return-type "GType")
 )
 
-(define-method from_string
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_string")
+(define-method get_preferred_size
+  (of-object "ClutterContent")
+  (c-name "clutter_content_get_preferred_size")
   (return-type "gboolean")
   (parameters
-    '("const-gchar*" "str")
+    '("gfloat*" "width")
+    '("gfloat*" "height")
   )
 )
 
-(define-method to_hls
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_hls")
+(define-method invalidate
+  (of-object "ClutterContent")
+  (c-name "clutter_content_invalidate")
   (return-type "none")
-  (parameters
-    '("gfloat*" "hue")
-    '("gfloat*" "luminance")
-    '("gfloat*" "saturation")
-  )
 )
 
-(define-method from_hls
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_hls")
-  (return-type "none")
-  (parameters
-    '("gfloat" "hue")
-    '("gfloat" "luminance")
-    '("gfloat" "saturation")
-  )
-)
 
-(define-method to_pixel
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_pixel")
-  (return-type "guint32")
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-deform-effect.h
+
+(define-function clutter_deform_effect_get_type
+  (c-name "clutter_deform_effect_get_type")
+  (return-type "GType")
 )
 
-(define-method from_pixel
-  (of-object "ClutterColor")
-  (c-name "clutter_color_from_pixel")
+(define-method set_back_material
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_set_back_material")
   (return-type "none")
   (parameters
-    '("guint32" "pixel")
+    '("CoglHandle" "material")
   )
 )
 
-(define-function clutter_color_hash
-  (c-name "clutter_color_hash")
-  (return-type "guint")
-  (parameters
-    '("gconstpointer" "v")
-  )
+(define-method get_back_material
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_get_back_material")
+  (return-type "CoglHandle")
 )
 
-(define-function clutter_color_equal
-  (c-name "clutter_color_equal")
-  (return-type "gboolean")
+(define-method set_n_tiles
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_set_n_tiles")
+  (return-type "none")
   (parameters
-    '("gconstpointer" "v1")
-    '("gconstpointer" "v2")
+    '("guint" "x_tiles")
+    '("guint" "y_tiles")
   )
 )
 
-(define-method interpolate
-  (of-object "ClutterColor")
-  (c-name "clutter_color_interpolate")
+(define-method get_n_tiles
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_get_n_tiles")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "final")
-    '("gdouble" "progress")
-    '("ClutterColor*" "result")
+    '("guint*" "x_tiles")
+    '("guint*" "y_tiles")
   )
 )
 
-(define-function clutter_value_set_color
-  (c-name "clutter_value_set_color")
+(define-method invalidate
+  (of-object "ClutterDeformEffect")
+  (c-name "clutter_deform_effect_invalidate")
   (return-type "none")
-  (parameters
-    '("GValue*" "value")
-    '("const-ClutterColor*" "color")
-  )
 )
 
-(define-function clutter_value_get_color
-  (c-name "clutter_value_get_color")
-  (return-type "const-ClutterColor*")
-  (parameters
-    '("const-GValue*" "value")
-  )
-)
 
-(define-function clutter_param_color_get_type
-  (c-name "clutter_param_color_get_type")
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-deprecated.h
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-desaturate-effect.h
+
+(define-function clutter_desaturate_effect_get_type
+  (c-name "clutter_desaturate_effect_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_param_spec_color
-  (c-name "clutter_param_spec_color")
-  (return-type "GParamSpec*")
+(define-function clutter_desaturate_effect_new
+  (c-name "clutter_desaturate_effect_new")
+  (is-constructor-of "ClutterDesaturateEffect")
+  (return-type "ClutterEffect*")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("const-ClutterColor*" "default_value")
-    '("GParamFlags" "flags")
+    '("gdouble" "factor")
   )
 )
 
-(define-function clutter_color_get_static
-  (c-name "clutter_color_get_static")
-  (return-type "const-ClutterColor*")
+(define-method set_factor
+  (of-object "ClutterDesaturateEffect")
+  (c-name "clutter_desaturate_effect_set_factor")
+  (return-type "none")
   (parameters
-    '("ClutterStaticColor" "color")
+    '("gdouble" "factor")
   )
 )
 
+(define-method get_factor
+  (of-object "ClutterDesaturateEffect")
+  (c-name "clutter_desaturate_effect_get_factor")
+  (return-type "gdouble")
+)
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-colorize-effect.h
 
-(define-function clutter_colorize_effect_get_type
-  (c-name "clutter_colorize_effect_get_type")
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-device-manager.h
+
+(define-function clutter_device_manager_get_type
+  (c-name "clutter_device_manager_get_type")
   (return-type "GType")
 )
 
-(define-method ize_effect_new
-  (of-object "ClutterColor")
-  (c-name "clutter_colorize_effect_new")
-  (return-type "ClutterEffect*")
+(define-function clutter_device_manager_get_default
+  (c-name "clutter_device_manager_get_default")
+  (return-type "ClutterDeviceManager*")
 )
 
-(define-method set_tint
-  (of-object "ClutterColorizeEffect")
-  (c-name "clutter_colorize_effect_set_tint")
-  (return-type "none")
+(define-method list_devices
+  (of-object "ClutterDeviceManager")
+  (c-name "clutter_device_manager_list_devices")
+  (return-type "GSList*")
+)
+
+(define-method peek_devices
+  (of-object "ClutterDeviceManager")
+  (c-name "clutter_device_manager_peek_devices")
+  (return-type "const-GSList*")
+)
+
+(define-method get_device
+  (of-object "ClutterDeviceManager")
+  (c-name "clutter_device_manager_get_device")
+  (return-type "ClutterInputDevice*")
   (parameters
-    '("const-ClutterColor*" "tint")
+    '("gint" "device_id")
   )
 )
 
-(define-method get_tint
-  (of-object "ClutterColorizeEffect")
-  (c-name "clutter_colorize_effect_get_tint")
-  (return-type "none")
+(define-method get_core_device
+  (of-object "ClutterDeviceManager")
+  (c-name "clutter_device_manager_get_core_device")
+  (return-type "ClutterInputDevice*")
   (parameters
-    '("ClutterColor*" "tint")
+    '("ClutterInputDeviceType" "device_type")
   )
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-color-static.h
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-config.h
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-constraint.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-drag-action.h
 
-(define-function clutter_constraint_get_type
-  (c-name "clutter_constraint_get_type")
+(define-function clutter_drag_action_get_type
+  (c-name "clutter_drag_action_get_type")
   (return-type "GType")
 )
 
-(define-method add_constraint
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_add_constraint")
+(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
-    '("ClutterConstraint*" "constraint")
+    '("gint" "x_threshold")
+    '("gint" "y_threshold")
   )
 )
 
-(define-method add_constraint_with_name
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_add_constraint_with_name")
+(define-method get_drag_threshold
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_drag_threshold")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("ClutterConstraint*" "constraint")
+    '("guint*" "x_threshold")
+    '("guint*" "y_threshold")
   )
 )
 
-(define-method remove_constraint
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_remove_constraint")
+(define-method set_drag_handle
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_set_drag_handle")
   (return-type "none")
   (parameters
-    '("ClutterConstraint*" "constraint")
+    '("ClutterActor*" "handle")
   )
 )
 
-(define-method remove_constraint_by_name
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_remove_constraint_by_name")
+(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
-    '("const-gchar*" "name")
+    '("ClutterDragAxis" "axis")
   )
 )
 
-(define-method get_constraints
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_constraints")
-  (return-type "GList*")
+(define-method get_drag_axis
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_drag_axis")
+  (return-type "ClutterDragAxis")
 )
 
-(define-method get_constraint
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_constraint")
-  (return-type "ClutterConstraint*")
+(define-method get_press_coords
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_press_coords")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("gfloat*" "press_x")
+    '("gfloat*" "press_y")
   )
 )
 
-(define-method clear_constraints
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_clear_constraints")
+(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")
+  )
 )
 
-(define-method has_constraints
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_has_constraints")
+(define-method get_drag_area
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_get_drag_area")
   (return-type "gboolean")
+  (parameters
+    '("ClutterRect*" "drag_area")
+  )
+)
+
+(define-method set_drag_area
+  (of-object "ClutterDragAction")
+  (c-name "clutter_drag_action_set_drag_area")
+  (return-type "none")
+  (parameters
+    '("const-ClutterRect*" "drag_area")
+  )
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-container.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-drop-action.h
 
-(define-function clutter_container_get_type
-  (c-name "clutter_container_get_type")
+(define-function clutter_drop_action_get_type
+  (c-name "clutter_drop_action_get_type")
   (return-type "GType")
 )
 
-(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-function clutter_drop_action_new
+  (c-name "clutter_drop_action_new")
+  (is-constructor-of "ClutterDropAction")
+  (return-type "ClutterAction*")
 )
 
-(define-function clutter_container_class_find_child_property
-  (c-name "clutter_container_class_find_child_property")
-  (return-type "GParamSpec*")
-  (parameters
-    '("GObjectClass*" "klass")
-    '("const-gchar*" "property_name")
-  )
-)
 
-(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")
-  )
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-effect.h
+
+(define-function clutter_effect_get_type
+  (c-name "clutter_effect_get_type")
+  (return-type "GType")
 )
 
-(define-method create_child_meta
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_create_child_meta")
+(define-method queue_repaint
+  (of-object "ClutterEffect")
+  (c-name "clutter_effect_queue_repaint")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
 )
 
-(define-method destroy_child_meta
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_destroy_child_meta")
+(define-method add_effect
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_effect")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("ClutterEffect*" "effect")
   )
 )
 
-(define-method get_child_meta
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_get_child_meta")
-  (return-type "ClutterChildMeta*")
+(define-method add_effect_with_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_add_effect_with_name")
+  (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("const-gchar*" "name")
+    '("ClutterEffect*" "effect")
   )
 )
 
-(define-method child_set_property
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_set_property")
+(define-method remove_effect
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_effect")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "child")
-    '("const-gchar*" "property")
-    '("const-GValue*" "value")
+    '("ClutterEffect*" "effect")
   )
 )
 
-(define-method child_get_property
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_get_property")
+(define-method remove_effect_by_name
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_remove_effect_by_name")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "child")
-    '("const-gchar*" "property")
-    '("GValue*" "value")
+    '("const-gchar*" "name")
   )
 )
 
-(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_effects
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_effects")
+  (return-type "GList*")
 )
 
-(define-method child_get
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_get")
-  (return-type "none")
+(define-method get_effect
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_effect")
+  (return-type "ClutterEffect*")
   (parameters
-    '("ClutterActor*" "actor")
-    '("const-gchar*" "first_prop")
+    '("const-gchar*" "name")
   )
-  (varargs #t)
 )
 
-(define-method child_notify
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_child_notify")
+(define-method clear_effects
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_clear_effects")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "child")
-    '("GParamSpec*" "pspec")
-  )
+)
+
+(define-method has_effects
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_has_effects")
+  (return-type "gboolean")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-content.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-enums.h
 
-(define-function clutter_content_get_type
-  (c-name "clutter_content_get_type")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-enum-types.h
+
+(define-function clutter_gravity_get_type
+  (c-name "clutter_gravity_get_type")
   (return-type "GType")
 )
 
-(define-method get_preferred_size
-  (of-object "ClutterContent")
-  (c-name "clutter_content_get_preferred_size")
-  (return-type "gboolean")
-  (parameters
-    '("gfloat*" "width")
-    '("gfloat*" "height")
-  )
+(define-function clutter_rotate_axis_get_type
+  (c-name "clutter_rotate_axis_get_type")
+  (return-type "GType")
 )
 
-(define-method invalidate
-  (of-object "ClutterContent")
-  (c-name "clutter_content_invalidate")
-  (return-type "none")
+(define-function clutter_rotate_direction_get_type
+  (c-name "clutter_rotate_direction_get_type")
+  (return-type "GType")
 )
 
+(define-function clutter_request_mode_get_type
+  (c-name "clutter_request_mode_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_animation_mode_get_type
+  (c-name "clutter_animation_mode_get_type")
+  (return-type "GType")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-deform-effect.h
-
-(define-function clutter_deform_effect_get_type
-  (c-name "clutter_deform_effect_get_type")
+(define-function clutter_font_flags_get_type
+  (c-name "clutter_font_flags_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-function clutter_text_direction_get_type
+  (c-name "clutter_text_direction_get_type")
+  (return-type "GType")
 )
 
-(define-method get_back_material
-  (of-object "ClutterDeformEffect")
-  (c-name "clutter_deform_effect_get_back_material")
-  (return-type "CoglHandle")
+(define-function clutter_shader_type_get_type
+  (c-name "clutter_shader_type_get_type")
+  (return-type "GType")
 )
 
-(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-function clutter_modifier_type_get_type
+  (c-name "clutter_modifier_type_get_type")
+  (return-type "GType")
 )
 
-(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-function clutter_actor_flags_get_type
+  (c-name "clutter_actor_flags_get_type")
+  (return-type "GType")
 )
 
-(define-method invalidate
-  (of-object "ClutterDeformEffect")
-  (c-name "clutter_deform_effect_invalidate")
-  (return-type "none")
+(define-function clutter_offscreen_redirect_get_type
+  (c-name "clutter_offscreen_redirect_get_type")
+  (return-type "GType")
 )
 
+(define-function clutter_allocation_flags_get_type
+  (c-name "clutter_allocation_flags_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_align_axis_get_type
+  (c-name "clutter_align_axis_get_type")
+  (return-type "GType")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-deprecated.h
+(define-function clutter_interpolation_get_type
+  (c-name "clutter_interpolation_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_bin_alignment_get_type
+  (c-name "clutter_bin_alignment_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_bind_coordinate_get_type
+  (c-name "clutter_bind_coordinate_get_type")
+  (return-type "GType")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-desaturate-effect.h
+(define-function clutter_effect_paint_flags_get_type
+  (c-name "clutter_effect_paint_flags_get_type")
+  (return-type "GType")
+)
 
-(define-function clutter_desaturate_effect_get_type
-  (c-name "clutter_desaturate_effect_get_type")
+(define-function clutter_box_alignment_get_type
+  (c-name "clutter_box_alignment_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-function clutter_long_press_state_get_type
+  (c-name "clutter_long_press_state_get_type")
+  (return-type "GType")
 )
 
-(define-method set_factor
-  (of-object "ClutterDesaturateEffect")
-  (c-name "clutter_desaturate_effect_set_factor")
-  (return-type "none")
-  (parameters
-    '("gdouble" "factor")
-  )
+(define-function clutter_static_color_get_type
+  (c-name "clutter_static_color_get_type")
+  (return-type "GType")
 )
 
-(define-method get_factor
-  (of-object "ClutterDesaturateEffect")
-  (c-name "clutter_desaturate_effect_get_factor")
-  (return-type "gdouble")
+(define-function clutter_drag_axis_get_type
+  (c-name "clutter_drag_axis_get_type")
+  (return-type "GType")
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-device-manager.h
-
-(define-function clutter_device_manager_get_type
-  (c-name "clutter_device_manager_get_type")
+(define-function clutter_event_flags_get_type
+  (c-name "clutter_event_flags_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_device_manager_get_default
-  (c-name "clutter_device_manager_get_default")
-  (return-type "ClutterDeviceManager*")
+(define-function clutter_event_type_get_type
+  (c-name "clutter_event_type_get_type")
+  (return-type "GType")
 )
 
-(define-method list_devices
-  (of-object "ClutterDeviceManager")
-  (c-name "clutter_device_manager_list_devices")
-  (return-type "GSList*")
+(define-function clutter_scroll_direction_get_type
+  (c-name "clutter_scroll_direction_get_type")
+  (return-type "GType")
 )
 
-(define-method peek_devices
-  (of-object "ClutterDeviceManager")
-  (c-name "clutter_device_manager_peek_devices")
-  (return-type "const-GSList*")
+(define-function clutter_stage_state_get_type
+  (c-name "clutter_stage_state_get_type")
+  (return-type "GType")
 )
 
-(define-method get_device
-  (of-object "ClutterDeviceManager")
-  (c-name "clutter_device_manager_get_device")
-  (return-type "ClutterInputDevice*")
-  (parameters
-    '("gint" "device_id")
-  )
+(define-function clutter_feature_flags_get_type
+  (c-name "clutter_feature_flags_get_type")
+  (return-type "GType")
 )
 
-(define-method get_core_device
-  (of-object "ClutterDeviceManager")
-  (c-name "clutter_device_manager_get_core_device")
-  (return-type "ClutterInputDevice*")
-  (parameters
-    '("ClutterInputDeviceType" "device_type")
-  )
+(define-function clutter_flow_orientation_get_type
+  (c-name "clutter_flow_orientation_get_type")
+  (return-type "GType")
 )
 
+(define-function clutter_input_device_type_get_type
+  (c-name "clutter_input_device_type_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_input_mode_get_type
+  (c-name "clutter_input_mode_get_type")
+  (return-type "GType")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-drag-action.h
-
-(define-function clutter_drag_action_get_type
-  (c-name "clutter_drag_action_get_type")
+(define-function clutter_input_axis_get_type
+  (c-name "clutter_input_axis_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-function clutter_snap_edge_get_type
+  (c-name "clutter_snap_edge_get_type")
+  (return-type "GType")
 )
 
-(define-method set_drag_threshold
-  (of-object "ClutterDragAction")
-  (c-name "clutter_drag_action_set_drag_threshold")
-  (return-type "none")
-  (parameters
-    '("gint" "x_threshold")
-    '("gint" "y_threshold")
-  )
+(define-function clutter_pick_mode_get_type
+  (c-name "clutter_pick_mode_get_type")
+  (return-type "GType")
 )
 
-(define-method get_drag_threshold
-  (of-object "ClutterDragAction")
-  (c-name "clutter_drag_action_get_drag_threshold")
-  (return-type "none")
-  (parameters
-    '("guint*" "x_threshold")
-    '("guint*" "y_threshold")
-  )
+(define-function clutter_swipe_direction_get_type
+  (c-name "clutter_swipe_direction_get_type")
+  (return-type "GType")
 )
 
-(define-method set_drag_handle
-  (of-object "ClutterDragAction")
-  (c-name "clutter_drag_action_set_drag_handle")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "handle")
-  )
+(define-function clutter_pan_axis_get_type
+  (c-name "clutter_pan_axis_get_type")
+  (return-type "GType")
 )
 
-(define-method get_drag_handle
-  (of-object "ClutterDragAction")
-  (c-name "clutter_drag_action_get_drag_handle")
-  (return-type "ClutterActor*")
+(define-function clutter_table_alignment_get_type
+  (c-name "clutter_table_alignment_get_type")
+  (return-type "GType")
 )
 
-(define-method set_drag_axis
-  (of-object "ClutterDragAction")
-  (c-name "clutter_drag_action_set_drag_axis")
-  (return-type "none")
-  (parameters
-    '("ClutterDragAxis" "axis")
-  )
+(define-function clutter_texture_flags_get_type
+  (c-name "clutter_texture_flags_get_type")
+  (return-type "GType")
 )
 
-(define-method get_drag_axis
-  (of-object "ClutterDragAction")
-  (c-name "clutter_drag_action_get_drag_axis")
-  (return-type "ClutterDragAxis")
+(define-function clutter_texture_quality_get_type
+  (c-name "clutter_texture_quality_get_type")
+  (return-type "GType")
 )
 
-(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-function clutter_timeline_direction_get_type
+  (c-name "clutter_timeline_direction_get_type")
+  (return-type "GType")
 )
 
-(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")
-  )
+(define-function clutter_unit_type_get_type
+  (c-name "clutter_unit_type_get_type")
+  (return-type "GType")
 )
 
+(define-function clutter_path_node_type_get_type
+  (c-name "clutter_path_node_type_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_actor_align_get_type
+  (c-name "clutter_actor_align_get_type")
+  (return-type "GType")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-drop-action.h
+(define-function clutter_repaint_flags_get_type
+  (c-name "clutter_repaint_flags_get_type")
+  (return-type "GType")
+)
 
-(define-function clutter_drop_action_get_type
-  (c-name "clutter_drop_action_get_type")
+(define-function clutter_content_gravity_get_type
+  (c-name "clutter_content_gravity_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_drop_action_new
-  (c-name "clutter_drop_action_new")
-  (is-constructor-of "ClutterDropAction")
-  (return-type "ClutterAction*")
+(define-function clutter_scaling_filter_get_type
+  (c-name "clutter_scaling_filter_get_type")
+  (return-type "GType")
 )
 
+(define-function clutter_orientation_get_type
+  (c-name "clutter_orientation_get_type")
+  (return-type "GType")
+)
 
+(define-function clutter_scroll_mode_get_type
+  (c-name "clutter_scroll_mode_get_type")
+  (return-type "GType")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-effect.h
+(define-function clutter_grid_position_get_type
+  (c-name "clutter_grid_position_get_type")
+  (return-type "GType")
+)
 
-(define-function clutter_effect_get_type
-  (c-name "clutter_effect_get_type")
+(define-function clutter_content_repeat_get_type
+  (c-name "clutter_content_repeat_get_type")
   (return-type "GType")
 )
 
-(define-method queue_repaint
-  (of-object "ClutterEffect")
-  (c-name "clutter_effect_queue_repaint")
-  (return-type "none")
+(define-function clutter_step_mode_get_type
+  (c-name "clutter_step_mode_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-function clutter_zoom_axis_get_type
+  (c-name "clutter_zoom_axis_get_type")
+  (return-type "GType")
 )
 
-(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-function clutter_image_error_get_type
+  (c-name "clutter_image_error_get_type")
+  (return-type "GType")
 )
 
-(define-method remove_effect
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_remove_effect")
-  (return-type "none")
-  (parameters
-    '("ClutterEffect*" "effect")
-  )
+(define-function clutter_init_error_get_type
+  (c-name "clutter_init_error_get_type")
+  (return-type "GType")
 )
 
-(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-function clutter_script_error_get_type
+  (c-name "clutter_script_error_get_type")
+  (return-type "GType")
 )
 
-(define-method get_effects
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_effects")
-  (return-type "GList*")
+(define-function clutter_texture_error_get_type
+  (c-name "clutter_texture_error_get_type")
+  (return-type "GType")
 )
 
-(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")
+(define-function clutter_x11_filter_return_get_type
+  (c-name "clutter_x11_filter_return_get_type")
+  (return-type "GType")
 )
 
-(define-method has_effects
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_has_effects")
-  (return-type "gboolean")
+(define-function clutter_x11_xinput_event_types_get_type
+  (c-name "clutter_x11_xinput_event_types_get_type")
+  (return-type "GType")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-enums.h
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-enum-types.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-event.h
 
-(define-function clutter_gravity_get_type
-  (c-name "clutter_gravity_get_type")
+(define-function clutter_event_get_type
+  (c-name "clutter_event_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_rotate_axis_get_type
-  (c-name "clutter_rotate_axis_get_type")
-  (return-type "GType")
+(define-function clutter_events_pending
+  (c-name "clutter_events_pending")
+  (return-type "gboolean")
 )
 
-(define-function clutter_rotate_direction_get_type
-  (c-name "clutter_rotate_direction_get_type")
-  (return-type "GType")
+(define-function clutter_event_get
+  (c-name "clutter_event_get")
+  (return-type "ClutterEvent*")
 )
 
-(define-function clutter_request_mode_get_type
-  (c-name "clutter_request_mode_get_type")
-  (return-type "GType")
+(define-function clutter_event_peek
+  (c-name "clutter_event_peek")
+  (return-type "ClutterEvent*")
 )
 
-(define-function clutter_animation_mode_get_type
-  (c-name "clutter_animation_mode_get_type")
-  (return-type "GType")
+(define-method put
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_put")
+  (return-type "none")
 )
 
-(define-function clutter_font_flags_get_type
-  (c-name "clutter_font_flags_get_type")
-  (return-type "GType")
+(define-function clutter_event_new
+  (c-name "clutter_event_new")
+  (is-constructor-of "ClutterEvent")
+  (return-type "ClutterEvent*")
+  (parameters
+    '("ClutterEventType" "type")
+  )
 )
 
-(define-function clutter_text_direction_get_type
-  (c-name "clutter_text_direction_get_type")
-  (return-type "GType")
+(define-method copy
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_copy")
+  (return-type "ClutterEvent*")
 )
 
-(define-function clutter_shader_type_get_type
-  (c-name "clutter_shader_type_get_type")
-  (return-type "GType")
+(define-method free
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_free")
+  (return-type "none")
 )
 
-(define-function clutter_modifier_type_get_type
-  (c-name "clutter_modifier_type_get_type")
-  (return-type "GType")
+(define-method type
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_type")
+  (return-type "ClutterEventType")
 )
 
-(define-function clutter_actor_flags_get_type
-  (c-name "clutter_actor_flags_get_type")
-  (return-type "GType")
+(define-method set_flags
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_flags")
+  (return-type "none")
+  (parameters
+    '("ClutterEventFlags" "flags")
+  )
 )
 
-(define-function clutter_offscreen_redirect_get_type
-  (c-name "clutter_offscreen_redirect_get_type")
-  (return-type "GType")
+(define-method get_flags
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_flags")
+  (return-type "ClutterEventFlags")
 )
 
-(define-function clutter_allocation_flags_get_type
-  (c-name "clutter_allocation_flags_get_type")
-  (return-type "GType")
+(define-method set_time
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_time")
+  (return-type "none")
+  (parameters
+    '("guint32" "time_")
+  )
 )
 
-(define-function clutter_align_axis_get_type
-  (c-name "clutter_align_axis_get_type")
-  (return-type "GType")
+(define-method get_time
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_time")
+  (return-type "guint32")
 )
 
-(define-function clutter_interpolation_get_type
-  (c-name "clutter_interpolation_get_type")
-  (return-type "GType")
+(define-method set_state
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_state")
+  (return-type "none")
+  (parameters
+    '("ClutterModifierType" "state")
+  )
 )
 
-(define-function clutter_bin_alignment_get_type
-  (c-name "clutter_bin_alignment_get_type")
-  (return-type "GType")
+(define-method get_state
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_state")
+  (return-type "ClutterModifierType")
 )
 
-(define-function clutter_bind_coordinate_get_type
-  (c-name "clutter_bind_coordinate_get_type")
-  (return-type "GType")
+(define-method set_device
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_device")
+  (return-type "none")
+  (parameters
+    '("ClutterInputDevice*" "device")
+  )
 )
 
-(define-function clutter_effect_paint_flags_get_type
-  (c-name "clutter_effect_paint_flags_get_type")
-  (return-type "GType")
+(define-method get_device
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_device")
+  (return-type "ClutterInputDevice*")
 )
 
-(define-function clutter_box_alignment_get_type
-  (c-name "clutter_box_alignment_get_type")
-  (return-type "GType")
+(define-method set_source_device
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_source_device")
+  (return-type "none")
+  (parameters
+    '("ClutterInputDevice*" "device")
+  )
 )
 
-(define-function clutter_long_press_state_get_type
-  (c-name "clutter_long_press_state_get_type")
-  (return-type "GType")
+(define-method get_source_device
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_source_device")
+  (return-type "ClutterInputDevice*")
 )
 
-(define-function clutter_static_color_get_type
-  (c-name "clutter_static_color_get_type")
-  (return-type "GType")
+(define-method set_source
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_source")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
 )
 
-(define-function clutter_drag_axis_get_type
-  (c-name "clutter_drag_axis_get_type")
-  (return-type "GType")
+(define-method get_source
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_source")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_event_flags_get_type
-  (c-name "clutter_event_flags_get_type")
-  (return-type "GType")
+(define-method set_stage
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_stage")
+  (return-type "none")
+  (parameters
+    '("ClutterStage*" "stage")
+  )
 )
 
-(define-function clutter_event_type_get_type
-  (c-name "clutter_event_type_get_type")
-  (return-type "GType")
+(define-method get_stage
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_stage")
+  (return-type "ClutterStage*")
 )
 
-(define-function clutter_scroll_direction_get_type
-  (c-name "clutter_scroll_direction_get_type")
-  (return-type "GType")
+(define-method get_device_id
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_device_id")
+  (return-type "gint")
 )
 
-(define-function clutter_stage_state_get_type
-  (c-name "clutter_stage_state_get_type")
-  (return-type "GType")
+(define-method get_device_type
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_device_type")
+  (return-type "ClutterInputDeviceType")
 )
 
-(define-function clutter_feature_flags_get_type
-  (c-name "clutter_feature_flags_get_type")
-  (return-type "GType")
+(define-method set_coords
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_coords")
+  (return-type "none")
+  (parameters
+    '("gfloat" "x")
+    '("gfloat" "y")
+  )
 )
 
-(define-function clutter_flow_orientation_get_type
-  (c-name "clutter_flow_orientation_get_type")
-  (return-type "GType")
+(define-method get_coords
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_coords")
+  (return-type "none")
+  (parameters
+    '("gfloat*" "x")
+    '("gfloat*" "y")
+  )
 )
 
-(define-function clutter_input_device_type_get_type
-  (c-name "clutter_input_device_type_get_type")
-  (return-type "GType")
+(define-method get_position
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_position")
+  (return-type "none")
+  (parameters
+    '("ClutterPoint*" "position")
+  )
 )
 
-(define-function clutter_input_mode_get_type
-  (c-name "clutter_input_mode_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_input_axis_get_type
-  (c-name "clutter_input_axis_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_snap_edge_get_type
-  (c-name "clutter_snap_edge_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_pick_mode_get_type
-  (c-name "clutter_pick_mode_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_swipe_direction_get_type
-  (c-name "clutter_swipe_direction_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_table_alignment_get_type
-  (c-name "clutter_table_alignment_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_texture_flags_get_type
-  (c-name "clutter_texture_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_texture_quality_get_type
-  (c-name "clutter_texture_quality_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_timeline_direction_get_type
-  (c-name "clutter_timeline_direction_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_unit_type_get_type
-  (c-name "clutter_unit_type_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_path_node_type_get_type
-  (c-name "clutter_path_node_type_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_actor_align_get_type
-  (c-name "clutter_actor_align_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_repaint_flags_get_type
-  (c-name "clutter_repaint_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_content_gravity_get_type
-  (c-name "clutter_content_gravity_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_scaling_filter_get_type
-  (c-name "clutter_scaling_filter_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_image_error_get_type
-  (c-name "clutter_image_error_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_init_error_get_type
-  (c-name "clutter_init_error_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_texture_error_get_type
-  (c-name "clutter_texture_error_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_x11_filter_return_get_type
-  (c-name "clutter_x11_filter_return_get_type")
-  (return-type "GType")
+(define-method get_distance
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_distance")
+  (return-type "float")
+  (parameters
+    '("const-ClutterEvent*" "target")
+  )
 )
 
-(define-function clutter_x11_xinput_event_types_get_type
-  (c-name "clutter_x11_xinput_event_types_get_type")
-  (return-type "GType")
+(define-method get_angle
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_angle")
+  (return-type "double")
+  (parameters
+    '("const-ClutterEvent*" "target")
+  )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-event.h
-
-(define-function clutter_event_get_type
-  (c-name "clutter_event_get_type")
-  (return-type "GType")
+(define-method get_axes
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_axes")
+  (return-type "gdouble*")
+  (parameters
+    '("guint*" "n_axes")
+  )
 )
 
-(define-function clutter_events_pending
-  (c-name "clutter_events_pending")
+(define-method has_shift_modifier
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_has_shift_modifier")
   (return-type "gboolean")
 )
 
-(define-function clutter_event_get
-  (c-name "clutter_event_get")
-  (return-type "ClutterEvent*")
+(define-method has_control_modifier
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_has_control_modifier")
+  (return-type "gboolean")
 )
 
-(define-function clutter_event_peek
-  (c-name "clutter_event_peek")
-  (return-type "ClutterEvent*")
+(define-method is_pointer_emulated
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_is_pointer_emulated")
+  (return-type "gboolean")
 )
 
-(define-method put
+(define-method set_key_symbol
   (of-object "ClutterEvent")
-  (c-name "clutter_event_put")
+  (c-name "clutter_event_set_key_symbol")
   (return-type "none")
-)
-
-(define-function clutter_event_new
-  (c-name "clutter_event_new")
-  (is-constructor-of "ClutterEvent")
-  (return-type "ClutterEvent*")
   (parameters
-    '("ClutterEventType" "type")
+    '("guint" "key_sym")
   )
 )
 
-(define-method copy
+(define-method get_key_symbol
   (of-object "ClutterEvent")
-  (c-name "clutter_event_copy")
-  (return-type "ClutterEvent*")
+  (c-name "clutter_event_get_key_symbol")
+  (return-type "guint")
 )
 
-(define-method free
+(define-method set_key_code
   (of-object "ClutterEvent")
-  (c-name "clutter_event_free")
+  (c-name "clutter_event_set_key_code")
   (return-type "none")
+  (parameters
+    '("guint16" "key_code")
+  )
 )
 
-(define-method type
+(define-method get_key_code
   (of-object "ClutterEvent")
-  (c-name "clutter_event_type")
-  (return-type "ClutterEventType")
+  (c-name "clutter_event_get_key_code")
+  (return-type "guint16")
 )
 
-(define-method set_flags
+(define-method set_key_unicode
   (of-object "ClutterEvent")
-  (c-name "clutter_event_set_flags")
+  (c-name "clutter_event_set_key_unicode")
   (return-type "none")
   (parameters
-    '("ClutterEventFlags" "flags")
+    '("guint32" "key_unicode")
   )
 )
 
-(define-method get_flags
+(define-method get_key_unicode
   (of-object "ClutterEvent")
-  (c-name "clutter_event_get_flags")
-  (return-type "ClutterEventFlags")
+  (c-name "clutter_event_get_key_unicode")
+  (return-type "guint32")
 )
 
-(define-method set_time
+(define-method set_button
   (of-object "ClutterEvent")
-  (c-name "clutter_event_set_time")
+  (c-name "clutter_event_set_button")
   (return-type "none")
   (parameters
-    '("guint32" "time_")
+    '("guint32" "button")
   )
 )
 
-(define-method get_time
+(define-method get_button
   (of-object "ClutterEvent")
-  (c-name "clutter_event_get_time")
+  (c-name "clutter_event_get_button")
   (return-type "guint32")
 )
 
-(define-method set_state
+(define-method get_click_count
   (of-object "ClutterEvent")
-  (c-name "clutter_event_set_state")
+  (c-name "clutter_event_get_click_count")
+  (return-type "guint")
+)
+
+(define-method set_related
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_set_related")
   (return-type "none")
   (parameters
-    '("ClutterModifierType" "state")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_state
+(define-method get_related
   (of-object "ClutterEvent")
-  (c-name "clutter_event_get_state")
-  (return-type "ClutterModifierType")
+  (c-name "clutter_event_get_related")
+  (return-type "ClutterActor*")
 )
 
-(define-method set_device
+(define-method set_scroll_direction
   (of-object "ClutterEvent")
-  (c-name "clutter_event_set_device")
+  (c-name "clutter_event_set_scroll_direction")
   (return-type "none")
   (parameters
-    '("ClutterInputDevice*" "device")
+    '("ClutterScrollDirection" "direction")
   )
 )
 
-(define-method get_device
+(define-method get_scroll_direction
   (of-object "ClutterEvent")
-  (c-name "clutter_event_get_device")
-  (return-type "ClutterInputDevice*")
+  (c-name "clutter_event_get_scroll_direction")
+  (return-type "ClutterScrollDirection")
 )
 
-(define-method set_source_device
+(define-method set_scroll_delta
   (of-object "ClutterEvent")
-  (c-name "clutter_event_set_source_device")
+  (c-name "clutter_event_set_scroll_delta")
   (return-type "none")
   (parameters
-    '("ClutterInputDevice*" "device")
+    '("gdouble" "dx")
+    '("gdouble" "dy")
   )
 )
 
-(define-method get_source_device
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_source_device")
-  (return-type "ClutterInputDevice*")
-)
-
-(define-method set_source
+(define-method get_scroll_delta
   (of-object "ClutterEvent")
-  (c-name "clutter_event_set_source")
+  (c-name "clutter_event_get_scroll_delta")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("gdouble*" "dx")
+    '("gdouble*" "dy")
   )
 )
 
-(define-method get_source
+(define-method get_event_sequence
   (of-object "ClutterEvent")
-  (c-name "clutter_event_get_source")
-  (return-type "ClutterActor*")
+  (c-name "clutter_event_get_event_sequence")
+  (return-type "ClutterEventSequence*")
 )
 
-(define-method set_stage
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_stage")
-  (return-type "none")
+(define-function clutter_keysym_to_unicode
+  (c-name "clutter_keysym_to_unicode")
+  (return-type "guint32")
   (parameters
-    '("ClutterStage*" "stage")
-  )
-)
-
-(define-method get_stage
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_stage")
-  (return-type "ClutterStage*")
-)
-
-(define-method get_device_id
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_device_id")
-  (return-type "gint")
-)
-
-(define-method get_device_type
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_device_type")
-  (return-type "ClutterInputDeviceType")
-)
-
-(define-method set_coords
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_coords")
-  (return-type "none")
-  (parameters
-    '("gfloat" "x")
-    '("gfloat" "y")
-  )
-)
-
-(define-method get_coords
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_coords")
-  (return-type "none")
-  (parameters
-    '("gfloat*" "x")
-    '("gfloat*" "y")
-  )
-)
-
-(define-method get_axes
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_axes")
-  (return-type "gdouble*")
-  (parameters
-    '("guint*" "n_axes")
-  )
-)
-
-(define-method set_key_symbol
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_key_symbol")
-  (return-type "none")
-  (parameters
-    '("guint" "key_sym")
-  )
-)
-
-(define-method get_key_symbol
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_key_symbol")
-  (return-type "guint")
-)
-
-(define-method set_key_code
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_key_code")
-  (return-type "none")
-  (parameters
-    '("guint16" "key_code")
-  )
-)
-
-(define-method get_key_code
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_key_code")
-  (return-type "guint16")
-)
-
-(define-method set_key_unicode
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_key_unicode")
-  (return-type "none")
-  (parameters
-    '("guint32" "key_unicode")
-  )
-)
-
-(define-method get_key_unicode
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_key_unicode")
-  (return-type "guint32")
-)
-
-(define-method set_button
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_button")
-  (return-type "none")
-  (parameters
-    '("guint32" "button")
-  )
-)
-
-(define-method get_button
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_button")
-  (return-type "guint32")
-)
-
-(define-method get_click_count
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_click_count")
-  (return-type "guint")
-)
-
-(define-method set_related
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_related")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
-(define-method get_related
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_related")
-  (return-type "ClutterActor*")
-)
-
-(define-method set_scroll_direction
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_scroll_direction")
-  (return-type "none")
-  (parameters
-    '("ClutterScrollDirection" "direction")
-  )
-)
-
-(define-method get_scroll_direction
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_scroll_direction")
-  (return-type "ClutterScrollDirection")
-)
-
-(define-method set_scroll_delta
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_set_scroll_delta")
-  (return-type "none")
-  (parameters
-    '("gdouble" "dx")
-    '("gdouble" "dy")
-  )
-)
-
-(define-method get_scroll_delta
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_scroll_delta")
-  (return-type "none")
-  (parameters
-    '("gdouble*" "dx")
-    '("gdouble*" "dy")
-  )
-)
-
-(define-method get_event_sequence
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_event_sequence")
-  (return-type "ClutterEventSequence*")
-)
-
-(define-function clutter_keysym_to_unicode
-  (c-name "clutter_keysym_to_unicode")
-  (return-type "guint32")
-  (parameters
-    '("guint" "keyval")
+    '("guint" "keyval")
   )
 )
 
@@ -4485,6 +4024,21 @@
   (return-type "ClutterAction*")
 )
 
+(define-method get_n_touch_points
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_get_n_touch_points")
+  (return-type "gint")
+)
+
+(define-method set_n_touch_points
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_set_n_touch_points")
+  (return-type "none")
+  (parameters
+    '("gint" "nb_points")
+  )
+)
+
 (define-method get_press_coords
   (of-object "ClutterGestureAction")
   (c-name "clutter_gesture_action_get_press_coords")
@@ -4507,6 +4061,17 @@
   )
 )
 
+(define-method get_motion_delta
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_get_motion_delta")
+  (return-type "gfloat")
+  (parameters
+    '("guint" "device")
+    '("gfloat*" "delta_x")
+    '("gfloat*" "delta_y")
+  )
+)
+
 (define-method get_release_coords
   (of-object "ClutterGestureAction")
   (c-name "clutter_gesture_action_get_release_coords")
@@ -4518,78 +4083,287 @@
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-group.h
-
-(define-function clutter_group_get_type
-  (c-name "clutter_group_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter.h
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-image.h
-
-(define-function clutter_image_error_quark
-  (c-name "clutter_image_error_quark")
-  (return-type "GQuark")
-)
-
-(define-function clutter_image_get_type
-  (c-name "clutter_image_get_type")
-  (return-type "GType")
+(define-method get_velocity
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_get_velocity")
+  (return-type "gfloat")
+  (parameters
+    '("guint" "device")
+    '("gfloat*" "velocity_x")
+    '("gfloat*" "velocity_y")
+  )
 )
 
-(define-function clutter_image_new
-  (c-name "clutter_image_new")
-  (is-constructor-of "ClutterImage")
-  (return-type "ClutterContent*")
+(define-method get_n_current_points
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_get_n_current_points")
+  (return-type "guint")
 )
 
-(define-method set_data
-  (of-object "ClutterImage")
-  (c-name "clutter_image_set_data")
-  (return-type "gboolean")
+(define-method get_sequence
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_get_sequence")
+  (return-type "ClutterEventSequence*")
   (parameters
-    '("const-guint8*" "data")
-    '("CoglPixelFormat" "pixel_format")
-    '("guint" "width")
-    '("guint" "height")
-    '("guint" "row_stride")
-    '("GError**" "error")
+    '("guint" "point")
   )
 )
 
-(define-method set_area
-  (of-object "ClutterImage")
-  (c-name "clutter_image_set_area")
-  (return-type "gboolean")
+(define-method get_device
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_get_device")
+  (return-type "ClutterInputDevice*")
   (parameters
-    '("const-guint8*" "data")
-    '("CoglPixelFormat" "pixel_format")
-    '("const-cairo_rectangle_int_t*" "rect")
-    '("guint" "row_stride")
-    '("GError**" "error")
+    '("guint" "point")
   )
 )
 
-(define-method get_texture
-  (of-object "ClutterImage")
-  (c-name "clutter_image_get_texture")
-  (return-type "CoglTexture*")
+(define-method cancel
+  (of-object "ClutterGestureAction")
+  (c-name "clutter_gesture_action_cancel")
+  (return-type "none")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-input-device.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-grid-layout.h
 
-(define-function clutter_input_device_get_type
-  (c-name "clutter_input_device_get_type")
+(define-function clutter_grid_layout_get_type
+  (c-name "clutter_grid_layout_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_grid_layout_new
+  (c-name "clutter_grid_layout_new")
+  (is-constructor-of "ClutterGridLayout")
+  (return-type "ClutterLayoutManager*")
+)
+
+(define-method attach
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_attach")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "child")
+    '("gint" "left")
+    '("gint" "top")
+    '("gint" "width")
+    '("gint" "height")
+  )
+)
+
+(define-method attach_next_to
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_attach_next_to")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "child")
+    '("ClutterActor*" "sibling")
+    '("ClutterGridPosition" "side")
+    '("gint" "width")
+    '("gint" "height")
+  )
+)
+
+(define-method get_child_at
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_get_child_at")
+  (return-type "ClutterActor*")
+  (parameters
+    '("gint" "left")
+    '("gint" "top")
+  )
+)
+
+(define-method insert_row
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_insert_row")
+  (return-type "none")
+  (parameters
+    '("gint" "position")
+  )
+)
+
+(define-method insert_column
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_insert_column")
+  (return-type "none")
+  (parameters
+    '("gint" "position")
+  )
+)
+
+(define-method insert_next_to
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_insert_next_to")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "sibling")
+    '("ClutterGridPosition" "side")
+  )
+)
+
+(define-method set_orientation
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_set_orientation")
+  (return-type "none")
+  (parameters
+    '("ClutterOrientation" "orientation")
+  )
+)
+
+(define-method get_orientation
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_get_orientation")
+  (return-type "ClutterOrientation")
+)
+
+(define-method set_column_spacing
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_set_column_spacing")
+  (return-type "none")
+  (parameters
+    '("guint" "spacing")
+  )
+)
+
+(define-method get_column_spacing
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_get_column_spacing")
+  (return-type "guint")
+)
+
+(define-method set_row_spacing
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_set_row_spacing")
+  (return-type "none")
+  (parameters
+    '("guint" "spacing")
+  )
+)
+
+(define-method get_row_spacing
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_get_row_spacing")
+  (return-type "guint")
+)
+
+(define-method set_column_homogeneous
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_set_column_homogeneous")
+  (return-type "none")
+  (parameters
+    '("gboolean" "homogeneous")
+  )
+)
+
+(define-method get_column_homogeneous
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_get_column_homogeneous")
+  (return-type "gboolean")
+)
+
+(define-method set_row_homogeneous
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_set_row_homogeneous")
+  (return-type "none")
+  (parameters
+    '("gboolean" "homogeneous")
+  )
+)
+
+(define-method get_row_homogeneous
+  (of-object "ClutterGridLayout")
+  (c-name "clutter_grid_layout_get_row_homogeneous")
+  (return-type "gboolean")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-group.h
+
+(define-function clutter_group_get_type
+  (c-name "clutter_group_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter.h
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-image.h
+
+(define-function clutter_image_error_quark
+  (c-name "clutter_image_error_quark")
+  (return-type "GQuark")
+)
+
+(define-function clutter_image_get_type
+  (c-name "clutter_image_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_image_new
+  (c-name "clutter_image_new")
+  (is-constructor-of "ClutterImage")
+  (return-type "ClutterContent*")
+)
+
+(define-method set_data
+  (of-object "ClutterImage")
+  (c-name "clutter_image_set_data")
+  (return-type "gboolean")
+  (parameters
+    '("const-guint8*" "data")
+    '("CoglPixelFormat" "pixel_format")
+    '("guint" "width")
+    '("guint" "height")
+    '("guint" "row_stride")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_area
+  (of-object "ClutterImage")
+  (c-name "clutter_image_set_area")
+  (return-type "gboolean")
+  (parameters
+    '("const-guint8*" "data")
+    '("CoglPixelFormat" "pixel_format")
+    '("const-cairo_rectangle_int_t*" "rect")
+    '("guint" "row_stride")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_bytes
+  (of-object "ClutterImage")
+  (c-name "clutter_image_set_bytes")
+  (return-type "gboolean")
+  (parameters
+    '("GBytes*" "data")
+    '("CoglPixelFormat" "pixel_format")
+    '("guint" "width")
+    '("guint" "height")
+    '("guint" "row_stride")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_texture
+  (of-object "ClutterImage")
+  (c-name "clutter_image_get_texture")
+  (return-type "CoglTexture*")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-input-device.h
+
+(define-function clutter_input_device_get_type
+  (c-name "clutter_input_device_get_type")
   (return-type "GType")
 )
 
@@ -4605,13 +4379,13 @@
   (return-type "gint")
 )
 
-(define-method get_device_coords
+(define-method get_coords
   (of-object "ClutterInputDevice")
-  (c-name "clutter_input_device_get_device_coords")
-  (return-type "none")
+  (c-name "clutter_input_device_get_coords")
+  (return-type "gboolean")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("ClutterEventSequence*" "sequence")
+    '("ClutterPoint*" "point")
   )
 )
 
@@ -4757,6 +4531,34 @@
   (return-type "ClutterActor*")
 )
 
+(define-method sequence_grab
+  (of-object "ClutterInputDevice")
+  (c-name "clutter_input_device_sequence_grab")
+  (return-type "none")
+  (parameters
+    '("ClutterEventSequence*" "sequence")
+    '("ClutterActor*" "actor")
+  )
+)
+
+(define-method sequence_ungrab
+  (of-object "ClutterInputDevice")
+  (c-name "clutter_input_device_sequence_ungrab")
+  (return-type "none")
+  (parameters
+    '("ClutterEventSequence*" "sequence")
+  )
+)
+
+(define-method sequence_get_grabbed_actor
+  (of-object "ClutterInputDevice")
+  (c-name "clutter_input_device_sequence_get_grabbed_actor")
+  (return-type "ClutterActor*")
+  (parameters
+    '("ClutterEventSequence*" "sequence")
+  )
+)
+
 (define-method keycode_to_evdev
   (of-object "ClutterInputDevice")
   (c-name "clutter_input_device_keycode_to_evdev")
@@ -4920,75 +4722,167 @@
   )
 )
 
-(define-function clutter_interval_register_progress_func
-  (c-name "clutter_interval_register_progress_func")
-  (return-type "none")
-  (parameters
-    '("GType" "value_type")
-    '("ClutterProgressFunc" "func")
-  )
+(define-method is_valid
+  (of-object "ClutterInterval")
+  (c-name "clutter_interval_is_valid")
+  (return-type "gboolean")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-keysyms.h
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-layout-manager.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-keyframe-transition.h
 
-(define-function clutter_layout_manager_get_type
-  (c-name "clutter_layout_manager_get_type")
+(define-function clutter_keyframe_transition_get_type
+  (c-name "clutter_keyframe_transition_get_type")
   (return-type "GType")
 )
 
-(define-method get_preferred_width
-  (of-object "ClutterLayoutManager")
-  (c-name "clutter_layout_manager_get_preferred_width")
-  (return-type "none")
+(define-function clutter_keyframe_transition_new
+  (c-name "clutter_keyframe_transition_new")
+  (is-constructor-of "ClutterKeyframeTransition")
+  (return-type "ClutterTransition*")
   (parameters
-    '("ClutterContainer*" "container")
-    '("gfloat" "for_height")
-    '("gfloat*" "min_width_p")
-    '("gfloat*" "nat_width_p")
+    '("const-char*" "property_name")
   )
 )
 
-(define-method get_preferred_height
-  (of-object "ClutterLayoutManager")
-  (c-name "clutter_layout_manager_get_preferred_height")
+(define-method set_key_frames
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_set_key_frames")
   (return-type "none")
   (parameters
-    '("ClutterContainer*" "container")
-    '("gfloat" "for_width")
-    '("gfloat*" "min_height_p")
-    '("gfloat*" "nat_height_p")
+    '("guint" "n_key_frames")
+    '("const-double*" "key_frames")
   )
 )
 
-(define-method allocate
-  (of-object "ClutterLayoutManager")
-  (c-name "clutter_layout_manager_allocate")
+(define-method set_values
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_set_values")
   (return-type "none")
   (parameters
-    '("ClutterContainer*" "container")
-    '("const-ClutterActorBox*" "allocation")
-    '("ClutterAllocationFlags" "flags")
+    '("guint" "n_values")
+    '("const-GValue*" "values")
   )
 )
 
-(define-method set_container
-  (of-object "ClutterLayoutManager")
-  (c-name "clutter_layout_manager_set_container")
+(define-method set_modes
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_set_modes")
   (return-type "none")
   (parameters
-    '("ClutterContainer*" "container")
+    '("guint" "n_modes")
+    '("const-ClutterAnimationMode*" "modes")
   )
 )
 
-(define-method layout_changed
-  (of-object "ClutterLayoutManager")
-  (c-name "clutter_layout_manager_layout_changed")
+(define-method set
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_set")
+  (return-type "none")
+  (parameters
+    '("GType" "gtype")
+    '("guint" "n_key_frames")
+  )
+  (varargs #t)
+)
+
+(define-method set_key_frame
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_set_key_frame")
+  (return-type "none")
+  (parameters
+    '("guint" "index_")
+    '("double" "key")
+    '("ClutterAnimationMode" "mode")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method get_key_frame
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_get_key_frame")
+  (return-type "none")
+  (parameters
+    '("guint" "index_")
+    '("double*" "key")
+    '("ClutterAnimationMode*" "mode")
+    '("GValue*" "value")
+  )
+)
+
+(define-method get_n_key_frames
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_get_n_key_frames")
+  (return-type "guint")
+)
+
+(define-method clear
+  (of-object "ClutterKeyframeTransition")
+  (c-name "clutter_keyframe_transition_clear")
+  (return-type "none")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-keysyms.h
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-layout-manager.h
+
+(define-function clutter_layout_manager_get_type
+  (c-name "clutter_layout_manager_get_type")
+  (return-type "GType")
+)
+
+(define-method get_preferred_width
+  (of-object "ClutterLayoutManager")
+  (c-name "clutter_layout_manager_get_preferred_width")
+  (return-type "none")
+  (parameters
+    '("ClutterContainer*" "container")
+    '("gfloat" "for_height")
+    '("gfloat*" "min_width_p")
+    '("gfloat*" "nat_width_p")
+  )
+)
+
+(define-method get_preferred_height
+  (of-object "ClutterLayoutManager")
+  (c-name "clutter_layout_manager_get_preferred_height")
+  (return-type "none")
+  (parameters
+    '("ClutterContainer*" "container")
+    '("gfloat" "for_width")
+    '("gfloat*" "min_height_p")
+    '("gfloat*" "nat_height_p")
+  )
+)
+
+(define-method allocate
+  (of-object "ClutterLayoutManager")
+  (c-name "clutter_layout_manager_allocate")
+  (return-type "none")
+  (parameters
+    '("ClutterContainer*" "container")
+    '("const-ClutterActorBox*" "allocation")
+    '("ClutterAllocationFlags" "flags")
+  )
+)
+
+(define-method set_container
+  (of-object "ClutterLayoutManager")
+  (c-name "clutter_layout_manager_set_container")
+  (return-type "none")
+  (parameters
+    '("ClutterContainer*" "container")
+  )
+)
+
+(define-method layout_changed
+  (of-object "ClutterLayoutManager")
+  (c-name "clutter_layout_manager_layout_changed")
   (return-type "none")
 )
 
@@ -5212,16 +5106,6 @@
   (return-type "gboolean")
 )
 
-(define-function clutter_threads_enter
-  (c-name "clutter_threads_enter")
-  (return-type "none")
-)
-
-(define-function clutter_threads_leave
-  (c-name "clutter_threads_leave")
-  (return-type "none")
-)
-
 (define-function clutter_threads_set_lock_functions
   (c-name "clutter_threads_set_lock_functions")
   (return-type "none")
@@ -5383,6 +5267,45 @@
   )
 )
 
+(define-function _clutter_marshal_BOOLEAN__OBJECT_BOOLEAN
+  (c-name "_clutter_marshal_BOOLEAN__OBJECT_BOOLEAN")
+  (return-type "extern-void")
+  (parameters
+    '("GClosure*" "closure")
+    '("GValue*" "return_value")
+    '("guint" "n_param_values")
+    '("const-GValue*" "param_values")
+    '("gpointer" "invocation_hint")
+    '("gpointer" "marshal_data")
+  )
+)
+
+(define-function _clutter_marshal_BOOLEAN__OBJECT_BOXED_DOUBLE
+  (c-name "_clutter_marshal_BOOLEAN__OBJECT_BOXED_DOUBLE")
+  (return-type "extern-void")
+  (parameters
+    '("GClosure*" "closure")
+    '("GValue*" "return_value")
+    '("guint" "n_param_values")
+    '("const-GValue*" "param_values")
+    '("gpointer" "invocation_hint")
+    '("gpointer" "marshal_data")
+  )
+)
+
+(define-function _clutter_marshal_BOOLEAN__OBJECT_DOUBLE
+  (c-name "_clutter_marshal_BOOLEAN__OBJECT_DOUBLE")
+  (return-type "extern-void")
+  (parameters
+    '("GClosure*" "closure")
+    '("GValue*" "return_value")
+    '("guint" "n_param_values")
+    '("const-GValue*" "param_values")
+    '("gpointer" "invocation_hint")
+    '("gpointer" "marshal_data")
+  )
+)
+
 (define-function _clutter_marshal_BOOLEAN__OBJECT_ENUM
   (c-name "_clutter_marshal_BOOLEAN__OBJECT_ENUM")
   (return-type "extern-void")
@@ -5617,6 +5540,19 @@
   )
 )
 
+(define-function _clutter_marshal_VOID__STRING_BOOLEAN
+  (c-name "_clutter_marshal_VOID__STRING_BOOLEAN")
+  (return-type "extern-void")
+  (parameters
+    '("GClosure*" "closure")
+    '("GValue*" "return_value")
+    '("guint" "n_param_values")
+    '("const-GValue*" "param_values")
+    '("gpointer" "invocation_hint")
+    '("gpointer" "marshal_data")
+  )
+)
+
 (define-function _clutter_marshal_VOID__STRING_BOOLEAN_BOOLEAN
   (c-name "_clutter_marshal_VOID__STRING_BOOLEAN_BOOLEAN")
   (return-type "extern-void")
@@ -5684,245 +5620,119 @@
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-media.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-model.h
 
-(define-function clutter_media_get_type
-  (c-name "clutter_media_get_type")
+(define-function clutter_model_get_type
+  (c-name "clutter_model_get_type")
   (return-type "GType")
 )
 
-(define-method set_uri
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_uri")
+(define-method set_types
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_types")
   (return-type "none")
   (parameters
-    '("const-gchar*" "uri")
+    '("guint" "n_columns")
+    '("GType*" "types")
   )
 )
 
-(define-method get_uri
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_uri")
-  (return-type "gchar*")
+(define-method set_names
+  (of-object "ClutterModel")
+  (c-name "clutter_model_set_names")
+  (return-type "none")
+  (parameters
+    '("guint" "n_columns")
+    '("const-gchar*-const[]" "names")
+  )
 )
 
-(define-method set_filename
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_filename")
+(define-method append
+  (of-object "ClutterModel")
+  (c-name "clutter_model_append")
   (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
   )
+  (varargs #t)
 )
 
-(define-method set_playing
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_playing")
+(define-method appendv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_appendv")
   (return-type "none")
   (parameters
-    '("gboolean" "playing")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method get_playing
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_playing")
-  (return-type "gboolean")
+(define-method prepend
+  (of-object "ClutterModel")
+  (c-name "clutter_model_prepend")
+  (return-type "none")
+  (parameters
+  )
+  (varargs #t)
 )
 
-(define-method set_progress
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_progress")
+(define-method prependv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_prependv")
   (return-type "none")
   (parameters
-    '("gdouble" "progress")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method get_progress
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_progress")
-  (return-type "gdouble")
+(define-method insert
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insert")
+  (return-type "none")
+  (parameters
+    '("guint" "row")
+  )
+  (varargs #t)
 )
 
-(define-method set_subtitle_uri
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_subtitle_uri")
+(define-method insertv
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insertv")
   (return-type "none")
   (parameters
-    '("const-gchar*" "uri")
+    '("guint" "row")
+    '("guint" "n_columns")
+    '("guint*" "columns")
+    '("GValue*" "values")
   )
 )
 
-(define-method get_subtitle_uri
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_subtitle_uri")
-  (return-type "gchar*")
+(define-method insert_value
+  (of-object "ClutterModel")
+  (c-name "clutter_model_insert_value")
+  (return-type "none")
+  (parameters
+    '("guint" "row")
+    '("guint" "column")
+    '("const-GValue*" "value")
+  )
 )
 
-(define-method set_subtitle_font_name
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_subtitle_font_name")
+(define-method remove
+  (of-object "ClutterModel")
+  (c-name "clutter_model_remove")
   (return-type "none")
   (parameters
-    '("const-char*" "font_name")
+    '("guint" "row")
   )
 )
 
-(define-method get_subtitle_font_name
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_subtitle_font_name")
-  (return-type "gchar*")
-)
-
-(define-method set_audio_volume
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_set_audio_volume")
-  (return-type "none")
-  (parameters
-    '("gdouble" "volume")
-  )
-)
-
-(define-method get_audio_volume
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_audio_volume")
-  (return-type "gdouble")
-)
-
-(define-method get_can_seek
-  (of-object "ClutterMedia")
-  (c-name "clutter_media_get_can_seek")
-  (return-type "gboolean")
-)
-
-(define-method get_buffer_fill
-  (of-object "ClutterMedia")
-  (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 "gdouble")
-)
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/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")
-  (return-type "none")
-  (parameters
-    '("guint" "n_columns")
-    '("GType*" "types")
-  )
-)
-
-(define-method set_names
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_names")
-  (return-type "none")
-  (parameters
-    '("guint" "n_columns")
-    '("const-gchar*-const[]" "names")
-  )
-)
-
-(define-method append
-  (of-object "ClutterModel")
-  (c-name "clutter_model_append")
-  (return-type "none")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method appendv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_appendv")
-  (return-type "none")
-  (parameters
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
-  )
-)
-
-(define-method prepend
-  (of-object "ClutterModel")
-  (c-name "clutter_model_prepend")
-  (return-type "none")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method prependv
-  (of-object "ClutterModel")
-  (c-name "clutter_model_prependv")
-  (return-type "none")
-  (parameters
-    '("guint" "n_columns")
-    '("guint*" "columns")
-    '("GValue*" "values")
-  )
-)
-
-(define-method insert
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insert")
-  (return-type "none")
-  (parameters
-    '("guint" "row")
-  )
-  (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 insert_value
-  (of-object "ClutterModel")
-  (c-name "clutter_model_insert_value")
-  (return-type "none")
-  (parameters
-    '("guint" "row")
-    '("guint" "column")
-    '("const-GValue*" "value")
-  )
-)
-
-(define-method remove
-  (of-object "ClutterModel")
-  (c-name "clutter_model_remove")
-  (return-type "none")
-  (parameters
-    '("guint" "row")
-  )
-)
-
-(define-method get_n_rows
-  (of-object "ClutterModel")
-  (c-name "clutter_model_get_n_rows")
-  (return-type "guint")
+(define-method get_n_rows
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_n_rows")
+  (return-type "guint")
 )
 
 (define-method get_n_columns
@@ -6450,6 +6260,101 @@
 
 
 
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-pan-action.h
+
+(define-function clutter_pan_action_get_type
+  (c-name "clutter_pan_action_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_pan_action_new
+  (c-name "clutter_pan_action_new")
+  (is-constructor-of "ClutterPanAction")
+  (return-type "ClutterAction*")
+)
+
+(define-method set_pan_axis
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_set_pan_axis")
+  (return-type "none")
+  (parameters
+    '("ClutterPanAxis" "axis")
+  )
+)
+
+(define-method get_pan_axis
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_get_pan_axis")
+  (return-type "ClutterPanAxis")
+)
+
+(define-method set_interpolate
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_set_interpolate")
+  (return-type "none")
+  (parameters
+    '("gboolean" "should_interpolate")
+  )
+)
+
+(define-method get_interpolate
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_get_interpolate")
+  (return-type "gboolean")
+)
+
+(define-method set_deceleration
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_set_deceleration")
+  (return-type "none")
+  (parameters
+    '("gdouble" "rate")
+  )
+)
+
+(define-method get_deceleration
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_get_deceleration")
+  (return-type "gdouble")
+)
+
+(define-method set_acceleration_factor
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_set_acceleration_factor")
+  (return-type "none")
+  (parameters
+    '("gdouble" "factor")
+  )
+)
+
+(define-method get_acceleration_factor
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_get_acceleration_factor")
+  (return-type "gdouble")
+)
+
+(define-method get_interpolated_coords
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_get_interpolated_coords")
+  (return-type "none")
+  (parameters
+    '("gfloat*" "interpolated_x")
+    '("gfloat*" "interpolated_y")
+  )
+)
+
+(define-method get_interpolated_delta
+  (of-object "ClutterPanAction")
+  (c-name "clutter_pan_action_get_interpolated_delta")
+  (return-type "none")
+  (parameters
+    '("gfloat*" "delta_x")
+    '("gfloat*" "delta_y")
+  )
+)
+
+
+
 ;; From /opt/clutter/include/clutter-1.0/clutter/clutter-path-constraint.h
 
 (define-function clutter_path_constraint_get_type
@@ -6505,11 +6410,6 @@
   (return-type "GType")
 )
 
-(define-function clutter_path_node_get_type
-  (c-name "clutter_path_node_get_type")
-  (return-type "GType")
-)
-
 (define-function clutter_path_new
   (c-name "clutter_path_new")
   (is-constructor-of "ClutterPath")
@@ -6732,27 +6632,6 @@
   (return-type "guint")
 )
 
-(define-method copy
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_copy")
-  (return-type "ClutterPathNode*")
-)
-
-(define-method free
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_free")
-  (return-type "none")
-)
-
-(define-method equal
-  (of-object "ClutterPathNode")
-  (c-name "clutter_path_node_equal")
-  (return-type "gboolean")
-  (parameters
-    '("const-ClutterPathNode*" "node_b")
-  )
-)
-
 
 
 ;; From /opt/clutter/include/clutter-1.0/clutter/clutter-property-transition.h
@@ -6788,6 +6667,21 @@
 
 
 
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-rotate-action.h
+
+(define-function clutter_rotate_action_get_type
+  (c-name "clutter_rotate_action_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_rotate_action_new
+  (c-name "clutter_rotate_action_new")
+  (is-constructor-of "ClutterRotateAction")
+  (return-type "ClutterAction*")
+)
+
+
+
 ;; From /opt/clutter/include/clutter-1.0/clutter/clutter-scriptable.h
 
 (define-function clutter_scriptable_get_type
@@ -7015,25 +6909,73 @@
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-settings.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-scroll-actor.h
 
-(define-function clutter_settings_get_type
-  (c-name "clutter_settings_get_type")
+(define-function clutter_scroll_actor_get_type
+  (c-name "clutter_scroll_actor_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_settings_get_default
-  (c-name "clutter_settings_get_default")
-  (return-type "ClutterSettings*")
+(define-function clutter_scroll_actor_new
+  (c-name "clutter_scroll_actor_new")
+  (is-constructor-of "ClutterScrollActor")
+  (return-type "ClutterActor*")
 )
 
+(define-method set_scroll_mode
+  (of-object "ClutterScrollActor")
+  (c-name "clutter_scroll_actor_set_scroll_mode")
+  (return-type "none")
+  (parameters
+    '("ClutterScrollMode" "mode")
+  )
+)
 
+(define-method get_scroll_mode
+  (of-object "ClutterScrollActor")
+  (c-name "clutter_scroll_actor_get_scroll_mode")
+  (return-type "ClutterScrollMode")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-shader-effect.h
-
-(define-function clutter_shader_effect_get_type
-  (c-name "clutter_shader_effect_get_type")
-  (return-type "GType")
+(define-method scroll_to_point
+  (of-object "ClutterScrollActor")
+  (c-name "clutter_scroll_actor_scroll_to_point")
+  (return-type "none")
+  (parameters
+    '("const-ClutterPoint*" "point")
+  )
+)
+
+(define-method scroll_to_rect
+  (of-object "ClutterScrollActor")
+  (c-name "clutter_scroll_actor_scroll_to_rect")
+  (return-type "none")
+  (parameters
+    '("const-ClutterRect*" "rect")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/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 /opt/clutter/include/clutter-1.0/clutter/clutter-shader-effect.h
+
+(define-function clutter_shader_effect_get_type
+  (c-name "clutter_shader_effect_get_type")
+  (return-type "GType")
 )
 
 (define-function clutter_shader_effect_new
@@ -7538,215 +7480,6 @@
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/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 "gboolean")
-  (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 /opt/clutter/include/clutter-1.0/clutter/clutter-swipe-action.h
 
 (define-function clutter_swipe_action_get_type
@@ -8647,234 +8380,13 @@
   (return-type "GType")
 )
 
-(define-function clutter_texture_new
-  (c-name "clutter_texture_new")
-  (is-constructor-of "ClutterTexture")
-  (return-type "ClutterActor*")
-)
 
-(define-function clutter_texture_new_from_file
-  (c-name "clutter_texture_new_from_file")
-  (return-type "ClutterActor*")
-  (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
-  )
-)
-
-(define-method set_from_file
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_file")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
-  )
-)
-
-(define-method set_from_rgb_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_from_rgb_data")
-  (return-type "gboolean")
-  (parameters
-    '("const-guchar*" "data")
-    '("gboolean" "has_alpha")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "rowstride")
-    '("gint" "bpp")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
-  )
-)
-
-(define-method set_area_from_rgb_data
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_area_from_rgb_data")
-  (return-type "gboolean")
-  (parameters
-    '("const-guchar*" "data")
-    '("gboolean" "has_alpha")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "rowstride")
-    '("gint" "bpp")
-    '("ClutterTextureFlags" "flags")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_base_size
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_base_size")
-  (return-type "none")
-  (parameters
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
-(define-method set_filter_quality
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_filter_quality")
-  (return-type "none")
-  (parameters
-    '("ClutterTextureQuality" "filter_quality")
-  )
-)
-
-(define-method get_filter_quality
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_filter_quality")
-  (return-type "ClutterTextureQuality")
-)
-
-(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
-    '("CoglHandle" "cogl_tex")
-  )
-)
-
-(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
-    '("CoglHandle" "cogl_material")
-  )
-)
-
-(define-method set_sync_size
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_sync_size")
-  (return-type "none")
-  (parameters
-    '("gboolean" "sync_size")
-  )
-)
-
-(define-method get_sync_size
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_sync_size")
-  (return-type "gboolean")
-)
-
-(define-method set_repeat
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_repeat")
-  (return-type "none")
-  (parameters
-    '("gboolean" "repeat_x")
-    '("gboolean" "repeat_y")
-  )
-)
-
-(define-method get_repeat
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_repeat")
-  (return-type "none")
-  (parameters
-    '("gboolean*" "repeat_x")
-    '("gboolean*" "repeat_y")
-  )
-)
-
-(define-method get_pixel_format
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_pixel_format")
-  (return-type "CoglPixelFormat")
-)
-
-(define-method get_max_tile_waste
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_max_tile_waste")
-  (return-type "gint")
-)
-
-(define-method set_keep_aspect_ratio
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_keep_aspect_ratio")
-  (return-type "none")
-  (parameters
-    '("gboolean" "keep_aspect")
-  )
-)
-
-(define-method get_keep_aspect_ratio
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_keep_aspect_ratio")
-  (return-type "gboolean")
-)
-
-(define-method set_load_async
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_load_async")
-  (return-type "none")
-  (parameters
-    '("gboolean" "load_async")
-  )
-)
-
-(define-method get_load_async
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_load_async")
-  (return-type "gboolean")
-)
-
-(define-method set_load_data_async
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_set_load_data_async")
-  (return-type "none")
-  (parameters
-    '("gboolean" "load_async")
-  )
-)
-
-(define-method get_load_data_async
-  (of-object "ClutterTexture")
-  (c-name "clutter_texture_get_load_data_async")
-  (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 /opt/clutter/include/clutter-1.0/clutter/clutter-timeline.h
-
-(define-function clutter_timeline_get_type
-  (c-name "clutter_timeline_get_type")
-  (return-type "GType")
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-timeline.h
+
+(define-function clutter_timeline_get_type
+  (c-name "clutter_timeline_get_type")
+  (return-type "GType")
 )
 
 (define-function clutter_timeline_new
@@ -9100,6 +8612,46 @@
   (return-type "ClutterAnimationMode")
 )
 
+(define-method set_step_progress
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_step_progress")
+  (return-type "none")
+  (parameters
+    '("gint" "n_steps")
+    '("ClutterStepMode" "step_mode")
+  )
+)
+
+(define-method get_step_progress
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_step_progress")
+  (return-type "gboolean")
+  (parameters
+    '("gint*" "n_steps")
+    '("ClutterStepMode*" "step_mode")
+  )
+)
+
+(define-method set_cubic_bezier_progress
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_set_cubic_bezier_progress")
+  (return-type "none")
+  (parameters
+    '("const-ClutterPoint*" "c_1")
+    '("const-ClutterPoint*" "c_2")
+  )
+)
+
+(define-method get_cubic_bezier_progress
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_cubic_bezier_progress")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterPoint*" "c_1")
+    '("ClutterPoint*" "c_2")
+  )
+)
+
 (define-method get_duration_hint
   (of-object "ClutterTimeline")
   (c-name "clutter_timeline_get_duration_hint")
@@ -9114,29 +8666,106 @@
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-transition.h
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-transition-group.h
 
-(define-function clutter_transition_get_type
-  (c-name "clutter_transition_get_type")
+(define-function clutter_transition_group_get_type
+  (c-name "clutter_transition_group_get_type")
   (return-type "GType")
 )
 
-(define-method set_interval
-  (of-object "ClutterTransition")
-  (c-name "clutter_transition_set_interval")
+(define-function clutter_transition_group_new
+  (c-name "clutter_transition_group_new")
+  (is-constructor-of "ClutterTransitionGroup")
+  (return-type "ClutterTransition*")
+)
+
+(define-method add_transition
+  (of-object "ClutterTransitionGroup")
+  (c-name "clutter_transition_group_add_transition")
   (return-type "none")
   (parameters
-    '("ClutterInterval*" "interval")
+    '("ClutterTransition*" "transition")
   )
 )
 
-(define-method get_interval
-  (of-object "ClutterTransition")
-  (c-name "clutter_transition_get_interval")
-  (return-type "ClutterInterval*")
-)
-
-(define-method set_animatable
+(define-method remove_transition
+  (of-object "ClutterTransitionGroup")
+  (c-name "clutter_transition_group_remove_transition")
+  (return-type "none")
+  (parameters
+    '("ClutterTransition*" "transition")
+  )
+)
+
+(define-method remove_all
+  (of-object "ClutterTransitionGroup")
+  (c-name "clutter_transition_group_remove_all")
+  (return-type "none")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-transition.h
+
+(define-function clutter_transition_get_type
+  (c-name "clutter_transition_get_type")
+  (return-type "GType")
+)
+
+(define-method set_interval
+  (of-object "ClutterTransition")
+  (c-name "clutter_transition_set_interval")
+  (return-type "none")
+  (parameters
+    '("ClutterInterval*" "interval")
+  )
+)
+
+(define-method get_interval
+  (of-object "ClutterTransition")
+  (c-name "clutter_transition_get_interval")
+  (return-type "ClutterInterval*")
+)
+
+(define-method set_from_value
+  (of-object "ClutterTransition")
+  (c-name "clutter_transition_set_from_value")
+  (return-type "none")
+  (parameters
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method set_to_value
+  (of-object "ClutterTransition")
+  (c-name "clutter_transition_set_to_value")
+  (return-type "none")
+  (parameters
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method set_from
+  (of-object "ClutterTransition")
+  (c-name "clutter_transition_set_from")
+  (return-type "none")
+  (parameters
+    '("GType" "value_type")
+  )
+  (varargs #t)
+)
+
+(define-method set_to
+  (of-object "ClutterTransition")
+  (c-name "clutter_transition_set_to")
+  (return-type "none")
+  (parameters
+    '("GType" "value_type")
+  )
+  (varargs #t)
+)
+
+(define-method set_animatable
   (of-object "ClutterTransition")
   (c-name "clutter_transition_set_animatable")
   (return-type "none")
@@ -9170,6 +8799,255 @@
 
 ;; From /opt/clutter/include/clutter-1.0/clutter/clutter-types.h
 
+(define-function clutter_point_get_type
+  (c-name "clutter_point_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_point_zero
+  (c-name "clutter_point_zero")
+  (return-type "const-ClutterPoint*")
+)
+
+(define-function clutter_point_alloc
+  (c-name "clutter_point_alloc")
+  (return-type "ClutterPoint*")
+)
+
+(define-method init
+  (of-object "ClutterPoint")
+  (c-name "clutter_point_init")
+  (return-type "ClutterPoint*")
+  (parameters
+    '("float" "x")
+    '("float" "y")
+  )
+)
+
+(define-method copy
+  (of-object "ClutterPoint")
+  (c-name "clutter_point_copy")
+  (return-type "ClutterPoint*")
+)
+
+(define-method free
+  (of-object "ClutterPoint")
+  (c-name "clutter_point_free")
+  (return-type "none")
+)
+
+(define-method equals
+  (of-object "ClutterPoint")
+  (c-name "clutter_point_equals")
+  (return-type "gboolean")
+  (parameters
+    '("const-ClutterPoint*" "b")
+  )
+)
+
+(define-method distance
+  (of-object "ClutterPoint")
+  (c-name "clutter_point_distance")
+  (return-type "float")
+  (parameters
+    '("const-ClutterPoint*" "b")
+    '("float*" "x_distance")
+    '("float*" "y_distance")
+  )
+)
+
+(define-function clutter_size_get_type
+  (c-name "clutter_size_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_size_alloc
+  (c-name "clutter_size_alloc")
+  (return-type "ClutterSize*")
+)
+
+(define-method init
+  (of-object "ClutterSize")
+  (c-name "clutter_size_init")
+  (return-type "ClutterSize*")
+  (parameters
+    '("float" "width")
+    '("float" "height")
+  )
+)
+
+(define-method copy
+  (of-object "ClutterSize")
+  (c-name "clutter_size_copy")
+  (return-type "ClutterSize*")
+)
+
+(define-method free
+  (of-object "ClutterSize")
+  (c-name "clutter_size_free")
+  (return-type "none")
+)
+
+(define-method equals
+  (of-object "ClutterSize")
+  (c-name "clutter_size_equals")
+  (return-type "gboolean")
+  (parameters
+    '("const-ClutterSize*" "b")
+  )
+)
+
+(define-function clutter_rect_get_type
+  (c-name "clutter_rect_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_rect_zero
+  (c-name "clutter_rect_zero")
+  (return-type "const-ClutterRect*")
+)
+
+(define-function clutter_rect_alloc
+  (c-name "clutter_rect_alloc")
+  (return-type "ClutterRect*")
+)
+
+(define-method init
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_init")
+  (return-type "ClutterRect*")
+  (parameters
+    '("float" "x")
+    '("float" "y")
+    '("float" "width")
+    '("float" "height")
+  )
+)
+
+(define-method copy
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_copy")
+  (return-type "ClutterRect*")
+)
+
+(define-method free
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_free")
+  (return-type "none")
+)
+
+(define-method equals
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_equals")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterRect*" "b")
+  )
+)
+
+(define-method normalize
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_normalize")
+  (return-type "ClutterRect*")
+)
+
+(define-method get_center
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_get_center")
+  (return-type "none")
+  (parameters
+    '("ClutterPoint*" "center")
+  )
+)
+
+(define-method contains_point
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_contains_point")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterPoint*" "point")
+  )
+)
+
+(define-method contains_rect
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_contains_rect")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterRect*" "b")
+  )
+)
+
+(define-method union
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_union")
+  (return-type "none")
+  (parameters
+    '("ClutterRect*" "b")
+    '("ClutterRect*" "res")
+  )
+)
+
+(define-method intersection
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_intersection")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterRect*" "b")
+    '("ClutterRect*" "res")
+  )
+)
+
+(define-method offset
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_offset")
+  (return-type "none")
+  (parameters
+    '("float" "d_x")
+    '("float" "d_y")
+  )
+)
+
+(define-method inset
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_inset")
+  (return-type "none")
+  (parameters
+    '("float" "d_x")
+    '("float" "d_y")
+  )
+)
+
+(define-method clamp_to_pixel
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_clamp_to_pixel")
+  (return-type "none")
+)
+
+(define-method get_x
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_get_x")
+  (return-type "float")
+)
+
+(define-method get_y
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_get_y")
+  (return-type "float")
+)
+
+(define-method get_width
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_get_width")
+  (return-type "float")
+)
+
+(define-method get_height
+  (of-object "ClutterRect")
+  (c-name "clutter_rect_get_height")
+  (return-type "float")
+)
+
 (define-function clutter_vertex_get_type
   (c-name "clutter_vertex_get_type")
   (return-type "GType")
@@ -9186,10 +9064,15 @@
   )
 )
 
+(define-function clutter_vertex_alloc
+  (c-name "clutter_vertex_alloc")
+  (return-type "ClutterVertex*")
+)
+
 (define-method init
   (of-object "ClutterVertex")
   (c-name "clutter_vertex_init")
-  (return-type "none")
+  (return-type "ClutterVertex*")
   (parameters
     '("gfloat" "x")
     '("gfloat" "y")
@@ -9235,10 +9118,15 @@
   )
 )
 
+(define-function clutter_actor_box_alloc
+  (c-name "clutter_actor_box_alloc")
+  (return-type "ClutterActorBox*")
+)
+
 (define-method init
   (of-object "ClutterActorBox")
   (c-name "clutter_actor_box_init")
-  (return-type "none")
+  (return-type "ClutterActorBox*")
   (parameters
     '("gfloat" "x_1")
     '("gfloat" "y_1")
@@ -9366,2037 +9254,3541 @@
   (return-type "none")
 )
 
-(define-method union
-  (of-object "ClutterActorBox")
-  (c-name "clutter_actor_box_union")
+(define-method union
+  (of-object "ClutterActorBox")
+  (c-name "clutter_actor_box_union")
+  (return-type "none")
+  (parameters
+    '("const-ClutterActorBox*" "b")
+    '("ClutterActorBox*" "result")
+  )
+)
+
+(define-method set_origin
+  (of-object "ClutterActorBox")
+  (c-name "clutter_actor_box_set_origin")
+  (return-type "none")
+  (parameters
+    '("gfloat" "x")
+    '("gfloat" "y")
+  )
+)
+
+(define-method set_size
+  (of-object "ClutterActorBox")
+  (c-name "clutter_actor_box_set_size")
+  (return-type "none")
+  (parameters
+    '("gfloat" "width")
+    '("gfloat" "height")
+  )
+)
+
+(define-function clutter_geometry_get_type
+  (c-name "clutter_geometry_get_type")
+  (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-method intersects
+  (of-object "ClutterGeometry")
+  (c-name "clutter_geometry_intersects")
+  (return-type "gboolean")
+  (parameters
+    '("const-ClutterGeometry*" "geometry1")
+  )
+)
+
+(define-function clutter_knot_get_type
+  (c-name "clutter_knot_get_type")
+  (return-type "GType")
+)
+
+(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
+    '("const-ClutterKnot*" "knot_b")
+  )
+)
+
+(define-function clutter_path_node_get_type
+  (c-name "clutter_path_node_get_type")
+  (return-type "GType")
+)
+
+(define-method copy
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_copy")
+  (return-type "ClutterPathNode*")
+)
+
+(define-method free
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_free")
+  (return-type "none")
+)
+
+(define-method equal
+  (of-object "ClutterPathNode")
+  (c-name "clutter_path_node_equal")
+  (return-type "gboolean")
+  (parameters
+    '("const-ClutterPathNode*" "node_b")
+  )
+)
+
+(define-function clutter_paint_volume_get_type
+  (c-name "clutter_paint_volume_get_type")
+  (return-type "GType")
+)
+
+(define-method copy
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_copy")
+  (return-type "ClutterPaintVolume*")
+)
+
+(define-method free
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_free")
+  (return-type "none")
+)
+
+(define-method set_origin
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_set_origin")
+  (return-type "none")
+  (parameters
+    '("const-ClutterVertex*" "origin")
+  )
+)
+
+(define-method get_origin
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_get_origin")
+  (return-type "none")
+  (parameters
+    '("ClutterVertex*" "vertex")
+  )
+)
+
+(define-method set_width
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_set_width")
+  (return-type "none")
+  (parameters
+    '("gfloat" "width")
+  )
+)
+
+(define-method get_width
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_get_width")
+  (return-type "gfloat")
+)
+
+(define-method set_height
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_set_height")
+  (return-type "none")
+  (parameters
+    '("gfloat" "height")
+  )
+)
+
+(define-method get_height
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_get_height")
+  (return-type "gfloat")
+)
+
+(define-method set_depth
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_set_depth")
+  (return-type "none")
+  (parameters
+    '("gfloat" "depth")
+  )
+)
+
+(define-method get_depth
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_get_depth")
+  (return-type "gfloat")
+)
+
+(define-method union
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_union")
+  (return-type "none")
+  (parameters
+    '("const-ClutterPaintVolume*" "another_pv")
+  )
+)
+
+(define-method union_box
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_union_box")
+  (return-type "none")
+  (parameters
+    '("const-ClutterActorBox*" "box")
+  )
+)
+
+(define-method set_from_allocation
+  (of-object "ClutterPaintVolume")
+  (c-name "clutter_paint_volume_set_from_allocation")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
+)
+
+(define-function clutter_margin_get_type
+  (c-name "clutter_margin_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_margin_new
+  (c-name "clutter_margin_new")
+  (is-constructor-of "ClutterMargin")
+  (return-type "ClutterMargin*")
+)
+
+(define-method copy
+  (of-object "ClutterMargin")
+  (c-name "clutter_margin_copy")
+  (return-type "ClutterMargin*")
+)
+
+(define-method free
+  (of-object "ClutterMargin")
+  (c-name "clutter_margin_free")
+  (return-type "none")
+)
+
+(define-function clutter_interval_register_progress_func
+  (c-name "clutter_interval_register_progress_func")
+  (return-type "none")
+  (parameters
+    '("GType" "value_type")
+    '("ClutterProgressFunc" "func")
+  )
+)
+
+(define-function clutter_matrix_get_type
+  (c-name "clutter_matrix_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_matrix_alloc
+  (c-name "clutter_matrix_alloc")
+  (return-type "ClutterMatrix*")
+)
+
+(define-method init_identity
+  (of-object "ClutterMatrix")
+  (c-name "clutter_matrix_init_identity")
+  (return-type "ClutterMatrix*")
+)
+
+(define-method init_from_array
+  (of-object "ClutterMatrix")
+  (c-name "clutter_matrix_init_from_array")
+  (return-type "ClutterMatrix*")
+  (parameters
+    '("const-float" "values[16]")
+  )
+)
+
+(define-method init_from_matrix
+  (of-object "ClutterMatrix")
+  (c-name "clutter_matrix_init_from_matrix")
+  (return-type "ClutterMatrix*")
+  (parameters
+    '("const-ClutterMatrix*" "b")
+  )
+)
+
+(define-method free
+  (of-object "ClutterMatrix")
+  (c-name "clutter_matrix_free")
+  (return-type "none")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-units.h
+
+(define-function clutter_units_get_type
+  (c-name "clutter_units_get_type")
+  (return-type "GType")
+)
+
+(define-method get_unit_type
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_get_unit_type")
+  (return-type "ClutterUnitType")
+)
+
+(define-method get_unit_value
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_get_unit_value")
+  (return-type "gfloat")
+)
+
+(define-method copy
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_copy")
+  (return-type "ClutterUnits*")
+)
+
+(define-method free
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_free")
+  (return-type "none")
+)
+
+(define-method from_pixels
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_from_pixels")
+  (return-type "none")
+  (parameters
+    '("gint" "px")
+  )
+)
+
+(define-method from_em
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_from_em")
+  (return-type "none")
+  (parameters
+    '("gfloat" "em")
+  )
+)
+
+(define-method from_em_for_font
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_from_em_for_font")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "font_name")
+    '("gfloat" "em")
+  )
+)
+
+(define-method from_mm
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_from_mm")
+  (return-type "none")
+  (parameters
+    '("gfloat" "mm")
+  )
+)
+
+(define-method from_cm
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_from_cm")
+  (return-type "none")
+  (parameters
+    '("gfloat" "cm")
+  )
+)
+
+(define-method from_pt
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_from_pt")
+  (return-type "none")
+  (parameters
+    '("gfloat" "pt")
+  )
+)
+
+(define-method to_pixels
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_to_pixels")
+  (return-type "gfloat")
+)
+
+(define-method from_string
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_from_string")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
+
+(define-method to_string
+  (of-object "ClutterUnits")
+  (c-name "clutter_units_to_string")
+  (return-type "gchar*")
+)
+
+(define-function clutter_param_units_get_type
+  (c-name "clutter_param_units_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_param_spec_units
+  (c-name "clutter_param_spec_units")
+  (return-type "GParamSpec*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("ClutterUnitType" "default_type")
+    '("gfloat" "minimum")
+    '("gfloat" "maximum")
+    '("gfloat" "default_value")
+    '("GParamFlags" "flags")
+  )
+)
+
+(define-function clutter_value_set_units
+  (c-name "clutter_value_set_units")
+  (return-type "none")
+  (parameters
+    '("GValue*" "value")
+    '("const-ClutterUnits*" "units")
+  )
+)
+
+(define-function clutter_value_get_units
+  (c-name "clutter_value_get_units")
+  (return-type "const-ClutterUnits*")
+  (parameters
+    '("const-GValue*" "value")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-version.h
+
+(define-function clutter_check_version
+  (c-name "clutter_check_version")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "major")
+    '("guint" "minor")
+    '("guint" "micro")
+  )
+)
+
+(define-function clutter_check_windowing_backend
+  (c-name "clutter_check_windowing_backend")
+  (return-type "gboolean")
+  (parameters
+    '("const-char*" "backend_type")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/clutter-zoom-action.h
+
+(define-function clutter_zoom_action_get_type
+  (c-name "clutter_zoom_action_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_zoom_action_new
+  (c-name "clutter_zoom_action_new")
+  (is-constructor-of "ClutterZoomAction")
+  (return-type "ClutterAction*")
+)
+
+(define-method set_zoom_axis
+  (of-object "ClutterZoomAction")
+  (c-name "clutter_zoom_action_set_zoom_axis")
+  (return-type "none")
+  (parameters
+    '("ClutterZoomAxis" "axis")
+  )
+)
+
+(define-method get_zoom_axis
+  (of-object "ClutterZoomAction")
+  (c-name "clutter_zoom_action_get_zoom_axis")
+  (return-type "ClutterZoomAxis")
+)
+
+(define-method get_focal_point
+  (of-object "ClutterZoomAction")
+  (c-name "clutter_zoom_action_get_focal_point")
+  (return-type "none")
+  (parameters
+    '("ClutterPoint*" "point")
+  )
+)
+
+(define-method get_transformed_focal_point
+  (of-object "ClutterZoomAction")
+  (c-name "clutter_zoom_action_get_transformed_focal_point")
+  (return-type "none")
+  (parameters
+    '("ClutterPoint*" "point")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-actor.h
+
+(define-method set_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_geometry")
+  (return-type "none")
+  (parameters
+    '("const-ClutterGeometry*" "geometry")
+  )
+)
+
+(define-method get_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_geometry")
+  (return-type "none")
+  (parameters
+    '("ClutterGeometry*" "geometry")
+  )
+)
+
+(define-method get_gid
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_gid")
+  (return-type "guint32")
+)
+
+(define-function clutter_get_actor_by_gid
+  (c-name "clutter_get_actor_by_gid")
+  (return-type "ClutterActor*")
+  (parameters
+    '("guint32" "id_")
+  )
+)
+
+(define-method reparent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_reparent")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "new_parent")
+  )
+)
+
+(define-method set_parent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_parent")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "parent")
+  )
+)
+
+(define-method unparent
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_unparent")
+  (return-type "none")
+)
+
+(define-method raise
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_raise")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "below")
+  )
+)
+
+(define-method lower
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_lower")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "above")
+  )
+)
+
+(define-method raise_top
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_raise_top")
+  (return-type "none")
+)
+
+(define-method lower_bottom
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_lower_bottom")
+  (return-type "none")
+)
+
+(define-method push_internal
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_push_internal")
+  (return-type "none")
+)
+
+(define-method pop_internal
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_pop_internal")
+  (return-type "none")
+)
+
+(define-method show_all
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_show_all")
+  (return-type "none")
+)
+
+(define-method hide_all
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_hide_all")
+  (return-type "none")
+)
+
+(define-method set_depth
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_depth")
+  (return-type "none")
+  (parameters
+    '("gfloat" "depth")
+  )
+)
+
+(define-method get_depth
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_depth")
+  (return-type "gfloat")
+)
+
+(define-method set_rotation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_rotation")
+  (return-type "none")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
+    '("gfloat" "x")
+    '("gfloat" "y")
+    '("gfloat" "z")
+  )
+)
+
+(define-method set_z_rotation_from_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_z_rotation_from_gravity")
+  (return-type "none")
+  (parameters
+    '("gdouble" "angle")
+    '("ClutterGravity" "gravity")
+  )
+)
+
+(define-method get_rotation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_rotation")
+  (return-type "gdouble")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+    '("gfloat*" "x")
+    '("gfloat*" "y")
+    '("gfloat*" "z")
+  )
+)
+
+(define-method get_z_rotation_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_z_rotation_gravity")
+  (return-type "ClutterGravity")
+)
+
+(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")
+    '("gfloat" "center_x")
+    '("gfloat" "center_y")
+  )
+)
+
+(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-method get_scale_center
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scale_center")
+  (return-type "none")
+  (parameters
+    '("gfloat*" "center_x")
+    '("gfloat*" "center_y")
+  )
+)
+
+(define-method get_scale_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_scale_gravity")
+  (return-type "ClutterGravity")
+)
+
+(define-method set_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_point")
+  (return-type "none")
+  (parameters
+    '("gfloat" "anchor_x")
+    '("gfloat" "anchor_y")
+  )
+)
+
+(define-method move_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_move_anchor_point")
+  (return-type "none")
+  (parameters
+    '("gfloat" "anchor_x")
+    '("gfloat" "anchor_y")
+  )
+)
+
+(define-method get_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_point")
+  (return-type "none")
+  (parameters
+    '("gfloat*" "anchor_x")
+    '("gfloat*" "anchor_y")
+  )
+)
+
+(define-method get_anchor_point_gravity
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_point_gravity")
+  (return-type "ClutterGravity")
+)
+
+(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-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-method get_transformation_matrix
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_transformation_matrix")
+  (return-type "none")
+  (parameters
+    '("ClutterMatrix*" "matrix")
+  )
+)
+
+(define-method get_allocation_geometry
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_allocation_geometry")
+  (return-type "none")
+  (parameters
+    '("ClutterGeometry*" "geom")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-alpha.h
+
+(define-function clutter_alpha_get_type
+  (c-name "clutter_alpha_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_alpha_new
+  (c-name "clutter_alpha_new")
+  (is-constructor-of "ClutterAlpha")
+  (return-type "ClutterAlpha*")
+)
+
+(define-function clutter_alpha_new_full
+  (c-name "clutter_alpha_new_full")
+  (return-type "ClutterAlpha*")
+  (parameters
+    '("ClutterTimeline*" "timeline")
+    '("gulong" "mode")
+  )
+)
+
+(define-function clutter_alpha_new_with_func
+  (c-name "clutter_alpha_new_with_func")
+  (return-type "ClutterAlpha*")
+  (parameters
+    '("ClutterTimeline*" "timeline")
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
+  )
+)
+
+(define-method get_alpha
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_alpha")
+  (return-type "gdouble")
+)
+
+(define-method set_func
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_func")
+  (return-type "none")
+  (parameters
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
+  )
+)
+
+(define-method set_closure
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_closure")
+  (return-type "none")
+  (parameters
+    '("GClosure*" "closure")
+  )
+)
+
+(define-method set_timeline
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_set_timeline")
+  (return-type "none")
+  (parameters
+    '("ClutterTimeline*" "timeline")
+  )
+)
+
+(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
+    '("gulong" "mode")
+  )
+)
+
+(define-method get_mode
+  (of-object "ClutterAlpha")
+  (c-name "clutter_alpha_get_mode")
+  (return-type "gulong")
+)
+
+(define-function clutter_alpha_register_func
+  (c-name "clutter_alpha_register_func")
+  (return-type "gulong")
+  (parameters
+    '("ClutterAlphaFunc" "func")
+    '("gpointer" "data")
+  )
+)
+
+(define-function clutter_alpha_register_closure
+  (c-name "clutter_alpha_register_closure")
+  (return-type "gulong")
+  (parameters
+    '("GClosure*" "closure")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-animatable.h
+
+(define-method animate_property
+  (of-object "ClutterAnimatable")
+  (c-name "clutter_animatable_animate_property")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterAnimation*" "animation")
+    '("const-gchar*" "property_name")
+    '("const-GValue*" "initial_value")
+    '("const-GValue*" "final_value")
+    '("gdouble" "progress")
+    '("GValue*" "value")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-animation.h
+
+(define-function clutter_animation_get_type
+  (c-name "clutter_animation_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_object
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_object")
+  (return-type "none")
+  (parameters
+    '("GObject*" "object")
+  )
+)
+
+(define-method get_object
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_object")
+  (return-type "GObject*")
+)
+
+(define-method set_mode
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_mode")
+  (return-type "none")
+  (parameters
+    '("gulong" "mode")
+  )
+)
+
+(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
+    '("guint" "msecs")
+  )
+)
+
+(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
+    '("gboolean" "loop")
+  )
+)
+
+(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
+    '("ClutterTimeline*" "timeline")
+  )
+)
+
+(define-method get_timeline
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_timeline")
+  (return-type "ClutterTimeline*")
+)
+
+(define-method set_alpha
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_set_alpha")
+  (return-type "none")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+  )
+)
+
+(define-method get_alpha
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_alpha")
+  (return-type "ClutterAlpha*")
+)
+
+(define-method bind
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_bind")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("const-GValue*" "final")
+  )
+)
+
+(define-method bind_interval
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_bind_interval")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("ClutterInterval*" "interval")
+  )
+)
+
+(define-method has_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_has_property")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method update
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_update")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("const-GValue*" "final")
+  )
+)
+
+(define-method update_interval
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_update_interval")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+    '("ClutterInterval*" "interval")
+  )
+)
+
+(define-method unbind_property
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_unbind_property")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method get_interval
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_get_interval")
+  (return-type "ClutterInterval*")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method completed
+  (of-object "ClutterAnimation")
+  (c-name "clutter_animation_completed")
+  (return-type "none")
+)
+
+(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-method animate_with_timeline
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_timeline")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("gulong" "mode")
+    '("ClutterTimeline*" "timeline")
+    '("const-gchar*" "first_property_name")
+  )
+  (varargs #t)
+)
+
+(define-method animatev
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animatev")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("gulong" "mode")
+    '("guint" "duration")
+    '("gint" "n_properties")
+    '("const-gchar*-const[]" "properties")
+    '("const-GValue*" "values")
+  )
+)
+
+(define-method animate_with_timelinev
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_timelinev")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("gulong" "mode")
+    '("ClutterTimeline*" "timeline")
+    '("gint" "n_properties")
+    '("const-gchar*-const[]" "properties")
+    '("const-GValue*" "values")
+  )
+)
+
+(define-method animate_with_alpha
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_alpha")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("const-gchar*" "first_property_name")
+  )
+  (varargs #t)
+)
+
+(define-method animate_with_alphav
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_alphav")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gint" "n_properties")
+    '("const-gchar*-const[]" "properties")
+    '("const-GValue*" "values")
+  )
+)
+
+(define-method get_animation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_animation")
+  (return-type "ClutterAnimation*")
+)
+
+(define-method detach_animation
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_detach_animation")
+  (return-type "none")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-animator.h
+
+(define-function clutter_animator_get_type
+  (c-name "clutter_animator_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_animator_new
+  (c-name "clutter_animator_new")
+  (is-constructor-of "ClutterAnimator")
+  (return-type "ClutterAnimator*")
+)
+
+(define-method set_key
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_set_key")
+  (return-type "ClutterAnimator*")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+    '("guint" "mode")
+    '("gdouble" "progress")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method set
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_set")
+  (return-type "none")
+  (parameters
+    '("gpointer" "first_object")
+    '("const-gchar*" "first_property_name")
+    '("guint" "first_mode")
+    '("gdouble" "first_progress")
+  )
+  (varargs #t)
+)
+
+(define-method get_keys
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_get_keys")
+  (return-type "GList*")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+    '("gdouble" "progress")
+  )
+)
+
+(define-method remove_key
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_remove_key")
+  (return-type "none")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+    '("gdouble" "progress")
+  )
+)
+
+(define-method start
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_start")
+  (return-type "ClutterTimeline*")
+)
+
+(define-method compute_value
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_compute_value")
+  (return-type "gboolean")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+    '("gdouble" "progress")
+    '("GValue*" "value")
+  )
+)
+
+(define-method get_timeline
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_get_timeline")
+  (return-type "ClutterTimeline*")
+)
+
+(define-method set_timeline
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_set_timeline")
+  (return-type "none")
+  (parameters
+    '("ClutterTimeline*" "timeline")
+  )
+)
+
+(define-method get_duration
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_get_duration")
+  (return-type "guint")
+)
+
+(define-method set_duration
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_set_duration")
+  (return-type "none")
+  (parameters
+    '("guint" "duration")
+  )
+)
+
+(define-method property_get_ease_in
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_property_get_ease_in")
+  (return-type "gboolean")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method property_set_ease_in
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_property_set_ease_in")
+  (return-type "none")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+    '("gboolean" "ease_in")
+  )
+)
+
+(define-method property_get_interpolation
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_property_get_interpolation")
+  (return-type "ClutterInterpolation")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method property_set_interpolation
+  (of-object "ClutterAnimator")
+  (c-name "clutter_animator_property_set_interpolation")
+  (return-type "none")
+  (parameters
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
+    '("ClutterInterpolation" "interpolation")
+  )
+)
+
+(define-function clutter_animator_key_get_type
+  (c-name "clutter_animator_key_get_type")
+  (return-type "GType")
+)
+
+(define-method get_object
+  (of-object "ClutterAnimatorKey")
+  (c-name "clutter_animator_key_get_object")
+  (return-type "GObject*")
+)
+
+(define-method get_property_name
+  (of-object "ClutterAnimatorKey")
+  (c-name "clutter_animator_key_get_property_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_property_type
+  (of-object "ClutterAnimatorKey")
+  (c-name "clutter_animator_key_get_property_type")
+  (return-type "GType")
+)
+
+(define-method get_mode
+  (of-object "ClutterAnimatorKey")
+  (c-name "clutter_animator_key_get_mode")
+  (return-type "gulong")
+)
+
+(define-method get_progress
+  (of-object "ClutterAnimatorKey")
+  (c-name "clutter_animator_key_get_progress")
+  (return-type "gdouble")
+)
+
+(define-method get_value
+  (of-object "ClutterAnimatorKey")
+  (c-name "clutter_animator_key_get_value")
+  (return-type "gboolean")
+  (parameters
+    '("GValue*" "value")
+  )
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-backend.h
+
+(define-method set_resolution
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_resolution")
   (return-type "none")
   (parameters
-    '("const-ClutterActorBox*" "b")
-    '("ClutterActorBox*" "result")
+    '("gdouble" "dpi")
   )
 )
 
-(define-method set_origin
-  (of-object "ClutterActorBox")
-  (c-name "clutter_actor_box_set_origin")
+(define-method set_double_click_time
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_double_click_time")
   (return-type "none")
   (parameters
-    '("gfloat" "x")
-    '("gfloat" "y")
+    '("guint" "msec")
   )
 )
 
-(define-method set_size
-  (of-object "ClutterActorBox")
-  (c-name "clutter_actor_box_set_size")
+(define-method get_double_click_time
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_double_click_time")
+  (return-type "guint")
+)
+
+(define-method set_double_click_distance
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_double_click_distance")
   (return-type "none")
   (parameters
-    '("gfloat" "width")
-    '("gfloat" "height")
+    '("guint" "distance")
   )
 )
 
-(define-function clutter_geometry_get_type
-  (c-name "clutter_geometry_get_type")
-  (return-type "GType")
+(define-method get_double_click_distance
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_double_click_distance")
+  (return-type "guint")
 )
 
-(define-method union
-  (of-object "ClutterGeometry")
-  (c-name "clutter_geometry_union")
+(define-method set_font_name
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_set_font_name")
   (return-type "none")
   (parameters
-    '("const-ClutterGeometry*" "geometry_b")
-    '("ClutterGeometry*" "result")
+    '("const-gchar*" "font_name")
   )
 )
 
-(define-method intersects
-  (of-object "ClutterGeometry")
-  (c-name "clutter_geometry_intersects")
-  (return-type "gboolean")
-  (parameters
-    '("const-ClutterGeometry*" "geometry1")
-  )
+(define-method get_font_name
+  (of-object "ClutterBackend")
+  (c-name "clutter_backend_get_font_name")
+  (return-type "const-gchar*")
 )
 
-(define-function clutter_knot_get_type
-  (c-name "clutter_knot_get_type")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-depth.h
+
+(define-function clutter_behaviour_depth_get_type
+  (c-name "clutter_behaviour_depth_get_type")
   (return-type "GType")
 )
 
-(define-method copy
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_copy")
-  (return-type "ClutterKnot*")
+(define-function clutter_behaviour_depth_new
+  (c-name "clutter_behaviour_depth_new")
+  (is-constructor-of "ClutterBehaviourDepth")
+  (return-type "ClutterBehaviour*")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gint" "depth_start")
+    '("gint" "depth_end")
+  )
 )
 
-(define-method free
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_free")
+(define-method set_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_set_bounds")
   (return-type "none")
+  (parameters
+    '("gint" "depth_start")
+    '("gint" "depth_end")
+  )
 )
 
-(define-method equal
-  (of-object "ClutterKnot")
-  (c-name "clutter_knot_equal")
-  (return-type "gboolean")
+(define-method get_bounds
+  (of-object "ClutterBehaviourDepth")
+  (c-name "clutter_behaviour_depth_get_bounds")
+  (return-type "none")
   (parameters
-    '("const-ClutterKnot*" "knot_b")
+    '("gint*" "depth_start")
+    '("gint*" "depth_end")
   )
 )
 
-(define-function clutter_paint_volume_get_type
-  (c-name "clutter_paint_volume_get_type")
-  (return-type "GType")
-)
 
-(define-method copy
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_copy")
-  (return-type "ClutterPaintVolume*")
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-ellipse.h
+
+(define-function clutter_behaviour_ellipse_get_type
+  (c-name "clutter_behaviour_ellipse_get_type")
+  (return-type "GType")
 )
 
-(define-method free
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_free")
-  (return-type "none")
+(define-function clutter_behaviour_ellipse_new
+  (c-name "clutter_behaviour_ellipse_new")
+  (is-constructor-of "ClutterBehaviourEllipse")
+  (return-type "ClutterBehaviour*")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("ClutterRotateDirection" "direction")
+    '("gdouble" "start")
+    '("gdouble" "end")
+  )
 )
 
-(define-method set_origin
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_set_origin")
+(define-method set_center
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_center")
   (return-type "none")
   (parameters
-    '("const-ClutterVertex*" "origin")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-method get_origin
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_get_origin")
+(define-method get_center
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_center")
   (return-type "none")
   (parameters
-    '("ClutterVertex*" "vertex")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
 (define-method set_width
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_set_width")
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_width")
   (return-type "none")
   (parameters
-    '("gfloat" "width")
+    '("gint" "width")
   )
 )
 
 (define-method get_width
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_get_width")
-  (return-type "gfloat")
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_width")
+  (return-type "gint")
 )
 
 (define-method set_height
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_set_height")
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_height")
   (return-type "none")
   (parameters
-    '("gfloat" "height")
+    '("gint" "height")
   )
 )
 
 (define-method get_height
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_get_height")
-  (return-type "gfloat")
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_height")
+  (return-type "gint")
 )
 
-(define-method set_depth
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_set_depth")
+(define-method set_angle_start
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_start")
   (return-type "none")
   (parameters
-    '("gfloat" "depth")
+    '("gdouble" "angle_start")
   )
 )
 
-(define-method get_depth
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_get_depth")
-  (return-type "gfloat")
+(define-method get_angle_start
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_start")
+  (return-type "gdouble")
 )
 
-(define-method union
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_union")
+(define-method set_angle_end
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_angle_end")
   (return-type "none")
   (parameters
-    '("const-ClutterPaintVolume*" "another_pv")
+    '("gdouble" "angle_end")
+  )
+)
+
+(define-method get_angle_end
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_end")
+  (return-type "gdouble")
+)
+
+(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")
+  )
+)
+
+(define-method get_angle_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_angle_tilt")
+  (return-type "gdouble")
+  (parameters
+    '("ClutterRotateAxis" "axis")
+  )
+)
+
+(define-method set_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_set_tilt")
+  (return-type "none")
+  (parameters
+    '("gdouble" "angle_tilt_x")
+    '("gdouble" "angle_tilt_y")
+    '("gdouble" "angle_tilt_z")
   )
 )
 
-(define-method union_box
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_union_box")
+(define-method get_tilt
+  (of-object "ClutterBehaviourEllipse")
+  (c-name "clutter_behaviour_ellipse_get_tilt")
+  (return-type "none")
+  (parameters
+    '("gdouble*" "angle_tilt_x")
+    '("gdouble*" "angle_tilt_y")
+    '("gdouble*" "angle_tilt_z")
+  )
+)
+
+(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
-    '("const-ClutterActorBox*" "box")
+    '("ClutterRotateDirection" "direction")
   )
 )
 
-(define-method set_from_allocation
-  (of-object "ClutterPaintVolume")
-  (c-name "clutter_paint_volume_set_from_allocation")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
 
-(define-function clutter_margin_get_type
-  (c-name "clutter_margin_get_type")
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour.h
+
+(define-function clutter_behaviour_get_type
+  (c-name "clutter_behaviour_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_margin_new
-  (c-name "clutter_margin_new")
-  (is-constructor-of "ClutterMargin")
-  (return-type "ClutterMargin*")
+(define-method apply
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_apply")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
 )
 
-(define-method copy
-  (of-object "ClutterMargin")
-  (c-name "clutter_margin_copy")
-  (return-type "ClutterMargin*")
+(define-method remove
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
 )
 
-(define-method free
-  (of-object "ClutterMargin")
-  (c-name "clutter_margin_free")
+(define-method remove_all
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove_all")
   (return-type "none")
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-units.h
-
-(define-function clutter_units_get_type
-  (c-name "clutter_units_get_type")
-  (return-type "GType")
+(define-method actors_foreach
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_actors_foreach")
+  (return-type "none")
+  (parameters
+    '("ClutterBehaviourForeachFunc" "func")
+    '("gpointer" "data")
+  )
 )
 
-(define-method get_unit_type
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_get_unit_type")
-  (return-type "ClutterUnitType")
+(define-method get_n_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_n_actors")
+  (return-type "gint")
 )
 
-(define-method get_unit_value
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_get_unit_value")
-  (return-type "gfloat")
+(define-method get_nth_actor
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_nth_actor")
+  (return-type "ClutterActor*")
+  (parameters
+    '("gint" "index_")
+  )
 )
 
-(define-method copy
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_copy")
-  (return-type "ClutterUnits*")
+(define-method get_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_actors")
+  (return-type "GSList*")
 )
 
-(define-method free
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_free")
-  (return-type "none")
+(define-method get_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_alpha")
+  (return-type "ClutterAlpha*")
 )
 
-(define-method from_pixels
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_from_pixels")
+(define-method set_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_set_alpha")
   (return-type "none")
   (parameters
-    '("gint" "px")
+    '("ClutterAlpha*" "alpha")
   )
 )
 
-(define-method from_em
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_from_em")
-  (return-type "none")
+(define-method is_applied
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_is_applied")
+  (return-type "gboolean")
   (parameters
-    '("gfloat" "em")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method from_em_for_font
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_from_em_for_font")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "font_name")
-    '("gfloat" "em")
-  )
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-opacity.h
+
+(define-function clutter_behaviour_opacity_get_type
+  (c-name "clutter_behaviour_opacity_get_type")
+  (return-type "GType")
 )
 
-(define-method from_mm
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_from_mm")
-  (return-type "none")
+(define-function clutter_behaviour_opacity_new
+  (c-name "clutter_behaviour_opacity_new")
+  (is-constructor-of "ClutterBehaviourOpacity")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("gfloat" "mm")
+    '("ClutterAlpha*" "alpha")
+    '("guint8" "opacity_start")
+    '("guint8" "opacity_end")
   )
 )
 
-(define-method from_cm
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_from_cm")
+(define-method set_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_set_bounds")
   (return-type "none")
   (parameters
-    '("gfloat" "cm")
+    '("guint8" "opacity_start")
+    '("guint8" "opacity_end")
   )
 )
 
-(define-method from_pt
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_from_pt")
+(define-method get_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_get_bounds")
   (return-type "none")
   (parameters
-    '("gfloat" "pt")
+    '("guint8*" "opacity_start")
+    '("guint8*" "opacity_end")
   )
 )
 
-(define-method to_pixels
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_to_pixels")
-  (return-type "gfloat")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-path.h
+
+(define-function clutter_behaviour_path_get_type
+  (c-name "clutter_behaviour_path_get_type")
+  (return-type "GType")
 )
 
-(define-method from_string
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_from_string")
-  (return-type "gboolean")
+(define-function clutter_behaviour_path_new
+  (c-name "clutter_behaviour_path_new")
+  (is-constructor-of "ClutterBehaviourPath")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("const-gchar*" "str")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterPath*" "path")
   )
 )
 
-(define-method to_string
-  (of-object "ClutterUnits")
-  (c-name "clutter_units_to_string")
-  (return-type "gchar*")
-)
-
-(define-function clutter_param_units_get_type
-  (c-name "clutter_param_units_get_type")
-  (return-type "GType")
+(define-function clutter_behaviour_path_new_with_description
+  (c-name "clutter_behaviour_path_new_with_description")
+  (return-type "ClutterBehaviour*")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("const-gchar*" "desc")
+  )
 )
 
-(define-function clutter_param_spec_units
-  (c-name "clutter_param_spec_units")
-  (return-type "GParamSpec*")
+(define-function clutter_behaviour_path_new_with_knots
+  (c-name "clutter_behaviour_path_new_with_knots")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("ClutterUnitType" "default_type")
-    '("gfloat" "minimum")
-    '("gfloat" "maximum")
-    '("gfloat" "default_value")
-    '("GParamFlags" "flags")
+    '("ClutterAlpha*" "alpha")
+    '("const-ClutterKnot*" "knots")
+    '("guint" "n_knots")
   )
 )
 
-(define-function clutter_value_set_units
-  (c-name "clutter_value_set_units")
+(define-method set_path
+  (of-object "ClutterBehaviourPath")
+  (c-name "clutter_behaviour_path_set_path")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("const-ClutterUnits*" "units")
+    '("ClutterPath*" "path")
   )
 )
 
-(define-function clutter_value_get_units
-  (c-name "clutter_value_get_units")
-  (return-type "const-ClutterUnits*")
-  (parameters
-    '("const-GValue*" "value")
-  )
+(define-method get_path
+  (of-object "ClutterBehaviourPath")
+  (c-name "clutter_behaviour_path_get_path")
+  (return-type "ClutterPath*")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/clutter-version.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-rotate.h
 
-(define-function clutter_check_version
-  (c-name "clutter_check_version")
-  (return-type "gboolean")
+(define-function clutter_behaviour_rotate_get_type
+  (c-name "clutter_behaviour_rotate_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_behaviour_rotate_new
+  (c-name "clutter_behaviour_rotate_new")
+  (is-constructor-of "ClutterBehaviourRotate")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("guint" "major")
-    '("guint" "minor")
-    '("guint" "micro")
+    '("ClutterAlpha*" "alpha")
+    '("ClutterRotateAxis" "axis")
+    '("ClutterRotateDirection" "direction")
+    '("gdouble" "angle_start")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-function clutter_check_windowing_backend
-  (c-name "clutter_check_windowing_backend")
-  (return-type "gboolean")
+(define-method get_center
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_center")
+  (return-type "none")
   (parameters
-    '("const-char*" "backend_type")
+    '("gint*" "x")
+    '("gint*" "y")
+    '("gint*" "z")
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-actor.h
-
-(define-method set_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_geometry")
+(define-method set_center
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_center")
   (return-type "none")
   (parameters
-    '("const-ClutterGeometry*" "geometry")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "z")
   )
 )
 
-(define-method get_geometry
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_geometry")
+(define-method get_axis
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_axis")
+  (return-type "ClutterRotateAxis")
+)
+
+(define-method set_axis
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_axis")
   (return-type "none")
   (parameters
-    '("ClutterGeometry*" "geometry")
+    '("ClutterRotateAxis" "axis")
   )
 )
 
-(define-method get_gid
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_gid")
-  (return-type "guint32")
+(define-method get_direction
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_direction")
+  (return-type "ClutterRotateDirection")
 )
 
-(define-function clutter_get_actor_by_gid
-  (c-name "clutter_get_actor_by_gid")
-  (return-type "ClutterActor*")
+(define-method set_direction
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_direction")
+  (return-type "none")
   (parameters
-    '("guint32" "id_")
+    '("ClutterRotateDirection" "direction")
   )
 )
 
-(define-method reparent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_reparent")
+(define-method get_bounds
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_get_bounds")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "new_parent")
+    '("gdouble*" "angle_start")
+    '("gdouble*" "angle_end")
   )
 )
 
-(define-method set_parent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_parent")
+(define-method set_bounds
+  (of-object "ClutterBehaviourRotate")
+  (c-name "clutter_behaviour_rotate_set_bounds")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "parent")
+    '("gdouble" "angle_start")
+    '("gdouble" "angle_end")
   )
 )
 
-(define-method unparent
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_unparent")
-  (return-type "none")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-scale.h
+
+(define-function clutter_behaviour_scale_get_type
+  (c-name "clutter_behaviour_scale_get_type")
+  (return-type "GType")
 )
 
-(define-method raise
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_raise")
-  (return-type "none")
+(define-function clutter_behaviour_scale_new
+  (c-name "clutter_behaviour_scale_new")
+  (is-constructor-of "ClutterBehaviourScale")
+  (return-type "ClutterBehaviour*")
   (parameters
-    '("ClutterActor*" "below")
+    '("ClutterAlpha*" "alpha")
+    '("gdouble" "x_scale_start")
+    '("gdouble" "y_scale_start")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
   )
 )
 
-(define-method lower
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_lower")
+(define-method set_bounds
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_bounds")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "above")
+    '("gdouble" "x_scale_start")
+    '("gdouble" "y_scale_start")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
   )
 )
 
-(define-method raise_top
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_raise_top")
+(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 lower_bottom
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_lower_bottom")
-  (return-type "none")
-)
 
-(define-method push_internal
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_push_internal")
-  (return-type "none")
-)
 
-(define-method pop_internal
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_pop_internal")
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-bin-layout.h
+
+(define-method set_alignment
+  (of-object "ClutterBinLayout")
+  (c-name "clutter_bin_layout_set_alignment")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "child")
+    '("ClutterBinAlignment" "x_align")
+    '("ClutterBinAlignment" "y_align")
+  )
 )
 
-(define-method show_all
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_show_all")
+(define-method get_alignment
+  (of-object "ClutterBinLayout")
+  (c-name "clutter_bin_layout_get_alignment")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "child")
+    '("ClutterBinAlignment*" "x_align")
+    '("ClutterBinAlignment*" "y_align")
+  )
 )
 
-(define-method hide_all
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_hide_all")
+(define-method add
+  (of-object "ClutterBinLayout")
+  (c-name "clutter_bin_layout_add")
   (return-type "none")
+  (parameters
+    '("ClutterActor*" "child")
+    '("ClutterBinAlignment" "x_align")
+    '("ClutterBinAlignment" "y_align")
+  )
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-animatable.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-box.h
 
-(define-method animate_property
-  (of-object "ClutterAnimatable")
-  (c-name "clutter_animatable_animate_property")
-  (return-type "gboolean")
+(define-function clutter_box_get_type
+  (c-name "clutter_box_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_box_new
+  (c-name "clutter_box_new")
+  (is-constructor-of "ClutterBox")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterAnimation*" "animation")
-    '("const-gchar*" "property_name")
-    '("const-GValue*" "initial_value")
-    '("const-GValue*" "final_value")
-    '("gdouble" "progress")
-    '("GValue*" "value")
+    '("ClutterLayoutManager*" "manager")
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-animation.h
-
-(define-method set_alpha
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_set_alpha")
+(define-method set_layout_manager
+  (of-object "ClutterBox")
+  (c-name "clutter_box_set_layout_manager")
   (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
+    '("ClutterLayoutManager*" "manager")
   )
 )
 
-(define-method get_alpha
-  (of-object "ClutterAnimation")
-  (c-name "clutter_animation_get_alpha")
-  (return-type "ClutterAlpha*")
+(define-method get_layout_manager
+  (of-object "ClutterBox")
+  (c-name "clutter_box_get_layout_manager")
+  (return-type "ClutterLayoutManager*")
 )
 
-(define-method animate_with_alpha
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_alpha")
-  (return-type "ClutterAnimation*")
+(define-method set_color
+  (of-object "ClutterBox")
+  (c-name "clutter_box_set_color")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-gchar*" "first_property_name")
+    '("const-ClutterColor*" "color")
   )
-  (varargs #t)
 )
 
-(define-method animate_with_alphav
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_animate_with_alphav")
-  (return-type "ClutterAnimation*")
+(define-method get_color
+  (of-object "ClutterBox")
+  (c-name "clutter_box_get_color")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "n_properties")
-    '("const-gchar*-const[]" "properties")
-    '("const-GValue*" "values")
+    '("ClutterColor*" "color")
   )
 )
 
+(define-method pack
+  (of-object "ClutterBox")
+  (c-name "clutter_box_pack")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("const-gchar*" "first_property")
+  )
+  (varargs #t)
+)
 
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-backend.h
-
-(define-method set_resolution
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_resolution")
+(define-method packv
+  (of-object "ClutterBox")
+  (c-name "clutter_box_packv")
   (return-type "none")
   (parameters
-    '("gdouble" "dpi")
+    '("ClutterActor*" "actor")
+    '("guint" "n_properties")
+    '("const-gchar*-const[]" "properties")
+    '("const-GValue*" "values")
   )
 )
 
-(define-method set_double_click_time
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_double_click_time")
+(define-method pack_after
+  (of-object "ClutterBox")
+  (c-name "clutter_box_pack_after")
   (return-type "none")
   (parameters
-    '("guint" "msec")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
+    '("const-gchar*" "first_property")
   )
+  (varargs #t)
 )
 
-(define-method get_double_click_time
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_double_click_time")
-  (return-type "guint")
-)
-
-(define-method set_double_click_distance
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_double_click_distance")
+(define-method pack_before
+  (of-object "ClutterBox")
+  (c-name "clutter_box_pack_before")
   (return-type "none")
   (parameters
-    '("guint" "distance")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
+    '("const-gchar*" "first_property")
   )
+  (varargs #t)
 )
 
-(define-method get_double_click_distance
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_double_click_distance")
-  (return-type "guint")
-)
-
-(define-method set_font_name
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_set_font_name")
+(define-method pack_at
+  (of-object "ClutterBox")
+  (c-name "clutter_box_pack_at")
   (return-type "none")
   (parameters
-    '("const-gchar*" "font_name")
+    '("ClutterActor*" "actor")
+    '("gint" "position")
+    '("const-gchar*" "first_property")
   )
-)
-
-(define-method get_font_name
-  (of-object "ClutterBackend")
-  (c-name "clutter_backend_get_font_name")
-  (return-type "const-gchar*")
+  (varargs #t)
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-depth.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-cairo-texture.h
 
-(define-function clutter_behaviour_depth_get_type
-  (c-name "clutter_behaviour_depth_get_type")
+(define-function clutter_cairo_texture_get_type
+  (c-name "clutter_cairo_texture_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-function clutter_cairo_texture_new
+  (c-name "clutter_cairo_texture_new")
+  (is-constructor-of "ClutterCairoTexture")
+  (return-type "ClutterActor*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "depth_start")
-    '("gint" "depth_end")
+    '("guint" "width")
+    '("guint" "height")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourDepth")
-  (c-name "clutter_behaviour_depth_set_bounds")
+(define-method set_surface_size
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_set_surface_size")
   (return-type "none")
   (parameters
-    '("gint" "depth_start")
-    '("gint" "depth_end")
+    '("guint" "width")
+    '("guint" "height")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourDepth")
-  (c-name "clutter_behaviour_depth_get_bounds")
+(define-method get_surface_size
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_get_surface_size")
   (return-type "none")
   (parameters
-    '("gint*" "depth_start")
-    '("gint*" "depth_end")
+    '("guint*" "width")
+    '("guint*" "height")
   )
 )
 
+(define-method set_auto_resize
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_set_auto_resize")
+  (return-type "none")
+  (parameters
+    '("gboolean" "value")
+  )
+)
 
+(define-method get_auto_resize
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_get_auto_resize")
+  (return-type "gboolean")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-ellipse.h
+(define-method clear
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_clear")
+  (return-type "none")
+)
 
-(define-function clutter_behaviour_ellipse_get_type
-  (c-name "clutter_behaviour_ellipse_get_type")
-  (return-type "GType")
+(define-method invalidate_rectangle
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_invalidate_rectangle")
+  (return-type "none")
+  (parameters
+    '("cairo_rectangle_int_t*" "rect")
+  )
 )
 
-(define-function clutter_behaviour_ellipse_new
-  (c-name "clutter_behaviour_ellipse_new")
-  (is-constructor-of "ClutterBehaviourEllipse")
-  (return-type "ClutterBehaviour*")
+(define-method invalidate
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_invalidate")
+  (return-type "none")
+)
+
+(define-method create_region
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_create_region")
+  (return-type "cairo_t*")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gint" "x")
-    '("gint" "y")
+    '("gint" "x_offset")
+    '("gint" "y_offset")
     '("gint" "width")
     '("gint" "height")
-    '("ClutterRotateDirection" "direction")
-    '("gdouble" "start")
-    '("gdouble" "end")
   )
 )
 
-(define-method set_center
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_center")
+(define-method create
+  (of-object "ClutterCairoTexture")
+  (c-name "clutter_cairo_texture_create")
+  (return-type "cairo_t*")
+)
+
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-container.h
+
+(define-method add
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("ClutterActor*" "first_actor")
   )
+  (varargs #t)
 )
 
-(define-method get_center
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_center")
+(define-method add_actor
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add_actor")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method set_width
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_width")
+(define-method add_valist
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_add_valist")
   (return-type "none")
   (parameters
-    '("gint" "width")
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
   )
 )
 
-(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")
+(define-method remove
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove")
   (return-type "none")
   (parameters
-    '("gint" "height")
+    '("ClutterActor*" "first_actor")
   )
+  (varargs #t)
 )
 
-(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")
+(define-method remove_actor
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove_actor")
   (return-type "none")
   (parameters
-    '("gdouble" "angle_start")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method get_angle_start
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_start")
-  (return-type "gdouble")
-)
-
-(define-method set_angle_end
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_end")
+(define-method remove_valist
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_remove_valist")
   (return-type "none")
   (parameters
-    '("gdouble" "angle_end")
+    '("ClutterActor*" "first_actor")
+    '("va_list" "var_args")
   )
 )
 
-(define-method get_angle_end
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_end")
-  (return-type "gdouble")
+(define-method get_children
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_get_children")
+  (return-type "GList*")
 )
 
-(define-method set_angle_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_angle_tilt")
+(define-method foreach
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_foreach")
   (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
-    '("gdouble" "angle_tilt")
+    '("ClutterCallback" "callback")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method get_angle_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_angle_tilt")
-  (return-type "gdouble")
+(define-method foreach_with_internals
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_foreach_with_internals")
+  (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
+    '("ClutterCallback" "callback")
+    '("gpointer" "user_data")
   )
 )
 
-(define-method set_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_set_tilt")
+(define-method raise_child
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_raise_child")
   (return-type "none")
   (parameters
-    '("gdouble" "angle_tilt_x")
-    '("gdouble" "angle_tilt_y")
-    '("gdouble" "angle_tilt_z")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-(define-method get_tilt
-  (of-object "ClutterBehaviourEllipse")
-  (c-name "clutter_behaviour_ellipse_get_tilt")
+(define-method lower_child
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_lower_child")
   (return-type "none")
   (parameters
-    '("gdouble*" "angle_tilt_x")
-    '("gdouble*" "angle_tilt_y")
-    '("gdouble*" "angle_tilt_z")
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "sibling")
   )
 )
 
-(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")
+(define-method sort_depth_order
+  (of-object "ClutterContainer")
+  (c-name "clutter_container_sort_depth_order")
   (return-type "none")
-  (parameters
-    '("ClutterRotateDirection" "direction")
-  )
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-fixed.h
 
-(define-function clutter_behaviour_get_type
-  (c-name "clutter_behaviour_get_type")
+(define-function clutter_param_fixed_get_type
+  (c-name "clutter_param_fixed_get_type")
   (return-type "GType")
 )
 
-(define-method apply
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_apply")
+(define-function clutter_value_set_fixed
+  (c-name "clutter_value_set_fixed")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("GValue*" "value")
+    '("CoglFixed" "fixed_")
   )
 )
 
-(define-method remove
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove")
-  (return-type "none")
+(define-function clutter_value_get_fixed
+  (c-name "clutter_value_get_fixed")
+  (return-type "CoglFixed")
   (parameters
-    '("ClutterActor*" "actor")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method remove_all
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove_all")
-  (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")
+    '("CoglFixed" "minimum")
+    '("CoglFixed" "maximum")
+    '("CoglFixed" "default_value")
+    '("GParamFlags" "flags")
+  )
 )
 
-(define-method actors_foreach
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_actors_foreach")
-  (return-type "none")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-frame-source.h
+
+(define-function clutter_frame_source_add
+  (c-name "clutter_frame_source_add")
+  (return-type "guint")
   (parameters
-    '("ClutterBehaviourForeachFunc" "func")
+    '("guint" "fps")
+    '("GSourceFunc" "func")
     '("gpointer" "data")
   )
 )
 
-(define-method get_n_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_n_actors")
-  (return-type "gint")
+(define-function clutter_frame_source_add_full
+  (c-name "clutter_frame_source_add_full")
+  (return-type "guint")
+  (parameters
+    '("gint" "priority")
+    '("guint" "fps")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
 )
 
-(define-method get_nth_actor
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_nth_actor")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-group.h
+
+(define-function clutter_group_new
+  (c-name "clutter_group_new")
+  (is-constructor-of "ClutterGroup")
+  (return-type "ClutterActor*")
+)
+
+(define-method get_nth_child
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_get_nth_child")
   (return-type "ClutterActor*")
   (parameters
     '("gint" "index_")
   )
 )
 
-(define-method get_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_actors")
-  (return-type "GSList*")
+(define-method get_n_children
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_get_n_children")
+  (return-type "gint")
 )
 
-(define-method get_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_alpha")
-  (return-type "ClutterAlpha*")
+(define-method remove_all
+  (of-object "ClutterGroup")
+  (c-name "clutter_group_remove_all")
+  (return-type "none")
 )
 
-(define-method set_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_set_alpha")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-input-device.h
+
+(define-method get_device_coords
+  (of-object "ClutterInputDevice")
+  (c-name "clutter_input_device_get_device_coords")
   (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
+    '("gint*" "x")
+    '("gint*" "y")
   )
 )
 
-(define-method is_applied
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_is_applied")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
 
 
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-keysyms.h
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-opacity.h
 
-(define-function clutter_behaviour_opacity_get_type
-  (c-name "clutter_behaviour_opacity_get_type")
-  (return-type "GType")
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-main.h
+
+(define-function clutter_threads_init
+  (c-name "clutter_threads_init")
+  (return-type "none")
 )
 
-(define-function clutter_behaviour_opacity_new
-  (c-name "clutter_behaviour_opacity_new")
-  (is-constructor-of "ClutterBehaviourOpacity")
-  (return-type "ClutterBehaviour*")
+(define-function clutter_threads_enter
+  (c-name "clutter_threads_enter")
+  (return-type "none")
+)
+
+(define-function clutter_threads_leave
+  (c-name "clutter_threads_leave")
+  (return-type "none")
+)
+
+(define-function clutter_threads_add_frame_source
+  (c-name "clutter_threads_add_frame_source")
+  (return-type "guint")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("guint8" "opacity_start")
-    '("guint8" "opacity_end")
+    '("guint" "fps")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourOpacity")
-  (c-name "clutter_behaviour_opacity_set_bounds")
-  (return-type "none")
+(define-function clutter_threads_add_frame_source_full
+  (c-name "clutter_threads_add_frame_source_full")
+  (return-type "guint")
   (parameters
-    '("guint8" "opacity_start")
-    '("guint8" "opacity_end")
+    '("gint" "priority")
+    '("guint" "fps")
+    '("GSourceFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourOpacity")
-  (c-name "clutter_behaviour_opacity_get_bounds")
+(define-function clutter_set_motion_events_enabled
+  (c-name "clutter_set_motion_events_enabled")
   (return-type "none")
   (parameters
-    '("guint8*" "opacity_start")
-    '("guint8*" "opacity_end")
+    '("gboolean" "enable")
   )
 )
 
+(define-function clutter_get_motion_events_enabled
+  (c-name "clutter_get_motion_events_enabled")
+  (return-type "gboolean")
+)
 
+(define-function clutter_redraw
+  (c-name "clutter_redraw")
+  (return-type "none")
+  (parameters
+    '("ClutterStage*" "stage")
+  )
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-path.h
-
-(define-function clutter_behaviour_path_get_type
-  (c-name "clutter_behaviour_path_get_type")
-  (return-type "GType")
+(define-function clutter_clear_glyph_cache
+  (c-name "clutter_clear_glyph_cache")
+  (return-type "none")
 )
 
-(define-function clutter_behaviour_path_new
-  (c-name "clutter_behaviour_path_new")
-  (is-constructor-of "ClutterBehaviourPath")
-  (return-type "ClutterBehaviour*")
+(define-function clutter_set_font_flags
+  (c-name "clutter_set_font_flags")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterPath*" "path")
+    '("ClutterFontFlags" "flags")
   )
 )
 
-(define-function clutter_behaviour_path_new_with_description
-  (c-name "clutter_behaviour_path_new_with_description")
-  (return-type "ClutterBehaviour*")
+(define-function clutter_get_font_flags
+  (c-name "clutter_get_font_flags")
+  (return-type "ClutterFontFlags")
+)
+
+(define-function clutter_get_input_device_for_id
+  (c-name "clutter_get_input_device_for_id")
+  (return-type "ClutterInputDevice*")
+  (parameters
+    '("gint" "id_")
+  )
+)
+
+(define-function clutter_grab_pointer_for_device
+  (c-name "clutter_grab_pointer_for_device")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-gchar*" "desc")
+    '("ClutterActor*" "actor")
+    '("gint" "id_")
   )
 )
 
-(define-function clutter_behaviour_path_new_with_knots
-  (c-name "clutter_behaviour_path_new_with_knots")
-  (return-type "ClutterBehaviour*")
+(define-function clutter_ungrab_pointer_for_device
+  (c-name "clutter_ungrab_pointer_for_device")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("const-ClutterKnot*" "knots")
-    '("guint" "n_knots")
+    '("gint" "id_")
   )
 )
 
-(define-method set_path
-  (of-object "ClutterBehaviourPath")
-  (c-name "clutter_behaviour_path_set_path")
+(define-function clutter_set_default_frame_rate
+  (c-name "clutter_set_default_frame_rate")
   (return-type "none")
   (parameters
-    '("ClutterPath*" "path")
+    '("guint" "frames_per_sec")
   )
 )
 
-(define-method get_path
-  (of-object "ClutterBehaviourPath")
-  (c-name "clutter_behaviour_path_get_path")
-  (return-type "ClutterPath*")
+(define-function clutter_get_timestamp
+  (c-name "clutter_get_timestamp")
+  (return-type "gulong")
+)
+
+(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 /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-rotate.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-media.h
 
-(define-function clutter_behaviour_rotate_get_type
-  (c-name "clutter_behaviour_rotate_get_type")
+(define-function clutter_media_get_type
+  (c-name "clutter_media_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_behaviour_rotate_new
-  (c-name "clutter_behaviour_rotate_new")
-  (is-constructor-of "ClutterBehaviourRotate")
-  (return-type "ClutterBehaviour*")
+(define-method set_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_uri")
+  (return-type "none")
   (parameters
-    '("ClutterAlpha*" "alpha")
-    '("ClutterRotateAxis" "axis")
-    '("ClutterRotateDirection" "direction")
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
+    '("const-gchar*" "uri")
   )
 )
 
-(define-method get_center
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_center")
+(define-method get_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_uri")
+  (return-type "gchar*")
+)
+
+(define-method set_filename
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_filename")
   (return-type "none")
   (parameters
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "z")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method set_center
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_center")
+(define-method set_playing
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_playing")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
+    '("gboolean" "playing")
   )
 )
 
-(define-method get_axis
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_axis")
-  (return-type "ClutterRotateAxis")
+(define-method get_playing
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_playing")
+  (return-type "gboolean")
 )
 
-(define-method set_axis
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_axis")
+(define-method set_progress
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_progress")
   (return-type "none")
   (parameters
-    '("ClutterRotateAxis" "axis")
+    '("gdouble" "progress")
   )
 )
 
-(define-method get_direction
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_direction")
-  (return-type "ClutterRotateDirection")
+(define-method get_progress
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_progress")
+  (return-type "gdouble")
 )
 
-(define-method set_direction
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_direction")
+(define-method set_subtitle_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_subtitle_uri")
   (return-type "none")
   (parameters
-    '("ClutterRotateDirection" "direction")
+    '("const-gchar*" "uri")
   )
 )
 
-(define-method get_bounds
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_get_bounds")
+(define-method get_subtitle_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_subtitle_uri")
+  (return-type "gchar*")
+)
+
+(define-method set_subtitle_font_name
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_subtitle_font_name")
   (return-type "none")
   (parameters
-    '("gdouble*" "angle_start")
-    '("gdouble*" "angle_end")
+    '("const-char*" "font_name")
   )
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourRotate")
-  (c-name "clutter_behaviour_rotate_set_bounds")
+(define-method get_subtitle_font_name
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_subtitle_font_name")
+  (return-type "gchar*")
+)
+
+(define-method set_audio_volume
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_audio_volume")
   (return-type "none")
   (parameters
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
+    '("gdouble" "volume")
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-behaviour-scale.h
-
-(define-function clutter_behaviour_scale_get_type
-  (c-name "clutter_behaviour_scale_get_type")
-  (return-type "GType")
+(define-method get_audio_volume
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_audio_volume")
+  (return-type "gdouble")
 )
 
-(define-function clutter_behaviour_scale_new
-  (c-name "clutter_behaviour_scale_new")
-  (is-constructor-of "ClutterBehaviourScale")
-  (return-type "ClutterBehaviour*")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-    '("gdouble" "x_scale_start")
-    '("gdouble" "y_scale_start")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
-  )
+(define-method get_can_seek
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_can_seek")
+  (return-type "gboolean")
 )
 
-(define-method set_bounds
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_set_bounds")
-  (return-type "none")
-  (parameters
-    '("gdouble" "x_scale_start")
-    '("gdouble" "y_scale_start")
-    '("gdouble" "x_scale_end")
-    '("gdouble" "y_scale_end")
-  )
+(define-method get_buffer_fill
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_buffer_fill")
+  (return-type "gdouble")
 )
 
-(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 get_duration
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_duration")
+  (return-type "gdouble")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-box.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-rectangle.h
 
-(define-function clutter_box_get_type
-  (c-name "clutter_box_get_type")
+(define-function clutter_rectangle_get_type
+  (c-name "clutter_rectangle_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_box_new
-  (c-name "clutter_box_new")
-  (is-constructor-of "ClutterBox")
+(define-function clutter_rectangle_new
+  (c-name "clutter_rectangle_new")
+  (is-constructor-of "ClutterRectangle")
   (return-type "ClutterActor*")
-  (parameters
-    '("ClutterLayoutManager*" "manager")
-  )
-)
-
-(define-method set_layout_manager
-  (of-object "ClutterBox")
-  (c-name "clutter_box_set_layout_manager")
-  (return-type "none")
-  (parameters
-    '("ClutterLayoutManager*" "manager")
-  )
-)
-
-(define-method get_layout_manager
-  (of-object "ClutterBox")
-  (c-name "clutter_box_get_layout_manager")
-  (return-type "ClutterLayoutManager*")
 )
 
-(define-method set_color
-  (of-object "ClutterBox")
-  (c-name "clutter_box_set_color")
-  (return-type "none")
+(define-function clutter_rectangle_new_with_color
+  (c-name "clutter_rectangle_new_with_color")
+  (return-type "ClutterActor*")
   (parameters
     '("const-ClutterColor*" "color")
   )
 )
 
 (define-method get_color
-  (of-object "ClutterBox")
-  (c-name "clutter_box_get_color")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "color")
-  )
-)
-
-(define-method pack
-  (of-object "ClutterBox")
-  (c-name "clutter_box_pack")
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_color")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("const-gchar*" "first_property")
+    '("ClutterColor*" "color")
   )
-  (varargs #t)
 )
 
-(define-method packv
-  (of-object "ClutterBox")
-  (c-name "clutter_box_packv")
+(define-method set_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_color")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("guint" "n_properties")
-    '("const-gchar*-const[]" "properties")
-    '("const-GValue*" "values")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method pack_after
-  (of-object "ClutterBox")
-  (c-name "clutter_box_pack_after")
+(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
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-    '("const-gchar*" "first_property")
+    '("guint" "width")
   )
-  (varargs #t)
 )
 
-(define-method pack_before
-  (of-object "ClutterBox")
-  (c-name "clutter_box_pack_before")
+(define-method get_border_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_get_border_color")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-    '("const-gchar*" "first_property")
+    '("ClutterColor*" "color")
   )
-  (varargs #t)
 )
 
-(define-method pack_at
-  (of-object "ClutterBox")
-  (c-name "clutter_box_pack_at")
+(define-method set_border_color
+  (of-object "ClutterRectangle")
+  (c-name "clutter_rectangle_set_border_color")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("gint" "position")
-    '("const-gchar*" "first_property")
+    '("const-ClutterColor*" "color")
   )
-  (varargs #t)
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-cairo-texture.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-score.h
 
-(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_score_get_type
+  (c-name "clutter_score_get_type")
+  (return-type "GType")
 )
 
-(define-method create
-  (of-object "ClutterCairoTexture")
-  (c-name "clutter_cairo_texture_create")
-  (return-type "cairo_t*")
+(define-function clutter_score_new
+  (c-name "clutter_score_new")
+  (is-constructor-of "ClutterScore")
+  (return-type "ClutterScore*")
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-container.h
-
-(define-method add
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add")
+(define-method set_loop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_set_loop")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "first_actor")
+    '("gboolean" "loop")
   )
-  (varargs #t)
 )
 
-(define-method add_actor
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add_actor")
-  (return-type "none")
+(define-method get_loop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_get_loop")
+  (return-type "gboolean")
+)
+
+(define-method append
+  (of-object "ClutterScore")
+  (c-name "clutter_score_append")
+  (return-type "gulong")
   (parameters
-    '("ClutterActor*" "actor")
+    '("ClutterTimeline*" "parent")
+    '("ClutterTimeline*" "timeline")
   )
 )
 
-(define-method add_valist
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_add_valist")
-  (return-type "none")
+(define-method append_at_marker
+  (of-object "ClutterScore")
+  (c-name "clutter_score_append_at_marker")
+  (return-type "gulong")
   (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
+    '("ClutterTimeline*" "parent")
+    '("const-gchar*" "marker_name")
+    '("ClutterTimeline*" "timeline")
   )
 )
 
 (define-method remove
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove")
+  (of-object "ClutterScore")
+  (c-name "clutter_score_remove")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "first_actor")
+    '("gulong" "id_")
   )
-  (varargs #t)
 )
 
-(define-method remove_actor
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove_actor")
+(define-method remove_all
+  (of-object "ClutterScore")
+  (c-name "clutter_score_remove_all")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
 )
 
-(define-method remove_valist
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_remove_valist")
-  (return-type "none")
+(define-method get_timeline
+  (of-object "ClutterScore")
+  (c-name "clutter_score_get_timeline")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterActor*" "first_actor")
-    '("va_list" "var_args")
+    '("gulong" "id_")
   )
 )
 
-(define-method get_children
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_get_children")
-  (return-type "GList*")
+(define-method list_timelines
+  (of-object "ClutterScore")
+  (c-name "clutter_score_list_timelines")
+  (return-type "GSList*")
 )
 
-(define-method foreach
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_foreach")
+(define-method start
+  (of-object "ClutterScore")
+  (c-name "clutter_score_start")
   (return-type "none")
-  (parameters
-    '("ClutterCallback" "callback")
-    '("gpointer" "user_data")
-  )
 )
 
-(define-method foreach_with_internals
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_foreach_with_internals")
+(define-method stop
+  (of-object "ClutterScore")
+  (c-name "clutter_score_stop")
   (return-type "none")
-  (parameters
-    '("ClutterCallback" "callback")
-    '("gpointer" "user_data")
-  )
 )
 
-(define-method raise_child
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_raise_child")
+(define-method pause
+  (of-object "ClutterScore")
+  (c-name "clutter_score_pause")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
 )
 
-(define-method lower_child
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_lower_child")
+(define-method rewind
+  (of-object "ClutterScore")
+  (c-name "clutter_score_rewind")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-    '("ClutterActor*" "sibling")
-  )
 )
 
-(define-method sort_depth_order
-  (of-object "ClutterContainer")
-  (c-name "clutter_container_sort_depth_order")
-  (return-type "none")
+(define-method is_playing
+  (of-object "ClutterScore")
+  (c-name "clutter_score_is_playing")
+  (return-type "gboolean")
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-fixed.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-shader.h
 
-(define-function clutter_param_fixed_get_type
-  (c-name "clutter_param_fixed_get_type")
+(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_value_set_fixed
-  (c-name "clutter_value_set_fixed")
+(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
-    '("GValue*" "value")
-    '("CoglFixed" "fixed_")
+    '("gboolean" "enabled")
   )
 )
 
-(define-function clutter_value_get_fixed
-  (c-name "clutter_value_get_fixed")
-  (return-type "CoglFixed")
-  (parameters
-    '("const-GValue*" "value")
-  )
+(define-method get_is_enabled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_is_enabled")
+  (return-type "gboolean")
 )
 
-(define-function clutter_param_spec_fixed
-  (c-name "clutter_param_spec_fixed")
-  (return-type "GParamSpec*")
+(define-method compile
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_compile")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "name")
-    '("const-gchar*" "nick")
-    '("const-gchar*" "blurb")
-    '("CoglFixed" "minimum")
-    '("CoglFixed" "maximum")
-    '("CoglFixed" "default_value")
-    '("GParamFlags" "flags")
+    '("GError**" "error")
   )
 )
 
+(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")
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-frame-source.h
-
-(define-function clutter_frame_source_add
-  (c-name "clutter_frame_source_add")
-  (return-type "guint")
+(define-method set_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_vertex_source")
+  (return-type "none")
   (parameters
-    '("guint" "fps")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("const-gchar*" "data")
+    '("gssize" "length")
   )
 )
 
-(define-function clutter_frame_source_add_full
-  (c-name "clutter_frame_source_add_full")
-  (return-type "guint")
+(define-method set_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_fragment_source")
+  (return-type "none")
   (parameters
-    '("gint" "priority")
-    '("guint" "fps")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("const-gchar*" "data")
+    '("gssize" "length")
   )
 )
 
+(define-method get_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_vertex_source")
+  (return-type "const-gchar*")
+)
 
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-group.h
-
-(define-function clutter_group_new
-  (c-name "clutter_group_new")
-  (is-constructor-of "ClutterGroup")
-  (return-type "ClutterActor*")
+(define-method get_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_fragment_source")
+  (return-type "const-gchar*")
 )
 
-(define-method get_nth_child
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_get_nth_child")
-  (return-type "ClutterActor*")
+(define-method set_uniform
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_uniform")
+  (return-type "none")
   (parameters
-    '("gint" "index_")
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
   )
 )
 
-(define-method get_n_children
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_get_n_children")
-  (return-type "gint")
+(define-method get_cogl_program
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_program")
+  (return-type "CoglHandle")
 )
 
-(define-method remove_all
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_remove_all")
-  (return-type "none")
+(define-method get_cogl_fragment_shader
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_fragment_shader")
+  (return-type "CoglHandle")
 )
 
+(define-method get_cogl_vertex_shader
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_cogl_vertex_shader")
+  (return-type "CoglHandle")
+)
 
+(define-method set_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterShader*" "shader")
+  )
+)
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-keysyms.h
-
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-main.h
-
-(define-function clutter_threads_init
-  (c-name "clutter_threads_init")
-  (return-type "none")
+(define-method get_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_shader")
+  (return-type "ClutterShader*")
 )
 
-(define-function clutter_threads_add_frame_source
-  (c-name "clutter_threads_add_frame_source")
-  (return-type "guint")
+(define-method set_shader_param
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param")
+  (return-type "none")
   (parameters
-    '("guint" "fps")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
+    '("const-gchar*" "param")
+    '("const-GValue*" "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_int
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param_int")
+  (return-type "none")
   (parameters
-    '("gint" "priority")
-    '("guint" "fps")
-    '("GSourceFunc" "func")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
+    '("const-gchar*" "param")
+    '("gint" "value")
   )
 )
 
-(define-function clutter_set_motion_events_enabled
-  (c-name "clutter_set_motion_events_enabled")
+(define-method set_shader_param_float
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param_float")
   (return-type "none")
   (parameters
-    '("gboolean" "enable")
+    '("const-gchar*" "param")
+    '("gfloat" "value")
   )
 )
 
-(define-function clutter_get_motion_events_enabled
-  (c-name "clutter_get_motion_events_enabled")
-  (return-type "gboolean")
+
+
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-stage.h
+
+(define-function clutter_stage_get_default
+  (c-name "clutter_stage_get_default")
+  (return-type "ClutterActor*")
 )
 
-(define-function clutter_redraw
-  (c-name "clutter_redraw")
-  (return-type "none")
-  (parameters
-    '("ClutterStage*" "stage")
-  )
+(define-method is_default
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_is_default")
+  (return-type "gboolean")
 )
 
-(define-function clutter_clear_glyph_cache
-  (c-name "clutter_clear_glyph_cache")
+(define-method queue_redraw
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_queue_redraw")
   (return-type "none")
 )
 
-(define-function clutter_set_font_flags
-  (c-name "clutter_set_font_flags")
+(define-method set_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_use_fog")
   (return-type "none")
   (parameters
-    '("ClutterFontFlags" "flags")
+    '("gboolean" "fog")
   )
 )
 
-(define-function clutter_get_font_flags
-  (c-name "clutter_get_font_flags")
-  (return-type "ClutterFontFlags")
+(define-method get_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_use_fog")
+  (return-type "gboolean")
 )
 
-(define-function clutter_get_input_device_for_id
-  (c-name "clutter_get_input_device_for_id")
-  (return-type "ClutterInputDevice*")
+(define-method set_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_fog")
+  (return-type "none")
   (parameters
-    '("gint" "id_")
+    '("ClutterFog*" "fog")
   )
 )
 
-(define-function clutter_grab_pointer_for_device
-  (c-name "clutter_grab_pointer_for_device")
+(define-method get_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_fog")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("gint" "id_")
+    '("ClutterFog*" "fog")
   )
 )
 
-(define-function clutter_ungrab_pointer_for_device
-  (c-name "clutter_ungrab_pointer_for_device")
+(define-method set_color
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_color")
   (return-type "none")
   (parameters
-    '("gint" "id_")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-function clutter_set_default_frame_rate
-  (c-name "clutter_set_default_frame_rate")
+(define-method get_color
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_color")
   (return-type "none")
   (parameters
-    '("guint" "frames_per_sec")
+    '("ClutterColor*" "color")
   )
 )
 
-(define-function clutter_get_timestamp
-  (c-name "clutter_get_timestamp")
-  (return-type "gulong")
-)
 
-(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 /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-stage-manager.h
+
+(define-method set_default_stage
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_set_default_stage")
+  (return-type "none")
+  (parameters
+    '("ClutterStage*" "stage")
+  )
 )
 
 
 
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-rectangle.h
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-state.h
 
-(define-function clutter_rectangle_get_type
-  (c-name "clutter_rectangle_get_type")
+(define-function clutter_state_get_type
+  (c-name "clutter_state_get_type")
   (return-type "GType")
 )
 
-(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
-    '("const-ClutterColor*" "color")
-  )
+(define-function clutter_state_new
+  (c-name "clutter_state_new")
+  (is-constructor-of "ClutterState")
+  (return-type "ClutterState*")
 )
 
-(define-method get_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_color")
-  (return-type "none")
+(define-method set_state
+  (of-object "ClutterState")
+  (c-name "clutter_state_set_state")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("ClutterColor*" "color")
+    '("const-gchar*" "target_state_name")
   )
 )
 
-(define-method set_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_color")
-  (return-type "none")
+(define-method warp_to_state
+  (of-object "ClutterState")
+  (c-name "clutter_state_warp_to_state")
+  (return-type "ClutterTimeline*")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("const-gchar*" "target_state_name")
   )
 )
 
-(define-method get_border_width
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_border_width")
-  (return-type "guint")
+(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_border_width
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_border_width")
+(define-method set_duration
+  (of-object "ClutterState")
+  (c-name "clutter_state_set_duration")
   (return-type "none")
   (parameters
-    '("guint" "width")
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("guint" "duration")
   )
 )
 
-(define-method get_border_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_get_border_color")
-  (return-type "none")
+(define-method get_duration
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_duration")
+  (return-type "guint")
   (parameters
-    '("ClutterColor*" "color")
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
   )
 )
 
-(define-method set_border_color
-  (of-object "ClutterRectangle")
-  (c-name "clutter_rectangle_set_border_color")
+(define-method set
+  (of-object "ClutterState")
+  (c-name "clutter_state_set")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("gpointer" "first_object")
+    '("const-gchar*" "first_property_name")
+    '("gulong" "first_mode")
   )
+  (varargs #t)
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-score.h
-
-(define-function clutter_score_get_type
-  (c-name "clutter_score_get_type")
-  (return-type "GType")
+(define-method get_states
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_states")
+  (return-type "GList*")
 )
 
-(define-function clutter_score_new
-  (c-name "clutter_score_new")
-  (is-constructor-of "ClutterScore")
-  (return-type "ClutterScore*")
+(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 set_loop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_set_loop")
+(define-method remove_key
+  (of-object "ClutterState")
+  (c-name "clutter_state_remove_key")
   (return-type "none")
   (parameters
-    '("gboolean" "loop")
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("GObject*" "object")
+    '("const-gchar*" "property_name")
   )
 )
 
-(define-method get_loop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_get_loop")
-  (return-type "gboolean")
+(define-method get_timeline
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_timeline")
+  (return-type "ClutterTimeline*")
 )
 
-(define-method append
-  (of-object "ClutterScore")
-  (c-name "clutter_score_append")
-  (return-type "gulong")
+(define-method set_animator
+  (of-object "ClutterState")
+  (c-name "clutter_state_set_animator")
+  (return-type "none")
   (parameters
-    '("ClutterTimeline*" "parent")
-    '("ClutterTimeline*" "timeline")
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
+    '("ClutterAnimator*" "animator")
   )
 )
 
-(define-method append_at_marker
-  (of-object "ClutterScore")
-  (c-name "clutter_score_append_at_marker")
-  (return-type "gulong")
+(define-method get_animator
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_animator")
+  (return-type "ClutterAnimator*")
   (parameters
-    '("ClutterTimeline*" "parent")
-    '("const-gchar*" "marker_name")
-    '("ClutterTimeline*" "timeline")
+    '("const-gchar*" "source_state_name")
+    '("const-gchar*" "target_state_name")
   )
 )
 
-(define-method remove
-  (of-object "ClutterScore")
-  (c-name "clutter_score_remove")
-  (return-type "none")
-  (parameters
-    '("gulong" "id_")
-  )
+(define-method get_state
+  (of-object "ClutterState")
+  (c-name "clutter_state_get_state")
+  (return-type "const-gchar*")
 )
 
-(define-method remove_all
-  (of-object "ClutterScore")
-  (c-name "clutter_score_remove_all")
-  (return-type "none")
+(define-function clutter_state_key_get_type
+  (c-name "clutter_state_key_get_type")
+  (return-type "GType")
 )
 
-(define-method get_timeline
-  (of-object "ClutterScore")
-  (c-name "clutter_score_get_timeline")
-  (return-type "ClutterTimeline*")
-  (parameters
-    '("gulong" "id_")
-  )
+(define-method get_pre_delay
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_pre_delay")
+  (return-type "gdouble")
 )
 
-(define-method list_timelines
-  (of-object "ClutterScore")
-  (c-name "clutter_score_list_timelines")
-  (return-type "GSList*")
+(define-method get_post_delay
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_post_delay")
+  (return-type "gdouble")
 )
 
-(define-method start
-  (of-object "ClutterScore")
-  (c-name "clutter_score_start")
-  (return-type "none")
+(define-method get_mode
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_mode")
+  (return-type "gulong")
 )
 
-(define-method stop
-  (of-object "ClutterScore")
-  (c-name "clutter_score_stop")
-  (return-type "none")
+(define-method get_value
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_value")
+  (return-type "gboolean")
+  (parameters
+    '("GValue*" "value")
+  )
 )
 
-(define-method pause
-  (of-object "ClutterScore")
-  (c-name "clutter_score_pause")
-  (return-type "none")
+(define-method get_property_type
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_property_type")
+  (return-type "GType")
 )
 
-(define-method rewind
-  (of-object "ClutterScore")
-  (c-name "clutter_score_rewind")
-  (return-type "none")
+(define-method get_object
+  (of-object "ClutterStateKey")
+  (c-name "clutter_state_key_get_object")
+  (return-type "GObject*")
 )
 
-(define-method is_playing
-  (of-object "ClutterScore")
-  (c-name "clutter_score_is_playing")
-  (return-type "gboolean")
+(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 /opt/clutter/include/clutter-1.0/clutter/deprecated/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")
-)
+;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-texture.h
 
-(define-function clutter_shader_new
-  (c-name "clutter_shader_new")
-  (is-constructor-of "ClutterShader")
-  (return-type "ClutterShader*")
+(define-function clutter_texture_new
+  (c-name "clutter_texture_new")
+  (is-constructor-of "ClutterTexture")
+  (return-type "ClutterActor*")
 )
 
-(define-method set_is_enabled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_is_enabled")
-  (return-type "none")
+(define-function clutter_texture_new_from_file
+  (c-name "clutter_texture_new_from_file")
+  (return-type "ClutterActor*")
   (parameters
-    '("gboolean" "enabled")
-  )
-)
-
-(define-method get_is_enabled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_is_enabled")
-  (return-type "gboolean")
+    '("const-gchar*" "filename")
+    '("GError**" "error")
+  )
 )
 
-(define-method compile
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_compile")
+(define-method set_from_file
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_file")
   (return-type "gboolean")
   (parameters
+    '("const-gchar*" "filename")
     '("GError**" "error")
   )
 )
 
-(define-method release
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_release")
-  (return-type "none")
+(define-method set_from_rgb_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_from_rgb_data")
+  (return-type "gboolean")
+  (parameters
+    '("const-guchar*" "data")
+    '("gboolean" "has_alpha")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "rowstride")
+    '("gint" "bpp")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
+  )
 )
 
-(define-method is_compiled
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_is_compiled")
+(define-method set_area_from_rgb_data
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_area_from_rgb_data")
   (return-type "gboolean")
+  (parameters
+    '("const-guchar*" "data")
+    '("gboolean" "has_alpha")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "rowstride")
+    '("gint" "bpp")
+    '("ClutterTextureFlags" "flags")
+    '("GError**" "error")
+  )
 )
 
-(define-method set_vertex_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_vertex_source")
+(define-method get_base_size
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_base_size")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
+    '("gint*" "width")
+    '("gint*" "height")
   )
 )
 
-(define-method set_fragment_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_fragment_source")
+(define-method set_filter_quality
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_filter_quality")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gssize" "length")
+    '("ClutterTextureQuality" "filter_quality")
   )
 )
 
-(define-method get_vertex_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_vertex_source")
-  (return-type "const-gchar*")
+(define-method get_filter_quality
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_filter_quality")
+  (return-type "ClutterTextureQuality")
 )
 
-(define-method get_fragment_source
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_fragment_source")
-  (return-type "const-gchar*")
+(define-method get_cogl_texture
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_cogl_texture")
+  (return-type "CoglHandle")
 )
 
-(define-method set_uniform
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_set_uniform")
+(define-method set_cogl_texture
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_cogl_texture")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-GValue*" "value")
+    '("CoglHandle" "cogl_tex")
   )
 )
 
-(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 get_cogl_vertex_shader
-  (of-object "ClutterShader")
-  (c-name "clutter_shader_get_cogl_vertex_shader")
+(define-method get_cogl_material
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_cogl_material")
   (return-type "CoglHandle")
 )
 
-(define-method set_shader
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader")
-  (return-type "gboolean")
+(define-method set_cogl_material
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_cogl_material")
+  (return-type "none")
   (parameters
-    '("ClutterShader*" "shader")
+    '("CoglHandle" "cogl_material")
   )
 )
 
-(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")
+(define-method set_sync_size
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_sync_size")
   (return-type "none")
   (parameters
-    '("const-gchar*" "param")
-    '("const-GValue*" "value")
+    '("gboolean" "sync_size")
   )
 )
 
-(define-method set_shader_param_int
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param_int")
+(define-method get_sync_size
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_sync_size")
+  (return-type "gboolean")
+)
+
+(define-method set_repeat
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_repeat")
   (return-type "none")
   (parameters
-    '("const-gchar*" "param")
-    '("gint" "value")
+    '("gboolean" "repeat_x")
+    '("gboolean" "repeat_y")
   )
 )
 
-(define-method set_shader_param_float
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_shader_param_float")
+(define-method get_repeat
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_repeat")
   (return-type "none")
   (parameters
-    '("const-gchar*" "param")
-    '("gfloat" "value")
+    '("gboolean*" "repeat_x")
+    '("gboolean*" "repeat_y")
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-stage.h
-
-(define-function clutter_stage_get_default
-  (c-name "clutter_stage_get_default")
-  (return-type "ClutterActor*")
-)
-
-(define-method is_default
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_is_default")
-  (return-type "gboolean")
+(define-method get_pixel_format
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_pixel_format")
+  (return-type "CoglPixelFormat")
 )
 
-(define-method queue_redraw
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_queue_redraw")
-  (return-type "none")
+(define-method get_max_tile_waste
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_max_tile_waste")
+  (return-type "gint")
 )
 
-(define-method set_use_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_use_fog")
+(define-method set_keep_aspect_ratio
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_keep_aspect_ratio")
   (return-type "none")
   (parameters
-    '("gboolean" "fog")
+    '("gboolean" "keep_aspect")
   )
 )
 
-(define-method get_use_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_use_fog")
+(define-method get_keep_aspect_ratio
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_keep_aspect_ratio")
   (return-type "gboolean")
 )
 
-(define-method set_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_fog")
+(define-method set_load_async
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_load_async")
   (return-type "none")
   (parameters
-    '("ClutterFog*" "fog")
+    '("gboolean" "load_async")
   )
 )
 
-(define-method get_fog
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_fog")
-  (return-type "none")
-  (parameters
-    '("ClutterFog*" "fog")
-  )
+(define-method get_load_async
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_load_async")
+  (return-type "gboolean")
 )
 
-(define-method set_color
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_color")
+(define-method set_load_data_async
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_load_data_async")
   (return-type "none")
   (parameters
-    '("const-ClutterColor*" "color")
+    '("gboolean" "load_async")
   )
 )
 
-(define-method get_color
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_color")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "color")
-  )
+(define-method get_load_data_async
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_load_data_async")
+  (return-type "gboolean")
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-stage-manager.h
-
-(define-method set_default_stage
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_set_default_stage")
+(define-method set_pick_with_alpha
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_set_pick_with_alpha")
   (return-type "none")
   (parameters
-    '("ClutterStage*" "stage")
+    '("gboolean" "pick_with_alpha")
   )
 )
 
-
-
-;; From /opt/clutter/include/clutter-1.0/clutter/deprecated/clutter-texture.h
+(define-method get_pick_with_alpha
+  (of-object "ClutterTexture")
+  (c-name "clutter_texture_get_pick_with_alpha")
+  (return-type "gboolean")
+)
 
 (define-function clutter_texture_new_from_actor
   (c-name "clutter_texture_new_from_actor")
-- 
2.1.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0009-remove-types-deprecated-in-1.12.patch --]
[-- Type: text/x-patch, Size: 1302 bytes --]

From bc755f49fa0c06c905a143776db99fb9ab4fc1e6 Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Thu, 9 Oct 2014 18:36:55 -0300
Subject: [PATCH 09/12] remove types deprecated in 1.12

* clutter/gnome/overrides/clutter.defs-type-ignores: ignore-types list
  updated with types deprecated in 1.12.
---
 clutter/gnome/overrides/clutter.defs-type-ignores | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/clutter/gnome/overrides/clutter.defs-type-ignores b/clutter/gnome/overrides/clutter.defs-type-ignores
index 9f0bdb5..d0acb89 100644
--- a/clutter/gnome/overrides/clutter.defs-type-ignores
+++ b/clutter/gnome/overrides/clutter.defs-type-ignores
@@ -26,6 +26,7 @@
 ;;; Code:
 
 (ignore-types "ClutterRedrawFlags"
+	      "ClutterShader"		;; Use ClutterShaderEffect instead
               "ClutterShaderError"
 
               ;; Deprecated in 1.9.4.
@@ -50,7 +51,10 @@
               "ClutterBehaviourScale"
 
 	      ;; Deprecated in 1.12
+	      "ClutterAlpha"
+	      "ClutterAnimation"
+	      "ClutterAnimatorKey"
 	      "ClutterAnimator"
-	      "ClutterCairoTexture" ;; Use ClutterCanvas instead
+	      "ClutterCairoTexture"	;; Use ClutterCanvas instead
 	      "ClutterState"
 	      "ClutterStateKey")
-- 
2.1.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0010-fix-some-more-files-should-not-be-tracked-by-git.patch --]
[-- Type: text/x-patch, Size: 823 bytes --]

From d27e8b65d90e7161f76ee30feb5c959c1f8347b8 Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Fri, 10 Oct 2014 16:09:42 -0300
Subject: [PATCH 10/12] fix some more files should not be tracked by git

* .gitignore: do not track *.trs, /build-aux/compile and
  /build-aux/test-driver files.
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index c5ede53..67d9622 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ autom4te.cache/
 *.log
 *.la
 *.lo
+/build-aux/compile
 /build-aux/config.guess
 /build-aux/config.sub
 /build-aux/depcomp
@@ -25,6 +26,7 @@ autom4te.cache/
 /build-aux/ltmain.sh
 /build-aux/mdate-sh
 /build-aux/missing
+/build-aux/test-driver
 /build-aux/texinfo.tex
 /INSTALL
 /config.h.in~
-- 
2.1.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: 0011-CoglPixelFormat-must-become-visible-from-guile-clutt.patch --]
[-- Type: text/x-patch, Size: 43102 bytes --]

From a5c4a959609a8987786450447c33a1a6c9e6aead Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Fri, 10 Oct 2014 16:52:12 -0300
Subject: [PATCH 11/12] CoglPixelFormat must become visible from guile-clutter

Note: this is a 'special' patch, motivated by the necessity to wrap
clutter_image_set_data, itself requesting that CoglPixelFormat becomes
known and visible from guile-clutter.  Until now, there has been no
such needs and therefore, no guile-cogl binding [yet], which would be
nice but would also represent quite some work.  No guile-cogl, no
wrapper template, no git branch and no directory infrastructure.  So,
some cogl type 'polution' is inevitable in our clutter branch and/or
files.  Among the various possible solutions to this small problem, I
believe I took the simplest and fastest to implement, as well as the
the easiest to maintain.  Here is what I did:

  (1) I copied the cogl 1.12 types definition file in our clutter
  wrapper structure, here: clutter/gnome/gw/cogl-support.h;

  (2) I modified the generation of defs files step [Makefile.am] so
  that it also generates a cogl-types.defs;

  (3) I modified the procedures generation step [Makefile.am] so that
  it includes the cogl-types.defs file.

And since from these types, not so many actually, we only use
CoglPixelFormat, since CoglPixelFormat definition probably won't
change in decades, the solution I proposed and implemented is
acceptable, I think.

* clutter/gnome/defs/Makefile.am: modified as explained above, see
  points (2) and (3).

* clutter/gnome/gw/cogl-support.h: added as explained above, see
  point (1).

* clutter/gnome/defs/cogl-types.defs: automatically generated, this is
  the cogl type definitions for cogl version 1.12.
---
 clutter/gnome/defs/Makefile.am     |   8 +-
 clutter/gnome/defs/cogl-types.defs | 236 ++++++++++
 clutter/gnome/gw/cogl-support.h    | 871 +++++++++++++++++++++++++++++++++++++
 3 files changed, 1112 insertions(+), 3 deletions(-)
 create mode 100644 clutter/gnome/defs/cogl-types.defs
 create mode 100644 clutter/gnome/gw/cogl-support.h

diff --git a/clutter/gnome/defs/Makefile.am b/clutter/gnome/defs/Makefile.am
index bb26946..11c7d1b 100644
--- a/clutter/gnome/defs/Makefile.am
+++ b/clutter/gnome/defs/Makefile.am
@@ -8,7 +8,8 @@ defs_DATA = 					\
 	clutter-x11.defs			\
 	clutter-x11-types.defs			\
 	clutter-glx.defs			\
-	clutter-glx-types.defs
+	clutter-glx-types.defs			\
+	cogl-types.defs
 
 EXTRA_DIST = $(defs_DATA)
 
@@ -19,12 +20,13 @@ CLUTTER_INC_DIR=$(CLUTTER_PREFIX)/include/clutter-$(CLUTTER_MAJORMINOR)/clutter
 # functions that we deprecated in the current stable release.  When the
 # next stable release comes out, there will be new compile warnings, and
 # those warnings should be added to the clutter.defs file in ../overrides/.
-#
+
 clutter:
+	../../../h2def.py --types ../gw/cogl-support.h > cogl-types.defs
 	../../../h2def.py --types \
 	   $(CLUTTER_INC_DIR)/*.h $(CLUTTER_INC_DIR)/deprecated/*.h > clutter-types.defs
 	../../../h2def.py --procs \
-	   --with-header='(include type-ignores) (include "clutter-types.defs") (include overrides)' \
+	   --with-header='(include type-ignores) (include "cogl-types.defs") (include "clutter-types.defs") (include overrides)' \
 	   $(CLUTTER_INC_DIR)/*.h $(CLUTTER_INC_DIR)/deprecated/*.h > clutter.defs
 
 clutter-x11:
diff --git a/clutter/gnome/defs/cogl-types.defs b/clutter/gnome/defs/cogl-types.defs
new file mode 100644
index 0000000..9b6e8a5
--- /dev/null
+++ b/clutter/gnome/defs/cogl-types.defs
@@ -0,0 +1,236 @@
+;; -*- scheme -*-
+;; Enumerations and flags ...
+
+(define-enum PixelFormat
+  (in-module "Cogl")
+  (c-name "CoglPixelFormat")
+  (gtype-id "COGL_TYPE_PIXEL_FORMAT")
+  (values
+    '("any" "COGL_PIXEL_FORMAT_ANY")
+    '("a-8" "COGL_PIXEL_FORMAT_A_8")
+    '("rgb-565" "COGL_PIXEL_FORMAT_RGB_565")
+    '("rgba-4444" "COGL_PIXEL_FORMAT_RGBA_4444")
+    '("rgba-5551" "COGL_PIXEL_FORMAT_RGBA_5551")
+    '("yuv" "COGL_PIXEL_FORMAT_YUV")
+    '("g-8" "COGL_PIXEL_FORMAT_G_8")
+    '("rgb-888" "COGL_PIXEL_FORMAT_RGB_888")
+    '("bgr-888" "COGL_PIXEL_FORMAT_BGR_888")
+    '("rgba-8888" "COGL_PIXEL_FORMAT_RGBA_8888")
+    '("bgra-8888" "COGL_PIXEL_FORMAT_BGRA_8888")
+    '("argb-8888" "COGL_PIXEL_FORMAT_ARGB_8888")
+    '("abgr-8888" "COGL_PIXEL_FORMAT_ABGR_8888")
+    '("rgba-1010102" "COGL_PIXEL_FORMAT_RGBA_1010102")
+    '("bgra-1010102" "COGL_PIXEL_FORMAT_BGRA_1010102")
+    '("argb-2101010" "COGL_PIXEL_FORMAT_ARGB_2101010")
+    '("abgr-2101010" "COGL_PIXEL_FORMAT_ABGR_2101010")
+    '("rgba-8888-pre" "COGL_PIXEL_FORMAT_RGBA_8888_PRE")
+    '("bgra-8888-pre" "COGL_PIXEL_FORMAT_BGRA_8888_PRE")
+    '("argb-8888-pre" "COGL_PIXEL_FORMAT_ARGB_8888_PRE")
+    '("abgr-8888-pre" "COGL_PIXEL_FORMAT_ABGR_8888_PRE")
+    '("rgba-4444-pre" "COGL_PIXEL_FORMAT_RGBA_4444_PRE")
+    '("rgba-5551-pre" "COGL_PIXEL_FORMAT_RGBA_5551_PRE")
+    '("rgba-1010102-pre" "COGL_PIXEL_FORMAT_RGBA_1010102_PRE")
+    '("bgra-1010102-pre" "COGL_PIXEL_FORMAT_BGRA_1010102_PRE")
+    '("argb-2101010-pre" "COGL_PIXEL_FORMAT_ARGB_2101010_PRE")
+    '("abgr-2101010-pre" "COGL_PIXEL_FORMAT_ABGR_2101010_PRE")
+  )
+)
+
+(define-flags FeatureFlags
+  (in-module "Cogl")
+  (c-name "CoglFeatureFlags")
+  (gtype-id "COGL_TYPE_FEATURE_FLAGS")
+  (values
+    '("texture-rectangle" "COGL_FEATURE_TEXTURE_RECTANGLE")
+    '("texture-npot" "COGL_FEATURE_TEXTURE_NPOT")
+    '("texture-yuv" "COGL_FEATURE_TEXTURE_YUV")
+    '("texture-read-pixels" "COGL_FEATURE_TEXTURE_READ_PIXELS")
+    '("shaders-glsl" "COGL_FEATURE_SHADERS_GLSL")
+    '("offscreen" "COGL_FEATURE_OFFSCREEN")
+    '("offscreen-multisample" "COGL_FEATURE_OFFSCREEN_MULTISAMPLE")
+    '("offscreen-blit" "COGL_FEATURE_OFFSCREEN_BLIT")
+    '("four-clip-planes" "COGL_FEATURE_FOUR_CLIP_PLANES")
+    '("stencil-buffer" "COGL_FEATURE_STENCIL_BUFFER")
+    '("vbos" "COGL_FEATURE_VBOS")
+    '("pbos" "COGL_FEATURE_PBOS")
+    '("unsigned-int-indices" "COGL_FEATURE_UNSIGNED_INT_INDICES")
+    '("depth-range" "COGL_FEATURE_DEPTH_RANGE")
+    '("texture-npot-basic" "COGL_FEATURE_TEXTURE_NPOT_BASIC")
+    '("texture-npot-mipmap" "COGL_FEATURE_TEXTURE_NPOT_MIPMAP")
+    '("texture-npot-repeat" "COGL_FEATURE_TEXTURE_NPOT_REPEAT")
+    '("point-sprite" "COGL_FEATURE_POINT_SPRITE")
+    '("texture-3d" "COGL_FEATURE_TEXTURE_3D")
+    '("shaders-arbfp" "COGL_FEATURE_SHADERS_ARBFP")
+    '("map-buffer-for-read" "COGL_FEATURE_MAP_BUFFER_FOR_READ")
+    '("map-buffer-for-write" "COGL_FEATURE_MAP_BUFFER_FOR_WRITE")
+    '("onscreen-multiple" "COGL_FEATURE_ONSCREEN_MULTIPLE")
+  )
+)
+
+(define-flags BufferTarget
+  (in-module "Cogl")
+  (c-name "CoglBufferTarget")
+  (gtype-id "COGL_TYPE_BUFFER_TARGET")
+  (values
+    '("window-buffer" "COGL_WINDOW_BUFFER")
+    '("offscreen-buffer" "COGL_OFFSCREEN_BUFFER")
+  )
+)
+
+(define-flags TextureFlags
+  (in-module "Cogl")
+  (c-name "CoglTextureFlags")
+  (gtype-id "COGL_TYPE_TEXTURE_FLAGS")
+  (values
+    '("ne" "COGL_TEXTURE_NONE")
+    '("-auto-mipmap" "COGL_TEXTURE_NO_AUTO_MIPMAP")
+    '("-slicing" "COGL_TEXTURE_NO_SLICING")
+    '("-atlas" "COGL_TEXTURE_NO_ATLAS")
+  )
+)
+
+(define-enum FogMode
+  (in-module "Cogl")
+  (c-name "CoglFogMode")
+  (gtype-id "COGL_TYPE_FOG_MODE")
+  (values
+    '("linear" "COGL_FOG_MODE_LINEAR")
+    '("exponential" "COGL_FOG_MODE_EXPONENTIAL")
+    '("exponential-squared" "COGL_FOG_MODE_EXPONENTIAL_SQUARED")
+  )
+)
+
+(define-enum BlendStringError
+  (in-module "Cogl")
+  (c-name "CoglBlendStringError")
+  (gtype-id "COGL_TYPE_BLEND_STRING_ERROR")
+  (values
+    '("parse-error" "COGL_BLEND_STRING_ERROR_PARSE_ERROR")
+    '("argument-parse-error" "COGL_BLEND_STRING_ERROR_ARGUMENT_PARSE_ERROR")
+    '("invalid-error" "COGL_BLEND_STRING_ERROR_INVALID_ERROR")
+    '("gpu-unsupported-error" "COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR")
+  )
+)
+
+(define-enum Error
+  (in-module "Cogl")
+  (c-name "CoglError")
+  (gtype-id "COGL_TYPE_ERROR")
+  (values
+    '("unsupported" "COGL_ERROR_UNSUPPORTED")
+    '("no-memory" "COGL_ERROR_NO_MEMORY")
+  )
+)
+
+(define-enum AttributeType
+  (in-module "Cogl")
+  (c-name "CoglAttributeType")
+  (gtype-id "COGL_TYPE_ATTRIBUTE_TYPE")
+  (values
+    '("byte" "COGL_ATTRIBUTE_TYPE_BYTE")
+    '("unsigned-byte" "COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE")
+    '("short" "COGL_ATTRIBUTE_TYPE_SHORT")
+    '("unsigned-short" "COGL_ATTRIBUTE_TYPE_UNSIGNED_SHORT")
+    '("float" "COGL_ATTRIBUTE_TYPE_FLOAT")
+  )
+)
+
+(define-enum IndicesType
+  (in-module "Cogl")
+  (c-name "CoglIndicesType")
+  (gtype-id "COGL_TYPE_INDICES_TYPE")
+  (values
+    '("byte" "COGL_INDICES_TYPE_UNSIGNED_BYTE")
+    '("short" "COGL_INDICES_TYPE_UNSIGNED_SHORT")
+    '("int" "COGL_INDICES_TYPE_UNSIGNED_INT")
+  )
+)
+
+(define-enum VerticesMode
+  (in-module "Cogl")
+  (c-name "CoglVerticesMode")
+  (gtype-id "COGL_TYPE_VERTICES_MODE")
+  (values
+    '("points" "COGL_VERTICES_MODE_POINTS")
+    '("lines" "COGL_VERTICES_MODE_LINES")
+    '("line-loop" "COGL_VERTICES_MODE_LINE_LOOP")
+    '("line-strip" "COGL_VERTICES_MODE_LINE_STRIP")
+    '("triangles" "COGL_VERTICES_MODE_TRIANGLES")
+    '("triangle-strip" "COGL_VERTICES_MODE_TRIANGLE_STRIP")
+    '("triangle-fan" "COGL_VERTICES_MODE_TRIANGLE_FAN")
+  )
+)
+
+(define-enum DepthTestFunction
+  (in-module "Cogl")
+  (c-name "CoglDepthTestFunction")
+  (gtype-id "COGL_TYPE_DEPTH_TEST_FUNCTION")
+  (values
+    '("never" "COGL_DEPTH_TEST_FUNCTION_NEVER")
+    '("less" "COGL_DEPTH_TEST_FUNCTION_LESS")
+    '("equal" "COGL_DEPTH_TEST_FUNCTION_EQUAL")
+    '("lequal" "COGL_DEPTH_TEST_FUNCTION_LEQUAL")
+    '("greater" "COGL_DEPTH_TEST_FUNCTION_GREATER")
+    '("notequal" "COGL_DEPTH_TEST_FUNCTION_NOTEQUAL")
+    '("gequal" "COGL_DEPTH_TEST_FUNCTION_GEQUAL")
+    '("always" "COGL_DEPTH_TEST_FUNCTION_ALWAYS")
+  )
+)
+
+(define-enum RendererError
+  (in-module "Cogl")
+  (c-name "CoglRendererError")
+  (gtype-id "COGL_TYPE_RENDERER_ERROR")
+  (values
+    '("not-found" "COGL_RENDERER_ERROR_NOT_FOUND")
+    '("xlib-display-open" "COGL_RENDERER_ERROR_XLIB_DISPLAY_OPEN")
+    '("bad-constraint" "COGL_RENDERER_ERROR_BAD_CONSTRAINT")
+  )
+)
+
+(define-flags ColorMask
+  (in-module "Cogl")
+  (c-name "CoglColorMask")
+  (gtype-id "COGL_TYPE_COLOR_MASK")
+  (values
+    '("none" "COGL_COLOR_MASK_NONE")
+    '("red" "COGL_COLOR_MASK_RED")
+    '("green" "COGL_COLOR_MASK_GREEN")
+    '("blue" "COGL_COLOR_MASK_BLUE")
+    '("alpha" "COGL_COLOR_MASK_ALPHA")
+    '("all" "COGL_COLOR_MASK_ALL")
+  )
+)
+
+(define-enum Winding
+  (in-module "Cogl")
+  (c-name "CoglWinding")
+  (gtype-id "COGL_TYPE_WINDING")
+  (values
+    '("lockwise" "COGL_WINDING_CLOCKWISE")
+    '("ounter-clockwise" "COGL_WINDING_COUNTER_CLOCKWISE")
+  )
+)
+
+(define-flags BufferBit
+  (in-module "Cogl")
+  (c-name "CoglBufferBit")
+  (gtype-id "COGL_TYPE_BUFFER_BIT")
+  (values
+    '("color" "COGL_BUFFER_BIT_COLOR")
+    '("depth" "COGL_BUFFER_BIT_DEPTH")
+    '("stencil" "COGL_BUFFER_BIT_STENCIL")
+  )
+)
+
+(define-flags ReadPixelsFlags
+  (in-module "Cogl")
+  (c-name "CoglReadPixelsFlags")
+  (gtype-id "COGL_TYPE_READ_PIXELS_FLAGS")
+  (values
+    '("r" "COGL_READ_PIXELS_COLOR_BUFFER")
+  )
+)
+
+;; -*- scheme -*-
+; object definitions ...
diff --git a/clutter/gnome/gw/cogl-support.h b/clutter/gnome/gw/cogl-support.h
new file mode 100644
index 0000000..933cac0
--- /dev/null
+++ b/clutter/gnome/gw/cogl-support.h
@@ -0,0 +1,871 @@
+/*
+ * Cogl
+ *
+ * An object oriented GL/GLES Abstraction/Utility Layer
+ *
+ * Copyright (C) 2008,2009 Intel Corporation.
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
+#error "Only <cogl/cogl.h> can be included directly."
+#endif
+
+#ifndef __COGL_TYPES_H__
+#define __COGL_TYPES_H__
+
+#include <stdint.h>
+#include <glib-object.h>
+
+#include <cogl/cogl-defines.h>
+
+G_BEGIN_DECLS
+
+/**
+ * CoglBool:
+ *
+ * A boolean data type used throughout the Cogl C api. This should be
+ * used in conjunction with the %TRUE and %FALSE macro defines for
+ * setting and testing boolean values.
+ *
+ * Since: 2.0
+ * Stability: stable
+ */
+typedef int CoglBool;
+
+/**
+ * TRUE:
+ *
+ * A constant to be used with #CoglBool types to indicate a boolean in
+ * the "true" state.
+ *
+ * Since: 2.0
+ * Stability: stable
+ */
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+/**
+ * TRUE:
+ *
+ * A constant to be used with #CoglBool types to indicate a boolean in
+ * the "false" state.
+ *
+ * Since: 2.0
+ * Stability: stable
+ */
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+/* Some structures are meant to be opaque but they have public
+   definitions because we want the size to be public so they can be
+   allocated on the stack. This macro is used to ensure that users
+   don't accidentally access private members */
+#ifdef COGL_COMPILATION
+#define COGL_PRIVATE(x) x
+#else
+#define COGL_PRIVATE(x) private_member_ ## x
+#endif
+
+/* To help catch accidental changes to public structs that should
+ * be stack allocated we use this macro to compile time assert that
+ * a struct size is as expected.
+ */
+#define COGL_STRUCT_SIZE_ASSERT(TYPE, SIZE) \
+typedef struct { \
+          char compile_time_assert_ ## TYPE ## _size[ \
+              (sizeof (TYPE) == (SIZE)) ? 1 : -1]; \
+        } _ ## TYPE ## SizeCheck
+
+/**
+ * CoglHandle:
+ *
+ * Type used for storing references to cogl objects, the CoglHandle is
+ * a fully opaque type without any public data members.
+ */
+typedef void * CoglHandle;
+
+/**
+ * COGL_INVALID_HANDLE:
+ *
+ * A COGL handle that is not valid, used for unitialized handles as well as
+ * error conditions.
+ */
+#define COGL_INVALID_HANDLE NULL
+
+#define COGL_TYPE_HANDLE        (cogl_handle_get_type ())
+GType
+cogl_handle_get_type (void) G_GNUC_CONST;
+
+/**
+ * cogl_handle_ref:
+ * @handle: a #CoglHandle
+ *
+ * Increases the reference count of @handle by 1
+ *
+ * Return value: (transfer none): the handle, with its reference count increased
+ */
+CoglHandle
+cogl_handle_ref (CoglHandle handle);
+
+/**
+ * cogl_handle_unref:
+ * @handle: a #CoglHandle
+ *
+ * Drecreases the reference count of @handle by 1; if the reference
+ * count reaches 0, the resources allocated by @handle will be freed
+ */
+void
+cogl_handle_unref (CoglHandle handle);
+
+/**
+ * cogl_object_ref: (skip)
+ * @object: a #CoglObject
+ *
+ * Increases the reference count of @object by 1
+ *
+ * Returns: the @object, with its reference count increased
+ */
+void *
+cogl_object_ref (void *object);
+
+/**
+ * cogl_object_unref: (skip)
+ * @object: a #CoglObject
+ *
+ * Drecreases the reference count of @object by 1; if the reference
+ * count reaches 0, the resources allocated by @object will be freed
+ */
+void
+cogl_object_unref (void *object);
+
+/**
+ * CoglFuncPtr:
+ *
+ * The type used by cogl for function pointers, note that this type
+ * is used as a generic catch-all cast for function pointers and the
+ * actual arguments and return type may be different.
+ */
+typedef void (* CoglFuncPtr) (void);
+
+/* We forward declare this in cogl-types to avoid circular dependencies
+ * between cogl-matrix.h, cogl-euler.h and cogl-quaterion.h */
+typedef struct _CoglMatrix      CoglMatrix;
+
+/* Same as above we forward declared CoglQuaternion to avoid
+ * circular dependencies. */
+typedef struct _CoglQuaternion CoglQuaternion;
+
+/* Same as above we forward declared CoglEuler to avoid
+ * circular dependencies. */
+typedef struct _CoglEuler CoglEuler;
+
+/**
+ * CoglFixed:
+ *
+ * Fixed point number using a (16.16) notation.
+ */
+typedef int32_t CoglFixed;
+
+#define COGL_TYPE_FIXED         (cogl_fixed_get_type ())
+GType
+cogl_fixed_get_type (void) G_GNUC_CONST;
+
+/**
+ * CoglAngle:
+ *
+ * Integer representation of an angle such that 1024 corresponds to
+ * full circle (i.e., 2 * pi).
+ *
+ * Since: 1.0
+ */
+typedef int32_t CoglAngle;
+
+typedef struct _CoglColor               CoglColor;
+typedef struct _CoglTextureVertex       CoglTextureVertex;
+
+/* Enum declarations */
+
+#define COGL_A_BIT              (1 << 4)
+#define COGL_BGR_BIT            (1 << 5)
+#define COGL_AFIRST_BIT         (1 << 6)
+#define COGL_PREMULT_BIT        (1 << 7)
+
+/* XXX: Notes to those adding new formats here...
+ *
+ * First this diagram outlines how we allocate the 32bits of a
+ * CoglPixelFormat currently...
+ *
+ *                             4 bits for flags
+ *                             |--|
+ *  enum        unused             4 bits for the bytes-per-pixel
+ *                                 and component alignment info
+ *  |------| |---------------|     |--|
+ *  00000000 xxxxxxxx xxxxxxxx PFBA0000
+ *                             ^ premult
+ *                              ^ alpha first
+ *                               ^ bgr order
+ *                                ^ has alpha
+ *
+ * The most awkward part about the formats is how we use the last 4
+ * bits to encode the bytes per pixel and component alignment
+ * information. Ideally we should have had 3 bits for the bpp and a
+ * flag for alignment but we didn't plan for that in advance so we
+ * instead use a small lookup table to query the bpp and whether the
+ * components are byte aligned or not.
+ *
+ * The mapping is the following (see discussion on bug #660188):
+ *
+ * 0     = undefined
+ * 1, 8  = 1 bpp (e.g. A_8, G_8)
+ * 2     = 3 bpp, aligned (e.g. 888)
+ * 3     = 4 bpp, aligned (e.g. 8888)
+ * 4-6   = 2 bpp, not aligned (e.g. 565, 4444, 5551)
+ * 7     = YUV: undefined bpp, undefined alignment
+ * 9     = 2 bpp, aligned
+ * 10    = undefined
+ * 11    = undefined
+ * 12    = 3 bpp, not aligned
+ * 13    = 4 bpp, not aligned (e.g. 2101010)
+ * 14-15 = undefined
+ *
+ * Note: the gap at 10-11 is just because we wanted to maintain that
+ * all non-aligned formats have the third bit set in case that's
+ * useful later.
+ *
+ * Since we don't want to waste bits adding more and more flags, we'd
+ * like to see most new pixel formats that can't be represented
+ * uniquely with the existing flags in the least significant byte
+ * simply be enumerated with sequential values in the most significant
+ * enum byte.
+ *
+ * Note: Cogl avoids exposing any padded XRGB or RGBX formats and
+ * instead we leave it up to applications to decided whether they
+ * consider the A component as padding or valid data. We shouldn't
+ * change this policy without good reasoning.
+ *
+ * So to add a new format:
+ * 1) Use the mapping table above to figure out what to but in
+ *    the lowest nibble.
+ * 2) OR in the COGL_PREMULT_BIT, COGL_AFIRST_BIT, COGL_A_BIT and
+ *    COGL_BGR_BIT flags as appropriate.
+ * 3) If the result is not yet unique then also combine with an
+ *    increment of the last sequence number in the most significant
+ *    byte.
+ *
+ * The last sequence number used was 0 (i.e. no formats currently need
+ *                                      a sequence number)
+ * Update this note whenever a new sequence number is used.
+ */
+/**
+ * CoglPixelFormat:
+ * @COGL_PIXEL_FORMAT_ANY: Any format
+ * @COGL_PIXEL_FORMAT_A_8: 8 bits alpha mask
+ * @COGL_PIXEL_FORMAT_RGB_565: RGB, 16 bits
+ * @COGL_PIXEL_FORMAT_RGBA_4444: RGBA, 16 bits
+ * @COGL_PIXEL_FORMAT_RGBA_5551: RGBA, 16 bits
+ * @COGL_PIXEL_FORMAT_YUV: Not currently supported
+ * @COGL_PIXEL_FORMAT_G_8: Single luminance component
+ * @COGL_PIXEL_FORMAT_RGB_888: RGB, 24 bits
+ * @COGL_PIXEL_FORMAT_BGR_888: BGR, 24 bits
+ * @COGL_PIXEL_FORMAT_RGBA_8888: RGBA, 32 bits
+ * @COGL_PIXEL_FORMAT_BGRA_8888: BGRA, 32 bits
+ * @COGL_PIXEL_FORMAT_ARGB_8888: ARGB, 32 bits
+ * @COGL_PIXEL_FORMAT_ABGR_8888: ABGR, 32 bits
+ * @COGL_PIXEL_FORMAT_RGBA_1010102 : RGBA, 32 bits, 10 bpc
+ * @COGL_PIXEL_FORMAT_BGRA_1010102 : BGRA, 32 bits, 10 bpc
+ * @COGL_PIXEL_FORMAT_ARGB_2101010 : ARGB, 32 bits, 10 bpc
+ * @COGL_PIXEL_FORMAT_ABGR_2101010 : ABGR, 32 bits, 10 bpc
+ * @COGL_PIXEL_FORMAT_RGBA_8888_PRE: Premultiplied RGBA, 32 bits
+ * @COGL_PIXEL_FORMAT_BGRA_8888_PRE: Premultiplied BGRA, 32 bits
+ * @COGL_PIXEL_FORMAT_ARGB_8888_PRE: Premultiplied ARGB, 32 bits
+ * @COGL_PIXEL_FORMAT_ABGR_8888_PRE: Premultiplied ABGR, 32 bits
+ * @COGL_PIXEL_FORMAT_RGBA_4444_PRE: Premultiplied RGBA, 16 bits
+ * @COGL_PIXEL_FORMAT_RGBA_5551_PRE: Premultiplied RGBA, 16 bits
+ * @COGL_PIXEL_FORMAT_RGBA_1010102_PRE: Premultiplied RGBA, 32 bits, 10 bpc
+ * @COGL_PIXEL_FORMAT_BGRA_1010102_PRE: Premultiplied BGRA, 32 bits, 10 bpc
+ * @COGL_PIXEL_FORMAT_ARGB_2101010_PRE: Premultiplied ARGB, 32 bits, 10 bpc
+ * @COGL_PIXEL_FORMAT_ABGR_2101010_PRE: Premultiplied ABGR, 32 bits, 10 bpc
+ *
+ * Pixel formats used by Cogl. For the formats with a byte per
+ * component, the order of the components specify the order in
+ * increasing memory addresses. So for example
+ * %COGL_PIXEL_FORMAT_RGB_888 would have the red component in the
+ * lowest address, green in the next address and blue after that
+ * regardless of the endianness of the system.
+ *
+ * For the formats with non byte aligned components the component
+ * order specifies the order within a 16-bit or 32-bit number from
+ * most significant bit to least significant. So for
+ * %COGL_PIXEL_FORMAT_RGB_565, the red component would be in bits
+ * 11-15, the green component would be in 6-11 and the blue component
+ * would be in 1-5. Therefore the order in memory depends on the
+ * endianness of the system.
+ *
+ * When uploading a texture %COGL_PIXEL_FORMAT_ANY can be used as the
+ * internal format. Cogl will try to pick the best format to use
+ * internally and convert the texture data if necessary.
+ *
+ * Since: 0.8
+ */
+typedef enum { /*< prefix=COGL_PIXEL_FORMAT >*/
+  COGL_PIXEL_FORMAT_ANY           = 0,
+  COGL_PIXEL_FORMAT_A_8           = 1 | COGL_A_BIT,
+
+  COGL_PIXEL_FORMAT_RGB_565       = 4,
+  COGL_PIXEL_FORMAT_RGBA_4444     = 5 | COGL_A_BIT,
+  COGL_PIXEL_FORMAT_RGBA_5551     = 6 | COGL_A_BIT,
+  COGL_PIXEL_FORMAT_YUV           = 7,
+  COGL_PIXEL_FORMAT_G_8           = 8,
+
+  COGL_PIXEL_FORMAT_RGB_888       = 2,
+  COGL_PIXEL_FORMAT_BGR_888       = (2 | COGL_BGR_BIT),
+
+  COGL_PIXEL_FORMAT_RGBA_8888     = (3 | COGL_A_BIT),
+  COGL_PIXEL_FORMAT_BGRA_8888     = (3 | COGL_A_BIT | COGL_BGR_BIT),
+  COGL_PIXEL_FORMAT_ARGB_8888     = (3 | COGL_A_BIT | COGL_AFIRST_BIT),
+  COGL_PIXEL_FORMAT_ABGR_8888     = (3 | COGL_A_BIT | COGL_BGR_BIT | COGL_AFIRST_BIT),
+
+  COGL_PIXEL_FORMAT_RGBA_1010102  = (13 | COGL_A_BIT),
+  COGL_PIXEL_FORMAT_BGRA_1010102  = (13 | COGL_A_BIT | COGL_BGR_BIT),
+  COGL_PIXEL_FORMAT_ARGB_2101010  = (13 | COGL_A_BIT | COGL_AFIRST_BIT),
+  COGL_PIXEL_FORMAT_ABGR_2101010  = (13 | COGL_A_BIT | COGL_BGR_BIT | COGL_AFIRST_BIT),
+
+  COGL_PIXEL_FORMAT_RGBA_8888_PRE = (3 | COGL_A_BIT | COGL_PREMULT_BIT),
+  COGL_PIXEL_FORMAT_BGRA_8888_PRE = (3 | COGL_A_BIT | COGL_PREMULT_BIT | COGL_BGR_BIT),
+  COGL_PIXEL_FORMAT_ARGB_8888_PRE = (3 | COGL_A_BIT | COGL_PREMULT_BIT | COGL_AFIRST_BIT),
+  COGL_PIXEL_FORMAT_ABGR_8888_PRE = (3 | COGL_A_BIT | COGL_PREMULT_BIT | COGL_BGR_BIT | COGL_AFIRST_BIT),
+  COGL_PIXEL_FORMAT_RGBA_4444_PRE = (COGL_PIXEL_FORMAT_RGBA_4444 | COGL_A_BIT | COGL_PREMULT_BIT),
+  COGL_PIXEL_FORMAT_RGBA_5551_PRE = (COGL_PIXEL_FORMAT_RGBA_5551 | COGL_A_BIT | COGL_PREMULT_BIT),
+
+  COGL_PIXEL_FORMAT_RGBA_1010102_PRE = (COGL_PIXEL_FORMAT_RGBA_1010102 | COGL_PREMULT_BIT),
+  COGL_PIXEL_FORMAT_BGRA_1010102_PRE = (COGL_PIXEL_FORMAT_BGRA_1010102 | COGL_PREMULT_BIT),
+  COGL_PIXEL_FORMAT_ARGB_2101010_PRE = (COGL_PIXEL_FORMAT_ARGB_2101010 | COGL_PREMULT_BIT),
+  COGL_PIXEL_FORMAT_ABGR_2101010_PRE = (COGL_PIXEL_FORMAT_ABGR_2101010 | COGL_PREMULT_BIT)
+} CoglPixelFormat;
+
+/**
+ * CoglFeatureFlags:
+ * @COGL_FEATURE_TEXTURE_RECTANGLE: ARB_texture_rectangle support
+ * @COGL_FEATURE_TEXTURE_NPOT: Non power of two textures are supported
+ *    by the hardware. This is a equivalent to the
+ *    %COGL_FEATURE_TEXTURE_NPOT_BASIC, %COGL_FEATURE_TEXTURE_NPOT_MIPMAP
+ *    and %COGL_FEATURE_TEXTURE_NPOT_REPEAT features combined.
+ * @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support
+ * @COGL_FEATURE_TEXTURE_READ_PIXELS: glReadPixels() support
+ * @COGL_FEATURE_SHADERS_GLSL: GLSL support
+ * @COGL_FEATURE_SHADERS_ARBFP: ARBFP support
+ * @COGL_FEATURE_OFFSCREEN: FBO support
+ * @COGL_FEATURE_OFFSCREEN_MULTISAMPLE: Multisample support on FBOs
+ * @COGL_FEATURE_OFFSCREEN_BLIT: Blit support on FBOs
+ * @COGL_FEATURE_FOUR_CLIP_PLANES: At least 4 clip planes available
+ * @COGL_FEATURE_STENCIL_BUFFER: Stencil buffer support
+ * @COGL_FEATURE_VBOS: VBO support
+ * @COGL_FEATURE_PBOS: PBO support
+ * @COGL_FEATURE_UNSIGNED_INT_INDICES: Set if
+ *     %COGL_INDICES_TYPE_UNSIGNED_INT is supported in
+ *     cogl_vertex_buffer_indices_new().
+ * @COGL_FEATURE_DEPTH_RANGE: cogl_material_set_depth_range() support
+ * @COGL_FEATURE_TEXTURE_NPOT_BASIC: The hardware supports non power
+ *     of two textures, but you also need to check the
+ *     %COGL_FEATURE_TEXTURE_NPOT_MIPMAP and %COGL_FEATURE_TEXTURE_NPOT_REPEAT
+ *     features to know if the hardware supports npot texture mipmaps
+ *     or repeat modes other than
+ *     %COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE respectively.
+ * @COGL_FEATURE_TEXTURE_NPOT_MIPMAP: Mipmapping is supported in
+ *     conjuntion with non power of two textures.
+ * @COGL_FEATURE_TEXTURE_NPOT_REPEAT: Repeat modes other than
+ *     %COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE are supported by the
+ *     hardware.
+ * @COGL_FEATURE_POINT_SPRITE: Whether
+ *     cogl_material_set_layer_point_sprite_coords_enabled() is supported.
+ * @COGL_FEATURE_TEXTURE_3D: 3D texture support
+ * @COGL_FEATURE_MAP_BUFFER_FOR_READ: Whether cogl_buffer_map() is
+ *     supported with CoglBufferAccess including read support.
+ * @COGL_FEATURE_MAP_BUFFER_FOR_WRITE: Whether cogl_buffer_map() is
+ *     supported with CoglBufferAccess including write support.
+ *
+ * Flags for the supported features.
+ *
+ * Since: 0.8
+ */
+typedef enum
+{
+  COGL_FEATURE_TEXTURE_RECTANGLE      = (1 << 1),
+  COGL_FEATURE_TEXTURE_NPOT           = (1 << 2),
+  COGL_FEATURE_TEXTURE_YUV            = (1 << 3),
+  COGL_FEATURE_TEXTURE_READ_PIXELS    = (1 << 4),
+  COGL_FEATURE_SHADERS_GLSL           = (1 << 5),
+  COGL_FEATURE_OFFSCREEN              = (1 << 6),
+  COGL_FEATURE_OFFSCREEN_MULTISAMPLE  = (1 << 7),
+  COGL_FEATURE_OFFSCREEN_BLIT         = (1 << 8),
+  COGL_FEATURE_FOUR_CLIP_PLANES       = (1 << 9),
+  COGL_FEATURE_STENCIL_BUFFER         = (1 << 10),
+  COGL_FEATURE_VBOS		      = (1 << 11),
+  COGL_FEATURE_PBOS		      = (1 << 12),
+  COGL_FEATURE_UNSIGNED_INT_INDICES   = (1 << 13),
+  COGL_FEATURE_DEPTH_RANGE            = (1 << 14),
+  COGL_FEATURE_TEXTURE_NPOT_BASIC     = (1 << 15),
+  COGL_FEATURE_TEXTURE_NPOT_MIPMAP    = (1 << 16),
+  COGL_FEATURE_TEXTURE_NPOT_REPEAT    = (1 << 17),
+  COGL_FEATURE_POINT_SPRITE           = (1 << 18),
+  COGL_FEATURE_TEXTURE_3D             = (1 << 19),
+  COGL_FEATURE_SHADERS_ARBFP          = (1 << 20),
+  COGL_FEATURE_MAP_BUFFER_FOR_READ    = (1 << 21),
+  COGL_FEATURE_MAP_BUFFER_FOR_WRITE   = (1 << 22),
+  COGL_FEATURE_ONSCREEN_MULTIPLE      = (1 << 23)
+} CoglFeatureFlags;
+
+/**
+ * CoglBufferTarget:
+ * @COGL_WINDOW_BUFFER: FIXME
+ * @COGL_OFFSCREEN_BUFFER: FIXME
+ *
+ * Target flags for FBOs.
+ *
+ * Since: 0.8
+ */
+typedef enum
+{
+  COGL_WINDOW_BUFFER      = (1 << 1),
+  COGL_OFFSCREEN_BUFFER   = (1 << 2)
+} CoglBufferTarget;
+
+/**
+ * CoglColor:
+ *
+ * A structure for holding a color definition. The contents of
+ * the CoglColor structure are private and should never by accessed
+ * directly.
+ *
+ * Since: 1.0
+ */
+struct _CoglColor
+{
+  /*< private >*/
+  uint8_t COGL_PRIVATE (red);
+  uint8_t COGL_PRIVATE (green);
+  uint8_t COGL_PRIVATE (blue);
+
+  uint8_t COGL_PRIVATE (alpha);
+
+  /* padding in case we want to change to floats at
+   * some point */
+  uint32_t COGL_PRIVATE (padding0);
+  uint32_t COGL_PRIVATE (padding1);
+  uint32_t COGL_PRIVATE (padding2);
+};
+COGL_STRUCT_SIZE_ASSERT (CoglColor, 16);
+
+/**
+ * CoglTextureVertex:
+ * @x: Model x-coordinate
+ * @y: Model y-coordinate
+ * @z: Model z-coordinate
+ * @tx: Texture x-coordinate
+ * @ty: Texture y-coordinate
+ * @color: The color to use at this vertex. This is ignored if
+ *   use_color is %FALSE when calling cogl_polygon()
+ *
+ * Used to specify vertex information when calling cogl_polygon()
+ */
+struct _CoglTextureVertex
+{
+  float x, y, z;
+  float tx, ty;
+
+  CoglColor color;
+};
+COGL_STRUCT_SIZE_ASSERT (CoglTextureVertex, 36);
+
+/**
+ * CoglTextureFlags:
+ * @COGL_TEXTURE_NONE: No flags specified
+ * @COGL_TEXTURE_NO_AUTO_MIPMAP: Disables the automatic generation of
+ *   the mipmap pyramid from the base level image whenever it is
+ *   updated. The mipmaps are only generated when the texture is
+ *   rendered with a mipmap filter so it should be free to leave out
+ *   this flag when using other filtering modes
+ * @COGL_TEXTURE_NO_SLICING: Disables the slicing of the texture
+ * @COGL_TEXTURE_NO_ATLAS: Disables the insertion of the texture inside
+ *   the texture atlas used by Cogl
+ *
+ * Flags to pass to the cogl_texture_new_* family of functions.
+ *
+ * Since: 1.0
+ */
+typedef enum {
+  COGL_TEXTURE_NONE           = 0,
+  COGL_TEXTURE_NO_AUTO_MIPMAP = 1 << 0,
+  COGL_TEXTURE_NO_SLICING     = 1 << 1,
+  COGL_TEXTURE_NO_ATLAS       = 1 << 2
+} CoglTextureFlags;
+
+/**
+ * CoglFogMode:
+ * @COGL_FOG_MODE_LINEAR: Calculates the fog blend factor as:
+ * |[
+ *   f = end - eye_distance / end - start
+ * ]|
+ * @COGL_FOG_MODE_EXPONENTIAL: Calculates the fog blend factor as:
+ * |[
+ *   f = e ^ -(density * eye_distance)
+ * ]|
+ * @COGL_FOG_MODE_EXPONENTIAL_SQUARED: Calculates the fog blend factor as:
+ * |[
+ *   f = e ^ -(density * eye_distance)^2
+ * ]|
+ *
+ * The fog mode determines the equation used to calculate the fogging blend
+ * factor while fogging is enabled. The simplest %COGL_FOG_MODE_LINEAR mode
+ * determines f as:
+ *
+ * |[
+ *   f = end - eye_distance / end - start
+ * ]|
+ *
+ * Where eye_distance is the distance of the current fragment in eye
+ * coordinates from the origin.
+ *
+ * Since: 1.0
+ */
+typedef enum {
+  COGL_FOG_MODE_LINEAR,
+  COGL_FOG_MODE_EXPONENTIAL,
+  COGL_FOG_MODE_EXPONENTIAL_SQUARED
+} CoglFogMode;
+
+/**
+ * COGL_BLEND_STRING_ERROR:
+ *
+ * #GError domain for blend string parser errors
+ *
+ * Since: 1.0
+ */
+#define COGL_BLEND_STRING_ERROR (cogl_blend_string_error_quark ())
+
+/**
+ * CoglBlendStringError:
+ * @COGL_BLEND_STRING_ERROR_PARSE_ERROR: Generic parse error
+ * @COGL_BLEND_STRING_ERROR_ARGUMENT_PARSE_ERROR: Argument parse error
+ * @COGL_BLEND_STRING_ERROR_INVALID_ERROR: Internal parser error
+ * @COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR: Blend string not
+ *   supported by the GPU
+ *
+ * Error enumeration for the blend strings parser
+ *
+ * Since: 1.0
+ */
+typedef enum { /*< prefix=COGL_BLEND_STRING_ERROR >*/
+  COGL_BLEND_STRING_ERROR_PARSE_ERROR,
+  COGL_BLEND_STRING_ERROR_ARGUMENT_PARSE_ERROR,
+  COGL_BLEND_STRING_ERROR_INVALID_ERROR,
+  COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR
+} CoglBlendStringError;
+
+GQuark
+cogl_blend_string_error_quark (void);
+
+#define COGL_ERROR (_cogl_error_quark ())
+
+/**
+ * CoglError:
+ * @COGL_ERROR_UNSUPPORTED: You tried to use a feature or
+ *    configuration not currently available.
+ * @COGL_ERROR_NO_MEMORY: You tried to allocate a resource
+ *    such as a texture and there wasn't enough memory.
+ *
+ * Error enumeration for Cogl
+ *
+ * The @COGL_ERROR_UNSUPPORTED error can be thrown for a variety of
+ * reasons. For example:
+ *
+ * <itemizedlist>
+ *  <listitem><para>You've tried to use a feature that is not
+ *   advertised by cogl_get_features(). This could happen if you create
+ *   a 2d texture with a non-power-of-two size when
+ *   %COGL_FEATURE_TEXTURE_NPOT is not advertised.</para></listitem>
+ *  <listitem><para>The GPU can not handle the configuration you have
+ *   requested. An example might be if you try to use too many texture
+ *   layers in a single #CoglPipeline</para></listitem>
+ *  <listitem><para>The driver does not support some
+ *   configuration.</para></listiem>
+ * </itemizedlist>
+ *
+ * Currently this is only used by Cogl API marked as experimental so
+ * this enum should also be considered experimental.
+ *
+ * Since: 1.4
+ * Stability: unstable
+ */
+typedef enum { /*< prefix=COGL_ERROR >*/
+  COGL_ERROR_UNSUPPORTED,
+  COGL_ERROR_NO_MEMORY
+} CoglError;
+
+GQuark
+_cogl_error_quark (void);
+
+/**
+ * CoglAttributeType:
+ * @COGL_ATTRIBUTE_TYPE_BYTE: Data is the same size of a byte
+ * @COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE: Data is the same size of an
+ *   unsigned byte
+ * @COGL_ATTRIBUTE_TYPE_SHORT: Data is the same size of a short integer
+ * @COGL_ATTRIBUTE_TYPE_UNSIGNED_SHORT: Data is the same size of
+ *   an unsigned short integer
+ * @COGL_ATTRIBUTE_TYPE_FLOAT: Data is the same size of a float
+ *
+ * Data types for the components of a vertex attribute.
+ *
+ * Since: 1.0
+ */
+typedef enum {
+  COGL_ATTRIBUTE_TYPE_BYTE           = 0x1400,
+  COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE  = 0x1401,
+  COGL_ATTRIBUTE_TYPE_SHORT          = 0x1402,
+  COGL_ATTRIBUTE_TYPE_UNSIGNED_SHORT = 0x1403,
+  COGL_ATTRIBUTE_TYPE_FLOAT          = 0x1406
+} CoglAttributeType;
+
+/**
+ * CoglIndicesType:
+ * @COGL_INDICES_TYPE_UNSIGNED_BYTE: Your indices are unsigned bytes
+ * @COGL_INDICES_TYPE_UNSIGNED_SHORT: Your indices are unsigned shorts
+ * @COGL_INDICES_TYPE_UNSIGNED_INT: Your indices are unsigned ints
+ *
+ * You should aim to use the smallest data type that gives you enough
+ * range, since it reduces the size of your index array and can help
+ * reduce the demand on memory bandwidth.
+ *
+ * Note that %COGL_INDICES_TYPE_UNSIGNED_INT is only supported if the
+ * %COGL_FEATURE_UNSIGNED_INT_INDICES feature is available. This
+ * should always be available on OpenGL but on OpenGL ES it will only
+ * be available if the GL_OES_element_index_uint extension is
+ * advertized.
+ */
+typedef enum {
+  COGL_INDICES_TYPE_UNSIGNED_BYTE,
+  COGL_INDICES_TYPE_UNSIGNED_SHORT,
+  COGL_INDICES_TYPE_UNSIGNED_INT
+} CoglIndicesType;
+
+/**
+ * CoglVerticesMode:
+ * @COGL_VERTICES_MODE_POINTS: FIXME, equivalent to %GL_POINTS
+ * @COGL_VERTICES_MODE_LINES: FIXME, equivalent to %GL_LINES
+ * @COGL_VERTICES_MODE_LINE_LOOP: FIXME, equivalent to %GL_LINE_LOOP
+ * @COGL_VERTICES_MODE_LINE_STRIP: FIXME, equivalent to %GL_LINE_STRIP
+ * @COGL_VERTICES_MODE_TRIANGLES: FIXME, equivalent to %GL_TRIANGLES
+ * @COGL_VERTICES_MODE_TRIANGLE_STRIP: FIXME, equivalent to %GL_TRIANGLE_STRIP
+ * @COGL_VERTICES_MODE_TRIANGLE_FAN: FIXME, equivalent to %GL_TRIANGLE_FAN
+ *
+ * Different ways of interpreting vertices when drawing.
+ *
+ * Since: 1.0
+ */
+typedef enum {
+  COGL_VERTICES_MODE_POINTS = 0x0000,
+  COGL_VERTICES_MODE_LINES = 0x0001,
+  COGL_VERTICES_MODE_LINE_LOOP = 0x0002,
+  COGL_VERTICES_MODE_LINE_STRIP = 0x0003,
+  COGL_VERTICES_MODE_TRIANGLES = 0x0004,
+  COGL_VERTICES_MODE_TRIANGLE_STRIP = 0x0005,
+  COGL_VERTICES_MODE_TRIANGLE_FAN = 0x0006
+} CoglVerticesMode;
+
+/* NB: The above definitions are taken from gl.h equivalents */
+
+
+/* XXX: should this be CoglMaterialDepthTestFunction?
+ * It makes it very verbose but would be consistent with
+ * CoglMaterialWrapMode */
+
+/**
+ * CoglDepthTestFunction:
+ * @COGL_DEPTH_TEST_FUNCTION_NEVER: Never passes.
+ * @COGL_DEPTH_TEST_FUNCTION_LESS: Passes if the fragment's depth
+ * value is less than the value currently in the depth buffer.
+ * @COGL_DEPTH_TEST_FUNCTION_EQUAL: Passes if the fragment's depth
+ * value is equal to the value currently in the depth buffer.
+ * @COGL_DEPTH_TEST_FUNCTION_LEQUAL: Passes if the fragment's depth
+ * value is less or equal to the value currently in the depth buffer.
+ * @COGL_DEPTH_TEST_FUNCTION_GREATER: Passes if the fragment's depth
+ * value is greater than the value currently in the depth buffer.
+ * @COGL_DEPTH_TEST_FUNCTION_NOTEQUAL: Passes if the fragment's depth
+ * value is not equal to the value currently in the depth buffer.
+ * @COGL_DEPTH_TEST_FUNCTION_GEQUAL: Passes if the fragment's depth
+ * value greater than or equal to the value currently in the depth buffer.
+ * @COGL_DEPTH_TEST_FUNCTION_ALWAYS: Always passes.
+ *
+ * When using depth testing one of these functions is used to compare
+ * the depth of an incoming fragment against the depth value currently
+ * stored in the depth buffer. The function is changed using
+ * cogl_material_set_depth_test_function().
+ *
+ * The test is only done when depth testing is explicitly enabled. (See
+ * cogl_material_set_depth_test_enabled())
+ */
+typedef enum
+{
+  COGL_DEPTH_TEST_FUNCTION_NEVER    = 0x0200,
+  COGL_DEPTH_TEST_FUNCTION_LESS     = 0x0201,
+  COGL_DEPTH_TEST_FUNCTION_EQUAL    = 0x0202,
+  COGL_DEPTH_TEST_FUNCTION_LEQUAL   = 0x0203,
+  COGL_DEPTH_TEST_FUNCTION_GREATER  = 0x0204,
+  COGL_DEPTH_TEST_FUNCTION_NOTEQUAL = 0x0205,
+  COGL_DEPTH_TEST_FUNCTION_GEQUAL   = 0x0206,
+  COGL_DEPTH_TEST_FUNCTION_ALWAYS   = 0x0207
+} CoglDepthTestFunction;
+/* NB: The above definitions are taken from gl.h equivalents */
+
+typedef enum { /*< prefix=COGL_RENDERER_ERROR >*/
+  COGL_RENDERER_ERROR_NOT_FOUND,
+  COGL_RENDERER_ERROR_XLIB_DISPLAY_OPEN,
+  COGL_RENDERER_ERROR_BAD_CONSTRAINT
+} CoglRendererError;
+
+/*
+ * CoglFilterReturn:
+ * @COGL_FILTER_CONTINUE: The event was not handled, continues the
+ *                        processing
+ * @COGL_FILTER_REMOVE: Remove the event, stops the processing
+ *
+ * Return values for the #CoglFilterFunc function.
+ *
+ * Stability: Unstable
+ */
+typedef enum _CoglFilterReturn { /*< prefix=COGL_FILTER >*/
+  COGL_FILTER_CONTINUE,
+  COGL_FILTER_REMOVE
+} CoglFilterReturn;
+
+typedef enum _CoglWinsysFeature
+{
+  /* Available if the window system can support multiple onscreen
+   * framebuffers at the same time. */
+  COGL_WINSYS_FEATURE_MULTIPLE_ONSCREEN,
+
+  /* Available if onscreen framebuffer swaps can be automatically
+   * throttled to the vblank frequency. */
+  COGL_WINSYS_FEATURE_SWAP_THROTTLE,
+
+  /* Available if its possible to query a counter that
+   * increments at each vblank. */
+  COGL_WINSYS_FEATURE_VBLANK_COUNTER,
+
+  /* Available if its possible to wait until the next vertical
+   * blank period */
+  COGL_WINSYS_FEATURE_VBLANK_WAIT,
+
+  /* Available if the window system supports mapping native
+   * pixmaps to textures. */
+  COGL_WINSYS_FEATURE_TEXTURE_FROM_PIXMAP,
+
+  /* Available if the window system supports reporting an event
+   * for swap buffer completions. */
+  COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT,
+
+  /* Available if it's possible to swap a list of sub rectangles
+   * from the back buffer to the front buffer */
+  COGL_WINSYS_FEATURE_SWAP_REGION,
+
+  /* Available if swap_region requests can be automatically throttled
+   * to the vblank frequency. */
+  COGL_WINSYS_FEATURE_SWAP_REGION_THROTTLE,
+
+  /* Available if the swap region implementation won't tear and thus
+   * only needs to be throttled to the framerate */
+  COGL_WINSYS_FEATURE_SWAP_REGION_SYNCHRONIZED,
+
+  COGL_WINSYS_FEATURE_N_FEATURES
+} CoglWinsysFeature;
+
+/**
+ * CoglColorMask:
+ * @COGL_COLOR_MASK_NONE: None of the color channels are masked
+ * @COGL_COLOR_MASK_RED: Masks the red color channel
+ * @COGL_COLOR_MASK_GREEN: Masks the green color channel
+ * @COGL_COLOR_MASK_BLUE: Masks the blue color channel
+ * @COGL_COLOR_MASK_ALPHA: Masks the alpha color channel
+ * @COGL_COLOR_MASK_ALL: All of the color channels are masked
+ *
+ * Defines a bit mask of color channels. This can be used with
+ * cogl_pipeline_set_color_mask() for example to define which color
+ * channels should be written to the current framebuffer when
+ * drawing something.
+ */
+typedef enum
+{
+  COGL_COLOR_MASK_NONE = 0,
+  COGL_COLOR_MASK_RED = 1L<<0,
+  COGL_COLOR_MASK_GREEN = 1L<<1,
+  COGL_COLOR_MASK_BLUE = 1L<<2,
+  COGL_COLOR_MASK_ALPHA = 1L<<3,
+  /* XXX: glib-mkenums is a perl script that can't cope if we split
+   * this onto multiple lines! *sigh* */
+  COGL_COLOR_MASK_ALL = (COGL_COLOR_MASK_RED | COGL_COLOR_MASK_GREEN | COGL_COLOR_MASK_BLUE | COGL_COLOR_MASK_ALPHA)
+} CoglColorMask;
+
+/**
+ * CoglWinding:
+ * @COGL_WINDING_CLOCKWISE: Vertices are in a clockwise order
+ * @COGL_WINDING_COUNTER_CLOCKWISE: Vertices are in a counter-clockwise order
+ *
+ * Enum used to represent the two directions of rotation. This can be
+ * used to set the front face for culling by calling
+ * cogl_pipeline_set_front_face_winding().
+ */
+typedef enum
+{
+  COGL_WINDING_CLOCKWISE,
+  COGL_WINDING_COUNTER_CLOCKWISE
+} CoglWinding;
+
+/**
+ * CoglBufferBit:
+ * @COGL_BUFFER_BIT_COLOR: Selects the primary color buffer
+ * @COGL_BUFFER_BIT_DEPTH: Selects the depth buffer
+ * @COGL_BUFFER_BIT_STENCIL: Selects the stencil buffer
+ *
+ * Types of auxiliary buffers
+ *
+ * Since: 1.0
+ */
+typedef enum {
+  COGL_BUFFER_BIT_COLOR   = 1L<<0,
+  COGL_BUFFER_BIT_DEPTH   = 1L<<1,
+  COGL_BUFFER_BIT_STENCIL = 1L<<2
+} CoglBufferBit;
+
+/**
+ * CoglReadPixelsFlags:
+ * @COGL_READ_PIXELS_COLOR_BUFFER: Read from the color buffer
+ *
+ * Flags for cogl_read_pixels()
+ *
+ * Since: 1.0
+ */
+typedef enum { /*< prefix=COGL_READ_PIXELS >*/
+  COGL_READ_PIXELS_COLOR_BUFFER = 1L << 0
+} CoglReadPixelsFlags;
+
+G_END_DECLS
+
+#endif /* __COGL_TYPES_H__ */
-- 
2.1.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.6: 0012-clutter_image_set_data-special-wrapper-plus-some-dep.patch --]
[-- Type: text/x-patch, Size: 6248 bytes --]

From 5f06c8bc10d6c3e67ff85699ec9692e230e05059 Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Fri, 10 Oct 2014 17:10:40 -0300
Subject: [PATCH 12/12] clutter_image_set_data special wrapper, plus some
 deprecated fixes

* clutter/gnome/gw/clutter-support.c:
* clutter/gnome/gw/clutter-support.h: _wrap_clutter_image_set_data
  added.

* clutter/gnome/overrides/clutter.defs: (1) clutter_image_set_data
  overriden by calling _wrap_clutter_image_set_data. (2) some more
  deprecated procedures added, (3) clutter_box_layout_get_orientation,
  clutter_box_layout_set_orientation were mistakenly deprecated [my
  mistake], fixed.
---
 clutter/gnome/gw/clutter-support.c   | 14 ++++++++++
 clutter/gnome/gw/clutter-support.h   |  4 +++
 clutter/gnome/overrides/clutter.defs | 50 +++++++++++++++++++++---------------
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/clutter/gnome/gw/clutter-support.c b/clutter/gnome/gw/clutter-support.c
index f3bad6a..2088a95 100644
--- a/clutter/gnome/gw/clutter-support.c
+++ b/clutter/gnome/gw/clutter-support.c
@@ -406,3 +406,17 @@ scm_scm_to_clutter_matrix (SCM scm)
 
   return g_boxed_copy (clutter_matrix_get_type (), &ret);
 }
+
+gboolean
+_wrap_clutter_image_set_data (ClutterImage *image,
+			      guchar *data,
+			      CoglPixelFormat pixel_format,
+			      guint width,
+			      guint height,
+			      guint row_stride,
+			      GError **error)
+{
+  return clutter_image_set_data (image,
+				 (const guint8 *)data,
+				 pixel_format, width, height, row_stride, error);
+}
diff --git a/clutter/gnome/gw/clutter-support.h b/clutter/gnome/gw/clutter-support.h
index d5ead14..553ef91 100644
--- a/clutter/gnome/gw/clutter-support.h
+++ b/clutter/gnome/gw/clutter-support.h
@@ -73,3 +73,7 @@ ClutterRect* scm_scm_to_clutter_rect (SCM scm);
 
 SCM scm_clutter_matrix_to_scm (ClutterMatrix *m);
 ClutterMatrix* scm_scm_to_clutter_matrix (SCM scm);
+
+gboolean _wrap_clutter_image_set_data (ClutterImage *image, guchar *data,
+				       CoglPixelFormat pixel_format, guint width, guint height,
+				       guint row_stride, GError **error);
diff --git a/clutter/gnome/overrides/clutter.defs b/clutter/gnome/overrides/clutter.defs
index 110c4a9..ca86d6c 100644
--- a/clutter/gnome/overrides/clutter.defs
+++ b/clutter/gnome/overrides/clutter.defs
@@ -61,12 +61,6 @@
   (gtype-id "CLUTTER_TYPE_CONTAINER")
 )
 
-(define-interface Media
-  (in-module "Clutter")
-  (c-name "ClutterMedia")
-  (gtype-id "CLUTTER_TYPE_MEDIA")
-)
-
 (define-interface StageManager
   (in-module "Clutter")
   (c-name "ClutterStageManager")
@@ -202,6 +196,19 @@
   (return-type "const-GSList*-of-ClutterInputDevice*")
 )
 
+(define-method set_data
+  (of-object "ClutterImage")
+  (c-name "_wrap_clutter_image_set_data")
+  (overrides "clutter_image_set_data")
+  (return-type "gboolean")
+  (parameters
+   '("guchar*" "data")
+   '("CoglPixelFormat" "pixel_format")
+   '("guint" "width")
+   '("guint" "height")
+   '("guint" "row_stride")
+   '("GError**" "error")))
+
 (define-method get_slave_devices
   (of-object "ClutterInputDevice")
   (c-name "clutter_input_device_get_slave_devices")
@@ -226,7 +233,7 @@
 (define-method get_nodes
   (of-object "ClutterPath")
   (c-name "clutter_path_get_nodes")
-    (overrides "clutter_path_get_nodes")
+  (overrides "clutter_path_get_nodes")
   (return-type "GSList*-of-ClutterPathNode*")
 )
 
@@ -364,20 +371,21 @@
              "clutter_deform_effect_set_back_material"
              "clutter_event_get_axes"
              "clutter_frame_source_*"
-             "clutter_image_get_data"
-             "clutter_image_set_data"
+             ;; "clutter_image_set_data" this 1 must be wrapped [>= 1.12]
              "clutter_image_set_area"
+             "clutter_image_set_bytes"
              "clutter_image_get_texture"
              "clutter_init*"
              "clutter_interval_peek_*"
              "clutter_interval_compute_value"
              "clutter_get_option_group"
              "clutter_get_option_group_without_init"
-             ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main?
+	     ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main?
              "clutter_threads*"
              "clutter_model*"
              "clutter_layout_manager_list_child_properties"
              "clutter_list_model*"
+	     "clutter_matrix_init_from_array" ;; needs a special wrapper
              "clutter_offscreen_effect_get_target"
              "clutter_offscreen_effect_get_texture"
              "clutter_offscreen_effect_create_texture"
@@ -508,6 +516,7 @@
         "clutter_score_start"
         "clutter_score_stop"
         "clutter_shader_compile"
+	"clutter_shader_error_quark"
         "clutter_shader_get_fragment_source"
         "clutter_shader_get_is_enabled"
         "clutter_shader_get_vertex_source"
@@ -670,22 +679,23 @@
 	"clutter_bin_layout_add"
 	"clutter_bin_layout_get_alignment"
 	"clutter_bin_layout_set_alignment"
+
+	"clutter_box_layout_pack"
+	"clutter_box_layout_set_vertical"
+	"clutter_box_layout_get_vertical"
+	"clutter_box_layout_set_alignment"
 	"clutter_box_layout_get_alignment"
-	"clutter_box_layout_get_easing_duration"
-	"clutter_box_layout_get_easing_mode"
+	"clutter_box_layout_set_expand"
 	"clutter_box_layout_get_expand"
+	"clutter_box_layout_set_fill"
 	"clutter_box_layout_get_fill"
-	"clutter_box_layout_get_orientation"
+	"clutter_box_layout_set_use_animations"
 	"clutter_box_layout_get_use_animations"
-	"clutter_box_layout_get_vertical"
-	"clutter_box_layout_set_alignment"
 	"clutter_box_layout_set_easing_duration"
+	"clutter_box_layout_get_easing_duration"
 	"clutter_box_layout_set_easing_mode"
-	"clutter_box_layout_set_expand"
-	"clutter_box_layout_set_fill"
-	"clutter_box_layout_set_orientation"
-	"clutter_box_layout_set_use_animations"
-	"clutter_box_layout_set_vertical"
+	"clutter_box_layout_get_easing_mode"
+
 	"clutter_cairo_texture_clear"
 	"clutter_cairo_texture_get_auto_resize"
 	"clutter_cairo_texture_get_surface_size"
-- 
2.1.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 173 bytes --]

                 reply	other threads:[~2014-10-10 20:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/guile/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141010172439.26c3302d@capac \
    --to=david@altosw.be \
    --cc=guile-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).