[vala] clutter-1.0: update bindings to latest git, remove obsolete data

From: Evan Nemerson <evann src gnome org>
To: commits-list gnome org
Cc:
Subject: [vala] clutter-1.0: update bindings to latest git, remove obsolete data
Date: Wed, 13 Jun 2012 02:52:53 +0000 (UTC)
commit 2106cf6d1d4e1ae52ee5e7e9e7080dae681e9b94
Author: Evan Nemerson <evan coeus-group com>
Date:   Tue Jun 12 19:51:56 2012 -0700

    clutter-1.0: update bindings to latest git, remove obsolete data

 vapi/clutter-1.0.vapi                 |   34 +++--
 vapi/metadata/Clutter-1.0-custom.vala |    5 -
 vapi/metadata/Clutter-1.0.metadata    |  253 +++++++++++++++++++--------------
 3 files changed, 166 insertions(+), 126 deletions(-)
---
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 5e7c73f..5785d07 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -843,6 +843,8 @@ namespace Clutter {
 		public const int ENG;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ETH")]
 		public const int ETH;
+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EZH")]
+		public const int EZH;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eabovedot")]
 		public const int Eabovedot;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eacute")]
@@ -3521,6 +3523,8 @@ namespace Clutter {
 		public const int dead_e;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_grave")]
 		public const int dead_grave;
+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_greek")]
+		public const int dead_greek;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_hook")]
 		public const int dead_hook;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_horn")]
@@ -3671,6 +3675,8 @@ namespace Clutter {
 		public const int exclam;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclamdown")]
 		public const int exclamdown;
+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ezh")]
+		public const int ezh;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_f")]
 		public const int f;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fabovedot")]
@@ -4241,6 +4247,8 @@ namespace Clutter {
 		public const int period;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_periodcentered")]
 		public const int periodcentered;
+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_permille")]
+		public const int permille;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_phonographcopyright")]
 		public const int phonographcopyright;
 		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plus")]
@@ -4605,11 +4613,11 @@ namespace Clutter {
 		[CCode (cheader_filename = "clutter/clutter.h")]
 		public static void set_paint_node (GLib.Value value, Clutter.PaintNode? node);
 		[CCode (cheader_filename = "clutter/clutter.h")]
-		public static void set_shader_float (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5, type = "gfloat*")] float[] floats);
+		public static void set_shader_float (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] floats);
 		[CCode (cheader_filename = "clutter/clutter.h")]
-		public static void set_shader_int (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5, type = "gint*")] int[] ints);
+		public static void set_shader_int (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] int[] ints);
 		[CCode (cheader_filename = "clutter/clutter.h")]
-		public static void set_shader_matrix (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5, type = "gfloat*")] float[] matrix);
+		public static void set_shader_matrix (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] matrix);
 		[CCode (cheader_filename = "clutter/clutter.h")]
 		public static void set_units (GLib.Value value, Clutter.Units units);
 		[CCode (cheader_filename = "clutter/clutter.h")]
