From c01580cec605921ad34f93ee4dc84f5377aa7cba Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 6 Jun 2023 22:35:21 +0200 Subject: [PATCH] clutter: Remove some unused code The drag actors were practically unused, and became wholly unused API with commit eb6e1f694a. There is no provision for using this in the future, so drop this internal API. Part-of: --- clutter/clutter/clutter-stage-private.h | 16 ---- clutter/clutter/clutter-stage.c | 108 ------------------------ 2 files changed, 124 deletions(-) diff --git a/clutter/clutter/clutter-stage-private.h b/clutter/clutter/clutter-stage-private.h index e7e0cbce4..e88c17d37 100644 --- a/clutter/clutter/clutter-stage-private.h +++ b/clutter/clutter/clutter-stage-private.h @@ -100,22 +100,6 @@ 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_add_pointer_drag_actor (ClutterStage *stage, - ClutterInputDevice *device, - ClutterActor *actor); -ClutterActor * _clutter_stage_get_pointer_drag_actor (ClutterStage *stage, - ClutterInputDevice *device); -void _clutter_stage_remove_pointer_drag_actor (ClutterStage *stage, - ClutterInputDevice *device); - -void _clutter_stage_add_touch_drag_actor (ClutterStage *stage, - ClutterEventSequence *sequence, - ClutterActor *actor); -ClutterActor * _clutter_stage_get_touch_drag_actor (ClutterStage *stage, - ClutterEventSequence *sequence); -void _clutter_stage_remove_touch_drag_actor (ClutterStage *stage, - ClutterEventSequence *sequence); - void _clutter_stage_set_scale_factor (ClutterStage *stage, int factor); diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 8c7be95ae..3b083d0cc 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -2564,114 +2564,6 @@ clutter_stage_add_to_redraw_clip (ClutterStage *stage, clutter_stage_add_redraw_clip (stage, &stage_clip); } -void -_clutter_stage_add_pointer_drag_actor (ClutterStage *stage, - ClutterInputDevice *device, - ClutterActor *actor) -{ - GHashTable *drag_actors; - - drag_actors = g_object_get_data (G_OBJECT (stage), - "__clutter_stage_pointer_drag_actors"); - if (drag_actors == NULL) - { - drag_actors = g_hash_table_new (NULL, NULL); - g_object_set_data_full (G_OBJECT (stage), - "__clutter_stage_pointer_drag_actors", - drag_actors, - (GDestroyNotify) g_hash_table_destroy); - } - - g_hash_table_replace (drag_actors, device, actor); -} - -ClutterActor * -_clutter_stage_get_pointer_drag_actor (ClutterStage *stage, - ClutterInputDevice *device) -{ - GHashTable *drag_actors; - - drag_actors = g_object_get_data (G_OBJECT (stage), - "__clutter_stage_pointer_drag_actors"); - if (drag_actors == NULL) - return NULL; - - return g_hash_table_lookup (drag_actors, device); -} - -void -_clutter_stage_remove_pointer_drag_actor (ClutterStage *stage, - ClutterInputDevice *device) -{ - GHashTable *drag_actors; - - drag_actors = g_object_get_data (G_OBJECT (stage), - "__clutter_stage_pointer_drag_actors"); - if (drag_actors == NULL) - return; - - g_hash_table_remove (drag_actors, device); - - if (g_hash_table_size (drag_actors) == 0) - g_object_set_data (G_OBJECT (stage), - "__clutter_stage_pointer_drag_actors", - NULL); -} - -void -_clutter_stage_add_touch_drag_actor (ClutterStage *stage, - ClutterEventSequence *sequence, - ClutterActor *actor) -{ - GHashTable *drag_actors; - - drag_actors = g_object_get_data (G_OBJECT (stage), - "__clutter_stage_touch_drag_actors"); - if (drag_actors == NULL) - { - drag_actors = g_hash_table_new (NULL, NULL); - g_object_set_data_full (G_OBJECT (stage), - "__clutter_stage_touch_drag_actors", - drag_actors, - (GDestroyNotify) g_hash_table_destroy); - } - - g_hash_table_replace (drag_actors, sequence, actor); -} - -ClutterActor * -_clutter_stage_get_touch_drag_actor (ClutterStage *stage, - ClutterEventSequence *sequence) -{ - GHashTable *drag_actors; - - drag_actors = g_object_get_data (G_OBJECT (stage), - "__clutter_stage_touch_drag_actors"); - if (drag_actors == NULL) - return NULL; - - return g_hash_table_lookup (drag_actors, sequence); -} - -void -_clutter_stage_remove_touch_drag_actor (ClutterStage *stage, - ClutterEventSequence *sequence) -{ - GHashTable *drag_actors; - - drag_actors = g_object_get_data (G_OBJECT (stage), - "__clutter_stage_touch_drag_actors"); - if (drag_actors == NULL) - return; - - g_hash_table_remove (drag_actors, sequence); - - if (g_hash_table_size (drag_actors) == 0) - g_object_set_data (G_OBJECT (stage), - "__clutter_stage_touch_drag_actors", - NULL); -} - int64_t clutter_stage_get_frame_counter (ClutterStage *stage) {