From d3815e151bce9c51158dee3ec2f65bda17037817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sun, 10 Nov 2024 12:44:29 -0800 Subject: [PATCH] Rest of 45 ifdef --- vapi/libmutter.vapi | 206 +------------------------------------------- 1 file changed, 1 insertion(+), 205 deletions(-) diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi index c531f6f3..308c71e9 100644 --- a/vapi/libmutter.vapi +++ b/vapi/libmutter.vapi @@ -59,10 +59,8 @@ namespace Meta { public static bool get_gnome_animations (); [CCode (cheader_filename = "meta/prefs.h")] public static Meta.KeyBindingAction get_keybinding_action (string name); -#if HAS_MUTTER45 [CCode (cheader_filename = "meta/prefs.h")] public static string? get_keybinding_label (string name); -#endif [CCode (cheader_filename = "meta/prefs.h")] public static int get_mouse_button_menu (); [CCode (cheader_filename = "meta/prefs.h")] @@ -75,10 +73,6 @@ namespace Meta { public static bool get_raise_on_click (); [CCode (cheader_filename = "meta/prefs.h")] public static bool get_show_fallback_app_menu (); -#if !HAS_MUTTER45 - [CCode (cheader_filename = "meta/prefs.h")] - public static unowned Pango.FontDescription get_titlebar_font (); -#endif [CCode (cheader_filename = "meta/prefs.h")] public static bool get_visual_bell (); [CCode (cheader_filename = "meta/prefs.h")] @@ -321,9 +315,7 @@ namespace Meta { public unowned Meta.DebugControl get_debug_control (); #endif public unowned Meta.Display get_display (); -#if HAS_MUTTER45 public unowned Meta.WaylandCompositor? get_wayland_compositor (); -#endif public bool is_replacing (); public void notify_ready (); public bool raise_rlimit_nofile () throws GLib.Error; @@ -407,11 +399,7 @@ namespace Meta { public unowned Meta.Window get_focus_window (); public uint get_keybinding_action (uint keycode, ulong mask); public uint32 get_last_user_time (); -#if HAS_MUTTER45 public Mtk.Rectangle get_monitor_geometry (int monitor); -#else - public Meta.Rectangle get_monitor_geometry (int monitor); -#endif public bool get_monitor_in_fullscreen (int monitor); public int get_monitor_index_for_rect (Mtk.Rectangle rect); public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir); @@ -484,11 +472,7 @@ namespace Meta { public signal bool restart (); public signal void show_osd (int object, string p0, string p1); public signal unowned Clutter.Actor? show_pad_osd (Clutter.InputDevice pad, GLib.Settings settings, string layout_path, bool edition_mode, int monitor_idx); -#if HAS_MUTTER45 public signal bool show_resize_popup (bool object, Mtk.Rectangle p0, int p1, int p2); -#else - public signal bool show_resize_popup (bool object, Meta.Rectangle p0, int p1, int p2); -#endif public signal bool show_restart_message (string? message); public signal void showing_desktop_changed (); public signal void window_created (Meta.Window object); @@ -591,10 +575,8 @@ namespace Meta { public void switch_config (Meta.MonitorSwitchConfigType config_type); [NoAccessorMethod] public Meta.Backend backend { owned get; construct; } -#if HAS_MUTTER45 [NoAccessorMethod] public string experimental_hdr { owned get; set; } -#endif [NoAccessorMethod] public bool has_builtin_panel { get; } [NoAccessorMethod] @@ -603,13 +585,8 @@ namespace Meta { public signal void confirm_display_change (); public signal void monitors_changed (); public signal void monitors_changed_internal (); -#if HAS_MUTTER45 public signal void power_save_mode_changed (Meta.PowerSaveChangeReason object); -#else - public signal void power_save_mode_changed (); -#endif } -#if HAS_MUTTER45 [CCode (cheader_filename = "meta/meta-multi-texture.h", type_id = "meta_multi_texture_get_type ()")] public class MultiTexture : GLib.Object { [CCode (has_construct_function = false)] @@ -624,7 +601,6 @@ namespace Meta { public MultiTexture.simple (owned Cogl.Texture plane); public string to_string (); } -#endif #if HAS_MUTTER47 [CCode (cheader_filename = "meta/meta-orientation-manager.h", type_id = "meta_orientation_manager_get_type ()")] public class OrientationManager : GLib.Object { @@ -672,23 +648,13 @@ namespace Meta { [NoWrapper] public virtual unowned Meta.PluginInfo? plugin_info (); [NoWrapper] -#if HAS_MUTTER45 public virtual void show_tile_preview (Meta.Window window, Mtk.Rectangle tile_rect, int tile_monitor_number); -#else - public virtual void show_tile_preview (Meta.Window window, Meta.Rectangle tile_rect, int tile_monitor_number); -#endif [NoWrapper] public virtual void show_window_menu (Meta.Window window, Meta.WindowMenuType menu, int x, int y); [NoWrapper] -#if HAS_MUTTER45 public virtual void show_window_menu_for_rect (Meta.Window window, Meta.WindowMenuType menu, Mtk.Rectangle rect); [NoWrapper] public virtual void size_change (Meta.WindowActor actor, Meta.SizeChange which_change, Mtk.Rectangle old_frame_rect, Mtk.Rectangle old_buffer_rect); -#else - public virtual void show_window_menu_for_rect (Meta.Window window, Meta.WindowMenuType menu, Meta.Rectangle rect); - [NoWrapper] - public virtual void size_change (Meta.WindowActor actor, Meta.SizeChange which_change, Meta.Rectangle old_frame_rect, Meta.Rectangle old_buffer_rect); -#endif public void size_change_completed (Meta.WindowActor actor); [NoWrapper] public virtual void size_changed (Meta.WindowActor actor); @@ -762,11 +728,7 @@ namespace Meta { [CCode (cheader_filename = "meta/meta-shadow-factory.h", ref_function = "meta_shadow_ref", type_id = "meta_shadow_get_type ()", unref_function = "meta_shadow_unref")] [Compact] public class Shadow { -#if HAS_MUTTER45 public void get_bounds (int window_x, int window_y, int window_width, int window_height, Mtk.Rectangle bounds); -#else - public void get_bounds (int window_x, int window_y, int window_width, int window_height, Cairo.RectangleInt bounds); -#endif #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 @@ -790,13 +752,8 @@ namespace Meta { public sealed class ShapedTexture : GLib.Object, Clutter.Content { [CCode (has_construct_function = false)] protected ShapedTexture (); -#if HAS_MUTTER45 public Cairo.Surface? get_image (Mtk.Rectangle? clip); public unowned Meta.MultiTexture get_texture (); -#else - public Cairo.Surface? get_image (Cairo.RectangleInt? clip); - public unowned Cogl.Texture get_texture (); -#endif public void set_create_mipmaps (bool create_mipmaps); public void set_mask_texture (Cogl.Texture mask_texture); #if HAS_MUTTER47 @@ -822,9 +779,6 @@ namespace Meta { #endif [CCode (has_construct_function = false)] protected Stage (); -#if !HAS_MUTTER45 - public signal void actors_painted (); -#endif } [CCode (cheader_filename = "meta/meta-startup-notification.h", type_id = "meta_startup_notification_get_type ()")] public sealed class StartupNotification : GLib.Object { @@ -861,25 +815,12 @@ namespace Meta { public signal void complete (); public signal void timeout (); } -#if !HAS_MUTTER45 - [CCode (cheader_filename = "meta/theme.h", has_type_id = false)] - [Compact] - public class Theme { - public void free (); - [CCode (cheader_filename = "meta/theme.h")] - public static unowned Meta.Theme get_default (); - [CCode (cheader_filename = "meta/theme.h")] - public static unowned Meta.Theme @new (); - } -#endif [CCode (cheader_filename = "meta/meta-wayland-client.h", type_id = "meta_wayland_client_get_type ()")] public sealed class WaylandClient : GLib.Object { [CCode (has_construct_function = false)] public WaylandClient (Meta.Context context, GLib.SubprocessLauncher launcher) throws GLib.Error; public void hide_from_window_list (Meta.Window window); -#if HAS_MUTTER45 public void make_desktop (Meta.Window window); -#endif #if HAS_MUTTER46 public void make_dock (Meta.Window window); #endif @@ -889,7 +830,6 @@ namespace Meta { public GLib.Subprocess spawnv (Meta.Display display, [CCode (array_length = false, array_null_terminated = true)] string[] argv) throws GLib.Error; public signal void client_destroyed (); } -#if HAS_MUTTER45 [CCode (cheader_filename = "meta/meta-wayland-compositor.h", type_id = "meta_wayland_compositor_get_type ()")] public class WaylandCompositor : GLib.Object { [CCode (has_construct_function = false)] @@ -897,7 +837,6 @@ namespace Meta { public void* get_wayland_display (); public signal void prepare_shutdown (); } -#endif #if HAS_MUTTER46 [CCode (cheader_filename = "meta/main.h", type_id = "meta_wayland_surface_get_type ()")] public class WaylandSurface : GLib.Object { @@ -931,17 +870,10 @@ namespace Meta { public bool can_close (); public bool can_maximize (); public bool can_minimize (); -#if !HAS_MUTTER45 - public bool can_shade (); -#endif public void change_workspace (Meta.Workspace workspace); public void change_workspace_by_index (int space_index, bool append); public void check_alive (uint32 timestamp); -#if HAS_MUTTER45 public Mtk.Rectangle client_rect_to_frame_rect (Mtk.Rectangle client_rect); -#else - public Meta.Rectangle client_rect_to_frame_rect (Meta.Rectangle client_rect); -#endif #if !HAS_MUTTER46 public void compute_group (); #endif @@ -950,13 +882,8 @@ namespace Meta { public void focus (uint32 timestamp); public void foreach_ancestor (Meta.WindowForeachFunc func); public void foreach_transient (Meta.WindowForeachFunc func); -#if HAS_MUTTER45 public Mtk.Rectangle frame_rect_to_client_rect (Mtk.Rectangle frame_rect); public Mtk.Rectangle get_buffer_rect (); -#else - public Meta.Rectangle frame_rect_to_client_rect (Meta.Rectangle frame_rect); - public Meta.Rectangle get_buffer_rect (); -#endif #if !HAS_MUTTER46 public unowned string? get_client_machine (); #endif @@ -972,11 +899,7 @@ namespace Meta { #else public unowned Cairo.Region? get_frame_bounds (); #endif -#if HAS_MUTTER45 public Mtk.Rectangle get_frame_rect (); -#else - public Meta.Rectangle get_frame_rect (); -#endif public Meta.FrameType get_frame_type (); #if !HAS_MUTTER46 public unowned Meta.Group? get_group (); @@ -988,11 +911,7 @@ namespace Meta { public unowned string? get_gtk_theme_variant (); public unowned string? get_gtk_unique_bus_name (); public unowned string? get_gtk_window_object_path (); -#if HAS_MUTTER45 public bool get_icon_geometry (out Mtk.Rectangle rect); -#else - public bool get_icon_geometry (out Meta.Rectangle rect); -#endif public uint64 get_id (); public Meta.StackLayer get_layer (); public Meta.MaximizeFlags get_maximized (); @@ -1010,15 +929,9 @@ namespace Meta { public Meta.WindowType get_window_type (); public unowned string? get_wm_class (); public unowned string? get_wm_class_instance (); -#if HAS_MUTTER45 public Mtk.Rectangle get_work_area_all_monitors (); public Mtk.Rectangle get_work_area_current_monitor (); public Mtk.Rectangle get_work_area_for_monitor (int which_monitor); -#else - public Meta.Rectangle get_work_area_all_monitors (); - public Meta.Rectangle get_work_area_current_monitor (); - public Meta.Rectangle get_work_area_for_monitor (int which_monitor); -#endif public unowned Meta.Workspace get_workspace (); #if !HAS_MUTTER46 public X.Window get_xwindow (); @@ -1026,9 +939,7 @@ namespace Meta { #endif public bool has_attached_dialogs (); public bool has_focus (); -#if HAS_MUTTER45 public bool has_pointer (); -#endif public bool is_above (); public bool is_always_on_all_workspaces (); public bool is_ancestor_of_transient (Meta.Window transient); @@ -1044,9 +955,6 @@ namespace Meta { public bool is_override_redirect (); public bool is_remote (); public bool is_screen_sized (); -#if !HAS_MUTTER45 - public bool is_shaded (); -#endif public bool is_skip_taskbar (); public void kill (); public bool located_on_workspace (Meta.Workspace workspace); @@ -1065,17 +973,12 @@ namespace Meta { public void raise (); #if HAS_MUTTER46 public void raise_and_make_recent_on_workspace (Meta.Workspace workspace); -#elif HAS_MUTTER45 +#else public void raise_and_make_recent (); #endif public void set_compositor_private (GLib.Object priv); public void set_demands_attention (); -#if HAS_MUTTER45 public void set_icon_geometry (Mtk.Rectangle? rect); -#else - public void set_icon_geometry (Meta.Rectangle? rect); - public void shade (uint32 timestamp); -#endif #if !HAS_MUTTER47 public void shove_titlebar_onscreen (); #endif @@ -1093,9 +996,6 @@ namespace Meta { public void unmaximize (Meta.MaximizeFlags directions); public void unminimize (); public void unset_demands_attention (); -#if !HAS_MUTTER45 - public void unshade (uint32 timestamp); -#endif public void unstick (); #if HAS_MUTTER46 #if HAS_MUTTER47 @@ -1160,9 +1060,7 @@ namespace Meta { #endif [CCode (cname = "focus")] public signal void focused (); -#if HAS_MUTTER45 public signal void highest_scale_monitor_changed (); -#endif public signal void position_changed (); public signal void raised (); public signal void shown (); @@ -1180,19 +1078,11 @@ namespace Meta { [CCode (has_construct_function = false)] protected WindowActor (); public void freeze (); -#if HAS_MUTTER45 public Cairo.Surface? get_image (Mtk.Rectangle? clip); -#else - public Cairo.Surface? get_image (Cairo.RectangleInt? clip); -#endif public unowned Meta.Window? get_meta_window (); public unowned Meta.ShapedTexture? get_texture (); public bool is_destroyed (); -#if HAS_MUTTER45 public Clutter.Content? paint_to_content (Mtk.Rectangle? clip) throws GLib.Error; -#else - public Clutter.Content? paint_to_content (Meta.Rectangle? clip) throws GLib.Error; -#endif public void sync_visibility (); public void thaw (); public Meta.Window meta_window { get; construct; } @@ -1240,13 +1130,8 @@ namespace Meta { public void activate_with_focus (Meta.Window focus_this, uint32 timestamp); public unowned Meta.Display get_display (); public unowned Meta.Workspace get_neighbor (Meta.MotionDirection direction); -#if HAS_MUTTER45 public Mtk.Rectangle get_work_area_all_monitors (); public Mtk.Rectangle get_work_area_for_monitor (int which_monitor); -#else - public Meta.Rectangle get_work_area_all_monitors (); - public Meta.Rectangle get_work_area_for_monitor (int which_monitor); -#endif public int index (); public GLib.List list_windows (); public void set_builtin_struts (GLib.SList struts); @@ -1303,38 +1188,19 @@ namespace Meta { 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 (); -#endif -#if !HAS_MUTTER45 - public int get_damage_event_base (); - public int get_screen_number (); - public int get_shape_event_base (); #endif public unowned X.Display get_xdisplay (); -#if !HAS_MUTTER45 - public int get_xinput_opcode (); -#endif public X.Window get_xroot (); -#if !HAS_MUTTER45 - public bool has_shape (); -#endif public unowned Meta.Group lookup_group (X.Window group_leader); #if HAS_MUTTER46 public X.Window lookup_xwindow (Meta.Window window); #endif -#if HAS_MUTTER45 public void redirect_windows (Meta.Display display); public void remove_event_func (uint id); -#endif -#if !HAS_MUTTER45 - public void set_cm_selection (); -#endif #if HAS_MUTTER47 public void set_stage_input_region ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, type = "XRectangle*")] X.Xrectangle[] rects); #else public void set_stage_input_region (X.XserverRegion region); -#endif -#if !HAS_MUTTER45 - public bool xwindow_is_a_no_focus_window (X.Window xwindow); #endif } [CCode (cheader_filename = "meta/meta-close-dialog.h", type_cname = "MetaCloseDialogInterface", type_id = "meta_close_dialog_get_type ()")] @@ -1370,11 +1236,7 @@ namespace Meta { } [CCode (cheader_filename = "meta/boxes.h", has_type_id = false)] public struct Edge { -#if HAS_MUTTER45 public Mtk.Rectangle rect; -#else - public Meta.Rectangle rect; -#endif public Meta.Side side_type; public Meta.EdgeType edge_type; } @@ -1400,26 +1262,6 @@ namespace Meta { public weak string license; public weak string description; } -#if !HAS_MUTTER45 - [CCode (cheader_filename = "meta/boxes.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_rectangle_get_type ()")] - public struct Rectangle { - public int x; - public int y; - public int width; - public int height; - public int area (); - public bool contains_rect (Meta.Rectangle inner_rect); - public Meta.Rectangle? copy (); - public bool could_fit_rect (Meta.Rectangle inner_rect); - public bool equal (Meta.Rectangle src2); - public void free (); - public bool horiz_overlap (Meta.Rectangle rect2); - public bool intersect (Meta.Rectangle src2, out Meta.Rectangle dest); - public bool overlap (Meta.Rectangle rect2); - public Meta.Rectangle union (Meta.Rectangle rect2); - public bool vert_overlap (Meta.Rectangle rect2); - } -#endif #if !HAS_MUTTER47 [CCode (cheader_filename = "meta/meta-shadow-factory.h", has_type_id = false)] public struct ShadowParams { @@ -1432,11 +1274,7 @@ namespace Meta { #endif [CCode (cheader_filename = "meta/boxes.h", has_type_id = false)] public struct Strut { -#if HAS_MUTTER45 public Mtk.Rectangle rect; -#else - public Meta.Rectangle rect; -#endif public Meta.Side side; } [CCode (cheader_filename = "meta/main.h", cprefix = "META_BACKEND_CAPABILITY_", type_id = "meta_backend_capabilities_get_type ()")] @@ -1453,14 +1291,12 @@ namespace Meta { NEGATIVE_X, NEGATIVE_Y } -#if HAS_MUTTER45 [CCode (cheader_filename = "meta/barrier.h", cprefix = "META_BARRIER_FLAG_", type_id = "meta_barrier_flags_get_type ()")] [Flags] public enum BarrierFlags { NONE, STICKY } -#endif [CCode (cheader_filename = "meta/common.h", cprefix = "META_BUTTON_FUNCTION_", type_id = "meta_button_function_get_type ()")] public enum ButtonFunction { MENU, @@ -1551,10 +1387,8 @@ namespace Meta { REMOTE_DESKTOP, BACKEND, COLOR, -#if HAS_MUTTER45 INPUT_EVENTS, EIS, -#endif #if HAS_MUTTER47 KMS_DEADLINE, SESSION_MANAGEMENT, @@ -1600,28 +1434,6 @@ namespace Meta { SUCCESS, ERROR } -#if !HAS_MUTTER45 - [CCode (cheader_filename = "meta/common.h", cprefix = "META_FRAME_", type_id = "meta_frame_flags_get_type ()")] - [Flags] - public enum FrameFlags { - ALLOWS_DELETE, - ALLOWS_MENU, - ALLOWS_MINIMIZE, - ALLOWS_MAXIMIZE, - ALLOWS_VERTICAL_RESIZE, - ALLOWS_HORIZONTAL_RESIZE, - HAS_FOCUS, - SHADED, - STUCK, - MAXIMIZED, - ALLOWS_SHADE, - ALLOWS_MOVE, - FULLSCREEN, - ABOVE, - TILED_LEFT, - TILED_RIGHT - } -#endif [CCode (cheader_filename = "meta/common.h", cprefix = "META_FRAME_TYPE_", type_id = "meta_frame_type_get_type ()")] public enum FrameType { NORMAL, @@ -1785,9 +1597,7 @@ namespace Meta { IS_REVERSED, NON_MASKABLE, IGNORE_AUTOREPEAT, -#if HAS_MUTTER45 CUSTOM_TRIGGER, -#endif #if HAS_MUTTER47 TRIGGER_RELEASE, #endif @@ -1853,7 +1663,6 @@ namespace Meta { DOWN_LEFT, DOWN_RIGHT } -#if HAS_MUTTER45 [CCode (cheader_filename = "meta/meta-multi-texture-format.h", cprefix = "META_MULTI_TEXTURE_FORMAT_", type_id = "meta_multi_texture_format_get_type ()")] public enum MultiTextureFormat { INVALID, @@ -1888,21 +1697,11 @@ namespace Meta { RING, STRIP } -#else - [CCode (cheader_filename = "meta/display.h", cprefix = "META_PAD_ACTION_", type_id = "meta_pad_action_type_get_type ()")] - public enum PadActionType { - BUTTON, - RING, - STRIP - } -#endif -#if HAS_MUTTER45 [CCode (cheader_filename = "meta/meta-monitor-manager.h", cprefix = "META_POWER_SAVE_CHANGE_REASON_", type_id = "meta_power_save_change_reason_get_type ()")] public enum PowerSaveChangeReason { MODE_CHANGE, HOTPLUG } -#endif [CCode (cheader_filename = "meta/prefs.h", cprefix = "META_PREF_", type_id = "meta_preference_get_type ()")] public enum Preference { MOUSE_BUTTON_MODS, @@ -1916,9 +1715,6 @@ namespace Meta { AUTO_RAISE, AUTO_RAISE_DELAY, FOCUS_CHANGE_ON_POINTER_REST, -#if !HAS_MUTTER45 - TITLEBAR_FONT, -#endif NUM_WORKSPACES, DYNAMIC_WORKSPACES, KEYBINDINGS,