summaryrefslogtreecommitdiff
path: root/xkb/xkbActions.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2008-03-28 11:56:34 +0200
committerDaniel Stone <daniel@fooishbar.org>2009-01-22 14:23:24 +1100
commit5c281446d2a8c38511d45baee6f0d25a640f12e1 (patch)
tree19a48ddb67b6254cc84faeede146bbf06bb8d6ca /xkb/xkbActions.c
parent2f7cb7306709d5266688e05a066701d309323035 (diff)
XKB: Remove lock actions disabling
For some reason, XKB allows clients to set a global (!) flag that simply turns lock keys into state no-ops. Ignore this flag. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'xkb/xkbActions.c')
-rw-r--r--xkb/xkbActions.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 424fc637a..315ff0db7 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -85,41 +85,6 @@ static XkbAction fake;
fake.type = XkbSA_NoAction;
return fake;
}
- if (XkbDisableLockActions) {
- switch (act->type) {
- case XkbSA_LockMods:
- fake.mods.type = XkbSA_SetMods;
- fake.mods.flags = 0;
- fake.mods.mask = act->mods.mask;
- return fake;
- case XkbSA_LatchMods:
- fake.mods.type = XkbSA_SetMods;
- fake.mods.flags = 0;
- fake.mods.mask = act->mods.mask;
- return fake;
- case XkbSA_ISOLock:
- if (act->iso.flags&XkbSA_ISODfltIsGroup) {
- fake.group.type = XkbSA_SetGroup;
- fake.group.flags = act->iso.flags&XkbSA_GroupAbsolute;
- XkbSASetGroup(&fake.group,XkbSAGroup(&act->iso));
- }
- else {
- fake.mods.type = XkbSA_SetMods;
- fake.mods.flags = 0;
- fake.mods.mask = act->iso.mask;
- }
- return fake;
- case XkbSA_LockGroup:
- case XkbSA_LatchGroup:
- /* We want everything from the latch/lock action except the
- * type should be changed to set.
- */
- fake = *act;
- fake.group.type = XkbSA_SetGroup;
- return fake;
- }
- }
- else
if (xkb->ctrls->enabled_ctrls&XkbStickyKeysMask) {
if (act->any.type==XkbSA_SetMods) {
fake.mods.type = XkbSA_LatchMods;