clutter: Drop unused private functions/defines

The commit also stops defining certain functions in a private header
when they are only used in the same file.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3437>

clutter/clutter/clutter-actor-private.h

@@ -209,10 +209,6 @@ void                            _clutter_actor_apply_relative_transformation_mat
                                                                                          ClutterActor      *ancestor,
                                                                                          graphene_matrix_t *matrix);
 
-void                            _clutter_actor_rerealize                                (ClutterActor    *self,
-                                                                                         ClutterCallback  callback,
-                                                                                         gpointer         data);
-
 void                            _clutter_actor_set_in_clone_paint                       (ClutterActor *self,
                                                                                          gboolean      is_in_clone_paint);
 
@@ -232,8 +228,6 @@ void                            _clutter_actor_queue_redraw_full
                                                                                          const ClutterPaintVolume *volume,
                                                                                          ClutterEffect            *effect);
 
-void                            _clutter_actor_finish_queue_redraw                      (ClutterActor *self);
-
 gboolean                        _clutter_actor_set_default_paint_volume                 (ClutterActor       *self,
                                                                                          GType               check_gtype,
                                                                                          ClutterPaintVolume *volume);

clutter/clutter/clutter-actor.c

@@ -2086,68 +2086,6 @@ clutter_actor_unrealize_not_hiding (ClutterActor *self)
                            stage);
 }
 
-/*
- * _clutter_actor_rerealize:
- * @self: A #ClutterActor
- * @callback: Function to call while unrealized
- * @data: data for callback
- *
- * If an actor is already unrealized, this just calls the callback.
- *
- * If it is realized, it unrealizes temporarily, calls the callback,
- * and then re-realizes the actor.
- *
- * As a side effect, leaves all children of the actor unrealized if
- * the actor was realized but not showing.  This is because when we
- * unrealize the actor temporarily we must unrealize its children
- * (e.g. children of a stage can't be realized if stage window is
- * gone). And we aren't clever enough to save the realization state of
- * all children. In most cases this should not matter, because
- * the children will automatically realize when they next become mapped.
- */
-void
-_clutter_actor_rerealize (ClutterActor    *self,
-                          ClutterCallback  callback,
-                          void            *data)
-{
-  gboolean was_mapped;
-  gboolean was_showing;
-  gboolean was_realized;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
-#ifdef CLUTTER_ENABLE_DEBUG
-  clutter_actor_verify_map_state (self);
-#endif
-
-  was_realized = clutter_actor_is_realized (self);
-  was_mapped = clutter_actor_is_mapped (self);
-  was_showing = clutter_actor_is_visible (self);
-
-  /* Must be unmapped to unrealize. Note we only have to hide this
-   * actor if it was mapped (if all parents were showing).  If actor
-   * is merely visible (but not mapped), then that's fine, we can
-   * leave it visible.
-   */
-  if (was_mapped)
-    clutter_actor_hide (self);
-
-  g_assert (!clutter_actor_is_mapped (self));
-
-  /* unrealize self and all children */
-  clutter_actor_unrealize_not_hiding (self);
-
-  if (callback != NULL)
-    {
-      (* callback) (self, data);
-    }
-
-  if (was_showing)
-    clutter_actor_show (self); /* will realize only if mapping implies it */
-  else if (was_realized)
-    clutter_actor_realize (self); /* realize self and all parents */
-}
-
 static void
 clutter_actor_real_pick (ClutterActor       *self,
                          ClutterPickContext *pick_context)

clutter/clutter/clutter-input-focus-private.h

@@ -25,12 +25,4 @@ void clutter_input_focus_focus_out (ClutterInputFocus  *focus);
 
 void clutter_input_focus_commit (ClutterInputFocus *focus,
                                  const gchar       *text);
-void clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
-                                             int                offset,
-                                             guint              len);
 void clutter_input_focus_request_surrounding (ClutterInputFocus *focus);
-
-void clutter_input_focus_set_preedit_text (ClutterInputFocus *focus,
-                                           const gchar       *preedit,
-                                           unsigned int       cursor,
-                                           unsigned int       anchor);

