From 25b9dbb15f0dc98cfc6b5585e7efebf3250f64d3 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 7 Dec 2010 15:49:06 +0000
Subject: xserver pixman git update 7-12-2010

---
 xorg-server/mi/mieq.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'xorg-server/mi/mieq.c')

diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c
index 58db72968..974bec77d 100644
--- a/xorg-server/mi/mieq.c
+++ b/xorg-server/mi/mieq.c
@@ -320,6 +320,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
 {
     DeviceIntPtr mdev;
     int len = original->any.length;
+    int type = original->any.type;
 
     CHECKEVENT(original);
 
@@ -327,7 +328,12 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     if (!sdev || !sdev->u.master)
         return NULL;
 
-    switch(original->any.type)
+#if XFreeXDGA
+    if (type == ET_DGAEvent)
+        type = original->dga_event.subtype;
+#endif
+
+    switch(type)
     {
         case ET_KeyPress:
         case ET_KeyRelease:
@@ -444,6 +450,7 @@ mieqProcessInputEvents(void)
             event_size = evlen;
           }
 
+
         if (!event)
             FatalError("[mi] No memory left for event processing.\n");
 
-- 
cgit v1.2.3