xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default

to MP devices.

Xi:	Adding QueryDevicePointer request/reply
	Adding WarpDevicePointer request/reply
This commit is contained in:
Peter Hutterer 2006-12-20 13:05:53 +10:30 • committed by Peter Hutterer
commit 202b46eb6b
13 changed files with 493 additions and 15 deletions

View file

@ -434,9 +434,9 @@ xf86WarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{
int sigstate;
sigstate = xf86BlockSIGIO ();
miPointerWarpCursor(pDev, pScreen,x,y);
miPointerWarpCursor(pDev, pScreen, x, y);
xf86Info.currentScreen = pScreen;
xf86Info.currentScreen = pScreen;
xf86UnblockSIGIO (sigstate);
}

View file

@ -132,10 +132,10 @@ xf86ProcessCommonOptions(LocalDevicePtr local,
xf86Msg(X_CONFIG, "%s: always reports core events\n", local->name);
}
if (xf86SetBoolOption(list, "IsMPDevice", 0)) {
local->flags |= XI86_MP_DEVICE;
xf86Msg(X_CONFIG, "%s: is MP device\n", local->name);
}
if (xf86SetBoolOption(list, "SharedPointer", 0)) {
local->flags &= ~XI86_SHARED_POINTER;
xf86Msg(X_CONFIG, "%s: is shared device\n", local->name);
}
if (xf86SetBoolOption(list, "SendDragEvents", 1)) {
local->flags |= XI86_SEND_DRAG_EVENTS;
@ -171,7 +171,7 @@ xf86ActivateDevice(LocalDevicePtr local)
local->dev = dev;
dev->coreEvents = local->flags & XI86_ALWAYS_CORE;
dev->isMPDev = (local->flags & XI86_MP_DEVICE);
dev->isMPDev = !(local->flags & XI86_SHARED_POINTER);
InitSprite(dev, dev->isMPDev);
RegisterOtherDevice(dev);

View file

@ -82,7 +82,7 @@
#define XI86_CORE_KEYBOARD 0x20 /* device is the core keyboard */
#define XI86_POINTER_CAPABLE 0x40 /* capable of being a core pointer */
#define XI86_KEYBOARD_CAPABLE 0x80 /* capable of being a core keyboard */
#define XI86_MP_DEVICE 0x100 /* device is multipointer device */
#define XI86_SHARED_POINTER 0x100 /* device shares core cursor */
#define XI_PRIVATE(dev) \
(((LocalDevicePtr)((dev)->public.devicePrivate))->private)