From 2cd986337d28f5faf86f6d77152adf28ba242974 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Sun, 27 Feb 2011 05:32:50 +0100
Subject: Work around broken XI2 master devices

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

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

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