diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-02-26 11:37:49 +0300 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-02-26 11:37:49 +0300 |
| commit | ffbeaa25e0290fa0f974e4e1b4697003c4058187 (patch) | |
| tree | 8ff659b43119b8fd3fbda3301e7a3610d09ecd7c /src/mumble/GlobalShortcut_unix.h | |
| parent | fcc8c2b759791a82ffeb291c81de7a165a638f69 (diff) | |
XInput 2.0 support
Diffstat (limited to 'src/mumble/GlobalShortcut_unix.h')
| -rw-r--r-- | src/mumble/GlobalShortcut_unix.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h index 3a73b11d1..014567978 100644 --- a/src/mumble/GlobalShortcut_unix.h +++ b/src/mumble/GlobalShortcut_unix.h @@ -35,7 +35,7 @@ #include <QX11Info> #include <X11/X.h> #include <X11/Xlib.h> -#include <X11/extensions/XInput.h> +#include <X11/extensions/XInput2.h> #include <X11/Xutil.h> #ifdef Q_OS_LINUX #include <linux/input.h> @@ -48,15 +48,13 @@ class GlobalShortcutX : public GlobalShortcutEngine { private: Q_OBJECT Q_DISABLE_COPY(GlobalShortcutX) - QMap<QSocketNotifier *, Display *> startScreensConnection(Display *); public: Display *display; + QSet<Window> qsRootWindows; + int iXIopcode; volatile bool bRunning; - QMap<QSocketNotifier *, Display *> qmConnections; - bool bXInput; QSet<QString> qsKeyboards; QMap<QString, QFile *> qmInputDevices; - QMap<Display *, QMap<XID, XDevice *> *> qmXDevices; GlobalShortcutX(); ~GlobalShortcutX(); |