From 3e07e73fefc100e491d1e465cb162373d1d82425 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 16 Oct 2007 11:34:29 +0930 Subject: [PATCH] dix: remove pairing/attachment from InitAndStartDevices. If we enabled in the correct order, this has all been done already. --- dix/devices.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 7be0d6941..f886120cc 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -215,7 +215,10 @@ EnableDevice(DeviceIntPtr dev) { /* Sprites appear on first root window, so we can hardcode it */ if (dev->spriteInfo->spriteOwner) + { InitializeSprite(dev, WindowTable[0]); + ((FocusSemaphoresPtr)(WindowTable[0])->devPrivates[FocusPrivatesIndex].ptr)->enterleave++; + } else if ((other = NextFreePointerDevice()) == NULL) { ErrorF("[dix] cannot find pointer to pair with. " @@ -596,23 +599,6 @@ InitAndStartDevices(WindowPtr root) (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; }