Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4952 from Chocobozzz/qt5 

Fix media global shortcuts which don't work
This commit is contained in:
John Maguire 2015-07-14 10:36:39 +01:00
parent 66e50f654d 947f7a132e
commit 00f8e5b608
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
3rdparty/qxt/qxtglobalshortcut_x11.cpp vendored
View File

@ -38,6 +38,7 @@
#endif
#include <QVector>
#include <X11/Xlib.h>
#include "keymapper_x11.h"
namespace {
@ -214,15 +215,30 @@ quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifier
quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key)
{
QxtX11Data x11;
if (!x11.isValid())
return 0;
// (davidsansome) Try the table from QKeyMapper first - this seems to be
// the only way to get Keysyms for the media keys.
unsigned int keysym = 0;
int i = 0;
while (KeyTbl[i]) {
if (KeyTbl[i+1] == static_cast<uint>(key)) {
keysym = KeyTbl[i];
break;
}
i += 2;
}
KeySym keysym = XStringToKeysym(QKeySequence(key).toString().toLatin1().data());
// If that didn't work then fall back on XStringToKeysym
if (!keysym) {
keysym = XStringToKeysym(QKeySequence(key).toString().toLatin1().data());
if (keysym == NoSymbol)
keysym = static_cast<ushort>(key);
keysym = static_cast<ushort>(key);
}
return XKeysymToKeycode(x11.display(), keysym);
QxtX11Data x11;
if (!x11.isValid())
return 0;
return XKeysymToKeycode(x11.display(), keysym);
}
bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods)