diff options
Diffstat (limited to 'libs/input/KeyCharacterMap.cpp')
-rw-r--r-- | libs/input/KeyCharacterMap.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp index 2039fa6553..a5e651254b 100644 --- a/libs/input/KeyCharacterMap.cpp +++ b/libs/input/KeyCharacterMap.cpp @@ -304,9 +304,8 @@ char16_t KeyCharacterMap::getNumber(int32_t keyCode) const { char16_t KeyCharacterMap::getCharacter(int32_t keyCode, int32_t metaState) const { char16_t result = 0; - const Key* key; const Behavior* behavior; - if (getKeyBehavior(keyCode, metaState, &key, &behavior)) { + if (getKeyBehavior(keyCode, metaState, &behavior)) { result = behavior->character; } #if DEBUG_MAPPING @@ -321,9 +320,8 @@ bool KeyCharacterMap::getFallbackAction(int32_t keyCode, int32_t metaState, outFallbackAction->metaState = 0; bool result = false; - const Key* key; const Behavior* behavior; - if (getKeyBehavior(keyCode, metaState, &key, &behavior)) { + if (getKeyBehavior(keyCode, metaState, &behavior)) { if (behavior->fallbackKeyCode) { outFallbackAction->keyCode = behavior->fallbackKeyCode; outFallbackAction->metaState = metaState & ~behavior->metaState; @@ -438,9 +436,8 @@ void KeyCharacterMap::tryRemapKey(int32_t keyCode, int32_t metaState, *outKeyCode = keyCode; *outMetaState = metaState; - const Key* key; const Behavior* behavior; - if (getKeyBehavior(keyCode, metaState, &key, &behavior)) { + if (getKeyBehavior(keyCode, metaState, &behavior)) { if (behavior->replacementKeyCode) { *outKeyCode = behavior->replacementKeyCode; int32_t newMetaState = metaState & ~behavior->metaState; @@ -485,13 +482,12 @@ bool KeyCharacterMap::getKey(int32_t keyCode, const Key** outKey) const { } bool KeyCharacterMap::getKeyBehavior(int32_t keyCode, int32_t metaState, - const Key** outKey, const Behavior** outBehavior) const { + const Behavior** outBehavior) const { const Key* key; if (getKey(keyCode, &key)) { const Behavior* behavior = key->firstBehavior; while (behavior) { if (matchesMetaState(metaState, behavior->metaState)) { - *outKey = key; *outBehavior = behavior; return true; } |