diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-07 15:49:06 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-07 15:49:06 +0000 |
| commit | 25b9dbb15f0dc98cfc6b5585e7efebf3250f64d3 (patch) | |
| tree | 93007a6f77999699b0077f448c08b3d505662f55 /xorg-server/mi/mieq.c | |
| parent | c82036153f9273a6041426fb98e69fff0806680e (diff) | |
| download | vcxsrv-25b9dbb15f0dc98cfc6b5585e7efebf3250f64d3.tar.gz vcxsrv-25b9dbb15f0dc98cfc6b5585e7efebf3250f64d3.tar.bz2 vcxsrv-25b9dbb15f0dc98cfc6b5585e7efebf3250f64d3.zip | |
xserver pixman git update 7-12-2010
Diffstat (limited to 'xorg-server/mi/mieq.c')
| -rw-r--r-- | xorg-server/mi/mieq.c | 9 |
1 files changed, 8 insertions, 1 deletions
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");
|