clutter/clutter/clutter-input-focus.c

@@ -25,6 +25,14 @@
 
 typedef struct _ClutterInputFocusPrivate ClutterInputFocusPrivate;
 
+static void clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
+                                                    int                offset,
+                                                    guint              len);
+static void clutter_input_focus_set_preedit_text (ClutterInputFocus *focus,
+                                                  const gchar       *preedit,
+                                                  unsigned int       cursor,
+                                                  unsigned int       anchor);
+
 struct _ClutterInputFocusPrivate
 {
   ClutterInputMethod *im;

clutter/clutter/clutter-input-method-private.h

@@ -19,8 +19,6 @@
 
 #pragma once
 
-ClutterInputFocus * clutter_input_method_get_focus (ClutterInputMethod *method);
-
 void clutter_input_method_reset               (ClutterInputMethod *method);
 
 void clutter_input_method_set_cursor_location (ClutterInputMethod    *method,
@@ -37,5 +35,3 @@ void clutter_input_method_set_can_show_preedit (ClutterInputMethod *method,
                                                 gboolean            can_show_preedit);
 gboolean clutter_input_method_filter_key_event (ClutterInputMethod    *method,
                                                 const ClutterKeyEvent *key);
-
-void clutter_input_method_toggle_input_panel (ClutterInputMethod *method);

clutter/clutter/clutter-input-method.c

@@ -261,15 +261,6 @@ clutter_input_method_focus_out (ClutterInputMethod *im)
   klass->focus_out (im);
 }
 
-ClutterInputFocus *
-clutter_input_method_get_focus (ClutterInputMethod *im)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  return priv->focus;
-}
-
 static void
 clutter_input_method_put_im_event (ClutterInputMethod      *im,
                                    ClutterEventType         event_type,

clutter/clutter/clutter-layout-manager.c

@@ -455,12 +455,6 @@ clutter_layout_manager_set_container (ClutterLayoutManager *manager,
     klass->set_container (manager, container);
 }
 
-GType
-_clutter_layout_manager_get_child_meta_type (ClutterLayoutManager *manager)
-{
-  return CLUTTER_LAYOUT_MANAGER_GET_CLASS (manager)->get_child_meta_type (manager);
-}
-
 static inline ClutterLayoutMeta *
 create_child_meta (ClutterLayoutManager *manager,
                    ClutterActor         *container,

clutter/clutter/clutter-paint-node-private.h

@@ -97,47 +97,16 @@ struct _ClutterPaintOperation
   } op;
 };
 
-GType _clutter_transform_node_get_type (void) G_GNUC_CONST;
 GType _clutter_dummy_node_get_type (void) G_GNUC_CONST;
 
-void                    _clutter_paint_operation_paint_rectangle        (const ClutterPaintOperation *op);
-void                    _clutter_paint_operation_clip_rectangle         (const ClutterPaintOperation *op);
-void                    _clutter_paint_operation_paint_path             (const ClutterPaintOperation *op);
-void                    _clutter_paint_operation_clip_path              (const ClutterPaintOperation *op);
-void                    _clutter_paint_operation_paint_primitive        (const ClutterPaintOperation *op);
-
 void                    clutter_paint_node_init_types                   (ClutterBackend *clutter_backend);
 gpointer                _clutter_paint_node_create                      (GType gtype);
 
-ClutterPaintNode *      _clutter_transform_node_new                     (const graphene_matrix_t     *matrix);
 ClutterPaintNode *      _clutter_dummy_node_new                         (ClutterActor                *actor,
                                                                          CoglFramebuffer             *framebuffer);
