From fc259100b2f7eb9907a76c29485c5390214a27dd Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Thu, 21 Dec 2017 18:12:48 +0100 Subject: [PATCH] added addGlobalMapping method Enables overrides for specific key sequences, fixes #11 --- HotkeyTest/hottestwidget.cpp | 7 +++++++ QHotkey/qhotkey.cpp | 16 ++++++++++++++++ QHotkey/qhotkey.h | 4 ++++ QHotkey/qhotkey_p.h | 5 +++++ 4 files changed, 32 insertions(+) diff --git a/HotkeyTest/hottestwidget.cpp b/HotkeyTest/hottestwidget.cpp index 382378b..63faa24 100644 --- a/HotkeyTest/hottestwidget.cpp +++ b/HotkeyTest/hottestwidget.cpp @@ -1,6 +1,8 @@ #include "hottestwidget.h" #include "ui_hottestwidget.h" +//#define TEST_MAPPING + HotTestWidget::HotTestWidget(QWidget *parent) : QWidget(parent), ui(new Ui::HotTestWidget), @@ -18,6 +20,11 @@ HotTestWidget::HotTestWidget(QWidget *parent) : this->thread4->start(); this->thread5->start(); +#ifdef TEST_MAPPING + //shortcut mapping override + QHotkey::addGlobalMapping(QKeySequence("X"), QHotkey::NativeShortcut());// add invalid mapping to test if the overwrite works for all platforms +#endif + //1 connect(this->ui->hotkeyCheckbox_1, &QCheckBox::toggled, this->hotkey_1, &QHotkey::setRegistered); diff --git a/QHotkey/qhotkey.cpp b/QHotkey/qhotkey.cpp index e8e3adb..8b11bdd 100644 --- a/QHotkey/qhotkey.cpp +++ b/QHotkey/qhotkey.cpp @@ -8,6 +8,14 @@ Q_LOGGING_CATEGORY(logQHotkey, "QHotkey") +void QHotkey::addGlobalMapping(const QKeySequence &shortcut, const QHotkey::NativeShortcut &nativeShortcut) +{ + QMetaObject::invokeMethod(QHotkeyPrivate::instance(), "addMappingInvoked", Qt::QueuedConnection, + Q_ARG(Qt::Key, Qt::Key(shortcut[0] & ~Qt::KeyboardModifierMask)), + Q_ARG(Qt::KeyboardModifiers, Qt::KeyboardModifiers(shortcut[0] & Qt::KeyboardModifierMask)), + Q_ARG(QHotkey::NativeShortcut, nativeShortcut)); +} + QHotkey::QHotkey(QObject *parent) : QObject(parent), _keyCode(Qt::Key_unknown), @@ -249,6 +257,11 @@ void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut) signal.invoke(hkey, Qt::QueuedConnection); } +void QHotkeyPrivate::addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, const QHotkey::NativeShortcut &nativeShortcut) +{ + mapping.insert({keycode, modifiers}, nativeShortcut); +} + bool QHotkeyPrivate::addShortcutInvoked(QHotkey *hotkey) { QHotkey::NativeShortcut shortcut = hotkey->_nativeShortcut; @@ -279,6 +292,9 @@ bool QHotkeyPrivate::removeShortcutInvoked(QHotkey *hotkey) QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers) { + if(mapping.contains({keycode, modifiers})) + return mapping.value({keycode, modifiers}); + bool ok1, ok2 = false; auto k = nativeKeycode(keycode, ok1); auto m = nativeModifiers(modifiers, ok2); diff --git a/QHotkey/qhotkey.h b/QHotkey/qhotkey.h index 92d13c8..411b00d 100644 --- a/QHotkey/qhotkey.h +++ b/QHotkey/qhotkey.h @@ -53,6 +53,8 @@ public: bool valid; }; + static void addGlobalMapping(const QKeySequence &shortcut, const NativeShortcut &nativeShortcut); + //! Constructor explicit QHotkey(QObject *parent = Q_NULLPTR); //! Constructs a hotkey with a shortcut and optionally registers it @@ -110,4 +112,6 @@ uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key, uint seed); QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey) +Q_DECLARE_METATYPE(QHotkey::NativeShortcut) + #endif // QHOTKEY_H diff --git a/QHotkey/qhotkey_p.h b/QHotkey/qhotkey_p.h index 7ba4123..9e9e0ae 100644 --- a/QHotkey/qhotkey_p.h +++ b/QHotkey/qhotkey_p.h @@ -32,8 +32,10 @@ protected: virtual bool unregisterShortcut(QHotkey::NativeShortcut shortcut) = 0;//platform implement private: + QHash, QHotkey::NativeShortcut> mapping; QMultiHash shortcuts; + Q_INVOKABLE void addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, const QHotkey::NativeShortcut &nativeShortcut); Q_INVOKABLE bool addShortcutInvoked(QHotkey *hotkey); Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey); Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers); @@ -47,4 +49,7 @@ private: return hotkeyPrivate;\ } +Q_DECLARE_METATYPE(Qt::Key) +Q_DECLARE_METATYPE(Qt::KeyboardModifiers) + #endif // QHOTKEY_P_H