From 34c439b3de4518f770af09efd8f23a9b9df87fb6 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Fri, 22 Aug 2025 16:25:52 +0100 Subject: [PATCH] refactor: Use single case to ignore mods in EI mod mask --- src/lib/platform/EiKeyState.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/platform/EiKeyState.cpp b/src/lib/platform/EiKeyState.cpp index 10067d8af..6ef2c63e8 100644 --- a/src/lib/platform/EiKeyState.cpp +++ b/src/lib/platform/EiKeyState.cpp @@ -163,11 +163,10 @@ std::uint32_t EiKeyState::convertModMask(xkb_mod_mask_t xkbModMaskIn) const modMaskOut |= (1 << kKeyModifierBitNumLock); else if (strcmp(XKB_VMOD_NAME_SCROLL, name) == 0) modMaskOut |= (1 << kKeyModifierBitScrollLock); - else if (strcmp(XKB_VMOD_NAME_META, name) == 0) // possibly the old meta (not the new meta/super/logo key) - LOG_DEBUG2("modifier mask %s ignored", name); - else if (strcmp(XKB_MOD_NAME_MOD2, name) == 0) // spare, sometimes mapped to num lock. - LOG_DEBUG2("modifier mask %s ignored", name); - else if (strcmp(XKB_MOD_NAME_MOD3, name) == 0) // spare, could be mapped to alt_r, caps lock, scroll lock, etc. + else if ((strcmp(XKB_VMOD_NAME_META, name) == 0) || // possibly the old meta (not the new meta/super/logo key) + (strcmp(XKB_MOD_NAME_MOD2, name) == 0) || // spare, sometimes mapped to num lock. + (strcmp(XKB_MOD_NAME_MOD3, name) == 0) // spare, could be mapped to alt_r, caps lock, scroll lock, etc. + ) LOG_DEBUG2("modifier mask %s ignored", name); else LOG_WARN("modifier mask %s not accounted for, this is a bug", name);