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

Avoid duplicating keysyms for merge if possible 

If we can merge cleanly (i.e. use the entirety of one entry rather than
having to go level by level), then just reuse the existing symbols array
and skip the entire merge process.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-06-04 16:15:10 +01:00
parent d3dfd7deab
commit 2e009f69c7
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/xkbcomp/symbols.c
View File

@ -366,11 +366,18 @@ ResizeKeyGroup(KeyInfo * key, unsigned int group, unsigned int numLevels,
return true; return true;
} }
enum key_group_selector {
NONE = 0,
FROM = (1 << 0),
TO = (1 << 1),
};
static bool static bool
MergeKeyGroups(SymbolsInfo * info, MergeKeyGroups(SymbolsInfo * info,
KeyInfo * into, KeyInfo * from, unsigned group) KeyInfo * into, KeyInfo * from, unsigned group)
{ {
xkb_keysym_t *resultSyms = NULL; xkb_keysym_t *resultSyms = NULL;
enum key_group_selector using = NONE;
union xkb_action *resultActs; union xkb_action *resultActs;
unsigned int resultWidth; unsigned int resultWidth;
unsigned int resultSize = 0; unsigned int resultSize = 0;
@ -476,20 +483,34 @@ MergeKeyGroups(SymbolsInfo * info,
if (fromSize == 0) if (fromSize == 0)
{ {
resultSize += toSize; resultSize += toSize;
using |= TO;
} }
else if (toSize == 0 || clobber) else if (toSize == 0 || clobber)
{ {
resultSize += fromSize; resultSize += fromSize;
using |= FROM;
} }
else else
{ {
resultSize += toSize; resultSize += toSize;
using |= TO;
} }
} }
if (resultSize == 0) if (resultSize == 0)
goto out; goto out;
if (using == FROM)
{
resultSyms = from->syms[group];
goto out;
}
else if (using == TO)
{
resultSyms = into->syms[group];
goto out;
}
resultSyms = uTypedCalloc(resultSize, xkb_keysym_t); resultSyms = uTypedCalloc(resultSize, xkb_keysym_t);
if (!resultSyms) if (!resultSyms)
{ {
@ -500,7 +521,7 @@ MergeKeyGroups(SymbolsInfo * info,
for (i = 0; i < resultWidth; i++) for (i = 0; i < resultWidth; i++)
{ {
enum { NONE, FROM, TO } use; enum key_group_selector use = NONE;
unsigned int fromSize = 0; unsigned int fromSize = 0;
unsigned int toSize = 0; unsigned int toSize = 0;
@ -557,9 +578,11 @@ out:
if (resultActs != from->acts[group]) if (resultActs != from->acts[group])
free(from->acts[group]); free(from->acts[group]);
into->numLevels[group] = resultWidth; into->numLevels[group] = resultWidth;
free(into->syms[group]); if (resultSyms != into->syms[group])
free(into->syms[group]);
into->syms[group] = resultSyms; into->syms[group] = resultSyms;
free(from->syms[group]); if (resultSyms != from->syms[group])
free(from->syms[group]);
from->syms[group] = NULL; from->syms[group] = NULL;
from->sizeSyms[group] = 0; from->sizeSyms[group] = 0;
into->sizeSyms[group] = resultSize; into->sizeSyms[group] = resultSize;
@ -569,7 +592,8 @@ out:
from->symsMapNumEntries[group] = NULL; from->symsMapNumEntries[group] = NULL;
into->acts[group] = resultActs; into->acts[group] = resultActs;
from->acts[group] = NULL; from->acts[group] = NULL;
into->symsDefined |= (1 << group); if (into->syms[group])
into->symsDefined |= (1 << group);
from->symsDefined &= ~(1 << group); from->symsDefined &= ~(1 << group);
into->actsDefined |= (1 << group); into->actsDefined |= (1 << group);
from->actsDefined &= ~(1 << group); from->actsDefined &= ~(1 << group);