-
-G_GNUC_INTERNAL
-void                    clutter_paint_node_remove_child                 (ClutterPaintNode      *node,
-                                                                         ClutterPaintNode      *child);
-G_GNUC_INTERNAL
-void                    clutter_paint_node_replace_child                (ClutterPaintNode      *node,
-                                                                         ClutterPaintNode      *old_child,
-                                                                         ClutterPaintNode      *new_child);
-G_GNUC_INTERNAL
-void                    clutter_paint_node_remove_all                   (ClutterPaintNode      *node);
-
 G_GNUC_INTERNAL
 guint                   clutter_paint_node_get_n_children               (ClutterPaintNode      *node);
 
-G_GNUC_INTERNAL
-ClutterPaintNode *      clutter_paint_node_get_first_child              (ClutterPaintNode      *node);
-G_GNUC_INTERNAL
-ClutterPaintNode *      clutter_paint_node_get_previous_sibling         (ClutterPaintNode      *node);
-G_GNUC_INTERNAL
-ClutterPaintNode *      clutter_paint_node_get_next_sibling             (ClutterPaintNode      *node);
-G_GNUC_INTERNAL
-ClutterPaintNode *      clutter_paint_node_get_last_child               (ClutterPaintNode      *node);
-G_GNUC_INTERNAL
-ClutterPaintNode *      clutter_paint_node_get_parent                   (ClutterPaintNode      *node);
-
-
 #define CLUTTER_TYPE_EFFECT_NODE                (clutter_effect_node_get_type ())
 #define CLUTTER_EFFECT_NODE(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_EFFECT_NODE, ClutterEffectNode))
 #define CLUTTER_IS_EFFECT_NODE(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_EFFECT_NODE))

clutter/clutter/clutter-paint-node.c

@@ -60,6 +60,9 @@
 
 static inline void      clutter_paint_operation_clear   (ClutterPaintOperation *op);
 
