From 7667d1fcd83bc34b6a1eca0a1e9b87ef37c2ef0e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 25 Aug 2025 12:44:11 +1000 Subject: [PATCH] test: make some behavior enabling more expressive Remove the non-obvious +1/-1 and use the enum values instead. Then group the two together better and remove an unnecessary separate handling of the flag setting. Part-of: --- test/eierpecken.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/eierpecken.c b/test/eierpecken.c index e21428a..882a463 100644 --- a/test/eierpecken.c +++ b/test/eierpecken.c @@ -700,10 +700,6 @@ peck_enable_eis_behavior(struct peck *peck, enum peck_eis_behavior behavior) peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_ADD_KEYBOARD); peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_ADD_TOUCH); break; - case PECK_EIS_BEHAVIOR_REJECT_CLIENT: - flag_clear(peck->eis_behavior, behavior - 1); - flag_set(peck->eis_behavior, behavior); - break; case PECK_EIS_BEHAVIOR_HANDLE_BIND_SEAT: case PECK_EIS_BEHAVIOR_HANDLE_CLOSE_DEVICE: case PECK_EIS_BEHAVIOR_HANDLE_FRAME: @@ -716,8 +712,12 @@ peck_enable_eis_behavior(struct peck *peck, enum peck_eis_behavior behavior) case PECK_EIS_BEHAVIOR_ADD_TOUCH: flag_set(peck->eis_behavior, behavior); break; + case PECK_EIS_BEHAVIOR_REJECT_CLIENT: + flag_clear(peck->eis_behavior, PECK_EIS_BEHAVIOR_ACCEPT_CLIENT); + flag_set(peck->eis_behavior, behavior); + break; case PECK_EIS_BEHAVIOR_ACCEPT_CLIENT: - flag_clear(peck->eis_behavior, behavior + 1); + flag_clear(peck->eis_behavior, PECK_EIS_BEHAVIOR_REJECT_CLIENT); flag_set(peck->eis_behavior, behavior); break; case PECK_EIS_BEHAVIOR_RESUME_DEVICE: @@ -764,8 +764,6 @@ peck_enable_ei_behavior(struct peck *peck, enum peck_ei_behavior behavior) case PECK_EI_BEHAVIOR_HANDLE_ADDED_SCROLL: case PECK_EI_BEHAVIOR_HANDLE_FRAME: case PECK_EI_BEHAVIOR_HANDLE_SYNC: - flag_set(peck->ei_behavior, behavior); - break; case PECK_EI_BEHAVIOR_HANDLE_RESUMED: case PECK_EI_BEHAVIOR_HANDLE_PAUSED: flag_set(peck->ei_behavior, behavior);