From 0631debf0e2132de052c906e830eb23477251ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Mon, 8 Aug 2022 20:46:04 +0000 Subject: [PATCH] Add support for Mutter 43 (#1451) --- meson.build | 11 ++ vapi/Clutter-11-custom.vala | 53 ++++++++++ vapi/Clutter-11.metadata | 186 +++++++++++++++++++++++++++++++++ vapi/Cogl-11-custom.vala | 161 ++++++++++++++++++++++++++++ vapi/Cogl-11.metadata | 66 ++++++++++++ vapi/Meta-11.metadata | 184 ++++++++++++++++++++++++++++++++ vapi/libmutter-11.deps | 1 + vapi/libmutter-11.vapi | 1 + vapi/libmutter.vapi | 77 +++++++++++++- vapi/meson.build | 72 +++++++++++++ vapi/mutter-clutter-11.deps | 6 ++ vapi/mutter-clutter-11.vapi | 1 + vapi/mutter-clutter.vapi | 101 +++++++++++++++++- vapi/mutter-cogl-11.deps | 1 + vapi/mutter-cogl-11.vapi | 1 + vapi/mutter-cogl-6.deps | 2 + vapi/mutter-cogl-pango-11.vapi | 1 + 17 files changed, 915 insertions(+), 10 deletions(-) create mode 100644 vapi/Clutter-11-custom.vala create mode 100644 vapi/Clutter-11.metadata create mode 100644 vapi/Cogl-11-custom.vala create mode 100644 vapi/Cogl-11.metadata create mode 100644 vapi/Meta-11.metadata create mode 120000 vapi/libmutter-11.deps create mode 120000 vapi/libmutter-11.vapi create mode 100644 vapi/mutter-clutter-11.deps create mode 120000 vapi/mutter-clutter-11.vapi create mode 120000 vapi/mutter-cogl-11.deps create mode 120000 vapi/mutter-cogl-11.vapi create mode 120000 vapi/mutter-cogl-pango-11.vapi diff --git a/meson.build b/meson.build index 8ce7892b..800aba66 100644 --- a/meson.build +++ b/meson.build @@ -166,6 +166,17 @@ if mutter42_dep.found() vala_flags = ['--define', 'HAS_MUTTER338', '--define', 'HAS_MUTTER40', '--define', 'HAS_MUTTER41', '--define', 'HAS_MUTTER42'] endif +mutter43_dep = dependency('libmutter-11', version: ['>= 43', '< 44'], required: false) +if mutter43_dep.found() + libmutter_dep = dependency('libmutter-11', version: '>= 43') + mutter_dep = [ + libmutter_dep, + dependency('mutter-cogl-11'), dependency('mutter-cogl-pango-11'), + dependency('mutter-clutter-11') + ] + vala_flags = ['--define', 'HAS_MUTTER338', '--define', 'HAS_MUTTER40', '--define', 'HAS_MUTTER41', '--define', 'HAS_MUTTER42', '--define', 'HAS_MUTTER43'] +endif + if mutter_dep.length() == 0 error ('No supported mutter library found!') endif diff --git a/vapi/Clutter-11-custom.vala b/vapi/Clutter-11-custom.vala new file mode 100644 index 00000000..e5c71c2d --- /dev/null +++ b/vapi/Clutter-11-custom.vala @@ -0,0 +1,53 @@ +namespace Clutter { + public struct Color { + [CCode (cname = "_vala_clutter_color_from_hls")] + public static Clutter.Color? from_hls (float hue, float luminance, float saturation) { + var color = Clutter.Color.alloc (); + color.init_from_hls (hue, luminance, saturation); + return color; + } + [CCode (cname = "_vala_clutter_color_from_pixel")] + public static Clutter.Color? from_pixel (uint32 pixel) { + var color = Clutter.Color.alloc (); + color.init_from_pixel (pixel); + return color; + } + [CCode (cname = "_vala_clutter_color_from_string")] + public static Clutter.Color? from_string (string str) { + var color = Clutter.Color.alloc (); + color.init_from_string (str); + return color; + } + [CCode (cname = "clutter_color_from_string")] + public bool parse_string (string str); + } + + public interface Container : GLib.Object { + public void add (params Clutter.Actor[] actors); + [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")] + public class unowned GLib.ParamSpec[] list_child_properties (); + } + + public struct Units { + [CCode (cname = "clutter_units_from_cm")] + public Units.from_cm (float cm); + [CCode (cname = "clutter_units_from_em")] + public Units.from_em (float em); + [CCode (cname = "clutter_units_from_em_for_font")] + public Units.from_em_for_font (string font_name, float em); + [CCode (cname = "clutter_units_from_mm")] + public Units.from_mm (float mm); + [CCode (cname = "clutter_units_from_pixels")] + public Units.from_pixels (int px); + [CCode (cname = "clutter_units_from_pt")] + public Units.from_pt (float pt); + [CCode (cname = "clutter_units_from_string")] + public Units.from_string (string str); + } + + [CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)] + public struct Capture { + } +} diff --git a/vapi/Clutter-11.metadata b/vapi/Clutter-11.metadata new file mode 100644 index 00000000..6fe61c1d --- /dev/null +++ b/vapi/Clutter-11.metadata @@ -0,0 +1,186 @@ +// Non mini-object +ActorBox struct +Color struct +Knot struct +Margin struct +PaintVolume struct +PathNode struct +Perspective struct +Units struct + +*.ref unowned + +Actor + .apply_transform.matrix ref + .get_abs_allocation_vertices.verts out=false +Canvas + .new symbol_type="constructor" +Event.type#method name="get_type" +Image + .new symbol_type="constructor" + +// ??? +Actor.has_pointer#method name="get_has_pointer" +ScriptError errordomain + +// Not all backing symbols are deprecated +Actor.pick deprecated=false + +// Nullable return values +Actor + .get_parent nullable +value_get_color nullable + +// method/virtual-method/signal don't match +Actor + .event#method name="emit_event" + .get_paint_volume#virtual_method name="get_paint_volume_vfunc" + .get_paint_volume#virtual_method.volume out +Container + .add_actor skip=false + .class_* skip +Text + .activate#method name="try_activate" + .insert_text#signal skip +TextBuffer.get_text#virtual_method name="get_text_with_length" + +// virtual/abstract distinction +Container + .*_child_meta#virtual_method virtual + +// Default values +Stage.read_pixels + .width default=-1 + .height default=-1 +Stage.paint_to_buffer + .data type="uint8[]" +Text + .position_to_coords.line_height default=null + +// Skipped by g-i for unknown reasons +LayoutManager + .create_child_meta skip=false + +// Variadic arguments +Backend + .get_cogl_context skip=false +Container + .child_get skip=false + .child_set skip=false + .remove 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 +Script + .get_objects skip=false + +// Skipped upstream for unknown reasons +Interval.register_progress_func skip=false +threads_add_idle skip=false +threads_add_idle_full skip=false +threads_add_timeout skip=false +threads_add_timeout_full skip=false + +// struct/class confusion +ActorBox + .new skip + .from_vertices skip +Units.from_* skip +Margin + .new skip + +// Class methods +container_class_find_child_property skip +container_class_list_child_properties skip + +// Move symbols +units_from_* skip + +// Struct return values +color_get_static nullable + +// Upstream +Event + .get_position.position out + +FrameListenerIface skip +FrameClock.new skip + +// Remove for clutter-2.0 +///////////////////////// + +StageView.layout skip + +Stage + .paint_view.redraw_clip type="Cairo.Region" + +Capture + .image type="Cairo.ImageSurface" + +// *Event should be compact classes derived from Clutter.Event +Event.type skip=false +AnyEvent struct=false base_type="Clutter.Event" +ButtonEvent struct=false base_type="Clutter.Event" +CrossingEvent struct=false base_type="Clutter.Event" +DeviceEvent struct=false base_type="Clutter.Event" +IMEvent struct=false base_type="Clutter.Event" +KeyEvent struct=false base_type="Clutter.Event" +MotionEvent struct=false base_type="Clutter.Event" +PadButtonEvent struct=false base_type="Clutter.Event" +PadRingEvent struct=false base_type="Clutter.Event" +PadStripEvent struct=false base_type="Clutter.Event" +ProximityEvent struct=false base_type="Clutter.Event" +ScrollEvent struct=false base_type="Clutter.Event" +TouchEvent struct=false base_type="Clutter.Event" +TouchpadHoldEvent struct=false base_type="Clutter.Event" +TouchpadPinchEvent struct=false base_type="Clutter.Event" +TouchpadSwipeEvent struct=false base_type="Clutter.Event" + +// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X +*#constant skip +COGL skip=false +CURRENT_TIME skip=false +FLAVOUR skip=false +PATH_RELATIVE skip=false +PRIORITY_REDRAW skip=false + +// Clutter devs don't like us creating nested namespaces +value_* name="value_(.+)" parent="Clutter.Value" +threads_* name="threads_(.+)" parent="Clutter.Threads" +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" + +// Backwards compatibility +Color.alloc symbol_type="function" + +Color.from_hls name="init_from_hls" +Color.from_pixel name="init_from_pixel" +Color.from_string name="init_from_string" + +Color.new name="from_rgba" symbol_type="function" + .alpha default=0 + .blue default=0 + .green default=0 + .red default=0 + +Color.init + .alpha default=0 + .blue default=0 + .green default=0 + .red default=0 + +BinAlignment deprecated=false deprecated_since=null +BinAlignment.* deprecated +BinAlignment.start deprecated=false +BinLayout.new.*_align default=Clutter.BinAlignment.START + +// Possibly keep +KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key" diff --git a/vapi/Cogl-11-custom.vala b/vapi/Cogl-11-custom.vala new file mode 100644 index 00000000..f6034717 --- /dev/null +++ b/vapi/Cogl-11-custom.vala @@ -0,0 +1,161 @@ +namespace Cogl { + public struct Color { + [Version (since = "1.4")] + [CCode (cname="cogl_color_init_from_4f")] + public Color.from_4f (float red, float green, float blue, float alpha); + [Version (since = "1.4")] + [CCode (cname="cogl_color_init_from_4fv")] + public Color.from_4fv (float color_array); + [Version (since = "1.4")] + [CCode (cname="cogl_color_init_from_4ub")] + public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha); + [Version (since = "1.16")] + [CCode (cname="cogl_color_init_from_hsl")] + public Color.from_hsl (float hue, float saturation, float luminance); + } + + [Compact] + [CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_object_ref", unref_function = "cogl_object_unref")] + public class Shader : Cogl.Handle { + } + + [CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_primitive_get_gtype ()")] + public class Primitive : Cogl.Object { + [CCode (has_construct_function = false)] + protected Primitive (); + [Version (since = "1.10")] + public Cogl.Primitive copy (); + [Version (since = "1.16")] + public void draw (Cogl.Framebuffer framebuffer, Cogl.Pipeline pipeline); + public int get_first_vertex (); + public Cogl.VerticesMode get_mode (); + [Version (since = "1.8")] + public int get_n_vertices (); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p2 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP2[] data); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p2c4 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP2C4[] data); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p2t2 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP2T2[] data); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p2t2c4 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP2T2C4[] data); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p3 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP3[] data); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p3c4 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP3C4[] data); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p3t2 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP3T2[] data); + [CCode (has_construct_function = false)] + [Version (since = "1.6")] + public Primitive.p3t2c4 (Cogl.Context context, Cogl.VerticesMode mode, [CCode (array_length_cname = "n_vertices", array_length_pos = 2.5)] Cogl.VertexP3T2C4[] data); + public void set_first_vertex (int first_vertex); + public void set_mode (Cogl.VerticesMode mode); + [Version (since = "1.8")] + public void set_n_vertices (int n_vertices); + } + + [Compact] + [CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_object_ref", unref_function = "cogl_object_unref")] + public class Program : Cogl.Handle { + } + + [Compact] + [CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_object_ref", unref_function = "cogl_object_unref")] + public class Handle { + [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_material")] + [Version (deprecated = true, deprecated_since = "1.16")] + public bool is_material (); + [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_program")] + [Version (deprecated = true, deprecated_since = "1.16")] + public bool is_program (Cogl.Handle handle); + [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_shader")] + [Version (deprecated = true, deprecated_since = "1.16")] + public bool is_shader (); + [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_texture")] + public bool is_texture (); + } + + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP2 { + public float x; + public float y; + } + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP2C4 { + public float x; + public float y; + public uint8 r; + public uint8 g; + public uint8 b; + public uint8 a; + } + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP2T2 { + public float x; + public float y; + public float s; + public float t; + } + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP2T2C4 { + public float x; + public float y; + public float s; + public float t; + public uint8 r; + public uint8 g; + public uint8 b; + public uint8 a; + } + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP3 { + public float x; + public float y; + public float z; + } + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP3C4 { + public float x; + public float y; + public float z; + public uint8 r; + public uint8 g; + public uint8 b; + public uint8 a; + } + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP3T2 { + public float x; + public float y; + public float z; + public float s; + public float t; + } + [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)] + [Version (since = "1.6")] + public struct VertexP3T2C4 { + public float x; + public float y; + public float z; + public float s; + public float t; + public uint8 r; + public uint8 g; + public uint8 b; + public uint8 a; + } +} diff --git a/vapi/Cogl-11.metadata b/vapi/Cogl-11.metadata new file mode 100644 index 00000000..dc7218fe --- /dev/null +++ b/vapi/Cogl-11.metadata @@ -0,0 +1,66 @@ +* cheader_filename="cogl/cogl.h" + +Color struct + +_ColorSizeCheck skip +_TextureVertexSizeCheck skip + +Color.equal.v1 type="Cogl.Color" +Color.equal.v2 type="Cogl.Color" +color_equal skip + +Context.free_timestamp_query.query owned + +Texture + .get_data.data type="uint8[]" + .set_data.data type="uint8[]" + .set_region.data type="uint8[]" + +Texture2D + .new_from_data skip=false + .new_from_data.data array=true + +shader_* name="shader_(.+)" parent="Cogl.Shader" +shader_* symbol_type="method" instance_idx=0 + +program_* name="program_(.+)" parent="Cogl.Program" +program_attach_shader symbol_type="method" instance_idx=0 +program_get_uniform_location symbol_type="method" instance_idx=0 +program_link symbol_type="method" instance_idx=0 +program_set_uniform_1f symbol_type="method" instance_idx=0 +program_set_uniform_1i symbol_type="method" instance_idx=0 +program_set_uniform_float symbol_type="method" instance_idx=0 +program_set_uniform_int symbol_type="method" instance_idx=0 +program_set_uniform_matrix symbol_type="method" instance_idx=0 + +is_bitmap parent="Cogl.Object" symbol_type="method" instance_idx=0 +is_program parent="Cogl.Handle" +is_shader parent="Cogl.Handle" +is_texture parent="Cogl.Object" symbol_type="method" instance_idx=0 +is_context parent="Cogl.Object" symbol_type="method" instance_idx=0 +is_framebuffer parent="Cogl.Object" symbol_type="method" instance_idx=0 +is_frame_info parent="Cogl.Object" symbol_type="method" instance_idx=0 +is_pipeline parent="Cogl.Object" symbol_type="method" instance_idx=0 +is_texture_2d parent="Cogl.Object" symbol_type="method" instance_idx=0 +is_texture_2d_sliced parent="Cogl.Object" symbol_type="method" instance_idx=0 + +create_program type="unowned Cogl.Program" name="create" parent="Cogl.Program" +create_shader type="unowned Cogl.Shader" name="create" parent="Cogl.Shader" + +foreach_feature parent="Cogl.Context" symbol_type="method" instance_idx=0 +get_graphics_reset_status parent="Cogl.Context" symbol_type="method" instance_idx=0 +has_feature parent="Cogl.Context" symbol_type="method" instance_idx=0 + +Bitmap.error_quark parent="Cogl.BitmapError" name="quark" +Texture.error_quark parent="Cogl.TextureError" name="quark" +texture_error_quark skip +Scanout.error_quark parent="Cogl.ScanoutError" name="quark" +scanout_error_quark skip + +BitmapError errordomain +BlendStringError errordomain +RendererError errordomain +SystemError errordomain +TextureError errordomain +FramebufferError errordomain +ScanoutError errordomain diff --git a/vapi/Meta-11.metadata b/vapi/Meta-11.metadata new file mode 100644 index 00000000..89d83728 --- /dev/null +++ b/vapi/Meta-11.metadata @@ -0,0 +1,184 @@ +* skip=false +*.* skip=false +* cheader_filename="meta/main.h" + +Backend cheader_filename="meta/meta-backend.h" +Backend.gpu_added skip +get_backend parent="Meta.Backend" cheader_filename="meta/meta-backend.h" +Background cheader_filename="meta/meta-background.h" +Background.set_file.file nullable +BackgroundContent.new symbol_type="constructor" +BackgroundActor cheader_filename="meta/meta-background-actor.h" +BackgroundContent cheader_filename="meta/meta-background-content.h" +BackgroundGroup cheader_filename="meta/meta-background-group.h" +BackgroundImage cheader_filename="meta/meta-background-image.h" +BackgroundImageCache cheader_filename="meta/meta-background-image.h" +Barrier cheader_filename="meta/barrier.h" +BarrierDirection cheader_filename="meta/barrier.h" +BarrierEvent cheader_filename="meta/barrier.h" +ButtonFunction cheader_filename="meta/common.h" +ButtonLayout cheader_filename="meta/common.h" +Compositor cheader_filename="meta/compositor.h" +Compositor.sync_stack.stack type_arguments="Meta.Window" +get_feedback_group_for_display parent="Meta.Display" symbol_type="method" name="get_feedback_group" instance_idx=0 cheader_filename="meta/compositor-mutter.h" +get_stage_for_display parent="Meta.Display" symbol_type="method" name="get_stage" instance_idx=0 cheader_filename="meta/compositor-mutter.h" +get_top_window_group_for_display parent="Meta.Display" symbol_type="method" name="get_top_window_group" instance_idx=0 cheader_filename="meta/compositor-mutter.h" +get_window_group_for_display parent="Meta.Display" symbol_type="method" name="get_window_group" instance_idx=0 cheader_filename="meta/compositor-mutter.h" +disable_unredirect_for_display parent="Meta.Display" symbol_type="method" name="disable_unredirect" instance_idx=0 cheader_filename="meta/compositor-mutter.h" +enable_unredirect_for_display parent="Meta.Display" symbol_type="method" name="enable_unredirect" instance_idx=0 cheader_filename="meta/compositor-mutter.h" + +get_window_actors parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h" type_arguments="Meta.WindowActor" +focus_stage_window parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h" + +CompEffect cheader_filename="meta/compositor.h" +CloseDialog cheader_filename="meta/meta-close-dialog.h" +CloseDialogResponse cheader_filename="meta/meta-close-dialog.h" +Context cheader_filename="meta/meta-context.h" +CompositorType cheader_filename="meta/meta-enums.h" +Cursor cheader_filename="meta/common.h" +CursorTracker cheader_filename="meta/meta-cursor-tracker.h" +CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker" +CursorTracker.get_pointer.mods out +DebugTopic cheader_filename="meta/util.h" +DebugPaintFlag cheader_filename="meta/util.h" +Direction cheader_filename="meta/common.h" +Display cheader_filename="meta/display.h" +DisplayCorner cheader_filename="meta/display.h" +DisplayDirection cheader_filename="meta/display.h" +Dnd cheader_filename="meta/meta-dnd.h" +EdgeType cheader_filename="meta/boxes.h" +Edge cheader_filename="meta/boxes.h" +Frame cheader_filename="meta/types.h" +FrameBorders cheader_filename="meta/common.h" +FrameFlags cheader_filename="meta/common.h" +FrameType cheader_filename="meta/common.h" +GrabOp cheader_filename="meta/common.h" +Gravity cheader_filename="meta/common.h" +Group cheader_filename="meta/group.h" +Group.property_notify.event type="X.Event" ref +IdleMonitor cheader_filename="meta/meta-idle-monitor.h" +IdleMonitorWatchFunc cheader_filename="meta/meta-idle-monitor.h" +InhibitShortcutsDialog cheader_filename="meta/meta-inhibit-shortcuts-dialog.h" +InhibitShortcutsDialogResponse cheader_filename="meta/meta-inhibit-shortcuts-dialog.h" +KeyboardA11yFlags cheader_filename="meta/meta-enums.h" +KeyBinding cheader_filename="meta/keybindings.h" +keybindings_set_custom_handler parent="Meta.KeyBinding" name="set_custom_handler" cheader_filename="meta/keybindings.h" +KeyBindingAction cheader_filename="meta/prefs.h" +KeyBindingFlags cheader_filename="meta/prefs.h" +KeyHandlerFunc cheader_filename="meta/prefs.h" +KeyHandlerFunc.event type="Clutter.KeyEvent?" +KeyHandlerFunc.window nullable +LaunchContext cheader_filename="meta/meta-launch-context.h" +Laters cheader_filename="meta/types.h" +LaterType cheader_filename="meta/util.h" +LocaleDirection cheader_filename="meta/util.h" +MaximizeFlags cheader_filename="meta/window.h" +MonitorManager cheader_filename="meta/meta-monitor-manager.h" +MonitorSwitchConfigType cheader_filename="meta/meta-monitor-manager.h" +MotionDirection cheader_filename="meta/common.h" +PadActionType cheader_filename="meta/display.h" +Plugin cheader_filename="meta/meta-plugin.h" +Plugin.xevent_filter.event type="X.Event" ref +PluginInfo cheader_filename="meta/meta-plugin.h" +Preference cheader_filename="meta/prefs.h" +PrefsChangedFunc cheader_filename="meta/prefs.h" +Rectangle cheader_filename="meta/boxes.h" struct +RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h" +RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h" +Selection cheader_filename="meta/meta-selection.h" +SelectionSource cheader_filename="meta/meta-selection-source.h" +SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h" +SelectionType cheader_filename="meta/meta-selection-source.h" +Settings cheader_filename="meta/meta-settings.h" +Shadow cheader_filename="meta/meta-shadow-factory.h" +ShadowFactory cheader_filename="meta/meta-shadow-factory.h" +ShadowMode cheader_filename="meta/meta-window-actor.h" +ShadowParams cheader_filename="meta/meta-shadow-factory.h" +ShapedTexture cheader_filename="meta/meta-shaped-texture.h" +Side cheader_filename="meta/common.h" +SizeChange cheader_filename="meta/compositor.h" +SoundPlayer cheader_filename="meta/meta-sound-player.h" +StartupNotification cheader_filename="meta/meta-startup-notification.h" +StartupNotification.changed.object type="Meta.StartupSequence" +StartupNotification.get_sequences type_arguments="Meta.StartupSequence" +StartupSequence cheader_filename="meta/meta-startup-notification.h" +StackLayer cheader_filename="meta/common.h" +Stage cheader_filename="meta/meta-stage.h" +Stage.is_focused parent="Meta.Display" symbol_type="method" name="stage_is_focused" instance_idx=0 cheader_filename="meta/compositor-mutter.h" +Strut cheader_filename="meta/boxes.h" +TabList cheader_filename="meta/display.h" +TabShowType cheader_filename="meta/display.h" +Theme cheader_filename="meta/theme.h" +theme_get_default cheader_filename="meta/theme.h" +theme_new cheader_filename="meta/theme.h" +VirtualModifier cheader_filename="meta/common.h" +WaylandClient cheader_filename="meta/meta-wayland-client.h" +Workspace cheader_filename="meta/workspace.h" +WorkspaceManager cheader_filename="meta/meta-workspace-manager.h" +Window cheader_filename="meta/window.h" +Window.focus#signal name="focused" +Window.icon type="Cairo.Surface" +Window.mini_icon type="Cairo.Surface" +WindowActor cheader_filename="meta/meta-window-actor.h" +WindowClientType cheader_filename="meta/window.h" +WindowForeachFunc cheader_filename="meta/window.h" +WindowGroup cheader_filename="meta/meta-window-group.h" +WindowMenuType cheader_filename="meta/compositor.h" +WindowShape cheader_filename="meta/meta-window-shape.h" +WindowType cheader_filename="meta/window.h" +X11Display cheader_filename="meta/meta-x11-display.h" + +// As per https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2287 +MonitorManager.monitor_privacy_screen_changed skip + +rect skip +prefs_* parent="Meta.Prefs" name="prefs_(.+)" cheader_filename="meta/prefs.h" + +g_utf8_strndup skip + +preference_to_string cheader_filename="meta/prefs.h" +frame_type_to_string cheader_filename="meta/util.h" +topic_to_string parent="Meta.DebugTopic" name="to_string" cheader_filename="meta/util.h" + +CURRENT_TIME cheader_filename="meta/common.h" +ICON_WIDTH cheader_filename="meta/common.h" +ICON_HEIGHT cheader_filename="meta/common.h" +MINI_ICON_WIDTH cheader_filename="meta/common.h" +MINI_ICON_HEIGHT cheader_filename="meta/common.h" +DEFAULT_ICON_NAME cheader_filename="meta/common.h" +PRIORITY_RESIZE cheader_filename="meta/common.h" +PRIORITY_BEFORE_REDRAW cheader_filename="meta/common.h" +PRIORITY_REDRAW cheader_filename="meta/common.h" +PRIORITY_PREFS_NOTIFY cheader_filename="meta/common.h" +VIRTUAL_CORE_POINTER_ID cheader_filename="meta/common.h" +VIRTUAL_CORE_KEYBOARD_ID cheader_filename="meta/common.h" + +Display.window_visibility_updated + .object name="unplaced" type="GLib.List" + .p0 name="should_show" type="GLib.List" + .p1 name="should_hide" type="GLib.List" + +add_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h" +bug parent="Meta.Util" cheader_filename="meta/util.h" +external_binding_name_for_action parent="Meta.Util" cheader_filename="meta/util.h" +fatal parent="Meta.Util" cheader_filename="meta/util.h" +get_locale_direction parent="Meta.Util" cheader_filename="meta/util.h" +is_verbose parent="Meta.Util" cheader_filename="meta/util.h" +is_wayland_compositor parent="Meta.Util" cheader_filename="meta/util.h" +later_add parent="Meta.Util" cheader_filename="meta/util.h" +later_remove parent="Meta.Util" cheader_filename="meta/util.h" +pop_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h" +push_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h" +remove_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h" +unsigned_long_equal parent="Meta.Util" name="ulong_equal" cheader_filename="meta/util.h" +unsigned_long_equal.v1 type="ulong?" +unsigned_long_equal.v2 type="ulong?" +unsigned_long_hash parent="Meta.Util" name="ulong_hash" cheader_filename="meta/util.h" +unsigned_long_hash.v type="ulong?" +warning parent="Meta.Util" cheader_filename="meta/util.h" +create_context parent="Meta.Context" name="new" symbol_type="constructor" cheader_filename="meta/meta-context.h" + +x11_error_trap_pop parent="Meta.X11Display" symbol_type="method" name="error_trap_pop" instance_idx=0 cheader_filename="meta/meta-x11-errors.h" +x11_error_trap_pop_with_return parent="Meta.X11Display" symbol_type="method" name="error_trap_pop_with_return" instance_idx=0 cheader_filename="meta/meta-x11-errors.h" +x11_error_trap_push parent="Meta.X11Display" symbol_type="method" name="error_trap_push" instance_idx=0 cheader_filename="meta/meta-x11-errors.h" +x11_init_gdk_display parent="Meta.X11Display" cheader_filename="meta/meta-x11-display.h" diff --git a/vapi/libmutter-11.deps b/vapi/libmutter-11.deps new file mode 120000 index 00000000..2abaae88 --- /dev/null +++ b/vapi/libmutter-11.deps @@ -0,0 +1 @@ +libmutter-10.deps \ No newline at end of file diff --git a/vapi/libmutter-11.vapi b/vapi/libmutter-11.vapi new file mode 120000 index 00000000..0dc007f2 --- /dev/null +++ b/vapi/libmutter-11.vapi @@ -0,0 +1 @@ +libmutter-10.vapi \ No newline at end of file diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi index 5edcddb1..b74b81ea 100644 --- a/vapi/libmutter.vapi +++ b/vapi/libmutter.vapi @@ -113,8 +113,10 @@ namespace Meta { [CCode (cheader_filename = "meta/util.h", cname = "meta_is_debugging")] public static bool is_debugging (); #endif +#if !HAS_MUTTER43 [CCode (cheader_filename = "meta/util.h", cname = "meta_is_syncing")] public static bool is_syncing (); +#endif [CCode (cheader_filename = "meta/util.h", cname = "meta_is_verbose")] public static bool is_verbose (); [CCode (cheader_filename = "meta/util.h", cname = "meta_is_wayland_compositor")] @@ -135,8 +137,10 @@ namespace Meta { [CCode (cheader_filename = "meta/main.h", cname = "meta_set_wm_name")] public static void set_wm_name (string wm_name); #endif +#if !HAS_MUTTER43 [CCode (cheader_filename = "meta/util.h", cname = "meta_show_dialog")] public static GLib.Pid show_dialog (string type, string message, string? timeout = null, string? display = null, string? ok_text = null, string? cancel_text = null, string? icon_name = null, int transient_for = 0, GLib.SList? columns = null, GLib.SList? entries = null); +#endif #if !HAS_MUTTER42 [CCode (cheader_filename = "meta/util.h", cname = "meta_topic_real")] public static void topic_real (Meta.DebugTopic topic, string format, ...); @@ -826,7 +830,7 @@ namespace Meta { public static unowned Meta.Theme @new (); } #if HAS_MUTTER338 - [CCode (cheader_filename = "meta/main.h", type_id = "meta_wayland_client_get_type ()")] + [CCode (cheader_filename = "meta/meta-wayland-client.h", type_id = "meta_wayland_client_get_type ()")] public class WaylandClient : GLib.Object { [CCode (has_construct_function = false)] public WaylandClient (GLib.SubprocessLauncher launcher) throws GLib.Error; @@ -1255,7 +1259,7 @@ namespace Meta { NONE } #if HAS_MUTTER41 - [CCode (cheader_filename = "meta/main.h", cprefix = "META_COMPOSITOR_TYPE_", type_id = "meta_compositor_type_get_type ()")] + [CCode (cheader_filename = "meta/meta-enums.h", cprefix = "META_COMPOSITOR_TYPE_", type_id = "meta_compositor_type_get_type ()")] public enum CompositorType { WAYLAND, X11 @@ -1288,7 +1292,7 @@ namespace Meta { LAST } #if HAS_MUTTER338 - [CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")] + [CCode (cheader_filename = "meta/util.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")] [Flags] public enum DebugPaintFlag { NONE, @@ -1340,7 +1344,9 @@ namespace Meta { BACKEND, RENDER, #endif - DBUS + DBUS; + [CCode (cheader_filename = "meta/util.h", cname = "meta_topic_to_string")] + public unowned string to_string (); } [CCode (cheader_filename = "meta/common.h", cprefix = "META_DIRECTION_", type_id = "meta_direction_get_type ()")] [Flags] @@ -1374,7 +1380,11 @@ namespace Meta { MONITOR, SCREEN } +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h", cprefix = "META_EXIT_", type_id = "meta_exit_code_get_type ()")] +#else [CCode (cheader_filename = "meta/main.h", cprefix = "META_EXIT_", type_id = "meta_exit_code_get_type ()")] +#endif public enum ExitCode { SUCCESS, ERROR @@ -1441,7 +1451,7 @@ namespace Meta { KEYBOARD_RESIZING_SE, KEYBOARD_RESIZING_W } - [CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAVITY_", type_id = "meta_gravity_get_type ()")] + [CCode (cheader_filename = "meta/common.h", cprefix = "META_GRAVITY_", type_id = "meta_gravity_get_type ()")] public enum Gravity { NONE, NORTH_WEST, @@ -1571,6 +1581,26 @@ namespace Meta { IGNORE_AUTOREPEAT, NO_AUTO_GRAB } +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-enums.h", cprefix = "META_A11Y_", type_id = "meta_keyboard_a11y_flags_get_type ()")] + [Flags] + public enum KeyboardA11yFlags { + KEYBOARD_ENABLED, + TIMEOUT_ENABLED, + MOUSE_KEYS_ENABLED, + SLOW_KEYS_ENABLED, + SLOW_KEYS_BEEP_PRESS, + SLOW_KEYS_BEEP_ACCEPT, + SLOW_KEYS_BEEP_REJECT, + BOUNCE_KEYS_ENABLED, + BOUNCE_KEYS_BEEP_REJECT, + TOGGLE_KEYS_ENABLED, + STICKY_KEYS_ENABLED, + STICKY_KEYS_TWO_KEY_OFF, + STICKY_KEYS_BEEP, + FEATURE_STATE_CHANGE_BEEP + } +#endif [CCode (cheader_filename = "meta/util.h", cprefix = "META_LATER_", type_id = "meta_later_type_get_type ()")] public enum LaterType { RESIZE, @@ -1806,14 +1836,30 @@ namespace Meta { public static bool activate_session (); #endif #if HAS_MUTTER338 +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags); +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static void add_debug_paint_flag (Meta.DebugPaintFlag flag); #endif +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static void clutter_init (); +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static void exit (Meta.ExitCode code); #if !HAS_MUTTER41 #if HAS_MUTTER40 @@ -1837,10 +1883,18 @@ namespace Meta { [CCode (cheader_filename = "meta/main.h")] public static void init (); #endif +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/main.h,meta/meta-context.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static bool is_restart (); #if HAS_MUTTER40 +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static bool is_topic_enabled (Meta.DebugTopic topic); #endif #if !HAS_MUTTER41 @@ -1850,13 +1904,26 @@ namespace Meta { public static void register_with_session (); #endif #if HAS_MUTTER338 +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags); +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] +#else [CCode (cheader_filename = "meta/main.h")] +#endif public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag); #endif +#if HAS_MUTTER43 + [CCode (cheader_filename = "meta/meta-context.h,meta/main.h")] + public static void restart (string? message, Meta.Context context); +#else [CCode (cheader_filename = "meta/main.h")] public static void restart (string? message); +#endif #if !HAS_MUTTER41 [CCode (cheader_filename = "meta/main.h")] public static int run (); diff --git a/vapi/meson.build b/vapi/meson.build index a348b16b..6599559d 100644 --- a/vapi/meson.build +++ b/vapi/meson.build @@ -355,3 +355,75 @@ if mutter42_dep.found() output: 'libmutter-10.vapi' ) endif +if mutter43_dep.found() + cogl_target = custom_target('mutter-cogl-11', + command: [ + vapigen, + mutter_typelib_dir / 'Cogl-11.gir', + '--library=mutter-cogl-11', + '--pkg=gobject-2.0', + '--pkg=gio-2.0', + '--pkg=cairo', + '--pkg=graphene-gobject-1.0', + vapigen_args, + files('Cogl-11-custom.vala') + ], + output: 'mutter-cogl-11.vapi' + ) + + cogl_pango_target = custom_target('mutter-cogl-pango-11', + command: [ + vapigen, + mutter_typelib_dir / 'CoglPango-11.gir', + '--library=mutter-cogl-pango-11', + '--pkg=mutter-cogl-11', + '--pkg=pangocairo', + '--pkg=gio-2.0', + '--pkg=glib-2.0', + vapigen_args + ], + depends: cogl_target, + output: 'mutter-cogl-pango-11.vapi' + ) + + clutter_target = custom_target('mutter-clutter-11', + command: [ + vapigen, + mutter_typelib_dir / 'Clutter-11.gir', + '--library=mutter-clutter-11', + '--pkg=graphene-gobject-1.0', + '--pkg=mutter-cogl-11', + '--pkg=mutter-cogl-pango-11', + '--pkg=atk', + '--pkg=gio-2.0', + '--pkg=json-glib-1.0', + '--pkg=pangocairo', + vapigen_args, + files('Clutter-11-custom.vala') + ], + depends: [ cogl_target, cogl_pango_target ], + output: 'mutter-clutter-11.vapi' + ) + + libmutter_target = custom_target('libmutter-11', + command: [ + vapigen, + mutter_typelib_dir / 'Meta-11.gir', + '--library=libmutter-11', + '--pkg=graphene-gobject-1.0', + '--pkg=mutter-cogl-11', + '--pkg=mutter-cogl-pango-11', + '--pkg=mutter-clutter-11', + '--pkg=atk', + '--pkg=gio-2.0', + '--pkg=json-glib-1.0', + '--pkg=pangocairo', + '--pkg=gtk+-3.0', + '--pkg=x11', + '--pkg=xfixes-4.0', + vapigen_args + ], + depends: [ cogl_target, cogl_pango_target, clutter_target ], + output: 'libmutter-11.vapi' + ) +endif diff --git a/vapi/mutter-clutter-11.deps b/vapi/mutter-clutter-11.deps new file mode 100644 index 00000000..c813b782 --- /dev/null +++ b/vapi/mutter-clutter-11.deps @@ -0,0 +1,6 @@ +atk +cairo +pango +json-glib-1.0 +mutter-cogl-11 +graphene-gobject-1.0 diff --git a/vapi/mutter-clutter-11.vapi b/vapi/mutter-clutter-11.vapi new file mode 120000 index 00000000..716d1ccc --- /dev/null +++ b/vapi/mutter-clutter-11.vapi @@ -0,0 +1 @@ +mutter-clutter-10.vapi \ No newline at end of file diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi index c2a63a09..cc6bd752 100644 --- a/vapi/mutter-clutter.vapi +++ b/vapi/mutter-clutter.vapi @@ -4765,6 +4765,9 @@ namespace Clutter { public void get_clip (out float xoff, out float yoff, out float width, out float height); [Version (since = "1.4")] public bool get_clip_to_allocation (); +#if HAS_MUTTER43 + public Clutter.ColorState get_color_state (); +#endif [Version (since = "1.4")] public unowned Clutter.Constraint? get_constraint (string name); [Version (since = "1.4")] @@ -5054,6 +5057,9 @@ namespace Clutter { public void set_clip (float xoff, float yoff, float width, float height); [Version (since = "1.4")] public void set_clip_to_allocation (bool clip_set); +#if HAS_MUTTER43 + public void set_color_state (Clutter.ColorState color_state); +#endif [Version (since = "1.10")] public void set_content (Clutter.Content? content); [Version (since = "1.10")] @@ -5207,6 +5213,9 @@ namespace Clutter { public Graphene.Rect clip_rect { owned get; set; } [Version (since = "1.0")] public bool clip_to_allocation { get; set; } +#if HAS_MUTTER43 + public Clutter.ColorState color_state { owned get; set construct; } +#endif [NoAccessorMethod] [Version (since = "1.4")] public Clutter.Constraint constraints { set; } @@ -5567,7 +5576,9 @@ namespace Clutter { [Version (since = "0.2")] public class AnyEvent : Clutter.Event { public Clutter.EventFlags flags; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -5797,7 +5808,9 @@ namespace Clutter { #endif public Clutter.EventFlags flags; public Clutter.ModifierType modifier_state; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -5875,6 +5888,15 @@ namespace Clutter { [CCode (has_construct_function = false, type = "ClutterPaintNode*")] public ColorNode (Clutter.Color? color); } +#if HAS_MUTTER43 + [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_color_state_get_type ()")] + public class ColorState : GLib.Object { + [CCode (has_construct_function = false)] + public ColorState (Clutter.Colorspace colorspace); + public Clutter.Colorspace get_colorspace (); + public Clutter.Colorspace colorspace { get; construct; } + } +#endif [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_colorize_effect_get_type ()")] [Version (since = "1.4")] public class ColorizeEffect : Clutter.OffscreenEffect { @@ -5911,7 +5933,9 @@ namespace Clutter { public Clutter.EventFlags flags; public weak Clutter.Actor related; public weak Clutter.EventSequence sequence; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -5950,7 +5974,9 @@ namespace Clutter { public class DeviceEvent : Clutter.Event { public weak Clutter.InputDevice device; public Clutter.EventFlags flags; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -6359,7 +6385,9 @@ namespace Clutter { public Clutter.PreeditResetMode mode; #endif public int32 offset; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public weak string text; public uint32 time; @@ -6396,6 +6424,9 @@ namespace Clutter { public class InputDevice : GLib.Object { [CCode (has_construct_function = false)] protected InputDevice (); +#if HAS_MUTTER43 + public Clutter.InputCapabilities get_capabilities (); +#endif #if !HAS_MUTTER42 #if HAS_MUTTER338 [Version (since = "1.2")] @@ -6521,6 +6552,9 @@ namespace Clutter { [NoAccessorMethod] [Version (since = "1.6")] public Clutter.Backend backend { owned get; construct; } +#if HAS_MUTTER43 + public Clutter.InputCapabilities capabilities { get; construct; } +#endif public Clutter.InputMode device_mode { get; construct; } public string device_node { get; construct; } [Version (since = "1.2")] @@ -6693,7 +6727,9 @@ namespace Clutter { public uint16 hardware_keycode; public uint keyval; public Clutter.ModifierType modifier_state; +#if HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -6801,7 +6837,9 @@ namespace Clutter { #endif public Clutter.EventFlags flags; public Clutter.ModifierType modifier_state; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; #if HAS_MUTTER40 @@ -6841,7 +6879,9 @@ namespace Clutter { public Clutter.EventFlags flags; public uint32 group; public uint32 mode; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -6856,7 +6896,9 @@ namespace Clutter { public uint32 mode; public uint32 ring_number; public Clutter.InputDevicePadSource ring_source; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -7054,7 +7096,9 @@ namespace Clutter { public class ProximityEvent : Clutter.Event { public weak Clutter.InputDevice device; public Clutter.EventFlags flags; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -7167,7 +7211,9 @@ namespace Clutter { public Clutter.EventFlags flags; public Clutter.ModifierType modifier_state; public Clutter.ScrollSource scroll_source; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -7384,6 +7430,9 @@ namespace Clutter { #if HAS_MUTTER40 public unowned Clutter.Actor get_device_actor (Clutter.InputDevice device, Clutter.EventSequence? sequence); #endif +#if HAS_MUTTER43 + public unowned Clutter.Actor get_event_actor (Clutter.Event event); +#endif #if !HAS_MUTTER338 [Version (deprecated = true, deprecated_since = "1.10")] public Clutter.Color get_color (); @@ -7391,11 +7440,11 @@ namespace Clutter { public static unowned Clutter.Stage get_default (); #endif public int64 get_frame_counter (); - [Version (since = "0.6")] - public unowned Clutter.Actor get_key_focus (); #if HAS_MUTTER42 public unowned Clutter.Actor get_grab_actor (); #endif + [Version (since = "0.6")] + public unowned Clutter.Actor get_key_focus (); #if !HAS_MUTTER42 [Version (since = "1.2")] public void get_minimum_size (out uint width, out uint height); @@ -7517,6 +7566,9 @@ namespace Clutter { public virtual signal bool delete_event (Clutter.Event event); #endif public virtual signal void paint_view (Clutter.StageView view, Cairo.Region redraw_clip); +#if HAS_MUTTER43 + public signal void prepare_frame (Clutter.StageView view); +#endif } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_manager_get_type ()")] [Version (since = "1.0")] @@ -7988,7 +8040,9 @@ namespace Clutter { public Clutter.EventFlags flags; public Clutter.ModifierType modifier_state; public weak Clutter.EventSequence sequence; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -8002,7 +8056,9 @@ namespace Clutter { public Clutter.EventFlags flags; public uint32 n_fingers; public Clutter.TouchpadGesturePhase phase; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -8027,7 +8083,9 @@ namespace Clutter { public uint n_fingers; public Clutter.TouchpadGesturePhase phase; public float scale; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -8049,7 +8107,9 @@ namespace Clutter { public Clutter.EventFlags flags; public uint n_fingers; public Clutter.TouchpadGesturePhase phase; +#if !HAS_MUTTER43 public weak Clutter.Actor source; +#endif public weak Clutter.Stage stage; public uint32 time; public Clutter.EventType type; @@ -8608,6 +8668,14 @@ namespace Clutter { RELEASED, PRESSED } +#if HAS_MUTTER43 + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLORSPACE_", type_id = "clutter_colorspace_get_type ()")] + public enum Colorspace { + UNKNOWN, + SRGB, + BT2020 + } +#endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTENT_GRAVITY_", type_id = "clutter_content_gravity_get_type ()")] [Version (since = "1.10")] public enum ContentGravity { @@ -8753,6 +8821,7 @@ namespace Clutter { #endif EVENT_LAST } +#if !HAS_MUTTER43 [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")] [Flags] [Version (since = "0.4")] @@ -8769,6 +8838,7 @@ namespace Clutter { #endif SHADERS_GLSL } +#endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")] [Version (since = "1.2")] public enum FlowOrientation { @@ -8871,6 +8941,19 @@ namespace Clutter { ROTATION, SLIDER } +#endif +#if HAS_MUTTER43 + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CAPABILITY_", type_id = "clutter_input_capabilities_get_type ()")] + [Flags] + public enum InputCapabilities { + NONE, + POINTER, + KEYBOARD, + TOUCHPAD, + TOUCH, + TABLET_TOOL, + TABLET_PAD + } #endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_HINT_", type_id = "clutter_input_content_hint_flags_get_type ()")] [Flags] @@ -9360,12 +9443,14 @@ namespace Clutter { BOTH } #endif +#if !HAS_MUTTER43 [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_IMAGE_ERROR_INVALID_", type_id = "clutter_image_error_get_type ()")] [Version (since = "1.10")] public errordomain ImageError { DATA; public static GLib.Quark quark (); } +#endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_", type_id = "clutter_script_error_get_type ()")] [Version (since = "0.6")] public errordomain ScriptError { @@ -9391,9 +9476,15 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h", has_target = false)] public delegate void EmitInputDeviceEvent (Clutter.Event event, Clutter.InputDevice device); #endif +#if HAS_MUTTER43 + [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)] + [Version (since = "1.18")] + public delegate bool EventFilterFunc (Clutter.Event event, Clutter.Actor event_actor); +#else [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] [Version (since = "1.18")] public delegate bool EventFilterFunc (Clutter.Event event); +#endif [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] [Version (since = "1.0")] public delegate void PathCallback (Clutter.PathNode node); @@ -9454,13 +9545,13 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h")] [Version (since = "1.2")] public static unowned Clutter.Event get_current_event (); + [CCode (cheader_filename = "clutter/clutter.h")] + [Version (since = "1.0")] + public static uint32 get_current_event_time (); #if HAS_MUTTER41 [CCode (cheader_filename = "clutter/clutter.h")] public static void get_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags); #endif - [CCode (cheader_filename = "clutter/clutter.h")] - [Version (since = "1.0")] - public static uint32 get_current_event_time (); [CCode (cheader_filename = "clutter/clutter.h")] [Version (since = "0.4")] public static unowned Clutter.Backend get_default_backend (); diff --git a/vapi/mutter-cogl-11.deps b/vapi/mutter-cogl-11.deps new file mode 120000 index 00000000..ce132cda --- /dev/null +++ b/vapi/mutter-cogl-11.deps @@ -0,0 +1 @@ +mutter-cogl-10.deps \ No newline at end of file diff --git a/vapi/mutter-cogl-11.vapi b/vapi/mutter-cogl-11.vapi new file mode 120000 index 00000000..06333dd3 --- /dev/null +++ b/vapi/mutter-cogl-11.vapi @@ -0,0 +1 @@ +mutter-cogl-10.vapi \ No newline at end of file diff --git a/vapi/mutter-cogl-6.deps b/vapi/mutter-cogl-6.deps index 98ccac5b..e238f6b9 100644 --- a/vapi/mutter-cogl-6.deps +++ b/vapi/mutter-cogl-6.deps @@ -1 +1,3 @@ pango +glib-2.0 +gio-2.0 diff --git a/vapi/mutter-cogl-pango-11.vapi b/vapi/mutter-cogl-pango-11.vapi new file mode 120000 index 00000000..08e43243 --- /dev/null +++ b/vapi/mutter-cogl-pango-11.vapi @@ -0,0 +1 @@ +mutter-cogl-pango-10.vapi \ No newline at end of file