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

dix: Set bidirectional pairing, don't allow pairing with already paired devs.

This commit is contained in:
Peter Hutterer 2007-10-14 04:21:42 +09:30
parent 70efd3d06a
commit 38baac71bd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/devices.c
View File

@ -2238,7 +2238,10 @@ PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
return BadDevice; return BadDevice;
/* Don't allow pairing for slave devices */ /* Don't allow pairing for slave devices */
if (ptr->master || kbd->master) if (!ptr->isMaster || !kbd->isMaster)
return BadDevice;
if (ptr->spriteInfo->paired)
return BadDevice; return BadDevice;
if (!pairingClient) if (!pairingClient)
@ -2255,6 +2258,7 @@ PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
kbd->spriteInfo->sprite = ptr->spriteInfo->sprite; kbd->spriteInfo->sprite = ptr->spriteInfo->sprite;
kbd->spriteInfo->paired = ptr; kbd->spriteInfo->paired = ptr;
ptr->spriteInfo->paired = kbd;
return Success; return Success;
} }