From 3caab5aa37decb7b5dc1642a0452efc3e1f5100e Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 21 Jun 2011 15:55:59 +0100 Subject: Interp: Allow explicit Any/NoSymbol mappings Brown paper bag in full effect. The previous fix, while crushing the previous problem where an unknown keysym for an interp def would lead to every key matching it, also ignored explicit Any+AnyOfOrNone(All) mappings. Such as the one xkeyboard-config relied on for Control to actually update the modifier state. Fix this by allowing mappings explicitly declared as Any/NoSymbol, while ignoring only those with failed keysym lookups. Unfortunately, due to the structure of the parser, it's a deeply inelegant fix. Verified with a quick check of all layouts (albeit using default variants only) in xkeyboard-config that this results in no changes to the output at all, compared to xkbcomp 1.1.1. Signed-off-by: Daniel Stone --- compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compat.c') diff --git a/compat.c b/compat.c index a058dfb..759535a 100644 --- a/compat.c +++ b/compat.c @@ -658,9 +658,9 @@ HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge, ACTION("Symbol interpretation ignored\n"); return True; } - if (def->sym == NoSymbol) + if (def->ignore) { - ERROR("Couldn't determine keysym\n"); + ERROR("Couldn't lookup keysym\n"); ACTION("Symbol interpretation ignored\n"); return True; } -- cgit v1.2.3