SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dix: Remove InitSprite, work can be done by InitializeSprite.

Browse Source 
Free sprite struct if a spriteOwner is paired.

xfree86: Use PairDevices instead of passing booleans around when creating a
         sprite.

Xext:    Switch back to using LookupPointer/KeyboardDevice instead of
         inputInfo.xyz.
This commit is contained in:
Peter Hutterer
2007-03-01 17:19:37 +10:30
committed by Peter Hutterer
parent 2a35d44b6d
commit 43bd35fcf8
7 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dix/devices.c
View File

@@ -1937,14 +1937,21 @@ ProcQueryKeymap(ClientPtr client)
* pointer sprite.
*/
int
PairDevices(ClientPtr client, DeviceIntPtr pointer, DeviceIntPtr keyboard)
PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
{
if (!pairingClient)
RegisterPairingClient(client);
else if (pairingClient != client)
return BadAccess;
keyboard->pSprite = pointer->pSprite;
if (kbd->spriteOwner)
{
xfree(kbd->pSprite);
kbd->pSprite = NULL;
kbd->spriteOwner = FALSE;
}
kbd->pSprite = ptr->pSprite;
return Success;
}