+static void clutter_paint_node_remove_child (ClutterPaintNode *node,
+                                             ClutterPaintNode *child);
+
 static void
 value_paint_node_init (GValue *value)
 {
@@ -393,7 +396,7 @@ clutter_paint_node_add_child (ClutterPaintNode *node,
  * This function will release the reference on @child acquired by
  * using clutter_paint_node_add_child().
  */
-void
+static void
 clutter_paint_node_remove_child (ClutterPaintNode *node,
                                  ClutterPaintNode *child)
 {
@@ -428,168 +431,6 @@ clutter_paint_node_remove_child (ClutterPaintNode *node,
   clutter_paint_node_unref (child);
 }
 
-/**
- * clutter_paint_node_replace_child:
- * @node: a #ClutterPaintNode
- * @old_child: the child replaced by @new_child
- * @new_child: the child that replaces @old_child
- *
- * Atomically replaces @old_child with @new_child in the list of
- * children of @node.
- *
- * This function will release the reference on @old_child acquired
- * by @node, and will acquire a new reference on @new_child.
- */
-void
-clutter_paint_node_replace_child (ClutterPaintNode *node,
-                                  ClutterPaintNode *old_child,
-                                  ClutterPaintNode *new_child)
-{
-  ClutterPaintNode *prev, *next;
-
-  g_return_if_fail (CLUTTER_IS_PAINT_NODE (node));
-  g_return_if_fail (CLUTTER_IS_PAINT_NODE (old_child));
-  g_return_if_fail (old_child->parent == node);
-  g_return_if_fail (CLUTTER_IS_PAINT_NODE (new_child));
-  g_return_if_fail (new_child->parent == NULL);
-
-  prev = old_child->prev_sibling;
-  next = old_child->next_sibling;
-
-  new_child->parent = node;
-  new_child->prev_sibling = prev;
-  new_child->next_sibling = next;
-  clutter_paint_node_ref (new_child);
-
-  if (prev != NULL)
-    prev->next_sibling = new_child;
-
-  if (next != NULL)
-    next->prev_sibling = new_child;
-
-  if (node->first_child == old_child)
-    node->first_child = new_child;
-
-  if (node->last_child == old_child)
-    node->last_child = new_child;
-
-  old_child->prev_sibling = NULL;
-  old_child->next_sibling = NULL;
-  old_child->parent = NULL;
-  clutter_paint_node_unref (old_child);
-}
-
-/**
- * clutter_paint_node_remove_all:
- * @node: a #ClutterPaintNode
- *
- * Removes all children of @node.
- *
- * This function releases the reference acquired by @node on its
- * children.
- */
-void
-clutter_paint_node_remove_all (ClutterPaintNode *node)
-{
-  ClutterPaintNode *iter;
-
-  g_return_if_fail (CLUTTER_IS_PAINT_NODE (node));
-
-  iter = node->first_child;
-  while (iter != NULL)
-    {
-      ClutterPaintNode *next = iter->next_sibling;
-
-      clutter_paint_node_remove_child (node, iter);
-
-      iter = next;
-    }
-}
-
-/**
- * clutter_paint_node_get_first_child:
- * @node: a #ClutterPaintNode
- *
- * Retrieves the first child of the @node.
- *
- * Return value: (transfer none): a pointer to the first child of
- *   the #ClutterPaintNode.
- */
-ClutterPaintNode *
-clutter_paint_node_get_first_child (ClutterPaintNode *node)
-{
-  g_return_val_if_fail (CLUTTER_IS_PAINT_NODE (node), NULL);
-
-  return node->first_child;
-}
-
-/**
- * clutter_paint_node_get_previous_sibling:
- * @node: a #ClutterPaintNode
- *
- * Retrieves the previous sibling of @node.
- *
- * Return value: (transfer none): a pointer to the previous sibling
- *   of the #ClutterPaintNode.
- */
-ClutterPaintNode *
-clutter_paint_node_get_previous_sibling (ClutterPaintNode *node)
-{
-  g_return_val_if_fail (CLUTTER_IS_PAINT_NODE (node), NULL);
-
-  return node->prev_sibling;
-}
-
-/**
- * clutter_paint_node_get_next_sibling:
- * @node: a #ClutterPaintNode
- *
- * Retrieves the next sibling of @node.
- *
- * Return value: (transfer none): a pointer to the next sibling
- *   of a #ClutterPaintNode
- */
-ClutterPaintNode *
-clutter_paint_node_get_next_sibling (ClutterPaintNode *node)
-{
-  g_return_val_if_fail (CLUTTER_IS_PAINT_NODE (node), NULL);
-
-  return node->next_sibling;
-}
-
-/**
- * clutter_paint_node_get_last_child:
- * @node: a #ClutterPaintNode
- *
- * Retrieves the last child of @node.
- *
- * Return value: (transfer none): a pointer to the last child
- *   of a #ClutterPaintNode
- */
-ClutterPaintNode *
-clutter_paint_node_get_last_child (ClutterPaintNode *node)
-{
-  g_return_val_if_fail (CLUTTER_IS_PAINT_NODE (node), NULL);
-
-  return node->last_child;
-}
-
-/**
- * clutter_paint_node_get_parent:
- * @node: a #ClutterPaintNode
- *
- * Retrieves the parent of @node.
- *
- * Return value: (transfer none): a pointer to the parent of
- *   a #ClutterPaintNode
- */
-ClutterPaintNode *
-clutter_paint_node_get_parent (ClutterPaintNode *node)
-{
-  g_return_val_if_fail (CLUTTER_IS_PAINT_NODE (node), NULL);
-
-  return node->parent;
-}
 
 /**
  * clutter_paint_node_get_n_children:

clutter/clutter/clutter-paint-volume-private.h

@@ -112,13 +112,8 @@ void                _clutter_paint_volume_set_from_volume      (ClutterPaintVolu
 void                _clutter_paint_volume_complete             (ClutterPaintVolume *pv);
 void                _clutter_paint_volume_transform            (ClutterPaintVolume      *pv,
                                                                 const graphene_matrix_t *matrix);
-void                _clutter_paint_volume_project              (ClutterPaintVolume      *pv,
-                                                                const graphene_matrix_t *modelview,
-                                                                const graphene_matrix_t *projection,
-                                                                const float             *viewport);
 void                _clutter_paint_volume_get_bounding_box     (ClutterPaintVolume *pv,
                                                                 ClutterActorBox    *box);
-void                _clutter_paint_volume_axis_align           (ClutterPaintVolume *pv);
 void                _clutter_paint_volume_set_reference_actor  (ClutterPaintVolume *pv,
                                                                 ClutterActor *actor);
 

clutter/clutter/clutter-paint-volume.c

@@ -37,6 +37,8 @@
 #include "clutter/clutter-stage-private.h"
 #include "clutter/clutter-actor-box-private.h"
 
+static void _clutter_paint_volume_axis_align (ClutterPaintVolume *pv);
+
 G_DEFINE_BOXED_TYPE (ClutterPaintVolume, clutter_paint_volume,
                      clutter_paint_volume_copy,
                      clutter_paint_volume_free);
@@ -736,7 +738,7 @@ _clutter_paint_volume_get_bounding_box (ClutterPaintVolume *pv,
   box->y2 = y_max;
 }
 
-void
+static void
 _clutter_paint_volume_project (ClutterPaintVolume *pv,
                                const graphene_matrix_t *modelview,
                                const graphene_matrix_t *projection,
@@ -821,7 +823,7 @@ _clutter_paint_volume_transform (ClutterPaintVolume *pv,
 /* Given a paint volume that has been transformed by an arbitrary
  * modelview and is no longer axis aligned, this derives a replacement
  * that is axis aligned. */
-void
+static void
 _clutter_paint_volume_axis_align (ClutterPaintVolume *pv)
 {
   int count;

clutter/clutter/clutter-private.h

@@ -64,9 +64,6 @@ typedef struct _ClutterContext      ClutterContext;
 #define CLUTTER_ACTOR_IN_PAINT(a)               ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PAINT) != FALSE)
 #define CLUTTER_ACTOR_IN_PICK(a)                ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PICK) != FALSE)
 #define CLUTTER_ACTOR_IN_RELAYOUT(a)            ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_RELAYOUT) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_WIDTH(a)          ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PREF_WIDTH) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_HEIGHT(a)         ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_PREF_HEIGHT) != FALSE)
-#define CLUTTER_ACTOR_IN_PREF_SIZE(a)           ((CLUTTER_PRIVATE_FLAGS (a) & (CLUTTER_IN_PREF_HEIGHT|CLUTTER_IN_PREF_WIDTH)) != FALSE)
 #define CLUTTER_ACTOR_IN_MAP_UNMAP(a)           ((CLUTTER_PRIVATE_FLAGS (a) & CLUTTER_IN_MAP_UNMAP) != FALSE)
 
 #define CLUTTER_PARAM_ANIMATABLE        (1 << G_PARAM_USER_SHIFT)
@@ -120,9 +117,6 @@ gboolean                _clutter_context_get_show_fps                   (void);
 /* Diagnostic mode */
 gboolean        _clutter_diagnostic_enabled     (void);
 
-CLUTTER_EXPORT
-void            _clutter_set_sync_to_vblank     (gboolean      sync_to_vblank);
-
 /* use this function as the accumulator if you have a signal with
  * a G_TYPE_BOOLEAN return value; this will stop the emission as
  * soon as one handler returns TRUE
@@ -143,8 +137,6 @@ gboolean _clutter_boolean_continue_accumulator (GSignalInvocationHint *ihint,
 
 void _clutter_run_repaint_functions (ClutterRepaintFlags flags);
 
-GType _clutter_layout_manager_get_child_meta_type (ClutterLayoutManager *manager);
-
 void  _clutter_util_fully_transform_vertices (const graphene_matrix_t  *modelview,
                                               const graphene_matrix_t  *projection,
                                               const float              *viewport,

clutter/clutter/clutter-settings-private.h

@@ -8,10 +8,6 @@ G_BEGIN_DECLS
 void    _clutter_settings_set_backend           (ClutterSettings *settings,
                                                  ClutterBackend  *backend);
 
-void    clutter_settings_set_property_internal (ClutterSettings *settings,
-                                                const char *property,
-                                                GValue *value);
-
 void clutter_settings_ensure_pointer_a11y_settings (ClutterSettings *settings,
                                                     ClutterSeat     *seat);
 

clutter/clutter/clutter-settings.c

@@ -676,17 +676,6 @@ clutter_settings_set_property (GObject      *gobject,
     }
 }
 
-void
-clutter_settings_set_property_internal (ClutterSettings *self,
-                                        const char *property,
-                                        GValue *value)
-{
-
-  property = g_intern_string (property);
-
-  g_object_set_property (G_OBJECT (self), property, value);
-}
-
 static void
 clutter_settings_get_property (GObject    *gobject,
                                guint       prop_id,

clutter/clutter/clutter-stage-manager-private.h

@@ -40,7 +40,5 @@ void _clutter_stage_manager_add_stage         (ClutterStageManager *stage_manage
                                                ClutterStage        *stage);
 void _clutter_stage_manager_remove_stage      (ClutterStageManager *stage_manager,
                                                ClutterStage        *stage);
-void _clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
-                                               ClutterStage        *stage);
 
 G_END_DECLS

clutter/clutter/clutter-stage-manager.c

@@ -172,30 +172,6 @@ clutter_stage_manager_get_default (void)
   return context->stage_manager;
 }
 
-/*< private >
- * _clutter_stage_manager_set_default_stage:
- * @stage_manager: a #ClutterStageManager
- * @stage: a #ClutterStage
- *
- * Sets @stage as the default stage
- *
- * A no-op if there already is a default stage
- */
-void
-_clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
-                                          ClutterStage        *stage)
-{
-  if (G_UNLIKELY (default_stage == NULL))
-    {
-      default_stage = stage;
-
-      /* the default stage is immediately realized */
-      clutter_actor_realize (CLUTTER_ACTOR (stage));
-
-      g_object_notify (G_OBJECT (stage_manager), "default-stage");
-    }
-}
-
 /**
  * clutter_stage_manager_get_default_stage:
  * @stage_manager: a #ClutterStageManager

clutter/clutter/clutter-stage-view-private.h

@@ -54,11 +54,6 @@ gboolean clutter_stage_view_has_full_redraw_clip (ClutterStageView *view);
 
 gboolean clutter_stage_view_has_redraw_clip (ClutterStageView *view);
 
-const MtkRegion * clutter_stage_view_peek_redraw_clip (ClutterStageView *view);
-
-CLUTTER_EXPORT
-MtkRegion * clutter_stage_view_take_redraw_clip (ClutterStageView *view);
-
 CLUTTER_EXPORT
 MtkRegion * clutter_stage_view_take_accumulated_redraw_clip (ClutterStageView *view);
 

clutter/clutter/clutter-stage-view.c

@@ -656,26 +656,6 @@ clutter_stage_view_has_full_redraw_clip (ClutterStageView *view)
   return priv->has_redraw_clip && !priv->redraw_clip;
 }
 
-const MtkRegion *
-clutter_stage_view_peek_redraw_clip (ClutterStageView *view)
-{
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-
-  return priv->redraw_clip;
-}
-
-MtkRegion *
-clutter_stage_view_take_redraw_clip (ClutterStageView *view)
-{
-  ClutterStageViewPrivate *priv =
-    clutter_stage_view_get_instance_private (view);
-
-  priv->has_redraw_clip = FALSE;
-
-  return g_steal_pointer (&priv->redraw_clip);
-}
-
 MtkRegion *
 clutter_stage_view_take_accumulated_redraw_clip (ClutterStageView *view)
 {

clutter/clutter/clutter-timeline-private.h

@@ -25,6 +25,5 @@
 
 void                    _clutter_timeline_advance                       (ClutterTimeline    *timeline,
                                                                          int64_t             tick_time);
-int64_t                 _clutter_timeline_get_delta                     (ClutterTimeline    *timeline);
 void                    _clutter_timeline_do_tick                       (ClutterTimeline    *timeline,
                                                                          int64_t             tick_time);