Commit 8feba630fa7a4b720c42a9b5b4e4280b0e17a500
2012-04-08T18:46:58
Fix KeyInfo's syms array size calculation When merging group info from two KeyInfo's, the new size of the keysym array was off. Fix it to match how it is used a few lines below. There are also some peripheral fixes, and some comments (took me a few minutes to get what's going on). 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
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index f8f5881..8762720 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -64,10 +64,24 @@ typedef struct _KeyInfo
unsigned char symsDefined;
unsigned char actsDefined;
unsigned int numLevels[XkbNumKbdGroups];
+
+ /* syms[group] -> Single array for all the keysyms in the group. */
xkb_keysym_t *syms[XkbNumKbdGroups];
+ /* sizeSyms[group] -> The size of the syms[group] array. */
int sizeSyms[XkbNumKbdGroups];
+ /*
+ * symsMapIndex[group][level] -> The index from which the syms for
+ * the level begin in the syms[group] array. Remember each keycode
+ * can have multiple keysyms in each level (that is, each key press
+ * can result in multiple keysyms).
+ */
int *symsMapIndex[XkbNumKbdGroups];
+ /*
+ * symsMapNumEntries[group][level] -> How many syms are in
+ * syms[group][symsMapIndex[group][level]].
+ */
unsigned int *symsMapNumEntries[XkbNumKbdGroups];
+
union xkb_action *acts[XkbNumKbdGroups];
xkb_atom_t types[XkbNumKbdGroups];
unsigned repeat;
@@ -215,7 +229,7 @@ CopyKeyInfo(KeyInfo * old, KeyInfo * new, Bool clearOld)
return False;
}
memcpy(new->symsMapNumEntries[i], old->symsMapNumEntries[i],
- sizeof(unsigned int));
+ width * sizeof(unsigned int));
}
if (old->acts[i] != NULL)
{
@@ -401,8 +415,8 @@ MergeKeyGroups(SymbolsInfo * info,
int);
into->symsMapNumEntries[group] =
uTypedRecalloc(into->symsMapNumEntries[group],
- from->numLevels[group],
into->numLevels[group],
+ from->numLevels[group],
unsigned int);
if (!into->symsMapIndex[group] || !into->symsMapNumEntries[group])
{
@@ -479,14 +493,10 @@ MergeKeyGroups(SymbolsInfo * info,
if (into->symsMapNumEntries[group] && (i < into->numLevels[group]))
toSize = into->symsMapNumEntries[group][i];
- if (fromSize == 0 || fromSize == toSize || clobber)
- {
- fromSize += toSize;
- }
- else if (toSize == 0)
- {
+ if ((fromSize != 0 && toSize == 0) || clobber)
resultSize += fromSize;
- }
+ else
+ resultSize += toSize;
}
if (resultSize == 0)