andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: remove inputInfo.keyboard reference in QueryPointer handling.

Browse Source 
PickKeyboard() is to be used instead.
This commit is contained in:
Peter Hutterer 2009-01-06 09:01:48 +10:00
parent 30d2cfcd38
commit b72c6b083b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dix/events.c
View File

@ -5130,6 +5130,7 @@ ProcQueryPointer(ClientPtr client)
xQueryPointerReply rep; xQueryPointerReply rep;
WindowPtr pWin, t; WindowPtr pWin, t;
DeviceIntPtr mouse = PickPointer(client); DeviceIntPtr mouse = PickPointer(client);
DeviceIntPtr kbd = PickKeyboard(client);
SpritePtr pSprite; SpritePtr pSprite;
int rc; int rc;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -5147,7 +5148,7 @@ ProcQueryPointer(ClientPtr client)
MaybeStopHint(mouse, client); MaybeStopHint(mouse, client);
rep.type = X_Reply; rep.type = X_Reply;
rep.sequenceNumber = client->sequence; 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.length = 0;
rep.root = (RootWindow(mouse))->drawable.id; rep.root = (RootWindow(mouse))->drawable.id;
rep.rootX = pSprite->hot.x; rep.rootX = pSprite->hot.x;