From f89686af61ed12b11a1ed7c4f878579922f6b672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Sun, 3 Jan 2021 20:34:25 +0100 Subject: [PATCH] Bump Mutter to 3.34 --- meson.build | 19 +-- src/DBusAccelerator.vala | 15 -- src/InternalUtils.vala | 9 -- src/Widgets/MultitaskingView.vala | 2 - vapi/Clutter-4-custom.vala | 42 ------ vapi/Clutter-4.metadata | 237 ------------------------------ vapi/Cogl-4-custom.vala | 79 ---------- vapi/Cogl-4.metadata | 102 ------------- vapi/Meta-4.metadata | 191 ------------------------ vapi/libmutter-4.deps | 1 - vapi/libmutter-4.vapi | 1 - vapi/libmutter-5.deps | 2 +- vapi/libmutter-5.vapi | 2 +- vapi/libmutter.vapi | 88 +---------- vapi/meson.build | 64 -------- vapi/mutter-clutter-4.deps | 5 - vapi/mutter-clutter-4.vapi | 1 - vapi/mutter-clutter-5.vapi | 2 +- vapi/mutter-cogl-4.deps | 1 - vapi/mutter-cogl-4.vapi | 1 - vapi/mutter-cogl-5.deps | 2 +- vapi/mutter-cogl-5.vapi | 2 +- vapi/mutter-cogl-pango-4.vapi | 0 vapi/mutter-cogl-path-4.vapi | 34 ----- 24 files changed, 9 insertions(+), 893 deletions(-) delete mode 100644 vapi/Clutter-4-custom.vala delete mode 100644 vapi/Clutter-4.metadata delete mode 100644 vapi/Cogl-4-custom.vala delete mode 100644 vapi/Cogl-4.metadata delete mode 100644 vapi/Meta-4.metadata delete mode 120000 vapi/libmutter-4.deps delete mode 120000 vapi/libmutter-4.vapi delete mode 100644 vapi/mutter-clutter-4.deps delete mode 120000 vapi/mutter-clutter-4.vapi delete mode 100644 vapi/mutter-cogl-4.deps delete mode 120000 vapi/mutter-cogl-4.vapi mode change 120000 => 100644 vapi/mutter-cogl-5.deps delete mode 100644 vapi/mutter-cogl-pango-4.vapi delete mode 100644 vapi/mutter-cogl-path-4.vapi diff --git a/meson.build b/meson.build index e2198e4f..4a5825f8 100644 --- a/meson.build +++ b/meson.build @@ -98,19 +98,6 @@ libmutter_dep = [] vala_flags = [] -mutter332_dep = dependency('libmutter-4', version: ['>= 3.31.2', '< 3.34'], required: false) -if mutter332_dep.found() - libmutter_dep = dependency('libmutter-4', version: '>= 3.31.2') - mutter_dep = [ - libmutter_dep, - dependency('mutter-cogl-4'), dependency('mutter-cogl-pango-4'), - dependency('mutter-cogl-path-4'), dependency('mutter-clutter-4') - ] - vala_flags = [] - add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API', - '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c') -endif - mutter334_dep = dependency('libmutter-5', version: ['>= 3.34', '< 3.35.1'], required: false) if mutter334_dep.found() libmutter_dep = dependency('libmutter-5', version: '>= 3.34') @@ -119,7 +106,7 @@ if mutter334_dep.found() dependency('mutter-cogl-5'), dependency('mutter-cogl-pango-5'), dependency('mutter-cogl-path-5'), dependency('mutter-clutter-5') ] - vala_flags = ['--define', 'HAS_MUTTER334'] + vala_flags = [] add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c') endif @@ -132,7 +119,7 @@ if mutter336_dep.found() dependency('mutter-cogl-6'), dependency('mutter-cogl-pango-6'), dependency('mutter-cogl-path-6'), dependency('mutter-clutter-6') ] - vala_flags = ['--define', 'HAS_MUTTER334', '--define', 'HAS_MUTTER336'] + vala_flags = ['--define', 'HAS_MUTTER336'] add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c') endif @@ -145,7 +132,7 @@ if mutter338_dep.found() dependency('mutter-cogl-7'), dependency('mutter-cogl-pango-7'), dependency('mutter-clutter-7') ] - vala_flags = ['--define', 'HAS_MUTTER334', '--define', 'HAS_MUTTER336', '--define', 'HAS_MUTTER338'] + vala_flags = ['--define', 'HAS_MUTTER336', '--define', 'HAS_MUTTER338'] add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c') endif diff --git a/src/DBusAccelerator.vala b/src/DBusAccelerator.vala index 087747df..b2afc270 100644 --- a/src/DBusAccelerator.vala +++ b/src/DBusAccelerator.vala @@ -46,19 +46,11 @@ namespace Gala { wm.get_display ().accelerator_activated.connect (on_accelerator_activated); } -#if HAS_MUTTER334 void on_accelerator_activated (uint action, Clutter.InputDevice device, uint timestamp) { -#else - void on_accelerator_activated (uint action, uint device_id, uint timestamp) { -#endif foreach (string accelerator in grabbed_accelerators.get_keys ()) { if (grabbed_accelerators[accelerator] == action) { var parameters = new GLib.HashTable (null, null); -#if HAS_MUTTER334 parameters.set ("device-id", new Variant.uint32 (device.id)); -#else - parameters.set ("device-id", new Variant.uint32 (device_id)); -#endif parameters.set ("timestamp", new Variant.uint32 (timestamp)); accelerator_activated (action, parameters); @@ -103,7 +95,6 @@ namespace Gala { return ret; } -#if HAS_MUTTER334 public bool ungrab_accelerators (uint[] actions) throws DBusError, IOError { foreach (uint action in actions) { ungrab_accelerator (action); @@ -111,7 +102,6 @@ namespace Gala { return true; } -#endif [DBus (name = "ShowOSD")] public void show_osd (GLib.HashTable parameters) throws DBusError, IOError { @@ -125,15 +115,10 @@ namespace Gala { if (parameters.contains ("label")) label = parameters["label"].get_string (); int32 level = 0; -#if HAS_MUTTER334 if (parameters.contains ("level")) { var double_level = parameters["level"].get_double (); level = (int)(double_level * 100); } -#else - if (parameters.contains ("level")) - level = parameters["level"].get_int32 (); -#endif //if (monitor_index > -1) // message ("MediaFeedback requested for specific monitor %i which is not supported", monitor_index); diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala index 86aa2144..75ec9f7a 100644 --- a/src/InternalUtils.vala +++ b/src/InternalUtils.vala @@ -131,23 +131,14 @@ namespace Gala { break; case InputArea.NONE: default: -#if HAS_MUTTER334 unowned Meta.X11Display x11display = display.get_x11_display (); x11display.clear_stage_input_region (); -#else - display.empty_stage_input_region (); -#endif return; } -#if HAS_MUTTER334 unowned Meta.X11Display x11display = display.get_x11_display (); var xregion = X.Fixes.create_region (x11display.get_xdisplay (), rects); x11display.set_stage_input_region (xregion); -#else - var xregion = X.Fixes.create_region (display.get_x11_display ().get_xdisplay (), rects); - Util.set_stage_input_region (display, xregion); -#endif } /** diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala index 41fb3952..94a5b830 100644 --- a/src/Widgets/MultitaskingView.vala +++ b/src/Widgets/MultitaskingView.vala @@ -78,9 +78,7 @@ namespace Gala { manager.workspace_added.connect (add_workspace); manager.workspace_removed.connect (remove_workspace); -#if HAS_MUTTER334 manager.workspaces_reordered.connect (() => update_positions (false)); -#endif manager.workspace_switched.connect_after ((from, to, direction) => { update_positions (opened); }); diff --git a/vapi/Clutter-4-custom.vala b/vapi/Clutter-4-custom.vala deleted file mode 100644 index 7350fd90..00000000 --- a/vapi/Clutter-4-custom.vala +++ /dev/null @@ -1,42 +0,0 @@ -namespace Clutter { - - public struct Color { - [CCode (cname = "clutter_color_from_hls")] - public Color.from_hls (float hue, float luminance, float saturation); - [CCode (cname = "clutter_color_from_pixel")] - public Color.from_pixel (uint32 pixel); - [CCode (cname = "clutter_color_from_string")] - public Color.from_string (string str); - [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-4.metadata b/vapi/Clutter-4.metadata deleted file mode 100644 index ee10bc2e..00000000 --- a/vapi/Clutter-4.metadata +++ /dev/null @@ -1,237 +0,0 @@ -// Non mini-object -ActorBox struct -Color struct -Fog struct -Geometry struct -Knot struct -Margin struct -PaintVolume struct -PathNode struct -Perspective struct -Point struct -Rect struct -Size struct -Units struct -Vertex struct - -*.ref unowned - -init.argv unowned -init_with_args - .argv unowned -Actor - .apply_transform.matrix ref - .get_abs_allocation_vertices.verts out=false - .get_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" -InitError errordomain=false -redraw skip - -// 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 - .queue_redraw#signal skip - .queue_redraw#virtual_method skip -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 - .lower virtual - .raise virtual - .*_child_meta#virtual_method virtual - .foreach_with_internals#virtual_method virtual - -// Default values -Container - .lower.sibling nullable default=null - .raise.sibling nullable default=null -Stage.read_pixels - .width default=-1 - .height default=-1 -Text - .position_to_coords.line_height default=null - -// Reparented funcs methods can't be instance methods -feature_available skip -feature_get_all skip -FeatureFlags.texture_npot skip - -// Skipped by g-i for unknown reasons -LayoutManager - .create_child_meta skip=false -Model - .insert_row skip=false - -// Variadic arguments -Actor - .animate skip=false - .animate_with_alpha skip=false - .animate_with_timeline skip=false -Animator - .set skip=false -Box - .pack skip=false - .pack_after skip=false - .pack_at skip=false - .pack_before skip=false -Container - .add_valist skip=false - .child_get skip=false - .child_set skip=false - .remove skip=false - .remove_valist 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 -ListModel - .new skip=false -Model - .append skip=false - .insert skip=false - .prepend skip=false -ModelIter - .get skip=false - .set skip=false -Script - .get_objects skip=false - -// Changing error domains -Texture - .new_from_file throws="Clutter.TextureError" - -// Skipped upstream for unknown reasons -Alpha.register_func skip=false -TimeoutPool skip=false -Interval.register_progress_func skip=false -frame_source_* skip=false -get_option_group skip=false -get_option_group_without_init skip=false -threads_add_frame_source skip=false -threads_add_frame_source_full skip=false -threads_add_idle skip=false -threads_add_idle_full skip=false -threads_set_lock_functions 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 -Color - .new skip -Margin - .new skip -Size - .init skip -Vertex.new skip - -// Class methods -container_class_find_child_property skip -container_class_list_child_properties skip - -// Move symbols -get_actor_by_gid parent="Clutter.Actor" name="get_by_gid" -get_input_device_for_id parent="Clutter.InputDevice" name="get_for_id" -color_from_* skip -units_from_* skip - -// Struct return values -color_get_static nullable - -// Upstream -Effect - .get_paint_volume.volume out -Event - .get_position.position out -Text - .cursor_event.geometry out - -// Remove for clutter-2.0 -///////////////////////// - -Stage - .event name="emit_event" - .capture.captures out array_length_idx=3 type="Clutter.Capture[]" - -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" -KeyEvent struct=false base_type="Clutter.Event" -MotionEvent struct=false base_type="Clutter.Event" -ScrollEvent struct=false base_type="Clutter.Event" -StageStateEvent struct=false base_type="Clutter.Event" -TouchEvent struct=false base_type="Clutter.Event" -TouchpadPinchEvent struct=false base_type="Clutter.Event" -TouchpadSwipeEvent struct=false base_type="Clutter.Event" - -// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X -*#constant skip -COGL skip=false -CURRENT_TIME skip=false -FLAVOUR skip=false -*VERSION* skip=false -PATH_RELATIVE skip=false -PRIORITY_REDRAW skip=false - -// Clutter devs don't like us creating nested namespaces -frame_source_* name="frame_source_(.+)" parent="Clutter.FrameSource" -value_* name="value_(.+)" parent="Clutter.Value" -threads_* name="threads_(.+)" parent="Clutter.Threads" -threads_add_frame_source name="add" parent="Clutter.Threads.FrameSource" -threads_add_frame_source_full name="add_full" parent="Clutter.Threads.FrameSource" -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" -util_next_p2 name="next_power_of_2" parent="Clutter.Util" - -// Backwards compatibility -Color.alloc symbol_type="function" -Point.alloc symbol_type="function" -Rect.alloc symbol_type="function" -Size.alloc symbol_type="function" -Vertex.alloc symbol_type="function" - -BinAlignment deprecated=false deprecated_since=null -BinAlignment.* deprecated -BinAlignment.start deprecated=false -BinLayout.new.*_align default=Clutter.BinAlignment.START - -// Possibly keep -KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key" diff --git a/vapi/Cogl-4-custom.vala b/vapi/Cogl-4-custom.vala deleted file mode 100644 index 392f3db2..00000000 --- a/vapi/Cogl-4-custom.vala +++ /dev/null @@ -1,79 +0,0 @@ -namespace Cogl { - [BooleanType] - [CCode (cheader_filename = "cogl/cogl.h")] - [SimpleType] - public struct Bool : bool { - } - - 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] - public class Bitmap : Cogl.Handle { - } - - [CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_quaternion_get_gtype ()", copy_function = "cogl_quaternion_copy", free_function = "cogl_quaternion_free")] - [Compact] - public class Quaternion { - } - - [Compact] - [CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_offscreen_get_gtype ()", ref_function = "cogl_offscreen_ref", unref_function = "cogl_offscreen_unref")] - public class Offscreen : Cogl.Handle { - } - - [Compact] - [CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")] - public class VertexBuffer : Cogl.Handle { - } - - [Compact] - [CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")] - public class Shader : Cogl.Handle { - } - - [Compact] - [CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")] - public class Program : Cogl.Handle { - } - - [Compact] - [CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")] - public class Handle { - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_bitmap")] - [Version (since = "1.0")] - public Cogl.Bool is_bitmap (); - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_material")] - [Version (deprecated = true, deprecated_since = "1.16")] - public Cogl.Bool is_material (); - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_offscreen")] - public Cogl.Bool is_offscreen (); - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_program")] - [Version (deprecated = true, deprecated_since = "1.16")] - public Cogl.Bool is_program (Cogl.Handle handle); - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_shader")] - [Version (deprecated = true, deprecated_since = "1.16")] - public Cogl.Bool is_shader (); - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_texture")] - public Cogl.Bool is_texture (); - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_vertex_buffer")] - [Version (deprecated = true, deprecated_since = "1.16", since = "1.0")] - public Cogl.Bool is_vertex_buffer (); - [CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_vertex_buffer_indices")] - [Version (deprecated = true, deprecated_since = "1.16", since = "1.4")] - public Cogl.Bool is_vertex_buffer_indices (); - } - -} diff --git a/vapi/Cogl-4.metadata b/vapi/Cogl-4.metadata deleted file mode 100644 index c9150c65..00000000 --- a/vapi/Cogl-4.metadata +++ /dev/null @@ -1,102 +0,0 @@ -Color struct -Bool skip -Quaternion skip=false - -Material base_type="Cogl.Handle" -MaterialLayer base_type="Cogl.Handle" - -_ColorSizeCheck skip -_MatrixSizeCheck skip -_TextureVertexSizeCheck skip - -Offscreen.ref skip -Offscreen.unref skip - -Color - .init_* skip -color_init_from_hsl skip -color_equal.v1 type="Cogl.Color" -color_equal.v2 type="Cogl.Color" -color_equal symbol_type=method - -texture_new_* name="texture_new_(.+)" parent="Cogl.Texture" -Texture - .get_data.data type="uint8[]" - .new_from_data.data type="uint8[]" - .set_data.data type="uint8[]" - .set_region.data type="uint8[]" - -Matrix - .transform_points.points_in type="uint8[]" - .transform_points.stride_out out - .transform_points.points_out out type="uint8[]" - .project_points.points_in type="uint8[]" - .project_points.stride_out out - .project_points.points_out out type="uint8[]" - -matrix_equal.v1 type="Cogl.Matrix" -matrix_equal.v2 type="Cogl.Matrix" -matrix_equal symbol_type=method - -polygon.vertices array array_length_idx=1 - -vertex_buffer_* name="vertex_buffer_(.+)" parent="Cogl.VertexBuffer" -//vertex_buffer_* symbol_type="method" instance_idx=0 -vertex_buffer_add symbol_type="method" instance_idx=0 -vertex_buffer_delete symbol_type="method" instance_idx=0 -vertex_buffer_disable symbol_type="method" instance_idx=0 -vertex_buffer_draw symbol_type="method" instance_idx=0 -vertex_buffer_draw_elements symbol_type="method" instance_idx=0 -vertex_buffer_enable symbol_type="method" instance_idx=0 -vertex_buffer_get_n_vertices symbol_type="method" instance_idx=0 -vertex_buffer_indices_get_type symbol_type="method" instance_idx=0 -vertex_buffer_submit symbol_type="method" instance_idx=0 -vertex_buffer_unref skip -vertex_buffer_ref skip - -shader_* name="shader_(.+)" parent="Cogl.Shader" -shader_* symbol_type="method" instance_idx=0 -shader_unref skip -shader_ref skip - -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 -program_use symbol_type="method" instance_idx=0 - -program_unref skip -program_ref skip - -is_bitmap parent="Cogl.Handle" -is_material parent="Cogl.Handle" -is_offscreen parent="Cogl.Handle" -is_program parent="Cogl.Handle" -is_shader parent="Cogl.Handle" -is_texture parent="Cogl.Handle" -is_vertex_buffer parent="Cogl.Handle" -is_vertex_buffer_indices parent="Cogl.Handle" - -create_program type="unowned Cogl.Program" name="create" parent="Cogl.Program" -create_shader type="unowned Cogl.Shader" name="create" parent="Cogl.Shader" - -get_source type="unowned Cogl.Material" -push_source.material type="Cogl.Material" -set_source.material type="Cogl.Material" - -Bitmap.error_quark parent="Cogl.BitmapError" name="quark" -Texture.error_quark parent="Cogl.TextureError" name="quark" -texture_error_quark skip - -BitmapError errordomain -BlendStringError errordomain -RendererError errordomain -SystemError errordomain -TextureError errordomain - -FuncPtr skip diff --git a/vapi/Meta-4.metadata b/vapi/Meta-4.metadata deleted file mode 100644 index e4d0cbc1..00000000 --- a/vapi/Meta-4.metadata +++ /dev/null @@ -1,191 +0,0 @@ -* skip=false -*.* skip=false -* cheader_filename="meta/main.h" - -Backend cheader_filename="meta/meta-backend.h" -get_backend parent="Meta.Backend" cheader_filename="meta/meta-backend.h" -Background cheader_filename="meta/meta-background.h" -Background.set_file.file nullable -BackgroundActor cheader_filename="meta/meta-background-actor.h" -BackgroundGroup cheader_filename="meta/meta-background-group.h" -BackgroundImage cheader_filename="meta/meta-background-image.h" -BackgroundImageCache cheader_filename="meta/meta-background-image.h" -Barrier cheader_filename="meta/barrier.h" -BarrierDirection cheader_filename="meta/barrier.h" -BarrierEvent cheader_filename="meta/barrier.h" -ButtonFunction cheader_filename="meta/common.h" -ButtonLayout cheader_filename="meta/common.h" -Compositor cheader_filename="meta/compositor.h" -Compositor.process_event.event type="X.Event" ref -Compositor.sync_stack.stack type_arguments="Meta.Window" -compositor_new 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" -get_overlay_window parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h" -set_stage_input_region parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h" -empty_stage_input_region parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h" -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" -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.x out -CursorTracker.get_pointer.y out -CursorTracker.get_pointer.mods out -DebugTopic cheader_filename="meta/util.h" -Direction cheader_filename="meta/common.h" -Display cheader_filename="meta/display.h" -DisplayCorner cheader_filename="meta/display.h" -DisplayDirection cheader_filename="meta/display.h" -Dnd cheader_filename="meta/meta-dnd.h" -EdgeType cheader_filename="meta/boxes.h" -Edge cheader_filename="meta/boxes.h" -Frame cheader_filename="meta/types.h" -FrameBorders cheader_filename="meta/common.h" -FrameFlags cheader_filename="meta/common.h" -FrameType cheader_filename="meta/common.h" -GrabOp cheader_filename="meta/common.h" -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" -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" -LaunchContext cheader_filename="meta/meta-launch-context.h" -LaterType cheader_filename="meta/util.h" -LocaleDirection cheader_filename="meta/util.h" -MaximizeFlags cheader_filename="meta/window.h" -ModalOptions cheader_filename="meta/meta-plugin.h" -MonitorManager cheader_filename="meta/meta-monitor-manager.h" -MonitorSwitchConfigType cheader_filename="meta/meta-monitor-manager.h" -MotionDirection cheader_filename="meta/common.h" -PadActionType cheader_filename="meta/display.h" -Plugin cheader_filename="meta/meta-plugin.h" -Plugin.xevent_filter.event type="X.Event" ref -PluginInfo cheader_filename="meta/meta-plugin.h" -PluginVersion cheader_filename="meta/meta-plugin.h" -Preference cheader_filename="meta/prefs.h" -PrefsChangedFunc cheader_filename="meta/prefs.h" -Rectangle cheader_filename="meta/boxes.h" struct -RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h" -RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h" -Settings cheader_filename="meta/meta-settings.h" -Shadow cheader_filename="meta/meta-shadow-factory.h" -ShadowFactory cheader_filename="meta/meta-shadow-factory.h" -ShadowMode cheader_filename="meta/meta-window-actor.h" -ShadowParams cheader_filename="meta/meta-shadow-factory.h" -ShapedTexture cheader_filename="meta/meta-shaped-texture.h" -Side cheader_filename="meta/common.h" -SizeChange cheader_filename="meta/compositor.h" -SoundPlayer cheader_filename="meta/meta-sound-player.h" -StartupNotification cheader_filename="meta/meta-startup-notification.h" -StartupNotification.changed.object type="Meta.StartupSequence" -StartupNotification.get_sequences type_arguments="Meta.StartupSequence" -StartupSequence cheader_filename="meta/meta-startup-notification.h" -StackLayer cheader_filename="meta/common.h" -Stage cheader_filename="meta/meta-stage.h" -Stage.is_focused parent="Meta.Display" symbol_type="method" name="stage_is_focused" instance_idx=0 cheader_filename="meta/compositor-mutter.h" -Strut cheader_filename="meta/boxes.h" -TabList cheader_filename="meta/display.h" -TabShowType cheader_filename="meta/display.h" -Theme cheader_filename="meta/theme.h" -theme_get_default cheader_filename="meta/theme.h" -theme_new cheader_filename="meta/theme.h" -VirtualModifier cheader_filename="meta/common.h" -Workspace cheader_filename="meta/workspace.h" -WorkspaceManager cheader_filename="meta/meta-workspace-manager.h" -Window cheader_filename="meta/window.h" -Window.focus#signal name="focused" -Window.icon type="Cairo.Surface" -Window.mini_icon type="Cairo.Surface" -WindowActor cheader_filename="meta/meta-window-actor.h" -WindowClientType cheader_filename="meta/window.h" -WindowForeachFunc cheader_filename="meta/window.h" -WindowGroup cheader_filename="meta/meta-window-group.h" -WindowMenuType cheader_filename="meta/compositor.h" -WindowShape cheader_filename="meta/meta-window-shape.h" -WindowType cheader_filename="meta/window.h" -X11Display cheader_filename="meta/meta-x11-display.h" - -rect skip -prefs_* parent="Meta.Prefs" name="prefs_(.+)" cheader_filename="meta/prefs.h" - -g_utf8_strndup skip - -preference_to_string cheader_filename="meta/prefs.h" -frame_type_to_string cheader_filename="meta/util.h" - -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" - -MAJOR_VERSION cheader_filename="meta/meta-version.h" -MINOR_VERSION cheader_filename="meta/meta-version.h" -MICRO_VERSION cheader_filename="meta/meta-version.h" -PLUGIN_API_VERSION cheader_filename="meta/meta-version.h" - -add_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h" -bug parent="Meta.Util" cheader_filename="meta/util.h" -debug_spew_real 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" -free_gslist_and_elements skip -get_locale_direction parent="Meta.Util" cheader_filename="meta/util.h" -gravity_to_string parent="Meta.Util" cheader_filename="meta/util.h" -is_debugging parent="Meta.Util" cheader_filename="meta/util.h" -is_syncing parent="Meta.Util" cheader_filename="meta/util.h" -is_verbose parent="Meta.Util" cheader_filename="meta/util.h" -is_wayland_compositor parent="Meta.Util" cheader_filename="meta/util.h" -later_add parent="Meta.Util" cheader_filename="meta/util.h" -later_remove parent="Meta.Util" cheader_filename="meta/util.h" -pop_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h" -push_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h" -remove_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h" -show_dialog parent="Meta.Util" cheader_filename="meta/util.h" -show_dialog.columns type_arguments="string" nullable default=null -show_dialog.entries type_arguments="string" nullable default=null -show_dialog.transient_for default=0 -show_dialog.icon_name nullable default=null -show_dialog.cancel_text nullable default=null -show_dialog.ok_text nullable default=null -show_dialog.display nullable default=null -show_dialog.timeout nullable default=null -topic_real 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?" -verbose_real parent="Meta.Util" cheader_filename="meta/util.h" -warning parent="Meta.Util" cheader_filename="meta/util.h" -set_gnome_wm_keybindings parent="Meta.Util" -set_wm_name parent="Meta.Util" - -x11_error_trap_pop parent="Meta.X11Display" symbol_type="method" name="error_trap_pop" instance_idx=0 cheader_filename="meta/meta-x11-errors.h" -x11_error_trap_pop_with_return parent="Meta.X11Display" symbol_type="method" name="error_trap_pop_with_return" instance_idx=0 cheader_filename="meta/meta-x11-errors.h" -x11_error_trap_push parent="Meta.X11Display" symbol_type="method" name="error_trap_push" instance_idx=0 cheader_filename="meta/meta-x11-errors.h" -x11_init_gdk_display parent="Meta.X11Display" cheader_filename="meta/meta-x11-display.h" diff --git a/vapi/libmutter-4.deps b/vapi/libmutter-4.deps deleted file mode 120000 index 7782137a..00000000 --- a/vapi/libmutter-4.deps +++ /dev/null @@ -1 +0,0 @@ -libmutter.deps \ No newline at end of file diff --git a/vapi/libmutter-4.vapi b/vapi/libmutter-4.vapi deleted file mode 120000 index 12f9cc52..00000000 --- a/vapi/libmutter-4.vapi +++ /dev/null @@ -1 +0,0 @@ -libmutter.vapi \ No newline at end of file diff --git a/vapi/libmutter-5.deps b/vapi/libmutter-5.deps index 1a8df7c1..7782137a 120000 --- a/vapi/libmutter-5.deps +++ b/vapi/libmutter-5.deps @@ -1 +1 @@ -libmutter-4.deps \ No newline at end of file +libmutter.deps \ No newline at end of file diff --git a/vapi/libmutter-5.vapi b/vapi/libmutter-5.vapi index 0aabcb7c..12f9cc52 120000 --- a/vapi/libmutter-5.vapi +++ b/vapi/libmutter-5.vapi @@ -1 +1 @@ -libmutter-4.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 69728bee..e9e94de9 100644 --- a/vapi/libmutter.vapi +++ b/vapi/libmutter.vapi @@ -282,16 +282,10 @@ namespace Meta { public double x; public double y; } -#if HAS_MUTTER334 [CCode (cheader_filename = "meta/compositor.h", type_id = "meta_compositor_get_type ()")] public abstract class Compositor : GLib.Object { [CCode (has_construct_function = false)] protected Compositor (); -#else - [CCode (cheader_filename = "meta/compositor.h", has_type_id = false)] - [Compact] - public class Compositor { -#endif public void add_window (Meta.Window window); public void destroy (); public bool filter_keybinding (Meta.KeyBinding binding); @@ -299,11 +293,6 @@ namespace Meta { public void hide_tile_preview (); public void hide_window (Meta.Window window, Meta.CompEffect effect); public void manage (); -#if !HAS_MUTTER334 - [CCode (cheader_filename = "meta/compositor.h")] - public static unowned Meta.Compositor @new (Meta.Display display); - public bool process_event ([CCode (type = "XEvent*")] ref X.Event event, Meta.Window window); -#endif public void queue_frame_drawn (Meta.Window window, bool no_delay_frame); public void remove_window (Meta.Window window); public void show_tile_preview (Meta.Window window, Meta.Rectangle tile_rect, int tile_monitor_number); @@ -322,12 +311,8 @@ namespace Meta { [NoAccessorMethod] public Meta.Backend backend { owned get; construct; } #endif -#if HAS_MUTTER334 [NoAccessorMethod] public Meta.Display display { owned get; construct; } -#else - public void window_surface_changed (Meta.Window window); -#endif } [CCode (cheader_filename = "meta/meta-cursor-tracker.h", type_id = "meta_cursor_tracker_get_type ()")] public class CursorTracker : GLib.Object { @@ -335,9 +320,7 @@ namespace Meta { protected CursorTracker (); public void get_hot (out int x, out int y); public void get_pointer (out int x, out int y, out Clutter.ModifierType mods); -#if HAS_MUTTER334 public bool get_pointer_visible (); -#endif public unowned Cogl.Texture get_sprite (); public void set_pointer_visible (bool visible); #if HAS_MUTTER338 @@ -346,9 +329,7 @@ namespace Meta { #endif public signal void cursor_changed (); public signal void cursor_moved (float x, float y); -#if HAS_MUTTER334 public signal void visibility_changed (); -#endif } [CCode (cheader_filename = "meta/display.h", type_id = "meta_display_get_type ()")] public class Display : GLib.Object { @@ -361,10 +342,6 @@ namespace Meta { public void close (uint32 timestamp); [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_disable_unredirect_for_display")] public void disable_unredirect (); -#if !HAS_MUTTER334 - [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_empty_stage_input_region")] - public void empty_stage_input_region (); -#endif [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_enable_unredirect_for_display")] public void enable_unredirect (); public void end_grab_op (uint32 timestamp); @@ -390,15 +367,8 @@ namespace Meta { public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir); public float get_monitor_scale (int monitor); public int get_n_monitors (); -#if !HAS_MUTTER334 - [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_overlay_window")] - public X.Window get_overlay_window (); -#endif public string get_pad_action_label (Clutter.InputDevice pad, Meta.PadActionType action_type, uint action_number); public int get_primary_monitor (); -#if !HAS_MUTTER334 - public unowned Meta.Selection get_selection (); -#endif public void get_size (out int width, out int height); public unowned Meta.SoundPlayer get_sound_player (); public unowned Meta.StartupNotification get_startup_notification (); @@ -420,12 +390,7 @@ namespace Meta { public bool remove_keybinding (string name); public void request_pad_osd (Clutter.InputDevice pad, bool edition_mode); public void set_cursor (Meta.Cursor cursor); -#if HAS_MUTTER334 public void set_input_focus (Meta.Window window, bool focus_frame, uint32 timestamp); -#else - [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_set_stage_input_region")] - public void set_stage_input_region (X.XserverRegion region); -#endif public GLib.SList sort_windows_by_stacking (GLib.SList windows); [CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_stage_is_focused")] public bool stage_is_focused (); @@ -438,20 +403,14 @@ namespace Meta { #endif public bool xserver_time_is_before (uint32 time1, uint32 time2); public Meta.Window focus_window { get; } -#if HAS_MUTTER334 public signal void accelerator_activated (uint object, Clutter.InputDevice p0, uint p1); public signal void closing (); -#else - public signal void accelerator_activated (uint object, uint p0, uint p1); -#endif public signal void cursor_updated (); public signal void gl_video_memory_purged (); public signal void grab_op_begin (Meta.Display object, Meta.Window p0, Meta.GrabOp p1); public signal void grab_op_end (Meta.Display object, Meta.Window p0, Meta.GrabOp p1); public signal void in_fullscreen_changed (); -#if HAS_MUTTER334 public signal bool init_xserver (GLib.Task object); -#endif public signal bool modifiers_accelerator_activated (); public signal void overlay_key (); public signal void pad_mode_switch (Clutter.InputDevice object, uint p0, uint p1); @@ -470,9 +429,7 @@ namespace Meta { public signal void workareas_changed (); public signal void x11_display_closing (); public signal void x11_display_opened (); -#if HAS_MUTTER334 public signal void x11_display_setup (); -#endif } [CCode (cheader_filename = "meta/meta-dnd.h", type_id = "meta_dnd_get_type ()")] public class Dnd : GLib.Object { @@ -588,10 +545,8 @@ namespace Meta { public virtual void kill_switch_workspace (); [NoWrapper] public virtual void kill_window_effects (Meta.WindowActor actor); -#if HAS_MUTTER334 [NoWrapper] public virtual void locate_pointer (); -#endif public static void manager_set_plugin_type (GLib.Type gtype); [NoWrapper] public virtual void map (Meta.WindowActor actor); @@ -647,7 +602,6 @@ namespace Meta { #endif public signal void stopped (); } -#if HAS_MUTTER334 [CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")] public class Selection : GLib.Object { [CCode (has_construct_function = false)] @@ -673,7 +627,6 @@ namespace Meta { [CCode (has_construct_function = false, type = "MetaSelectionSource*")] public SelectionSourceMemory (string mimetype, GLib.Bytes content); } -#endif [CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)] [Compact] public class Settings { @@ -699,11 +652,7 @@ namespace Meta { public signal void changed (); } [CCode (cheader_filename = "meta/meta-shaped-texture.h", type_id = "meta_shaped_texture_get_type ()")] -#if HAS_MUTTER334 public class ShapedTexture : GLib.Object, Clutter.Content { -#else - public class ShapedTexture : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { -#endif [CCode (has_construct_function = false)] protected ShapedTexture (); public Cairo.Surface? get_image (Cairo.RectangleInt? clip); @@ -711,9 +660,6 @@ namespace Meta { public void set_create_mipmaps (bool create_mipmaps); public void set_mask_texture (Cogl.Texture mask_texture); public void set_opaque_region (owned Cairo.Region opaque_region); -#if !HAS_MUTTER334 - public bool update_area (int x, int y, int width, int height); -#endif public signal void size_changed (); } [CCode (cheader_filename = "meta/meta-sound-player.h", type_id = "meta_sound_player_get_type ()")] @@ -936,7 +882,7 @@ namespace Meta { public string wm_class { get; } [CCode (cname = "focus")] public signal void focused (); -#if HAS_MUTTER334 && !HAS_MUTTER338 +#if !HAS_MUTTER338 public signal void monitor_changed (int old_monitor); #endif public signal void position_changed (); @@ -956,16 +902,9 @@ namespace Meta { #if HAS_MUTTER338 public void freeze (); #endif -#if HAS_MUTTER334 public Cairo.Surface? get_image (Cairo.RectangleInt? clip); -#endif public unowned Meta.Window get_meta_window (); -#if !HAS_MUTTER334 - public unowned Clutter.Actor get_texture (); -#endif -#if HAS_MUTTER334 public unowned Meta.ShapedTexture get_texture (); -#endif public bool is_destroyed (); public void sync_visibility (); #if HAS_MUTTER338 @@ -978,9 +917,7 @@ namespace Meta { [NoAccessorMethod] public Meta.ShadowMode shadow_mode { get; set; } #endif -#if HAS_MUTTER334 public signal void damaged (); -#endif public signal void effects_completed (); public signal void first_frame (); #if HAS_MUTTER336 @@ -1040,39 +977,30 @@ namespace Meta { 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); -#if HAS_MUTTER334 public void reorder_workspace (Meta.Workspace workspace, int new_index); [NoAccessorMethod] public int layout_columns { get; } [NoAccessorMethod] public int layout_rows { get; } -#endif public int n_workspaces { get; } public signal void active_workspace_changed (); public signal void showing_desktop_changed (); public signal void workspace_added (int object); public signal void workspace_removed (int object); public signal void workspace_switched (int object, int p0, Meta.MotionDirection p1); -#if HAS_MUTTER334 public signal void workspaces_reordered (); -#endif } [CCode (cheader_filename = "meta/meta-x11-display.h", type_id = "meta_x11_display_get_type ()")] public class X11Display : GLib.Object { [CCode (has_construct_function = false)] protected X11Display (); -#if HAS_MUTTER334 public void clear_stage_input_region (); -#endif [CCode (cheader_filename = "meta/meta-x11-errors.h", cname = "meta_x11_error_trap_pop")] public void error_trap_pop (); [CCode (cheader_filename = "meta/meta-x11-errors.h", cname = "meta_x11_error_trap_pop_with_return")] public int error_trap_pop_with_return (); [CCode (cheader_filename = "meta/meta-x11-errors.h", cname = "meta_x11_error_trap_push")] public void error_trap_push (); -#if !HAS_MUTTER334 - public void focus_the_no_focus_window (uint32 timestamp); -#endif public int get_damage_event_base (); public int get_screen_number (); public int get_shape_event_base (); @@ -1082,11 +1010,7 @@ namespace Meta { public bool has_shape (); public unowned Meta.Group lookup_group (X.Window group_leader); public void set_cm_selection (); -#if !HAS_MUTTER334 - public void set_input_focus_window (Meta.Window window, bool focus_frame, uint32 timestamp); -#else public void set_stage_input_region (X.XserverRegion region); -#endif [CCode (cheader_filename = "meta/meta-x11-display.h", cname = "meta_x11_init_gdk_display")] public static bool x11_init_gdk_display () throws GLib.Error; public bool xwindow_is_a_no_focus_window (X.Window xwindow); @@ -1482,9 +1406,7 @@ namespace Meta { MOVE_TO_SIDE_W, MOVE_TO_CENTER, OVERLAY_KEY, -#if HAS_MUTTER334 LOCATE_POINTER_KEY, -#endif ISO_NEXT_GROUP, ALWAYS_ON_TOP, SWITCH_MONITOR, @@ -1498,9 +1420,7 @@ namespace Meta { PER_WINDOW, BUILTIN, IGNORE_AUTOREPEAT, -#if HAS_MUTTER334 NO_AUTO_GRAB, -#endif IS_REVERSED, NON_MASKABLE } @@ -1590,9 +1510,7 @@ namespace Meta { DRAGGABLE_BORDER_WIDTH, AUTO_MAXIMIZE, CENTER_NEW_WINDOWS, -#if HAS_MUTTER334 LOCATE_POINTER, -#endif #if HAS_MUTTER336 CHECK_ALIVE_TIMEOUT, #endif @@ -1600,7 +1518,6 @@ namespace Meta { [CCode (cheader_filename = "meta/prefs.h")] public unowned string to_string (); } -#if HAS_MUTTER334 [CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")] public enum SelectionType { SELECTION_PRIMARY, @@ -1608,7 +1525,6 @@ namespace Meta { SELECTION_DND, N_SELECTION_TYPES } -#endif [CCode (cheader_filename = "meta/meta-window-actor.h", cprefix = "META_SHADOW_MODE_", type_id = "meta_shadow_mode_get_type ()")] public enum ShadowMode { AUTO, @@ -1772,8 +1688,6 @@ namespace Meta { public static void restart (string? message); [CCode (cheader_filename = "meta/main.h")] public static int run (); -#if HAS_MUTTER334 [CCode (cheader_filename = "meta/main.h")] public static void test_init (); -#endif } diff --git a/vapi/meson.build b/vapi/meson.build index fb9caae7..d8f13965 100644 --- a/vapi/meson.build +++ b/vapi/meson.build @@ -6,70 +6,6 @@ vapigen_args = [ '--vapidir=@0@'.format(meson.current_source_dir()), ] -if mutter332_dep.found() - cogl_target = custom_target('mutter-cogl-4', - command: [ - vapigen, - mutter_typelib_dir / 'Cogl-4.gir', - '--library=mutter-cogl-4', - '--pkg=gobject-2.0', - vapigen_args, - files('Cogl-4-custom.vala') - ], - output: 'mutter-cogl-4.vapi' - ) - - cogl_pango_target = custom_target('mutter-cogl-pango-4', - command: [ - vapigen, - mutter_typelib_dir / 'CoglPango-4.gir', - '--library=mutter-cogl-pango-4', - '--pkg=mutter-cogl-4', - '--pkg=pangocairo', - vapigen_args - ], - depends: cogl_target, - output: 'mutter-cogl-pango-4.vapi' - ) - - clutter_target = custom_target('mutter-clutter-4', - command: [ - vapigen, - mutter_typelib_dir / 'Clutter-4.gir', - '--library=mutter-clutter-4', - '--pkg=mutter-cogl-4', - '--pkg=mutter-cogl-pango-4', - '--pkg=atk', - '--pkg=gio-2.0', - '--pkg=json-glib-1.0', - '--pkg=pangocairo', - vapigen_args, - files('Clutter-4-custom.vala') - ], - depends: [ cogl_target, cogl_pango_target ], - output: 'mutter-clutter-4.vapi' - ) - - libmutter_target = custom_target('libmutter-4', - command: [ - vapigen, - mutter_typelib_dir / 'Meta-4.gir', - '--library=libmutter-4', - '--pkg=mutter-cogl-4', - '--pkg=mutter-cogl-pango-4', - '--pkg=mutter-clutter-4', - '--pkg=atk', - '--pkg=gio-2.0', - '--pkg=json-glib-1.0', - '--pkg=pangocairo', - '--pkg=gtk+-3.0', - '--pkg=x11', - vapigen_args - ], - depends: [ cogl_target, cogl_pango_target, clutter_target ], - output: 'libmutter-4.vapi' - ) -endif if mutter334_dep.found() cogl_target = custom_target('mutter-cogl-5', command: [ diff --git a/vapi/mutter-clutter-4.deps b/vapi/mutter-clutter-4.deps deleted file mode 100644 index 7b119ff7..00000000 --- a/vapi/mutter-clutter-4.deps +++ /dev/null @@ -1,5 +0,0 @@ -atk -cairo -pango -json-glib-1.0 -mutter-cogl-4 diff --git a/vapi/mutter-clutter-4.vapi b/vapi/mutter-clutter-4.vapi deleted file mode 120000 index e1b7159f..00000000 --- a/vapi/mutter-clutter-4.vapi +++ /dev/null @@ -1 +0,0 @@ -mutter-clutter.vapi \ No newline at end of file diff --git a/vapi/mutter-clutter-5.vapi b/vapi/mutter-clutter-5.vapi index 6d9f291d..e1b7159f 120000 --- a/vapi/mutter-clutter-5.vapi +++ b/vapi/mutter-clutter-5.vapi @@ -1 +1 @@ -mutter-clutter-4.vapi \ No newline at end of file +mutter-clutter.vapi \ No newline at end of file diff --git a/vapi/mutter-cogl-4.deps b/vapi/mutter-cogl-4.deps deleted file mode 100644 index 98ccac5b..00000000 --- a/vapi/mutter-cogl-4.deps +++ /dev/null @@ -1 +0,0 @@ -pango diff --git a/vapi/mutter-cogl-4.vapi b/vapi/mutter-cogl-4.vapi deleted file mode 120000 index 7e33c18b..00000000 --- a/vapi/mutter-cogl-4.vapi +++ /dev/null @@ -1 +0,0 @@ -mutter-cogl.vapi \ No newline at end of file diff --git a/vapi/mutter-cogl-5.deps b/vapi/mutter-cogl-5.deps deleted file mode 120000 index c267692f..00000000 --- a/vapi/mutter-cogl-5.deps +++ /dev/null @@ -1 +0,0 @@ -mutter-cogl-4.deps \ No newline at end of file diff --git a/vapi/mutter-cogl-5.deps b/vapi/mutter-cogl-5.deps new file mode 100644 index 00000000..98ccac5b --- /dev/null +++ b/vapi/mutter-cogl-5.deps @@ -0,0 +1 @@ +pango diff --git a/vapi/mutter-cogl-5.vapi b/vapi/mutter-cogl-5.vapi index 4a1fb9f4..7e33c18b 120000 --- a/vapi/mutter-cogl-5.vapi +++ b/vapi/mutter-cogl-5.vapi @@ -1 +1 @@ -mutter-cogl-4.vapi \ No newline at end of file +mutter-cogl.vapi \ No newline at end of file diff --git a/vapi/mutter-cogl-pango-4.vapi b/vapi/mutter-cogl-pango-4.vapi deleted file mode 100644 index e69de29b..00000000 diff --git a/vapi/mutter-cogl-path-4.vapi b/vapi/mutter-cogl-path-4.vapi deleted file mode 100644 index 23accc3a..00000000 --- a/vapi/mutter-cogl-path-4.vapi +++ /dev/null @@ -1,34 +0,0 @@ -[CCode (gir_namespace = "CoglPath", gir_version = "4")] -namespace Cogl { - [CCode (cheader_filename = "cogl-path/cogl-path.h", copy_function = "cogl_path_copy", ref_function = "cogl_object_ref", unref_function = "cogl_object_unref", type_id = "cogl_path_get_gtype")] - [Compact] - public class Path { - public void arc (float center_x, float center_y, float radius_x, float radius_y, float angle_1, float angle_2); - public void close (); - public Cogl.Path copy (); - public void curve_to (float x_1, float y_1, float x_2, float y_2, float x_3, float y_3); - public void ellipse (float center_x, float center_y, float radius_x, float radius_y); - public void fill (); - public void fill_preserve (); - public Cogl.PathFillRule get_fill_rule (); - public void line (float x_1, float y_1, float x_2, float y_2); - public void line_to (float x, float y); - public void move_to (float x, float y); - public Path (); - public void polygon ([CCode (array_length = false)] float[] coords, int num_points); - public void polyline ([CCode (array_length = false)] float[] coords, int num_points); - public void rectangle (float x_1, float y_1, float x_2, float y_2); - public void rel_curve_to (float x_1, float y_1, float x_2, float y_2, float x_3, float y_3); - public void rel_line_to (float x, float y); - public void rel_move_to (float x, float y); - public void round_rectangle (float x_1, float y_1, float x_2, float y_2, float radius, float arc_step); - public void set_fill_rule (Cogl.PathFillRule fill_rule); - public void stroke (); - public void stroke_preserve (); - } - [CCode (cheader_filename = "cogl-path/cogl-path.h", cprefix = "COGL_PATH_FILL_RULE_", has_type_id = false)] - public enum PathFillRule { - NON_ZERO, - EVEN_ODD - } -}