StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not clear sibling entries when override. 

lokid and hikid actually stores the sibling to current node, which
should not be cleared when override. This would break the sequence with
a common prefix when override another.

Fix #286

Signed-off-by: Weng Xuetian <wengxt@gmail.com>
master
Weng Xuetian 2022-05-14 01:11:32 -07:00 committed by Ran Benita
parent 3d56569ab2
commit b064b60984
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compose/parser.c
View File

@ -387,7 +387,7 @@ add_production(struct xkb_compose_table *table, struct scanner *s,
} else if (!last) { } else if (!last) {
if (node->is_leaf) { if (node->is_leaf) {
scanner_warn(s, "a sequence already exists which is a prefix of this sequence; overriding"); scanner_warn(s, "a sequence already exists which is a prefix of this sequence; overriding");
node->internal.eqkid = node->lokid = node->hikid = 0; node->internal.eqkid = 0;
node->internal.is_leaf = false; node->internal.is_leaf = false;
} }
lhs_pos++; lhs_pos++;

21
test/compose.c
View File

@ -560,6 +560,26 @@ test_include(struct xkb_context *ctx)
free(table_string); free(table_string);
} }
static void
test_override(struct xkb_context *ctx)
{
const char *table_string = "<dead_circumflex> <dead_circumflex> : \"foo\" X\n"
"<dead_circumflex> <e> : \"bar\" Y\n"
"<dead_circumflex> <dead_circumflex> <e> : \"baz\" Z\n";
assert(test_compose_seq_buffer(ctx, table_string,
/* Comes after - does override. */
XKB_KEY_dead_circumflex, XKB_COMPOSE_FEED_ACCEPTED, XKB_COMPOSE_COMPOSING, "", XKB_KEY_NoSymbol,
XKB_KEY_dead_circumflex, XKB_COMPOSE_FEED_ACCEPTED, XKB_COMPOSE_COMPOSING, "", XKB_KEY_NoSymbol,
XKB_KEY_e, XKB_COMPOSE_FEED_ACCEPTED, XKB_COMPOSE_COMPOSED, "baz", XKB_KEY_Z,
/* Override does not affect sibling nodes */
XKB_KEY_dead_circumflex, XKB_COMPOSE_FEED_ACCEPTED, XKB_COMPOSE_COMPOSING, "", XKB_KEY_NoSymbol,
XKB_KEY_e, XKB_COMPOSE_FEED_ACCEPTED, XKB_COMPOSE_COMPOSED, "bar", XKB_KEY_Y,
XKB_KEY_NoSymbol));
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@ -575,6 +595,7 @@ main(int argc, char *argv[])
test_state(ctx); test_state(ctx);
test_modifier_syntax(ctx); test_modifier_syntax(ctx);
test_include(ctx); test_include(ctx);
test_override(ctx);
xkb_context_unref(ctx); xkb_context_unref(ctx);
return 0; return 0;