From a5be65401769fabcb5001dc63035c69f9e4a2712 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 27 Oct 2006 01:25:21 +0300
Subject: [PATCH] mieqEnqueue: only compare DEVICE_BITS of deviceid Only
 compare DEVICE_BITS of the two deviceids, so we don't decide that a valuator
 event isn't for us, because (id | MORE_EVENTS) != id.

---
 mi/mieq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mi/mieq.c b/mi/mieq.c
index 63cd6e1cd..be76580ae 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -117,7 +117,8 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
             !(lastkbp->type == DeviceMotionNotify ||
               lastkbp->type == DeviceButtonPress ||
               lastkbp->type == DeviceButtonRelease) ||
-            (lastkbp->deviceid != v->deviceid)) {
+            ((lastkbp->deviceid & DEVICE_BITS) !=
+             (v->deviceid & DEVICE_BITS))) {
             ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");
             return;
         }