diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2006-12-11 18:09:59 +1030 |
|---|---|---|
| committer | Peter Hutterer <whot@hyena.localdomain> | 2006-12-11 18:09:59 +1030 |
| commit | ae3c24da34cd8eeb77a6389861856fd51e0841f5 (patch) | |
| tree | 6565b6456d8dc51cb5b43bedb4a2b698fb093785 /dix/getevents.c | |
| parent | eb1d9f51af19dab20a95c2830ca1c508d8ee66bb (diff) | |
dix: Moving SpriteRec into DeviceIntRec
removing global sprite structure
beginning to remove MPX ifdefs
xnest: Fix to make xnest compile again
Diffstat (limited to 'dix/getevents.c')
| -rw-r--r-- | dix/getevents.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 0932a1a23..f223f2918 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -488,11 +488,6 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, * The DDX is responsible for allocating the event structure in the first * place via GetMaximumEventsNum(), and for freeing it. */ -#ifdef MPX - /* In MPX, flags can be set to POINTER_MULTIPOINTER to indicate that the - * device is a multipointer device. MP devices always send core events. - */ -#endif _X_EXPORT int GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, int flags, int first_valuator, int num_valuators, @@ -543,7 +538,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, kbp->deviceid = pDev->id; #ifdef MPX - if (flags & POINTER_MULTIPOINTER) + if (pDev->isMPDev) pointer = pDev; else #endif @@ -604,7 +599,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators); #ifdef MPX - if (flags & POINTER_MULTIPOINTER) + if (pDev->isMPDev) { // noop, just less intrusive to fit MPX in like that } else @@ -800,7 +795,11 @@ SwitchCorePointer(DeviceIntPtr pDev) * to shift the pointer to get it inside the new bounds. */ void -PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time) +PostSyntheticMotion(DeviceIntPtr pDev, + int x, + int y, + ScreenPtr pScreen, + unsigned long time) { xEvent xE; @@ -820,5 +819,5 @@ PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time) xE.u.keyButtonPointer.rootY = y; xE.u.keyButtonPointer.time = time; - (*inputInfo.pointer->public.processInputProc)(&xE, inputInfo.pointer, 1); + (*pDev->public.processInputProc)(&xE, pDev, 1); } |