diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-06 09:01:48 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-01-08 11:45:21 +1000 |
| commit | b72c6b083baeadfd7b18b6025df054be502d6e28 (patch) | |
| tree | f29d392ea1cff95c7c1bb82a572bcef4df1acd9e /dix | |
| parent | 30d2cfcd3851870178d62e5067211aa36f87fbd2 (diff) | |
dix: remove inputInfo.keyboard reference in QueryPointer handling.
PickKeyboard() is to be used instead.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/events.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c index 37c922053..52a6ef461 100644 --- a/dix/events.c +++ b/dix/events.c @@ -5130,6 +5130,7 @@ ProcQueryPointer(ClientPtr client) xQueryPointerReply rep; WindowPtr pWin, t; DeviceIntPtr mouse = PickPointer(client); + DeviceIntPtr kbd = PickKeyboard(client); SpritePtr pSprite; int rc; REQUEST(xResourceReq); @@ -5147,7 +5148,7 @@ ProcQueryPointer(ClientPtr client) MaybeStopHint(mouse, client); rep.type = X_Reply; rep.sequenceNumber = client->sequence; - rep.mask = mouse->button->state | inputInfo.keyboard->key->state; + rep.mask = mouse->button->state | kbd->key->state; rep.length = 0; rep.root = (RootWindow(mouse))->drawable.id; rep.rootX = pSprite->hot.x; |