diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-26 10:58:41 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-26 10:58:41 +0200 |
| commit | 4f005bade376d15ee60e90ca45a831aff9725087 (patch) | |
| tree | 5abdbe5a7c55acf9e30c533414796f629fa9e47c /xorg-server/xkb/xkbActions.c | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-4f005bade376d15ee60e90ca45a831aff9725087.tar.gz vcxsrv-4f005bade376d15ee60e90ca45a831aff9725087.tar.bz2 vcxsrv-4f005bade376d15ee60e90ca45a831aff9725087.zip | |
libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011
Diffstat (limited to 'xorg-server/xkb/xkbActions.c')
| -rw-r--r-- | xorg-server/xkb/xkbActions.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c index 4b5405ab0..000002a45 100644 --- a/xorg-server/xkb/xkbActions.c +++ b/xorg-server/xkb/xkbActions.c @@ -344,15 +344,18 @@ _XkbFilterLockState( XkbSrvInfoPtr xkbi, filter->keycode = keycode; filter->active = 1; filter->filterOthers = 0; - filter->priv = 0; + filter->priv = xkbi->state.locked_mods&pAction->mods.mask; filter->filter = _XkbFilterLockState; filter->upAction = *pAction; - xkbi->state.locked_mods^= pAction->mods.mask; + if (!(filter->upAction.mods.flags&XkbSA_LockNoLock)) + xkbi->state.locked_mods|= pAction->mods.mask; xkbi->setMods = pAction->mods.mask; } else if (filter->keycode==keycode) { filter->active = 0; xkbi->clearMods = filter->upAction.mods.mask; + if (!(filter->upAction.mods.flags&XkbSA_LockNoUnlock)) + xkbi->state.locked_mods&= ~filter->priv; } return 1; } |