frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: remove pairing/attachment from InitAndStartDevices. 

If we enabled in the correct order, this has all been done already.
This commit is contained in:
Peter Hutterer 2007-10-16 11:34:29 +09:30
parent 38baac71bd
commit 3e07e73fef
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dix/devices.c
View File

@ -215,7 +215,10 @@ EnableDevice(DeviceIntPtr dev)
{ {
/* Sprites appear on first root window, so we can hardcode it */ /* Sprites appear on first root window, so we can hardcode it */
if (dev->spriteInfo->spriteOwner) if (dev->spriteInfo->spriteOwner)
{
InitializeSprite(dev, WindowTable[0]); InitializeSprite(dev, WindowTable[0]);
((FocusSemaphoresPtr)(WindowTable[0])->devPrivates[FocusPrivatesIndex].ptr)->enterleave++;
}
else if ((other = NextFreePointerDevice()) == NULL) else if ((other = NextFreePointerDevice()) == NULL)
{ {
ErrorF("[dix] cannot find pointer to pair with. " ErrorF("[dix] cannot find pointer to pair with. "
@ -596,23 +599,6 @@ InitAndStartDevices(WindowPtr root)
(void)EnableDevice(dev); (void)EnableDevice(dev);
} }
/* All of the devices are started up now. Pair VCK with VCP, then
* attach each device to the initial master.
*/
PairDevices(NULL, inputInfo.pointer, inputInfo.keyboard);
for (dev = inputInfo.devices; dev; dev = dev->next)
{
if (!DevHasCursor(dev))
AttachDevice(NULL, dev, inputInfo.keyboard);
else
{
AttachDevice(NULL, dev, inputInfo.pointer);
/* enter/leave counter on root window */
((FocusSemaphoresPtr)root->devPrivates[FocusPrivatesIndex].ptr)->enterleave++;
}
}
return Success; return Success;
} }