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

dix: GetPairedDevice: return dev paired with master for slave devices.

This commit is contained in:
Peter Hutterer 2007-10-16 13:09:35 +09:30
parent 6c259a08d9
commit 840bde3d32
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/devices.c
View File

@ -2268,11 +2268,17 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
return Success; return Success;
} }
/* Return the device paired with the given device or NULL. /**
* Return the device paired with the given device or NULL.
* Returns the device paired with the parent master if the given device is a
* slave device.
*/ */
_X_EXPORT DeviceIntPtr _X_EXPORT DeviceIntPtr
GetPairedDevice(DeviceIntPtr dev) GetPairedDevice(DeviceIntPtr dev)
{ {
if (!dev->isMaster && dev->master)
dev = dev->master;
if (!dev->spriteInfo->paired) if (!dev->spriteInfo->paired)
{ {
ErrorF("[dix] No device paired with %d (%s).\n", ErrorF("[dix] No device paired with %d (%s).\n",