From 74cab06b72e3efd49f27fa03275b2f183cbc11fb Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 6 Jan 2024 11:16:45 +0100 Subject: [PATCH] core: Drop unused private functions Part-of: --- src/core/display-private.h | 18 ------------------ src/core/display.c | 11 ++++++++--- src/core/meta-context-private.h | 1 - src/core/meta-context.c | 8 -------- src/core/meta-gesture-tracker-private.h | 2 -- src/core/meta-gesture-tracker.c | 18 ------------------ src/core/meta-workspace-manager-private.h | 1 - src/core/meta-workspace-manager.c | 2 ++ src/core/startup-notification-private.h | 3 --- src/core/util-private.h | 1 - src/core/window-private.h | 9 --------- src/core/window.c | 10 +++------- src/core/workspace-private.h | 2 -- src/core/workspace.c | 6 ------ src/x11/events.c | 4 ++-- 15 files changed, 15 insertions(+), 81 deletions(-) diff --git a/src/core/display-private.h b/src/core/display-private.h index deb09260d..829b34acf 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -183,9 +183,6 @@ MetaDisplay * meta_display_new (MetaContext *context, void meta_display_manage_all_xwindows (MetaDisplay *display); #endif -void meta_display_unmanage_windows (MetaDisplay *display, - guint32 timestamp); - /* Utility function to compare the stacking of two windows */ int meta_display_stack_cmp (const void *a, const void *b); @@ -226,8 +223,6 @@ META_EXPORT_TEST GSList* meta_display_list_windows (MetaDisplay *display, MetaListWindowsFlags flags); -void meta_display_reload_cursor (MetaDisplay *display); - void meta_display_grab_window_buttons (MetaDisplay *display, MetaWindow *window); void meta_display_ungrab_window_buttons (MetaDisplay *display, @@ -238,12 +233,6 @@ void meta_display_grab_focus_window_button (MetaDisplay *display, void meta_display_ungrab_focus_window_button (MetaDisplay *display, MetaWindow *window); -/* utility goo */ -const char* meta_event_mode_to_string (int m); -const char* meta_event_detail_to_string (int d); - -void meta_display_queue_retheme_all_windows (MetaDisplay *display); - void meta_display_ping_window (MetaWindow *window, guint32 serial); void meta_display_pong_for_serial (MetaDisplay *display, @@ -272,8 +261,6 @@ void meta_display_update_focus_window (MetaDisplay *display, void meta_display_sanity_check_timestamps (MetaDisplay *display, guint32 timestamp); -gboolean meta_display_timestamp_too_old (MetaDisplay *display, - guint32 *timestamp); void meta_display_remove_pending_pings_for_window (MetaDisplay *display, MetaWindow *window); @@ -310,11 +297,6 @@ void meta_display_notify_pad_group_switch (MetaDisplay *display, guint n_mode, guint n_modes); -void meta_display_foreach_window (MetaDisplay *display, - MetaListWindowsFlags flags, - MetaDisplayWindowFunc func, - gpointer data); - void meta_display_restacked (MetaDisplay *display); gboolean meta_display_apply_startup_properties (MetaDisplay *display, diff --git a/src/core/display.c b/src/core/display.c index 92cdddca2..d6cb733dd 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -208,6 +208,11 @@ static void prefs_changed_callback (MetaPreference pref, static int mru_cmp (gconstpointer a, gconstpointer b); +static void meta_display_reload_cursor (MetaDisplay *display); + +static void meta_display_unmanage_windows (MetaDisplay *display, + guint32 timestamp); + static void meta_display_show_osd (MetaDisplay *display, gint monitor_idx, @@ -1582,7 +1587,7 @@ meta_display_update_focus_window (MetaDisplay *display, g_object_notify (G_OBJECT (display), "focus-window"); } -gboolean +static gboolean meta_display_timestamp_too_old (MetaDisplay *display, guint32 *timestamp) { @@ -1823,7 +1828,7 @@ meta_display_is_grabbed (MetaDisplay *display) return meta_compositor_get_current_window_drag (display->compositor) != NULL; } -void +static void meta_display_queue_retheme_all_windows (MetaDisplay *display) { GSList* windows; @@ -2944,7 +2949,7 @@ meta_display_notify_pad_group_switch (MetaDisplay *display, g_string_free (message, TRUE); } -void +static void meta_display_foreach_window (MetaDisplay *display, MetaListWindowsFlags flags, MetaDisplayWindowFunc func, diff --git a/src/core/meta-context-private.h b/src/core/meta-context-private.h index cf07d3e59..9fac2bea8 100644 --- a/src/core/meta-context-private.h +++ b/src/core/meta-context-private.h @@ -62,7 +62,6 @@ const char * meta_context_get_name (MetaContext *context); const char * meta_context_get_gnome_wm_keybindings (MetaContext *context); -gboolean meta_context_get_unsafe_mode (MetaContext *context); void meta_context_set_unsafe_mode (MetaContext *context, gboolean enable); diff --git a/src/core/meta-context.c b/src/core/meta-context.c index 6278e240e..7332f0209 100644 --- a/src/core/meta-context.c +++ b/src/core/meta-context.c @@ -560,14 +560,6 @@ meta_context_destroy (MetaContext *context) g_object_unref (context); } -gboolean -meta_context_get_unsafe_mode (MetaContext *context) -{ - MetaContextPrivate *priv = meta_context_get_instance_private (context); - - return priv->unsafe_mode; -} - void meta_context_set_unsafe_mode (MetaContext *context, gboolean enable) diff --git a/src/core/meta-gesture-tracker-private.h b/src/core/meta-gesture-tracker-private.h index cead64f4c..88b59d409 100644 --- a/src/core/meta-gesture-tracker-private.h +++ b/src/core/meta-gesture-tracker-private.h @@ -61,6 +61,4 @@ gboolean meta_gesture_tracker_handle_event (MetaGestureTracker gboolean meta_gesture_tracker_set_sequence_state (MetaGestureTracker *tracker, ClutterEventSequence *sequence, MetaSequenceState state); -MetaSequenceState meta_gesture_tracker_get_sequence_state (MetaGestureTracker *tracker, - ClutterEventSequence *sequence); gint meta_gesture_tracker_get_n_current_touches (MetaGestureTracker *tracker); diff --git a/src/core/meta-gesture-tracker.c b/src/core/meta-gesture-tracker.c index 06b93c4c2..8fcc67285 100644 --- a/src/core/meta-gesture-tracker.c +++ b/src/core/meta-gesture-tracker.c @@ -540,24 +540,6 @@ meta_gesture_tracker_set_sequence_state (MetaGestureTracker *tracker, return TRUE; } -MetaSequenceState -meta_gesture_tracker_get_sequence_state (MetaGestureTracker *tracker, - ClutterEventSequence *sequence) -{ - MetaGestureTrackerPrivate *priv; - MetaSequenceInfo *info; - - g_return_val_if_fail (META_IS_GESTURE_TRACKER (tracker), META_SEQUENCE_PENDING_END); - - priv = meta_gesture_tracker_get_instance_private (tracker); - info = g_hash_table_lookup (priv->sequences, sequence); - - if (!info) - return META_SEQUENCE_PENDING_END; - - return info->state; -} - gint meta_gesture_tracker_get_n_current_touches (MetaGestureTracker *tracker) { diff --git a/src/core/meta-workspace-manager-private.h b/src/core/meta-workspace-manager-private.h index ea278f883..0ecc6159b 100644 --- a/src/core/meta-workspace-manager-private.h +++ b/src/core/meta-workspace-manager-private.h @@ -47,7 +47,6 @@ struct _MetaWorkspaceManager MetaWorkspaceManager *meta_workspace_manager_new (MetaDisplay *display); -void meta_workspace_manager_init_workspaces (MetaWorkspaceManager *workspace_manager); void meta_workspace_manager_update_workspace_layout (MetaWorkspaceManager *workspace_manager, MetaDisplayCorner starting_corner, gboolean vertical_layout, diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c index e16e1cd91..5896fd8c5 100644 --- a/src/core/meta-workspace-manager.c +++ b/src/core/meta-workspace-manager.c @@ -62,6 +62,8 @@ static guint workspace_manager_signals [LAST_SIGNAL] = { 0 }; static void prefs_changed_callback (MetaPreference pref, gpointer data); +static void meta_workspace_manager_init_workspaces (MetaWorkspaceManager *workspace_manager); + static void meta_workspace_manager_get_property (GObject *object, guint prop_id, diff --git a/src/core/startup-notification-private.h b/src/core/startup-notification-private.h index 2655e9907..56041fbdb 100644 --- a/src/core/startup-notification-private.h +++ b/src/core/startup-notification-private.h @@ -37,9 +37,6 @@ struct _MetaStartupSequenceClass MetaStartupNotification * meta_startup_notification_new (MetaDisplay *display); -gboolean meta_startup_notification_handle_xevent (MetaStartupNotification *sn, - XEvent *xevent); - void meta_startup_notification_add_sequence (MetaStartupNotification *sn, MetaStartupSequence *seq); void meta_startup_notification_remove_sequence (MetaStartupNotification *sn, diff --git a/src/core/util-private.h b/src/core/util-private.h index 18ae68de7..1d2638cc2 100644 --- a/src/core/util-private.h +++ b/src/core/util-private.h @@ -33,7 +33,6 @@ #define META_EXPORT_TEST META_EXPORT void meta_set_verbose (gboolean setting); -void meta_set_debugging (gboolean setting); void meta_set_is_wayland_compositor (gboolean setting); diff --git a/src/core/window-private.h b/src/core/window-private.h index 1cb15763d..edce67d62 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -630,12 +630,9 @@ struct _MetaWindowClass #define META_WINDOW_ALLOWS_RESIZE(w) (META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS (w) && \ (((w)->size_hints.min_width < (w)->size_hints.max_width) || \ ((w)->size_hints.min_height < (w)->size_hints.max_height))) -#define META_WINDOW_ALLOWS_HORIZONTAL_RESIZE(w) (META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS (w) && (w)->size_hints.min_width < (w)->size_hints.max_width) -#define META_WINDOW_ALLOWS_VERTICAL_RESIZE(w) (META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS (w) && (w)->size_hints.min_height < (w)->size_hints.max_height) void meta_window_unmanage (MetaWindow *window, guint32 timestamp); -void meta_window_unmanage_on_idle (MetaWindow *window); void meta_window_queue (MetaWindow *window, MetaQueueType queue_types); META_EXPORT_TEST @@ -644,7 +641,6 @@ void meta_window_untile (MetaWindow *window); META_EXPORT_TEST void meta_window_tile (MetaWindow *window, MetaTileMode mode); -MetaTileMode meta_window_get_tile_mode (MetaWindow *window); void meta_window_restore_tile (MetaWindow *window, MetaTileMode mode, int width, @@ -697,8 +693,6 @@ void meta_window_get_session_geometry (MetaWindow *window, int *width, int *height); -void meta_window_update_unfocused_button_grabs (MetaWindow *window); - void meta_window_update_appears_focused (MetaWindow *window); void meta_window_set_focused_internal (MetaWindow *window, @@ -722,8 +716,6 @@ void meta_window_show_menu (MetaWindow *window, int x, int y); -GList* meta_window_get_workspaces (MetaWindow *window); - void meta_window_get_work_area_for_logical_monitor (MetaWindow *window, MetaLogicalMonitor *logical_monitor, MtkRectangle *area); @@ -772,7 +764,6 @@ void meta_window_set_user_time (MetaWindow *window, void meta_window_update_for_monitors_changed (MetaWindow *window); void meta_window_on_all_workspaces_changed (MetaWindow *window); -gboolean meta_window_should_attach_to_parent (MetaWindow *window); gboolean meta_window_can_tile_side_by_side (MetaWindow *window, int monitor_number); diff --git a/src/core/window.c b/src/core/window.c index 64cdaa2fb..95699fdb2 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -165,6 +165,8 @@ static MetaWindow * meta_window_find_tile_match (MetaWindow *window, MetaTileMode mode); static void update_edge_constraints (MetaWindow *window); +static gboolean meta_window_should_attach_to_parent (MetaWindow *window); + static void initable_iface_init (GInitableIface *initable_iface); typedef struct _MetaWindowPrivate @@ -2992,12 +2994,6 @@ meta_window_tile (MetaWindow *window, window->unconstrained_rect); } -MetaTileMode -meta_window_get_tile_mode (MetaWindow *window) -{ - return window->tile_mode; -} - void meta_window_restore_tile (MetaWindow *window, MetaTileMode mode, @@ -5353,7 +5349,7 @@ meta_window_set_icon_geometry (MetaWindow *window, } } -GList* +static GList* meta_window_get_workspaces (MetaWindow *window) { MetaWorkspaceManager *workspace_manager = window->display->workspace_manager; diff --git a/src/core/workspace-private.h b/src/core/workspace-private.h index 43767c310..83fc8ea74 100644 --- a/src/core/workspace-private.h +++ b/src/core/workspace-private.h @@ -102,6 +102,4 @@ MetaWindow * meta_workspace_get_default_focus_window_at_point (MetaWorkspace *wo int root_y); GList * meta_workspace_get_default_focus_candidates (MetaWorkspace *workspace); -const char* meta_workspace_get_name (MetaWorkspace *workspace); - void meta_workspace_index_changed (MetaWorkspace *workspace); diff --git a/src/core/workspace.c b/src/core/workspace.c index c90de072f..b668abef0 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -1304,12 +1304,6 @@ meta_workspace_get_neighbor (MetaWorkspace *workspace, return meta_workspace_manager_get_workspace_by_index (workspace->manager, i); } -const char* -meta_workspace_get_name (MetaWorkspace *workspace) -{ - return meta_prefs_get_workspace_name (meta_workspace_index (workspace)); -} - static MetaWindow * workspace_find_focused_window (MetaWorkspace *workspace) { diff --git a/src/x11/events.c b/src/x11/events.c index d252262a3..16abd8ee8 100644 --- a/src/x11/events.c +++ b/src/x11/events.c @@ -253,7 +253,7 @@ event_get_time (MetaX11Display *x11_display, } } -const char* +static const char* meta_event_detail_to_string (int d) { const char *detail = "???"; @@ -290,7 +290,7 @@ meta_event_detail_to_string (int d) return detail; } -const char* +static const char* meta_event_mode_to_string (int m) { const char *mode = "???";