dix: don't send presence events for attaching/detaching slave devices.
The code that didn't list attached slave devices for XI1 clients doesn't exist anymore, so there's no need for these presence events. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
0c0ef42292
commit
2c535b6f13
|
@ -2391,11 +2391,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
|
||||||
InitializeSprite(dev, currentRoot);
|
InitializeSprite(dev, currentRoot);
|
||||||
dev->spriteInfo->spriteOwner = FALSE;
|
dev->spriteInfo->spriteOwner = FALSE;
|
||||||
dev->spriteInfo->paired = dev;
|
dev->spriteInfo->paired = dev;
|
||||||
|
|
||||||
/* Floating an SD makes it appear to XI 1 clients */
|
|
||||||
SendDevicePresenceEvent(dev->id, DeviceAdded);
|
|
||||||
if (dev->enabled)
|
|
||||||
SendDevicePresenceEvent(dev->id, DeviceEnabled);
|
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
dev->spriteInfo->sprite = master->spriteInfo->sprite;
|
dev->spriteInfo->sprite = master->spriteInfo->sprite;
|
||||||
|
@ -2403,14 +2398,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
|
||||||
dev->spriteInfo->spriteOwner = FALSE;
|
dev->spriteInfo->spriteOwner = FALSE;
|
||||||
|
|
||||||
RecalculateMasterButtons(master);
|
RecalculateMasterButtons(master);
|
||||||
|
|
||||||
if (!oldmaster)
|
|
||||||
{
|
|
||||||
/* Attaching a floating SD makes it disappear to XI 1 clients */
|
|
||||||
if (dev->enabled)
|
|
||||||
SendDevicePresenceEvent(dev->id, DeviceDisabled);
|
|
||||||
SendDevicePresenceEvent(dev->id, DeviceRemoved);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we were connected to master device before, this MD may need to
|
/* If we were connected to master device before, this MD may need to
|
||||||
|
|
Loading…
Reference in New Issue
Block a user