summaryrefslogtreecommitdiff
authorPeter Hutterer <peter.hutterer@who-t.net>2009-01-12 06:16:24 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2009-01-12 23:22:56 (GMT)
commit488d45295105daf10ccd17ca93ae6a6f4d0104f1 (patch) (side-by-side diff)
tree4bfc650942bf5f33b0b4afaf85d7d8a5bdf520c5
parent1e470645983ad18fa38c0885d674bc9d1dc1e560 (diff)
downloadxserver-488d45295105daf10ccd17ca93ae6a6f4d0104f1.zip
xserver-488d45295105daf10ccd17ca93ae6a6f4d0104f1.tar.gz
dix: EnqueueEvent and PlayReleasedEvent need to handle DeviceMotionNotifies
No MotionNotify events in the processing anymore, so let's have them treat DMN instead. Reported by Thomas Jaeger.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--dix/events.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dix/events.c b/dix/events.c
index ba90ff1..e6a3fbf 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1157,14 +1157,14 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
* the data that GetCurrentRootWindow relies on hasn't been
* updated yet.
*/
- if (xE->u.u.type == MotionNotify)
+ if (xE->u.u.type == DeviceMotionNotify)
XE_KBPTR.root =
WindowTable[pSprite->hotPhys.pScreen->myNum]->drawable.id;
eventinfo.events = xE;
eventinfo.count = count;
CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
}
- if (xE->u.u.type == MotionNotify)
+ if (xE->u.u.type == DeviceMotionNotify)
{
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
@@ -1178,7 +1178,7 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
pSprite->hotPhys.y = XE_KBPTR.rootY;
/* do motion compression, but not if from different devices */
if (tail &&
- (tail->event->u.u.type == MotionNotify) &&
+ (tail->event->u.u.type == DeviceMotionNotify) &&
(tail->device == device) &&
(tail->pScreen == pSprite->hotPhys.pScreen))
{
@@ -1245,7 +1245,7 @@ PlayReleasedEvents(void)
pDev = qe->device;
if (*syncEvents.pendtail == *prev)
syncEvents.pendtail = prev;
- if (qe->event->u.u.type == MotionNotify)
+ if (qe->event->u.u.type == DeviceMotionNotify)
CheckVirtualMotion(pDev, qe, NullWindow);
syncEvents.time.months = qe->months;
/* XXX: Hack! We can't reliably get the time from GenericEvents,