From 01444e803f7f8f158c65b10b57a195737ecd26a6 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 17 Jun 2024 16:15:07 +0200 Subject: [PATCH] clutter: Specify that input-only grabs are started inactive in API Add the _inactive suffix, so that the state of these objects is clear. Part-of: --- clutter/clutter/clutter-stage-private.h | 8 ++++---- clutter/clutter/clutter-stage.c | 8 ++++---- src/tests/clutter/conform/grab.c | 6 +++--- src/wayland/meta-wayland-input.c | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/clutter/clutter/clutter-stage-private.h b/clutter/clutter/clutter-stage-private.h index da38000bd..0520cae8a 100644 --- a/clutter/clutter/clutter-stage-private.h +++ b/clutter/clutter/clutter-stage-private.h @@ -136,10 +136,10 @@ void clutter_stage_add_to_redraw_clip (ClutterStage *self, ClutterPaintVolume *clip); CLUTTER_EXPORT -ClutterGrab * clutter_stage_grab_input_only (ClutterStage *self, - ClutterEventHandler handler, - gpointer user_data, - GDestroyNotify user_data_destroy); +ClutterGrab * clutter_stage_grab_input_only_inactive (ClutterStage *self, + ClutterEventHandler handler, + gpointer user_data, + GDestroyNotify user_data_destroy); void clutter_stage_invalidate_devices (ClutterStage *stage); diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 9b27ff8b3..a6bc89983 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -3959,10 +3959,10 @@ clutter_stage_grab_inactive (ClutterStage *stage, } ClutterGrab * -clutter_stage_grab_input_only (ClutterStage *stage, - ClutterEventHandler handler, - gpointer user_data, - GDestroyNotify user_data_destroy) +clutter_stage_grab_input_only_inactive (ClutterStage *stage, + ClutterEventHandler handler, + gpointer user_data, + GDestroyNotify user_data_destroy) { ClutterInputOnlyActor *input_only_actor; ClutterActor *actor; diff --git a/src/tests/clutter/conform/grab.c b/src/tests/clutter/conform/grab.c index ef958b99f..26125a2e1 100644 --- a/src/tests/clutter/conform/grab.c +++ b/src/tests/clutter/conform/grab.c @@ -625,9 +625,9 @@ grab_input_only (void) test_data_init (&data); - grab = clutter_stage_grab_input_only (CLUTTER_STAGE (data.stage), - handle_input_only_event, - data.events, NULL); + grab = clutter_stage_grab_input_only_inactive (CLUTTER_STAGE (data.stage), + handle_input_only_event, + data.events, NULL); clutter_grab_activate (grab); event_log_compare ((EventLog *) &grab1_log, data.events); diff --git a/src/wayland/meta-wayland-input.c b/src/wayland/meta-wayland-input.c index 791536e75..44490ee19 100644 --- a/src/wayland/meta-wayland-input.c +++ b/src/wayland/meta-wayland-input.c @@ -299,10 +299,10 @@ meta_wayland_input_attach_event_handler (MetaWaylandInput *input, MetaBackend *backend = meta_context_get_backend (context); ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend)); - input->grab = clutter_stage_grab_input_only (stage, - grab_handle_event, - input, - NULL); + input->grab = clutter_stage_grab_input_only_inactive (stage, + grab_handle_event, + input, + NULL); clutter_grab_activate (input->grab); g_signal_connect_swapped (input->grab, "notify::revoked",