diff options
| author | Ran Benita <ran234@gmail.com> | 2012-03-24 13:27:48 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-03-27 14:16:36 +0100 |
| commit | 602e87805bdb829dfc0867b1466e2b1dc729ab52 (patch) | |
| tree | 04d955125b823624cf29dd3701b3789e51438425 /src/xkbcomp/symbols.c | |
| parent | d3908b631c531aa3721d91297badad1c85e3c4f1 (diff) | |
| download | xorg-lib-libxkbcommon-602e87805bdb829dfc0867b1466e2b1dc729ab52.tar.gz | |
Define our own NoSymbol value and use it
Since we have our own xkb_keysym_t type, it makes sense to have our own
NoSymbol value instead of the one from X11/X.h.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/symbols.c')
| -rw-r--r-- | src/xkbcomp/symbols.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c index ddb7afb..b3953c1 100644 --- a/src/xkbcomp/symbols.c +++ b/src/xkbcomp/symbols.c @@ -358,14 +358,14 @@ MergeKeyGroups(SymbolsInfo * info, if (from->syms[group] && (i < from->numLevels[group])) fromSym = from->syms[group][i]; else - fromSym = NoSymbol; + fromSym = XKB_KEYSYM_NO_SYMBOL; if (into->syms[group] && (i < into->numLevels[group])) toSym = into->syms[group][i]; else - toSym = NoSymbol; - if ((fromSym == NoSymbol) || (fromSym == toSym)) + toSym = XKB_KEYSYM_NO_SYMBOL; + if ((fromSym == XKB_KEYSYM_NO_SYMBOL) || (fromSym == toSym)) resultSyms[i] = toSym; - else if (toSym == NoSymbol) + else if (toSym == XKB_KEYSYM_NO_SYMBOL) resultSyms[i] = fromSym; else { @@ -927,11 +927,11 @@ AddSymbolsToKey(KeyInfo * key, WARN("Could not resolve keysym %s for key %s, group %d (%s), level %d\n", value->value.list.syms[i], longText(key->name), ndx + 1, XkbcAtomText(info->groupNames[ndx]), nSyms); - key->syms[ndx][i] = NoSymbol; + key->syms[ndx][i] = XKB_KEYSYM_NO_SYMBOL; } } for (j = key->numLevels[ndx] - 1; - (j >= 0) && (key->syms[ndx][j] == NoSymbol); j--) + (j >= 0) && (key->syms[ndx][j] == XKB_KEYSYM_NO_SYMBOL); j--) { key->numLevels[ndx]--; } @@ -1878,7 +1878,7 @@ CopySymbolsDef(struct xkb_desc * xkb, KeyInfo *key, int start_from) if (tmp < key->numLevels[i]) outSyms[tmp] = key->syms[i][tmp]; else - outSyms[tmp] = NoSymbol; + outSyms[tmp] = XKB_KEYSYM_NO_SYMBOL; if ((outActs != NULL) && (key->acts[i] != NULL)) { if (tmp < key->numLevels[i]) |