gnomemm r1282 - in cluttermm/trunk: . clutter/src



Author: jjongsma
Date: Sun Jan 20 02:06:40 2008
New Revision: 1282
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1282&view=rev

Log:
	* clutter/src/clutter_enums.defs:
	* clutter/src/clutter_methods.defs:
	* clutter/src/clutter_signals.defs: re-generated defs
	* clutter/src/actor.hg: wrapped the new Unit-related API (e.g. get_xu()).
	It might be nice to wrap the set_xu() functions as overloaded versions of
	set_x(), but that won't work for get_xu() since you can't overload on return
	values, so I left them all with the slightly awkward naming of the C
	functions.



Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/actor.hg
   cluttermm/trunk/clutter/src/clutter_enums.defs
   cluttermm/trunk/clutter/src/clutter_methods.defs
   cluttermm/trunk/clutter/src/clutter_signals.defs

Modified: cluttermm/trunk/clutter/src/actor.hg
==============================================================================
--- cluttermm/trunk/clutter/src/actor.hg	(original)
+++ cluttermm/trunk/clutter/src/actor.hg	Sun Jan 20 02:06:40 2008
@@ -63,18 +63,29 @@
   _WRAP_METHOD(void get_geometry(ClutterGeometry *geometry), clutter_actor_get_geometry)
   _WRAP_METHOD(void get_coords(int *x_1, int *y_1, int *x_2, int *y_2) const, clutter_actor_get_coords)
   _WRAP_METHOD(void set_size(int width, int height), clutter_actor_set_size)
+  _WRAP_METHOD(void set_sizeu(Unit width, Unit height), clutter_actor_set_sizeu)
   _WRAP_METHOD(void get_position(int& x, int& y), clutter_actor_get_position)
+  _WRAP_METHOD(void get_positionu(Unit& x, Unit& y), clutter_actor_get_positionu)
   _WRAP_METHOD(void set_position(int x, int y), clutter_actor_set_position)
+  _WRAP_METHOD(void set_positionu(Unit x, Unit y), clutter_actor_set_positionu)
   _WRAP_METHOD(void get_abs_position(int& x, int& y) const, clutter_actor_get_abs_position)
   _WRAP_METHOD(guint get_width() const, clutter_actor_get_width)
+  _WRAP_METHOD(Unit get_widthu() const, clutter_actor_get_widthu)
   _WRAP_METHOD(guint get_height() const, clutter_actor_get_height)
+  _WRAP_METHOD(Unit get_heightu() const, clutter_actor_get_heightu)
   _WRAP_METHOD(void set_width(guint width), clutter_actor_set_width)
+  _WRAP_METHOD(void set_widthu(Unit width), clutter_actor_set_widthu)
   _WRAP_METHOD(void set_height(guint height), clutter_actor_set_height)
+  _WRAP_METHOD(void set_heightu(Unit height), clutter_actor_set_heightu)
 
   _WRAP_METHOD(void set_x(int x), clutter_actor_set_x)
+  _WRAP_METHOD(void set_xu(Unit x), clutter_actor_set_xu)
   _WRAP_METHOD(int get_x() const, clutter_actor_get_x)
+  _WRAP_METHOD(Unit get_xu() const, clutter_actor_get_xu)
   _WRAP_METHOD(void set_y(int y), clutter_actor_set_y)
+  _WRAP_METHOD(void set_yu(Unit y), clutter_actor_set_yu)
   _WRAP_METHOD(int get_y() const, clutter_actor_get_y)
+  _WRAP_METHOD(Unit get_yu() const, clutter_actor_get_yu)
   _WRAP_METHOD(void set_reactive(bool reactive), clutter_actor_set_reactive)
   _WRAP_METHOD(bool get_reactive() const, clutter_actor_get_reactive)
 
@@ -88,6 +99,9 @@
   _WRAP_METHOD(Glib::ustring get_name() const, clutter_actor_get_name)
   _WRAP_METHOD(guint32 get_gid() const, clutter_actor_get_gid)
   _WRAP_METHOD(void set_clip(int xoff, int yoff, int width, int height), clutter_actor_set_clip)
+  _WRAP_METHOD(void get_clip(int& xoff, int& yoff, int& width, int& height), clutter_actor_get_clip)
+  _WRAP_METHOD(void set_clipu(Unit xoff, Unit yoff, Unit width, Unit height), clutter_actor_set_clipu)
+  _WRAP_METHOD(void get_clipu(Unit& xoff, Unit& yoff, Unit& width, Unit& height), clutter_actor_get_clipu)
   _WRAP_METHOD(void remove_clip(), clutter_actor_remove_clip)
   _WRAP_METHOD(bool has_clip() const, clutter_actor_has_clip)
   _WRAP_METHOD(void set_parent(const Glib::RefPtr<Actor>& parent), clutter_actor_set_parent)
@@ -100,7 +114,9 @@
   _WRAP_METHOD(void raise_top (), clutter_actor_raise_top)
   _WRAP_METHOD(void lower_bottom(), clutter_actor_lower_bottom)
   _WRAP_METHOD(void set_depth(int depth), clutter_actor_set_depth)
+  _WRAP_METHOD(void set_depthu(Unit depth), clutter_actor_set_depthu)
   _WRAP_METHOD(int get_depth() const, clutter_actor_get_depth)
+  _WRAP_METHOD(Unit get_depthu() const, clutter_actor_get_depthu)
   _WRAP_METHOD(void set_scalex(Fixed scale_x, Fixed scale_y), clutter_actor_set_scalex)
   _WRAP_METHOD(void set_scale(double scale_x, double scale_y), clutter_actor_set_scale)
   _WRAP_METHOD(void get_scalex(Fixed& scale_x, Fixed& scale_y) const, clutter_actor_get_scalex)
@@ -112,7 +128,9 @@
 
   _WRAP_METHOD(void get_abs_size(guint& width, guint& height) const, clutter_actor_get_abs_size)
   _WRAP_METHOD(void get_size(guint& width, guint& height) const, clutter_actor_get_size)
+  _WRAP_METHOD(void get_sizeu(Unit& width, Unit& height) const, clutter_actor_get_sizeu)
   _WRAP_METHOD(void move_by(int dx, int dy), clutter_actor_move_by)
+  _WRAP_METHOD(void move_byu(Unit dx, Unit dy), clutter_actor_move_byu)
 
   //TODO: _WRAP_METHOD(void get_vertices(ClutterVertex verts[4]) const, clutter_actor_get_vertices)
 
@@ -120,6 +138,7 @@
 #m4 _CONVERSION(`const ClutterVertex&',`ClutterVertex*',`const_cast<ClutterVertex*>(&($3))')
 #m4 _CONVERSION(`ClutterVertex&',`ClutterVertex*',`&($3)')
   _WRAP_METHOD(void apply_transform_to_point(const ClutterVertex& point, ClutterVertex& vertex), clutter_actor_apply_transform_to_point)
+  _WRAP_METHOD(void transform_stage_point(Unit x, Unit y, Unit& x_out, Unit& y_out), clutter_actor_transform_stage_point)
 
 
   _WRAP_METHOD(bool event(ClutterEvent* event, bool capture), clutter_actor_event)
@@ -128,8 +147,8 @@
 
   _WRAP_METHOD(void set_anchor_point(int anchor_x, int anchor_y), clutter_actor_set_anchor_point)
   _WRAP_METHOD(void get_anchor_point(int& anchor_x, int& anchor_y) const, clutter_actor_get_anchor_point)
