From 0c909772b75cf8a01b8cd53c7a737d00d09a9b8b Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 10 Oct 2026 00:10:13 +0300 Subject: [PATCH] Require Mutter 46 --- vapi/Clutter-13-custom.vala | 53 --- vapi/Clutter-13.metadata | 194 --------- vapi/Cogl-13-custom.vala | 161 -------- vapi/Cogl-13.metadata | 73 ---- vapi/Meta-13.metadata | 203 --------- vapi/Mtk-13.metadata | 1 - vapi/libmutter-13.deps | 1 - vapi/libmutter-13.vapi | 1 - vapi/libmutter-14.deps | 2 +- vapi/libmutter-14.vapi | 2 +- vapi/libmutter.vapi | 153 +------ vapi/meson.build | 85 ---- vapi/mutter-clutter-13.deps | 6 - vapi/mutter-clutter-13.vapi | 1 - vapi/mutter-clutter-14.vapi | 2 +- vapi/mutter-clutter.vapi | 569 +------------------------- vapi/mutter-cogl-13.deps | 1 - vapi/mutter-cogl-13.vapi | 1 - vapi/mutter-cogl-pango-13.vapi | 1 - vapi/mutter-cogl-pango-14.vapi | 2 +- vapi/mutter-mtk-13.vapi | 202 --------- vapi/mutter-mtk-14.vapi | 189 ++++++++- wingpanel-interface/FocusManager.vala | 9 +- wingpanel-interface/meson.build | 21 +- 24 files changed, 203 insertions(+), 1730 deletions(-) delete mode 100644 vapi/Clutter-13-custom.vala delete mode 100644 vapi/Clutter-13.metadata delete mode 100644 vapi/Cogl-13-custom.vala delete mode 100644 vapi/Cogl-13.metadata delete mode 100644 vapi/Meta-13.metadata delete mode 100644 vapi/Mtk-13.metadata delete mode 120000 vapi/libmutter-13.deps delete mode 120000 vapi/libmutter-13.vapi delete mode 100644 vapi/mutter-clutter-13.deps delete mode 120000 vapi/mutter-clutter-13.vapi delete mode 120000 vapi/mutter-cogl-13.deps delete mode 120000 vapi/mutter-cogl-13.vapi delete mode 120000 vapi/mutter-cogl-pango-13.vapi delete mode 100644 vapi/mutter-mtk-13.vapi mode change 120000 => 100644 vapi/mutter-mtk-14.vapi diff --git a/vapi/Clutter-13-custom.vala b/vapi/Clutter-13-custom.vala deleted file mode 100644 index e5c71c2d..00000000 --- a/vapi/Clutter-13-custom.vala +++ /dev/null @@ -1,53 +0,0 @@ -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-13.metadata b/vapi/Clutter-13.metadata deleted file mode 100644 index 36bcf973..00000000 --- a/vapi/Clutter-13.metadata +++ /dev/null @@ -1,194 +0,0 @@ -// 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 -CURRENT_TIME 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" - -// There is no way to know sealed classes before GLib 2.70 -ColorState sealed -FrameClock sealed -TextureContent sealed - -TextureContent.new_from_texture symbol_type="constructor" - -// 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" -BUTTON_* skip=false name="BUTTON_(.+)" type="uint32" parent="Clutter.Button" -EVENT_STOP skip=false type="bool" -EVENT_PROPAGATE skip=false type="bool" diff --git a/vapi/Cogl-13-custom.vala b/vapi/Cogl-13-custom.vala deleted file mode 100644 index f6034717..00000000 --- a/vapi/Cogl-13-custom.vala +++ /dev/null @@ -1,161 +0,0 @@ -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-13.metadata b/vapi/Cogl-13.metadata deleted file mode 100644 index 828aa5b5..00000000 --- a/vapi/Cogl-13.metadata +++ /dev/null @@ -1,73 +0,0 @@ -* 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 - -Pipeline.get_layer_filters - .min_filter out - .mag_filter out - -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 -is_snippet 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 - -Offscreen sealed diff --git a/vapi/Meta-13.metadata b/vapi/Meta-13.metadata deleted file mode 100644 index c6ef9a83..00000000 --- a/vapi/Meta-13.metadata +++ /dev/null @@ -1,203 +0,0 @@ -* skip=false -*.* skip=false -* cheader_filename="meta/main.h" - -Backend cheader_filename="meta/meta-backend.h" -Backend.gpu_added skip -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" -BarrierFlags cheader_filename="meta/barrier.h" -ButtonFunction cheader_filename="meta/common.h" -ButtonLayout cheader_filename="meta/common.h" -Compositor cheader_filename="meta/compositor.h" -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" -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" -MultiTexture cheader_filename="meta/meta-multi-texture.h" -MultiTextureFormat cheader_filename="meta/meta-multi-texture-format.h" -MonitorManager cheader_filename="meta/meta-monitor-manager.h" -MonitorSwitchConfigType cheader_filename="meta/meta-monitor-manager.h" -MotionDirection cheader_filename="meta/common.h" -PadDirection cheader_filename="meta/display.h" -PadFeatureType 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" -PowerSaveChangeReason cheader_filename="meta/meta-monitor-manager.h" -Preference cheader_filename="meta/prefs.h" -PrefsChangedFunc cheader_filename="meta/prefs.h" -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" -VirtualModifier cheader_filename="meta/common.h" -WaylandClient cheader_filename="meta/meta-wayland-client.h" -WaylandCompositor cheader_filename="meta/meta-wayland-compositor.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" -Window.suspend_state skip -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" -X11Display.add_event_func skip -X11DisplayEventFunc skip - -// As per https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2287 -MonitorManager.monitor_privacy_screen_changed 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" -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" - -BackgroundActor sealed -BackgroundContent sealed -BackgroundImage sealed -BackgroundImageCache sealed -Background sealed -Dnd sealed -IdleMonitor sealed -LaunchContext sealed -RemoteAccessController sealed -SelectionSourceMemory sealed -Selection sealed -ShadowFactory sealed -ShapedTexture sealed -SoundPlayer sealed -Stage sealed -StartupNotification sealed -WaylandClient sealed -WindowGroup sealed -WorkspaceManager sealed -X11Display sealed diff --git a/vapi/Mtk-13.metadata b/vapi/Mtk-13.metadata deleted file mode 100644 index a8b51c6c..00000000 --- a/vapi/Mtk-13.metadata +++ /dev/null @@ -1 +0,0 @@ -Rectangle struct diff --git a/vapi/libmutter-13.deps b/vapi/libmutter-13.deps deleted file mode 120000 index 7782137a..00000000 --- a/vapi/libmutter-13.deps +++ /dev/null @@ -1 +0,0 @@ -libmutter.deps \ No newline at end of file diff --git a/vapi/libmutter-13.vapi b/vapi/libmutter-13.vapi deleted file mode 120000 index 12f9cc52..00000000 --- a/vapi/libmutter-13.vapi +++ /dev/null @@ -1 +0,0 @@ -libmutter.vapi \ No newline at end of file diff --git a/vapi/libmutter-14.deps b/vapi/libmutter-14.deps index e19fc39f..7782137a 120000 --- a/vapi/libmutter-14.deps +++ b/vapi/libmutter-14.deps @@ -1 +1 @@ -libmutter-13.deps \ No newline at end of file +libmutter.deps \ No newline at end of file diff --git a/vapi/libmutter-14.vapi b/vapi/libmutter-14.vapi index 25c1d15b..12f9cc52 120000 --- a/vapi/libmutter-14.vapi +++ b/vapi/libmutter-14.vapi @@ -1 +1 @@ -libmutter-13.vapi \ No newline at end of file +libmutter.vapi \ No newline at end of file diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi index 922c6959..056f994c 100644 --- a/vapi/libmutter.vapi +++ b/vapi/libmutter.vapi @@ -119,18 +119,12 @@ namespace Meta { public static int ulong_equal ([CCode (type = "gconstpointer")] ulong? v1, [CCode (type = "gconstpointer")] ulong? v2); [CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_hash")] public static uint ulong_hash ([CCode (type = "gconstpointer")] ulong? v); -#if !HAS_MUTTER46 - [CCode (cheader_filename = "meta/util.h", cname = "meta_warning")] - public static void warning (string format, ...); -#endif } [CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")] public abstract class Backend : GLib.Object, GLib.Initable { [CCode (has_construct_function = false)] protected Backend (); -#if HAS_MUTTER46 public void freeze_keyboard (uint32 timestamp); -#endif public Meta.BackendCapabilities get_capabilities (); public unowned Meta.Context get_context (); public unowned Meta.IdleMonitor get_core_idle_monitor (); @@ -159,7 +153,6 @@ namespace Meta { #if HAS_MUTTER48 public void renderdoc_capture (); #endif -#if HAS_MUTTER46 #if HAS_MUTTER49 #if HAS_MUTTER50 public async bool set_keymap_async (Meta.KeymapDescription description, uint32 layout_index, GLib.Cancellable? cancellable) throws GLib.Error; @@ -175,9 +168,6 @@ namespace Meta { #if !HAS_MUTTER50 public void unfreeze_keyboard (uint32 timestamp); public void ungrab_keyboard (uint32 timestamp); -#endif -#else - public void set_keymap (string layouts, string variants, string options); #endif public Meta.BackendCapabilities capabilities { get; } public Meta.Context context { get; construct; } @@ -220,11 +210,7 @@ namespace Meta { public signal void changed (); } [CCode (cheader_filename = "meta/meta-background-actor.h", type_id = "meta_background_actor_get_type ()")] -#if HAS_MUTTER46 public sealed class BackgroundActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public sealed class BackgroundActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterActor*")] public BackgroundActor (Meta.Display display, int monitor); [NoAccessorMethod] @@ -263,11 +249,7 @@ namespace Meta { public double vignette_sharpness { get; set; } } [CCode (cheader_filename = "meta/meta-background-group.h", type_id = "meta_background_group_get_type ()")] -#if HAS_MUTTER46 public class BackgroundGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public class BackgroundGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterActor*")] public BackgroundGroup (); } @@ -318,10 +300,6 @@ namespace Meta { public Meta.Backend backend { owned get; construct; } [NoAccessorMethod] public Meta.BarrierDirection directions { get; construct; } -#if !HAS_MUTTER46 - [NoAccessorMethod] - public Meta.Display display { owned get; construct; } -#endif [NoAccessorMethod] public Meta.BarrierFlags flags { get; construct; } [NoAccessorMethod] @@ -465,11 +443,6 @@ namespace Meta { public void enable_unredirect (); #endif public void focus_default_window (uint32 timestamp); -#if !HAS_MUTTER46 - [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_focus_stage_window")] - public void focus_stage_window (uint32 timestamp); - public void freeze_keyboard (uint32 timestamp); -#endif public unowned Meta.Compositor get_compositor (); public Clutter.ModifierType get_compositor_modifiers (); public unowned Meta.Context get_context (); @@ -479,10 +452,6 @@ namespace Meta { #if !HAS_MUTTER48 [CCode (cname = "meta_cursor_tracker_get_for_display")] public unowned Meta.CursorTracker get_cursor_tracker (); -#endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_feedback_group_for_display")] - public unowned Clutter.Actor get_feedback_group (); #endif public unowned Meta.Window get_focus_window (); public uint get_keybinding_action (uint keycode, ulong mask); @@ -528,22 +497,9 @@ namespace Meta { #if !HAS_MUTTER50 public void set_cursor (Meta.Cursor cursor); #endif -#if HAS_MUTTER46 public void set_input_focus (Meta.Window window, uint32 timestamp); -#else - public void set_input_focus (Meta.Window window, bool focus_frame, uint32 timestamp); -#endif public GLib.SList sort_windows_by_stacking (GLib.SList windows); -#if !HAS_MUTTER46 - [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_stage_is_focused")] - public bool stage_is_focused (); - public bool supports_extended_barriers (); - public void unfreeze_keyboard (uint32 timestamp); -#endif public bool ungrab_accelerator (uint action_id); -#if !HAS_MUTTER46 - public void ungrab_keyboard (uint32 timestamp); -#endif public void unset_input_focus (uint32 timestamp); public bool xserver_time_is_before (uint32 time1, uint32 time2); public Clutter.ModifierType compositor_modifiers { get; } @@ -846,10 +802,6 @@ namespace Meta { public virtual void unminimize (Meta.WindowActor actor); public void unminimize_completed (Meta.WindowActor actor); #if !HAS_MUTTER50 -#if !HAS_MUTTER46 - [NoWrapper] - public virtual bool xevent_filter ([CCode (type = "XEvent*")] ref X.Event event); -#endif #if HAS_MUTTER49 [NoWrapper] public virtual bool xevent_filter ([CCode (type = "MetaXEvent*")] X.Event event); @@ -900,11 +852,7 @@ namespace Meta { [CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")] public sealed class SelectionSourceMemory : Meta.SelectionSource { [CCode (has_construct_function = false, type = "MetaSelectionSource*")] -#if HAS_MUTTER46 public SelectionSourceMemory (string mimetype, GLib.Bytes content) throws GLib.Error; -#else - public SelectionSourceMemory (string mimetype, GLib.Bytes content); -#endif } [CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)] [Compact] @@ -917,11 +865,7 @@ namespace Meta { [Compact] public class Shadow { public void get_bounds (int window_x, int window_y, int window_width, int window_height, Mtk.Rectangle bounds); -#if HAS_MUTTER46 public void paint (Cogl.Framebuffer framebuffer, int window_x, int window_y, int window_width, int window_height, uint8 opacity, Mtk.Region? clip, bool clip_strictly); -#else - public void paint (Cogl.Framebuffer framebuffer, int window_x, int window_y, int window_width, int window_height, uint8 opacity, Cairo.Region? clip, bool clip_strictly); -#endif public Meta.Shadow @ref (); public void unref (); } @@ -960,11 +904,7 @@ namespace Meta { public void play_from_theme (string name, string description, GLib.Cancellable? cancellable = null); } [CCode (cheader_filename = "meta/meta-stage.h", type_id = "meta_stage_get_type ()")] -#if HAS_MUTTER46 public sealed class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable { -#else - public sealed class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] protected Stage (); } @@ -1018,9 +958,7 @@ namespace Meta { public WaylandClient (Meta.Context context, GLib.SubprocessLauncher launcher) throws GLib.Error; public void hide_from_window_list (Meta.Window window); public void make_desktop (Meta.Window window); -#if HAS_MUTTER46 public void make_dock (Meta.Window window); -#endif #endif public bool owns_window (Meta.Window window); #if HAS_MUTTER49 @@ -1040,7 +978,6 @@ namespace Meta { public void* get_wayland_display (); public signal void prepare_shutdown (); } -#if HAS_MUTTER46 [CCode (cheader_filename = "meta/main.h", type_id = "meta_wayland_surface_get_type ()")] public class WaylandSurface : GLib.Object { [CCode (has_construct_function = false)] @@ -1056,7 +993,6 @@ namespace Meta { public signal void shortcuts_restored (); public signal void unmapped (); } -#endif [CCode (cheader_filename = "meta/window.h", type_id = "meta_window_get_type ()")] public abstract class Window : GLib.Object, GLib.Initable { [CCode (has_construct_function = false)] @@ -1070,10 +1006,8 @@ namespace Meta { public bool allows_resize (); #if HAS_MUTTER49 public bool begin_grab_op (Meta.GrabOp op, Clutter.Sprite? sprite, uint32 timestamp, Graphene.Point? pos_hint); -#elif HAS_MUTTER46 - public bool begin_grab_op (Meta.GrabOp op, Clutter.InputDevice? device, Clutter.EventSequence? sequence, uint32 timestamp, Graphene.Point? pos_hint); #else - public bool begin_grab_op (Meta.GrabOp op, Clutter.InputDevice? device, Clutter.EventSequence? sequence, uint32 timestamp); + public bool begin_grab_op (Meta.GrabOp op, Clutter.InputDevice? device, Clutter.EventSequence? sequence, uint32 timestamp, Graphene.Point? pos_hint); #endif public bool can_close (); public bool can_maximize (); @@ -1082,9 +1016,6 @@ namespace Meta { public void change_workspace_by_index (int space_index, bool append); public void check_alive (uint32 timestamp); public Mtk.Rectangle client_rect_to_frame_rect (Mtk.Rectangle client_rect); -#if !HAS_MUTTER46 - public void compute_group (); -#endif public void @delete (uint32 timestamp); public unowned Meta.Window find_root_ancestor (); public void focus (uint32 timestamp); @@ -1094,29 +1025,16 @@ namespace Meta { public Mtk.Rectangle get_buffer_rect (); #if HAS_MUTTER48 public Mtk.Rectangle get_client_content_rect (); -#endif -#if !HAS_MUTTER46 - public unowned string? get_client_machine (); #endif public Meta.WindowClientType get_client_type (); public unowned GLib.Object get_compositor_private (); public unowned string get_description (); public unowned Meta.Display get_display (); -#if !HAS_MUTTER46 - public unowned Meta.Frame get_frame (); -#endif #if !HAS_MUTTER48 -#if HAS_MUTTER46 public unowned Mtk.Region? get_frame_bounds (); -#else - public unowned Cairo.Region? get_frame_bounds (); -#endif #endif public Mtk.Rectangle get_frame_rect (); public Meta.FrameType get_frame_type (); -#if !HAS_MUTTER46 - public unowned Meta.Group? get_group (); -#endif public unowned string? get_gtk_app_menu_object_path (); public unowned string? get_gtk_application_id (); public unowned string? get_gtk_application_object_path (); @@ -1157,10 +1075,6 @@ namespace Meta { public Mtk.Rectangle get_work_area_current_monitor (); public Mtk.Rectangle get_work_area_for_monitor (int which_monitor); public unowned Meta.Workspace get_workspace (); -#if !HAS_MUTTER46 - public X.Window get_xwindow (); - public void group_leader_changed (); -#endif public bool has_attached_dialogs (); public bool has_focus (); public bool has_pointer (); @@ -1211,11 +1125,7 @@ namespace Meta { public Mtk.Rectangle protocol_to_stage_rect (Mtk.Rectangle protocol_rect); #endif public void raise (); -#if HAS_MUTTER46 public void raise_and_make_recent_on_workspace (Meta.Workspace workspace); -#else - public void raise_and_make_recent (); -#endif #if HAS_MUTTER50 public void remove_external_constraint (Meta.ExternalConstraint constraint); #endif @@ -1232,9 +1142,6 @@ namespace Meta { public void shove_titlebar_onscreen (); #endif public bool showing_on_its_workspace (); -#if !HAS_MUTTER46 - public void shutdown_group (); -#endif #if HAS_MUTTER47 public Mtk.Rectangle stage_to_protocol_rect (Mtk.Rectangle stage_rect); #endif @@ -1255,12 +1162,10 @@ namespace Meta { public void unminimize (); public void unset_demands_attention (); public void unstick (); -#if HAS_MUTTER46 #if HAS_MUTTER47 [CCode (cheader_filename = "meta/meta-x11-group.h")] #endif public unowned Meta.Group? x11_get_group (); -#endif #if HAS_MUTTER50 [NoAccessorMethod] public string a11y_dbus_name { owned get; } @@ -1286,10 +1191,6 @@ namespace Meta { public string gtk_menubar_object_path { get; } public string gtk_unique_bus_name { get; } public string gtk_window_object_path { get; } -#if !HAS_MUTTER46 - [NoAccessorMethod] - public Cairo.Surface icon { owned get; } -#endif [NoAccessorMethod] public bool is_alive { get; } #if HAS_MUTTER47 @@ -1300,10 +1201,6 @@ namespace Meta { public bool maximized_horizontally { get; } [NoAccessorMethod] public bool maximized_vertically { get; } -#if !HAS_MUTTER46 - [NoAccessorMethod] - public Cairo.Surface mini_icon { owned get; } -#endif [NoAccessorMethod] public bool minimized { get; } public string mutter_hints { get; } @@ -1340,11 +1237,7 @@ namespace Meta { public signal void workspace_changed (); } [CCode (cheader_filename = "meta/meta-window-actor.h", type_id = "meta_window_actor_get_type ()")] -#if HAS_MUTTER46 public abstract class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public abstract class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] protected WindowActor (); public void freeze (); @@ -1380,11 +1273,7 @@ namespace Meta { } #endif [CCode (cheader_filename = "meta/meta-window-group.h", type_id = "meta_window_group_get_type ()")] -#if HAS_MUTTER46 public sealed class WindowGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public sealed class WindowGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] protected WindowGroup (); } @@ -1393,20 +1282,12 @@ namespace Meta { [Compact] public class WindowShape { [CCode (has_construct_function = false)] -#if HAS_MUTTER46 public WindowShape (Mtk.Region region); -#else - public WindowShape (Cairo.Region region); -#endif public bool equal (Meta.WindowShape shape_b); public void get_borders (int border_top, int border_right, int border_bottom, int border_left); public uint hash (); public Meta.WindowShape @ref (); -#if HAS_MUTTER46 public Mtk.Region to_region (int center_width, int center_height); -#else - public Cairo.Region to_region (int center_width, int center_height); -#endif public void unref (); } #endif @@ -1439,23 +1320,15 @@ namespace Meta { public unowned Meta.Workspace append_new_workspace (bool activate, uint32 timestamp); public unowned Meta.Workspace get_active_workspace (); public int get_active_workspace_index (); -#if HAS_MUTTER46 public int get_layout_columns (); public int get_layout_rows (); -#endif public int get_n_workspaces (); public unowned Meta.Workspace? get_workspace_by_index (int index); public unowned GLib.List get_workspaces (); public void override_workspace_layout (Meta.DisplayCorner starting_corner, bool vertical_layout, int n_rows, int n_columns); public void remove_workspace (Meta.Workspace workspace, uint32 timestamp); public void reorder_workspace (Meta.Workspace workspace, int new_index); -#if !HAS_MUTTER46 - [NoAccessorMethod] -#endif public int layout_columns { get; } -#if !HAS_MUTTER46 - [NoAccessorMethod] -#endif public int layout_rows { get; } public int n_workspaces { get; } public signal void active_workspace_changed (); @@ -1486,9 +1359,7 @@ namespace Meta { #if !HAS_MUTTER48 public unowned Meta.Group lookup_group (X.Window group_leader); #endif -#if HAS_MUTTER46 public X.Window lookup_xwindow (Meta.Window window); -#endif public void redirect_windows (Meta.Display display); public void remove_event_func (uint id); #if !HAS_MUTTER50 @@ -2108,9 +1979,7 @@ namespace Meta { NV24, NV42, #endif -#if HAS_MUTTER46 P010, - #endif #if HAS_MUTTER49 P012, P016, @@ -2260,22 +2129,6 @@ namespace Meta { ICON, INSTANTLY } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "meta/common.h", cprefix = "META_VIRTUAL_", type_id = "meta_virtual_modifier_get_type ()")] - [Flags] - public enum VirtualModifier { - SHIFT_MASK, - CONTROL_MASK, - ALT_MASK, - META_MASK, - SUPER_MASK, - HYPER_MASK, - MOD2_MASK, - MOD3_MASK, - MOD4_MASK, - MOD5_MASK - } -#endif [CCode (cheader_filename = "meta/window.h", cprefix = "META_WINDOW_CLIENT_TYPE_", type_id = "meta_window_client_type_get_type ()")] public enum WindowClientType { WAYLAND, @@ -2343,10 +2196,6 @@ namespace Meta { #endif [CCode (cheader_filename = "meta/main.h")] public static void add_debug_paint_flag (Meta.DebugPaintFlag flag); -#if !HAS_MUTTER46 - [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_MUTTER48 diff --git a/vapi/meson.build b/vapi/meson.build index 464346fa..cce93c6c 100644 --- a/vapi/meson.build +++ b/vapi/meson.build @@ -6,91 +6,6 @@ vapigen_args = [ '--vapidir=@0@'.format(meson.current_source_dir()), ] -if mutter45_dep.found() - mtk_target = custom_target('mutter-mtk-13', - command: [ - vapigen, - mutter_typelib_dir / 'Mtk-13.gir', - '--library=mutter-mtk-13', - '--pkg=gobject-2.0', - '--pkg=gio-2.0', - '--pkg=cairo', - '--pkg=graphene-gobject-1.0', - vapigen_args - ], - output: 'mutter-mtk-13.vapi' - ) - cogl_target = custom_target('mutter-cogl-13', - command: [ - vapigen, - mutter_typelib_dir / 'Cogl-13.gir', - '--library=mutter-cogl-13', - '--pkg=gobject-2.0', - '--pkg=gio-2.0', - '--pkg=cairo', - '--pkg=graphene-gobject-1.0', - vapigen_args, - files('Cogl-13-custom.vala') - ], - output: 'mutter-cogl-13.vapi' - ) - - cogl_pango_target = custom_target('mutter-cogl-pango-13', - command: [ - vapigen, - mutter_typelib_dir / 'CoglPango-13.gir', - '--library=mutter-cogl-pango-13', - '--pkg=mutter-cogl-13', - '--pkg=pangocairo', - '--pkg=gio-2.0', - '--pkg=glib-2.0', - vapigen_args - ], - depends: cogl_target, - output: 'mutter-cogl-pango-13.vapi' - ) - - clutter_target = custom_target('mutter-clutter-13', - command: [ - vapigen, - mutter_typelib_dir / 'Clutter-13.gir', - '--library=mutter-clutter-13', - '--pkg=graphene-gobject-1.0', - '--pkg=mutter-cogl-13', - '--pkg=mutter-cogl-pango-13', - '--pkg=mutter-mtk-13', - '--pkg=atk', - '--pkg=gio-2.0', - '--pkg=json-glib-1.0', - '--pkg=pangocairo', - vapigen_args, - files('Clutter-13-custom.vala') - ], - depends: [ cogl_target, cogl_pango_target, mtk_target ], - output: 'mutter-clutter-13.vapi' - ) - - libmutter_target = custom_target('libmutter-13', - command: [ - vapigen, - mutter_typelib_dir / 'Meta-13.gir', - '--library=libmutter-13', - '--pkg=graphene-gobject-1.0', - '--pkg=mutter-cogl-13', - '--pkg=mutter-cogl-pango-13', - '--pkg=mutter-clutter-13', - '--pkg=atk', - '--pkg=gio-2.0', - '--pkg=json-glib-1.0', - '--pkg=pangocairo', - '--pkg=x11', - '--pkg=xfixes-4.0', - vapigen_args - ], - depends: [ cogl_target, cogl_pango_target, clutter_target ], - output: 'libmutter-13.vapi' - ) -endif if mutter46_dep.found() mtk_target = custom_target('mutter-mtk-14', command: [ diff --git a/vapi/mutter-clutter-13.deps b/vapi/mutter-clutter-13.deps deleted file mode 100644 index ae34ab3a..00000000 --- a/vapi/mutter-clutter-13.deps +++ /dev/null @@ -1,6 +0,0 @@ -atk -cairo -pango -json-glib-1.0 -mutter-cogl-13 -graphene-gobject-1.0 diff --git a/vapi/mutter-clutter-13.vapi b/vapi/mutter-clutter-13.vapi deleted file mode 120000 index e1b7159f..00000000 --- a/vapi/mutter-clutter-13.vapi +++ /dev/null @@ -1 +0,0 @@ -mutter-clutter.vapi \ No newline at end of file diff --git a/vapi/mutter-clutter-14.vapi b/vapi/mutter-clutter-14.vapi index 7958fe70..e1b7159f 120000 --- a/vapi/mutter-clutter-14.vapi +++ b/vapi/mutter-clutter-14.vapi @@ -1 +1 @@ -mutter-clutter-13.vapi \ No newline at end of file +mutter-clutter.vapi \ No newline at end of file diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi index ae1a0b08..9d9e7cfe 100644 --- a/vapi/mutter-clutter.vapi +++ b/vapi/mutter-clutter.vapi @@ -5107,10 +5107,6 @@ namespace Clutter { public static unowned int[] get_shader_int (GLib.Value value); [CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")] public static unowned float[] get_shader_matrix (GLib.Value value); -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h")] - public static unowned Clutter.Units? get_units (GLib.Value value); -#endif #if !HAS_MUTTER47 [CCode (cheader_filename = "clutter/clutter.h")] public static void set_color (GLib.Value value, Clutter.Color color); @@ -5157,11 +5153,7 @@ namespace Clutter { #endif } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_get_type ()")] -#if HAS_MUTTER46 public class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable { -#else - public class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif public uint32 flags; [CCode (has_construct_function = false)] public Actor (); @@ -5200,9 +5192,7 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter-pango.h")] #endif public Pango.Layout create_pango_layout (string? text); -#if HAS_MUTTER46 public Clutter.PaintNode create_texture_paint_node (Cogl.Texture texture); -#endif public void destroy_all_children (); [CCode (cname = "clutter_actor_event")] public bool emit_event (Clutter.Event event, bool capture); @@ -5255,10 +5245,8 @@ namespace Clutter { public float get_height (); public unowned Clutter.Actor? get_last_child (); public unowned Clutter.LayoutManager? get_layout_manager (); -#if HAS_MUTTER46 [CCode (cname = "clutter_actor_class_get_layout_manager_type")] public class GLib.Type get_layout_manager_type (); -#endif public Clutter.Margin get_margin (); public float get_margin_bottom (); public float get_margin_left (); @@ -5419,10 +5407,8 @@ namespace Clutter { #endif public void set_height (float height); public void set_layout_manager (Clutter.LayoutManager? manager); -#if HAS_MUTTER46 [CCode (cname = "clutter_actor_class_set_layout_manager_type")] public class void set_layout_manager_type (GLib.Type type); -#endif public void set_margin (Clutter.Margin margin); public void set_margin_bottom (float margin); public void set_margin_left (float margin); @@ -5587,12 +5573,10 @@ namespace Clutter { public virtual signal bool button_press_event (Clutter.Event event); public virtual signal bool button_release_event (Clutter.Event event); public virtual signal bool captured_event (Clutter.Event event); -#if HAS_MUTTER46 public virtual signal void child_added (Clutter.Actor child); public virtual signal void child_removed (Clutter.Actor child); public signal void cloned (Clutter.Clone object); public signal void decloned (Clutter.Clone object); -#endif [HasEmitter] public virtual signal void destroy (); public virtual signal bool enter_event (Clutter.Event event); @@ -5706,17 +5690,7 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bin_layout_get_type ()")] public class BinLayout : Clutter.LayoutManager { [CCode (has_construct_function = false, type = "ClutterLayoutManager*")] -#if HAS_MUTTER46 public BinLayout (); -#else - public BinLayout (Clutter.BinAlignment x_align = Clutter.BinAlignment.START, Clutter.BinAlignment y_align = Clutter.BinAlignment.START); - [NoAccessorMethod] - [Version (deprecated = true, deprecated_since = "1.12")] - public Clutter.BinAlignment x_align { get; set; } - [NoAccessorMethod] - [Version (deprecated = true, deprecated_since = "1.12")] - public Clutter.BinAlignment y_align { get; set; } -#endif } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bind_constraint_get_type ()")] public sealed class BindConstraint : Clutter.Constraint { @@ -5741,11 +5715,7 @@ namespace Clutter { public static unowned Clutter.BindingPool find (string name); public unowned string find_action (uint key_val, Clutter.ModifierType modifiers); public static unowned Clutter.BindingPool get_for_class (void* klass); -#if HAS_MUTTER46 public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback); -#else - public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback); -#endif public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure); public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback); public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure); @@ -5811,31 +5781,6 @@ namespace Clutter { [Compact] public class ButtonEvent : Clutter.Event { } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_canvas_get_type ()")] - public class Canvas : GLib.Object, Clutter.Content { - [CCode (has_construct_function = false, type = "ClutterContent*")] - public Canvas (); - public float get_scale_factor (); - public void set_scale_factor (float scale); - public bool set_size (int width, int height); - [NoAccessorMethod] - public int height { get; set; } - public float scale_factor { get; set; } - [NoAccessorMethod] - public int width { get; set; } - public virtual signal bool draw (Cairo.Context cr, int width, int height); - } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_child_meta_get_type ()")] - public abstract class ChildMeta : GLib.Object { - [CCode (has_construct_function = false)] - protected ChildMeta (); - public unowned Clutter.Actor get_actor (); - public unowned Clutter.Container get_container (); - public Clutter.Actor actor { get; construct; } - public Clutter.Container container { get; construct; } - } -#endif #if HAS_MUTTER49 [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_click_gesture_get_type ()")] public sealed class ClickGesture : Clutter.PressGesture { @@ -5875,11 +5820,7 @@ namespace Clutter { public ClipNode (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clone_get_type ()")] -#if HAS_MUTTER46 public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterActor*")] public Clone (Clutter.Actor source); public unowned Clutter.Actor get_source (); @@ -6042,24 +5983,16 @@ namespace Clutter { public virtual void update_allocation (Clutter.Actor actor, Clutter.ActorBox allocation); public virtual void update_preferred_size (Clutter.Actor actor, Clutter.Orientation direction, float for_size, ref float minimum_size, ref float natural_size); } -#if HAS_MUTTER46 [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_context_get_type ()")] public class Context : GLib.Object { [CCode (has_construct_function = false)] protected Context (); -#else - [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] - [Compact] - public class Context { -#endif public unowned Clutter.Backend get_backend (); #if HAS_MUTTER47 public unowned Clutter.ColorManager get_color_manager (); public unowned Clutter.Settings get_settings (); #endif -#if HAS_MUTTER46 public Clutter.TextDirection get_text_direction (); -#endif } [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] [Compact] @@ -6099,24 +6032,20 @@ namespace Clutter { #endif #if HAS_MUTTER47 public unowned Cogl.Pipeline? get_back_pipeline (); -#elif HAS_MUTTER46 - public unowned Cogl.Pipeline get_back_material (); #else - public unowned Cogl.Handle get_back_material (); + public unowned Cogl.Pipeline get_back_material (); #endif public void get_n_tiles (out uint x_tiles, out uint y_tiles); public void invalidate (); #if HAS_MUTTER47 public void set_back_pipeline (Cogl.Pipeline? pipeline); -#elif HAS_MUTTER46 - public void set_back_material (Cogl.Pipeline? material); #else - public void set_back_material (Cogl.Handle? material); + public void set_back_material (Cogl.Pipeline? material); #endif public void set_n_tiles (uint x_tiles, uint y_tiles); #if HAS_MUTTER47 public Cogl.Pipeline back_pipeline { get; set; } -#elif HAS_MUTTER46 +#else public Cogl.Pipeline back_material { get; set; } #endif [NoAccessorMethod] @@ -6157,10 +6086,6 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_get_type ()")] [Compact] public class Event { -#if !HAS_MUTTER46 - [CCode (has_construct_function = false)] - public Event (Clutter.EventType type); -#endif public static uint add_filter (Clutter.Stage? stage, [CCode (delegate_target_pos = 2.2, destroy_notify_pos = 2.1)] owned Clutter.EventFilterFunc func); public Clutter.Event copy (); public void free (); @@ -6188,9 +6113,7 @@ namespace Clutter { public Clutter.PreeditResetMode get_im_preedit_reset_mode (); public unowned string get_im_text (); public uint16 get_key_code (); -#if HAS_MUTTER46 public void get_key_state (out Clutter.ModifierType pressed, out Clutter.ModifierType latched, out Clutter.ModifierType locked); -#endif public uint get_key_symbol (); public unichar get_key_unicode (); public uint get_mode_group (); @@ -6205,9 +6128,6 @@ namespace Clutter { public Clutter.ScrollFlags get_scroll_flags (); #endif public Clutter.ScrollSource get_scroll_source (); -#if !HAS_MUTTER46 - public unowned Clutter.Actor get_source (); -#endif public unowned Clutter.InputDevice get_source_device (); public Clutter.ModifierType get_state (); public uint32 get_time (); @@ -6234,30 +6154,18 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_flow_layout_get_type ()")] public sealed class FlowLayout : Clutter.LayoutManager { [CCode (has_construct_function = false, type = "ClutterLayoutManager*")] -#if HAS_MUTTER46 public FlowLayout (Clutter.Orientation orientation); -#else - public FlowLayout (Clutter.FlowOrientation orientation); -#endif public float get_column_spacing (); public void get_column_width (out float min_width, out float max_width); public bool get_homogeneous (); -#if HAS_MUTTER46 public Clutter.Orientation get_orientation (); -#else - public Clutter.FlowOrientation get_orientation (); -#endif public void get_row_height (out float min_height, out float max_height); public float get_row_spacing (); public bool get_snap_to_grid (); public void set_column_spacing (float spacing); public void set_column_width (float min_width, float max_width); public void set_homogeneous (bool homogeneous); -#if HAS_MUTTER46 public void set_orientation (Clutter.Orientation orientation); -#else - public void set_orientation (Clutter.FlowOrientation orientation); -#endif public void set_row_height (float min_height, float max_height); public void set_row_spacing (float spacing); public void set_snap_to_grid (bool snap_to_grid); @@ -6271,11 +6179,7 @@ namespace Clutter { public float min_column_width { get; set; } [NoAccessorMethod] public float min_row_height { get; set; } -#if HAS_MUTTER46 public Clutter.Orientation orientation { get; set construct; } -#else - public Clutter.FlowOrientation orientation { get; set construct; } -#endif public float row_spacing { get; set; } public bool snap_to_grid { get; set; } } @@ -6303,11 +6207,7 @@ namespace Clutter { #if HAS_MUTTER50 public bool get_expected_presentation_time (int64 expected_presentation_time_us); #endif -#if HAS_MUTTER46 public bool get_frame_deadline (int64 frame_deadline_us); -#else - public bool get_min_render_time_allowed (int64 min_render_time_allowed_us); -#endif public bool get_target_presentation_time (int64 target_presentation_time_us); public bool has_result (); public unowned Clutter.Frame @ref (); @@ -6401,10 +6301,6 @@ namespace Clutter { public unowned Clutter.EventSequence get_sequence (uint point); public void get_threshold_trigger_distance (out float x, out float y); public Clutter.GestureTriggerEdge get_threshold_trigger_edge (); -#if !HAS_MUTTER46 - [Version (deprecated = true, deprecated_since = "1.20")] - public Clutter.GestureTriggerEdge get_threshold_trigger_egde (); -#endif public float get_velocity (uint point, out float velocity_x, out float velocity_y); public void set_n_touch_points (int nb_points); public void set_threshold_trigger_distance (float x, float y); @@ -6421,16 +6317,10 @@ namespace Clutter { public virtual signal bool gesture_progress (Clutter.Actor actor); } #endif -#if HAS_MUTTER46 [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grab_get_type ()")] public sealed class Grab : GLib.Object { [CCode (has_construct_function = false)] protected Grab (); -#else - [CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_grab_ref", type_id = "clutter_grab_get_type ()", unref_function = "clutter_grab_unref")] - [Compact] - public class Grab { -#endif #if HAS_MUTTER47 public void activate (); #endif @@ -6438,14 +6328,9 @@ namespace Clutter { #if !HAS_MUTTER50 public Clutter.GrabState get_seat_state (); #endif -#if HAS_MUTTER46 public bool is_revoked (); [NoAccessorMethod] public bool revoked { get; } -#else - public unowned Clutter.Grab @ref (); - public void unref (); -#endif } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grid_layout_get_type ()")] public sealed class GridLayout : Clutter.LayoutManager { @@ -6641,11 +6526,7 @@ namespace Clutter { public signal void request_surrounding (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_interval_get_type ()")] -#if HAS_MUTTER46 public class Interval : GLib.InitiallyUnowned { -#else - public class Interval : GLib.InitiallyUnowned, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] public Interval (GLib.Type gtype, ...); public Clutter.Interval clone (); @@ -6685,11 +6566,7 @@ namespace Clutter { } #endif [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keyframe_transition_get_type ()")] -#if HAS_MUTTER46 public class KeyframeTransition : Clutter.PropertyTransition { -#else - public class KeyframeTransition : Clutter.PropertyTransition, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterTransition*")] public KeyframeTransition (string property_name); public void clear (); @@ -6709,11 +6586,7 @@ namespace Clutter { public unowned string? get_current_display_name (); public unowned string? get_current_short_name (); #endif -#if HAS_MUTTER46 public virtual Clutter.TextDirection get_direction (); -#else - public virtual Pango.Direction get_direction (); -#endif public bool get_num_lock_state (); public bool caps_lock_state { get; } public bool num_lock_state { get; } @@ -6721,13 +6594,8 @@ namespace Clutter { } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layer_node_get_type ()")] public class LayerNode : Clutter.PaintNode { -#if HAS_MUTTER46 [CCode (has_construct_function = false)] protected LayerNode (); -#else - [CCode (has_construct_function = false, type = "ClutterPaintNode*")] - public LayerNode (Graphene.Matrix projection, Cairo.Rectangle viewport, float width, float height, uint8 opacity); -#endif [CCode (has_construct_function = false, type = "ClutterPaintNode*")] public LayerNode.to_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Pipeline pipeline); } @@ -6735,7 +6603,6 @@ namespace Clutter { public abstract class LayoutManager : GLib.InitiallyUnowned { [CCode (has_construct_function = false)] protected LayoutManager (); -#if HAS_MUTTER46 public virtual void allocate (Clutter.Actor container, Clutter.ActorBox allocation); public void child_get (Clutter.Actor container, Clutter.Actor actor, ...); public void child_get_property (Clutter.Actor container, Clutter.Actor actor, string property_name, GLib.Value value); @@ -6743,58 +6610,28 @@ namespace Clutter { public void child_set_property (Clutter.Actor container, Clutter.Actor actor, string property_name, GLib.Value value); [NoWrapper] public virtual unowned Clutter.LayoutMeta create_child_meta (Clutter.Actor container, Clutter.Actor actor); -#else - public virtual void allocate (Clutter.Container container, Clutter.ActorBox allocation); - public void child_get (Clutter.Container container, Clutter.Actor actor, ...); - public void child_get_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value); - public void child_set (Clutter.Container container, Clutter.Actor actor, ...); - public void child_set_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value); - [NoWrapper] - public virtual unowned Clutter.LayoutMeta create_child_meta (Clutter.Container container, Clutter.Actor actor); -#endif public unowned GLib.ParamSpec find_child_property (string name); -#if HAS_MUTTER46 public unowned Clutter.LayoutMeta get_child_meta (Clutter.Actor container, Clutter.Actor actor); -#else - public unowned Clutter.LayoutMeta get_child_meta (Clutter.Container container, Clutter.Actor actor); -#endif [NoWrapper] public virtual GLib.Type get_child_meta_type (); -#if HAS_MUTTER46 public virtual void get_preferred_height (Clutter.Actor container, float for_width, out float min_height_p, out float nat_height_p); public virtual void get_preferred_width (Clutter.Actor container, float for_height, out float min_width_p, out float nat_width_p); -#else - public virtual void get_preferred_height (Clutter.Container container, float for_width, out float min_height_p, out float nat_height_p); - public virtual void get_preferred_width (Clutter.Container container, float for_height, out float min_width_p, out float nat_width_p); -#endif [CCode (array_length_pos = 0.1, array_length_type = "guint")] public GLib.ParamSpec[] list_child_properties (); -#if HAS_MUTTER46 public virtual void set_container (Clutter.Actor? container); -#else - public virtual void set_container (Clutter.Container? container); -#endif [HasEmitter] public virtual signal void layout_changed (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_meta_get_type ()")] -#if HAS_MUTTER46 public abstract class LayoutMeta : GLib.Object { -#else - public abstract class LayoutMeta : Clutter.ChildMeta { -#endif [CCode (has_construct_function = false)] protected LayoutMeta (); -#if HAS_MUTTER46 public unowned Clutter.Actor get_actor (); public unowned Clutter.Actor get_container (); -#endif public unowned Clutter.LayoutManager get_manager (); -#if HAS_MUTTER46 public bool is_for (Clutter.LayoutManager manager, Clutter.Actor container, Clutter.Actor actor); public Clutter.Actor actor { get; construct; } public Clutter.Actor container { get; construct; } -#endif public Clutter.LayoutManager manager { get; construct; } } #if HAS_MUTTER49 @@ -6814,18 +6651,12 @@ namespace Clutter { protected OffscreenEffect (); #if HAS_MUTTER47 public virtual Cogl.Texture create_texture (Cogl.Context cogl_context, float width, float height); -#elif HAS_MUTTER46 - public virtual Cogl.Texture create_texture (float width, float height); #else - public virtual Cogl.Handle create_texture (float width, float height); + public virtual Cogl.Texture create_texture (float width, float height); #endif public unowned Cogl.Pipeline? get_pipeline (); public bool get_target_size (out float width, out float height); -#if HAS_MUTTER46 public unowned Cogl.Texture get_texture (); -#else - public unowned Cogl.Handle get_texture (); -#endif public virtual void paint_target (Clutter.PaintNode node, Clutter.PaintContext paint_context); } [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] @@ -6859,11 +6690,7 @@ namespace Clutter { public class PaintContext { public void destroy (); public unowned Cogl.Framebuffer get_framebuffer (); -#if HAS_MUTTER46 public unowned Mtk.Region get_redraw_clip (); -#else - public unowned Cairo.Region get_redraw_clip (); -#endif #if HAS_MUTTER47 public void pop_color_state (); #endif @@ -6961,55 +6788,6 @@ namespace Clutter { public signal bool pan (Clutter.Actor actor, bool is_interpolated); public virtual signal void pan_stopped (Clutter.Actor actor); } -#endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", lower_case_csuffix = "param_units", type_id = "clutter_param_units_get_type ()")] - public class ParamSpecUnit : GLib.ParamSpec { - [CCode (has_construct_function = false)] - protected ParamSpecUnit (); - } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_get_type ()")] - public class Path : GLib.InitiallyUnowned { - [CCode (has_construct_function = false)] - public Path (); - public void add_close (); - public void add_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3); - public void add_line_to (int x, int y); - public void add_move_to (int x, int y); - public void add_node (Clutter.PathNode node); - public void add_rel_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3); - public void add_rel_line_to (int x, int y); - public void add_rel_move_to (int x, int y); - public bool add_string (string str); - public void clear (); - public void @foreach (Clutter.PathCallback callback); - public string get_description (); - public uint get_length (); - public uint get_n_nodes (); - public Clutter.PathNode get_node (uint index_); - public GLib.SList get_nodes (); - public uint get_position (double progress, out Clutter.Knot position); - public void insert_node (int index_, Clutter.PathNode node); - public void remove_node (uint index_); - public void replace_node (uint index_, Clutter.PathNode node); - public bool set_description (string str); - [CCode (has_construct_function = false)] - public Path.with_description (string desc); - public string description { owned get; set; } - public uint length { get; } - } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_constraint_get_type ()")] - public class PathConstraint : Clutter.Constraint { - [CCode (has_construct_function = false, type = "ClutterConstraint*")] - public PathConstraint (Clutter.Path? path, float offset); - public float get_offset (); - public unowned Clutter.Path get_path (); - public void set_offset (float offset); - public void set_path (Clutter.Path? path); - public float offset { get; set; } - public Clutter.Path path { get; set; } - public signal void node_reached (Clutter.Actor actor, uint index); - } #endif [CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_pick_context_ref", type_id = "clutter_pick_context_get_type ()", unref_function = "clutter_pick_context_unref")] [Compact] @@ -7070,11 +6848,7 @@ namespace Clutter { } #endif [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_property_transition_get_type ()")] -#if HAS_MUTTER46 public class PropertyTransition : Clutter.Transition { -#else - public class PropertyTransition : Clutter.Transition, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterTransition*")] public PropertyTransition (string? property_name); [CCode (has_construct_function = false, type = "ClutterTransition*")] @@ -7106,33 +6880,6 @@ namespace Clutter { public signal bool rotate (Clutter.Actor actor, double angle); } #endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_script_get_type ()")] - public class Script : GLib.Object { - [CCode (has_construct_function = false)] - public Script (); - public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_pos = 1.1, array_length_type = "gsize")] string[] paths); - public void connect_signals (void* user_data); - public void connect_signals_full (Clutter.ScriptConnectFunc func); - public void ensure_objects (); - public unowned GLib.Object get_object (string name); - public int get_objects (...); - public unowned string get_translation_domain (); - public virtual GLib.Type get_type_from_name (string type_name); - public GLib.List list_objects (); - public uint load_from_data (string data, ssize_t length) throws GLib.Error; - public uint load_from_file (string filename) throws GLib.Error; - public uint load_from_resource (string resource_path) throws GLib.Error; - public string lookup_filename (string filename); - public void set_translation_domain (string? domain); - public void unmerge_objects (uint merge_id); - [NoAccessorMethod] - public string filename { owned get; } - [NoAccessorMethod] - public bool filename_set { get; } - public string translation_domain { get; set; } - } -#endif #if HAS_MUTTER48 [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] [Compact] @@ -7141,11 +6888,7 @@ namespace Clutter { #endif #if !HAS_MUTTER47 [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scroll_actor_get_type ()")] -#if HAS_MUTTER46 public class ScrollActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public class ScrollActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterActor*")] public ScrollActor (); public Clutter.ScrollMode get_scroll_mode (); @@ -7271,12 +7014,6 @@ namespace Clutter { public int unscaled_font_dpi { set; } #endif } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] - [Compact] - public class Shader { - } -#endif [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_effect_get_type ()")] public class ShaderEffect : Clutter.OffscreenEffect { [CCode (has_construct_function = false, type = "ClutterEffect*")] @@ -7285,13 +7022,8 @@ namespace Clutter { #else public ShaderEffect (Clutter.ShaderType shader_type); #endif -#if HAS_MUTTER46 public unowned Cogl.Program get_program (); public unowned Cogl.Shader get_shader (); -#else - public unowned Cogl.Handle get_program (); - public unowned Cogl.Handle get_shader (); -#endif [NoWrapper] public virtual string get_static_shader_source (); public bool set_shader_source (string source); @@ -7357,11 +7089,7 @@ namespace Clutter { } #endif [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_get_type ()")] -#if HAS_MUTTER46 public class Stage : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public class Stage : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] protected Stage (); #if !HAS_MUTTER48 @@ -7414,11 +7142,7 @@ namespace Clutter { public void set_minimum_size (uint width, uint height); #if !HAS_MUTTER48 public void set_title (string title); -#if HAS_MUTTER46 public void update_device (Clutter.InputDevice device, Clutter.EventSequence sequence, Clutter.InputDevice source_device, Graphene.Point point, uint32 time, Clutter.Actor new_actor, Mtk.Region region, bool emit_crossing); -#else - public void update_device (Clutter.InputDevice device, Clutter.EventSequence sequence, Clutter.InputDevice source_device, Graphene.Point point, uint32 time, Clutter.Actor new_actor, Cairo.Region region, bool emit_crossing); -#endif #endif [NoAccessorMethod] public bool is_grabbed { get; } @@ -7489,11 +7213,7 @@ namespace Clutter { public void schedule_update_now (); #if !HAS_MUTTER47 [NoWrapper] -#if HAS_MUTTER46 public virtual void setup_offscreen_transform (Cogl.Pipeline pipeline); -#else - public virtual void setup_offscreen_blit_pipeline (Cogl.Pipeline pipeline); -#endif [NoWrapper] public virtual void transform_rect_to_onscreen (Mtk.Rectangle src_rect, int dst_width, int dst_height, Mtk.Rectangle dst_rect); #endif @@ -7533,15 +7253,7 @@ namespace Clutter { public class SwipeAction : Clutter.GestureAction { [CCode (has_construct_function = false, type = "ClutterAction*")] public SwipeAction (); -#if !HAS_MUTTER46 - [Version (deprecated = true, deprecated_since = "1.14")] - public virtual signal void swept (Clutter.Actor actor, Clutter.SwipeDirection direction); -#endif -#if HAS_MUTTER46 public virtual signal bool swipe (Clutter.Actor actor, Clutter.SwipeDirection direction); -#else - public signal bool swipe (Clutter.Actor actor, Clutter.SwipeDirection direction); -#endif } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_tap_action_get_type ()")] public class TapAction : Clutter.GestureAction { @@ -7555,11 +7267,7 @@ namespace Clutter { #else [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_get_type ()")] #endif -#if HAS_MUTTER46 public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable { -#else - public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterActor*")] public Text (); public int coords_to_position (float x, float y); @@ -7696,11 +7404,6 @@ namespace Clutter { public Pango.WrapMode line_wrap_mode { get; set; } public int max_length { get; set; } public uint password_char { get; set; } -#if !HAS_MUTTER46 - [NoAccessorMethod] - [Version (deprecated = true, deprecated_since = "1.12")] - public int position { get; set; } -#endif public bool selectable { get; set; } #if HAS_MUTTER47 public Cogl.Color selected_text_color { get; set; } @@ -7722,10 +7425,6 @@ namespace Clutter { public bool use_markup { get; set; } public virtual signal void activate (); public virtual signal void cursor_changed (); -#if !HAS_MUTTER46 - [Version (deprecated = true, deprecated_since = "1.16")] - public virtual signal void cursor_event (Graphene.Rect rect); -#endif [HasEmitter] public signal void delete_text (int start_pos, int end_pos); public virtual signal void text_changed (); @@ -7790,17 +7489,9 @@ namespace Clutter { #endif } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_timeline_get_type ()")] -#if HAS_MUTTER46 public class Timeline : GLib.Object { -#else - public class Timeline : GLib.Object, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] -#if HAS_MUTTER46 protected Timeline (); -#else - public Timeline (uint duration_ms); -#endif public void add_marker (string marker_name, double progress); public void add_marker_at_time (string marker_name, uint msecs); public void advance (uint msecs); @@ -7882,11 +7573,7 @@ namespace Clutter { public TransformNode (Graphene.Matrix projection); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_get_type ()")] -#if HAS_MUTTER46 public abstract class Transition : Clutter.Timeline { -#else - public abstract class Transition : Clutter.Timeline, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] protected Transition (); [NoWrapper] @@ -7908,11 +7595,7 @@ namespace Clutter { public bool remove_on_complete { get; set; } } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_group_get_type ()")] -#if HAS_MUTTER46 public sealed class TransitionGroup : Clutter.Transition { -#else - public class TransitionGroup : Clutter.Transition, Clutter.Scriptable { -#endif [CCode (has_construct_function = false, type = "ClutterTransition*")] public TransitionGroup (); public void add_transition (Clutter.Transition transition); @@ -7957,43 +7640,13 @@ namespace Clutter { public abstract void set_final_state (string property_name, GLib.Value value); } #if !HAS_MUTTER48 -#if HAS_MUTTER46 [CCode (cheader_filename = "clutter/clutter.h")] -#else - [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")] -#endif public interface Container : GLib.Object { public void add (params Clutter.Actor[] actors); -#if !HAS_MUTTER46 - [CCode (vfunc_name = "add")] - [Version (deprecated = true, deprecated_since = "1.10")] - public abstract void add_actor (Clutter.Actor actor); - public void child_get (Clutter.Actor actor, ...); - public void child_get_property (Clutter.Actor child, string property, GLib.Value value); - public void child_set (Clutter.Actor actor, ...); - public void child_set_property (Clutter.Actor child, string property, GLib.Value value); - public virtual void create_child_meta (Clutter.Actor actor); - public virtual void destroy_child_meta (Clutter.Actor actor); - public unowned Clutter.Actor find_child_by_name (string child_name); -#endif [CCode (cname = "clutter_container_class_find_child_property")] public class unowned GLib.ParamSpec find_child_property (string property_name); -#if !HAS_MUTTER46 - public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor); -#endif [CCode (cname = "clutter_container_class_list_child_properties")] public class unowned GLib.ParamSpec[] list_child_properties (); -#if !HAS_MUTTER46 - [Version (deprecated = true, deprecated_since = "1.10")] - public void remove (...); - [CCode (vfunc_name = "remove")] - [Version (deprecated = true, deprecated_since = "1.10")] - public abstract void remove_actor (Clutter.Actor actor); - public virtual signal void actor_added (Clutter.Actor actor); - public virtual signal void actor_removed (Clutter.Actor actor); - [HasEmitter] - public virtual signal void child_notify (Clutter.Actor child, GLib.ParamSpec pspec); -#endif } #endif [CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterContentInterface", type_id = "clutter_content_get_type ()")] @@ -8006,15 +7659,6 @@ namespace Clutter { public virtual signal void attached (Clutter.Actor actor); public virtual signal void detached (Clutter.Actor actor); } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scriptable_get_type ()")] - public interface Scriptable : GLib.Object { - public abstract unowned string get_id (); - public abstract bool parse_custom_node (Clutter.Script script, GLib.Value value, string name, Json.Node node); - public abstract void set_custom_property (Clutter.Script script, string name, GLib.Value value); - public abstract void set_id (string id_); - } -#endif [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_actor_box_get_type ()")] public struct ActorBox { public float x1; @@ -8055,10 +7699,6 @@ namespace Clutter { #if !HAS_MUTTER48 [CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)] public struct Capture { -#if !HAS_MUTTER46 - public Cairo.ImageSurface image; - public Mtk.Rectangle rect; -#endif } #endif #if HAS_MUTTER49 @@ -8105,14 +7745,8 @@ namespace Clutter { public uint8 green; public uint8 blue; public uint8 alpha; -#if !HAS_MUTTER46 - public Clutter.Color add (Clutter.Color b); -#endif public static Clutter.Color? alloc (); public Clutter.Color? copy (); -#if !HAS_MUTTER46 - public Clutter.Color darken (); -#endif public bool equal (Clutter.Color v2); public void free (); [CCode (cname = "_vala_clutter_color_from_hls")] @@ -8135,9 +7769,6 @@ namespace Clutter { color.init_from_string (str); return color; } -#if !HAS_MUTTER46 - public static unowned Clutter.Color? get_static (Clutter.StaticColor color); -#endif public uint hash (); public unowned Clutter.Color? init (uint8 red = 0, uint8 green = 0, uint8 blue = 0, uint8 alpha = 0); [CCode (cname = "clutter_color_from_hls")] @@ -8147,29 +7778,12 @@ namespace Clutter { [CCode (cname = "clutter_color_from_string")] public bool init_from_string (string str); public Clutter.Color interpolate (Clutter.Color final, double progress); -#if !HAS_MUTTER46 - public Clutter.Color lighten (); -#endif [CCode (cname = "clutter_color_from_string")] public bool parse_string (string str); -#if !HAS_MUTTER46 - public Clutter.Color shade (double factor); - public Clutter.Color subtract (Clutter.Color b); -#endif public void to_hls (out float hue, out float luminance, out float saturation); public uint32 to_pixel (); public string to_string (); } -#endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_knot_get_type ()")] - public struct Knot { - public int x; - public int y; - public Clutter.Knot? copy (); - public bool equal (Clutter.Knot knot_b); - public void free (); - } #endif [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")] public struct Margin { @@ -8196,17 +7810,6 @@ namespace Clutter { public void union (Clutter.PaintVolume another_pv); public void union_box (Clutter.ActorBox box); } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")] - public struct PathNode { - public Clutter.PathNodeType type; - [CCode (array_length = false)] - public weak Clutter.Knot points[3]; - public Clutter.PathNode? copy (); - public bool equal (Clutter.PathNode node_b); - public void free (); - } -#endif [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_perspective_get_type ()")] public struct Perspective { public float fovy; @@ -8259,16 +7862,8 @@ namespace Clutter { } #endif #if !HAS_MUTTER48 -#if HAS_MUTTER46 [CCode (cheader_filename = "clutter/clutter.h")] -#else - [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")] -#endif public struct Units { -#if !HAS_MUTTER46 - public Clutter.Units? copy (); - public void free (); -#endif [CCode (cname = "clutter_units_from_cm")] public Units.from_cm (float cm); [CCode (cname = "clutter_units_from_em")] @@ -8283,12 +7878,6 @@ namespace Clutter { public Units.from_pt (float pt); [CCode (cname = "clutter_units_from_string")] public Units.from_string (string str); -#if !HAS_MUTTER46 - public Clutter.UnitType get_unit_type (); - public float get_unit_value (); - public float to_pixels (); - public string to_string (); -#endif } #endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_", type_id = "clutter_actor_align_get_type ()")] @@ -8359,20 +7948,6 @@ namespace Clutter { EASE_IN_OUT, ANIMATION_LAST } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_", type_id = "clutter_bin_alignment_get_type ()")] - public enum BinAlignment { - [Version (deprecated = true)] - FIXED, - [Version (deprecated = true)] - FILL, - START, - [Version (deprecated = true)] - END, - [Version (deprecated = true)] - CENTER - } -#endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_", type_id = "clutter_bind_coordinate_get_type ()")] public enum BindCoordinate { X, @@ -8383,14 +7958,6 @@ namespace Clutter { SIZE, ALL } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_", type_id = "clutter_box_alignment_get_type ()")] - public enum BoxAlignment { - START, - END, - CENTER - } -#endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BUTTON_STATE_", type_id = "clutter_button_state_get_type ()")] public enum ButtonState { RELEASED, @@ -8518,14 +8085,12 @@ namespace Clutter { } #endif #if !HAS_MUTTER48 -#if HAS_MUTTER46 [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTEXT_FLAG_", type_id = "clutter_context_flags_get_type ()")] [Flags] public enum ContextFlags { NONE, NO_A11Y } -#endif #endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_debug_flag_get_type ()")] [Flags] @@ -8555,14 +8120,6 @@ namespace Clutter { #endif DETAILED_TRACE } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_", type_id = "clutter_drag_axis_get_type ()")] - public enum DragAxis { - AXIS_NONE, - X_AXIS, - Y_AXIS - } -#endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_draw_debug_flag_get_type ()")] [Flags] public enum DrawDebugFlag { @@ -8658,14 +8215,6 @@ namespace Clutter { #endif EVENT_LAST } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")] - public enum FlowOrientation { - HORIZONTAL, - VERTICAL - } -#endif -#if HAS_MUTTER46 [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FRAME_CLOCK_MODE_", type_id = "clutter_frame_clock_mode_get_type ()")] public enum FrameClockMode { FIXED, @@ -8674,7 +8223,6 @@ namespace Clutter { #endif VARIABLE } -#endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FRAME_INFO_FLAG_", type_id = "clutter_frame_info_flag_get_type ()")] [Flags] public enum FrameInfoFlag { @@ -8949,18 +8497,6 @@ namespace Clutter { Y_AXIS, AXIS_AUTO } -#endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_", type_id = "clutter_path_node_type_get_type ()")] - public enum PathNodeType { - MOVE_TO, - LINE_TO, - CURVE_TO, - CLOSE, - REL_MOVE_TO, - REL_LINE_TO, - REL_CURVE_TO - } #endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_NOP_", type_id = "clutter_pick_debug_flag_get_type ()")] [Flags] @@ -9104,56 +8640,6 @@ namespace Clutter { TABLET, TOUCHPOINT } -#endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_", type_id = "clutter_static_color_get_type ()")] - public enum StaticColor { - WHITE, - BLACK, - RED, - DARK_RED, - GREEN, - DARK_GREEN, - BLUE, - DARK_BLUE, - CYAN, - DARK_CYAN, - MAGENTA, - DARK_MAGENTA, - YELLOW, - DARK_YELLOW, - GRAY, - DARK_GRAY, - LIGHT_GRAY, - BUTTER, - BUTTER_LIGHT, - BUTTER_DARK, - ORANGE, - ORANGE_LIGHT, - ORANGE_DARK, - CHOCOLATE, - CHOCOLATE_LIGHT, - CHOCOLATE_DARK, - CHAMELEON, - CHAMELEON_LIGHT, - CHAMELEON_DARK, - SKY_BLUE, - SKY_BLUE_LIGHT, - SKY_BLUE_DARK, - PLUM, - PLUM_LIGHT, - PLUM_DARK, - SCARLET_RED, - SCARLET_RED_LIGHT, - SCARLET_RED_DARK, - ALUMINIUM_1, - ALUMINIUM_2, - ALUMINIUM_3, - ALUMINIUM_4, - ALUMINIUM_5, - ALUMINIUM_6, - TRANSPARENT - } #endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_", type_id = "clutter_step_mode_get_type ()")] public enum StepMode { @@ -9208,16 +8694,6 @@ namespace Clutter { public void get_default_luminances (out float min_lum_out, out float max_lum_out, out float ref_lum_out); #endif } -#endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_", type_id = "clutter_unit_type_get_type ()")] - public enum UnitType { - PIXEL, - EM, - MM, - POINT, - CM - } #endif [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_VIRTUAL_DEVICE_TYPE_", type_id = "clutter_virtual_device_type_get_type ()")] [Flags] @@ -9227,35 +8703,12 @@ namespace Clutter { POINTER, TOUCHSCREEN } -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_", type_id = "clutter_script_error_get_type ()")] - public errordomain ScriptError { - TYPE_FUNCTION, - PROPERTY, - VALUE; - public static GLib.Quark quark (); - } -#endif [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] public delegate Clutter.Actor ActorCreateChildFunc (GLib.Object item); -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 4.9)] - public delegate bool BindingActionFunc (GLib.Object gobject, string action_name, uint key_val, Clutter.ModifierType modifiers); - [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] - public delegate void Callback (Clutter.Actor actor); -#endif [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)] public delegate bool EventFilterFunc (Clutter.Event event, Clutter.Actor event_actor); -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)] - public delegate void PathCallback (Clutter.PathNode node); -#endif [CCode (cheader_filename = "clutter/clutter.h", has_target = false)] public delegate bool ProgressFunc (GLib.Value a, GLib.Value b, double progress, GLib.Value retval); -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 6.9)] - public delegate void ScriptConnectFunc (Clutter.Script script, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags); -#endif #if HAS_MUTTER49 [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)] public delegate bool StageInputForeachFunc (Clutter.Stage stage, Clutter.Sprite sprite); @@ -9271,10 +8724,6 @@ namespace Clutter { public const bool EVENT_PROPAGATE; [CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_EVENT_STOP")] public const bool EVENT_STOP; -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PATH_RELATIVE")] - public const int PATH_RELATIVE; -#endif [CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PRIORITY_REDRAW")] public const int PRIORITY_REDRAW; #if HAS_MUTTER50 @@ -9285,12 +8734,6 @@ namespace Clutter { [Version (replacement = "ActorBox.clamp_to_pixel")] public static void actor_box_clamp_to_pixel (ref Clutter.ActorBox box); #endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h")] - public static void cairo_clear (Cairo.Context cr); - [CCode (cheader_filename = "clutter/clutter.h")] - public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color); -#endif #if HAS_MUTTER48 [CCode (cheader_filename = "clutter/clutter.h")] public static void add_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags); @@ -9333,10 +8776,6 @@ namespace Clutter { #if !HAS_MUTTER47 [CCode (cheader_filename = "clutter/clutter.h")] public static unowned Pango.FontMap get_font_map (); -#endif -#if !HAS_MUTTER46 - [CCode (cheader_filename = "clutter/clutter.h")] - public static unowned string get_script_id (GLib.Object gobject); #endif [CCode (cheader_filename = "clutter/clutter.h")] public static Clutter.TextDirection get_text_direction (); diff --git a/vapi/mutter-cogl-13.deps b/vapi/mutter-cogl-13.deps deleted file mode 120000 index ca8dd2a9..00000000 --- a/vapi/mutter-cogl-13.deps +++ /dev/null @@ -1 +0,0 @@ -mutter-cogl.deps \ No newline at end of file diff --git a/vapi/mutter-cogl-13.vapi b/vapi/mutter-cogl-13.vapi deleted file mode 120000 index 7e33c18b..00000000 --- a/vapi/mutter-cogl-13.vapi +++ /dev/null @@ -1 +0,0 @@ -mutter-cogl.vapi \ No newline at end of file diff --git a/vapi/mutter-cogl-pango-13.vapi b/vapi/mutter-cogl-pango-13.vapi deleted file mode 120000 index b099ea40..00000000 --- a/vapi/mutter-cogl-pango-13.vapi +++ /dev/null @@ -1 +0,0 @@ -mutter-cogl-pango.vapi \ No newline at end of file diff --git a/vapi/mutter-cogl-pango-14.vapi b/vapi/mutter-cogl-pango-14.vapi index b4bc9c76..b099ea40 120000 --- a/vapi/mutter-cogl-pango-14.vapi +++ b/vapi/mutter-cogl-pango-14.vapi @@ -1 +1 @@ -mutter-cogl-pango-13.vapi \ No newline at end of file +mutter-cogl-pango.vapi \ No newline at end of file diff --git a/vapi/mutter-mtk-13.vapi b/vapi/mutter-mtk-13.vapi deleted file mode 100644 index 1f1981ac..00000000 --- a/vapi/mutter-mtk-13.vapi +++ /dev/null @@ -1,202 +0,0 @@ -/* mutter-mtk-13.vapi generated by vapigen, do not modify. */ - -[CCode (cprefix = "Mtk", gir_namespace = "Mtk", gir_version = "13", lower_case_cprefix = "mtk_")] -namespace Mtk { -#if HAS_MUTTER49 - [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] - [Compact] - public class AnonymousFile { - } - [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] - [Compact] - public class DbusPidfd { - public void free (); - public pid_t get_pid (); - public int get_pidfd (); - } -#endif -#if HAS_MUTTER46 - [CCode (cheader_filename = "mtk/mtk.h", ref_function = "mtk_region_ref", type_id = "mtk_region_get_type ()", unref_function = "mtk_region_unref")] - [Compact] - public class Region { - public Mtk.Region apply_matrix_transform_expand (Graphene.Matrix transform); - public bool contains_point (int x, int y); - public Mtk.RegionOverlap contains_rectangle (Mtk.Rectangle rect); - public Mtk.Region copy (); - public static Mtk.Region create (); - public static Mtk.Region create_rectangle (Mtk.Rectangle rect); - public static Mtk.Region create_rectangles (Mtk.Rectangle rects, int n_rects); - public Mtk.Region crop_and_scale (Graphene.Rect src_rect, int dst_width, int dst_height); -#if HAS_MUTTER50 - public Mtk.Region downscale (int scale); -#endif - public bool equal (Mtk.Region other); -#if HAS_MUTTER48 - public void get_box (int nth, int x1, int y1, int x2, int y2); -#endif - public Mtk.Rectangle? get_extents (); - public Mtk.Rectangle? get_rectangle (int nth); - public void intersect (Mtk.Region other); - public void intersect_rectangle (Mtk.Rectangle rect); - public bool is_empty (); - public int num_rectangles (); - public unowned Mtk.Region @ref (); - public Mtk.Region scale (int scale); - public void subtract (Mtk.Region other); - public void subtract_rectangle (Mtk.Rectangle rect); - public void translate (int dx, int dy); - public void union (Mtk.Region other); - public void union_rectangle (Mtk.Rectangle rect); - public void unref (); - } -#endif - [CCode (cheader_filename = "mtk/mtk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "mtk_rectangle_get_type ()")] - public struct Rectangle { - public int x; - public int y; - public int width; - public int height; -#if HAS_MUTTER46 - [CCode (cname = "MTK_RECTANGLE_MAX_STACK_RECTS")] - public const int MAX_STACK_RECTS; -#endif - [CCode (has_construct_function = false, type = "MtkRectangle*")] - public Rectangle (int x, int y, int width, int height); - public int area (); -#if HAS_MUTTER48 - public bool contains_point (int x, int y); - public bool contains_pointf (float x, float y); -#endif - public bool contains_rect (Mtk.Rectangle inner_rect); - public Mtk.Rectangle? copy (); - public bool could_fit_rect (Mtk.Rectangle inner_rect); -#if HAS_MUTTER46 - public void crop_and_scale (Graphene.Rect src_rect, int dst_width, int dst_height, Mtk.Rectangle dest); -#endif -#if HAS_MUTTER47 - [CCode (has_construct_function = false, type = "MtkRectangle*")] - public Rectangle.empty (); -#endif - public bool equal (Mtk.Rectangle src2); - public void free (); - public static Mtk.Rectangle from_graphene_rect (Graphene.Rect rect, Mtk.RoundingStrategy rounding_strategy); - public bool horiz_overlap (Mtk.Rectangle rect2); - public bool intersect (Mtk.Rectangle src2, out Mtk.Rectangle dest); -#if HAS_MUTTER46 - public bool is_adjacent_to (Mtk.Rectangle other); -#endif -#if HAS_MUTTER49 - public bool is_empty (); -#endif - public bool overlap (Mtk.Rectangle rect2); -#if HAS_MUTTER46 - public void scale_double (double scale, Mtk.RoundingStrategy rounding_strategy, Mtk.Rectangle dest); -#endif - public Graphene.Rect? to_graphene_rect (); -#if HAS_MUTTER47 - public void transform (Mtk.MonitorTransform transform, int width, int height, Mtk.Rectangle dest); -#endif - public Mtk.Rectangle union (Mtk.Rectangle rect2); - public bool vert_overlap (Mtk.Rectangle rect2); - } -#if HAS_MUTTER46 - [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] - public struct RegionBuilder { - [CCode (array_length_cname = "n_levels")] - public weak Mtk.Region levels[16]; - public int n_levels; - [CCode (cname = "MTK_REGION_BUILDER_MAX_LEVELS")] - public const int MAX_LEVELS; - public void add_rectangle (int x, int y, int width, int height); - public Mtk.Region finish (); - public void init (); - } - [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] - public struct RegionIterator { - public weak Mtk.Region region; - public Mtk.Rectangle rectangle; - public bool line_start; - public bool line_end; - public int i; - public bool at_end (); - public void init (Mtk.Region region); - public void next (); - } -#if HAS_MUTTER49 - [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_ANONYMOUS_FILE_MAPMODE_", has_type_id = false)] - public enum AnonymousFileMapmode { - PRIVATE, - SHARED - } -#endif -#if HAS_MUTTER47 - [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_MONITOR_TRANSFORM_", has_type_id = false)] - public enum MonitorTransform { - NORMAL, - @90, - @180, - @270, - FLIPPED, - FLIPPED_90, - FLIPPED_180, - FLIPPED_270; -#if HAS_MUTTER48 - public static Mtk.MonitorTransform from_string (string name); -#endif - public Mtk.MonitorTransform invert (); -#if HAS_MUTTER48 - public unowned string to_string (); -#endif - public Mtk.MonitorTransform transform (Mtk.MonitorTransform other); - public void transform_matrix (Graphene.Matrix matrix); - public void transform_point (int area_width, int area_height, int point_x, int point_y); - [CCode (cname = "MTK_MONITOR_ALL_TRANSFORMS")] - public const int ALL; - } -#endif - [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_REGION_OVERLAP_", has_type_id = false)] - public enum RegionOverlap { - OUT, - IN, - PART - } -#endif - [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_ROUNDING_STRATEGY_", has_type_id = false)] - public enum RoundingStrategy { - SHRINK, - GROW, - ROUND - } -#if HAS_MUTTER48 - [CCode (cheader_filename = "mtk/mtk.h")] - public static void compute_viewport_matrix (Graphene.Matrix matrix, int width, int height, float scale, Mtk.MonitorTransform transform, Graphene.Rect src_rect); -#endif -#if HAS_MUTTER49 - [CCode (cheader_filename = "mtk/mtk.h")] -#if HAS_MUTTER50 - public static int64 extrapolate_next_interval_boundary (int64 boundary_us, int64 base_us, int64 interval_us); -#else - public static int64 extrapolate_next_interval_boundary (int64 base_us, int64 interval_us); -#endif -#endif -#if HAS_MUTTER50 - [CCode (cheader_filename = "mtk/mtk.h")] - public static int64 find_nearest_interval_boundary (int64 boundary_us, int64 base_us, int64 interval_us); -#endif - [CCode (cheader_filename = "mtk/mtk.h")] - [Version (replacement = "Rectangle.from_graphene_rect")] - public static Mtk.Rectangle rectangle_from_graphene_rect (Graphene.Rect rect, Mtk.RoundingStrategy rounding_strategy); -#if HAS_MUTTER46 - [CCode (cheader_filename = "mtk/mtk.h")] - [Version (replacement = "Region.create")] - public static Mtk.Region region_create (); - [CCode (cheader_filename = "mtk/mtk.h")] - [Version (replacement = "Region.create_rectangle")] - public static Mtk.Region region_create_rectangle (Mtk.Rectangle rect); - [CCode (cheader_filename = "mtk/mtk.h")] - [Version (replacement = "Region.create_rectangles")] - public static Mtk.Region region_create_rectangles (Mtk.Rectangle rects, int n_rects); -#endif - [CCode (cheader_filename = "mtk/mtk.h")] - public static void x11_errors_deinit (); -} diff --git a/vapi/mutter-mtk-14.vapi b/vapi/mutter-mtk-14.vapi deleted file mode 120000 index 7aeabe79..00000000 --- a/vapi/mutter-mtk-14.vapi +++ /dev/null @@ -1 +0,0 @@ -mutter-mtk-13.vapi \ No newline at end of file diff --git a/vapi/mutter-mtk-14.vapi b/vapi/mutter-mtk-14.vapi new file mode 100644 index 00000000..2ae3a298 --- /dev/null +++ b/vapi/mutter-mtk-14.vapi @@ -0,0 +1,188 @@ +/* mutter-mtk-13.vapi generated by vapigen, do not modify. */ + +[CCode (cprefix = "Mtk", gir_namespace = "Mtk", gir_version = "13", lower_case_cprefix = "mtk_")] +namespace Mtk { +#if HAS_MUTTER49 + [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] + [Compact] + public class AnonymousFile { + } + [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] + [Compact] + public class DbusPidfd { + public void free (); + public pid_t get_pid (); + public int get_pidfd (); + } +#endif + [CCode (cheader_filename = "mtk/mtk.h", ref_function = "mtk_region_ref", type_id = "mtk_region_get_type ()", unref_function = "mtk_region_unref")] + [Compact] + public class Region { + public Mtk.Region apply_matrix_transform_expand (Graphene.Matrix transform); + public bool contains_point (int x, int y); + public Mtk.RegionOverlap contains_rectangle (Mtk.Rectangle rect); + public Mtk.Region copy (); + public static Mtk.Region create (); + public static Mtk.Region create_rectangle (Mtk.Rectangle rect); + public static Mtk.Region create_rectangles (Mtk.Rectangle rects, int n_rects); + public Mtk.Region crop_and_scale (Graphene.Rect src_rect, int dst_width, int dst_height); +#if HAS_MUTTER50 + public Mtk.Region downscale (int scale); +#endif + public bool equal (Mtk.Region other); +#if HAS_MUTTER48 + public void get_box (int nth, int x1, int y1, int x2, int y2); +#endif + public Mtk.Rectangle? get_extents (); + public Mtk.Rectangle? get_rectangle (int nth); + public void intersect (Mtk.Region other); + public void intersect_rectangle (Mtk.Rectangle rect); + public bool is_empty (); + public int num_rectangles (); + public unowned Mtk.Region @ref (); + public Mtk.Region scale (int scale); + public void subtract (Mtk.Region other); + public void subtract_rectangle (Mtk.Rectangle rect); + public void translate (int dx, int dy); + public void union (Mtk.Region other); + public void union_rectangle (Mtk.Rectangle rect); + public void unref (); + } + [CCode (cheader_filename = "mtk/mtk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "mtk_rectangle_get_type ()")] + public struct Rectangle { + public int x; + public int y; + public int width; + public int height; + [CCode (cname = "MTK_RECTANGLE_MAX_STACK_RECTS")] + public const int MAX_STACK_RECTS; + [CCode (has_construct_function = false, type = "MtkRectangle*")] + public Rectangle (int x, int y, int width, int height); + public int area (); +#if HAS_MUTTER48 + public bool contains_point (int x, int y); + public bool contains_pointf (float x, float y); +#endif + public bool contains_rect (Mtk.Rectangle inner_rect); + public Mtk.Rectangle? copy (); + public bool could_fit_rect (Mtk.Rectangle inner_rect); + public void crop_and_scale (Graphene.Rect src_rect, int dst_width, int dst_height, Mtk.Rectangle dest); +#if HAS_MUTTER47 + [CCode (has_construct_function = false, type = "MtkRectangle*")] + public Rectangle.empty (); +#endif + public bool equal (Mtk.Rectangle src2); + public void free (); + public static Mtk.Rectangle from_graphene_rect (Graphene.Rect rect, Mtk.RoundingStrategy rounding_strategy); + public bool horiz_overlap (Mtk.Rectangle rect2); + public bool intersect (Mtk.Rectangle src2, out Mtk.Rectangle dest); + public bool is_adjacent_to (Mtk.Rectangle other); +#if HAS_MUTTER49 + public bool is_empty (); +#endif + public bool overlap (Mtk.Rectangle rect2); + public void scale_double (double scale, Mtk.RoundingStrategy rounding_strategy, Mtk.Rectangle dest); + public Graphene.Rect? to_graphene_rect (); +#if HAS_MUTTER47 + public void transform (Mtk.MonitorTransform transform, int width, int height, Mtk.Rectangle dest); +#endif + public Mtk.Rectangle union (Mtk.Rectangle rect2); + public bool vert_overlap (Mtk.Rectangle rect2); + } + [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] + public struct RegionBuilder { + [CCode (array_length_cname = "n_levels")] + public weak Mtk.Region levels[16]; + public int n_levels; + [CCode (cname = "MTK_REGION_BUILDER_MAX_LEVELS")] + public const int MAX_LEVELS; + public void add_rectangle (int x, int y, int width, int height); + public Mtk.Region finish (); + public void init (); + } + [CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)] + public struct RegionIterator { + public weak Mtk.Region region; + public Mtk.Rectangle rectangle; + public bool line_start; + public bool line_end; + public int i; + public bool at_end (); + public void init (Mtk.Region region); + public void next (); + } +#if HAS_MUTTER49 + [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_ANONYMOUS_FILE_MAPMODE_", has_type_id = false)] + public enum AnonymousFileMapmode { + PRIVATE, + SHARED + } +#endif +#if HAS_MUTTER47 + [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_MONITOR_TRANSFORM_", has_type_id = false)] + public enum MonitorTransform { + NORMAL, + @90, + @180, + @270, + FLIPPED, + FLIPPED_90, + FLIPPED_180, + FLIPPED_270; +#if HAS_MUTTER48 + public static Mtk.MonitorTransform from_string (string name); +#endif + public Mtk.MonitorTransform invert (); +#if HAS_MUTTER48 + public unowned string to_string (); +#endif + public Mtk.MonitorTransform transform (Mtk.MonitorTransform other); + public void transform_matrix (Graphene.Matrix matrix); + public void transform_point (int area_width, int area_height, int point_x, int point_y); + [CCode (cname = "MTK_MONITOR_ALL_TRANSFORMS")] + public const int ALL; + } +#endif + [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_REGION_OVERLAP_", has_type_id = false)] + public enum RegionOverlap { + OUT, + IN, + PART + } + [CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_ROUNDING_STRATEGY_", has_type_id = false)] + public enum RoundingStrategy { + SHRINK, + GROW, + ROUND + } +#if HAS_MUTTER48 + [CCode (cheader_filename = "mtk/mtk.h")] + public static void compute_viewport_matrix (Graphene.Matrix matrix, int width, int height, float scale, Mtk.MonitorTransform transform, Graphene.Rect src_rect); +#endif +#if HAS_MUTTER49 + [CCode (cheader_filename = "mtk/mtk.h")] +#if HAS_MUTTER50 + public static int64 extrapolate_next_interval_boundary (int64 boundary_us, int64 base_us, int64 interval_us); +#else + public static int64 extrapolate_next_interval_boundary (int64 base_us, int64 interval_us); +#endif +#endif +#if HAS_MUTTER50 + [CCode (cheader_filename = "mtk/mtk.h")] + public static int64 find_nearest_interval_boundary (int64 boundary_us, int64 base_us, int64 interval_us); +#endif + [CCode (cheader_filename = "mtk/mtk.h")] + [Version (replacement = "Rectangle.from_graphene_rect")] + public static Mtk.Rectangle rectangle_from_graphene_rect (Graphene.Rect rect, Mtk.RoundingStrategy rounding_strategy); + [CCode (cheader_filename = "mtk/mtk.h")] + [Version (replacement = "Region.create")] + public static Mtk.Region region_create (); + [CCode (cheader_filename = "mtk/mtk.h")] + [Version (replacement = "Region.create_rectangle")] + public static Mtk.Region region_create_rectangle (Mtk.Rectangle rect); + [CCode (cheader_filename = "mtk/mtk.h")] + [Version (replacement = "Region.create_rectangles")] + public static Mtk.Region region_create_rectangles (Mtk.Rectangle rects, int n_rects); + [CCode (cheader_filename = "mtk/mtk.h")] + public static void x11_errors_deinit (); +} diff --git a/wingpanel-interface/FocusManager.vala b/wingpanel-interface/FocusManager.vala index 38bc91b4..124279b1 100644 --- a/wingpanel-interface/FocusManager.vala +++ b/wingpanel-interface/FocusManager.vala @@ -140,7 +140,7 @@ public class WingpanelInterface.FocusManager : Object { event.get_time (), { x, y } ); -#elif HAS_MUTTER46 +#else window.begin_grab_op ( Meta.GrabOp.MOVING, event.get_device (), @@ -148,13 +148,6 @@ public class WingpanelInterface.FocusManager : Object { event.get_time (), { x, y } ); -#else - window.begin_grab_op ( - Meta.GrabOp.MOVING, - event.get_device (), - event.get_event_sequence (), - event.get_time () - ); #endif } diff --git a/wingpanel-interface/meson.build b/wingpanel-interface/meson.build index fcda54d6..9eb31806 100644 --- a/wingpanel-interface/meson.build +++ b/wingpanel-interface/meson.build @@ -5,17 +5,6 @@ vala_flags = [] c_flags =['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'] -mutter45_dep = dependency('libmutter-13', version: ['>= 45', '< 46'], required: false) -if mutter45_dep.found() - libmutter_dep = dependency('libmutter-13', version: '>= 45') - mutter_dep = [ - libmutter_dep, - dependency('mutter-mtk-13'), dependency('mutter-cogl-13'), - dependency('mutter-cogl-pango-13'), dependency('mutter-clutter-13') - ] - vala_flags = [] -endif - mutter46_dep = dependency('libmutter-14', version: ['>= 46', '< 47'], required: false) if mutter46_dep.found() libmutter_dep = dependency('libmutter-14', version: '>= 46') @@ -24,7 +13,7 @@ if mutter46_dep.found() dependency('mutter-mtk-14'), dependency('mutter-cogl-14'), dependency('mutter-cogl-pango-14'), dependency('mutter-clutter-14') ] - vala_flags = ['--define', 'HAS_MUTTER46'] + vala_flags = [] endif mutter47_dep = dependency('libmutter-15', version: ['>= 47', '< 48'], required: false) @@ -35,7 +24,7 @@ if mutter47_dep.found() dependency('mutter-mtk-15'), dependency('mutter-cogl-15'), dependency('mutter-cogl-pango-15'), dependency('mutter-clutter-15') ] - vala_flags = ['--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47'] + vala_flags = ['--define', 'HAS_MUTTER47'] endif mutter48_dep = dependency('libmutter-16', version: ['>= 48', '< 49'], required: false) @@ -46,7 +35,7 @@ if mutter48_dep.found() dependency('mutter-mtk-16'), dependency('mutter-cogl-16'), dependency('mutter-clutter-16') ] - vala_flags = ['--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48'] + vala_flags = ['--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48'] endif mutter49_dep = dependency('libmutter-17', version: ['>= 49', '< 50'], required: false) @@ -57,7 +46,7 @@ if mutter49_dep.found() dependency('mutter-mtk-17'), dependency('mutter-cogl-17'), dependency('mutter-clutter-17') ] - vala_flags = ['--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49'] + vala_flags = ['--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49'] endif mutter50_dep = dependency('libmutter-18', version: ['>= 50', '< 51'], required: false) @@ -68,7 +57,7 @@ if mutter50_dep.found() dependency('mutter-mtk-18'), dependency('mutter-cogl-18'), dependency('mutter-clutter-18') ] - vala_flags = ['--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49', '--define', 'HAS_MUTTER50'] + vala_flags = ['--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49', '--define', 'HAS_MUTTER50'] endif if mutter_dep.length() == 0