diff options
Diffstat (limited to 'xkb/xkbEvents.c')
| -rw-r--r-- | xkb/xkbEvents.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 37d850dfa..351a3280e 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -405,7 +405,8 @@ XID winID = 0; if ((force||(xkbi->desc->ctrls->enabled_ctrls&XkbAudibleBellMask))&& (!eventOnly)) { - (*kbd->kbdfeed->BellProc)(percent,kbd,(pointer)pCtrl,class); + if (kbd->kbdfeed->BellProc) + (*kbd->kbdfeed->BellProc)(percent,kbd,(pointer)pCtrl,class); } interest = kbd->xkb_interest; if ((!interest)||(force)) @@ -807,7 +808,7 @@ Bool XkbFilterEvents(ClientPtr pClient,int nEvents,xEvent *xE) { int i, button_mask; -DeviceIntPtr pXDev = (DeviceIntPtr)LookupKeyboardDevice(); +DeviceIntPtr pXDev = inputInfo.keyboard; XkbSrvInfoPtr xkbi; xkbi= pXDev->key->xkbInfo; |