Commit e6e3bda3934345bce203558df57ade467e62a337
2012-10-06T17:00:26
expr: share code for modifier functions We can make more use of the functions in text.c now and remove some cruft. 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 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index 69bf30d..7d6847f 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -82,17 +82,9 @@ SimpleLookup(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
}
static bool
-LookupModIndex(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
- enum expr_value_type type, xkb_mod_index_t *val_rtrn)
-{
- const struct xkb_keymap *keymap = priv;
- *val_rtrn = ModNameToIndex(keymap, field, MOD_REAL);
- return (*val_rtrn != XKB_MOD_INVALID);
-}
-
-static bool
-LookupModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
- enum expr_value_type type, xkb_mod_mask_t *val_rtrn)
+lookup_mod_mask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
+ enum expr_value_type type, enum mod_type mod_type,
+ xkb_mod_mask_t *val_rtrn)
{
const char *str;
xkb_mod_index_t ndx;
@@ -103,18 +95,38 @@ LookupModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
str = xkb_atom_text(ctx, field);
- if (istreq(str, "all"))
+ if (istreq(str, "all")) {
*val_rtrn = 0xff;
- else if (istreq(str, "none"))
+ return true;
+ }
+
+ if (istreq(str, "none")) {
*val_rtrn = 0;
- else if (LookupModIndex(ctx, keymap, field, type, &ndx))
- *val_rtrn = (1 << ndx);
- else
+ return true;
+ }
+
+ ndx = ModNameToIndex(keymap, field, mod_type);
+ if (ndx == XKB_MOD_INVALID)
return false;
+ *val_rtrn = (1 << ndx);
return true;
}
+static bool
+LookupModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
+ enum expr_value_type type, xkb_mod_mask_t *val_rtrn)
+{
+ return lookup_mod_mask(ctx, priv, field, type, MOD_REAL, val_rtrn);
+}
+
+static bool
+LookupVModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
+ enum expr_value_type type, xkb_mod_mask_t *val_rtrn)
+{
+ return lookup_mod_mask(ctx, priv, field, type, MOD_BOTH, val_rtrn);
+}
+
bool
ExprResolveBoolean(struct xkb_context *ctx, const ExprDef *expr,
bool *set_rtrn)
@@ -626,46 +638,6 @@ ExprResolveModMask(struct xkb_keymap *keymap, const ExprDef *expr,
keymap);
}
-static bool
-LookupVModIndex(struct xkb_context *ctx, const void *priv,
- xkb_atom_t field, enum expr_value_type type,
- xkb_mod_index_t *val_rtrn)
-{
- const struct xkb_mod *mod;
- xkb_mod_index_t i;
- const struct xkb_keymap *keymap = priv;
-
- if (type != EXPR_TYPE_INT)
- return false;
-
- darray_enumerate(i, mod, keymap->mods) {
- if (mod->type == MOD_VIRT && mod->name == field) {
- *val_rtrn = i;
- return true;
- }
- }
-
- return false;
-}
-
-static bool
-LookupVModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
- enum expr_value_type type, xkb_mod_mask_t *val_rtrn)
-{
- xkb_mod_index_t ndx;
- const struct xkb_keymap *keymap = priv;
-
- if (LookupModMask(ctx, keymap, field, type, val_rtrn)) {
- return true;
- }
- else if (LookupVModIndex(ctx, keymap, field, type, &ndx)) {
- *val_rtrn = (1 << ndx);
- return true;
- }
-
- return false;
-}
-
bool
ExprResolveVModMask(struct xkb_keymap *keymap, const ExprDef *expr,
xkb_mod_mask_t *mask_rtrn)
@@ -702,8 +674,7 @@ bool
ExprResolveVMod(struct xkb_keymap *keymap, const ExprDef *def,
xkb_mod_index_t *ndx_rtrn)
{
- const struct xkb_mod *mod;
- xkb_mod_index_t i;
+ xkb_mod_index_t ndx;
xkb_atom_t name = def->value.str;
if (def->op != EXPR_IDENT) {
@@ -714,16 +685,15 @@ ExprResolveVMod(struct xkb_keymap *keymap, const ExprDef *def,
return false;
}
- darray_enumerate(i, mod, keymap->mods) {
- if (mod->type == MOD_VIRT && mod->name == name) {
- *ndx_rtrn = i;
- return true;
- }
+ ndx = ModNameToIndex(keymap, name, MOD_VIRT);
+ if (ndx == XKB_MOD_INVALID) {
+ log_err(keymap->ctx,
+ "Cannot resolve virtual modifier: "
+ "\"%s\" was not previously declared\n",
+ xkb_atom_text(keymap->ctx, name));
+ return false;
}
- log_err(keymap->ctx,
- "Cannot resolve virtual modifier: "
- "\"%s\" was not previously declared\n",
- xkb_atom_text(keymap->ctx, name));
- return false;
+ *ndx_rtrn = ndx;
+ return true;
}