mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
dix: Add ClientPointer to client, used for picking which pointer to use in
ambiguious request. PickPointer and PickKeyboard are used for getting
the appropriate pointer when situation is unclear.
Fix some issues with InitializeSprite.
dix, xfree86: Remove last traces of InitSprite.
This commit is contained in:
committed by
Peter Hutterer
parent
43bd35fcf8
commit
e43b8a4e40
@@ -188,9 +188,9 @@ xf86ActivateDevice(LocalDevicePtr local)
|
||||
|
||||
/* Only create a new sprite if it's a non-shared pointer */
|
||||
if (IsPointerDevice(dev) && dev->isMPDev)
|
||||
InitializeSprite(pDev, NullWindow);
|
||||
InitializeSprite(dev, GetCurrentRootWindow());
|
||||
else
|
||||
PairDevices(pairingClient, inputInfo.pointer, pDev);
|
||||
PairDevices(NULL, inputInfo.pointer, dev);
|
||||
|
||||
RegisterOtherDevice(dev);
|
||||
|
||||
@@ -425,8 +425,6 @@ NewInputDeviceRequest (InputOption *options)
|
||||
EnableDevice(dev);
|
||||
|
||||
/* send enter/leave event, update sprite window */
|
||||
if (dev->spriteOwner)
|
||||
InitializeSprite(dev, GetCurrentRootWindow());
|
||||
CheckMotion(NULL, dev);
|
||||
|
||||
return Success;
|
||||
|
||||
Reference in New Issue
Block a user