From 6ecd157487adb945ade530d9a6e3d44eac7b445e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 10 Sep 2021 17:01:33 +0200 Subject: macOS: Improve QAppleKeyMapper logging Pick-to: 6.2 Change-Id: If0018f2a1c8809e66b695949e8dc7b463c4612a6 Reviewed-by: Volker Hilsheimer --- src/gui/platform/darwin/qapplekeymapper.mm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/platform/darwin/qapplekeymapper.mm b/src/gui/platform/darwin/qapplekeymapper.mm index bdf741573d..8011154c0b 100644 --- a/src/gui/platform/darwin/qapplekeymapper.mm +++ b/src/gui/platform/darwin/qapplekeymapper.mm @@ -551,7 +551,7 @@ const QAppleKeyMapper::KeyMap &QAppleKeyMapper::keyMapForKey(VirtualKeyCode virt qCDebug(lcQpaKeyMapper).verbosity(0) << "\t" << qtModifiers << "+" << qUtf8Printable(QString::asprintf("0x%02x", virtualKey)) << "=" << qUtf8Printable(QString::asprintf("%d / 0x%02x /", qtKey, qtKey)) - << QString::asprintf("%c", qtKey); + << QString(QChar(qtKey)); } return keyMap; @@ -578,6 +578,8 @@ QList QAppleKeyMapper::possibleKeys(const QKeyEvent *event) const { QList ret; + qCDebug(lcQpaKeyMapper) << "Computing possible keys for" << event; + const auto nativeVirtualKey = event->nativeVirtualKey(); if (!nativeVirtualKey) return ret; @@ -613,6 +615,17 @@ QList QAppleKeyMapper::possibleKeys(const QKeyEvent *event) const } } + if (lcQpaKeyMapper().isDebugEnabled()) { + qCDebug(lcQpaKeyMapper) << "Possible keys:"; + for (int keyAndModifiers : ret) { + auto keyCombination = QKeyCombination::fromCombined(keyAndModifiers); + auto keySequence = QKeySequence(keyCombination); + qCDebug(lcQpaKeyMapper).verbosity(0) << "\t-" + << keyCombination << "/" << keySequence << "/" + << qUtf8Printable(keySequence.toString(QKeySequence::NativeText)); + } + } + return ret; } -- cgit v1.2.3