27 Commits
Author SHA1 Message Date
Skycoder42 547cf7a7cc updated qpm version
fixes #19
2018-03-10 23:22:50 +01:00
Felix Barz f00ae2a071 Merge pull request #18 from semanser/semanser-patch-1
Fix issue with non-English keyboard on Windows (Fixes #17)
2018-03-10 16:11:11 +01:00
Andriy Semenets 9a90aff273 Fix issue with non-English keyboard on Windows
Full issue described in #17.
2018-03-10 16:42:45 +02:00
Felix Barz 080ddd479a Update README.md 2018-02-22 20:53:04 +01:00
Felix Barz 2d21833742 Update README add help text 2018-02-08 15:28:56 +01:00
Skycoder42 fc259100b2 added addGlobalMapping method
Enables overrides for specific key sequences, fixes #11
2017-12-21 18:12:48 +01:00
Felix Barz 670705e4e0 Merge pull request #13 from aknobloch/master
X11 Media Key Support
2017-12-21 11:16:45 +01:00
aknobloch f549a7763f X11 Media Key Support 2017-12-20 20:15:02 -05:00
Skycoder42 d46af31902 Add define to stay compatible to pre Qt5.8 2017-11-08 14:07:59 +01:00
Felix Barz f4665e20ad Merge pull request #10 from Kolcha/master
removed warning for wide range of GCC versions (5,6,7), fixes #9
2017-11-08 12:28:41 +01:00
Kolcha 9a04e8f539 added Q_FALLTHROUGH macro 2017-11-08 14:16:07 +03:00
Kolcha 974af9253c removed warning for wide range of GCC versions (5,6,7) 2017-11-08 12:55:42 +03:00
Skycoder42 9a812a3eb4 Merge branch 'pr8' 2017-10-23 15:36:32 +02:00
Skycoder42 0943bb0494 lib fixup 2017-10-23 15:36:25 +02:00
Martin T. H. Sandsmark b910580fce add target to build as normal library 2017-10-22 14:00:59 +02:00
Skycoder42 c9cfd8fb6f fixed library parts 2017-09-30 22:22:21 +02:00
Skycoder42 7d214ac41e qpmx 2017-09-30 19:22:06 +02:00
Skycoder42 83910c8eca fixed invalid key detection 2017-09-30 19:21:26 +02:00
Skycoder42 91f3542b5d qm update 2017-06-25 14:41:23 +02:00
Skycoder42 1833a053f6 fixed xerrorhandler
fixes #4
2017-06-25 14:40:03 +02:00
Felix Barz f288e85ef1 Create README.md 2017-06-15 11:41:09 +02:00
Skycoder42 2578b69dc5 remove recursive call
detected by #4
2017-06-02 21:24:14 +02:00
Skycoder42 a0678c4cfc qpm update 2017-05-14 22:28:10 +02:00
Skycoder42 cdb4d37453 replaced XSync by XFlush 2017-05-14 22:27:26 +02:00
Skycoder42 9eace8fbbd do not discard events on XSync 2017-05-14 13:39:54 +02:00
Skycoder42 6baf644b40 fixed misread parameter
#3
2017-05-14 13:35:13 +02:00
Skycoder42 3fa176a380 Added XSync call for hotkey without window
For #3
2017-05-14 13:32:06 +02:00
15 changed files with 236 additions and 69 deletions
+7
View File
@@ -1,6 +1,8 @@
#include "hottestwidget.h" #include "hottestwidget.h"
#include "ui_hottestwidget.h" #include "ui_hottestwidget.h"
//#define TEST_MAPPING
HotTestWidget::HotTestWidget(QWidget *parent) : HotTestWidget::HotTestWidget(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::HotTestWidget), ui(new Ui::HotTestWidget),
@@ -18,6 +20,11 @@ HotTestWidget::HotTestWidget(QWidget *parent) :
this->thread4->start(); this->thread4->start();
this->thread5->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 //1
connect(this->ui->hotkeyCheckbox_1, &QCheckBox::toggled, connect(this->ui->hotkeyCheckbox_1, &QCheckBox::toggled,
this->hotkey_1, &QHotkey::setRegistered); this->hotkey_1, &QHotkey::setRegistered);
+9
View File
@@ -1,11 +1,20 @@
#include "hottestwidget.h" #include "hottestwidget.h"
#include <QApplication> #include <QApplication>
//#define START_BACKGROUND
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication a(argc, argv); QApplication a(argc, argv);
HotTestWidget w; HotTestWidget w;
#ifdef START_BACKGROUND
auto startKey = new QHotkey(QKeySequence(Qt::MetaModifier | Qt::ControlModifier | Qt::Key_S), true, &w);
QObject::connect(startKey, &QHotkey::activated,
&w, &QWidget::show);
#else
w.show(); w.show();
#endif
return a.exec(); return a.exec();
} }
+2 -1
View File
@@ -1,7 +1,8 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS += \ SUBDIRS += \
HotkeyTest HotkeyTest \
QHotkey
DISTFILES += README.md \ DISTFILES += README.md \
LICENSE \ LICENSE \
+16
View File
@@ -0,0 +1,16 @@
TEMPLATE = lib
win32: CONFIG += dll
TARGET = QHotkey
VERSION = 1.2.1
include(../qhotkey.pri)
DEFINES += QHOTKEY_LIB QHOTKEY_LIB_BUILD
# use INSTALL_ROOT to modify the install location
headers.files = $$PUBLIC_HEADERS
headers.path = $$[QT_INSTALL_HEADERS]
target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target headers
+23 -1
View File
@@ -8,6 +8,14 @@
Q_LOGGING_CATEGORY(logQHotkey, "QHotkey") 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) : QHotkey::QHotkey(QObject *parent) :
QObject(parent), QObject(parent),
_keyCode(Qt::Key_unknown), _keyCode(Qt::Key_unknown),
@@ -249,6 +257,11 @@ void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut)
signal.invoke(hkey, Qt::QueuedConnection); 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) bool QHotkeyPrivate::addShortcutInvoked(QHotkey *hotkey)
{ {
QHotkey::NativeShortcut shortcut = hotkey->_nativeShortcut; QHotkey::NativeShortcut shortcut = hotkey->_nativeShortcut;
@@ -279,7 +292,16 @@ bool QHotkeyPrivate::removeShortcutInvoked(QHotkey *hotkey)
QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers) QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers)
{ {
return {this->nativeKeycode(keycode), this->nativeModifiers(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);
if(ok1 && ok2)
return {k, m};
else
return {};
} }
+19 -5
View File
@@ -6,8 +6,18 @@
#include <QPair> #include <QPair>
#include <QLoggingCategory> #include <QLoggingCategory>
#ifdef QHOTKEY_LIB
#ifdef QHOTKEY_LIB_BUILD
#define QHOTKEY_SHARED_EXPORT Q_DECL_EXPORT
#else
#define QHOTKEY_SHARED_EXPORT Q_DECL_IMPORT
#endif
#else
#define QHOTKEY_SHARED_EXPORT
#endif
//! A class to define global, systemwide Hotkeys //! A class to define global, systemwide Hotkeys
class QHotkey : public QObject class QHOTKEY_SHARED_EXPORT QHotkey : public QObject
{ {
Q_OBJECT Q_OBJECT
friend class QHotkeyPrivate; friend class QHotkeyPrivate;
@@ -19,7 +29,7 @@ class QHotkey : public QObject
public: public:
//! Defines shortcut with native keycodes //! Defines shortcut with native keycodes
class NativeShortcut { class QHOTKEY_SHARED_EXPORT NativeShortcut {
public: public:
//! The native keycode //! The native keycode
quint32 key; quint32 key;
@@ -43,6 +53,8 @@ public:
bool valid; bool valid;
}; };
static void addGlobalMapping(const QKeySequence &shortcut, const NativeShortcut &nativeShortcut);
//! Constructor //! Constructor
explicit QHotkey(QObject *parent = Q_NULLPTR); explicit QHotkey(QObject *parent = Q_NULLPTR);
//! Constructs a hotkey with a shortcut and optionally registers it //! Constructs a hotkey with a shortcut and optionally registers it
@@ -95,9 +107,11 @@ private:
bool _registered; bool _registered;
}; };
uint qHash(const QHotkey::NativeShortcut &key); uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key);
uint qHash(const QHotkey::NativeShortcut &key, uint seed); uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key, uint seed);
Q_DECLARE_LOGGING_CATEGORY(logQHotkey) QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey)
Q_DECLARE_METATYPE(QHotkey::NativeShortcut)
#endif // QHOTKEY_H #endif // QHOTKEY_H
+16 -7
View File
@@ -13,8 +13,8 @@ public:
protected: protected:
// QHotkeyPrivate interface // QHotkeyPrivate interface
quint32 nativeKeycode(Qt::Key keycode) Q_DECL_OVERRIDE; quint32 nativeKeycode(Qt::Key keycode, bool &ok) Q_DECL_OVERRIDE;
quint32 nativeModifiers(Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; quint32 nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok) Q_DECL_OVERRIDE;
bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
@@ -35,9 +35,10 @@ bool QHotkeyPrivateMac::nativeEventFilter(const QByteArray &eventType, void *mes
return false; return false;
} }
quint32 QHotkeyPrivateMac::nativeKeycode(Qt::Key keycode) quint32 QHotkeyPrivateMac::nativeKeycode(Qt::Key keycode, bool &ok)
{ {
// Constants found in NSEvent.h from AppKit.framework // Constants found in NSEvent.h from AppKit.framework
ok = true;
switch (keycode) { switch (keycode) {
case Qt::Key_Return: case Qt::Key_Return:
return kVK_Return; return kVK_Return;
@@ -120,7 +121,8 @@ quint32 QHotkeyPrivateMac::nativeKeycode(Qt::Key keycode)
case Qt::Key_Up: case Qt::Key_Up:
return kVK_UpArrow; return kVK_UpArrow;
default: default:
; ok = false;
break;
} }
UTF16Char ch = keycode; UTF16Char ch = keycode;
@@ -157,11 +159,17 @@ quint32 QHotkeyPrivateMac::nativeKeycode(Qt::Key keycode)
long idx = keyToChar[k] & kUCKeyOutputGetIndexMask; long idx = keyToChar[k] & kUCKeyOutputGetIndexMask;
if (stateRec && idx < stateRec->keyStateRecordCount) { if (stateRec && idx < stateRec->keyStateRecordCount) {
UCKeyStateRecord* rec = reinterpret_cast<UCKeyStateRecord*>(data + stateRec->keyStateRecordOffsets[idx]); UCKeyStateRecord* rec = reinterpret_cast<UCKeyStateRecord*>(data + stateRec->keyStateRecordOffsets[idx]);
if (rec->stateZeroCharData == ch) return k; if (rec->stateZeroCharData == ch) {
ok = true;
return k;
}
} }
} }
else if (!(keyToChar[k] & kUCKeyOutputSequenceIndexMask) && keyToChar[k] < 0xFFFE) { else if (!(keyToChar[k] & kUCKeyOutputSequenceIndexMask) && keyToChar[k] < 0xFFFE) {
if (keyToChar[k] == ch) return k; if (keyToChar[k] == ch) {
ok = true;
return k;
}
} }
} }
} }
@@ -169,7 +177,7 @@ quint32 QHotkeyPrivateMac::nativeKeycode(Qt::Key keycode)
return 0; return 0;
} }
quint32 QHotkeyPrivateMac::nativeModifiers(Qt::KeyboardModifiers modifiers) quint32 QHotkeyPrivateMac::nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok)
{ {
quint32 nMods = 0; quint32 nMods = 0;
if (modifiers & Qt::ShiftModifier) if (modifiers & Qt::ShiftModifier)
@@ -182,6 +190,7 @@ quint32 QHotkeyPrivateMac::nativeModifiers(Qt::KeyboardModifiers modifiers)
nMods |= controlKey; nMods |= controlKey;
if (modifiers & Qt::KeypadModifier) if (modifiers & Qt::KeypadModifier)
nMods |= kEventKeyModifierNumLockMask; nMods |= kEventKeyModifierNumLockMask;
ok = true;
return nMods; return nMods;
} }
+8 -3
View File
@@ -7,7 +7,7 @@
#include <QMutex> #include <QMutex>
#include <QGlobalStatic> #include <QGlobalStatic>
class QHotkeyPrivate : public QObject, public QAbstractNativeEventFilter class QHOTKEY_SHARED_EXPORT QHotkeyPrivate : public QObject, public QAbstractNativeEventFilter
{ {
Q_OBJECT Q_OBJECT
@@ -25,15 +25,17 @@ public:
protected: protected:
void activateShortcut(QHotkey::NativeShortcut shortcut); void activateShortcut(QHotkey::NativeShortcut shortcut);
virtual quint32 nativeKeycode(Qt::Key keycode) = 0;//platform implement virtual quint32 nativeKeycode(Qt::Key keycode, bool &ok) = 0;//platform implement
virtual quint32 nativeModifiers(Qt::KeyboardModifiers modifiers) = 0;//platform implement virtual quint32 nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok) = 0;//platform implement
virtual bool registerShortcut(QHotkey::NativeShortcut shortcut) = 0;//platform implement virtual bool registerShortcut(QHotkey::NativeShortcut shortcut) = 0;//platform implement
virtual bool unregisterShortcut(QHotkey::NativeShortcut shortcut) = 0;//platform implement virtual bool unregisterShortcut(QHotkey::NativeShortcut shortcut) = 0;//platform implement
private: private:
QHash<QPair<Qt::Key, Qt::KeyboardModifiers>, QHotkey::NativeShortcut> mapping;
QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts; QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts;
Q_INVOKABLE void addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, const QHotkey::NativeShortcut &nativeShortcut);
Q_INVOKABLE bool addShortcutInvoked(QHotkey *hotkey); Q_INVOKABLE bool addShortcutInvoked(QHotkey *hotkey);
Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey); Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey);
Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers); Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers);
@@ -47,4 +49,7 @@ private:
return hotkeyPrivate;\ return hotkeyPrivate;\
} }
Q_DECLARE_METATYPE(Qt::Key)
Q_DECLARE_METATYPE(Qt::KeyboardModifiers)
#endif // QHOTKEY_P_H #endif // QHOTKEY_P_H
+12 -5
View File
@@ -13,8 +13,8 @@ public:
protected: protected:
// QHotkeyPrivate interface // QHotkeyPrivate interface
quint32 nativeKeycode(Qt::Key keycode) Q_DECL_OVERRIDE; quint32 nativeKeycode(Qt::Key keycode, bool &ok) Q_DECL_OVERRIDE;
quint32 nativeModifiers(Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; quint32 nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok) Q_DECL_OVERRIDE;
bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
@@ -35,8 +35,9 @@ bool QHotkeyPrivateWin::nativeEventFilter(const QByteArray &eventType, void *mes
return false; return false;
} }
quint32 QHotkeyPrivateWin::nativeKeycode(Qt::Key keycode) quint32 QHotkeyPrivateWin::nativeKeycode(Qt::Key keycode, bool &ok)
{ {
ok = true;
if(keycode <= 0xFFFF) {//Try to obtain the key from it's "character" if(keycode <= 0xFFFF) {//Try to obtain the key from it's "character"
const SHORT vKey = VkKeyScanW(keycode); const SHORT vKey = VkKeyScanW(keycode);
if(vKey > -1) if(vKey > -1)
@@ -201,11 +202,16 @@ quint32 QHotkeyPrivateWin::nativeKeycode(Qt::Key keycode)
return VK_OEM_FJ_TOUROKU; return VK_OEM_FJ_TOUROKU;
default: default:
return 0; if(keycode <= 0xFFFF)
return (byte)keycode;
else {
ok = false;
return 0;
}
} }
} }
quint32 QHotkeyPrivateWin::nativeModifiers(Qt::KeyboardModifiers modifiers) quint32 QHotkeyPrivateWin::nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok)
{ {
quint32 nMods = 0; quint32 nMods = 0;
if (modifiers & Qt::ShiftModifier) if (modifiers & Qt::ShiftModifier)
@@ -216,6 +222,7 @@ quint32 QHotkeyPrivateWin::nativeModifiers(Qt::KeyboardModifiers modifiers)
nMods |= MOD_ALT; nMods |= MOD_ALT;
if (modifiers & Qt::MetaModifier) if (modifiers & Qt::MetaModifier)
nMods |= MOD_WIN; nMods |= MOD_WIN;
ok = true;
return nMods; return nMods;
} }
+52 -13
View File
@@ -6,6 +6,11 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
//compability to pre Qt 5.8
#ifndef Q_FALLTHROUGH
#define Q_FALLTHROUGH() (void)0
#endif
class QHotkeyPrivateX11 : public QHotkeyPrivate class QHotkeyPrivateX11 : public QHotkeyPrivate
{ {
public: public:
@@ -14,8 +19,9 @@ public:
protected: protected:
// QHotkeyPrivate interface // QHotkeyPrivate interface
quint32 nativeKeycode(Qt::Key keycode) Q_DECL_OVERRIDE; quint32 nativeKeycode(Qt::Key keycode, bool &ok) Q_DECL_OVERRIDE;
quint32 nativeModifiers(Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; quint32 nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok) Q_DECL_OVERRIDE;
QString getX11String(Qt::Key keycode);
bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
@@ -58,9 +64,33 @@ bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *mes
return false; return false;
} }
quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode) QString QHotkeyPrivateX11::getX11String(Qt::Key keycode)
{ {
KeySym keysym = XStringToKeysym(QKeySequence(keycode).toString(QKeySequence::NativeText).toLatin1().constData()); switch(keycode){
case Qt::Key_MediaLast :
case Qt::Key_MediaPrevious :
return "XF86AudioPrev";
case Qt::Key_MediaNext :
return "XF86AudioNext";
case Qt::Key_MediaPause :
case Qt::Key_MediaPlay :
case Qt::Key_MediaTogglePlayPause :
return "XF86AudioPlay";
case Qt::Key_MediaRecord :
return "XF86AudioRecord";
case Qt::Key_MediaStop :
return "XF86AudioStop";
default :
return QKeySequence(keycode).toString(QKeySequence::NativeText);
}
}
quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode, bool &ok)
{
QString keyString = getX11String(keycode);
KeySym keysym = XStringToKeysym(keyString.toLatin1().constData());
if (keysym == NoSymbol) { if (keysym == NoSymbol) {
//not found -> just use the key //not found -> just use the key
if(keycode <= 0xFFFF) if(keycode <= 0xFFFF)
@@ -70,13 +100,16 @@ quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode)
} }
Display *display = QX11Info::display(); Display *display = QX11Info::display();
if(display) if(display) {
return XKeysymToKeycode(QX11Info::display(), keysym); auto res = XKeysymToKeycode(QX11Info::display(), keysym);
else if(res != 0)
ok = true;
return res;
} else
return 0; return 0;
} }
quint32 QHotkeyPrivateX11::nativeModifiers(Qt::KeyboardModifiers modifiers) quint32 QHotkeyPrivateX11::nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok)
{ {
quint32 nMods = 0; quint32 nMods = 0;
if (modifiers & Qt::ShiftModifier) if (modifiers & Qt::ShiftModifier)
@@ -87,6 +120,7 @@ quint32 QHotkeyPrivateX11::nativeModifiers(Qt::KeyboardModifiers modifiers)
nMods |= Mod1Mask; nMods |= Mod1Mask;
if (modifiers & Qt::MetaModifier) if (modifiers & Qt::MetaModifier)
nMods |= Mod4Mask; nMods |= Mod4Mask;
ok = true;
return nMods; return nMods;
} }
@@ -106,6 +140,7 @@ bool QHotkeyPrivateX11::registerShortcut(QHotkey::NativeShortcut shortcut)
GrabModeAsync, GrabModeAsync,
GrabModeAsync); GrabModeAsync);
} }
XSync(display, False);
if(errorHandler.hasError) { if(errorHandler.hasError) {
qCWarning(logQHotkey) << "Failed to register hotkey. Error:" qCWarning(logQHotkey) << "Failed to register hotkey. Error:"
@@ -129,11 +164,11 @@ bool QHotkeyPrivateX11::unregisterShortcut(QHotkey::NativeShortcut shortcut)
shortcut.modifier | specialMod, shortcut.modifier | specialMod,
DefaultRootWindow(display)); DefaultRootWindow(display));
} }
XSync(display, False);
if(errorHandler.hasError) { if(errorHandler.hasError) {
qCWarning(logQHotkey) << "Failed to unregister hotkey. Error:" qCWarning(logQHotkey) << "Failed to unregister hotkey. Error:"
<< qPrintable(errorHandler.errorString); << qPrintable(errorHandler.errorString);
this->unregisterShortcut(shortcut);
return false; return false;
} else } else
return true; return true;
@@ -155,12 +190,14 @@ QString QHotkeyPrivateX11::HotkeyErrorHandler::errorString;
QHotkeyPrivateX11::HotkeyErrorHandler::HotkeyErrorHandler() QHotkeyPrivateX11::HotkeyErrorHandler::HotkeyErrorHandler()
{ {
this->prevHandler = XSetErrorHandler(&HotkeyErrorHandler::handleError); prevHandler = XSetErrorHandler(&HotkeyErrorHandler::handleError);
} }
QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler() QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler()
{ {
XSetErrorHandler(this->prevHandler); XSetErrorHandler(prevHandler);
hasError = false;
errorString.clear();
} }
int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error) int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error)
@@ -171,10 +208,12 @@ int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorE
case BadWindow: case BadWindow:
if (error->request_code == 33 || //grab key if (error->request_code == 33 || //grab key
error->request_code == 34) {// ungrab key error->request_code == 34) {// ungrab key
HotkeyErrorHandler::hasError = true; hasError = true;
HotkeyErrorHandler::errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code); errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code);
return 1; return 1;
} }
Q_FALLTHROUGH();
// fall through
default: default:
return 0; return 0;
} }
+8 -1
View File
@@ -12,15 +12,21 @@ The QHotkey is a class that can be used to create hotkeys/global shortcuts, aka
- Thread-Safe - Can be used on all threads (See section Thread safety) - Thread-Safe - Can be used on all threads (See section Thread safety)
- Allows usage of native keycodes and modifiers, if needed - Allows usage of native keycodes and modifiers, if needed
**Note:** For now Wayland is not supported, as it is simply not possible to register a global shortcut with wayland. For more details, or possible Ideas on how to get Hotkeys working on wayland, see [Issue #14](https://github.com/Skycoder42/QHotkey/issues/14).
## Installation ## Installation
The package is providet as qpm package, [`de.skycoder42.qhotkey`](https://www.qpm.io/packages/de.skycoder42.qhotkey/index.html). To install: The package is providet as qpm package, [`de.skycoder42.qhotkey`](https://www.qpm.io/packages/de.skycoder42.qhotkey/index.html). To install:
1. Install qpm (See [GitHub - Installing](https://github.com/Cutehacks/qpm/blob/master/README.md#installing)) 1. Install qpm (See [GitHub - Installing](https://github.com/Cutehacks/qpm/blob/master/README.md#installing), for **windows** see below)
2. In your projects root directory, run `qpm install de.skycoder42.qhotkey` 2. In your projects root directory, run `qpm install de.skycoder42.qhotkey`
3. Include qpm to your project by adding `include(vendor/vendor.pri)` to your `.pro` file 3. Include qpm to your project by adding `include(vendor/vendor.pri)` to your `.pro` file
Check their [GitHub - Usage for App Developers](https://github.com/Cutehacks/qpm/blob/master/README.md#usage-for-app-developers) to learn more about qpm. Check their [GitHub - Usage for App Developers](https://github.com/Cutehacks/qpm/blob/master/README.md#usage-for-app-developers) to learn more about qpm.
**Important for Windows users:** QPM Version *0.10.0* (the one you can download on the website) is currently broken on windows! It's already fixed in master, but not released yet. Until a newer versions gets released, you can download the latest dev build from here:
- https://storage.googleapis.com/www.qpm.io/download/latest/windows_amd64/qpm.exe
- https://storage.googleapis.com/www.qpm.io/download/latest/windows_386/qpm.exe
## Usage ## Usage
The general usage is to create QHotkey instances for specific hotkeys, register them and then simply connect to the signal emitted once the hotkey is pressed. The general usage is to create QHotkey instances for specific hotkeys, register them and then simply connect to the signal emitted once the hotkey is pressed.
@@ -86,3 +92,4 @@ The documentation was created using [doxygen](http://www.doxygen.org). It includ
- Qt::Key makes no difference between normal numbers and the Numpad numbers. Most keyboards however require this. Thus, you can't register shortcuts for the numpad, unless you use a native shortcut. - Qt::Key makes no difference between normal numbers and the Numpad numbers. Most keyboards however require this. Thus, you can't register shortcuts for the numpad, unless you use a native shortcut.
- Supports not all keys, but most of the common ones. There are differences between platforms and it depends on the Keyboard-Layout. "Delete", for example, works on windows and mac, but not on X11 (At least on my test machines). I tried to use OS-Functions where possible, but since the Qt::Key values need to be converted into native keys, there are some limitations. I can use need such a key, try using the native shortcut. - Supports not all keys, but most of the common ones. There are differences between platforms and it depends on the Keyboard-Layout. "Delete", for example, works on windows and mac, but not on X11 (At least on my test machines). I tried to use OS-Functions where possible, but since the Qt::Key values need to be converted into native keys, there are some limitations. I can use need such a key, try using the native shortcut.
- The registered keys will be "taken" by QHotkey. This means after a hotkey was cosumend by your application, it will not be sent to the active application. This is done this way by the operating systems and cannot be changed. - The registered keys will be "taken" by QHotkey. This means after a hotkey was cosumend by your application, it will not be sent to the active application. This is done this way by the operating systems and cannot be changed.
- If you get a `QHotkey: Failed to register hotkey. Error: BadAccess (attempt to access private resource denied)` error on X11, this means you are trying to register a hotkey that is private to X11. Those keys simply cannot be registered using the normal API
+6
View File
@@ -0,0 +1,6 @@
mac: LIBS += -framework Carbon
else:win32: LIBS += -luser32
else:unix {
QT += x11extras
LIBS += -lX11
}
+9 -12
View File
@@ -1,20 +1,17 @@
CONFIG += C++11 CONFIG += C++11
HEADERS += $$PWD/QHotkey/qhotkey.h \ PUBLIC_HEADERS += $$PWD/QHotkey/qhotkey.h \
$$PWD/QHotkey/QHotkey
HEADERS += $$PUBLIC_HEADERS \
$$PWD/QHotkey/qhotkey_p.h $$PWD/QHotkey/qhotkey_p.h
SOURCES += $$PWD/QHotkey/qhotkey.cpp SOURCES += $$PWD/QHotkey/qhotkey.cpp
mac { mac: SOURCES += $$PWD/QHotkey/qhotkey_mac.cpp
SOURCES += $$PWD/QHotkey/qhotkey_mac.cpp else:win32: SOURCES += $$PWD/QHotkey/qhotkey_win.cpp
LIBS += -framework Carbon else:unix: SOURCES += $$PWD/QHotkey/qhotkey_x11.cpp
} else:win32 {
SOURCES += $$PWD/QHotkey/qhotkey_win.cpp
LIBS += -luser32
} else:unix {
SOURCES += $$PWD/QHotkey/qhotkey_x11.cpp
QT += x11extras
LIBS += -lX11
}
INCLUDEPATH += $$PWD/QHotkey INCLUDEPATH += $$PWD/QHotkey
include($$PWD/qhotkey.prc)
+20 -20
View File
@@ -1,22 +1,22 @@
{ {
"name": "de.skycoder42.qhotkey", "author": {
"description": "A global shortcut/hotkey for Desktop Qt-Applications", "email": "skycoder42.de@gmx.de",
"author": { "name": "Skycoder"
"name": "Skycoder", },
"email": "skycoder42.de@gmx.de" "dependencies": [
}, ],
"repository": { "description": "A global shortcut/hotkey for Desktop Qt-Applications",
"type": "GITHUB", "license": "BSD_3_CLAUSE",
"url": "https://github.com/Skycoder42/QHotkey.git" "name": "de.skycoder42.qhotkey",
}, "pri_filename": "qhotkey.pri",
"version": { "repository": {
"label": "1.1.2", "type": "GITHUB",
"revision": "", "url": "https://github.com/Skycoder42/QHotkey.git"
"fingerprint": "" },
}, "version": {
"dependencies": [ "fingerprint": "",
], "label": "1.2.2",
"license": "BSD_3_CLAUSE", "revision": ""
"pri_filename": "qhotkey.pri", },
"webpage": "https://github.com/Skycoder42/QHotkey" "webpage": "https://github.com/Skycoder42/QHotkey"
} }
+28
View File
@@ -0,0 +1,28 @@
{
"dependencies": [
],
"license": {
"file": "LICENSE",
"name": "BSD_3_CLAUSE"
},
"prcFile": "qhotkey.prc",
"priFile": "qhotkey.pri",
"priIncludes": [
],
"publishers": {
"qpm": {
"author": {
"email": "skycoder42.de@gmx.de",
"name": "Skycoder"
},
"description": "A global shortcut/hotkey for Desktop Qt-Applications",
"name": "de.skycoder42.qhotkey",
"repository": {
"type": "GITHUB",
"url": "https://github.com/Skycoder42/QHotkey.git"
},
"webpage": "https://github.com/Skycoder42/QHotkey"
}
},
"source": false
}