@@ -4665,13 +4673,13 @@ namespace Clutter {
 		public void detach_animation ();
 		[CCode (cname = "clutter_actor_event")]
 		public bool emit_event (Clutter.Event event, bool capture);
-		public void get_abs_allocation_vertices ([CCode (array_length = false)] out Clutter.Vertex[] verts);
+		public void get_abs_allocation_vertices ([CCode (array_length = false)] Clutter.Vertex[] verts);
 		public virtual unowned Atk.Object get_accessible ();
 		public unowned Clutter.Action get_action (string name);
 		public GLib.List<weak Clutter.Action> get_actions ();
 		public Clutter.ActorBox get_allocation_box ();
 		public Clutter.Geometry get_allocation_geometry ();
-		public void get_allocation_vertices (Clutter.Actor? ancestor, [CCode (array_length = false)] out Clutter.Vertex[] verts);
+		public void get_allocation_vertices (Clutter.Actor? ancestor, [CCode (array_length = false)] Clutter.Vertex[] verts);
 		public void get_anchor_point (out float anchor_x, out float anchor_y);
 		public Clutter.Gravity get_anchor_point_gravity ();
 		[Deprecated (since = "1.12")]
@@ -5402,8 +5410,8 @@ namespace Clutter {
 		public static unowned Clutter.BindingPool find (string name);
 		public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
 		public static unowned Clutter.BindingPool get_for_class (void* klass);
-		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GCallback")] owned Clutter.BindingActionFunc callback);
-		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GClosure*")] owned Clutter.BindingActionFunc closure);
+		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
+		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
 		public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
 		public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
 		public void remove_action (uint key_val, Clutter.ModifierType modifiers);
@@ -6192,6 +6200,7 @@ namespace Clutter {
 		public bool equals (Clutter.Point b);
 		public void free ();
 		public unowned Clutter.Point init (float x, float y);
+		public static unowned Clutter.Point zero ();
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_property_transition_get_type ()")]
 	public class PropertyTransition : Clutter.Transition, Clutter.Scriptable {
@@ -6224,6 +6233,7 @@ namespace Clutter {
 		public Clutter.Rect normalize ();
 		public void offset (float d_x, float d_y);
 		public void union (Clutter.Rect b, out unowned Clutter.Rect res);
+		public static unowned Clutter.Rect zero ();
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_rectangle_get_type ()")]
 	public class Rectangle : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
@@ -6952,8 +6962,10 @@ namespace Clutter {
 	public interface Container : GLib.Object {
 		public void add (params Clutter.Actor[] actors);
 		[CCode (vfunc_name = "add")]
+		[Deprecated (since = "1.10")]
 		public abstract void add_actor (Clutter.Actor actor);
-		public void add_valist (Clutter.Actor first_actor, void* var_args);
+		[Deprecated (since = "1.10")]
+		public void add_valist (Clutter.Actor first_actor, va_list var_args);
 		public void child_get (Clutter.Actor actor, ...);
 		public void child_get_property (Clutter.Actor child, string property, GLib.Value value);
 		public void child_set (Clutter.Actor actor, ...);
@@ -7144,8 +7156,6 @@ namespace Clutter {
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_COLOR")]
 	public struct Color {
-		public static GLib.HashFunc hash;
-		public static GLib.EqualFunc equal;
 		public uint8 red;
 		public uint8 green;
 		public uint8 blue;
@@ -7154,6 +7164,7 @@ namespace Clutter {
 		public static Clutter.Color alloc ();
 		public Clutter.Color copy ();
 		public Clutter.Color darken ();
+		public bool equal (Clutter.Color v2);
 		public void free ();
 		[CCode (cname = "clutter_color_from_hls")]
 		public Color.from_hls (float hue, float luminance, float saturation);
@@ -7162,6 +7173,7 @@ namespace Clutter {
 		[CCode (cname = "clutter_color_from_string")]
 		public Color.from_string (string str);
 		public static Clutter.Color get_static (Clutter.StaticColor color);
+		public uint hash ();
 		public Clutter.Color init (uint8 red, uint8 green, uint8 blue, uint8 alpha);
 		public Clutter.Color interpolate (Clutter.Color final, double progress);
 		public Clutter.Color lighten ();
@@ -7945,7 +7957,7 @@ namespace Clutter {
 	[CCode (cheader_filename = "clutter/clutter.h")]
 	public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
 	[CCode (cheader_filename = "clutter/clutter.h")]
-	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false, type = "GOptionEntry*")] GLib.OptionEntry?[] entries, string? translation_domain) throws GLib.Error;
+	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false)] GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
 	[CCode (cheader_filename = "clutter/clutter.h")]
 	public static uint32 keysym_to_unicode (uint keyval);
 	[CCode (cheader_filename = "clutter/clutter.h")]
diff --git a/vapi/metadata/Clutter-1.0-custom.vala b/vapi/metadata/Clutter-1.0-custom.vala
index 46aa85e..025c504 100644
--- a/vapi/metadata/Clutter-1.0-custom.vala
+++ b/vapi/metadata/Clutter-1.0-custom.vala
@@ -37,8 +37,6 @@ namespace Clutter {
 
 	[CCode (type_id = "CLUTTER_TYPE_COLOR", cheader_filename = "clutter/clutter.h")]
 	public struct Color {
-		public static GLib.HashFunc hash;
-		public static GLib.EqualFunc equal;
 		[CCode (cname = "clutter_color_from_hls")]
 		public Color.from_hls (float hue, float luminance, float saturation);
 		[CCode (cname = "clutter_color_from_pixel")]
@@ -52,9 +50,6 @@ namespace Clutter {
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
 	public interface Container : GLib.Object {
 		public void add (params Clutter.Actor[] actors);
-		[CCode (vfunc_name = "add")]
-		public abstract void add_actor (Clutter.Actor actor);
-		public void add_valist (Clutter.Actor first_actor, void* var_args);
 		[CCode (cname = "clutter_container_class_find_child_property")]
 		public class unowned GLib.ParamSpec find_child_property (string property_name);
 		[CCode (cname = "clutter_container_class_list_child_properties")]
diff --git a/vapi/metadata/Clutter-1.0.metadata b/vapi/metadata/Clutter-1.0.metadata
index 98bb114..ad4b52c 100644
--- a/vapi/metadata/Clutter-1.0.metadata
+++ b/vapi/metadata/Clutter-1.0.metadata
@@ -1,53 +1,3 @@
-// Vala specific
-Event.type#method name="get_type"
-Actor
-	.event#method name="emit_event"
-	.get_paint_volume#method skip
-	.queue_redraw#signal skip
-	.queue_redraw#virtual_method skip
-	.has_pointer#method name="get_has_pointer"
-ActorBox
-	.new skip
-	.from_vertices skip
-ActorClass.queue_redraw skip
-Color.new skip
-color_hash skip
-color_equal skip
-container_class_find_child_property skip
-container_class_list_child_properties skip
-redraw skip
-util_next_p2 name="next_power_of_2" parent="Clutter.Util"
-feature_available skip
-feature_get_all skip
-frame_source_* name="frame_source_(.+)" parent="Clutter.FrameSource" skip=false
-InitError errordomain=false
-Stage.read_pixels unowned=false
-	.width default=-1
-	.height default=-1
-TextBuffer.get_text#virtual_method name="get_text_with_length"
-threads_* name="threads_(.+)" parent="Clutter.Threads" skip=false
-threads_add_frame_source name="add" parent="Clutter.Threads.FrameSource" skip=false
-threads_add_frame_source_full name="add_full" parent="Clutter.Threads.FrameSource" skip=false
-threads_add_idle name="add" parent="Clutter.Threads.Idle" skip=false
-threads_add_idle_full name="add_full" parent="Clutter.Threads.Idle" skip=false
-threads_add_timeout name="add" parent="Clutter.Threads.Timeout" skip=false
-threads_add_timeout_full name="add_full" parent="Clutter.Threads.Timeout" skip=false
-value_* name="value_(.+)" parent="Clutter.Value"
-value_get_color nullable
-value_get_fixed skip=false nullable
-value_get_shader_float array array_length_idx=1
-value_get_shader_int array array_length_idx=1
-value_get_units unowned=false
-value_set_fixed skip=false
-value_set_shader_float.floats array array_length_idx=1
-value_set_shader_int.ints array array_length_idx=1
-value_set_shader_matrix.matrix array array_length_idx=1
-Text
-	.activate#method name="try_activate"
-	.insert_text#signal skip
-	.position_to_coords.line_height default=null
-Vertex.new skip
-
 // Non mini-object
 ActorBox struct
 Color struct
@@ -59,91 +9,174 @@ Perspective struct
 Units struct
 Vertex struct
 
-// Too many constants
-*#constant skip
-COGL skip=false
-CURRENT_TIME skip=false
-FLAVOUR skip=false
-*VERSION* skip=false
-PATH_RELATIVE skip=false
-PRIORITY_REDRAW skip=false
-KEY_* skip=false name="KEY_(.+)" parent="Clutter.Key"
+init.argv unowned
+init_with_args
+	.argv unowned
+Actor
+	.apply_transform.matrix ref
+	.get_abs_allocation_vertices.verts out=false
+	.get_allocation_vertices.verts out=false
+Event.type#method name="get_type"
 
+// ???
+Actor.has_pointer#method name="get_has_pointer"
+InitError errordomain=false
+redraw skip
 
-// Forward upstream
+// Nullable return values
 Actor
-	.animate* skip=false
-	.apply_relative_transform_to_point.vertex out unowned=false
-	.apply_transform.matrix ref
-	.apply_transform_to_point.vertex out unowned=false
-	.get_abs_allocation_vertices.verts unowned=false
-	.get_allocation_box.box unowned=false
-	.get_allocation_geometry.geom unowned=false
-	.get_allocation_vertices.verts unowned=false
 	.get_parent nullable
-Alpha.register_func skip=false
-Animator.set skip=false
-BehaviourForeachFunc.data closure=2
-BehaviourRotate.get_bounds.* out
-BindingPool
-	.install_action.callback type="owned BindingActionFunc"
-	.install_closure.closure type="owned BindingActionFunc"
-Box.pack* skip=false
-Callback.data closure=1
-Color
-	.from_* skip
+value_get_color nullable
+value_get_fixed nullable
+
+// method/virtual-method/signal don't match
+Actor
+	.event#method name="emit_event"
+	.get_paint_volume#method skip
+	.queue_redraw#signal skip
+	.queue_redraw#virtual_method skip
+Container
+	.add_actor skip=false
+Text
+	.activate#method name="try_activate"
+	.insert_text#signal skip
+TextBuffer.get_text#virtual_method name="get_text_with_length"
+
+// virtual/abstract distinction
 Container
-	.* skip=false
-	.add* skip
-	.foreach_with_internals#virtual_method virtual
-	.*_child_*#virtual_method virtual
 	.lower virtual
 	.raise virtual
+	.*_child_meta#virtual_method virtual
+	.foreach_with_internals#virtual_method virtual
+
+// Default values
+Container
 	.lower.sibling nullable default=null
 	.raise.sibling nullable default=null
-DeviceManager.get_devices type_arguments="Clutter.InputDevice"
-frame_source_add skip=false
-Event.* skip=false
+Stage.read_pixels
+	.width default=-1
+	.height default=-1
+Text
+	.position_to_coords.line_height default=null
+
+// Reparented funcs methods can't be instance methods
+feature_available skip
+feature_get_all skip
 FeatureFlags.texture_npot skip
-get_input_device_for_id parent="Clutter.InputDevice" name="get_for_id"
-get_option_group* skip=false
-init.argv unowned
-init_with_args
-	.argv unowned
-	.entries array
-Interval.* skip=false
+
+// Skipped by g-i for unknown reasons
+LayoutManager
+	.create_child_meta skip=false
+Model
+	.insert_row skip=false
+
+// Variadic arguments
+Actor
+	.animate skip=false
+	.animate_with_alpha skip=false
+	.animate_with_timeline skip=false
+Animator
+	.set skip=false
+Box
+	.pack skip=false
+	.pack_after skip=false
+	.pack_at skip=false
+	.pack_before skip=false
+Container
+	.add_valist skip=false
+	.child_get skip=false
+	.child_set skip=false
+	.remove skip=false
+	.remove_valist skip=false
+Interval
+	.new skip=false
+	.get_interval skip=false
+	.set_final skip=false
+	.set_initial skip=false
+	.set_interval skip=false
 LayoutManager
 	.child_get skip=false
 	.child_set skip=false
-	.create_child_meta skip=false
 ListModel
-        .new skip=false
+	.new skip=false
 Model
 	.append skip=false
 	.insert skip=false
-	.insert_row skip=false
 	.prepend skip=false
 ModelIter
 	.get skip=false
 	.set skip=false
-PathCallback.data closure=1
-State
-	.set_key.source_state_name nullable
 Script
-	.* skip=false
-Stage
-	.event name="emit_event"
-	.get_default type="unowned Clutter.Stage"
-	.get_fog.fog out
-Text
-	.get_cursor_color.color out
-	.new_with_text.font_name nullable
+	.get_objects skip=false
+
+// Changing error domains
 Texture
 	.new_from_file throws="Clutter.TextureError"
-	.set_area_from_rgb_data.data type="uint8[]"
-	.set_from_rgb_data.data type="uint8[]"
-	.set_from_yuv_data.data type="uint8[]"
+
+// Skipped upstream for unknown reasons
+Alpha.register_func skip=false
 TimeoutPool skip=false
+Interval.register_progress_func skip=false
+frame_source_* skip=false
+get_option_group skip=false
+get_option_group_without_init skip=false
+threads_add_frame_source skip=false
+threads_add_frame_source_full skip=false
+threads_add_idle skip=false
+threads_add_idle_full skip=false
+threads_set_lock_functions skip=false
+threads_add_timeout skip=false
+threads_add_timeout_full skip=false
+value_get_fixed skip=false
+value_set_fixed skip=false
+
+// struct/class confusion
+ActorBox
+	.new skip
+	.from_vertices skip
 Units.from_* skip
+Color
+	.new skip
+	.from_* skip
+Vertex.new skip
+
+// Class methods
+container_class_find_child_property skip
+container_class_list_child_properties skip
 
+// Move symbols
 get_actor_by_gid parent="Clutter.Actor" name="get_by_gid"
+get_input_device_for_id parent="Clutter.InputDevice" name="get_for_id"
+
+// Remove for clutter-1.0
+/////////////////////////
+
+Stage
+ 	.event name="emit_event"
+
+// *Event should be compact classes derived from Clutter.Event
+Event.* skip=false
+
+// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
+*#constant skip
+COGL skip=false
+CURRENT_TIME skip=false
+FLAVOUR skip=false
+*VERSION* skip=false
+PATH_RELATIVE skip=false
+PRIORITY_REDRAW skip=false
+
+// Clutter devs don't like us creating nested namespaces
+frame_source_* name="frame_source_(.+)" parent="Clutter.FrameSource"
+value_* name="value_(.+)" parent="Clutter.Value"
+threads_* name="threads_(.+)" parent="Clutter.Threads"
+threads_add_frame_source name="add" parent="Clutter.Threads.FrameSource"
+threads_add_frame_source_full name="add_full" parent="Clutter.Threads.FrameSource"
+threads_add_idle name="add" parent="Clutter.Threads.Idle"
+threads_add_idle_full name="add_full" parent="Clutter.Threads.Idle"
+threads_add_timeout name="add" parent="Clutter.Threads.Timeout"
+threads_add_timeout_full name="add_full" parent="Clutter.Threads.Timeout"
+util_next_p2 name="next_power_of_2" parent="Clutter.Util"
+
+// Possibly keep
+KEY_* skip=false name="KEY_(.+)" parent="Clutter.Key"
\ No newline at end of file
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]