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

compose/parser: be more careful when checking if sequence overrides or duplicates another 

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2017-12-12 15:44:52 +02:00
parent 2963e29f0e
commit 47f45194e4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compose/parser.c
View File

@ -316,6 +316,7 @@ struct production {
unsigned int len; unsigned int len;
xkb_keysym_t keysym; xkb_keysym_t keysym;
char string[256]; char string[256];
/* At least one of these is true. */
bool has_keysym; bool has_keysym;
bool has_string; bool has_string;
@ -400,9 +401,20 @@ add_production(struct xkb_compose_table *table, struct scanner *s,
} }
if (node->u.leaf.utf8 != 0 || node->u.leaf.keysym != XKB_KEY_NoSymbol) { if (node->u.leaf.utf8 != 0 || node->u.leaf.keysym != XKB_KEY_NoSymbol) {
if (streq(&darray_item(table->utf8, node->u.leaf.utf8), bool same_string =
production->string) && (node->u.leaf.utf8 == 0 && !production->has_string) ||
node->u.leaf.keysym == production->keysym) { (
node->u.leaf.utf8 != 0 && production->has_string &&
streq(&darray_item(table->utf8, node->u.leaf.utf8),
production->string)
);
bool same_keysym =
(node->u.leaf.keysym == XKB_KEY_NoSymbol && !production->has_keysym) ||
(
node->u.leaf.keysym != XKB_KEY_NoSymbol && production->has_keysym &&
node->u.leaf.keysym == production->keysym
);
if (same_string && same_keysym) {
scanner_warn(s, "this compose sequence is a duplicate of another; skipping line"); scanner_warn(s, "this compose sequence is a duplicate of another; skipping line");
return; return;
} }