gdk-2.0, gdk-3.0: Fix GdkDevice bindings

Fixes bug 652343.

diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index ac2ebe5dea038bd34ee1acc5d02ac8966f146bf8..ee5da72dda1c3e468392d72c8a1268d4f4e1f1b9 100644 (file)
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -92,13 +92,13 @@ namespace Gdk {
                public Gdk.AxisUse get_axis_use (uint index);
                public static unowned Gdk.Device get_core_pointer ();
                public bool get_has_cursor ();
-               public bool get_history (Gdk.Window window, uint32 start, uint32 stop, Gdk.TimeCoord[] events);
-               public void get_key (uint index, uint keyval, Gdk.ModifierType modifiers);
+               public bool get_history (Gdk.Window window, uint32 start, uint32 stop, out Gdk.TimeCoord[] events);
+               public void get_key (uint index, out uint keyval, out Gdk.ModifierType modifiers);
                public Gdk.InputMode get_mode ();
                public int get_n_axes ();
                public unowned string get_name ();
                public Gdk.InputSource get_source ();
-               public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
+               public void get_state (Gdk.Window window, [CCode (array_length = false)] double[] axes, out Gdk.ModifierType mask);
                public void set_axis_use (uint index_, Gdk.AxisUse use);
                public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
                public bool set_mode (Gdk.InputMode mode);

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index ff16587f46d877b3a74ffe23b27491920b61f703..4fbd8a7f8870ffdfa72567374df02e40ae4bc04b 100644 (file)
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -57,33 +57,33 @@ namespace Gdk {
                [CCode (has_construct_function = false)]
                protected Device ();
                public static void free_history (Gdk.TimeCoord[] events);
-               public unowned Gdk.Device get_associated_device ();
+               public unowned Gdk.Device? get_associated_device ();
                public bool get_axis ([CCode (array_length = false)] double[] axes, Gdk.AxisUse use, out double value);
                public Gdk.AxisUse get_axis_use (uint index_);
-               public bool get_axis_value (double axes, Gdk.Atom axis_label, double value);
+               public bool get_axis_value ([CCode (array_length = false)] double[] axes, Gdk.Atom axis_label, out double value);
                public Gdk.DeviceType get_device_type ();
                public unowned Gdk.Display get_display ();
                public bool get_has_cursor ();
-               public bool get_history (Gdk.Window window, uint32 start, uint32 stop, Gdk.TimeCoord[] events);
-               public bool get_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
+               public bool get_history (Gdk.Window window, uint32 start, uint32 stop, out Gdk.TimeCoord[] events);
+               public bool get_key (uint index_, out uint keyval, out Gdk.ModifierType modifiers);
                public Gdk.InputMode get_mode ();
                public int get_n_axes ();
                public int get_n_keys ();
                public unowned string get_name ();
-               public void get_position (out unowned Gdk.Screen screen, int x, int y);
+               public void get_position (out unowned Gdk.Screen screen, out int x, out int y);
                public Gdk.InputSource get_source ();
-               public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
-               public unowned Gdk.Window get_window_at_position (int win_x, int win_y);
+               public void get_state (Gdk.Window window, [CCode (array_length = false)] double[] axes, out Gdk.ModifierType mask);
+               public unowned Gdk.Window? get_window_at_position (int win_x, int win_y);
                public Gdk.GrabStatus grab (Gdk.Window window, Gdk.GrabOwnership grab_ownership, bool owner_events, Gdk.EventMask event_mask, Gdk.Cursor? cursor, uint32 time_);
                public static bool grab_info_libgtk_only (Gdk.Display display, Gdk.Device device, out unowned Gdk.Window grab_window, bool owner_events);
-               public unowned GLib.List list_axes ();
-               public unowned GLib.List list_slave_devices ();
+               public GLib.List<weak Gdk.Atom> list_axes ();
+               public GLib.List<weak Gdk.Atom>? list_slave_devices ();
                public void set_axis_use (uint index_, Gdk.AxisUse use);
                public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
                public bool set_mode (Gdk.InputMode mode);
                public void ungrab (uint32 time_);
                public void warp (Gdk.Screen screen, int x, int y);
-               public Gdk.Device associated_device { get; }
+               public Gdk.Device? associated_device { get; }
                [NoAccessorMethod]
                public Gdk.DeviceManager device_manager { owned get; construct; }
                public Gdk.Display display { get; construct; }
@@ -93,7 +93,7 @@ namespace Gdk {
                [NoAccessorMethod]
                public Gdk.InputSource input_source { get; construct; }
                public uint n_axes { get; }
-               public string name { get; construct; }
+               public string? name { get; construct; }
                [NoAccessorMethod]
                public Gdk.DeviceType type { get; construct; }
                public virtual signal void changed ();

diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index 379cee8d0c8b7cff0405cc19cb1dab103aeb37fd..a3b07cb4d6ff1da4721f7cb4eb361ca3b8de9768 100644 (file)
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -16,6 +16,11 @@ GdkDevice.axes is_array="1"
 GdkDevice.keys is_array="1"
 gdk_device_get_axis.axes is_array="1" no_array_length="1"
 gdk_device_get_axis.value is_out="1"
+gdk_device_get_history.events is_array="1" is_out="1" transfer_ownership="1"
+gdk_device_get_key.keyval is_out="1"
+gdk_device_get_key.modifiers is_out="1"
+gdk_device_get_state.axes is_array="1" no_array_length="1"
+gdk_device_get_state.mask is_out="1"
 GdkDeviceAxis is_value_type="1"
 GdkDeviceClass hidden="1"
 GdkDeviceKey is_value_type="1"

diff --git a/vapi/packages/gdk-3.0/gdk-3.0.metadata b/vapi/packages/gdk-3.0/gdk-3.0.metadata
index a27f9a2d27eafa077b105c77a66c8f5d40f04f58..77770dd3addbebb41ca1c3230aaa17fa43db750b 100644 (file)
--- a/vapi/packages/gdk-3.0/gdk-3.0.metadata
+++ b/vapi/packages/gdk-3.0/gdk-3.0.metadata
@@ -15,9 +15,25 @@ GdkCursor is_value_type="0"
 GdkDestroyNotify has_target="0"
 GdkDevice.axes is_array="1"
 GdkDevice.keys is_array="1"
+GdkDevice:associated-device nullable="1"
+GdkDevice:name nullable="1"
+gdk_device_get_associated_device nullable="1"
 gdk_device_get_axis.axes is_array="1" no_array_length="1"
 gdk_device_get_axis.value is_out="1"
+gdk_device_get_axis_value.axes is_array="1" no_array_length="1"
+gdk_device_get_axis_value.value is_out="1"
+gdk_device_get_position.screen is_out="1"
+gdk_device_get_position.x is_out="1"
+gdk_device_get_position.y is_out="1"
+gdk_device_get_window_at_position nullable="1"
 gdk_device_grab.cursor nullable="1"
+gdk_device_list_axes transfer_ownership="1" type_arguments="unowned Atom"
+gdk_device_list_slave_devices transfer_ownership="1" nullable="1" type_arguments="unowned Atom"
+gdk_device_get_history.events is_out="1" is_array="1" transfer_ownership="1"
+gdk_device_get_key.keyval is_out="1"
+gdk_device_get_key.modifiers is_out="1"
+gdk_device_get_state.axes is_array="1" no_array_length="1"
+gdk_device_get_state.mask is_out="1"
 GdkDeviceAxis is_value_type="1"
 GdkDeviceClass hidden="1"
 GdkDeviceKey is_value_type="1"