diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-12 16:16:24 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-13 09:22:56 +1000 |
| commit | 488d45295105daf10ccd17ca93ae6a6f4d0104f1 (patch) | |
| tree | 4bfc650942bf5f33b0b4afaf85d7d8a5bdf520c5 | |
| parent | 1e470645983ad18fa38c0885d674bc9d1dc1e560 (diff) | |
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.
| -rw-r--r-- | dix/events.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dix/events.c b/dix/events.c index ba90ff1ea..e6a3fbff8 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, |