Commit 544a83e6d7d555406dbb33a5bbe3d266078bc7f2
2012-07-21T15:27:09
vmod: use new log functions Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 4d200ec..c2e0710 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -43,7 +43,6 @@ ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap)
for (i = 0; i < XkbNumVirtualMods; i++)
keymap->vmods[i] = XkbNoModifierMask;
- info->keymap = keymap;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
if (keymap->vmod_names[i])
info->defined |= bit;
@@ -69,45 +68,53 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
for (i = 0, bit = 1, nextFree = -1; i < XkbNumVirtualMods; i++, bit <<=
1) {
- if (info->defined & bit) {
- if (keymap->vmod_names[i] &&
- strcmp(keymap->vmod_names[i],
- xkb_atom_text(keymap->ctx, stmt->name)) == 0) { /* already defined */
- info->available |= bit;
- if (stmt->value == NULL)
- return true;
- else {
- const char *str1;
- const char *str2 = "";
- if (!ExprResolveModMask(keymap->ctx, stmt->value,
- &mod)) {
- str1 = xkb_atom_text(keymap->ctx, stmt->name);
- ACTION("Declaration of %s ignored\n", str1);
- return false;
- }
- if (mod.uval == keymap->vmods[i])
- return true;
-
- str1 = xkb_atom_text(keymap->ctx, stmt->name);
- WARN("Virtual modifier %s multiply defined\n", str1);
- str1 = XkbcModMaskText(keymap->vmods[i], true);
- if (mergeMode == MERGE_OVERRIDE) {
- str2 = str1;
- str1 = XkbcModMaskText(mod.uval, true);
- }
- ACTION("Using %s, ignoring %s\n", str1, str2);
- if (mergeMode == MERGE_OVERRIDE)
- keymap->vmods[i] = mod.uval;
+ if (!(info->defined & bit)) {
+ if (nextFree < 0)
+ nextFree = i;
+ continue;
+ }
+
+ if (keymap->vmod_names[i] &&
+ strcmp(keymap->vmod_names[i],
+ xkb_atom_text(keymap->ctx, stmt->name)) == 0) { /* already defined */
+ info->available |= bit;
+ if (stmt->value == NULL)
+ return true;
+ else {
+ const char *str1;
+ const char *str2 = "";
+
+ if (!ExprResolveModMask(keymap->ctx, stmt->value,
+ &mod)) {
+ log_err(keymap->ctx, "Declaration of %s ignored\n",
+ xkb_atom_text(keymap->ctx, stmt->name));
+ return false;
+ }
+
+ if (mod.uval == keymap->vmods[i])
return true;
+
+ str1 = XkbcModMaskText(keymap->vmods[i], true);
+ if (mergeMode == MERGE_OVERRIDE) {
+ str2 = str1;
+ str1 = XkbcModMaskText(mod.uval, true);
}
+ 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)
+ keymap->vmods[i] = mod.uval;
+ return true;
}
}
- else if (nextFree < 0)
- nextFree = i;
}
+
if (nextFree < 0) {
- ERROR("Too many virtual modifiers defined (maximum %d)\n",
- XkbNumVirtualMods);
+ log_err(keymap->ctx,
+ "Too many virtual modifiers defined (maximum %d)\n",
+ XkbNumVirtualMods);
return false;
}
info->defined |= (1 << nextFree);
@@ -120,8 +127,8 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
keymap->vmods[nextFree] = mod.uval;
return true;
}
- ACTION("Declaration of %s ignored\n",
- xkb_atom_text(keymap->ctx, stmt->name));
+ log_err(keymap->ctx, "Declaration of %s ignored\n",
+ xkb_atom_text(keymap->ctx, stmt->name));
return false;
}
@@ -217,8 +224,9 @@ ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,
if (ExprResolveInteger(keymap->ctx, def, val_rtrn)) {
if (val_rtrn->uval < XkbNumVirtualMods)
return true;
- ERROR("Illegal virtual modifier %d (must be 0..%d inclusive)\n",
- val_rtrn->uval, XkbNumVirtualMods - 1);
+ log_err(keymap->ctx,
+ "Illegal virtual modifier %d (must be 0..%d inclusive)\n",
+ val_rtrn->uval, XkbNumVirtualMods - 1);
}
return false;
}
diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index ad3e819..f08e037 100644
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -31,7 +31,6 @@
#include "expr.h"
typedef struct _VModInfo {
- struct xkb_keymap *keymap;
unsigned defined;
unsigned available;
unsigned newlyDefined;