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

xkb: factor out the StateNotify flag check 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2014-02-26 16:03:19 +10:00
parent fdb4ec86c2
commit dda2468e57
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xkb/xkbActions.c
View File

@ -1127,6 +1127,22 @@ _XkbApplyFilters(XkbSrvInfoPtr xkbi, unsigned kc, XkbAction *pAction)
return send;
}
static int
_XkbEnsureStateChange(XkbSrvInfoPtr xkbi)
{
Bool genStateNotify = FALSE;
/* The state may change, so if we're not in the middle of sending a state
* notify, prepare for it */
if ((xkbi->flags & _XkbStateNotifyInProgress) == 0) {
xkbi->prev_state = xkbi->state;
xkbi->flags |= _XkbStateNotifyInProgress;
genStateNotify = TRUE;
}
return genStateNotify;
}
void
XkbHandleActions(DeviceIntPtr dev, DeviceIntPtr kbd, DeviceEvent *event)
{
@ -1146,15 +1162,8 @@ XkbHandleActions(DeviceIntPtr dev, DeviceIntPtr kbd, DeviceEvent *event)
keyc = kbd->key;
xkbi = keyc->xkbInfo;
key = event->detail.key;
/* The state may change, so if we're not in the middle of sending a state
* notify, prepare for it */
if ((xkbi->flags & _XkbStateNotifyInProgress) == 0) {
xkbi->prev_state = xkbi->state;
xkbi->flags |= _XkbStateNotifyInProgress;
genStateNotify = TRUE;
}
else
genStateNotify = FALSE;
genStateNotify = _XkbEnsureStateChange(xkbi);
xkbi->clearMods = xkbi->setMods = 0;
xkbi->groupChange = 0;