*
********************************************************/
+#include "config.h"
+
#include "xkbcomp-priv.h"
#include "text.h"
#include "expr.h"
#include "vmod.h"
-void
-InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
-{
- xkb_mod_index_t i;
-
- memset(info, 0, sizeof(*info));
- for (i = 0; i < darray_size(keymap->vmods); i++)
- info->defined |= (1 << i);
-}
-
bool
-HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap, VModInfo *info)
+HandleVModDef(struct xkb_context *ctx, struct xkb_mod_set *mods,
+ VModDef *stmt, enum merge_mode merge)
{
xkb_mod_index_t i;
- const char *name;
- const struct xkb_vmod *vmod;
- struct xkb_vmod new;
-
- if (stmt->value)
- log_err(keymap->ctx,
- "Support for setting a value in a virtual_modifiers statement has been removed; "
- "Value ignored\n");
-
- name = xkb_atom_text(keymap->ctx, stmt->name);
- if (ModNameToIndex(name) != XKB_MOD_INVALID) {
- log_err(keymap->ctx,
- "Can't add a virtual modifier named \"%s\"; "
- "there is already a non-virtual modifier with this name! Ignored\n",
- name);
- return false;
- }
-
- darray_enumerate(i, vmod, keymap->vmods) {
- if (vmod->name == stmt->name) {
- info->available |= 1 << i;
- return true;
+ struct xkb_mod *mod;
+ xkb_mod_mask_t mapping;
+
+ merge = (merge == MERGE_DEFAULT ? stmt->merge : merge);
+
+ if (stmt->value) {
+ /*
+ * This is a statement such as 'virtualModifiers NumLock = Mod1';
+ * it sets the vmod-to-real-mod[s] mapping directly instead of going
+ * through modifier_map or some such.
+ */
+ if (!ExprResolveModMask(ctx, stmt->value, MOD_REAL, mods, &mapping)) {
+ log_err(ctx,
+ "Declaration of %s ignored\n",
+ xkb_atom_text(ctx, stmt->name));
+ return false;
}
}
-
- if (darray_size(keymap->vmods) >= XKB_MAX_VIRTUAL_MODS) {
- log_err(keymap->ctx,
- "Too many virtual modifiers defined (maximum %d)\n",
- XKB_MAX_VIRTUAL_MODS);
- return false;
+ else {
+ mapping = 0;
}
- new.name = stmt->name;
- new.mapping = 0;
- darray_append(keymap->vmods, new);
- info->available |= (1 << (darray_size(keymap->vmods) - 1));
- return true;
-}
+ xkb_mods_enumerate(i, mod, mods) {
+ if (mod->name == stmt->name) {
+ if (mod->type != MOD_VIRT) {
+ log_err(ctx,
+ "Can't add a virtual modifier named \"%s\"; "
+ "there is already a non-virtual modifier with this name! Ignored\n",
+ xkb_atom_text(ctx, mod->name));
+ return false;
+ }
-static bool
-LookupVModIndex(const struct xkb_keymap *keymap, xkb_atom_t field,
- enum expr_value_type type, xkb_mod_index_t *val_rtrn)
-{
- const struct xkb_vmod *vmod;
- xkb_mod_index_t i;
+ if (mod->mapping == mapping)
+ return true;
- if (type != EXPR_TYPE_INT)
- return false;
+ if (mod->mapping != 0) {
+ xkb_mod_mask_t use, ignore;
- darray_enumerate(i, vmod, keymap->vmods) {
- if (vmod->name == field) {
- *val_rtrn = i;
- return true;
- }
- }
+ use = (merge == MERGE_OVERRIDE ? mapping : mod->mapping);
+ ignore = (merge == MERGE_OVERRIDE ? mod->mapping : mapping);
- return false;
-}
+ log_warn(ctx,
+ "Virtual modifier %s defined multiple times; "
+ "Using %s, ignoring %s\n",
+ xkb_atom_text(ctx, stmt->name),
+ ModMaskText(ctx, mods, use),
+ ModMaskText(ctx, mods, ignore));
-bool
-LookupVModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
- enum expr_value_type type, xkb_mod_mask_t *val_rtrn)
-{
- xkb_mod_index_t ndx;
+ mapping = use;
+ }
- if (LookupModMask(ctx, NULL, field, type, val_rtrn)) {
- return true;
- }
- else if (LookupVModIndex(priv, field, type, &ndx)) {
- *val_rtrn = (1 << (XKB_NUM_CORE_MODS + ndx));
- return true;
+ mod->mapping = mapping;
+ return true;
+ }
}
- return false;
-}
-
-bool
-ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,
- xkb_mod_index_t *ndx_rtrn, VModInfo *info)
-{
- const struct xkb_vmod *vmod;
- xkb_mod_index_t i;
- xkb_atom_t name = def->value.str;
-
- if (def->op != EXPR_IDENT) {
- log_err(keymap->ctx,
- "Cannot resolve virtual modifier: "
- "found %s where a virtual modifier name was expected\n",
- expr_op_type_to_string(def->op));
+ if (mods->num_mods >= XKB_MAX_MODS) {
+ log_err(ctx,
+ "Too many modifiers defined (maximum %d)\n",
+ XKB_MAX_MODS);
return false;
}
- darray_enumerate(i, vmod, keymap->vmods) {
- if ((info->available & (1 << i)) && vmod->name == name) {
- *ndx_rtrn = i;
- return true;
- }
- }
-
- log_err(keymap->ctx,
- "Cannot resolve virtual modifier: "
- "\"%s\" was not previously declared\n",
- xkb_atom_text(keymap->ctx, name));
- return false;
+ mods->mods[mods->num_mods].name = stmt->name;
+ mods->mods[mods->num_mods].type = MOD_VIRT;
+ mods->mods[mods->num_mods].mapping = mapping;
+ mods->num_mods++;
+ return true;
}