From 07431d1abc15f0c1a87e065bafd5309b7a41f540 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Tue, 20 Aug 2024 21:57:59 +0200 Subject: [PATCH] tests/clutter: Add a helper for getting the default seat As it is widely used in the tests, simplifies future changes like the previous one Part-of: --- src/tests/clutter-test-utils.c | 8 ++++++++ src/tests/clutter-test-utils.h | 3 +++ src/tests/clutter/conform/actor-event-hold.c | 4 +--- src/tests/clutter/conform/binding-pool.c | 2 +- src/tests/clutter/conform/event-delivery.c | 17 ++++++----------- .../clutter/conform/gesture-relationship.c | 18 ++++++------------ src/tests/clutter/conform/gesture.c | 15 +++++---------- src/tests/clutter/conform/grab.c | 4 ++-- src/tests/clutter/conform/text.c | 4 ++-- src/tests/clutter/interactive/test-devices.c | 2 +- 10 files changed, 35 insertions(+), 42 deletions(-) diff --git a/src/tests/clutter-test-utils.c b/src/tests/clutter-test-utils.c index 56ec27f92..8e7ba5511 100644 --- a/src/tests/clutter-test-utils.c +++ b/src/tests/clutter-test-utils.c @@ -102,6 +102,14 @@ clutter_test_get_backend (void) return meta_backend_get_clutter_backend (backend); } +ClutterSeat * +clutter_test_get_default_seat (void) +{ + ClutterBackend *backend = clutter_test_get_backend (); + + return clutter_backend_get_default_seat (backend); +} + void clutter_test_flush_input (void) { diff --git a/src/tests/clutter-test-utils.h b/src/tests/clutter-test-utils.h index 4f6a91377..725d2fd77 100644 --- a/src/tests/clutter-test-utils.h +++ b/src/tests/clutter-test-utils.h @@ -127,6 +127,9 @@ ClutterContext * clutter_test_get_context (void); CLUTTER_EXPORT ClutterBackend * clutter_test_get_backend (void); +CLUTTER_EXPORT +ClutterSeat * clutter_test_get_default_seat (void); + #define clutter_test_assert_actor_at_point(stage,point,actor) \ G_STMT_START { \ const graphene_point_t *__p = (point); \ diff --git a/src/tests/clutter/conform/actor-event-hold.c b/src/tests/clutter/conform/actor-event-hold.c index d56d4c5c1..9dd8a85cb 100644 --- a/src/tests/clutter/conform/actor-event-hold.c +++ b/src/tests/clutter/conform/actor-event-hold.c @@ -64,7 +64,6 @@ static void actor_event_hold (void) { ClutterActor *stage; - ClutterBackend *backend; ClutterSeat *seat; g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; @@ -81,8 +80,7 @@ actor_event_hold (void) clutter_actor_show (stage); /* Get the input device*/ - backend = clutter_test_get_backend (); - seat = clutter_backend_get_default_seat (backend); + seat = clutter_test_get_default_seat (); virtual_pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE); diff --git a/src/tests/clutter/conform/binding-pool.c b/src/tests/clutter/conform/binding-pool.c index 9a366b137..2d70fdd88 100644 --- a/src/tests/clutter/conform/binding-pool.c +++ b/src/tests/clutter/conform/binding-pool.c @@ -232,7 +232,7 @@ send_keyval (KeyGroup *group, int keyval) ClutterSeat *seat; ClutterEvent *event; - seat = clutter_backend_get_default_seat (clutter_test_get_backend ()); + seat = clutter_test_get_default_seat (); event = clutter_event_key_new (CLUTTER_KEY_PRESS, CLUTTER_EVENT_FLAG_SYNTHETIC, CLUTTER_CURRENT_TIME, diff --git a/src/tests/clutter/conform/event-delivery.c b/src/tests/clutter/conform/event-delivery.c index 2f95a028c..e54bed4aa 100644 --- a/src/tests/clutter/conform/event-delivery.c +++ b/src/tests/clutter/conform/event-delivery.c @@ -48,7 +48,7 @@ static void event_delivery_consecutive_touch_begin_end (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; gboolean was_updated; @@ -158,8 +158,7 @@ static void event_delivery_implicit_grabbing (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterActor *child; @@ -249,8 +248,7 @@ static void event_delivery_implicit_grab_cancelled (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterActor *child_1, *child_2; @@ -366,8 +364,7 @@ static void event_delivery_implicit_grab_existing_clutter_grab (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterActor *child_1, *child_2; @@ -537,8 +534,7 @@ static void event_delivery_stop_discrete_event (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; TestAction *test_action; @@ -594,8 +590,7 @@ static void event_delivery_actor_stop_sequence_event (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; TestAction *test_action; diff --git a/src/tests/clutter/conform/gesture-relationship.c b/src/tests/clutter/conform/gesture-relationship.c index 44c93ec2d..f6f9f4f26 100644 --- a/src/tests/clutter/conform/gesture-relationship.c +++ b/src/tests/clutter/conform/gesture-relationship.c @@ -103,8 +103,7 @@ static void gesture_relationship_cancel_on_recognize (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL)); @@ -162,8 +161,7 @@ static void gesture_relationship_simple (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL)); @@ -224,8 +222,7 @@ static void gesture_relationship_two_points (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL)); @@ -273,8 +270,7 @@ static void gesture_relationship_two_points_two_actors (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterActor *second_actor = clutter_actor_new (); @@ -342,8 +338,7 @@ static void gesture_relationship_claim_new_sequence_while_already_recognizing (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterGesture *gesture_1 = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, "name", "gesture-1", NULL)); @@ -440,8 +435,7 @@ static void gesture_relationship_claim_new_sequence_while_already_recognizing_2 (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterActor *second_actor = clutter_actor_new (); diff --git a/src/tests/clutter/conform/gesture.c b/src/tests/clutter/conform/gesture.c index 869f1e86f..f3901a234 100644 --- a/src/tests/clutter/conform/gesture.c +++ b/src/tests/clutter/conform/gesture.c @@ -78,8 +78,7 @@ static void gesture_disposed_while_active (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterActor *second_actor = clutter_actor_new (); @@ -128,8 +127,7 @@ static void gesture_state_machine_move_to_waiting (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL)); @@ -188,8 +186,7 @@ static void gesture_state_machine_move_to_cancelled_while_possible (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL)); @@ -235,8 +232,7 @@ static void gesture_state_machine_move_to_cancelled_on_sequence_cancel (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterActor *second_actor = clutter_actor_new (); @@ -295,8 +291,7 @@ static void gesture_multiple_mouse_buttons (void) { ClutterActor *stage = clutter_test_get_stage (); - ClutterSeat *seat = - clutter_backend_get_default_seat (clutter_test_get_backend ()); + ClutterSeat *seat = clutter_test_get_default_seat (); g_autoptr (ClutterVirtualInputDevice) virtual_pointer = NULL; int64_t now_us; ClutterGesture *gesture = CLUTTER_GESTURE (g_object_new (TEST_TYPE_GESTURE, NULL)); diff --git a/src/tests/clutter/conform/grab.c b/src/tests/clutter/conform/grab.c index e022b0c00..93a8cf430 100644 --- a/src/tests/clutter/conform/grab.c +++ b/src/tests/clutter/conform/grab.c @@ -137,7 +137,7 @@ create_pointer (ClutterActor *actor) ClutterSeat *seat; guint notify_id; - seat = clutter_backend_get_default_seat (clutter_test_get_backend ()); + seat = clutter_test_get_default_seat (); pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE); clutter_virtual_input_device_notify_absolute_motion (pointer, @@ -620,7 +620,7 @@ grab_input_only (void) ClutterSeat *seat; g_autoptr (ClutterVirtualInputDevice) pointer = NULL; - seat = clutter_backend_get_default_seat (clutter_test_get_backend ()); + seat = clutter_test_get_default_seat (); pointer = clutter_seat_create_virtual_device (seat, CLUTTER_POINTER_DEVICE); test_data_init (&data); diff --git a/src/tests/clutter/conform/text.c b/src/tests/clutter/conform/text.c index 821f7f4a7..137524c09 100644 --- a/src/tests/clutter/conform/text.c +++ b/src/tests/clutter/conform/text.c @@ -334,7 +334,7 @@ send_keyval (ClutterText *text, int keyval) ClutterSeat *seat; /* Unicode should be ignored for cursor keys etc. */ - seat = clutter_backend_get_default_seat (clutter_test_get_backend ()); + seat = clutter_test_get_default_seat (); event = clutter_event_key_new (CLUTTER_KEY_PRESS, CLUTTER_EVENT_FLAG_SYNTHETIC, CLUTTER_CURRENT_TIME, @@ -354,7 +354,7 @@ send_unichar (ClutterText *text, gunichar unichar) ClutterSeat *seat; /* Key symbol should be ignored for printable characters */ - seat = clutter_backend_get_default_seat (clutter_test_get_backend ()); + seat = clutter_test_get_default_seat (); event = clutter_event_key_new (CLUTTER_KEY_PRESS, CLUTTER_EVENT_FLAG_SYNTHETIC, CLUTTER_CURRENT_TIME, diff --git a/src/tests/clutter/interactive/test-devices.c b/src/tests/clutter/interactive/test-devices.c index c0b0b02a2..7b00866e4 100644 --- a/src/tests/clutter/interactive/test-devices.c +++ b/src/tests/clutter/interactive/test-devices.c @@ -185,7 +185,7 @@ test_devices_main (int argc, char **argv) clutter_actor_show (stage); - seat = clutter_backend_get_default_seat (clutter_test_get_backend ()); + seat = clutter_test_get_default_seat (); g_signal_connect (seat, "device-added", G_CALLBACK (seat_device_added_cb), app);