From 93c703da4ee945b41797f53b42d22d75c92f9558 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 21 Jul 2015 14:38:09 +0200 Subject: [PATCH] vapi: Update GIR-based bindings --- vapi/clutter-1.0.vapi | 54 +++++++++++++++++++++++++++++ vapi/gio-2.0.vapi | 2 ++ vapi/gobject-introspection-1.0.vapi | 1 + vapi/gtksourceview-3.0.vapi | 54 +++++++++++++++++++++++++---- vapi/libgdata.vapi | 20 +++++------ vapi/poppler-glib.vapi | 1 + 6 files changed, 116 insertions(+), 16 deletions(-) diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi index a3cafcdb4..a62800f11 100644 --- a/vapi/clutter-1.0.vapi +++ b/vapi/clutter-1.0.vapi @@ -4678,6 +4678,7 @@ namespace Clutter { [NoWrapper] public virtual void apply_transform (ref Clutter.Matrix matrix); public Clutter.Vertex apply_transform_to_point (Clutter.Vertex point); + public void bind_model (GLib.ListModel model, owned Clutter.ActorCreateChildFunc create_child_func); public void clear_actions (); public void clear_constraints (); public void clear_effects (); @@ -5785,6 +5786,8 @@ namespace Clutter { public Clutter.ScrollEvent scroll; public Clutter.StageStateEvent stage_state; public Clutter.TouchEvent touch; + public Clutter.TouchpadPinchEvent touchpad_pinch; + public Clutter.TouchpadSwipeEvent touchpad_swipe; public Clutter.EventType type; [CCode (has_construct_function = false)] public Event (Clutter.EventType type); @@ -5803,6 +5806,11 @@ namespace Clutter { public float get_distance (Clutter.Event target); public unowned Clutter.EventSequence get_event_sequence (); public Clutter.EventFlags get_flags (); + public void get_gesture_motion_delta (out double dx, out double dy); + public Clutter.TouchpadGesturePhase get_gesture_phase (); + public double get_gesture_pinch_angle_delta (); + public double get_gesture_pinch_scale (); + public uint get_gesture_swipe_finger_count (); public uint16 get_key_code (); public uint get_key_symbol (); public unichar get_key_unicode (); @@ -6095,6 +6103,7 @@ namespace Clutter { public Clutter.LayoutManager manager { get; construct; } } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_list_model_get_type ()")] + [Deprecated (since = "1.24")] public class ListModel : Clutter.Model, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterModel*")] public ListModel (uint n_columns, ...); @@ -6114,6 +6123,7 @@ namespace Clutter { public void free (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_model_get_type ()")] + [Deprecated (since = "1.24")] public abstract class Model : GLib.Object, Clutter.Scriptable { [CCode (has_construct_function = false)] protected Model (); @@ -6155,6 +6165,7 @@ namespace Clutter { public virtual signal void sort_changed (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_model_iter_get_type ()")] + [Deprecated (since = "1.24")] public abstract class ModelIter : GLib.Object { [CCode (has_construct_function = false)] protected ModelIter (); @@ -7548,6 +7559,35 @@ namespace Clutter { public double axes; public weak Clutter.InputDevice device; } + [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] + public struct TouchpadPinchEvent { + public Clutter.EventType type; + public uint32 time; + public Clutter.EventFlags flags; + public weak Clutter.Stage stage; + public weak Clutter.Actor source; + public Clutter.TouchpadGesturePhase phase; + public float x; + public float y; + public float dx; + public float dy; + public float angle_delta; + public float scale; + } + [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] + public struct TouchpadSwipeEvent { + public Clutter.EventType type; + public uint32 time; + public Clutter.EventFlags flags; + public weak Clutter.Stage stage; + public weak Clutter.Actor source; + public Clutter.TouchpadGesturePhase phase; + public uint n_fingers; + public float x; + public float y; + public float dx; + public float dy; + } [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_UNITS")] public struct Units { public Clutter.Units? copy (); @@ -7742,6 +7782,8 @@ namespace Clutter { TOUCH_UPDATE, TOUCH_END, TOUCH_CANCEL, + TOUCHPAD_PINCH, + TOUCHPAD_SWIPE, EVENT_LAST } [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_")] @@ -8086,6 +8128,13 @@ namespace Clutter { FORWARD, BACKWARD } + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TOUCHPAD_GESTURE_PHASE_", type_id = "clutter_touchpad_gesture_phase_get_type ()")] + public enum TouchpadGesturePhase { + BEGIN, + UPDATE, + END, + CANCEL + } [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_", type_id = "clutter_unit_type_get_type ()")] public enum UnitType { PIXEL, @@ -8143,6 +8192,8 @@ namespace Clutter { public static GLib.Quark quark (); } [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] + public delegate Clutter.Actor ActorCreateChildFunc (GLib.Object item); + [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] [Deprecated (since = "1.12")] public delegate double AlphaFunc (Clutter.Alpha alpha); [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)] @@ -8155,10 +8206,13 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] public delegate bool EventFilterFunc (Clutter.Event event); [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)] + [Deprecated (since = "1.24")] public delegate bool ModelFilterFunc (Clutter.Model model, Clutter.ModelIter iter); [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)] + [Deprecated (since = "1.24")] public delegate bool ModelForeachFunc (Clutter.Model model, Clutter.ModelIter iter); [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 3.9)] + [Deprecated (since = "1.24")] public delegate int ModelSortFunc (Clutter.Model model, GLib.Value a, GLib.Value b); [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] public delegate void PathCallback (Clutter.PathNode node); diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 61b8413ef..e45891249 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -2157,6 +2157,8 @@ namespace GLib { public bool is_active (); public void start (); public void stop (); + [NoAccessorMethod] + public bool active { get; set construct; } public virtual signal bool incoming (GLib.SocketConnection connection, GLib.Object? source_object); } [CCode (cheader_filename = "gio/gio.h", cname = "GSource", ref_function = "g_source_ref", unref_function = "g_source_unref")] diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi index 1b3c698a0..d94a468f7 100644 --- a/vapi/gobject-introspection-1.0.vapi +++ b/vapi/gobject-introspection-1.0.vapi @@ -214,6 +214,7 @@ namespace GI { public class StructInfo : GI.BaseInfo { [CCode (has_construct_function = false)] protected StructInfo (); + public static GI.FieldInfo find_field (GI.StructInfo info, string name); public static GI.FunctionInfo find_method (GI.StructInfo info, string name); public static size_t get_alignment (GI.StructInfo info); public static GI.FieldInfo get_field (GI.StructInfo info, int n); diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi index 1e000cec5..10c9067fc 100644 --- a/vapi/gtksourceview-3.0.vapi +++ b/vapi/gtksourceview-3.0.vapi @@ -44,6 +44,7 @@ namespace Gtk { public void set_max_undo_levels (int max_undo_levels); public void set_style_scheme (Gtk.SourceStyleScheme? scheme); public void set_undo_manager (Gtk.SourceUndoManager? manager); + public void sort_lines (Gtk.TextIter start, Gtk.TextIter end, Gtk.SourceSortFlags flags, int column); [CCode (has_construct_function = false)] public SourceBuffer.with_language (Gtk.SourceLanguage language); [NoAccessorMethod] @@ -192,6 +193,8 @@ namespace Gtk { public static GLib.SList et_all (); [CCode (cname = "gtk_source_encoding_get_current")] public static unowned Gtk.SourceEncoding et_current (); + [CCode (cname = "gtk_source_encoding_get_default_candidates")] + public static GLib.SList et_default_candidates (); [CCode (cname = "gtk_source_encoding_get_from_charset")] public static unowned Gtk.SourceEncoding? et_from_charset (string charset); [CCode (cname = "gtk_source_encoding_get_utf8")] @@ -206,15 +209,22 @@ namespace Gtk { public class SourceFile : GLib.Object { [CCode (has_construct_function = false)] public SourceFile (); + public void check_file_on_disk (); public Gtk.SourceCompressionType get_compression_type (); public unowned Gtk.SourceEncoding get_encoding (); public unowned GLib.File get_location (); public Gtk.SourceNewlineType get_newline_type (); + public bool is_deleted (); + public bool is_externally_modified (); + public bool is_local (); + public bool is_readonly (); public void set_location (GLib.File? location); public Gtk.SourceCompressionType compression_type { get; } public Gtk.SourceEncoding encoding { get; } - public GLib.File location { get; set; } + public GLib.File location { get; set construct; } public Gtk.SourceNewlineType newline_type { get; } + [NoAccessorMethod] + public bool read_only { get; } } [CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_file_loader_get_type ()")] [GIR (name = "FileLoader")] @@ -335,13 +345,13 @@ namespace Gtk { [NoAccessorMethod] public int ypad { get; set construct; } [HasEmitter] - public virtual signal void activate (Gtk.TextIter iter, Cairo.RectangleInt area, Gdk.Event event); + public virtual signal void activate (Gtk.TextIter iter, Gdk.Rectangle area, Gdk.Event event); [HasEmitter] - public virtual signal bool query_activatable (Gtk.TextIter iter, Cairo.RectangleInt area, Gdk.Event event); + public virtual signal bool query_activatable (Gtk.TextIter iter, Gdk.Rectangle area, Gdk.Event event); [HasEmitter] public virtual signal void query_data (Gtk.TextIter start, Gtk.TextIter end, Gtk.SourceGutterRendererState state); [HasEmitter] - public virtual signal bool query_tooltip (Gtk.TextIter iter, Cairo.RectangleInt area, int x, int y, Gtk.Tooltip tooltip); + public virtual signal bool query_tooltip (Gtk.TextIter iter, Gdk.Rectangle area, int x, int y, Gtk.Tooltip tooltip); [HasEmitter] public virtual signal void queue_draw (); } @@ -371,8 +381,8 @@ namespace Gtk { public class SourceGutterRendererText : Gtk.SourceGutterRenderer { [CCode (has_construct_function = false, type = "GtkSourceGutterRenderer*")] public SourceGutterRendererText (); - public void measure (string text, int width, int height); - public void measure_markup (string markup, int width, int height); + public void measure (string text, out int width, out int height); + public void measure_markup (string markup, out int width, out int height); public void set_markup (string markup, int length); public void set_text (string text, int length); [NoAccessorMethod] @@ -421,6 +431,17 @@ namespace Gtk { [CCode (array_length = false, array_null_terminated = true)] public string[] search_path { get; set; } } + [CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_map_get_type ()")] + [GIR (name = "Map")] + public class SourceMap : Gtk.SourceView, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable { + [CCode (has_construct_function = false, type = "GtkWidget*")] + public SourceMap (); + public unowned Gtk.SourceView? get_view (); + public void set_view (Gtk.SourceView view); + [NoAccessorMethod] + public Pango.FontDescription font_desc { owned get; set; } + public Gtk.SourceView view { get; set; } + } [CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_mark_get_type ()")] [GIR (name = "Mark")] public class SourceMark : Gtk.TextMark { @@ -592,6 +613,8 @@ namespace Gtk { [NoAccessorMethod] public bool line_background_set { get; construct; } [NoAccessorMethod] + public Pango.Underline pango_underline { get; construct; } + [NoAccessorMethod] public string scale { owned get; construct; } [NoAccessorMethod] public bool scale_set { get; construct; } @@ -599,9 +622,14 @@ namespace Gtk { public bool strikethrough { get; construct; } [NoAccessorMethod] public bool strikethrough_set { get; construct; } + [Deprecated (since = "3.18")] [NoAccessorMethod] public bool underline { get; construct; } [NoAccessorMethod] + public string underline_color { owned get; construct; } + [NoAccessorMethod] + public bool underline_color_set { get; construct; } + [NoAccessorMethod] public bool underline_set { get; construct; } } [CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_get_type ()")] @@ -672,6 +700,7 @@ namespace Gtk { public bool get_show_line_marks (); public bool get_show_line_numbers (); public bool get_show_right_margin (); + public bool get_smart_backspace (); public Gtk.SourceSmartHomeEndType get_smart_home_end (); public uint get_tab_width (); public uint get_visual_column (Gtk.TextIter iter); @@ -688,6 +717,7 @@ namespace Gtk { public void set_show_line_marks (bool show); public void set_show_line_numbers (bool show); public void set_show_right_margin (bool show); + public void set_smart_backspace (bool smart_backspace); public void set_smart_home_end (Gtk.SourceSmartHomeEndType smart_home_end); public void set_tab_width (uint width); public void unindent_lines (Gtk.TextIter start, Gtk.TextIter end); @@ -705,9 +735,12 @@ namespace Gtk { public bool show_line_marks { get; set; } public bool show_line_numbers { get; set; } public bool show_right_margin { get; set; } + public bool smart_backspace { get; set; } public Gtk.SourceSmartHomeEndType smart_home_end { get; set; } public uint tab_width { get; set; } + public signal void change_case (Gtk.SourceChangeCaseType case_type); public signal void change_number (int count); + public signal void join_lines (); public virtual signal void line_mark_activated (Gtk.TextIter iter, Gdk.Event event); public virtual signal void move_lines (bool copy, int step); public signal void move_to_matching_bracket (bool extend_selection); @@ -854,6 +887,15 @@ namespace Gtk { AFTER, ALWAYS } + [CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_SORT_FLAGS_", type_id = "gtk_source_sort_flags_get_type ()")] + [Flags] + [GIR (name = "SortFlags")] + public enum SourceSortFlags { + NONE, + CASE_SENSITIVE, + REVERSE_ORDER, + REMOVE_DUPLICATES + } [CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_", type_id = "gtk_source_view_gutter_position_get_type ()")] [GIR (name = "ViewGutterPosition")] public enum SourceViewGutterPosition { diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi index ec0af6b03..8dec4e52d 100644 --- a/vapi/libgdata.vapi +++ b/vapi/libgdata.vapi @@ -160,9 +160,9 @@ namespace GData { public CalendarCalendar (string? id); public unowned string get_access_level (); public GData.Color get_color (); - [Deprecated] + [Deprecated (since = "0.17.2")] public int64 get_edited (); - [Deprecated] + [Deprecated (since = "0.17.2")] public uint get_times_cleaned (); public unowned string get_timezone (); public void set_color (GData.Color color); @@ -171,13 +171,13 @@ namespace GData { public void set_timezone (string? _timezone); public string access_level { get; } public GData.Color color { get; set; } - [Deprecated] + [Deprecated (since = "0.17.2")] public int64 edited { get; } [NoAccessorMethod] public bool is_hidden { get; set; } [NoAccessorMethod] public bool is_selected { get; set; } - [Deprecated] + [Deprecated (since = "0.17.2")] public uint times_cleaned { get; } public string timezone { get; set; } } @@ -235,13 +235,13 @@ namespace GData { public class CalendarFeed : GData.Feed { [CCode (has_construct_function = false)] protected CalendarFeed (); - [Deprecated] + [Deprecated (since = "0.17.2")] public uint get_times_cleaned (); - [Deprecated] + [Deprecated (since = "0.17.2")] public unowned string get_timezone (); - [Deprecated] + [Deprecated (since = "0.17.2")] public uint times_cleaned { get; } - [Deprecated] + [Deprecated (since = "0.17.2")] public string timezone { get; } } [CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_calendar_query_get_type ()")] @@ -291,9 +291,9 @@ namespace GData { public static unowned GData.AuthorizationDomain get_primary_authorization_domain (); public GData.CalendarEvent insert_calendar_event (GData.CalendarCalendar calendar, GData.CalendarEvent event, GLib.Cancellable? cancellable = null) throws GLib.Error; public async void insert_calendar_event_async (GData.CalendarCalendar calendar, GData.CalendarEvent event, GLib.Cancellable? cancellable); - [Deprecated] + [Deprecated (since = "0.17.2")] public GData.CalendarEvent insert_event (GData.CalendarEvent event, GLib.Cancellable? cancellable = null) throws GLib.Error; - [Deprecated] + [Deprecated (since = "0.17.2")] public async void insert_event_async (GData.CalendarEvent event, GLib.Cancellable? cancellable); public GData.Feed query_all_calendars (GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error; public async void query_all_calendars_async (GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback); diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi index 8f9485c28..863d0fa64 100644 --- a/vapi/poppler-glib.vapi +++ b/vapi/poppler-glib.vapi @@ -125,6 +125,7 @@ namespace Poppler { public void set_opacity (double opacity); public void set_popup (Poppler.Rectangle popup_rect); public void set_popup_is_open (bool is_open); + public void set_popup_rectangle (Poppler.Rectangle poppler_rect); } [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_movie_get_type ()")] public class AnnotMovie : Poppler.Annot { -- 2.47.2