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

vmod: use new log functions 

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-07-21 15:27:09 +03:00
parent 3bb3e9c3a9
commit 544a83e6d7
2 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/xkbcomp/vmod.c
View File

@ -43,7 +43,6 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap)
for (i = 0; i < XkbNumVirtualMods; i++) for (i = 0; i < XkbNumVirtualMods; i++)
keymap->vmods[i] = XkbNoModifierMask; keymap->vmods[i] = XkbNoModifierMask;
info->keymap = keymap;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
if (keymap->vmod_names[i]) if (keymap->vmod_names[i])
info->defined |= bit; info->defined |= bit;
@ -69,7 +68,12 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
for (i = 0, bit = 1, nextFree = -1; i < XkbNumVirtualMods; i++, bit <<= for (i = 0, bit = 1, nextFree = -1; i < XkbNumVirtualMods; i++, bit <<=
1) { 1) {
if (info->defined & bit) { if (!(info->defined & bit)) {
if (nextFree < 0)
nextFree = i;
continue;
}
if (keymap->vmod_names[i] && if (keymap->vmod_names[i] &&
strcmp(keymap->vmod_names[i], strcmp(keymap->vmod_names[i],
xkb_atom_text(keymap->ctx, stmt->name)) == 0) { /* already defined */ xkb_atom_text(keymap->ctx, stmt->name)) == 0) { /* already defined */
@ -79,34 +83,37 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
else { else {
const char *str1; const char *str1;
const char *str2 = ""; const char *str2 = "";
if (!ExprResolveModMask(keymap->ctx, stmt->value, if (!ExprResolveModMask(keymap->ctx, stmt->value,
&mod)) { &mod)) {
str1 = xkb_atom_text(keymap->ctx, stmt->name); log_err(keymap->ctx, "Declaration of %s ignored\n",
ACTION("Declaration of %s ignored\n", str1); xkb_atom_text(keymap->ctx, stmt->name));
return false; return false;
} }
if (mod.uval == keymap->vmods[i]) if (mod.uval == keymap->vmods[i])
return true; return true;
str1 = xkb_atom_text(keymap->ctx, stmt->name);
WARN("Virtual modifier %s multiply defined\n", str1);
str1 = XkbcModMaskText(keymap->vmods[i], true); str1 = XkbcModMaskText(keymap->vmods[i], true);
if (mergeMode == MERGE_OVERRIDE) { if (mergeMode == MERGE_OVERRIDE) {
str2 = str1; str2 = str1;
str1 = XkbcModMaskText(mod.uval, true); str1 = XkbcModMaskText(mod.uval, true);
} }
ACTION("Using %s, ignoring %s\n", str1, str2); log_warn(keymap->ctx,
"Virtual modifier %s multiply defined; "
"Using %s, ignoring %s\n",
xkb_atom_text(keymap->ctx, stmt->name), str1, str2);
if (mergeMode == MERGE_OVERRIDE) if (mergeMode == MERGE_OVERRIDE)
keymap->vmods[i] = mod.uval; keymap->vmods[i] = mod.uval;
return true; return true;
} }
} }
} }
else if (nextFree < 0)
nextFree = i;
}
if (nextFree < 0) { if (nextFree < 0) {
ERROR("Too many virtual modifiers defined (maximum %d)\n", log_err(keymap->ctx,
"Too many virtual modifiers defined (maximum %d)\n",
XkbNumVirtualMods); XkbNumVirtualMods);
return false; return false;
} }
@ -120,7 +127,7 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
keymap->vmods[nextFree] = mod.uval; keymap->vmods[nextFree] = mod.uval;
return true; return true;
} }
ACTION("Declaration of %s ignored\n", log_err(keymap->ctx, "Declaration of %s ignored\n",
xkb_atom_text(keymap->ctx, stmt->name)); xkb_atom_text(keymap->ctx, stmt->name));
return false; return false;
} }
@ -217,7 +224,8 @@ ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,
if (ExprResolveInteger(keymap->ctx, def, val_rtrn)) { if (ExprResolveInteger(keymap->ctx, def, val_rtrn)) {
if (val_rtrn->uval < XkbNumVirtualMods) if (val_rtrn->uval < XkbNumVirtualMods)
return true; return true;
ERROR("Illegal virtual modifier %d (must be 0..%d inclusive)\n", log_err(keymap->ctx,
"Illegal virtual modifier %d (must be 0..%d inclusive)\n",
val_rtrn->uval, XkbNumVirtualMods - 1); val_rtrn->uval, XkbNumVirtualMods - 1);
} }
return false; return false;

1
src/xkbcomp/vmod.h
View File

@ -31,7 +31,6 @@
#include "expr.h" #include "expr.h"
typedef struct _VModInfo { typedef struct _VModInfo {
struct xkb_keymap *keymap;
unsigned defined; unsigned defined;
unsigned available; unsigned available;
unsigned newlyDefined; unsigned newlyDefined;