andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: EnqueueEvent and PlayReleasedEvent need to handle DeviceMotionNotifies

Browse Source 
No MotionNotify events in the processing anymore, so let's have them treat DMN
instead.

Reported by Thomas Jaeger.
This commit is contained in:
Peter Hutterer 2009-01-12 16:16:24 +10:00
parent 1e47064598
commit 488d452951
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/events.c
View File

@ -1157,14 +1157,14 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
* the data that GetCurrentRootWindow relies on hasn't been * the data that GetCurrentRootWindow relies on hasn't been
* updated yet. * updated yet.
*/ */
if (xE->u.u.type == MotionNotify) if (xE->u.u.type == DeviceMotionNotify)
XE_KBPTR.root = XE_KBPTR.root =
WindowTable[pSprite->hotPhys.pScreen->myNum]->drawable.id; WindowTable[pSprite->hotPhys.pScreen->myNum]->drawable.id;
eventinfo.events = xE; eventinfo.events = xE;
eventinfo.count = count; eventinfo.count = count;
CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo); CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
} }
if (xE->u.u.type == MotionNotify) if (xE->u.u.type == DeviceMotionNotify)
{ {
#ifdef PANORAMIX #ifdef PANORAMIX
if(!noPanoramiXExtension) { if(!noPanoramiXExtension) {
@ -1178,7 +1178,7 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
pSprite->hotPhys.y = XE_KBPTR.rootY; pSprite->hotPhys.y = XE_KBPTR.rootY;
/* do motion compression, but not if from different devices */ /* do motion compression, but not if from different devices */
if (tail && if (tail &&
(tail->event->u.u.type == MotionNotify) && (tail->event->u.u.type == DeviceMotionNotify) &&
(tail->device == device) && (tail->device == device) &&
(tail->pScreen == pSprite->hotPhys.pScreen)) (tail->pScreen == pSprite->hotPhys.pScreen))
{ {
@ -1245,7 +1245,7 @@ PlayReleasedEvents(void)
pDev = qe->device; pDev = qe->device;
if (*syncEvents.pendtail == *prev) if (*syncEvents.pendtail == *prev)
syncEvents.pendtail = prev; syncEvents.pendtail = prev;
if (qe->event->u.u.type == MotionNotify) if (qe->event->u.u.type == DeviceMotionNotify)
CheckVirtualMotion(pDev, qe, NullWindow); CheckVirtualMotion(pDev, qe, NullWindow);
syncEvents.time.months = qe->months; syncEvents.time.months = qe->months;
/* XXX: Hack! We can't reliably get the time from GenericEvents, /* XXX: Hack! We can't reliably get the time from GenericEvents,