From ffbeaa25e0290fa0f974e4e1b4697003c4058187 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Sat, 26 Feb 2011 00:37:49 -0800
Subject: XInput 2.0 support

---
 src/mumble/GlobalShortcut_unix.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/mumble/GlobalShortcut_unix.h')

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();
-- 
cgit v1.2.3