code cleanup

This commit is contained in:
Skycoder42
2017-04-18 16:31:05 +02:00
parent e1f90f15bc
commit 53bd8cdd14
6 changed files with 190 additions and 193 deletions
+77 -72
View File
@@ -10,81 +10,81 @@ Q_LOGGING_CATEGORY(logQHotkey, "QHotkey")
QHotkey::QHotkey(QObject *parent) : QHotkey::QHotkey(QObject *parent) :
QObject(parent), QObject(parent),
key(Qt::Key_unknown), _keyCode(Qt::Key_unknown),
mods(Qt::NoModifier), _modifiers(Qt::NoModifier),
nativeShortcut(), _nativeShortcut(),
registered(false) _registered(false)
{} {}
QHotkey::QHotkey(const QKeySequence &sequence, bool autoRegister, QObject *parent) : QHotkey::QHotkey(const QKeySequence &sequence, bool autoRegister, QObject *parent) :
QHotkey(parent) QHotkey(parent)
{ {
this->setShortcut(sequence, autoRegister); setShortcut(sequence, autoRegister);
} }
QHotkey::QHotkey(Qt::Key key, Qt::KeyboardModifiers modifiers, bool autoRegister, QObject *parent) : QHotkey::QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister, QObject *parent) :
QHotkey(parent) QHotkey(parent)
{ {
this->setShortcut(key, modifiers, autoRegister); setShortcut(keyCode, modifiers, autoRegister);
} }
QHotkey::QHotkey(const QHotkey::NativeShortcut &shortcut, bool autoRegister, QObject *parent) : QHotkey::QHotkey(const QHotkey::NativeShortcut &shortcut, bool autoRegister, QObject *parent) :
QHotkey(parent) QHotkey(parent)
{ {
this->setNativeShortcut(shortcut, autoRegister); setNativeShortcut(shortcut, autoRegister);
} }
QHotkey::~QHotkey() QHotkey::~QHotkey()
{ {
if(this->registered) if(_registered)
QHotkeyPrivate::instance()->removeShortcut(this); QHotkeyPrivate::instance()->removeShortcut(this);
} }
QKeySequence QHotkey::shortcut() const QKeySequence QHotkey::shortcut() const
{ {
if(this->key == Qt::Key_unknown) if(_keyCode == Qt::Key_unknown)
return QKeySequence(); return QKeySequence();
else else
return QKeySequence(this->key | this->mods); return QKeySequence(_keyCode | _modifiers);
} }
Qt::Key QHotkey::keyCode() const Qt::Key QHotkey::keyCode() const
{ {
return this->key; return _keyCode;
} }
Qt::KeyboardModifiers QHotkey::modifiers() const Qt::KeyboardModifiers QHotkey::modifiers() const
{ {
return this->mods; return _modifiers;
} }
QHotkey::NativeShortcut QHotkey::currentNativeShortcut() const QHotkey::NativeShortcut QHotkey::currentNativeShortcut() const
{ {
return this->nativeShortcut; return _nativeShortcut;
} }
bool QHotkey::isRegistered() const bool QHotkey::isRegistered() const
{ {
return this->registered; return _registered;
} }
bool QHotkey::setShortcut(const QKeySequence &shortcut, bool autoRegister) bool QHotkey::setShortcut(const QKeySequence &shortcut, bool autoRegister)
{ {
if(shortcut.isEmpty()) { if(shortcut.isEmpty()) {
return this->resetShortcut(); return resetShortcut();
} else if(shortcut.count() > 1) { } else if(shortcut.count() > 1) {
qCWarning(logQHotkey, "Keysequences with multiple shortcuts are not allowed! " qCWarning(logQHotkey, "Keysequences with multiple shortcuts are not allowed! "
"Only the first shortcut will be used!"); "Only the first shortcut will be used!");
} }
return this->setShortcut(Qt::Key(shortcut[0] & ~Qt::KeyboardModifierMask), return setShortcut(Qt::Key(shortcut[0] & ~Qt::KeyboardModifierMask),
Qt::KeyboardModifiers(shortcut[0] & Qt::KeyboardModifierMask), Qt::KeyboardModifiers(shortcut[0] & Qt::KeyboardModifierMask),
autoRegister); autoRegister);
} }
bool QHotkey::setShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers, bool autoRegister) bool QHotkey::setShortcut(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister)
{ {
if(this->registered) { if(_registered) {
if(autoRegister) { if(autoRegister) {
if(!QHotkeyPrivate::instance()->removeShortcut(this)) if(!QHotkeyPrivate::instance()->removeShortcut(this))
return false; return false;
@@ -92,46 +92,46 @@ bool QHotkey::setShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers, bool aut
return false; return false;
} }
if(key == Qt::Key_unknown) { if(keyCode == Qt::Key_unknown) {
this->key = Qt::Key_unknown; _keyCode = Qt::Key_unknown;
this->mods = Qt::NoModifier; _modifiers = Qt::NoModifier;
this->nativeShortcut = NativeShortcut(); _nativeShortcut = NativeShortcut();
return true; return true;
} }
this->key = key; _keyCode = keyCode;
this->mods = modifiers; _modifiers = modifiers;
this->nativeShortcut = QHotkeyPrivate::instance()->nativeShortcut(key, modifiers); _nativeShortcut = QHotkeyPrivate::instance()->nativeShortcut(keyCode, modifiers);
if(this->nativeShortcut.isValid()) { if(_nativeShortcut.isValid()) {
if(autoRegister) if(autoRegister)
return QHotkeyPrivate::instance()->addShortcut(this); return QHotkeyPrivate::instance()->addShortcut(this);
else else
return true; return true;
} else { } else {
qCWarning(logQHotkey) << "Unable to map shortcut to native keys. Key:" << key << "Modifiers:" << modifiers; qCWarning(logQHotkey) << "Unable to map shortcut to native keys. Key:" << keyCode << "Modifiers:" << modifiers;
this->key = Qt::Key_unknown; _keyCode = Qt::Key_unknown;
this->mods = Qt::NoModifier; _modifiers = Qt::NoModifier;
this->nativeShortcut = NativeShortcut(); _nativeShortcut = NativeShortcut();
return false; return false;
} }
} }
bool QHotkey::resetShortcut() bool QHotkey::resetShortcut()
{ {
if(this->registered && if(_registered &&
!QHotkeyPrivate::instance()->removeShortcut(this)) { !QHotkeyPrivate::instance()->removeShortcut(this)) {
return false; return false;
} }
this->key = Qt::Key_unknown; _keyCode = Qt::Key_unknown;
this->mods = Qt::NoModifier; _modifiers = Qt::NoModifier;
this->nativeShortcut = NativeShortcut(); _nativeShortcut = NativeShortcut();
return true; return true;
} }
bool QHotkey::setNativeShortcut(QHotkey::NativeShortcut nativeShortcut, bool autoRegister) bool QHotkey::setNativeShortcut(QHotkey::NativeShortcut nativeShortcut, bool autoRegister)
{ {
if(this->registered) { if(_registered) {
if(autoRegister) { if(autoRegister) {
if(!QHotkeyPrivate::instance()->removeShortcut(this)) if(!QHotkeyPrivate::instance()->removeShortcut(this))
return false; return false;
@@ -140,27 +140,27 @@ bool QHotkey::setNativeShortcut(QHotkey::NativeShortcut nativeShortcut, bool aut
} }
if(nativeShortcut.isValid()) { if(nativeShortcut.isValid()) {
this->key = Qt::Key_unknown; _keyCode = Qt::Key_unknown;
this->mods = Qt::NoModifier; _modifiers = Qt::NoModifier;
this->nativeShortcut = nativeShortcut; _nativeShortcut = nativeShortcut;
if(autoRegister) if(autoRegister)
return QHotkeyPrivate::instance()->addShortcut(this); return QHotkeyPrivate::instance()->addShortcut(this);
else else
return true; return true;
} else { } else {
this->key = Qt::Key_unknown; _keyCode = Qt::Key_unknown;
this->mods = Qt::NoModifier; _modifiers = Qt::NoModifier;
this->nativeShortcut = NativeShortcut(); _nativeShortcut = NativeShortcut();
return true; return true;
} }
} }
bool QHotkey::setRegistered(bool registered) bool QHotkey::setRegistered(bool registered)
{ {
if(this->registered && !registered) if(_registered && !registered)
return QHotkeyPrivate::instance()->removeShortcut(this); return QHotkeyPrivate::instance()->removeShortcut(this);
else if(!this->registered && registered) { else if(!_registered && registered) {
if(!this->nativeShortcut.isValid()) if(!_nativeShortcut.isValid())
return false; return false;
else else
return QHotkeyPrivate::instance()->addShortcut(this); return QHotkeyPrivate::instance()->addShortcut(this);
@@ -181,15 +181,15 @@ QHotkeyPrivate::QHotkeyPrivate() :
QHotkeyPrivate::~QHotkeyPrivate() QHotkeyPrivate::~QHotkeyPrivate()
{ {
if(!this->shortcuts.isEmpty()) if(!shortcuts.isEmpty())
qCWarning(logQHotkey, "QHotkeyPrivate destroyed with registered shortcuts!"); qCWarning(logQHotkey) << "QHotkeyPrivate destroyed with registered shortcuts!";
if(qApp && qApp->eventDispatcher()) if(qApp && qApp->eventDispatcher())
qApp->eventDispatcher()->removeNativeEventFilter(this); qApp->eventDispatcher()->removeNativeEventFilter(this);
} }
QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcut(Qt::Key keycode, Qt::KeyboardModifiers modifiers) QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcut(Qt::Key keycode, Qt::KeyboardModifiers modifiers)
{ {
Qt::ConnectionType conType = (QThread::currentThread() == this->thread() ? Qt::ConnectionType conType = (QThread::currentThread() == thread() ?
Qt::DirectConnection : Qt::DirectConnection :
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
QHotkey::NativeShortcut res; QHotkey::NativeShortcut res;
@@ -204,10 +204,10 @@ QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcut(Qt::Key keycode, Qt::Keyb
bool QHotkeyPrivate::addShortcut(QHotkey *hotkey) bool QHotkeyPrivate::addShortcut(QHotkey *hotkey)
{ {
if(hotkey->registered) if(hotkey->_registered)
return false; return false;
Qt::ConnectionType conType = (QThread::currentThread() == this->thread() ? Qt::ConnectionType conType = (QThread::currentThread() == thread() ?
Qt::DirectConnection : Qt::DirectConnection :
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
bool res = false; bool res = false;
@@ -224,10 +224,10 @@ bool QHotkeyPrivate::addShortcut(QHotkey *hotkey)
bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey) bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey)
{ {
if(!hotkey->registered) if(!hotkey->_registered)
return false; return false;
Qt::ConnectionType conType = (QThread::currentThread() == this->thread() ? Qt::ConnectionType conType = (QThread::currentThread() == thread() ?
Qt::DirectConnection : Qt::DirectConnection :
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
bool res = false; bool res = false;
@@ -245,38 +245,43 @@ bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey)
void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut) void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut)
{ {
QMetaMethod signal = QMetaMethod::fromSignal(&QHotkey::activated); QMetaMethod signal = QMetaMethod::fromSignal(&QHotkey::activated);
for(QHotkey *hkey : this->shortcuts.values(shortcut)) for(QHotkey *hkey : shortcuts.values(shortcut))
signal.invoke(hkey, Qt::QueuedConnection); signal.invoke(hkey, Qt::QueuedConnection);
} }
bool QHotkeyPrivate::addShortcutInvoked(QHotkey *hotkey) bool QHotkeyPrivate::addShortcutInvoked(QHotkey *hotkey)
{ {
QHotkey::NativeShortcut shortcut = hotkey->nativeShortcut; QHotkey::NativeShortcut shortcut = hotkey->_nativeShortcut;
if(!this->shortcuts.contains(shortcut)) { if(!shortcuts.contains(shortcut)) {
if(!this->registerShortcut(shortcut)) if(!registerShortcut(shortcut))
return false; return false;
} }
this->shortcuts.insert(shortcut, hotkey); shortcuts.insert(shortcut, hotkey);
hotkey->registered = true; hotkey->_registered = true;
return true; return true;
} }
bool QHotkeyPrivate::removeShortcutInvoked(QHotkey *hotkey) bool QHotkeyPrivate::removeShortcutInvoked(QHotkey *hotkey)
{ {
QHotkey::NativeShortcut shortcut = hotkey->nativeShortcut; QHotkey::NativeShortcut shortcut = hotkey->_nativeShortcut;
if(this->shortcuts.remove(shortcut, hotkey) == 0) if(shortcuts.remove(shortcut, hotkey) == 0)
return false; return false;
hotkey->registered = false; hotkey->_registered = false;
emit hotkey->registeredChanged(true); emit hotkey->registeredChanged(true);
if(this->shortcuts.count(shortcut) == 0) if(shortcuts.count(shortcut) == 0)
return this->unregisterShortcut(shortcut); return unregisterShortcut(shortcut);
else else
return true; return true;
} }
QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers)
{
return {this->nativeKeycode(keycode), this->nativeModifiers(modifiers)};
}
QHotkey::NativeShortcut::NativeShortcut() : QHotkey::NativeShortcut::NativeShortcut() :
@@ -293,21 +298,21 @@ QHotkey::NativeShortcut::NativeShortcut(quint32 key, quint32 modifier) :
bool QHotkey::NativeShortcut::isValid() const bool QHotkey::NativeShortcut::isValid() const
{ {
return this->valid; return valid;
} }
bool QHotkey::NativeShortcut::operator ==(const QHotkey::NativeShortcut &other) const bool QHotkey::NativeShortcut::operator ==(const QHotkey::NativeShortcut &other) const
{ {
return (this->key == other.key) && return (key == other.key) &&
(this->modifier == other.modifier) && (modifier == other.modifier) &&
this->valid == other.valid; valid == other.valid;
} }
bool QHotkey::NativeShortcut::operator !=(const QHotkey::NativeShortcut &other) const bool QHotkey::NativeShortcut::operator !=(const QHotkey::NativeShortcut &other) const
{ {
return (this->key != other.key) || return (key != other.key) ||
(this->modifier != other.modifier) || (modifier != other.modifier) ||
this->valid != other.valid; valid != other.valid;
} }
uint qHash(const QHotkey::NativeShortcut &key) uint qHash(const QHotkey::NativeShortcut &key)
+6 -6
View File
@@ -48,7 +48,7 @@ public:
//! Constructs a hotkey with a shortcut and optionally registers it //! Constructs a hotkey with a shortcut and optionally registers it
explicit QHotkey(const QKeySequence &shortcut, bool autoRegister = false, QObject *parent = Q_NULLPTR); explicit QHotkey(const QKeySequence &shortcut, bool autoRegister = false, QObject *parent = Q_NULLPTR);
//! Constructs a hotkey with a key and modifiers and optionally registers it //! Constructs a hotkey with a key and modifiers and optionally registers it
explicit QHotkey(Qt::Key key, Qt::KeyboardModifiers modifiers, bool autoRegister = false, QObject *parent = Q_NULLPTR); explicit QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister = false, QObject *parent = Q_NULLPTR);
//! Constructs a hotkey from a native shortcut and optionally registers it //! Constructs a hotkey from a native shortcut and optionally registers it
explicit QHotkey(const NativeShortcut &shortcut, bool autoRegister = false, QObject *parent = Q_NULLPTR); explicit QHotkey(const NativeShortcut &shortcut, bool autoRegister = false, QObject *parent = Q_NULLPTR);
//! Destructor //! Destructor
@@ -73,7 +73,7 @@ public slots:
//! WRITE-Accessor for QHotkey::shortcut //! WRITE-Accessor for QHotkey::shortcut
bool setShortcut(const QKeySequence &shortcut, bool autoRegister = false); bool setShortcut(const QKeySequence &shortcut, bool autoRegister = false);
//! WRITE-Accessor for QHotkey::shortcut //! WRITE-Accessor for QHotkey::shortcut
bool setShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers, bool autoRegister = false); bool setShortcut(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister = false);
//! RESET-Accessor for QHotkey::shortcut //! RESET-Accessor for QHotkey::shortcut
bool resetShortcut(); bool resetShortcut();
@@ -88,11 +88,11 @@ signals:
void registeredChanged(bool registered); void registeredChanged(bool registered);
private: private:
Qt::Key key; Qt::Key _keyCode;
Qt::KeyboardModifiers mods; Qt::KeyboardModifiers _modifiers;
NativeShortcut nativeShortcut; NativeShortcut _nativeShortcut;
bool registered; bool _registered;
}; };
uint qHash(const QHotkey::NativeShortcut &key); uint qHash(const QHotkey::NativeShortcut &key);
+7 -7
View File
@@ -163,9 +163,9 @@ quint32 QHotkeyPrivateMac::nativeKeycode(Qt::Key keycode)
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) return k;
} }
} // for k }
} // for j }
} // for i }
return 0; return 0;
} }
@@ -196,12 +196,12 @@ bool QHotkeyPrivateMac::registerShortcut(QHotkey::NativeShortcut shortcut)
} }
EventHotKeyID hkeyID; EventHotKeyID hkeyID;
hkeyID.signature = shortcut.key; hkeyID.signature = shortcut.key;
hkeyID.id = shortcut.modifier; hkeyID.id = shortcut.modifier;
EventHotKeyRef eventRef = 0; EventHotKeyRef eventRef = 0;
OSStatus status = RegisterEventHotKey(shortcut.key, OSStatus status = RegisterEventHotKey(shortcut.key,
shortcut.modifier, shortcut.modifier,
hkeyID, hkeyID,
GetApplicationEventTarget(), GetApplicationEventTarget(),
0, 0,
+4 -9
View File
@@ -31,13 +31,12 @@ protected:
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:/*functions*/ private:
QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts;
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 inline QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers); Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers);
private:
QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts;
}; };
#define NATIVE_INSTANCE(ClassName) \ #define NATIVE_INSTANCE(ClassName) \
@@ -48,8 +47,4 @@ private:
return hotkeyPrivate;\ return hotkeyPrivate;\
} }
inline QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers) {
return {this->nativeKeycode(keycode), this->nativeModifiers(modifiers)};
}
#endif // QHOTKEY_P_H #endif // QHOTKEY_P_H
+96 -96
View File
@@ -9,35 +9,35 @@
class QHotkeyPrivateX11 : public QHotkeyPrivate class QHotkeyPrivateX11 : public QHotkeyPrivate
{ {
public: public:
// QAbstractNativeEventFilter interface // QAbstractNativeEventFilter interface
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
protected: protected:
// QHotkeyPrivate interface // QHotkeyPrivate interface
quint32 nativeKeycode(Qt::Key keycode) Q_DECL_OVERRIDE; quint32 nativeKeycode(Qt::Key keycode) Q_DECL_OVERRIDE;
quint32 nativeModifiers(Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; quint32 nativeModifiers(Qt::KeyboardModifiers modifiers) 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;
private: private:
static const QVector<quint32> specialModifiers; static const QVector<quint32> specialModifiers;
static const quint32 validModsMask; static const quint32 validModsMask;
static QString formatX11Error(Display *display, int errorCode); static QString formatX11Error(Display *display, int errorCode);
class HotkeyErrorHandler { class HotkeyErrorHandler {
public: public:
HotkeyErrorHandler(); HotkeyErrorHandler();
~HotkeyErrorHandler(); ~HotkeyErrorHandler();
static bool hasError; static bool hasError;
static QString errorString; static QString errorString;
private: private:
XErrorHandler prevHandler; XErrorHandler prevHandler;
static int handleError(Display *display, XErrorEvent *error); static int handleError(Display *display, XErrorEvent *error);
}; };
}; };
NATIVE_INSTANCE(QHotkeyPrivateX11) NATIVE_INSTANCE(QHotkeyPrivateX11)
@@ -46,104 +46,104 @@ const quint32 QHotkeyPrivateX11::validModsMask = ShiftMask | ControlMask | Mod1M
bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *message, long *result) bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
{ {
Q_UNUSED(eventType); Q_UNUSED(eventType);
Q_UNUSED(result); Q_UNUSED(result);
xcb_generic_event_t *genericEvent = static_cast<xcb_generic_event_t *>(message); xcb_generic_event_t *genericEvent = static_cast<xcb_generic_event_t *>(message);
if (genericEvent->response_type == XCB_KEY_PRESS) { if (genericEvent->response_type == XCB_KEY_PRESS) {
xcb_key_press_event_t *keyEvent = static_cast<xcb_key_press_event_t *>(message); xcb_key_press_event_t *keyEvent = static_cast<xcb_key_press_event_t *>(message);
this->activateShortcut({keyEvent->detail, keyEvent->state & QHotkeyPrivateX11::validModsMask}); this->activateShortcut({keyEvent->detail, keyEvent->state & QHotkeyPrivateX11::validModsMask});
} }
return false; return false;
} }
quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode) quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode)
{ {
KeySym keysym = XStringToKeysym(QKeySequence(keycode).toString(QKeySequence::NativeText).toLatin1().constData()); KeySym keysym = XStringToKeysym(QKeySequence(keycode).toString(QKeySequence::NativeText).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)
keysym = keycode; keysym = keycode;
else else
return 0; return 0;
} }
Display *display = QX11Info::display(); Display *display = QX11Info::display();
if(display) if(display)
return XKeysymToKeycode(QX11Info::display(), keysym); return XKeysymToKeycode(QX11Info::display(), keysym);
else else
return 0; return 0;
} }
quint32 QHotkeyPrivateX11::nativeModifiers(Qt::KeyboardModifiers modifiers) quint32 QHotkeyPrivateX11::nativeModifiers(Qt::KeyboardModifiers modifiers)
{ {
quint32 nMods = 0; quint32 nMods = 0;
if (modifiers & Qt::ShiftModifier) if (modifiers & Qt::ShiftModifier)
nMods |= ShiftMask; nMods |= ShiftMask;
if (modifiers & Qt::ControlModifier) if (modifiers & Qt::ControlModifier)
nMods |= ControlMask; nMods |= ControlMask;
if (modifiers & Qt::AltModifier) if (modifiers & Qt::AltModifier)
nMods |= Mod1Mask; nMods |= Mod1Mask;
if (modifiers & Qt::MetaModifier) if (modifiers & Qt::MetaModifier)
nMods |= Mod4Mask; nMods |= Mod4Mask;
return nMods; return nMods;
} }
bool QHotkeyPrivateX11::registerShortcut(QHotkey::NativeShortcut shortcut) bool QHotkeyPrivateX11::registerShortcut(QHotkey::NativeShortcut shortcut)
{ {
Display *display = QX11Info::display(); Display *display = QX11Info::display();
if(!display) if(!display)
return false; return false;
HotkeyErrorHandler errorHandler; HotkeyErrorHandler errorHandler;
for(quint32 specialMod : QHotkeyPrivateX11::specialModifiers) { for(quint32 specialMod : QHotkeyPrivateX11::specialModifiers) {
XGrabKey(display, XGrabKey(display,
shortcut.key, shortcut.key,
shortcut.modifier | specialMod, shortcut.modifier | specialMod,
DefaultRootWindow(display), DefaultRootWindow(display),
True, True,
GrabModeAsync, GrabModeAsync,
GrabModeAsync); GrabModeAsync);
} }
if(errorHandler.hasError) { if(errorHandler.hasError) {
qCWarning(logQHotkey) << "[QHotkey] Failed to register hotkey. Error:" qCWarning(logQHotkey) << "Failed to register hotkey. Error:"
<< qPrintable(errorHandler.errorString); << qPrintable(errorHandler.errorString);
this->unregisterShortcut(shortcut); this->unregisterShortcut(shortcut);
return false; return false;
} else } else
return true; return true;
} }
bool QHotkeyPrivateX11::unregisterShortcut(QHotkey::NativeShortcut shortcut) bool QHotkeyPrivateX11::unregisterShortcut(QHotkey::NativeShortcut shortcut)
{ {
Display *display = QX11Info::display(); Display *display = QX11Info::display();
if(!display) if(!display)
return false; return false;
HotkeyErrorHandler errorHandler; HotkeyErrorHandler errorHandler;
for(quint32 specialMod : QHotkeyPrivateX11::specialModifiers) { for(quint32 specialMod : QHotkeyPrivateX11::specialModifiers) {
XUngrabKey(display, XUngrabKey(display,
shortcut.key, shortcut.key,
shortcut.modifier | specialMod, shortcut.modifier | specialMod,
DefaultRootWindow(display)); DefaultRootWindow(display));
} }
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); this->unregisterShortcut(shortcut);
return false; return false;
} else } else
return true; return true;
} }
QString QHotkeyPrivateX11::formatX11Error(Display *display, int errorCode) QString QHotkeyPrivateX11::formatX11Error(Display *display, int errorCode)
{ {
char errStr[256]; char errStr[256];
XGetErrorText(display, errorCode, errStr, 256); XGetErrorText(display, errorCode, errStr, 256);
return QString::fromLatin1(errStr); return QString::fromLatin1(errStr);
} }
@@ -155,27 +155,27 @@ QString QHotkeyPrivateX11::HotkeyErrorHandler::errorString;
QHotkeyPrivateX11::HotkeyErrorHandler::HotkeyErrorHandler() QHotkeyPrivateX11::HotkeyErrorHandler::HotkeyErrorHandler()
{ {
this->prevHandler = XSetErrorHandler(&HotkeyErrorHandler::handleError); this->prevHandler = XSetErrorHandler(&HotkeyErrorHandler::handleError);
} }
QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler() QHotkeyPrivateX11::HotkeyErrorHandler::~HotkeyErrorHandler()
{ {
XSetErrorHandler(this->prevHandler); XSetErrorHandler(this->prevHandler);
} }
int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error) int QHotkeyPrivateX11::HotkeyErrorHandler::handleError(Display *display, XErrorEvent *error)
{ {
switch (error->error_code) { switch (error->error_code) {
case BadAccess: case BadAccess:
case BadValue: case BadValue:
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; HotkeyErrorHandler::hasError = true;
HotkeyErrorHandler::errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code); HotkeyErrorHandler::errorString = QHotkeyPrivateX11::formatX11Error(display, error->error_code);
return 1; return 1;
} }
default: default:
return 0; return 0;
} }
} }
-3
View File
@@ -18,6 +18,3 @@ mac {
} }
INCLUDEPATH += $$PWD/QHotkey INCLUDEPATH += $$PWD/QHotkey
DISTFILES += \
$$PWD/QHotkey/qhotkey.pri