projects
/
platform
/
upstream
/
libxkbcommon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expr: drop ExprResult from ResolveMask
[platform/upstream/libxkbcommon.git]
/
src
/
xkbcomp
/
vmod.c
diff --git
a/src/xkbcomp/vmod.c
b/src/xkbcomp/vmod.c
index
d6cac95
..
5ce1f94
100644
(file)
--- a/
src/xkbcomp/vmod.c
+++ b/
src/xkbcomp/vmod.c
@@
-66,7
+66,7
@@
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
xkb_mod_index_t i;
int nextFree;
xkb_mod_mask_t bit;
xkb_mod_index_t i;
int nextFree;
xkb_mod_mask_t bit;
-
ExprResult mod
;
+
xkb_mod_mask_t mask
;
nextFree = -1;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) {
nextFree = -1;
for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) {
@@
-92,19
+92,19
@@
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
if (!stmt->value)
return true;
if (!stmt->value)
return true;
- if (!ExprResolveModMask(keymap->ctx, stmt->value, &m
od
)) {
+ if (!ExprResolveModMask(keymap->ctx, stmt->value, &m
ask
)) {
log_err(keymap->ctx, "Declaration of %s ignored\n",
xkb_atom_text(keymap->ctx, stmt->name));
return false;
}
log_err(keymap->ctx, "Declaration of %s ignored\n",
xkb_atom_text(keymap->ctx, stmt->name));
return false;
}
- if (m
od.uval
== keymap->vmods[i])
+ if (m
ask
== keymap->vmods[i])
return true;
str1 = ModMaskText(keymap->vmods[i], true);
if (mergeMode == MERGE_OVERRIDE) {
str2 = str1;
return true;
str1 = ModMaskText(keymap->vmods[i], true);
if (mergeMode == MERGE_OVERRIDE) {
str2 = str1;
- str1 = ModMaskText(m
od.uval
, true);
+ str1 = ModMaskText(m
ask
, true);
}
log_warn(keymap->ctx,
}
log_warn(keymap->ctx,
@@
-113,7
+113,7
@@
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
xkb_atom_text(keymap->ctx, stmt->name), str1, str2);
if (mergeMode == MERGE_OVERRIDE)
xkb_atom_text(keymap->ctx, stmt->name), str1, str2);
if (mergeMode == MERGE_OVERRIDE)
- keymap->vmods[i] = m
od.uval
;
+ keymap->vmods[i] = m
ask
;
return true;
}
return true;
}
@@
-134,13
+134,13
@@
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
if (!stmt->value)
return true;
if (!stmt->value)
return true;
- if (!ExprResolveModMask(keymap->ctx, stmt->value, &m
od
)) {
+ if (!ExprResolveModMask(keymap->ctx, stmt->value, &m
ask
)) {
log_err(keymap->ctx, "Declaration of %s ignored\n",
xkb_atom_text(keymap->ctx, stmt->name));
return false;
}
log_err(keymap->ctx, "Declaration of %s ignored\n",
xkb_atom_text(keymap->ctx, stmt->name));
return false;
}
- keymap->vmods[nextFree] = m
od.uval
;
+ keymap->vmods[nextFree] = m
ask
;
return true;
}
return true;
}