dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it
This commit is contained in:
parent
6cecae0e86
commit
942086fc96
13
dix/events.c
13
dix/events.c
|
@ -5410,7 +5410,6 @@ ProcQueryPointer(ClientPtr client)
|
|||
xQueryPointerReply rep;
|
||||
WindowPtr pWin, t;
|
||||
DeviceIntPtr mouse = PickPointer(client);
|
||||
DeviceIntPtr dev;
|
||||
SpritePtr pSprite;
|
||||
int rc;
|
||||
REQUEST(xResourceReq);
|
||||
|
@ -5423,18 +5422,6 @@ ProcQueryPointer(ClientPtr client)
|
|||
if (rc != Success)
|
||||
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;
|
||||
if (mouse->valuator->motionHintWindow)
|
||||
MaybeStopHint(mouse, client);
|
||||
|
|
|
@ -295,6 +295,8 @@ miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {
|
|||
ephyrUnrealizeCursor,
|
||||
ephyrSetCursor,
|
||||
ephyrMoveCursor,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user