-  _WRAP_METHOD(void set_anchor_pointu(ClutterUnit anchor_x, ClutterUnit anchor_y), clutter_actor_set_anchor_pointu)
-  _WRAP_METHOD(void get_anchor_pointu(ClutterUnit& anchor_x, ClutterUnit& anchor_y), clutter_actor_get_anchor_pointu)
+  _WRAP_METHOD(void set_anchor_pointu(Unit anchor_x, Unit anchor_y), clutter_actor_set_anchor_pointu)
+  _WRAP_METHOD(void get_anchor_pointu(Unit& anchor_x, Unit& anchor_y), clutter_actor_get_anchor_pointu)
   _WRAP_METHOD(void set_anchor_point_from_gravity(ClutterGravity gravity), clutter_actor_set_anchor_point_from_gravity)
 
 // signals

Modified: cluttermm/trunk/clutter/src/clutter_enums.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_enums.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_enums.defs	Sun Jan 20 02:06:40 2008
@@ -138,6 +138,18 @@
   )
 )
 
+;; From /opt/gnome2/include/clutter-0.5/clutter/clutter-shader.h
+
+(define-enum-extended ShaderError
+  (in-module "Clutter")
+  (c-name "ClutterShaderError")
+  (values
+    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM" "0")
+    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL" "1")
+    '("compile" "CLUTTER_SHADER_ERROR_COMPILE" "2")
+  )
+)
+
 ;; From /opt/gnome2/include/clutter-0.5/clutter/clutter-texture.h
 
 (define-enum-extended TextureError

Modified: cluttermm/trunk/clutter/src/clutter_methods.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_methods.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_methods.defs	Sun Jan 20 02:06:40 2008
@@ -179,6 +179,13 @@
   (gtype-id "CLUTTER_TYPE_SCRIPTABLE")
 )
 
+(define-object Shader
+  (in-module "Clutter")
+  (parent "GObject")
+  (c-name "ClutterShader")
+  (gtype-id "CLUTTER_TYPE_SHADER")
+)
+
 (define-object Stage
   (in-module "Clutter")
   (parent "ClutterGroup")
@@ -316,6 +323,7 @@
     '("stage-static" "CLUTTER_FEATURE_STAGE_STATIC")
     '("stage-user-resize" "CLUTTER_FEATURE_STAGE_USER_RESIZE")
     '("stage-cursor" "CLUTTER_FEATURE_STAGE_CURSOR")
+    '("shaders-glsl" "CLUTTER_FEATURE_SHADERS_GLSL")
   )
 )
 
@@ -356,6 +364,17 @@
   )
 )
 
+(define-enum ShaderError
+  (in-module "Clutter")
+  (c-name "ClutterShaderError")
+  (gtype-id "CLUTTER_TYPE_SHADER_ERROR")
+  (values
+    '("no-asm" "CLUTTER_SHADER_ERROR_NO_ASM")
+    '("no-glsl" "CLUTTER_SHADER_ERROR_NO_GLSL")
+    '("compile" "CLUTTER_SHADER_ERROR_COMPILE")
+  )
+)
+
 (define-enum TextureError
   (in-module "Clutter")
   (c-name "ClutterTextureError")
@@ -560,6 +579,46 @@
   )
 )
 
+(define-method set_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_sizeu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "width")
+    '("ClutterUnit" "height")
+  )
+)
+
+(define-method get_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_size")
+  (return-type "none")
+  (parameters
+    '("guint*" "width")
+    '("guint*" "height")
+  )
+)
+
+(define-method get_sizeu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_sizeu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
+  )
+)
+
+(define-method get_abs_size
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_abs_size")
+  (return-type "none")
+  (parameters
+    '("guint*" "width")
+    '("guint*" "height")
+  )
+)
+
 (define-method set_position
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_position")
@@ -570,6 +629,16 @@
   )
 )
 
+(define-method set_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_positionu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
+  )
+)
+
 (define-method get_position
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_position")
@@ -580,6 +649,16 @@
   )
 )
 
+(define-method get_positionu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_positionu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "x")
+    '("ClutterUnit*" "y")
+  )
+)
+
 (define-method get_abs_position
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_abs_position")
@@ -596,12 +675,24 @@
   (return-type "guint")
 )
 
+(define-method get_widthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_widthu")
+  (return-type "ClutterUnit")
+)
+
 (define-method get_height
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_height")
   (return-type "guint")
 )
 
+(define-method get_heightu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_heightu")
+  (return-type "ClutterUnit")
+)
+
 (define-method set_width
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_width")
@@ -611,6 +702,15 @@
   )
 )
 
+(define-method set_widthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_widthu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "width")
+  )
+)
+
 (define-method set_height
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_height")
@@ -620,18 +720,39 @@
   )
 )
 
+(define-method set_heightu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_heightu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "height")
+  )
+)
+
 (define-method get_x
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_x")
   (return-type "gint")
 )
 
+(define-method get_xu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_xu")
+  (return-type "ClutterUnit")
+)
+
 (define-method get_y
   (of-object "ClutterActor")
   (c-name "clutter_actor_get_y")
   (return-type "gint")
 )
 
+(define-method get_yu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_yu")
+  (return-type "ClutterUnit")
+)
+
 (define-method set_x
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_x")
@@ -641,6 +762,15 @@
   )
 )
 
+(define-method set_xu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_xu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "x")
+  )
+)
+
 (define-method set_y
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_y")
@@ -650,6 +780,15 @@
   )
 )
 
+(define-method set_yu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_yu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "y")
+  )
+)
+
 (define-method set_rotation
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_rotation")
@@ -748,6 +887,18 @@
   )
 )
 
+(define-method set_clipu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_clipu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "xoff")
+    '("ClutterUnit" "yoff")
+    '("ClutterUnit" "width")
+    '("ClutterUnit" "height")
+  )
+)
+
 (define-method remove_clip
   (of-object "ClutterActor")
   (c-name "clutter_actor_remove_clip")
@@ -772,6 +923,18 @@
   )
 )
 
+(define-method get_clipu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_clipu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "xoff")
+    '("ClutterUnit*" "yoff")
+    '("ClutterUnit*" "width")
+    '("ClutterUnit*" "height")
+  )
+)
+
 (define-method set_parent
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_parent")
@@ -847,6 +1010,21 @@
   (return-type "gint")
 )
 
+(define-method set_depthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_depthu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "depth")
+  )
+)
+
+(define-method get_depthu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_depthu")
+  (return-type "ClutterUnit")
+)
+
 (define-method set_reactive
   (of-object "ClutterActor")
   (c-name "clutter_actor_set_reactive")
@@ -902,55 +1080,23 @@
   )
 )
 
