diff --git a/vapi/gdesktopenums-3.0.vapi b/vapi/gdesktopenums-3.0.vapi index dda47354..b12ca1c7 100644 --- a/vapi/gdesktopenums-3.0.vapi +++ b/vapi/gdesktopenums-3.0.vapi @@ -34,6 +34,14 @@ namespace GDesktop { SMART, STRICT } + [CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_LOCATION_ACCURACY_LEVEL_", has_type_id = false)] + public enum LocationAccuracyLevel { + COUNTRY, + CITY, + NEIGHBORHOOD, + STREET, + EXACT + } [CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_MAGNIFIER_CARET_TRACKING_MODE_", has_type_id = false)] public enum MagnifierCaretTrackingMode { NONE, diff --git a/vapi/gnome-desktop-3.0.vapi b/vapi/gnome-desktop-3.0.vapi index 98ac3674..c3280f8b 100644 --- a/vapi/gnome-desktop-3.0.vapi +++ b/vapi/gnome-desktop-3.0.vapi @@ -16,8 +16,6 @@ namespace Gnome { public static Gdk.Pixbuf scale_down_pixbuf (Gdk.Pixbuf pixbuf, int dest_width, int dest_height); } namespace Languages { - [CCode (array_length = false, array_null_terminated = true, cheader_filename = "libgnome-desktop/gnome-languages.h", cname = "gnome_get_all_languages")] - public static string[] get_all_languages (); [CCode (array_length = false, array_null_terminated = true, cheader_filename = "libgnome-desktop/gnome-languages.h", cname = "gnome_get_all_locales")] public static string[] get_all_locales (); [CCode (cheader_filename = "libgnome-desktop/gnome-languages.h", cname = "gnome_get_country_from_code")] @@ -47,7 +45,6 @@ namespace Gnome { public Gdk.Pixbuf create_thumbnail (Gnome.DesktopThumbnailFactory factory, Gdk.Screen screen, int dest_width, int dest_height); public void draw (Gdk.Pixbuf dest, Gdk.Screen screen, bool is_root); public void get_color (GDesktop.BackgroundShading type, Gdk.Color primary, Gdk.Color secondary); - public bool get_draw_background (); public unowned string get_filename (); public bool get_image_size (Gnome.DesktopThumbnailFactory factory, int best_width, int best_height, int width, int height); public GDesktop.BackgroundStyle get_placement (); @@ -57,7 +54,6 @@ namespace Gnome { public void load_from_preferences (GLib.Settings settings); public void save_to_preferences (GLib.Settings settings); public void set_color (GDesktop.BackgroundShading type, Gdk.Color primary, Gdk.Color secondary); - public void set_draw_background (bool draw_background); public void set_filename (string filename); public void set_placement (GDesktop.BackgroundStyle placement); public static void set_surface_as_root (Gdk.Screen screen, Cairo.Surface surface); @@ -152,9 +148,9 @@ namespace Gnome { [Compact] public class RRCrtc { public bool can_drive_output (Gnome.RROutput output); - public Gnome.RRMode get_current_mode (); + public unowned Gnome.RRMode get_current_mode (); public Gnome.RRRotation get_current_rotation (); - public bool get_gamma (int size, ushort red, ushort green, ushort blue); + public bool get_gamma (int size, out ushort red, out ushort green, out ushort blue); public uint32 get_id (); public void get_position (out int x, out int y); public Gnome.RRRotation get_rotations (); @@ -174,8 +170,8 @@ namespace Gnome { public class RROutput { public bool can_clone (Gnome.RROutput clone); public int get_backlight (); - public Gnome.RRCrtc get_crtc (); - public Gnome.RRMode get_current_mode (); + public unowned Gnome.RRCrtc get_crtc (); + public unowned Gnome.RRMode get_current_mode (); public unowned string get_display_name (); public uint8 get_edid_data (size_t size); public uint32 get_id (); @@ -185,10 +181,12 @@ namespace Gnome { public unowned string get_name (); public void get_physical_size (out int width_mm, out int height_mm); public void get_position (out int x, out int y); - public Gnome.RRCrtc get_possible_crtcs (); - public Gnome.RRMode get_preferred_mode (); + [CCode (array_length = false, array_null_terminated = true)] + public unowned Gnome.RRCrtc[] get_possible_crtcs (); + public unowned Gnome.RRMode get_preferred_mode (); public bool is_builtin_display (); - public Gnome.RRMode list_modes (); + [CCode (array_length = false, array_null_terminated = true)] + public unowned Gnome.RRMode[] list_modes (); public bool set_backlight (int value) throws GLib.Error; public bool supports_mode (Gnome.RRMode mode); } @@ -251,6 +249,7 @@ namespace Gnome { public WallClock (); public unowned string get_clock (); public unowned GLib.TimeZone get_timezone (); + public string string_for_datetime (GLib.DateTime now, GDesktop.ClockFormat clock_format, bool show_weekday, bool show_full_date, bool show_seconds); public string clock { get; } [NoAccessorMethod] public bool time_only { get; set; } diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi index eb280e93..c7da8981 100644 --- a/vapi/libmutter.vapi +++ b/vapi/libmutter.vapi @@ -216,6 +216,15 @@ namespace Meta { [CCode (cheader_filename = "meta/main.h", cname = "meta_warning")] public static void warning (string format, ...); } +#if HAS_MUTTER314 + [CCode (cheader_filename = "meta/main.h", type_id = "meta_backend_get_type ()")] + public abstract class Backend : GLib.Object { + [CCode (has_construct_function = false)] + protected Backend (); + public void lock_layout_group (uint idx); + public void set_keymap (string layouts, string variants, string options); + } +#endif [CCode (cheader_filename = "meta/meta-background.h", type_id = "meta_background_get_type ()")] public class Background : GLib.Object, Clutter.Content { [CCode (has_construct_function = false)] @@ -432,6 +441,9 @@ namespace Meta { public int get_xinput_opcode (); public uint grab_accelerator (string accelerator); public bool has_shape (); +#if HAS_MUTTER314 + public bool is_pointer_emulating_sequence (Clutter.EventSequence? sequence); +#endif public unowned Meta.Group lookup_group (X.Window group_leader); public bool remove_keybinding (string name); #if !HAS_MUTTER314 @@ -571,6 +583,11 @@ namespace Meta { [NoWrapper] public virtual void unmaximize (Meta.WindowActor actor, int x, int y, int width, int height); public void unmaximize_completed (Meta.WindowActor actor); +#if HAS_MUTTER314 + [NoWrapper] + public virtual void unminimize (Meta.WindowActor actor); + public void unminimize_completed (Meta.WindowActor actor); +#endif [NoWrapper] public virtual bool xevent_filter (X.Event event); #if !HAS_MUTTER314 @@ -681,6 +698,9 @@ namespace Meta { public bool update_area (int x, int y, int width, int height, Cairo.Region? unobscured_region); #else public void update_area (int x, int y, int width, int height); +#endif +#if HAS_MUTTER314 + public signal void size_changed (); #endif } [CCode (cheader_filename = "meta/theme.h")] @@ -1653,9 +1673,15 @@ namespace Meta { #if HAS_MUTTER314 [CCode (cheader_filename = "meta/main.h")] public static bool activate_session (); + [CCode (cheader_filename = "meta/main.h")] + public static void clutter_init (); #endif [CCode (cheader_filename = "meta/main.h")] public static void exit (Meta.ExitCode code); +#if HAS_MUTTER314 + [CCode (cheader_filename = "meta/main.h")] + public static unowned Meta.Backend get_backend (); +#endif [CCode (cheader_filename = "meta/main.h")] public static unowned GLib.OptionContext get_option_context (); [CCode (cheader_filename = "meta/main.h")]