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

xfree86: NIDR: don't call PairDevices explicitly.

Browse Source 
set isMaster to FALSE explicitly.

Pairing isn't necessary, attachment should be done in EnableDevices.
This commit is contained in:
Peter Hutterer 2007-10-16 18:23:48 +09:30
parent 5eb033835e
commit 5fe9bfd23f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Xinput.c
View File

@ -172,6 +172,7 @@ xf86ActivateDevice(LocalDevicePtr local)
local->dev = dev;
dev->coreEvents = local->flags & XI86_ALWAYS_CORE;
dev->isMaster = FALSE;
dev->spriteInfo->spriteOwner = FALSE;
if (DeviceIsPointerType(dev))
@ -447,9 +448,6 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
(!is_auto || xf86Info.autoEnableDevices))
EnableDevice(dev);
if (!IsPointerDevice(dev))
PairDevices(NULL, GuessFreePointerDevice(), dev);
/* send enter/leave event, update sprite window */
CheckMotion(NULL, dev);