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

dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it

This commit is contained in:
Peter Hutterer 2008-05-31 18:17:49 +09:30
parent 6cecae0e86
commit 942086fc96
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dix/events.c
View File

@ -5410,7 +5410,6 @@ ProcQueryPointer(ClientPtr client)
xQueryPointerReply rep; xQueryPointerReply rep;
WindowPtr pWin, t; WindowPtr pWin, t;
DeviceIntPtr mouse = PickPointer(client); DeviceIntPtr mouse = PickPointer(client);
DeviceIntPtr dev;
SpritePtr pSprite; SpritePtr pSprite;
int rc; int rc;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -5423,18 +5422,6 @@ ProcQueryPointer(ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
for (dev = inputInfo.devices; dev; dev = dev->next)
{
if (dev->isMaster && IsPointerDevice(dev) &&
dev->deviceGrab.grab && dev->deviceGrab.grab->coreGrab &&
SameClient(dev->deviceGrab.grab, client))
{
/* special case, we have a grab on the device so we need to return
* this one */
mouse = dev;
}
}
pSprite = mouse->spriteInfo->sprite; pSprite = mouse->spriteInfo->sprite;
if (mouse->valuator->motionHintWindow) if (mouse->valuator->motionHintWindow)
MaybeStopHint(mouse, client); MaybeStopHint(mouse, client);

2
hw/kdrive/ephyr/ephyrinit.c
View File

@ -295,6 +295,8 @@ miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {
ephyrUnrealizeCursor, ephyrUnrealizeCursor,
ephyrSetCursor, ephyrSetCursor,
ephyrMoveCursor, ephyrMoveCursor,
NULL,
NULL
}; };