diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-13 15:34:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-16 13:29:06 +1000 |
| commit | 639658b2eab480a5bfb943dff51e4bdfc1e16e3b (patch) | |
| tree | 1b72b128d8f19ad55ee43a4830b70f45d2956c5e /dix/events.c | |
| parent | f01ee198ff0cbd7ca418217a84248d1c6131a0c6 (diff) | |
dix: use GetPairedDevice in ProcQueryPointer rather than inputInfo.keyboard.
Diffstat (limited to 'dix/events.c')
| -rw-r--r-- | dix/events.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c index 8b30706de..11a8fa537 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4626,6 +4626,7 @@ ProcQueryPointer(ClientPtr client) xQueryPointerReply rep; WindowPtr pWin, t; DeviceIntPtr mouse = PickPointer(client); + DeviceIntPtr keyboard; SpritePtr pSprite; int rc; REQUEST(xResourceReq); @@ -4638,6 +4639,8 @@ ProcQueryPointer(ClientPtr client) if (rc != Success) return rc; + keyboard = GetPairedDevice(mouse); + pSprite = mouse->spriteInfo->sprite; if (mouse->valuator->motionHintWindow) MaybeStopHint(mouse, client); @@ -4645,7 +4648,7 @@ ProcQueryPointer(ClientPtr client) rep.type = X_Reply; rep.sequenceNumber = client->sequence; rep.mask = mouse->button->state; - rep.mask |= XkbStateFieldFromRec(&inputInfo.keyboard->key->xkbInfo->state); + rep.mask |= XkbStateFieldFromRec(&keyboard->key->xkbInfo->state); rep.length = 0; rep.root = (RootWindow(mouse))->drawable.id; rep.rootX = pSprite->hot.x; |