From 22d0ff569a092f95b314fbaf6e65b6f798d75581 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 10 Apr 2024 17:30:07 +0200 Subject: [PATCH] clutter: Drop clutter-wide clutter_stage_repick_device() This is only called from a single place inside ClutterStage code, drop this public internal function, and repick in place. Part-of: --- clutter/clutter/clutter-mutter.h | 3 --- clutter/clutter/clutter-stage.c | 34 ++++++++++++++------------------ 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/clutter/clutter/clutter-mutter.h b/clutter/clutter/clutter-mutter.h index 4d9c5317c..cf46aaafa 100644 --- a/clutter/clutter/clutter-mutter.h +++ b/clutter/clutter/clutter-mutter.h @@ -106,9 +106,6 @@ gboolean clutter_stage_get_device_coords (ClutterStage *stage, ClutterInputDevice *device, ClutterEventSequence *sequence, graphene_point_t *coords); -CLUTTER_EXPORT -void clutter_stage_repick_device (ClutterStage *stage, - ClutterInputDevice *device); CLUTTER_EXPORT void clutter_get_debug_flags (ClutterDebugFlag *debug_flags, diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 47f61532c..54486d08c 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -1623,7 +1623,21 @@ static void on_seat_unfocus_inhibited_changed (ClutterStage *stage, ClutterSeat *seat) { - clutter_stage_repick_device (stage, clutter_seat_get_pointer (seat)); + ClutterInputDevice *device; + graphene_point_t point = GRAPHENE_POINT_INIT_ZERO; + + device = clutter_seat_get_pointer (seat); + + if (!clutter_stage_get_device_coords (stage, device, NULL, &point)) + return; + + clutter_stage_pick_and_update_device (stage, + device, + NULL, NULL, + CLUTTER_DEVICE_UPDATE_IGNORE_CACHE | + CLUTTER_DEVICE_UPDATE_EMIT_CROSSING, + point, + CLUTTER_CURRENT_TIME); } static void @@ -3524,24 +3538,6 @@ clutter_stage_update_device (ClutterStage *stage, } } -void -clutter_stage_repick_device (ClutterStage *stage, - ClutterInputDevice *device) -{ - graphene_point_t point = GRAPHENE_POINT_INIT_ZERO; - - if (!clutter_stage_get_device_coords (stage, device, NULL, &point)) - return; - - clutter_stage_pick_and_update_device (stage, - device, - NULL, NULL, - CLUTTER_DEVICE_UPDATE_IGNORE_CACHE | - CLUTTER_DEVICE_UPDATE_EMIT_CROSSING, - point, - CLUTTER_CURRENT_TIME); -} - static gboolean clutter_stage_check_in_clear_area (ClutterStage *stage, ClutterInputDevice *device,