smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clamp mapped modifiers

Browse source
This commit is contained in:
sithlord48 2026-07-02 22:42:51 -04:00 committed by Nick Bolton
parent b21f5a7ca8
commit 205a3c803e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lib/client/ServerProxy.cpp
View file

@ -455,9 +455,11 @@ KeyID ServerProxy::translateKey(KeyID id) const
} }
if (id2 != kKeyModifierIDNull) { if (id2 != kKeyModifierIDNull) {
return s_translationTable[m_modifierTranslationTable[id2]][side]; return std::clamp<KeyModifierMask>(
s_translationTable[m_modifierTranslationTable[id2]][side], 0, kKeyModifierIDLast - 1
);
} else { } else {
return id; return std::clamp<KeyModifierMask>(id, 0, kKeyModifierIDLast - 1);
} }
} }
@ -487,7 +489,7 @@ KeyModifierMask ServerProxy::translateModifierMask(KeyModifierMask mask) const
if ((mask & KeyModifierSuper) != 0) { if ((mask & KeyModifierSuper) != 0) {
newMask |= s_masks[m_modifierTranslationTable[kKeyModifierIDSuper]]; newMask |= s_masks[m_modifierTranslationTable[kKeyModifierIDSuper]];
} }
return newMask; return std::clamp<KeyModifierMask>(newMask, 0, kKeyModifierIDLast - 1);
} }
void ServerProxy::enter() void ServerProxy::enter()
@ -802,7 +804,7 @@ void ServerProxy::setOptions()
} }
if (id != kKeyModifierIDNull) { if (id != kKeyModifierIDNull) {
m_modifierTranslationTable[id] = options[i + 1]; m_modifierTranslationTable[id] = std::clamp<KeyModifierMask>(options[i + 1], 0, kKeyModifierIDLast - 1);
LOG_VERBOSE("modifier %d mapped to %d", id, m_modifierTranslationTable[id]); LOG_VERBOSE("modifier %d mapped to %d", id, m_modifierTranslationTable[id]);
} }
} }