xfree86: NIDR: don't call PairDevices explicitly.
set isMaster to FALSE explicitly. Pairing isn't necessary, attachment should be done in EnableDevices.
This commit is contained in:
parent
5eb033835e
commit
5fe9bfd23f
|
@ -172,6 +172,7 @@ xf86ActivateDevice(LocalDevicePtr local)
|
||||||
local->dev = dev;
|
local->dev = dev;
|
||||||
|
|
||||||
dev->coreEvents = local->flags & XI86_ALWAYS_CORE;
|
dev->coreEvents = local->flags & XI86_ALWAYS_CORE;
|
||||||
|
dev->isMaster = FALSE;
|
||||||
dev->spriteInfo->spriteOwner = FALSE;
|
dev->spriteInfo->spriteOwner = FALSE;
|
||||||
|
|
||||||
if (DeviceIsPointerType(dev))
|
if (DeviceIsPointerType(dev))
|
||||||
|
@ -447,9 +448,6 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
|
||||||
(!is_auto || xf86Info.autoEnableDevices))
|
(!is_auto || xf86Info.autoEnableDevices))
|
||||||
EnableDevice(dev);
|
EnableDevice(dev);
|
||||||
|
|
||||||
if (!IsPointerDevice(dev))
|
|
||||||
PairDevices(NULL, GuessFreePointerDevice(), dev);
|
|
||||||
|
|
||||||
/* send enter/leave event, update sprite window */
|
/* send enter/leave event, update sprite window */
|
||||||
CheckMotion(NULL, dev);
|
CheckMotion(NULL, dev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user