diff --git a/clutter/clutter/clutter-actor-meta-private.h b/clutter/clutter/clutter-actor-meta-private.h index 34ea331ad..0bdba023c 100644 --- a/clutter/clutter/clutter-actor-meta-private.h +++ b/clutter/clutter/clutter-actor-meta-private.h @@ -80,15 +80,9 @@ GList * _clutter_meta_group_get_metas_no_internal (ClutterMeta void _clutter_meta_group_clear_metas_no_internal (ClutterMetaGroup *group); /* ActorMeta */ -void _clutter_actor_meta_set_actor (ClutterActorMeta *meta, - ClutterActor *actor); - const gchar * _clutter_actor_meta_get_debug_name (ClutterActorMeta *meta); void _clutter_actor_meta_set_priority (ClutterActorMeta *meta, gint priority); -int _clutter_actor_meta_get_priority (ClutterActorMeta *meta); - -gboolean _clutter_actor_meta_is_internal (ClutterActorMeta *meta); G_END_DECLS diff --git a/clutter/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c index 7e157ed17..8dec6c0cf 100644 --- a/clutter/clutter/clutter-actor-meta.c +++ b/clutter/clutter/clutter-actor-meta.c @@ -355,7 +355,7 @@ clutter_actor_meta_get_enabled (ClutterActorMeta *meta) * Sets or unsets a back pointer to the #ClutterActor that owns * the @meta */ -void +static void _clutter_actor_meta_set_actor (ClutterActorMeta *meta, ClutterActor *actor) { @@ -406,7 +406,7 @@ _clutter_actor_meta_set_priority (ClutterActorMeta *meta, priv->priority = priority; } -gint +static gint _clutter_actor_meta_get_priority (ClutterActorMeta *meta) { ClutterActorMetaPrivate *priv; @@ -418,7 +418,7 @@ _clutter_actor_meta_get_priority (ClutterActorMeta *meta) return priv->priority; } -gboolean +static gboolean _clutter_actor_meta_is_internal (ClutterActorMeta *meta) { ClutterActorMetaPrivate *priv = diff --git a/clutter/clutter/clutter-paint-volume-private.h b/clutter/clutter/clutter-paint-volume-private.h index 06351784b..221807867 100644 --- a/clutter/clutter/clutter-paint-volume-private.h +++ b/clutter/clutter/clutter-paint-volume-private.h @@ -103,7 +103,6 @@ struct _ClutterPaintVolume void _clutter_paint_volume_init_static (ClutterPaintVolume *pv, ClutterActor *actor); -ClutterPaintVolume *_clutter_paint_volume_new (ClutterActor *actor); void _clutter_paint_volume_copy_static (const ClutterPaintVolume *src_pv, ClutterPaintVolume *dst_pv); void _clutter_paint_volume_set_from_volume (ClutterPaintVolume *pv, diff --git a/clutter/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c index 83bc0e8c7..191febdb1 100644 --- a/clutter/clutter/clutter-paint-volume.c +++ b/clutter/clutter/clutter-paint-volume.c @@ -43,37 +43,6 @@ G_DEFINE_BOXED_TYPE (ClutterPaintVolume, clutter_paint_volume, clutter_paint_volume_copy, clutter_paint_volume_free); -/* - * _clutter_paint_volume_new: - * @actor: a #ClutterActor - * - * Creates a new #ClutterPaintVolume for the given @actor. - * - * Return value: the newly allocated #ClutterPaintVolume. Use - * clutter_paint_volume_free() to free the resources it uses - */ -ClutterPaintVolume * -_clutter_paint_volume_new (ClutterActor *actor) -{ - ClutterPaintVolume *pv; - - g_return_val_if_fail (actor != NULL, NULL); - - pv = g_new0 (ClutterPaintVolume, 1); - - pv->actor = actor; - - memset (pv->vertices, 0, 8 * sizeof (graphene_point3d_t)); - - pv->is_static = FALSE; - pv->is_empty = TRUE; - pv->is_axis_aligned = TRUE; - pv->is_complete = TRUE; - pv->is_2d = TRUE; - - return pv; -} - /* Since paint volumes are used so heavily in a typical paint * traversal of a Clutter scene graph and since paint volumes often * have a very short life cycle that maps well to stack allocation we diff --git a/clutter/clutter/clutter-stage-private.h b/clutter/clutter/clutter-stage-private.h index d63b9e779..a2a14fa65 100644 --- a/clutter/clutter/clutter-stage-private.h +++ b/clutter/clutter/clutter-stage-private.h @@ -91,16 +91,7 @@ CLUTTER_EXPORT void _clutter_stage_queue_event (ClutterStage *stage, ClutterEvent *event, gboolean copy_event); -gboolean _clutter_stage_has_queued_events (ClutterStage *stage); void _clutter_stage_process_queued_events (ClutterStage *stage); -void _clutter_stage_update_input_devices (ClutterStage *stage); -gboolean _clutter_stage_has_full_redraw_queued (ClutterStage *stage); - -ClutterPaintVolume *_clutter_stage_paint_volume_stack_allocate (ClutterStage *stage); -void _clutter_stage_paint_volume_stack_free_all (ClutterStage *stage); - -void _clutter_stage_set_scale_factor (ClutterStage *stage, - int factor); void clutter_stage_presented (ClutterStage *stage, ClutterStageView *view, @@ -117,13 +108,6 @@ GList * clutter_stage_get_views_for_rect (ClutterStage *stage, void clutter_stage_set_actor_needs_immediate_relayout (ClutterStage *stage); -void clutter_stage_update_device_entry (ClutterStage *self, - ClutterInputDevice *device, - ClutterEventSequence *sequence, - graphene_point_t coords, - ClutterActor *actor, - MtkRegion *clear_area); - void clutter_stage_remove_device_entry (ClutterStage *self, ClutterInputDevice *device, ClutterEventSequence *sequence); diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 9efbf520c..8a2eae90e 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -649,18 +649,6 @@ _clutter_stage_queue_event (ClutterStage *stage, clutter_stage_schedule_update (stage); } -gboolean -_clutter_stage_has_queued_events (ClutterStage *stage) -{ - ClutterStagePrivate *priv; - - g_return_val_if_fail (CLUTTER_IS_STAGE (stage), FALSE); - - priv = stage->priv; - - return priv->event_queue->length > 0; -} - static ClutterEvent * clutter_stage_compress_motion (ClutterStage *stage, ClutterEvent *event, @@ -1025,15 +1013,6 @@ is_full_stage_redraw_queued (ClutterStage *stage) return TRUE; } -gboolean -_clutter_stage_has_full_redraw_queued (ClutterStage *stage) -{ - if (CLUTTER_ACTOR_IN_DESTRUCTION (stage)) - return FALSE; - - return is_full_stage_redraw_queued (stage); -} - static void setup_ray_for_coordinates (ClutterStage *stage, float x, @@ -3017,7 +2996,7 @@ free_pointer_device_entry (PointerDeviceEntry *entry) g_free (entry); } -void +static void clutter_stage_update_device_entry (ClutterStage *self, ClutterInputDevice *device, ClutterEventSequence *sequence,