gdk-3.0,gdk-x11-3.0,gtk+-3.0,gtk4: Fix a few binding errors

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 40960d14af1bb58967d2139f8841a643e846b98b..095d0b04ac49c9de870010f0eaa096bbd2b7f9e2 100644 (file)
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -4574,7 +4574,7 @@ namespace Gdk {
                [Version (since = "2.2")]
                public static bool owner_set_for_display (Gdk.Display display, Gdk.Window? owner, Gdk.Atom selection, uint32 time_, bool send_event);
                [CCode (cheader_filename = "gdk/gdk.h")]
-               public static int property_get (Gdk.Window requestor, [CCode (array_length = false, type = "guchar**")] uint8[] data, Gdk.Atom prop_type, int prop_format);
+               public static int property_get (Gdk.Window requestor, [CCode (array_length = false, type = "guchar**")] uint8[] data, out Gdk.Atom prop_type, out int prop_format);
                [CCode (cheader_filename = "gdk/gdk.h")]
                public static void send_notify (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
                [CCode (cheader_filename = "gdk/gdk.h")]
@@ -5045,7 +5045,8 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gdk_event_get_type ()")]
        [Compact]
        public class EventButton : Gdk.Event {
-               public double axes;
+               [CCode (array_length = false)]
+               public weak double[] axes;
                public uint button;
                public weak Gdk.Device device;
                public int8 send_event;
@@ -5273,7 +5274,8 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gdk_event_get_type ()")]
        [Compact]
        public class EventTouch : Gdk.Event {
-               public double axes;
+               [CCode (array_length = false)]
+               public weak double[] axes;
                public weak Gdk.Device device;
                public bool emulating_pointer;
                public int8 send_event;
@@ -6832,7 +6834,7 @@ namespace Gdk {
        [Version (since = "2.2")]
        public static Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Cairo.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
+       public static Cairo.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, [CCode (array_length_cname = "n_ranges", array_length_pos = 4.1, type = "const gint*")] int[] index_ranges);
        [CCode (cheader_filename = "gdk/gdk.h")]
        [Version (since = "2.2")]
        public static void parse_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[] argv);

diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index 1563105819325834b6fb0764a58ed5f9a200a80d..9b09abbe6785412720a263786360e30ade90c533 100644 (file)
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -87,7 +87,7 @@ namespace Gdk {
                        [Version (since = "2.24")]
                        public int string_to_compound_text (string str, out Gdk.Atom encoding, out int format, [CCode (array_length_cname = "length", array_length_pos = 4.1)] out uint8[] ctext);
                        [Version (since = "2.24")]
-                       public int text_property_to_text_list (Gdk.Atom encoding, int format, uint8 text, int length, string list);
+                       public int text_property_to_text_list (Gdk.Atom encoding, int format, [CCode (type = "const guchar*")] string text, int length, [CCode (array_length = false, type = "gchar***")] out string[] list);
                        [Version (since = "2.2")]
                        public void ungrab ();
                        [Version (since = "2.24")]
@@ -198,10 +198,10 @@ namespace Gdk {
                public static int device_get_id (Gdk.X11.DeviceCore device);
                [CCode (cheader_filename = "gdk/gdkx.h")]
                [Version (since = "2.24")]
-               public static void free_compound_text ([CCode (array_length = false, type = "guchar*")] uint8[] ctext);
+               public static void free_compound_text ([CCode (array_length = false, type = "guchar*")] owned uint8[] ctext);
                [CCode (cheader_filename = "gdk/gdkx.h")]
                [Version (since = "2.24")]
-               public static void free_text_list (string list);
+               public static void free_text_list ([CCode (array_length = false, type = "gchar**")] owned string[] list);
                [CCode (cheader_filename = "gdk/gdkx.h")]
                public static X.Window get_default_root_xwindow ();
                [CCode (cheader_filename = "gdk/gdkx.h")]

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index f0133ef3121409c7fbe37b2daebb8c93a8ac61c1..c9eca25c24508efa40cf699be506b8835b0200ef 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -9355,9 +9355,9 @@ namespace Gtk {
                [Version (since = "3.8")]
                public uint add_tick_callback (owned Gtk.TickCallback callback);
                [NoWrapper]
-               public virtual void adjust_baseline_allocation (int baseline);
+               public virtual void adjust_baseline_allocation (ref int baseline);
                [NoWrapper]
-               public virtual void adjust_baseline_request (int minimum_baseline, int natural_baseline);
+               public virtual void adjust_baseline_request (ref int minimum_baseline, ref int natural_baseline);
                [NoWrapper]
                public virtual void adjust_size_allocation (Gtk.Orientation orientation, ref int minimum_size, ref int natural_size, ref int allocated_pos, ref int allocated_size);
                [NoWrapper]
@@ -10431,10 +10431,10 @@ namespace Gtk {
                public void copy_clipboard ();
                public void cut_clipboard ();
                public void delete_selection ();
-               [NoWrapper]
-               public abstract void do_delete_text (int start_pos, int end_pos);
-               [NoWrapper]
-               public abstract void do_insert_text (string new_text, int new_text_length, ref int position);
+               [CCode (cname = "gtk_editable_delete_text", vfunc_name = "delete_text")]
+               public virtual void do_delete_text (int start_pos, int end_pos);
+               [CCode (cname = "gtk_editable_insert_text", vfunc_name = "insert_text")]
+               public virtual void do_insert_text (string new_text, int new_text_length, ref int position);
                public abstract string get_chars (int start_pos = 0, int end_pos = -1);
                public bool get_editable ();
                public abstract int get_position ();
@@ -12294,7 +12294,7 @@ namespace Gtk {
        public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
-       [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")]
+       [CCode (cheader_filename = "gtk/gtk.h", cname = "GCallback")]
        [Version (deprecated_since = "3.10")]
        public delegate void ActionCallback (Gtk.Action action);
        [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 1.9)]
@@ -12389,7 +12389,7 @@ namespace Gtk {
        public delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup);
        [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 2.9)]
        public delegate void PrintSettingsFunc (string key, string value);
-       [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")]
+       [CCode (cheader_filename = "gtk/gtk.h", cname = "GCallback")]
        public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value);
@@ -12401,8 +12401,8 @@ namespace Gtk {
        public delegate bool StylePropertyParser (string str, GLib.Value value) throws GLib.Error;
        [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 5.9)]
        public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, [CCode (array_length_cname = "length", array_length_pos = 4.5, array_length_type = "gsize")] uint8[] data, bool create_tags) throws GLib.Error;
-       [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 5.9)]
-       public delegate unowned uint8? TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, size_t length);
+       [CCode (array_length_pos = 4.1, array_length_type = "gsize", cheader_filename = "gtk/gtk.h", instance_pos = 4.9)]
+       public delegate uint8[]? TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end);
        [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 1.9)]
        public delegate bool TextCharPredicate (unichar ch);
        [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 1.9)]

diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi
index 55f2b73bf2aa72f0c9dd4e10d9805f37b20122f8..b934e24e4ed789c9f630bca59508bc0e70cea9f0 100644 (file)
--- a/vapi/gtk4.vapi
+++ b/vapi/gtk4.vapi
@@ -4686,7 +4686,7 @@ namespace Gdk {
                        public void set_startup_notification_id (string startup_id);
                        public void set_surface_scale (int scale);
                        public int string_to_compound_text (string str, out unowned string encoding, out int format, [CCode (array_length_cname = "length", array_length_pos = 4.1)] out uint8[] ctext);
-                       public int text_property_to_text_list (string encoding, int format, uint8 text, int length, string list);
+                       public int text_property_to_text_list (string encoding, int format, [CCode (type = "const guchar*")] string text, int length, [CCode (array_length = false, type = "char***")] out string[] list);
                        public void ungrab ();
                        public bool utf8_to_compound_text (string str, out unowned string encoding, out int format, [CCode (array_length_cname = "length", array_length_pos = 4.1)] out uint8[] ctext);
                        public signal bool xevent ([CCode (type = "gpointer")] X.Event xevent);
@@ -4755,9 +4755,9 @@ namespace Gdk {
                        FLOATING
                }
                [CCode (cheader_filename = "gdk/x11/gdkx.h")]
-               public static void free_compound_text ([CCode (array_length = false, type = "guchar*")] uint8[] ctext);
+               public static void free_compound_text ([CCode (array_length = false, type = "guchar*")] owned uint8[] ctext);
                [CCode (cheader_filename = "gdk/x11/gdkx.h")]
-               public static void free_text_list (string list);
+               public static void free_text_list ([CCode (array_length = false, type = "char**")] owned string[] list);
                [CCode (cheader_filename = "gdk/x11/gdkx.h")]
                public static void set_sm_client_id (string? sm_client_id);
        }
@@ -5376,7 +5376,7 @@ namespace Gdk {
                public void set_opaque_region (Cairo.Region? region);
                [CCode (has_construct_function = false)]
                public Surface.toplevel (Gdk.Display display);
-               public bool translate_coordinates (Gdk.Surface to, double x, double y);
+               public bool translate_coordinates (Gdk.Surface to, ref double x, ref double y);
                public Gdk.Cursor cursor { get; set; }
                public Gdk.Display display { get; construct; }
                public Gdk.FrameClock frame_clock { get; construct; }
@@ -5926,7 +5926,7 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static uint keyval_to_upper (uint keyval);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Cairo.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
+       public static Cairo.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, [CCode (array_length_cname = "n_ranges", array_length_pos = 4.1, type = "const int*")] int[] index_ranges);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static Gdk.Pixbuf? pixbuf_get_from_surface (Cairo.Surface surface, int src_x, int src_y, int width, int height);
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -12508,10 +12508,10 @@ namespace Gtk {
                public static bool delegate_get_property (GLib.Object object, uint prop_id, GLib.Value value, GLib.ParamSpec pspec);
                public static bool delegate_set_property (GLib.Object object, uint prop_id, GLib.Value value, GLib.ParamSpec pspec);
                public void delete_selection ();
-               [NoWrapper]
-               public abstract void do_delete_text (int start_pos, int end_pos);
-               [NoWrapper]
-               public abstract void do_insert_text (string text, int length, ref int position);
+               [CCode (cname = "gtk_editable_delete_text", vfunc_name = "delete_text")]
+               public virtual void do_delete_text (int start_pos, int end_pos);
+               [CCode (cname = "gtk_editable_insert_text", vfunc_name = "insert_text")]
+               public virtual void do_insert_text (string text, int length, ref int position);
                public void finish_delegate ();
                public float get_alignment ();
                public string get_chars (int start_pos = 0, int end_pos = -1);

diff --git a/vapi/metadata/Gdk-3.0.metadata b/vapi/metadata/Gdk-3.0.metadata
index d16218533adb9b0e30b48700898fe05b37927366..ce290014dcbd14539e142f556afcac78574d106e 100644 (file)
--- a/vapi/metadata/Gdk-3.0.metadata
+++ b/vapi/metadata/Gdk-3.0.metadata
@@ -17,6 +17,8 @@ Event
         ._get_angle skip
         ._get_center skip
         ._get_distance skip
+Event*
+        .axes array
 Window abstract=false
         .add_filter skip=false
         .create_similar_image_surface type="Cairo.ImageSurface"
@@ -32,6 +34,7 @@ RGBA struct
 ModifierType
         .modifier_reserved_*_mask skip
 pango_layout_get_clip_region skip=false
+        .index_ranges array array_length_idx=4
 property_change skip=false
 add_option_entries_libgtk_only skip=false
 Device
@@ -84,6 +87,8 @@ parse_args.argv unowned
 property_change.data array
 selection_property_get skip=false
         .data array
+        .prop_type out
+        .prop_format out
 threads_add_idle skip=false
 threads_add_timeout skip=false
 threads_add_timeout_seconds skip=false

diff --git a/vapi/metadata/Gdk-4.0.metadata b/vapi/metadata/Gdk-4.0.metadata
index 6331583c57b51e4781a1347dd7e571ece2c20e7c..3053be7df5692623689cd471ca4e8ae988a2deb1 100644 (file)
--- a/vapi/metadata/Gdk-4.0.metadata
+++ b/vapi/metadata/Gdk-4.0.metadata
@@ -33,11 +33,14 @@ Rectangle struct
         .height skip
 RGBA struct
 pango_layout_get_clip_region skip=false
+        .index_ranges array array_length_idx=4
 Texture
         // Factory method
         .new_* symbol_type="function" name="new_(.+)"
 Surface
         .destroy destroys_instance
+        .translate_coordinates.x ref
+        .translate_coordinates.y ref
 Toplevel
         .compute_size.size nullable unowned
 ToplevelSize struct

diff --git a/vapi/metadata/GdkX11-3.0.metadata b/vapi/metadata/GdkX11-3.0.metadata
index c26eccc3a960e64b6676c681edd8efcdf5cfd39e..c9496ca4106253ebe6a273a4c77f4d622e0fd88a 100644 (file)
--- a/vapi/metadata/GdkX11-3.0.metadata
+++ b/vapi/metadata/GdkX11-3.0.metadata
@@ -3,10 +3,13 @@ X11* name="X11(.+)" parent="Gdk.X11"
 
 X11Display
        .broadcast_startup_message skip=false
+       .text_property_to_text_list.text type="string"
+       .text_property_to_text_list.list type="string[]" out
 
 X11Window
        .foreign_new_for_display name="foreign_for_display"
 
 x11_device_manager_lookup name="lookup_for_device_manager" parent="Gdk.X11.DeviceCore"
-x11_free_compound_text.ctext type="uint8[]"
+x11_free_compound_text.ctext type="owned uint8[]"
+x11_free_text_list.list array owned
 x11_lookup_xdisplay name="lookup_for_xdisplay" parent="Gdk.X11.Display"

diff --git a/vapi/metadata/GdkX11-4.0.metadata b/vapi/metadata/GdkX11-4.0.metadata
index 6a71479214c994ccedceba2b73fafdd40c3b6713..d874a14dc0af1278432a5b7b0bcf3e73b8dbc98d 100644 (file)
--- a/vapi/metadata/GdkX11-4.0.metadata
+++ b/vapi/metadata/GdkX11-4.0.metadata
@@ -6,10 +6,13 @@ X11* name="X11(.+)" parent="Gdk.X11"
 X11Display
        .broadcast_startup_message skip=false
        .xevent.xevent type="X.Event"
+       .text_property_to_text_list.text type="string"
+       .text_property_to_text_list.list type="string[]" out
 
 x11_device_manager_lookup name="lookup_for_device_manager" parent="Gdk.X11.DeviceManagerXI2" symbol_type="method" instance_idx=0
 x11_device_get_id name="get_id" parent="Gdk.X11.DeviceXI2" symbol_type="method" instance_idx=0
-x11_free_compound_text.ctext type="uint8[]"
+x11_free_compound_text.ctext type="owned uint8[]"
+x11_free_text_list.list array owned
 x11_get_server_time name="get_server_time" parent="Gdk.X11.Surface" symbol_type="method" instance_idx=0
 x11_get_xatom_by_name_for_display name="get_xatom_by_name" parent="Gdk.X11.Display" symbol_type="method" instance_idx=0
 x11_get_xatom_name_for_display name="get_xatom_name" parent="Gdk.X11.Display" symbol_type="method" instance_idx=0

diff --git a/vapi/metadata/Gtk-3.0-custom.vala b/vapi/metadata/Gtk-3.0-custom.vala
index 9e4a9c4ae62ab353b62292df17bff859f4ed6fc6..7a4e6aba8c30f81f93c2cf7b6cf8d39df206e02f 100644 (file)
--- a/vapi/metadata/Gtk-3.0-custom.vala
+++ b/vapi/metadata/Gtk-3.0-custom.vala
@@ -1,9 +1,9 @@
 namespace Gtk {
-       [CCode (type_cname = "GCallback")]
+       [CCode (cname = "GCallback")]
        [Version (deprecated_since = "3.10")]
        public delegate void ActionCallback (Action action);
        public delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
-       [CCode (type_cname = "GCallback")]
+       [CCode (cname = "GCallback")]
        public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current);
 
        [CCode (has_type_id = false)]
@@ -114,14 +114,6 @@ namespace Gtk {
                public virtual void notify_gtk (GLib.ParamSpec pspec);
        }
 
-       [CCode (type_id = "gtk_editable_get_type ()")]
-       public interface Editable : GLib.Object {
-               [NoWrapper]
-               public abstract void do_insert_text (string new_text, int new_text_length, ref int position);
-               [NoWrapper]
-               public abstract void do_delete_text (int start_pos, int end_pos);
-       }
-
        [CCode (has_type_id = false)]
        public struct BindingArg {
                [CCode (cname = "d.long_data")]

diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index 681f966c471bca1f45923c1467151f7e9a79960c..17c199caeb5883235ced91733b293fb060d5339f 100644 (file)
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -59,6 +59,8 @@ Widget
   .adjust_size_allocation.*_size ref
   .adjust_size_allocation.allocated_pos ref
   .adjust_size_request.*_size ref
+  .adjust_baseline_allocation.baseline ref
+  .adjust_baseline_request.*_baseline ref
   .compute_expand#virtual_method.*expand_p out
   .dispatch_child_properties_changed.pspecs array array_length_idx=0
 RecentChooser
@@ -410,8 +412,8 @@ Window
   .activate_default#method name="try_activate_default"
   .activate_focus#method name="try_activate_focus"
 Editable
-  .delete_text#method skip
-  .insert_text#method skip
+  .delete_text#method name="do_delete_text" vfunc_name="delete_text"
+  .insert_text#method name="do_insert_text" vfunc_name="insert_text"
 
 // time_t
 RecentInfo
@@ -551,6 +553,7 @@ TextBuffer
   .insert*.iter ref
   .insert_text.pos ref
   .insert_text#signal.location ref
+TextBufferSerializeFunc type="uint8[]?" array_length_idx=4 unowned=false
 TextIter
   .order.second ref
 TextView

diff --git a/vapi/metadata/Gtk-4.0-custom.vala b/vapi/metadata/Gtk-4.0-custom.vala
index bd4ca2eafa1d6316f54692c1aa710f4b7ac4de15..c3f98568b8bfcac3533fe26bb6b78a97ec7138a1 100644 (file)
--- a/vapi/metadata/Gtk-4.0-custom.vala
+++ b/vapi/metadata/Gtk-4.0-custom.vala
@@ -9,13 +9,6 @@ namespace Gtk {
                public virtual signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter iter, [CCode (array_length = false)] int[] new_order);
        }
 
-       public interface Editable {
-               [NoWrapper]
-               public abstract void do_insert_text (string text, int length, ref int position);
-               [NoWrapper]
-               public abstract void do_delete_text (int start_pos, int end_pos);
-       }
-
        [CCode (has_type_id = false)]
        public struct BindingArg {
                [CCode (cname = "d.long_data")]

diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata
index 7925963c3d3ee585e856fb65cdd5c072cac3e081..76cfd5e3bd7ff1e1446446784abc317666880c31 100644 (file)
--- a/vapi/metadata/Gtk-4.0.metadata
+++ b/vapi/metadata/Gtk-4.0.metadata
@@ -243,8 +243,8 @@ Widget
   .compute_expand#virtual_method name="compute_expand_internal"
   .size_allocate#method name="allocate_size"
 Editable
-  .delete_text#method skip
-  .insert_text#method skip
+  .delete_text#method name="do_delete_text" vfunc_name="delete_text"
+  .insert_text#method name="do_insert_text" vfunc_name="insert_text"
 
 // Not sure what g-i was thinking
 TreeModel