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

dix: send presence events when floating and unfloating SDs

This commit is contained in:
Peter Hutterer 2009-03-12 10:42:05 +10:00
parent c9483a53be
commit 8634e1bcba
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dix/devices.c
View File

@ -2198,11 +2198,23 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
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;
dev->spriteInfo->paired = master; dev->spriteInfo->paired = master;
dev->spriteInfo->spriteOwner = FALSE; dev->spriteInfo->spriteOwner = FALSE;
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