diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-31 18:17:49 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-31 18:17:49 +0930 |
| commit | 942086fc965fc9a24be2db4f537f0ff54db51083 (patch) | |
| tree | 666a661c29f3b05a976f930f0083a6e76e9d6f60 | |
| parent | 6cecae0e8651b1fa58b3cd0e0a636db46f56f6a6 (diff) | |
dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it
| -rw-r--r-- | dix/events.c | 13 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/dix/events.c b/dix/events.c index 73b7fa0f2..cec12f0b2 100644 --- a/dix/events.c +++ b/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); diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index d415fe75f..e00791c18 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -295,6 +295,8 @@ miPointerSpriteFuncRec EphyrPointerSpriteFuncs = { ephyrUnrealizeCursor, ephyrSetCursor, ephyrMoveCursor, + NULL, + NULL }; |