diff options
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoakeymapper.h | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoakeymapper.mm | 27 |
2 files changed, 16 insertions, 17 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.h b/src/plugins/platforms/cocoa/qcocoakeymapper.h index bb39717b79..b2ad36712b 100644 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.h +++ b/src/plugins/platforms/cocoa/qcocoakeymapper.h @@ -85,7 +85,7 @@ public: private: bool updateKeyboard(); void deleteLayouts(); - void updateKeyMap(unsigned short macVirtualKey, QChar unicodeKey); + KeyboardLayoutItem *keyMapForKey(unsigned short macVirtualKey, QChar unicodeKey) const; void clearMappings(); QCFType<TISInputSourceRef> m_currentInputSource = nullptr; @@ -93,8 +93,8 @@ private: enum { NullMode, UnicodeMode, OtherMode } m_keyboardMode = NullMode; const UCKeyboardLayout *m_keyboardLayoutFormat = nullptr; KeyboardLayoutKind m_keyboardKind = kKLKCHRuchrKind; - UInt32 m_deadKeyState = 0; // Maintains dead key state beween calls to UCKeyTranslate - KeyboardLayoutItem *m_keyLayout[256]; + mutable UInt32 m_deadKeyState = 0; // Maintains dead key state beween calls to UCKeyTranslate + mutable KeyboardLayoutItem *m_keyLayout[256]; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm index a0004f6f8f..c326c1ca84 100644 --- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm +++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm @@ -363,15 +363,16 @@ static constexpr Qt::KeyboardModifiers modifierCombinations[] = { }; /* - Updates the key map for the given \macVirtualKey by applying - all possible modifier combinations. + Returns a key map for the given \macVirtualKey based on all + possible modifier combinations. */ -void QCocoaKeyMapper::updateKeyMap(unsigned short macVirtualKey, QChar unicodeKey) +KeyboardLayoutItem *QCocoaKeyMapper::keyMapForKey(unsigned short macVirtualKey, QChar unicodeKey) const { - updateKeyboard(); + const_cast<QCocoaKeyMapper *>(this)->updateKeyboard(); - if (m_keyLayout[macVirtualKey]) - return; + Q_ASSERT(macVirtualKey < 256); + if (auto *existingKeyMap = m_keyLayout[macVirtualKey]) + return existingKeyMap; qCDebug(lcQpaKeyMapper, "Updating key map for virtual key = 0x%02x!", (uint)macVirtualKey); @@ -402,27 +403,25 @@ void QCocoaKeyMapper::updateKeyMap(unsigned short macVirtualKey, QChar unicodeKe qCDebug(lcQpaKeyMapper, " [%d] (%d,0x%02x,'%c')", i, qtkey, qtkey, qtkey); } + + return m_keyLayout[macVirtualKey]; } QList<int> QCocoaKeyMapper::possibleKeys(const QKeyEvent *event) const { QList<int> ret; - auto virtualKey = event->nativeVirtualKey(); - const_cast<QCocoaKeyMapper *>(this)->updateKeyMap(virtualKey, QChar(event->key())); - KeyboardLayoutItem *keyLayout = m_keyLayout[virtualKey]; - - if (!keyLayout) // Key is not in any keyboard layout (e.g. eisu-key on Japanese keyboard) - return ret; + auto *keyMap = keyMapForKey(event->nativeVirtualKey(), QChar(event->key())); + Q_ASSERT(keyMap); - int baseKey = keyLayout->qtKey[Qt::NoModifier]; + int baseKey = keyMap->qtKey[Qt::NoModifier]; auto eventModifiers = event->modifiers(); // The base key is always valid ret << int(baseKey + eventModifiers); for (int i = 1; i < 8; ++i) { - int keyAfterApplyingModifiers = keyLayout->qtKey[i]; + int keyAfterApplyingModifiers = keyMap->qtKey[i]; if (!keyAfterApplyingModifiers) continue; if (keyAfterApplyingModifiers == baseKey) |