From 7348bf4935c8887bca33fe340ac2548f551bee3d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun, 7 Jun 2009 09:25:51 +1000
Subject: [PATCH] dix: set the generic event type for implicit XI2 grabs.

event->type is always GenericEvent for XI2 events. Instead, XI_ButtonPress
(the generic event's evtype must be stored.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 dix/events.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dix/events.c b/dix/events.c
index 538d6fd32..ffeb449b8 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2093,7 +2093,10 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
         else if (type == DeviceButtonPress)
             tempGrab.grabtype = GRABTYPE_XI;
         else
+        {
+            tempGrab.type = ((xGenericEvent*)pEvents)->evtype;
             tempGrab.grabtype = GRABTYPE_XI2;
+        }
 
         /* get the XI and XI2 device mask */
         inputMasks = wOtherInputMasks(pWin);