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

symbols: remove mention of keycodes in CopySymbolsDef 

Since now we only use the keycode in this function for logging, it's
better not to mention the keycode at all because the XkbKeyGetKeycode
macro is implemented using a dirty hack 0_0
The key name is sufficient to determine uniquely where to look.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-09-12 21:32:25 +03:00
parent 77ab928e92
commit 376e45eb6d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xkbcomp/symbols.c
View File

@ -1494,7 +1494,6 @@ static bool
CopySymbolsDef(SymbolsInfo *info, KeyInfo *keyi)
{
struct xkb_keymap *keymap = info->keymap;
xkb_keycode_t kc;
struct xkb_key *key;
unsigned int sizeSyms = 0;
xkb_group_index_t i, nGroups;
@ -1511,7 +1510,6 @@ CopySymbolsDef(SymbolsInfo *info, KeyInfo *keyi)
LongKeyNameText(keyi->name));
return false;
}
kc = XkbKeyGetKeycode(keymap, key);
haveActions = false;
width = 0;
@ -1543,10 +1541,10 @@ CopySymbolsDef(SymbolsInfo *info, KeyInfo *keyi)
else
log_vrb(info->keymap->ctx, 5,
"No automatic type for %d levels; "
"Using %s for the %s key (keycode %d)\n",
"Using %s for the %s key\n",
darray_size(groupi->levels),
xkb_atom_text(keymap->ctx, groupi->type),
LongKeyNameText(keyi->name), kc);
LongKeyNameText(keyi->name));
}
if (FindNamedType(keymap, groupi->type, &types[i])) {
@ -1556,9 +1554,9 @@ CopySymbolsDef(SymbolsInfo *info, KeyInfo *keyi)
else {
log_vrb(info->keymap->ctx, 3,
"Type \"%s\" is not defined; "
"Using default type for the %s key (keycode %d)\n",
"Using default type for the %s key\n",
xkb_atom_text(keymap->ctx, groupi->type),
LongKeyNameText(keyi->name), kc);
LongKeyNameText(keyi->name));
/*
* Index 0 is guaranteed to contain something, usually
* ONE_LEVEL or at least some default one-level type.
@ -1740,9 +1738,8 @@ CompileSymbols(XkbFile *file, struct xkb_keymap *keymap,
if (key->num_groups < 1)
log_info(info.keymap->ctx,
"No symbols defined for %s (keycode %d)\n",
KeyNameText(key->name),
XkbKeyGetKeycode(keymap, key));
"No symbols defined for %s\n",
KeyNameText(key->name));
}
}