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>
CopySymbolsDef(SymbolsInfo *info, KeyInfo *keyi)
{
struct xkb_keymap *keymap = info->keymap;
CopySymbolsDef(SymbolsInfo *info, KeyInfo *keyi)
{
struct xkb_keymap *keymap = info->keymap;
struct xkb_key *key;
unsigned int sizeSyms = 0;
xkb_group_index_t i, nGroups;
struct xkb_key *key;
unsigned int sizeSyms = 0;
xkb_group_index_t i, nGroups;
LongKeyNameText(keyi->name));
return false;
}
LongKeyNameText(keyi->name));
return false;
}
- kc = XkbKeyGetKeycode(keymap, key);
haveActions = false;
width = 0;
haveActions = false;
width = 0;
else
log_vrb(info->keymap->ctx, 5,
"No automatic type for %d levels; "
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),
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])) {
}
if (FindNamedType(keymap, groupi->type, &types[i])) {
else {
log_vrb(info->keymap->ctx, 3,
"Type \"%s\" is not defined; "
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),
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.
/*
* Index 0 is guaranteed to contain something, usually
* ONE_LEVEL or at least some default one-level type.
if (key->num_groups < 1)
log_info(info.keymap->ctx,
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));