frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: Fix a mis-use of inputInfo.keyboard.

This commit is contained in:
Peter Hutterer 2009-03-13 16:20:56 +10:00
parent c97c6c3de3
commit 23686e5680
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xkb/xkbEvents.c
View File

@ -918,15 +918,14 @@ Bool
XkbFilterEvents(ClientPtr pClient,int nEvents,xEvent *xE) XkbFilterEvents(ClientPtr pClient,int nEvents,xEvent *xE)
{ {
int i, button_mask; int i, button_mask;
DeviceIntPtr pXDev = inputInfo.keyboard; DeviceIntPtr pXDev = NULL;
XkbSrvInfoPtr xkbi; XkbSrvInfoPtr xkbi;
if (xE->u.u.type & EXTENSION_EVENT_BASE) if (xE->u.u.type & EXTENSION_EVENT_BASE)
{
pXDev = XIGetDevice(xE); pXDev = XIGetDevice(xE);
if (!pXDev)
pXDev = inputInfo.keyboard; if (!pXDev)
} pXDev = PickKeyboard(pClient);
xkbi= (pXDev->key) ? pXDev->key->xkbInfo : NULL; xkbi= (pXDev->key) ? pXDev->key->xkbInfo : NULL;