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 /hw | |
| 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 'hw')
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 23 | ||||
| -rw-r--r-- | hw/xnest/Events.c | 3 |
2 files changed, 5 insertions, 21 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 2cb1441db..422d43d4d 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -47,7 +47,6 @@ */ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ -#ifdef MPX /* * MPX additions: * Copyright © 2006 Peter Hutterer @@ -55,7 +54,6 @@ * Author: Peter Hutterer <peter@cs.unisa.edu.au> * */ -#endif #ifdef HAVE_XORG_CONFIG_H @@ -144,12 +142,10 @@ xf86ProcessCommonOptions(LocalDevicePtr local, xf86Msg(X_CONFIG, "%s: always reports core events\n", local->name); } -#ifdef MPX if (xf86SetBoolOption(list, "IsMPDevice", 0)) { local->flags |= XI86_MP_DEVICE; xf86Msg(X_CONFIG, "%s: is MP device\n", local->name); } -#endif if (xf86SetBoolOption(list, "SendDragEvents", 1)) { local->flags |= XI86_SEND_DRAG_EVENTS; @@ -214,12 +210,9 @@ xf86ActivateDevice(LocalDevicePtr local) xf86XinputFinalizeInit(dev); dev->coreEvents = local->flags & XI86_ALWAYS_CORE; -#ifdef MPX - if (local->flags & XI86_MP_DEVICE) - dev->isMPDev = TRUE; - else - dev->isMPDev = FALSE; -#endif + dev->isMPDev = (local->flags & XI86_MP_DEVICE); + InitSprite(dev, dev->isMPDev); + RegisterOtherDevice(dev); if (serverGeneration == 1) @@ -466,11 +459,6 @@ xf86PostMotionEvent(DeviceIntPtr device, else flags = POINTER_RELATIVE | POINTER_ACCELERATE; -#ifdef MPX - if (device->isMPDev) - flags |= POINTER_MULTIPOINTER; -#endif - valuators = xcalloc(sizeof(int), num_valuators); va_start(var, num_valuators); @@ -543,11 +531,6 @@ xf86PostButtonEvent(DeviceIntPtr device, else flags = POINTER_RELATIVE; -#ifdef MPX - if (device->isMPDev) - flags |= POINTER_MULTIPOINTER; -#endif - valuators = xcalloc(sizeof(int), num_valuators); va_start(var, num_valuators); diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index a20924128..8f794edcc 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -25,6 +25,7 @@ is" without express or implied warranty. #include "scrnintstr.h" #include "windowstr.h" #include "servermd.h" +#include "inputstr.h" #include "mi.h" @@ -183,7 +184,7 @@ xnestCollectEvents() if (X.xcrossing.detail != NotifyInferior) { pScreen = xnestScreen(X.xcrossing.window); if (pScreen) { - NewCurrentScreen(pScreen, X.xcrossing.x, X.xcrossing.y); + NewCurrentScreen(inputInfo.pointer, pScreen, X.xcrossing.x, X.xcrossing.y); valuators[0] = X.xcrossing.x; valuators[1] = X.xcrossing.y; lastEventTime = GetTimeInMillis(); |