-(define-method set_scale_with_gravityx
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scale_with_gravityx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "scale_x")
-    '("ClutterFixed" "scale_y")
-    '("ClutterGravity" "gravity")
-  )
-)
-
-(define-method set_scale_with_gravity
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_set_scale_with_gravity")
-  (return-type "none")
-  (parameters
-    '("gfloat" "scale_x")
-    '("gfloat" "scale_y")
-    '("ClutterGravity" "gravity")
-  )
-)
-
-(define-method get_abs_size
-  (of-object "ClutterActor")
-  (c-name "clutter_actor_get_abs_size")
-  (return-type "none")
-  (parameters
-    '("guint*" "width")
-    '("guint*" "height")
-  )
-)
-
-(define-method get_size
+(define-method move_by
   (of-object "ClutterActor")
-  (c-name "clutter_actor_get_size")
+  (c-name "clutter_actor_move_by")
   (return-type "none")
   (parameters
-    '("guint*" "width")
-    '("guint*" "height")
+    '("gint" "dx")
+    '("gint" "dy")
   )
 )
 
-(define-method move_by
+(define-method move_byu
   (of-object "ClutterActor")
-  (c-name "clutter_actor_move_by")
+  (c-name "clutter_actor_move_byu")
   (return-type "none")
   (parameters
-    '("gint" "dx")
-    '("gint" "dy")
+    '("ClutterUnit" "dx")
+    '("ClutterUnit" "dy")
   )
 )
 
@@ -997,6 +1143,86 @@
   (return-type "gboolean")
 )
 
+(define-method apply_shader
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_apply_shader")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterShader*" "shader")
+  )
+)
+
+(define-method set_shader_param
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_shader_param")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "param")
+    '("gfloat" "value")
+  )
+)
+
+(define-method set_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_point")
+  (return-type "none")
+  (parameters
+    '("gint" "anchor_x")
+    '("gint" "anchor_y")
+  )
+)
+
+(define-method get_anchor_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_point")
+  (return-type "none")
+  (parameters
+    '("gint*" "anchor_x")
+    '("gint*" "anchor_y")
+  )
+)
+
+(define-method set_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_set_anchor_pointu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit" "anchor_x")
+    '("ClutterUnit" "anchor_y")
+  )
+)
+
+(define-method get_anchor_pointu
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_get_anchor_pointu")
+  (return-type "none")
+  (parameters
+    '("ClutterUnit*" "anchor_x")
+    '("ClutterUnit*" "anchor_y")
+  )
+)
+
+(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 transform_stage_point
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_transform_stage_point")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterUnit" "x")
+    '("ClutterUnit" "y")
+    '("ClutterUnit*" "x_out")
+    '("ClutterUnit*" "y_out")
+  )
+)
+
 
 
 ;; From clutter-alpha.h
@@ -1446,14 +1672,14 @@
   (c-name "clutter_behaviour_ellipse_set_angle_startx")
   (return-type "none")
   (parameters
-    '("ClutterAngle" "angle_start")
+    '("ClutterFixed" "angle_start")
   )
 )
 
 (define-method get_angle_startx
   (of-object "ClutterBehaviourEllipse")
   (c-name "clutter_behaviour_ellipse_get_angle_startx")
-  (return-type "ClutterAngle")
+  (return-type "ClutterFixed")
 )
 
 (define-method get_angle_start
@@ -1467,7 +1693,7 @@
   (c-name "clutter_behaviour_ellipse_set_angle_endx")
   (return-type "none")
   (parameters
-    '("ClutterAngle" "angle_end")
+    '("ClutterFixed" "angle_end")
   )
 )
 
@@ -1483,7 +1709,7 @@
 (define-method get_angle_endx
   (of-object "ClutterBehaviourEllipse")
   (c-name "clutter_behaviour_ellipse_get_angle_endx")
-  (return-type "ClutterAngle")
+  (return-type "ClutterFixed")
 )
 
 (define-method get_angle_end
@@ -1498,7 +1724,7 @@
   (return-type "none")
   (parameters
     '("ClutterRotateAxis" "axis")
-    '("ClutterAngle" "angle_tilt")
+    '("ClutterFixed" "angle_tilt")
   )
 )
 
@@ -1515,7 +1741,7 @@
 (define-method get_angle_tiltx
   (of-object "ClutterBehaviourEllipse")
   (c-name "clutter_behaviour_ellipse_get_angle_tiltx")
-  (return-type "ClutterAngle")
+  (return-type "ClutterFixed")
   (parameters
     '("ClutterRotateAxis" "axis")
   )
@@ -1546,9 +1772,9 @@
   (c-name "clutter_behaviour_ellipse_set_tiltx")
   (return-type "none")
   (parameters
-    '("ClutterAngle" "angle_tilt_x")
-    '("ClutterAngle" "angle_tilt_y")
-    '("ClutterAngle" "angle_tilt_z")
+    '("ClutterFixed" "angle_tilt_x")
+    '("ClutterFixed" "angle_tilt_y")
+    '("ClutterFixed" "angle_tilt_z")
   )
 )
 
@@ -1568,9 +1794,9 @@
   (c-name "clutter_behaviour_ellipse_get_tiltx")
   (return-type "none")
   (parameters
-    '("ClutterAngle*" "angle_tilt_x")
-    '("ClutterAngle*" "angle_tilt_y")
-    '("ClutterAngle*" "angle_tilt_z")
+    '("ClutterFixed*" "angle_tilt_x")
+    '("ClutterFixed*" "angle_tilt_y")
+    '("ClutterFixed*" "angle_tilt_z")
   )
 )
 
@@ -1697,6 +1923,26 @@
   )
 )
 
+(define-method set_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_set_bounds")
+  (return-type "none")
+  (parameters
+    '("guint8" "opacity_start")
+    '("guint8" "opacity_end")
+  )
+)
+
+(define-method get_bounds
+  (of-object "ClutterBehaviourOpacity")
+  (c-name "clutter_behaviour_opacity_get_bounds")
+  (return-type "none")
+  (parameters
+    '("guint8*" "opacity_start")
+    '("guint8*" "opacity_end")
+  )
+)
+
 
 
 ;; From clutter-behaviour-path.h
@@ -1908,8 +2154,10 @@
   (return-type "ClutterBehaviour*")
   (parameters
     '("ClutterAlpha*" "alpha")
-    '("gdouble" "scale_start")
-    '("gdouble" "scale_end")
+    '("gdouble" "x_scale_start")
+    '("gdouble" "y_scale_start")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
     '("ClutterGravity" "gravity")
   )
 )
@@ -1919,19 +2167,47 @@
   (return-type "ClutterBehaviour*")
   (parameters
     '("ClutterAlpha*" "alpha")
-    '("ClutterFixed" "scale_start")
-    '("ClutterFixed" "scale_end")
+    '("ClutterFixed" "x_scale_start")
+    '("ClutterFixed" "y_scale_start")
+    '("ClutterFixed" "x_scale_end")
+    '("ClutterFixed" "y_scale_end")
     '("ClutterGravity" "gravity")
   )
 )
 
+(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 set_boundsx
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_boundsx")
+  (return-type "none")
+  (parameters
+    '("ClutterFixed" "x_scale_start")
+    '("ClutterFixed" "y_scale_start")
+    '("ClutterFixed" "x_scale_end")
+    '("ClutterFixed" "y_scale_end")
+  )
+)
+
 (define-method get_bounds
   (of-object "ClutterBehaviourScale")
   (c-name "clutter_behaviour_scale_get_bounds")
   (return-type "none")
   (parameters
-    '("gdouble*" "scale_start")
-    '("gdouble*" "scale_end")
+    '("gdouble*" "x_scale_start")
+    '("gdouble*" "y_scale_start")
+    '("gdouble*" "x_scale_end")
+    '("gdouble*" "y_scale_end")
   )
 )
 
@@ -1940,8 +2216,19 @@
   (c-name "clutter_behaviour_scale_get_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "scale_start")
-    '("ClutterFixed*" "scale_end")
+    '("ClutterFixed*" "x_scale_start")
+    '("ClutterFixed*" "y_scale_start")
+    '("ClutterFixed*" "x_scale_end")
+    '("ClutterFixed*" "y_scale_end")
+  )
+)
+
+(define-method set_gravity
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_gravity")
+  (return-type "none")
+  (parameters
+    '("ClutterGravity" "gravity")
   )
 )
 
@@ -2422,6 +2709,18 @@
   )
 )
 
