Commit b6ddd105686aaa7accb63d5fe9c228cc4d7b1db0
2012-10-11T14:05:49
keymap: rename keymap->sym_interpret -> sym_interprets This can be a bit confusing. 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
diff --git a/src/keymap-dump.c b/src/keymap-dump.c
index fc9b7bf..5ff3b84 100644
--- a/src/keymap-dump.c
+++ b/src/keymap-dump.c
@@ -511,7 +511,7 @@ write_compat(struct xkb_keymap *keymap, struct buf *buf)
write_buf(buf, "\t\tinterpret.useModMapMods= AnyLevel;\n");
write_buf(buf, "\t\tinterpret.repeat= False;\n");
- darray_foreach(interp, keymap->sym_interpret) {
+ darray_foreach(interp, keymap->sym_interprets) {
char keysym_name[64];
if (interp->sym == XKB_KEY_NoSymbol)
diff --git a/src/keymap.c b/src/keymap.c
index df215b5..49d7123 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -106,7 +106,7 @@ xkb_keymap_unref(struct xkb_keymap *keymap)
free(keymap->types[i].level_names);
}
free(keymap->types);
- darray_free(keymap->sym_interpret);
+ darray_free(keymap->sym_interprets);
darray_free(keymap->key_aliases);
darray_free(keymap->group_names);
darray_free(keymap->mods);
diff --git a/src/keymap.h b/src/keymap.h
index 11fa743..f72599e 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -390,7 +390,7 @@ struct xkb_keymap {
struct xkb_key_type *types;
unsigned int num_types;
- darray(struct xkb_sym_interpret) sym_interpret;
+ darray(struct xkb_sym_interpret) sym_interprets;
darray(struct xkb_mod) mods;
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 176a4ef..8edd587 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -221,7 +221,7 @@
* ----------------
* After all of the xkb_compat sections have been compiled, the following
* members of struct xkb_keymap are finalized:
- * darray(struct xkb_sym_interpret) sym_interpret;
+ * darray(struct xkb_sym_interpret) sym_interprets;
* darray(struct xkb_indicator_map) indicators;
* char *compat_section_name;
* TODO: virtual modifiers.
@@ -997,7 +997,7 @@ CopyInterps(CompatInfo *info, bool needSymbol, enum xkb_match_operation pred)
(!needSymbol && si->interp.sym != XKB_KEY_NoSymbol))
continue;
- darray_append(info->keymap->sym_interpret, si->interp);
+ darray_append(info->keymap->sym_interprets, si->interp);
}
}
diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c
index 78ba966..cd1f79c 100644
--- a/src/xkbcomp/keymap.c
+++ b/src/xkbcomp/keymap.c
@@ -90,10 +90,10 @@ FindInterpForKey(struct xkb_keymap *keymap, const struct xkb_key *key,
/*
* There may be multiple matchings interprets; we should always return
* the most specific. Here we rely on compat.c to set up the
- * sym_interpret array from the most specific to the least specific,
+ * sym_interprets array from the most specific to the least specific,
* such that when we find a match we return immediately.
*/
- darray_foreach(interp, keymap->sym_interpret) {
+ darray_foreach(interp, keymap->sym_interprets) {
xkb_mod_mask_t mods;
bool found;