diff options
author | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-02-27 07:32:50 +0300 |
---|---|---|
committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-02-27 07:32:50 +0300 |
commit | 2cd986337d28f5faf86f6d77152adf28ba242974 (patch) | |
tree | 4834166beb85e95468cc9f91c7efbe280a4ffacb /src/mumble/GlobalShortcut_unix.h | |
parent | 4774dab0bf186539d8a874d913ae5f66d900999c (diff) |
Work around broken XI2 master devices
Diffstat (limited to 'src/mumble/GlobalShortcut_unix.h')
-rw-r--r-- | src/mumble/GlobalShortcut_unix.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h index 014567978..c902ea6a2 100644 --- a/src/mumble/GlobalShortcut_unix.h +++ b/src/mumble/GlobalShortcut_unix.h @@ -52,6 +52,8 @@ class GlobalShortcutX : public GlobalShortcutEngine { Display *display; QSet<Window> qsRootWindows; int iXIopcode; + QSet<int> qsMasterDevices; + volatile bool bRunning; QSet<QString> qsKeyboards; QMap<QString, QFile *> qmInputDevices; @@ -61,9 +63,7 @@ class GlobalShortcutX : public GlobalShortcutEngine { void run(); QString buttonName(const QVariant &); - int iKeyPress, iKeyRelease, iButtonPress, iButtonRelease; - - void initXInput(Display *); + void queryXIMasterList(); public slots: void displayReadyRead(int); void inputReadyRead(int); |