+(define-method construct
+  (of-object "ClutterEffectTemplate")
+  (c-name "clutter_effect_template_construct")
+  (return-type "none")
+  (parameters
+    '("ClutterTimeline*" "timeline")
+    '("ClutterAlphaFunc" "alpha_func")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
+  )
+)
+
 (define-method set_timeline_clone
   (of-object "ClutterEffectTemplate")
   (c-name "clutter_effect_template_set_timeline_clone")
@@ -2443,10 +2742,9 @@
   (parameters
     '("ClutterEffectTemplate*" "template_")
     '("ClutterActor*" "actor")
-    '("guint8" "opacity_start")
     '("guint8" "opacity_end")
-    '("ClutterEffectCompleteFunc" "completed_func")
-    '("gpointer" "completed_data")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
@@ -2456,10 +2754,9 @@
   (parameters
     '("ClutterEffectTemplate*" "template_")
     '("ClutterActor*" "actor")
-    '("gint" "depth_start")
     '("gint" "depth_end")
-    '("ClutterEffectCompleteFunc" "completed_func")
-    '("gpointer" "completed_data")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
@@ -2469,72 +2766,54 @@
   (parameters
     '("ClutterEffectTemplate*" "template_")
     '("ClutterActor*" "actor")
-    '("const-ClutterKnot*" "knots")
-    '("guint" "n_knots")
-    '("ClutterEffectCompleteFunc" "completed_func")
-    '("gpointer" "completed_data")
+    '("gint" "x")
+    '("gint" "y")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_effect_scale
-  (c-name "clutter_effect_scale")
-  (return-type "ClutterTimeline*")
-  (parameters
-    '("ClutterEffectTemplate*" "template_")
-    '("ClutterActor*" "actor")
-    '("gdouble" "scale_start")
-    '("gdouble" "scale_end")
-    '("ClutterGravity" "gravity")
-    '("ClutterEffectCompleteFunc" "completed_func")
-    '("gpointer" "completed_data")
-  )
-)
-
-(define-function clutter_effect_rotate_x
-  (c-name "clutter_effect_rotate_x")
+(define-function clutter_effect_path
+  (c-name "clutter_effect_path")
   (return-type "ClutterTimeline*")
   (parameters
     '("ClutterEffectTemplate*" "template_")
     '("ClutterActor*" "actor")
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
-    '("gint" "center_y")
-    '("gint" "center_z")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterEffectCompleteFunc" "completed_func")
-    '("gpointer" "completed_data")
+    '("const-ClutterKnot*" "knots")
+    '("guint" "n_knots")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_effect_rotate_y
-  (c-name "clutter_effect_rotate_y")
+(define-function clutter_effect_scale
+  (c-name "clutter_effect_scale")
   (return-type "ClutterTimeline*")
   (parameters
     '("ClutterEffectTemplate*" "template_")
     '("ClutterActor*" "actor")
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
-    '("gint" "center_x")
-    '("gint" "center_z")
-    '("ClutterRotateDirection" "direction")
-    '("ClutterEffectCompleteFunc" "completed_func")
-    '("gpointer" "completed_data")
+    '("gdouble" "x_scale_end")
+    '("gdouble" "y_scale_end")
+    '("ClutterGravity" "gravity")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function clutter_effect_rotate_z
-  (c-name "clutter_effect_rotate_z")
+(define-function clutter_effect_rotate
+  (c-name "clutter_effect_rotate")
   (return-type "ClutterTimeline*")
   (parameters
     '("ClutterEffectTemplate*" "template_")
     '("ClutterActor*" "actor")
-    '("gdouble" "angle_start")
-    '("gdouble" "angle_end")
+    '("ClutterRotateAxis" "axis")
+    '("gdouble" "angle")
     '("gint" "center_x")
     '("gint" "center_y")
+    '("gint" "center_z")
     '("ClutterRotateDirection" "direction")
-    '("ClutterEffectCompleteFunc" "completed_func")
-    '("gpointer" "completed_data")
+    '("ClutterEffectCompleteFunc" "func")
+    '("gpointer" "data")
   )
 )
 
@@ -2772,11 +3051,6 @@
   (return-type "GType")
 )
 
-(define-function clutter_pack_type_get_type
-  (c-name "clutter_pack_type_get_type")
-  (return-type "GType")
-)
-
 (define-function clutter_modifier_type_get_type
   (c-name "clutter_modifier_type_get_type")
   (return-type "GType")
@@ -2807,11 +3081,6 @@
   (return-type "GType")
 )
 
-(define-function clutter_layout_flags_get_type
-  (c-name "clutter_layout_flags_get_type")
-  (return-type "GType")
-)
-
 (define-function clutter_init_error_get_type
   (c-name "clutter_init_error_get_type")
   (return-type "GType")
@@ -2822,6 +3091,11 @@
   (return-type "GType")
 )
 
+(define-function clutter_shader_error_get_type
+  (c-name "clutter_shader_error_get_type")
+  (return-type "GType")
+)
+
 (define-function clutter_texture_error_get_type
   (c-name "clutter_texture_error_get_type")
   (return-type "GType")
@@ -2931,6 +3205,12 @@
   )
 )
 
+(define-method get_source
+  (of-object "ClutterEvent")
+  (c-name "clutter_event_get_source")
+  (return-type "ClutterActor*")
+)
+
 (define-method symbol
   (of-object "ClutterKeyEvent")
   (c-name "clutter_key_event_symbol")
@@ -2963,12 +3243,6 @@
   )
 )
 
-(define-method get_source
-  (of-object "ClutterEvent")
-  (c-name "clutter_event_get_source")
-  (return-type "ClutterActor*")
-)
-
 
 
 ;; From clutter-feature.h
@@ -3095,15 +3369,6 @@
   (return-type "none")
 )
 
-(define-method add
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_add")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
 (define-method add_many
   (of-object "ClutterGroup")
   (c-name "clutter_group_add_many")
@@ -3133,15 +3398,6 @@
   )
 )
 
-(define-method find_child_by_id
-  (of-object "ClutterGroup")
-  (c-name "clutter_group_find_child_by_id")
-  (return-type "ClutterActor*")
-  (parameters
-    '("guint" "id")
-  )
-)
-
 (define-method raise
   (of-object "ClutterGroup")
   (c-name "clutter_group_raise")
@@ -3447,6 +3703,35 @@
 
 
 
+;; From clutter-list-model.h
+
+(define-function clutter_list_model_get_type
+  (c-name "clutter_list_model_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_list_model_new
+  (c-name "clutter_list_model_new")
+  (is-constructor-of "ClutterListModel")
+  (return-type "ClutterModel*")
+  (parameters
+    '("guint" "n_columns")
+  )
+  (varargs #t)
+)
+
+(define-function clutter_list_model_newv
+  (c-name "clutter_list_model_newv")
+  (return-type "ClutterModel*")
+  (parameters
+    '("guint" "n_columns")
+    '("GType*" "types")
+    '("const-gchar*-const[]" "names")
+  )
+)
+
+
+
 ;; From clutter-main.h
 
 (define-function clutter_init_error_quark
@@ -3760,16 +4045,21 @@
 
 
 
-;; From clutter-model.h
+;; From clutter-model-default.h
 
-(define-function clutter_model_get_type
-  (c-name "clutter_model_get_type")
+(define-function clutter_model_default_iter_get_type
+  (c-name "clutter_model_default_iter_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_model_default_get_type
+  (c-name "clutter_model_default_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_model_new
-  (c-name "clutter_model_new")
-  (is-constructor-of "ClutterModel")
+(define-function clutter_model_default_new
+  (c-name "clutter_model_default_new")
+  (is-constructor-of "ClutterModelDefault")
   (return-type "ClutterModel*")
   (parameters
     '("guint" "n_columns")
@@ -3777,15 +4067,25 @@
   (varargs #t)
 )
 
-(define-function clutter_model_newv
-  (c-name "clutter_model_newv")
+(define-function clutter_model_default_newv
+  (c-name "clutter_model_default_newv")
   (return-type "ClutterModel*")
   (parameters
     '("guint" "n_columns")
     '("GType*" "types")
+    '("const-gchar*-const[]" "names")
   )
 )
 
+
+
+;; From clutter-model.h
+
+(define-function clutter_model_get_type
+  (c-name "clutter_model_get_type")
+  (return-type "GType")
+)
+
 (define-method set_types
   (of-object "ClutterModel")
   (c-name "clutter_model_set_types")
@@ -3796,40 +4096,84 @@
   )
 )
 
+(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 "gboolean")
+  (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 "gboolean")
+  (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 "gboolean")
+  (return-type "none")
   (parameters
-    '("guint" "index_")
+    '("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 "gboolean")
+  (return-type "none")
   (parameters
-    '("guint" "index_")
+    '("guint" "row")
     '("guint" "column")
     '("const-GValue*" "value")
   )
@@ -3840,7 +4184,7 @@
   (c-name "clutter_model_remove")
   (return-type "none")
   (parameters
-    '("guint" "index_")
+    '("guint" "row")
   )
 )
 
@@ -3850,6 +4194,30 @@
   (return-type "guint")
 )
 
+(define-method get_n_columns
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_n_columns")
+  (return-type "guint")
+)
+
+(define-method get_column_name
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_column_name")
+  (return-type "const-gchar*")
+  (parameters
+    '("guint" "column")
+  )
+)
+
+(define-method get_column_type
+  (of-object "ClutterModel")
+  (c-name "clutter_model_get_column_type")
+  (return-type "GType")
+  (parameters
+    '("guint" "column")
+  )
+)
+
 (define-method get_first_iter
   (of-object "ClutterModel")
   (c-name "clutter_model_get_first_iter")
@@ -3867,7 +4235,7 @@
   (c-name "clutter_model_get_iter_at_row")
   (return-type "ClutterModelIter*")
   (parameters
-    '("guint" "index_")
+    '("guint" "row")
   )
 )
 
@@ -3876,14 +4244,14 @@
   (c-name "clutter_model_set_sorting_column")
   (return-type "none")
   (parameters
-    '("guint" "column")
+    '("gint" "column")
   )
 )
 
 (define-method get_sorting_column
   (of-object "ClutterModel")
   (c-name "clutter_model_get_sorting_column")
-  (return-type "guint")
+  (return-type "gint")
 )
 
 (define-method foreach
@@ -3919,6 +4287,30 @@
   )
 )
 
+(define-method resort
+  (of-object "ClutterModel")
+  (c-name "clutter_model_resort")
+  (return-type "none")
+)
+
+(define-method filter_row
+  (of-object "ClutterModel")
+  (c-name "clutter_model_filter_row")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "row")
+  )
+)
+
+(define-method filter_iter
+  (of-object "ClutterModel")
+  (c-name "clutter_model_filter_iter")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterModelIter*" "iter")
+  )
+)
+
 (define-function clutter_model_iter_get_type
   (c-name "clutter_model_iter_get_type")
   (return-type "GType")
@@ -4120,71 +4512,76 @@
   (return-type "gboolean")
 )
 
-(define-method rewind
+(define-method append
   (of-object "ClutterScore")
-  (c-name "clutter_score_rewind")
-  (return-type "none")
+  (c-name "clutter_score_append")
+  (return-type "guint")
+  (parameters
+    '("ClutterTimeline*" "parent")
+    '("ClutterTimeline*" "timeline")
+  )
 )
 
-(define-method is_playing
+(define-method remove
   (of-object "ClutterScore")
-  (c-name "clutter_score_is_playing")
-  (return-type "gboolean")
+  (c-name "clutter_score_remove")
+  (return-type "none")
+  (parameters
+    '("guint" "id")
+  )
 )
 
-(define-method start
+(define-method remove_all
   (of-object "ClutterScore")
-  (c-name "clutter_score_start")
+  (c-name "clutter_score_remove_all")
   (return-type "none")
 )
 
-(define-method stop
+(define-method get_timeline
   (of-object "ClutterScore")
-  (c-name "clutter_score_stop")
-  (return-type "none")
+  (c-name "clutter_score_get_timeline")
+  (return-type "ClutterTimeline*")
+  (parameters
+    '("guint" "id")
+  )
 )
 
-(define-method pause
+(define-method list_timelines
   (of-object "ClutterScore")
-  (c-name "clutter_score_pause")
-  (return-type "none")
+  (c-name "clutter_score_list_timelines")
+  (return-type "GSList*")
 )
 
-(define-method append
+(define-method start
   (of-object "ClutterScore")
-  (c-name "clutter_score_append")
+  (c-name "clutter_score_start")
   (return-type "none")
-  (parameters
-    '("ClutterTimeline*" "timeline_existing")
-    '("ClutterTimeline*" "timeline_new")
-  )
 )
 
-(define-method add
+(define-method stop
   (of-object "ClutterScore")
-  (c-name "clutter_score_add")
+  (c-name "clutter_score_stop")
   (return-type "none")
-  (parameters
-    '("ClutterTimeline*" "timeline")
-  )
 )
 
-(define-method remove
+(define-method pause
   (of-object "ClutterScore")
-  (c-name "clutter_score_remove")
+  (c-name "clutter_score_pause")
   (return-type "none")
-  (parameters
-    '("ClutterTimeline*" "timeline_parent")
-    '("ClutterTimeline*" "timeline")
-  )
 )
 
-(define-method remove_all
+(define-method rewind
   (of-object "ClutterScore")
-  (c-name "clutter_score_remove_all")
+  (c-name "clutter_score_rewind")
   (return-type "none")
 )
 
+(define-method is_playing
+  (of-object "ClutterScore")
+  (c-name "clutter_score_is_playing")
+  (return-type "gboolean")
+)
+
 
 
 ;; From clutter-scriptable.h
@@ -4268,7 +4665,7 @@
   (return-type "guint")
   (parameters
     '("const-gchar*" "data")
-    '("gsize" "length")
+    '("gssize" "length")
     '("GError**" "error")
   )
 )
@@ -4345,23 +4742,119 @@
 
 
 
-;; From clutter-stage.h
+;; From clutter-shader.h
 
-(define-function clutter_perspective_get_type
-  (c-name "clutter_perspective_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-method copy
-  (of-object "ClutterPerspective")
-  (c-name "clutter_perspective_copy")
-  (return-type "ClutterPerspective*")
+(define-function clutter_shader_new
+  (c-name "clutter_shader_new")
+  (is-constructor-of "ClutterShader")
+  (return-type "ClutterShader*")
 )
 
-(define-method free
-  (of-object "ClutterPerspective")
-  (c-name "clutter_perspective_free")
+(define-method set_is_enabled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_is_enabled")
+  (return-type "none")
+  (parameters
+    '("gboolean" "enabled")
+  )
+)
+
+(define-method get_is_enabled
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_is_enabled")
+  (return-type "gboolean")
+)
+
+(define-method bind
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_bind")
+  (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
+)
+
+(define-method release
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_release")
+  (return-type "none")
+)
+
+(define-method is_bound
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_is_bound")
+  (return-type "gboolean")
+)
+
+(define-method set_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_vertex_source")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "data")
+    '("gssize" "length")
+  )
+)
+
+(define-method set_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_fragment_source")
   (return-type "none")
+  (parameters
+    '("const-gchar*" "data")
+    '("gssize" "length")
+  )
+)
+
+(define-method get_vertex_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_vertex_source")
+  (return-type "const-gchar*")
+)
+
+(define-method get_fragment_source
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_get_fragment_source")
+  (return-type "const-gchar*")
+)
+
+(define-method set_uniform_1f
+  (of-object "ClutterShader")
+  (c-name "clutter_shader_set_uniform_1f")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("gfloat" "value")
+  )
+)
+
+(define-function clutter_shader_release_all
+  (c-name "clutter_shader_release_all")
+  (return-type "none")
+)
+
+
+
+;; From clutter-stage.h
+
+(define-function clutter_perspective_get_type
+  (c-name "clutter_perspective_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_fog_get_type
+  (c-name "clutter_fog_get_type")
+  (return-type "GType")
 )
 
 (define-function clutter_stage_get_type
@@ -4519,6 +5012,73 @@
   (return-type "gboolean")
 )
 
+(define-method set_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_use_fog")
+  (return-type "none")
+  (parameters
+    '("gboolean" "fog")
+  )
+)
+
+(define-method get_use_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_use_fog")
+  (return-type "gboolean")
+)
+
+(define-method set_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_fog")
+  (return-type "none")
+  (parameters
+    '("gdouble" "density")
+    '("gdouble" "z_near")
+    '("gdouble" "z_far")
+  )
+)
+
+(define-method get_fog
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_fog")
+  (return-type "none")
+  (parameters
+    '("gdouble*" "density")
+    '("gdouble*" "z_near")
+    '("gdouble*" "z_far")
+  )
+)
+
+(define-method set_fogx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_set_fogx")
+  (return-type "none")
+  (parameters
+    '("ClutterFog*" "fog")
+  )
+)
+
+(define-method get_fogx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_fogx")
+  (return-type "none")
+  (parameters
+    '("ClutterFog*" "fog")
+  )
+)
+
+(define-method get_resolution
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_resolution")
+  (return-type "gdouble")
+)
+
+(define-method get_resolutionx
+  (of-object "ClutterStage")
+  (c-name "clutter_stage_get_resolutionx")
+  (return-type "ClutterFixed")
+)
+
 (define-method set_key_focus
   (of-object "ClutterStage")
   (c-name "clutter_stage_set_key_focus")
@@ -4578,6 +5138,24 @@
   )
 )
 
+(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_from_yuv_data
   (of-object "ClutterTexture")
   (c-name "clutter_texture_set_from_yuv_data")
@@ -4861,6 +5439,15 @@
   (return-type "guint")
 )
 
+(define-method get_delta
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_delta")
+  (return-type "guint")
+  (parameters
+    '("guint*" "msecs")
+  )
+)
+
 
 
 ;; From clutter-timeout-pool.h
@@ -4935,16 +5522,6 @@
   )
 )
 
-(define-function clutter_margin_get_type
-  (c-name "clutter_margin_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_padding_get_type
-  (c-name "clutter_padding_get_type")
-  (return-type "GType")
-)
-
 
 
 ;; From clutter-units.h
@@ -5182,7 +5759,10 @@
   (c-name "cogl_clip_set")
   (return-type "none")
   (parameters
-    '("const-ClutterGeometry*" "clip")
+    '("ClutterFixed" "x_offset")
+    '("ClutterFixed" "y_offset")
+    '("ClutterFixed" "width")
+    '("ClutterFixed" "height")
   )
 )
 
@@ -5387,6 +5967,126 @@
   )
 )
 
+(define-function cogl_fog_set
+  (c-name "cogl_fog_set")
+  (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "fog_color")
+    '("ClutterFixed" "density")
+    '("ClutterFixed" "z_near")
+    '("ClutterFixed" "z_far")
+  )
+)
+
+(define-function cogl_create_shader
+  (c-name "cogl_create_shader")
+  (return-type "COGLhandle")
+  (parameters
+    '("COGLenum" "shaderType")
+  )
+)
+
+(define-function cogl_shader_destroy
+  (c-name "cogl_shader_destroy")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "handle")
+  )
+)
+
+(define-function cogl_shader_source
+  (c-name "cogl_shader_source")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "shader")
+    '("const-gchar*" "source")
+  )
+)
+
+(define-function cogl_shader_compile
+  (c-name "cogl_shader_compile")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "shader_handle")
+  )
+)
+
+(define-function cogl_shader_get_info_log
+  (c-name "cogl_shader_get_info_log")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "handle")
+    '("guint" "size")
+    '("gchar*" "buffer")
+  )
+)
+
+(define-function cogl_shader_get_parameteriv
+  (c-name "cogl_shader_get_parameteriv")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "handle")
+    '("COGLenum" "pname")
+    '("COGLint*" "dest")
+  )
+)
+
+(define-function cogl_create_program
+  (c-name "cogl_create_program")
+  (return-type "COGLhandle")
+)
+
+(define-function cogl_program_destroy
+  (c-name "cogl_program_destroy")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "handle")
+  )
+)
+
+(define-function cogl_program_attach_shader
+  (c-name "cogl_program_attach_shader")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "program_handle")
+    '("COGLhandle" "shader_handle")
+  )
+)
+
+(define-function cogl_program_link
+  (c-name "cogl_program_link")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "program_handle")
+  )
+)
+
+(define-function cogl_program_use
+  (c-name "cogl_program_use")
+  (return-type "none")
+  (parameters
+    '("COGLhandle" "program_handle")
+  )
+)
+
+(define-function cogl_program_get_uniform_location
+  (c-name "cogl_program_get_uniform_location")
+  (return-type "COGLint")
+  (parameters
+    '("COGLhandle" "program_int")
+    '("const-gchar*" "uniform_name")
+  )
+)
+
+(define-function cogl_program_uniform_1f
+  (c-name "cogl_program_uniform_1f")
+  (return-type "none")
+  (parameters
+    '("COGLint" "uniform_no")
+    '("gfloat" "value")
+  )
+)
+
 
 
 ;; From pangoclutter.h

Modified: cluttermm/trunk/clutter/src/clutter_signals.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_signals.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_signals.defs	Sun Jan 20 02:06:40 2008
@@ -129,6 +129,15 @@
   )
 )
 
+(define-property name
+  (of-object "ClutterActor")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property x
   (of-object "ClutterActor")
   (prop-type "GParamInt")
@@ -201,19 +210,19 @@
   (construct-only #f)
 )
 
-(define-property name
+(define-property visible
   (of-object "ClutterActor")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
+(define-property reactive
   (of-object "ClutterActor")
   (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (docs "Whether the actor is reactive to events or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -237,10 +246,55 @@
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-angle-x
   (of-object "ClutterActor")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-y
+  (of-object "ClutterActor")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterActor")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterActor")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterActor")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterActor")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -275,7 +329,7 @@
   (return-type "void")
   (when "last")
   (parameters
-    '("const-ClutterKnot*" "p0")
+    '("ClutterKnot*" "p0")
   )
 )
 
@@ -474,7 +528,7 @@
   (return-type "void")
   (when "last")
   (parameters
-    '("const-ClutterKnot*" "p0")
+    '("ClutterKnot*" "p0")
   )
 )
 
@@ -581,19 +635,37 @@
   (construct-only #f)
 )
 
-(define-property scale-start
+(define-property x-scale-start
+  (of-object "ClutterBehaviourScale")
+  (prop-type "GParamDouble")
+  (docs "Initial scale on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property y-scale-start
+  (of-object "ClutterBehaviourScale")
+  (prop-type "GParamDouble")
+  (docs "Initial scale on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property x-scale-end
   (of-object "ClutterBehaviourScale")
   (prop-type "GParamDouble")
-  (docs "Initial scale")
+  (docs "Final scale on the X axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property scale-end
+(define-property y-scale-end
   (of-object "ClutterBehaviourScale")
   (prop-type "GParamDouble")
-  (docs "Final scale")
+  (docs "Final scale on the Y axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -608,10 +680,19 @@
   (construct-only #f)
 )
 
-;; From ClutterBox
+;; From ClutterCloneTexture
+
+(define-property name
+  (of-object "ClutterCloneTexture")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
 (define-property x
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamInt")
   (docs "X co-ord of actor")
   (readable #t)
@@ -620,7 +701,7 @@
 )
 
 (define-property y
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamInt")
   (docs "Y co-ord of actor")
   (readable #t)
@@ -629,7 +710,7 @@
 )
 
 (define-property width
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamInt")
   (docs "Width of actor in pixels")
   (readable #t)
@@ -638,7 +719,7 @@
 )
 
 (define-property height
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamInt")
   (docs "Height of actor in pixels")
   (readable #t)
@@ -647,7 +728,7 @@
 )
 
 (define-property depth
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamInt")
   (docs "Depth of actor")
   (readable #t)
@@ -656,7 +737,7 @@
 )
 
 (define-property clip
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamBoxed")
   (docs "The clip region for the actor")
   (readable #t)
@@ -665,7 +746,7 @@
 )
 
 (define-property has-clip
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamBoolean")
   (docs "Whether the actor has a clip set or not")
   (readable #t)
@@ -674,7 +755,7 @@
 )
 
 (define-property opacity
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamUChar")
   (docs "Opacity of actor")
   (readable #t)
@@ -682,17 +763,8 @@
   (construct-only #f)
 )
 
-(define-property name
-  (of-object "ClutterBox")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property visible
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is visible or not")
   (readable #t)
@@ -700,26 +772,8 @@
   (construct-only #f)
 )
 
-(define-property scale-x
-  (of-object "ClutterBox")
-  (prop-type "GParamDouble")
-  (docs "Scale X")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property scale-y
-  (of-object "ClutterBox")
-  (prop-type "GParamDouble")
-  (docs "Scale Y")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property reactive
-  (of-object "ClutterBox")
+  (of-object "ClutterCloneTexture")
   (prop-type "GParamBoolean")
   (docs "Whether the actor is reactive to events or not")
   (readable #t)
@@ -727,138 +781,73 @@
   (construct-only #f)
 )
 
-(define-property margin
-  (of-object "ClutterBox")
-  (prop-type "GParamBoxed")
-  (docs "Margin between the inner border of a box and its children")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property color
-  (of-object "ClutterBox")
-  (prop-type "GParamBoxed")
-  (docs "Background color of a box")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From ClutterCloneTexture
-
-(define-property x
+(define-property scale-x
   (of-object "ClutterCloneTexture")
-  (prop-type "GParamInt")
-  (docs "X co-ord of actor")
+  (prop-type "GParamDouble")
+  (docs "Scale X")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property y
+(define-property scale-y
   (of-object "ClutterCloneTexture")
-  (prop-type "GParamInt")
-  (docs "Y co-ord of actor")
+  (prop-type "GParamDouble")
+  (docs "Scale Y")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property width
+(define-property rotation-angle-x
   (of-object "ClutterCloneTexture")
-  (prop-type "GParamInt")
-  (docs "Width of actor in pixels")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height
+(define-property rotation-angle-y
   (of-object "ClutterCloneTexture")
-  (prop-type "GParamInt")
-  (docs "Height of actor in pixels")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property depth
+(define-property rotation-angle-z
   (of-object "ClutterCloneTexture")
-  (prop-type "GParamInt")
-  (docs "Depth of actor")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property clip
+(define-property rotation-center-x
   (of-object "ClutterCloneTexture")
   (prop-type "GParamBoxed")
-  (docs "The clip region for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-clip
-  (of-object "ClutterCloneTexture")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor has a clip set or not")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property opacity
-  (of-object "ClutterCloneTexture")
-  (prop-type "GParamUChar")
-  (docs "Opacity of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "ClutterCloneTexture")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visible
-  (of-object "ClutterCloneTexture")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property scale-x
-  (of-object "ClutterCloneTexture")
-  (prop-type "GParamDouble")
-  (docs "Scale X")
+  (docs "The rotation center on the X axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property scale-y
+(define-property rotation-center-y
   (of-object "ClutterCloneTexture")
-  (prop-type "GParamDouble")
-  (docs "Scale Y")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-center-z
   (of-object "ClutterCloneTexture")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -875,37 +864,8 @@
 
 ;; From ClutterColor
 
-;; From ClutterContainer
-
-(define-signal actor-added
-  (of-object "ClutterContainer")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("ClutterActor*" "p0")
-  )
-)
-
-(define-signal actor-removed
-  (of-object "ClutterContainer")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("ClutterActor*" "p0")
-  )
-)
-
 ;; From ClutterEffectTemplate
 
-(define-property alpha-func
-  (of-object "ClutterEffectTemplate")
-  (prop-type "GParamPointer")
-  (docs "Alpha reference Function")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
-)
-
 (define-property timeline
   (of-object "ClutterEffectTemplate")
   (prop-type "GParamObject")
@@ -947,6 +907,15 @@
   )
 )
 
+(define-property name
+  (of-object "ClutterEntry")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property x
   (of-object "ClutterEntry")
   (prop-type "GParamInt")
@@ -1019,19 +988,19 @@
   (construct-only #f)
 )
 
-(define-property name
+(define-property visible
   (of-object "ClutterEntry")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
+(define-property reactive
   (of-object "ClutterEntry")
   (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (docs "Whether the actor is reactive to events or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1055,18 +1024,63 @@
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-angle-x
   (of-object "ClutterEntry")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property font-name
+(define-property rotation-angle-y
   (of-object "ClutterEntry")
-  (prop-type "GParamString")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterEntry")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterEntry")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterEntry")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterEntry")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property font-name
+  (of-object "ClutterEntry")
+  (prop-type "GParamString")
   (docs "Pango font description")
   (readable #t)
   (writable #t)
@@ -1176,6 +1190,15 @@
   )
 )
 
+(define-property name
+  (of-object "ClutterGroup")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property x
   (of-object "ClutterGroup")
   (prop-type "GParamInt")
@@ -1248,19 +1271,19 @@
   (construct-only #f)
 )
 
-(define-property name
+(define-property visible
   (of-object "ClutterGroup")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
+(define-property reactive
   (of-object "ClutterGroup")
   (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (docs "Whether the actor is reactive to events or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1284,156 +1307,55 @@
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-angle-x
   (of-object "ClutterGroup")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From ClutterHBox
-
-(define-property layout-flags
-  (of-object "ClutterHBox")
-  (prop-type "GParamFlags")
-  (docs "Supported layouts")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property x
-  (of-object "ClutterHBox")
-  (prop-type "GParamInt")
-  (docs "X co-ord of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property y
-  (of-object "ClutterHBox")
-  (prop-type "GParamInt")
-  (docs "Y co-ord of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property width
-  (of-object "ClutterHBox")
-  (prop-type "GParamInt")
-  (docs "Width of actor in pixels")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property height
-  (of-object "ClutterHBox")
-  (prop-type "GParamInt")
-  (docs "Height of actor in pixels")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property depth
-  (of-object "ClutterHBox")
-  (prop-type "GParamInt")
-  (docs "Depth of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property clip
-  (of-object "ClutterHBox")
-  (prop-type "GParamBoxed")
-  (docs "The clip region for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-clip
-  (of-object "ClutterHBox")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor has a clip set or not")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property opacity
-  (of-object "ClutterHBox")
-  (prop-type "GParamUChar")
-  (docs "Opacity of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "ClutterHBox")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visible
-  (of-object "ClutterHBox")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property scale-x
-  (of-object "ClutterHBox")
+(define-property rotation-angle-y
+  (of-object "ClutterGroup")
   (prop-type "GParamDouble")
-  (docs "Scale X")
+  (docs "The rotation angle on the Y axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property scale-y
-  (of-object "ClutterHBox")
+(define-property rotation-angle-z
+  (of-object "ClutterGroup")
   (prop-type "GParamDouble")
-  (docs "Scale Y")
+  (docs "The rotation angle on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property reactive
-  (of-object "ClutterHBox")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+(define-property rotation-center-x
+  (of-object "ClutterGroup")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property margin
-  (of-object "ClutterHBox")
+(define-property rotation-center-y
+  (of-object "ClutterGroup")
   (prop-type "GParamBoxed")
-  (docs "Margin between the inner border of a box and its children")
+  (docs "The rotation center on the Y axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property color
-  (of-object "ClutterHBox")
+(define-property rotation-center-z
+  (of-object "ClutterGroup")
   (prop-type "GParamBoxed")
-  (docs "Background color of a box")
+  (docs "The rotation center on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1441,12 +1363,12 @@
 
 ;; From ClutterLabel
 
-(define-property layout-flags
+(define-property name
   (of-object "ClutterLabel")
-  (prop-type "GParamFlags")
-  (docs "Supported layouts")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
@@ -1522,19 +1444,19 @@
   (construct-only #f)
 )
 
-(define-property name
+(define-property visible
   (of-object "ClutterLabel")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
+(define-property reactive
   (of-object "ClutterLabel")
   (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (docs "Whether the actor is reactive to events or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1558,10 +1480,55 @@
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-angle-x
   (of-object "ClutterLabel")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-y
+  (of-object "ClutterLabel")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterLabel")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterLabel")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterLabel")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterLabel")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1657,12 +1624,82 @@
   (construct-only #f)
 )
 
-;; From ClutterLayout
-
 ;; From ClutterMedia
 
+(define-property uri
+  (of-object "ClutterMedia")
+  (prop-type "GParamString")
+  (docs "The loaded URI.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property buffer-percent
+  (of-object "ClutterMedia")
+  (prop-type "GParamInt")
+  (docs "The percentage the current stream buffer is filled.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property playing
+  (of-object "ClutterMedia")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if playing.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property volume
+  (of-object "ClutterMedia")
+  (prop-type "GParamDouble")
+  (docs "The audio volume.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property position
+  (of-object "ClutterMedia")
+  (prop-type "GParamInt")
+  (docs "The position in the current stream in seconds.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property can-seek
+  (of-object "ClutterMedia")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the current stream is seekable.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property duration
+  (of-object "ClutterMedia")
+  (prop-type "GParamInt")
+  (docs "The duration of the current stream in seconds.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From ClutterRectangle
 
+(define-property name
+  (of-object "ClutterRectangle")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property x
   (of-object "ClutterRectangle")
   (prop-type "GParamInt")
@@ -1735,19 +1772,19 @@
   (construct-only #f)
 )
 
-(define-property name
+(define-property visible
   (of-object "ClutterRectangle")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
+(define-property reactive
   (of-object "ClutterRectangle")
   (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (docs "Whether the actor is reactive to events or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1771,10 +1808,55 @@
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-angle-x
   (of-object "ClutterRectangle")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-y
+  (of-object "ClutterRectangle")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterRectangle")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterRectangle")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterRectangle")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterRectangle")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1836,7 +1918,16 @@
   (when "last")
 )
 
-(define-signal new-timeline
+(define-signal timeline-started
+  (of-object "ClutterScore")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("ClutterTimeline*" "p0")
+  )
+)
+
+(define-signal timeline-completed
   (of-object "ClutterScore")
   (return-type "void")
   (when "last")
@@ -1845,6 +1936,15 @@
   )
 )
 
+(define-property loop
+  (of-object "ClutterScore")
+  (prop-type "GParamBoolean")
+  (docs "Whether the score should restart once finished")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From ClutterScript
 
 (define-property filename-set
@@ -1891,6 +1991,15 @@
   (when "last")
 )
 
+(define-property name
+  (of-object "ClutterStage")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property x
   (of-object "ClutterStage")
   (prop-type "GParamInt")
@@ -1963,19 +2072,19 @@
   (construct-only #f)
 )
 
-(define-property name
+(define-property visible
   (of-object "ClutterStage")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
+(define-property reactive
   (of-object "ClutterStage")
   (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (docs "Whether the actor is reactive to events or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1999,10 +2108,55 @@
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-angle-x
   (of-object "ClutterStage")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-y
+  (of-object "ClutterStage")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterStage")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterStage")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterStage")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterStage")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2062,6 +2216,15 @@
   (construct-only #f)
 )
 
+(define-property use-fog
+  (of-object "ClutterStage")
+  (prop-type "GParamBoolean")
+  (docs "Whether to enable depth cueing")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From ClutterTexture
 
 (define-signal size-change
@@ -2080,6 +2243,15 @@
   (when "last")
 )
 
+(define-property name
+  (of-object "ClutterTexture")
+  (prop-type "GParamString")
+  (docs "Name of the actor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property x
   (of-object "ClutterTexture")
   (prop-type "GParamInt")
@@ -2152,19 +2324,19 @@
   (construct-only #f)
 )
 
-(define-property name
+(define-property visible
   (of-object "ClutterTexture")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
+  (prop-type "GParamBoolean")
+  (docs "Whether the actor is visible or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
+(define-property reactive
   (of-object "ClutterTexture")
   (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
+  (docs "Whether the actor is reactive to events or not")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2188,10 +2360,55 @@
   (construct-only #f)
 )
 
-(define-property reactive
+(define-property rotation-angle-x
   (of-object "ClutterTexture")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-y
+  (of-object "ClutterTexture")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-angle-z
+  (of-object "ClutterTexture")
+  (prop-type "GParamDouble")
+  (docs "The rotation angle on the Z axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-x
+  (of-object "ClutterTexture")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the X axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-y
+  (of-object "ClutterTexture")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Y axis")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property rotation-center-z
+  (of-object "ClutterTexture")
+  (prop-type "GParamBoxed")
+  (docs "The rotation center on the Z axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2361,149 +2578,3 @@
   (construct-only #f)
 )
 
-;; From ClutterVBox
-
-(define-property layout-flags
-  (of-object "ClutterVBox")
-  (prop-type "GParamFlags")
-  (docs "Supported layouts")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property x
-  (of-object "ClutterVBox")
-  (prop-type "GParamInt")
-  (docs "X co-ord of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property y
-  (of-object "ClutterVBox")
-  (prop-type "GParamInt")
-  (docs "Y co-ord of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property width
-  (of-object "ClutterVBox")
-  (prop-type "GParamInt")
-  (docs "Width of actor in pixels")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property height
-  (of-object "ClutterVBox")
-  (prop-type "GParamInt")
-  (docs "Height of actor in pixels")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property depth
-  (of-object "ClutterVBox")
-  (prop-type "GParamInt")
-  (docs "Depth of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property clip
-  (of-object "ClutterVBox")
-  (prop-type "GParamBoxed")
-  (docs "The clip region for the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-clip
-  (of-object "ClutterVBox")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor has a clip set or not")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property opacity
-  (of-object "ClutterVBox")
-  (prop-type "GParamUChar")
-  (docs "Opacity of actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "ClutterVBox")
-  (prop-type "GParamString")
-  (docs "Name of the actor")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property visible
-  (of-object "ClutterVBox")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is visible or not")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property scale-x
-  (of-object "ClutterVBox")
-  (prop-type "GParamDouble")
-  (docs "Scale X")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property scale-y
-  (of-object "ClutterVBox")
-  (prop-type "GParamDouble")
-  (docs "Scale Y")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property reactive
-  (of-object "ClutterVBox")
-  (prop-type "GParamBoolean")
-  (docs "Whether the actor is reactive to events or not")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property margin
-  (of-object "ClutterVBox")
-  (prop-type "GParamBoxed")
-  (docs "Margin between the inner border of a box and its children")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property color
-  (of-object "ClutterVBox")
-  (prop-type "GParamBoxed")
-  (docs "Background color of a box")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-



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