*
********************************************************/
-#include "vmod.h"
-
-void
-InitVModInfo(VModInfo *info, struct xkb_keymap *keymap)
-{
- ClearVModInfo(info, keymap);
- info->errorCount = 0;
-}
-
-void
-ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap)
-{
- int i, bit;
+#include "config.h"
- info->newlyDefined = info->defined = info->available = 0;
-
- for (i = 0; i < XkbNumVirtualMods; i++)
- keymap->vmods[i] = XkbNoModifierMask;
-
- info->keymap = keymap;
- for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1)
- if (keymap->vmod_names[i])
- info->defined |= bit;
-}
-
-/***====================================================================***/
+#include "xkbcomp-priv.h"
+#include "text.h"
+#include "expr.h"
+#include "vmod.h"
-/**
- * Handle one entry in the virtualModifiers line (e.g. NumLock).
- * If the entry is e.g. NumLock=Mod1, stmt->value is not NULL, and the
- * XkbServerMap's vmod is set to the given modifier. Otherwise, the vmod is 0.
- *
- * @param stmt The statement specifying the name and (if any the value).
- * @param mergeMode Merge strategy (e.g. MERGE_OVERRIDE)
- */
bool
-HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
- enum merge_mode mergeMode,
- VModInfo *info)
+HandleVModDef(struct xkb_context *ctx, struct xkb_mod_set *mods,
+ VModDef *stmt, enum merge_mode merge)
{
- int i, bit, nextFree;
- ExprResult mod;
-
- for (i = 0, bit = 1, nextFree = -1; i < XkbNumVirtualMods; i++, bit <<=
- 1) {
- if (info->defined & bit) {
- if (keymap->vmod_names[i] &&
- strcmp(keymap->vmod_names[i],
- xkb_atom_text(keymap->ctx, stmt->name)) == 0) { /* already defined */
- info->available |= bit;
- if (stmt->value == NULL)
- return true;
- else {
- const char *str1;
- const char *str2 = "";
- if (!ExprResolveModMask(keymap->ctx, stmt->value,
- &mod)) {
- str1 = xkb_atom_text(keymap->ctx, stmt->name);
- ACTION("Declaration of %s ignored\n", str1);
- return false;
- }
- if (mod.uval == keymap->vmods[i])
- return true;
-
- str1 = xkb_atom_text(keymap->ctx, stmt->name);
- WARN("Virtual modifier %s multiply defined\n", str1);
- str1 = XkbcModMaskText(keymap->vmods[i], true);
- if (mergeMode == MERGE_OVERRIDE) {
- str2 = str1;
- str1 = XkbcModMaskText(mod.uval, true);
- }
- ACTION("Using %s, ignoring %s\n", str1, str2);
- if (mergeMode == MERGE_OVERRIDE)
- keymap->vmods[i] = mod.uval;
- return true;
- }
- }
+ xkb_mod_index_t i;
+ 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;
}
- else if (nextFree < 0)
- nextFree = i;
}
- if (nextFree < 0) {
- ERROR("Too many virtual modifiers defined (maximum %d)\n",
- XkbNumVirtualMods);
- return false;
- }
- info->defined |= (1 << nextFree);
- info->newlyDefined |= (1 << nextFree);
- info->available |= (1 << nextFree);
- keymap->vmod_names[nextFree] = xkb_atom_strdup(keymap->ctx, stmt->name);
- if (stmt->value == NULL)
- return true;
- if (ExprResolveModMask(keymap->ctx, stmt->value, &mod)) {
- keymap->vmods[nextFree] = mod.uval;
- return true;
+ else {
+ mapping = 0;
}
- ACTION("Declaration of %s ignored\n",
- xkb_atom_text(keymap->ctx, stmt->name));
- return false;
-}
-
-/**
- * Returns the index of the given modifier in the keymap->vmod_names array.
- *
- * @param keymap Pointer to the xkb data structure.
- * @param field The Atom of the modifier's name (e.g. Atom for LAlt)
- * @param type Must be TypeInt, otherwise return false.
- * @param val_rtrn Set to the index of the modifier that matches.
- *
- * @return true on success, false otherwise. If false is returned, val_rtrn is
- * undefined.
- */
-static int
-LookupVModIndex(const struct xkb_keymap *keymap, xkb_atom_t field,
- unsigned type, ExprResult * val_rtrn)
-{
- int i;
- const char *name = xkb_atom_text(keymap->ctx, field);
-
- if (type != TypeInt)
- return false;
- /* For each named modifier, get the name and compare it to the one passed
- * in. If we get a match, return the index of the modifier.
- * The order of modifiers is the same as in the virtual_modifiers line in
- * the xkb_types section.
- */
- for (i = 0; i < XkbNumVirtualMods; i++)
- if (keymap->vmod_names[i] &&
- strcmp(keymap->vmod_names[i], name) == 0) {
- val_rtrn->uval = i;
- 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;
+ }
- return false;
-}
+ if (mod->mapping == mapping)
+ return true;
-/**
- * Get the mask for the given (virtual or core) modifier and set
- * val_rtrn.uval to the mask value.
- *
- * @param priv Pointer to xkb data structure.
- * @param val_rtrn Member uval is set to the mask returned.
- *
- * @return true on success, false otherwise. If false is returned, val_rtrn is
- * undefined.
- */
-bool
-LookupVModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
- unsigned type, ExprResult *val_rtrn)
-{
- if (LookupModMask(ctx, NULL, field, type, val_rtrn)) {
- return true;
- }
- else if (LookupVModIndex(priv, field, type, val_rtrn)) {
- unsigned ndx = val_rtrn->uval;
- val_rtrn->uval = (1 << (XkbNumModifiers + ndx));
- return true;
- }
- return false;
-}
+ if (mod->mapping != 0) {
+ xkb_mod_mask_t use, ignore;
-int
-FindKeypadVMod(struct xkb_keymap *keymap)
-{
- xkb_atom_t name;
- ExprResult rtrn;
+ use = (merge == MERGE_OVERRIDE ? mapping : mod->mapping);
+ ignore = (merge == MERGE_OVERRIDE ? mod->mapping : mapping);
- name = xkb_atom_intern(keymap->ctx, "NumLock");
- if ((keymap) && LookupVModIndex(keymap, name, TypeInt, &rtrn)) {
- return rtrn.ival;
- }
- return -1;
-}
+ 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
-ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,
- ExprResult *val_rtrn, VModInfo *info)
-{
- if (def->op == ExprIdent) {
- int i, bit;
- const char *name = xkb_atom_text(keymap->ctx, def->value.str);
- for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) {
- if ((info->available & bit) && keymap->vmod_names[i] &&
- strcmp(keymap->vmod_names[i], name) == 0) {
- val_rtrn->uval = i;
- return true;
+ mapping = use;
}
+
+ mod->mapping = mapping;
+ return true;
}
}
- if (ExprResolveInteger(keymap->ctx, def, val_rtrn)) {
- if (val_rtrn->uval < XkbNumVirtualMods)
- return true;
- ERROR("Illegal virtual modifier %d (must be 0..%d inclusive)\n",
- val_rtrn->uval, XkbNumVirtualMods - 1);
+
+ if (mods->num_mods >= XKB_MAX_MODS) {
+ log_err(ctx,
+ "Too many modifiers defined (maximum %d)\n",
+ XKB_MAX_MODS);
+ return false;
}
- 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;
}
projects / platform / upstream / libxkbcommon.git / blobdiff