From d679cf70a79aa53e823f4fa51a7ab19837f26525 Mon Sep 17 00:00:00 2001
From: Tom Jaeger <ThJaeger@gmail.com>
Date: Mon, 8 Dec 2008 11:38:12 +1000
Subject: [PATCH] Xi: XIGetDevice needs to ignore the MORE_EVENTS flag.

Reported in X.Org Bug 18882, Comment 5.
<http://bugs.freedesktop.org/show_bug.cgi?id=18882>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 78a62d7713c708d067d8824ec41b0a0225c1997f)

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 Xi/exevents.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 00a6b2151..a976802a2 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -150,7 +150,7 @@ XIGetDevice(xEvent* xE)
         int rc;
         int id;
 
-        id = ((deviceKeyButtonPointer*)xE)->deviceid;
+        id = ((deviceKeyButtonPointer*)xE)->deviceid & ~MORE_EVENTS;
 
         rc = dixLookupDevice(&pDev, id, serverClient, DixUnknownAccess);
         if (rc != Success)