diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-03-28 11:56:34 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 14:23:24 +1100 |
| commit | 5c281446d2a8c38511d45baee6f0d25a640f12e1 (patch) | |
| tree | 19a48ddb67b6254cc84faeede146bbf06bb8d6ca | |
| parent | 2f7cb7306709d5266688e05a066701d309323035 (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>
| -rw-r--r-- | include/xkbsrv.h | 3 | ||||
| -rw-r--r-- | xkb/xkb.c | 2 | ||||
| -rw-r--r-- | xkb/xkbActions.c | 35 | ||||
| -rw-r--r-- | xkb/xkbUtils.c | 2 |
4 files changed, 0 insertions, 42 deletions
diff --git a/include/xkbsrv.h b/include/xkbsrv.h index ee04063fb..c6f6e9e32 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -291,12 +291,9 @@ extern _X_EXPORT void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer); extern _X_EXPORT int XkbReqCode; extern _X_EXPORT int XkbEventBase; -extern _X_EXPORT int XkbDisableLockActions; extern _X_EXPORT int XkbKeyboardErrorCode; extern _X_EXPORT char * XkbBaseDirectory; extern _X_EXPORT char * XkbBinDirectory; -extern _X_EXPORT int XkbDfltRepeatDelay; -extern _X_EXPORT int XkbDfltRepeatInterval; extern _X_EXPORT Bool noXkbExtension; @@ -6611,8 +6611,6 @@ int rc; xkbDebugFlags = newFlags; xkbDebugCtrls = newCtrls; - XkbDisableLockActions= (xkbDebugCtrls&XkbDF_DisableLocks); - rep.type= X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; 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; diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index a12cb79f3..abfd6fb97 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -68,8 +68,6 @@ DEALINGS IN THE SOFTWARE. #include "xkbgeom.h" #include "xkb.h" -int XkbDisableLockActions = 0; - /***====================================================================***/ int |