X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fxkbcomp%2Fcompat.c;h=44a444cccc9ba260ae4945b1c87e6a5cc0e8bca7;hb=f00e4d030c9dd49e40a8fa08fcae0c1a1be5cf14;hp=176a4efa4628289a77ebc86f2ad93b345256236d;hpb=e43f53a6986a1870bd75a58a82bde2fc957ed3f5;p=platform%2Fupstream%2Flibxkbcommon.git diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c index 176a4ef..44a444c 100644 --- a/src/xkbcomp/compat.c +++ b/src/xkbcomp/compat.c @@ -47,6 +47,8 @@ * DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include "xkbcomp-priv.h" #include "text.h" #include "expr.h" @@ -54,239 +56,67 @@ #include "vmod.h" #include "include.h" -/* - * The xkb_compat section - * ===================== - * This section is the third to be processed, after xkb_keycodes and - * xkb_types. - * - * Interpret statements - * -------------------- - * Statements of the form: - * interpret Num_Lock+Any { ... } - * interpret Shift_Lock+AnyOf(Shift+Lock) { ... } - * - * The xkb_symbols section (see symbols.c) allows the keymap author to do, - * among other things, the following for each key: - * - Bind an action, like SetMods or LockGroup, to the key. Actions, like - * symbols, are specified for each level of each group in the key - * separately. - * - Add a virtual modifier to the key's virtual modifier mapping (vmodmap). - * - Specify whether the key should repeat or not. - * - * However, doing this for each key (or level) is tedious and inflexible. - * Interpret's are a mechanism to apply these settings to a bunch of - * keys/levels at once. - * - * Each interpret specifies a condition by which it attaches to certain - * levels. The condition consists of two parts: - * - A keysym. If the level has a different (or more than one) keysym, the - * match failes. Leaving out the keysym is equivalent to using the - * NoSymbol keysym, which always matches successfully. - * - A modifier predicate. The predicate consists of a matching operation - * and a mask of (real) modifiers. The modifers are matched against the - * key's modifier map (modmap). The matching operation can be one of the - * following: - * + AnyOfOrNone - The modmap must either be empty or include at least - * one of the specified modifiers. - * + AnyOf - The modmap must include at least one of the specified - * modifiers. - * + NoneOf - The modmap must not include any of the specified modifiers. - * + AllOf - The modmap must include all of the specified modifiers (but - * may include others as well). - * + Exactly - The modmap must be exactly the same as the specified - * modifiers. - * Leaving out the predicate is equivalent to usign AnyOfOrNone while - * specifying all modifiers. Leaving out just the matching condtition - * is equivalent to using Exactly. - * An interpret may also include "useModMapMods = level1;" - see below. - * - * If a level fulfils the conditions of several interpret's, only the - * most specific one is used: - * - A specific keysym will always match before a generic NoSymbol - * condition. - * - If the keysyms are the same, the interpret with the more specific - * matching operation is used. The above list is sorted from least to - * most specific. - * - If both the keysyms and the matching operations are the same (but the - * modifiers are different), the first interpret is used. - * - * As described above, once an interpret "attaches" to a level, it can bind - * an action to that level, add one virtual modifier to the key's vmodmap, - * or set the key's repeat setting. You should note the following: - * - The key repeat is a property of the entire key; it is not level-specific. - * In order to avoid confusion, it is only inspected for the first level of - * the first group; the interpret's repeat setting is ignored when applied - * to other levels. - * - If one of the above fields was set directly for a key in xkb_symbols, - * the explicit setting takes precedence over the interpret. - * - * The body of the statment may include statements of the following - * forms (all of which are optional): - * - * - useModMapMods statement: - * useModMapMods = level1; - * - * When set to 'level1', the interpret will only match levels which are - * the first level of the first group of the keys. This can be useful in - * conjuction with e.g. a virtualModifier statement. - * - * - action statement: - * action = LockMods(modifiers=NumLock); - * - * Bind this action to the matching levels. - * - * - virtual modifier statement: - * virtualModifier = NumLock; - * - * Add this virtual modifier to the key's vmodmap. The given virtual - * modifier must be declared at the top level of the file with a - * virtual_modifiers statement, e.g.: - * virtual_modifiers NumLock; - * - * - repeat statement: - * repeat = True; - * - * Set whether the key should repeat or not. Must be a boolean value. - * - * Indicator map statements - * ------------------------ - * Statements of the form: - * indicator "Shift Lock" { ... } - * - * This statement specifies the behavior and binding of the indicator - * with the given name ("Shift Lock" above). The name should have been - * declared previously in the xkb_keycodes section (see Indicator name - * statement), and given an index there. If it wasn't, it is created - * with the next free index. - * The body of the statement describes the conditions of the keyboard - * state which will cause the indicator to be lit. It may include the - * following statements: - * - * - modifiers statment: - * modifiers = ScrollLock; - * - * If the given modifiers are in the required state (see below), the - * led is lit. - * - * - whichModifierState statment: - * whichModState = Latched + Locked; - * - * Can be any combination of: - * base, latched, locked, effective - * any (i.e. all of the above) - * none (i.e. none of the above) - * compat (legacy value, treated as effective) - * This will cause the respective portion of the modifer state (see - * struct xkb_state) to be matched against the modifiers given in the - * "modifiers" statement. - * - * Here's a simple example: - * indicator "Num Lock" { - * modifiers = NumLock; - * whichModState = Locked; - * }; - * Whenever the NumLock modifier is locked, the Num Lock indicator - * will light up. - * - * - groups statment: - * groups = All - group1; - * - * If the given groups are in the required state (see below), the led - * is lit. - * - * - whichGroupState statment: - * whichGroupState = Effective; - * - * Can be any combination of: - * base, latched, locked, effective - * any (i.e. all of the above) - * none (i.e. none of the above) - * This will cause the respective portion of the group state (see - * struct xkb_state) to be matched against the groups given in the - * "groups" statement. - * - * Note: the above conditions are disjunctive, i.e. if any of them are - * satisfied the led is lit. - * - * Virtual modifier statements - * --------------------------- - * Statements of the form: - * virtual_modifiers LControl; - * - * Can appear in the xkb_types, xkb_compat, xkb_symbols sections. - * TODO - * - * Effect on keymap - * ---------------- - * After all of the xkb_compat sections have been compiled, the following - * members of struct xkb_keymap are finalized: - * darray(struct xkb_sym_interpret) sym_interpret; - * darray(struct xkb_indicator_map) indicators; - * char *compat_section_name; - * TODO: virtual modifiers. - */ - enum si_field { - SI_FIELD_VIRTUAL_MOD = (1 << 0), - SI_FIELD_ACTION = (1 << 1), - SI_FIELD_AUTO_REPEAT = (1 << 2), + SI_FIELD_VIRTUAL_MOD = (1 << 0), + SI_FIELD_ACTION = (1 << 1), + SI_FIELD_AUTO_REPEAT = (1 << 2), SI_FIELD_LEVEL_ONE_ONLY = (1 << 3), }; typedef struct { enum si_field defined; - unsigned file_id; enum merge_mode merge; struct xkb_sym_interpret interp; } SymInterpInfo; enum led_field { - LED_FIELD_MODS = (1 << 0), - LED_FIELD_GROUPS = (1 << 1), - LED_FIELD_CTRLS = (1 << 2), + LED_FIELD_MODS = (1 << 0), + LED_FIELD_GROUPS = (1 << 1), + LED_FIELD_CTRLS = (1 << 2), }; typedef struct { enum led_field defined; - unsigned file_id; enum merge_mode merge; - struct xkb_indicator_map im; -} LEDInfo; + struct xkb_led led; +} LedInfo; typedef struct { char *name; - unsigned file_id; int errorCount; - SymInterpInfo dflt; + SymInterpInfo default_interp; darray(SymInterpInfo) interps; - LEDInfo ledDflt; - darray(LEDInfo) leds; + LedInfo default_led; + LedInfo leds[XKB_MAX_LEDS]; + unsigned int num_leds; ActionsInfo *actions; - struct xkb_keymap *keymap; + struct xkb_mod_set mods; + + struct xkb_context *ctx; } CompatInfo; static const char * siText(SymInterpInfo *si, CompatInfo *info) { - static char buf[128]; + char *buf = xkb_context_get_buffer(info->ctx, 128); - if (si == &info->dflt) + if (si == &info->default_interp) return "default"; - snprintf(buf, sizeof(buf), "%s+%s(%s)", - KeysymText(si->interp.sym), + snprintf(buf, 128, "%s+%s(%s)", + KeysymText(info->ctx, si->interp.sym), SIMatchText(si->interp.match), - ModMaskText(info->keymap, si->interp.mods)); + ModMaskText(info->ctx, &info->mods, si->interp.mods)); + return buf; } static inline bool ReportSINotArray(CompatInfo *info, SymInterpInfo *si, const char *field) { - return ReportNotArray(info->keymap, "symbol interpretation", field, + return ReportNotArray(info->ctx, "symbol interpretation", field, siText(si, info)); } @@ -294,40 +124,39 @@ static inline bool ReportSIBadType(CompatInfo *info, SymInterpInfo *si, const char *field, const char *wanted) { - return ReportBadType(info->keymap->ctx, "symbol interpretation", field, + return ReportBadType(info->ctx, XKB_ERROR_WRONG_FIELD_TYPE, + "symbol interpretation", field, siText(si, info), wanted); } static inline bool -ReportIndicatorBadType(CompatInfo *info, LEDInfo *led, - const char *field, const char *wanted) +ReportLedBadType(CompatInfo *info, LedInfo *ledi, const char *field, + const char *wanted) { - return ReportBadType(info->keymap->ctx, "indicator map", field, - xkb_atom_text(info->keymap->ctx, led->im.name), + return ReportBadType(info->ctx, XKB_ERROR_WRONG_FIELD_TYPE, + "indicator map", field, + xkb_atom_text(info->ctx, ledi->led.name), wanted); } static inline bool -ReportIndicatorNotArray(CompatInfo *info, LEDInfo *led, - const char *field) +ReportLedNotArray(CompatInfo *info, LedInfo *ledi, const char *field) { - return ReportNotArray(info->keymap, "indicator map", field, - xkb_atom_text(info->keymap->ctx, led->im.name)); + return ReportNotArray(info->ctx, "indicator map", field, + xkb_atom_text(info->ctx, ledi->led.name)); } static void -InitCompatInfo(CompatInfo *info, struct xkb_keymap *keymap, unsigned file_id, - ActionsInfo *actions) +InitCompatInfo(CompatInfo *info, struct xkb_context *ctx, + ActionsInfo *actions, const struct xkb_mod_set *mods) { memset(info, 0, sizeof(*info)); - info->keymap = keymap; - info->file_id = file_id; + info->ctx = ctx; info->actions = actions; - info->dflt.file_id = file_id; - info->dflt.merge = MERGE_OVERRIDE; - info->dflt.interp.virtual_mod = XKB_MOD_INVALID; - info->ledDflt.file_id = file_id; - info->ledDflt.merge = MERGE_OVERRIDE; + info->mods = *mods; + info->default_interp.merge = MERGE_OVERRIDE; + info->default_interp.interp.virtual_mod = XKB_MOD_INVALID; + info->default_led.merge = MERGE_OVERRIDE; } static void @@ -335,7 +164,6 @@ ClearCompatInfo(CompatInfo *info) { free(info->name); darray_free(info->interps); - darray_free(info->leds); } static SymInterpInfo * @@ -371,20 +199,17 @@ UseNewInterpField(enum si_field field, SymInterpInfo *old, SymInterpInfo *new, } static bool -AddInterp(CompatInfo *info, SymInterpInfo *new) +AddInterp(CompatInfo *info, SymInterpInfo *new, bool same_file) { - enum si_field collide = 0; - SymInterpInfo *old; - - old = FindMatchingInterp(info, new); + SymInterpInfo *old = FindMatchingInterp(info, new); if (old) { - int verbosity = xkb_context_get_log_verbosity(info->keymap->ctx); - bool report = ((old->file_id == new->file_id && verbosity > 0) || - verbosity > 9); + const int verbosity = xkb_context_get_log_verbosity(info->ctx); + const bool report = (same_file && verbosity > 0) || verbosity > 9; + enum si_field collide = 0; if (new->merge == MERGE_REPLACE) { if (report) - log_warn(info->keymap->ctx, + log_warn(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Multiple definitions for \"%s\"; " "Earlier interpretation ignored\n", siText(new, info)); @@ -399,7 +224,7 @@ AddInterp(CompatInfo *info, SymInterpInfo *new) } if (UseNewInterpField(SI_FIELD_ACTION, old, new, report, &collide)) { - old->interp.act = new->interp.act; + old->interp.action = new->interp.action; old->defined |= SI_FIELD_ACTION; } if (UseNewInterpField(SI_FIELD_AUTO_REPEAT, old, new, report, @@ -409,13 +234,12 @@ AddInterp(CompatInfo *info, SymInterpInfo *new) } if (UseNewInterpField(SI_FIELD_LEVEL_ONE_ONLY, old, new, report, &collide)) { - old->interp.match &= ~MATCH_LEVEL_ONE_ONLY; - old->interp.match |= (new->interp.match & MATCH_LEVEL_ONE_ONLY); + old->interp.level_one_only = new->interp.level_one_only; old->defined |= SI_FIELD_LEVEL_ONE_ONLY; } if (collide) { - log_warn(info->keymap->ctx, + log_warn(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Multiple interpretations of \"%s\"; " "Using %s definition for duplicate fields\n", siText(new, info), @@ -429,7 +253,6 @@ AddInterp(CompatInfo *info, SymInterpInfo *new) return true; } - /***====================================================================***/ static bool @@ -443,19 +266,18 @@ ResolveStateAndPredicate(ExprDef *expr, enum xkb_match_operation *pred_rtrn, } *pred_rtrn = MATCH_EXACTLY; - if (expr->op == EXPR_ACTION_DECL) { - const char *pred_txt = xkb_atom_text(info->keymap->ctx, - expr->value.action.name); - if (!LookupString(symInterpretMatchMaskNames, pred_txt, pred_rtrn)) { - log_err(info->keymap->ctx, + if (expr->expr.op == EXPR_ACTION_DECL) { + const char *pred_txt = xkb_atom_text(info->ctx, expr->action.name); + if (!LookupString(symInterpretMatchMaskNames, pred_txt, pred_rtrn) || + !expr->action.args || expr->action.args->common.next) { + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Illegal modifier predicate \"%s\"; Ignored\n", pred_txt); return false; } - expr = expr->value.action.args; + expr = expr->action.args; } - else if (expr->op == EXPR_IDENT) { - const char *pred_txt = xkb_atom_text(info->keymap->ctx, - expr->value.str); + else if (expr->expr.op == EXPR_IDENT) { + const char *pred_txt = xkb_atom_text(info->ctx, expr->ident.ident); if (pred_txt && istreq(pred_txt, "any")) { *pred_rtrn = MATCH_ANY; *mods_rtrn = MOD_REAL_MASK_ALL; @@ -463,13 +285,14 @@ ResolveStateAndPredicate(ExprDef *expr, enum xkb_match_operation *pred_rtrn, } } - return ExprResolveModMask(info->keymap, expr, MOD_REAL, mods_rtrn); + return ExprResolveModMask(info->ctx, expr, MOD_REAL, &info->mods, + mods_rtrn); } /***====================================================================***/ static bool -UseNewLEDField(enum led_field field, LEDInfo *old, LEDInfo *new, +UseNewLEDField(enum led_field field, LedInfo *old, LedInfo *new, bool report, enum led_field *collide) { if (!(old->defined & field)) @@ -487,69 +310,71 @@ UseNewLEDField(enum led_field field, LEDInfo *old, LEDInfo *new, } static bool -AddIndicatorMap(CompatInfo *info, LEDInfo *new) +AddLedMap(CompatInfo *info, LedInfo *new, bool same_file) { - LEDInfo *old; enum led_field collide; - struct xkb_context *ctx = info->keymap->ctx; - int verbosity = xkb_context_get_log_verbosity(ctx); + const int verbosity = xkb_context_get_log_verbosity(info->ctx); + const bool report = (same_file && verbosity > 0) || verbosity > 9; - darray_foreach(old, info->leds) { - bool report; + for (xkb_led_index_t i = 0; i < info->num_leds; i++) { + LedInfo *old = &info->leds[i]; - if (old->im.name != new->im.name) + if (old->led.name != new->led.name) continue; - if (old->im.mods.mods == new->im.mods.mods && - old->im.groups == new->im.groups && - old->im.ctrls == new->im.ctrls && - old->im.which_mods == new->im.which_mods && - old->im.which_groups == new->im.which_groups) { + if (old->led.mods.mods == new->led.mods.mods && + old->led.groups == new->led.groups && + old->led.ctrls == new->led.ctrls && + old->led.which_mods == new->led.which_mods && + old->led.which_groups == new->led.which_groups) { old->defined |= new->defined; return true; } - report = ((old->file_id == new->file_id && verbosity > 0) || - verbosity > 9); - if (new->merge == MERGE_REPLACE) { if (report) - log_warn(info->keymap->ctx, + log_warn(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Map for indicator %s redefined; " "Earlier definition ignored\n", - xkb_atom_text(ctx, old->im.name)); + xkb_atom_text(info->ctx, old->led.name)); *old = *new; return true; } collide = 0; if (UseNewLEDField(LED_FIELD_MODS, old, new, report, &collide)) { - old->im.which_mods = new->im.which_mods; - old->im.mods = new->im.mods; + old->led.which_mods = new->led.which_mods; + old->led.mods = new->led.mods; old->defined |= LED_FIELD_MODS; } if (UseNewLEDField(LED_FIELD_GROUPS, old, new, report, &collide)) { - old->im.which_groups = new->im.which_groups; - old->im.groups = new->im.groups; + old->led.which_groups = new->led.which_groups; + old->led.groups = new->led.groups; old->defined |= LED_FIELD_GROUPS; } if (UseNewLEDField(LED_FIELD_CTRLS, old, new, report, &collide)) { - old->im.ctrls = new->im.ctrls; + old->led.ctrls = new->led.ctrls; old->defined |= LED_FIELD_CTRLS; } if (collide) { - log_warn(info->keymap->ctx, + log_warn(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Map for indicator %s redefined; " "Using %s definition for duplicate fields\n", - xkb_atom_text(ctx, old->im.name), + xkb_atom_text(info->ctx, old->led.name), (new->merge == MERGE_AUGMENT ? "first" : "last")); } return true; } - darray_append(info->leds, *new); + if (info->num_leds >= XKB_MAX_LEDS) { + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, + "Too many LEDs defined (maximum %d)\n", + XKB_MAX_LEDS); + return false; + } + info->leds[info->num_leds++] = *new; return true; } @@ -557,29 +382,43 @@ static void MergeIncludedCompatMaps(CompatInfo *into, CompatInfo *from, enum merge_mode merge) { - SymInterpInfo *si; - LEDInfo *led; - if (from->errorCount > 0) { into->errorCount += from->errorCount; return; } + into->mods = from->mods; + if (into->name == NULL) { into->name = from->name; from->name = NULL; } - darray_foreach(si, from->interps) { - si->merge = (merge == MERGE_DEFAULT ? si->merge : merge); - if (!AddInterp(into, si)) - into->errorCount++; + if (darray_empty(into->interps)) { + into->interps = from->interps; + darray_init(from->interps); + } + else { + SymInterpInfo *si; + darray_foreach(si, from->interps) { + si->merge = (merge == MERGE_DEFAULT ? si->merge : merge); + if (!AddInterp(into, si, false)) + into->errorCount++; + } } - darray_foreach(led, from->leds) { - led->merge = (merge == MERGE_DEFAULT ? led->merge : merge); - if (!AddIndicatorMap(into, led)) - into->errorCount++; + if (into->num_leds == 0) { + memcpy(into->leds, from->leds, sizeof(*from->leds) * from->num_leds); + into->num_leds = from->num_leds; + from->num_leds = 0; + } + else { + for (xkb_led_index_t i = 0; i < from->num_leds; i++) { + LedInfo *ledi = &from->leds[i]; + ledi->merge = (merge == MERGE_DEFAULT ? ledi->merge : merge); + if (!AddLedMap(into, ledi, false)) + into->errorCount++; + } } } @@ -587,44 +426,43 @@ static void HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge); static bool -HandleIncludeCompatMap(CompatInfo *info, IncludeStmt *stmt) +HandleIncludeCompatMap(CompatInfo *info, IncludeStmt *include) { - enum merge_mode merge = MERGE_DEFAULT; - XkbFile *rtrn; - CompatInfo included, next_incl; - - InitCompatInfo(&included, info->keymap, info->file_id, info->actions); - if (stmt->stmt) { - free(included.name); - included.name = stmt->stmt; - stmt->stmt = NULL; - } + CompatInfo included; + + if (!include) + return false; + + InitCompatInfo(&included, info->ctx, info->actions, &info->mods); + included.name = include->stmt; + include->stmt = NULL; - for (; stmt; stmt = stmt->next_incl) { - if (!ProcessIncludeFile(info->keymap->ctx, stmt, FILE_TYPE_COMPAT, - &rtrn, &merge)) { + for (IncludeStmt *stmt = include; stmt; stmt = stmt->next_incl) { + CompatInfo next_incl; + XkbFile *file; + + file = ProcessIncludeFile(info->ctx, stmt, FILE_TYPE_COMPAT); + if (!file) { info->errorCount += 10; ClearCompatInfo(&included); return false; } - InitCompatInfo(&next_incl, info->keymap, rtrn->id, info->actions); - next_incl.file_id = rtrn->id; - next_incl.dflt = info->dflt; - next_incl.dflt.file_id = rtrn->id; - next_incl.dflt.merge = merge; - next_incl.ledDflt.file_id = rtrn->id; - next_incl.ledDflt.merge = merge; + InitCompatInfo(&next_incl, info->ctx, info->actions, &included.mods); + next_incl.default_interp = info->default_interp; + next_incl.default_interp.merge = stmt->merge; + next_incl.default_led = info->default_led; + next_incl.default_led.merge = stmt->merge; - HandleCompatMapFile(&next_incl, rtrn, MERGE_OVERRIDE); + HandleCompatMapFile(&next_incl, file, MERGE_OVERRIDE); - MergeIncludedCompatMaps(&included, &next_incl, merge); + MergeIncludedCompatMaps(&included, &next_incl, stmt->merge); ClearCompatInfo(&next_incl); - FreeXkbFile(rtrn); + FreeXkbFile(file); } - MergeIncludedCompatMaps(info, &included, merge); + MergeIncludedCompatMaps(info, &included, include->merge); ClearCompatInfo(&included); return (info->errorCount == 0); @@ -634,14 +472,14 @@ static bool SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, ExprDef *arrayNdx, ExprDef *value) { - struct xkb_keymap *keymap = info->keymap; xkb_mod_index_t ndx; if (istreq(field, "action")) { if (arrayNdx) return ReportSINotArray(info, si, field); - if (!HandleActionDef(value, keymap, &si->interp.act, info->actions)) + if (!HandleActionDef(info->ctx, info->actions, &info->mods, + value, &si->interp.action)) return false; si->defined |= SI_FIELD_ACTION; @@ -651,7 +489,7 @@ SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, if (arrayNdx) return ReportSINotArray(info, si, field); - if (!ExprResolveMod(keymap, value, MOD_VIRT, &ndx)) + if (!ExprResolveMod(info->ctx, value, MOD_VIRT, &info->mods, &ndx)) return ReportSIBadType(info, si, field, "virtual modifier"); si->interp.virtual_mod = ndx; @@ -663,7 +501,7 @@ SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, if (arrayNdx) return ReportSINotArray(info, si, field); - if (!ExprResolveBoolean(keymap->ctx, value, &set)) + if (!ExprResolveBoolean(info->ctx, value, &set)) return ReportSIBadType(info, si, field, "boolean"); si->interp.repeat = set; @@ -671,7 +509,7 @@ SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, si->defined |= SI_FIELD_AUTO_REPEAT; } else if (istreq(field, "locking")) { - log_dbg(info->keymap->ctx, + log_dbg(info->ctx, XKB_LOG_MESSAGE_NO_ID, "The \"locking\" field in symbol interpretation is unsupported; " "Ignored\n"); } @@ -682,18 +520,14 @@ SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, if (arrayNdx) return ReportSINotArray(info, si, field); - if (!ExprResolveEnum(keymap->ctx, value, &val, useModMapValueNames)) + if (!ExprResolveEnum(info->ctx, value, &val, useModMapValueNames)) return ReportSIBadType(info, si, field, "level specification"); - if (val) - si->interp.match |= MATCH_LEVEL_ONE_ONLY; - else - si->interp.match &= ~MATCH_LEVEL_ONE_ONLY; - + si->interp.level_one_only = val; si->defined |= SI_FIELD_LEVEL_ONE_ONLY; } else { - return ReportBadField(keymap, "symbol interpretation", field, + return ReportBadField(info->ctx, "symbol interpretation", field, siText(si, info)); } @@ -701,48 +535,47 @@ SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, } static bool -SetIndicatorMapField(CompatInfo *info, LEDInfo *led, - const char *field, ExprDef *arrayNdx, ExprDef *value) +SetLedMapField(CompatInfo *info, LedInfo *ledi, const char *field, + ExprDef *arrayNdx, ExprDef *value) { bool ok = true; - struct xkb_keymap *keymap = info->keymap; if (istreq(field, "modifiers") || istreq(field, "mods")) { if (arrayNdx) - return ReportIndicatorNotArray(info, led, field); + return ReportLedNotArray(info, ledi, field); - if (!ExprResolveModMask(keymap, value, MOD_BOTH, &led->im.mods.mods)) - return ReportIndicatorBadType(info, led, field, "modifier mask"); + if (!ExprResolveModMask(info->ctx, value, MOD_BOTH, + &info->mods, &ledi->led.mods.mods)) + return ReportLedBadType(info, ledi, field, "modifier mask"); - led->defined |= LED_FIELD_MODS; + ledi->defined |= LED_FIELD_MODS; } else if (istreq(field, "groups")) { unsigned int mask; if (arrayNdx) - return ReportIndicatorNotArray(info, led, field); + return ReportLedNotArray(info, ledi, field); - if (!ExprResolveMask(keymap->ctx, value, &mask, groupMaskNames)) - return ReportIndicatorBadType(info, led, field, "group mask"); + if (!ExprResolveMask(info->ctx, value, &mask, groupMaskNames)) + return ReportLedBadType(info, ledi, field, "group mask"); - led->im.groups = mask; - led->defined |= LED_FIELD_GROUPS; + ledi->led.groups = mask; + ledi->defined |= LED_FIELD_GROUPS; } else if (istreq(field, "controls") || istreq(field, "ctrls")) { unsigned int mask; if (arrayNdx) - return ReportIndicatorNotArray(info, led, field); + return ReportLedNotArray(info, ledi, field); - if (!ExprResolveMask(keymap->ctx, value, &mask, ctrlMaskNames)) - return ReportIndicatorBadType(info, led, field, - "controls mask"); + if (!ExprResolveMask(info->ctx, value, &mask, ctrlMaskNames)) + return ReportLedBadType(info, ledi, field, "controls mask"); - led->im.ctrls = mask; - led->defined |= LED_FIELD_CTRLS; + ledi->led.ctrls = mask; + ledi->defined |= LED_FIELD_CTRLS; } else if (istreq(field, "allowexplicit")) { - log_dbg(info->keymap->ctx, + log_dbg(info->ctx, XKB_LOG_MESSAGE_NO_ID, "The \"allowExplicit\" field in indicator statements is unsupported; " "Ignored\n"); } @@ -751,27 +584,27 @@ SetIndicatorMapField(CompatInfo *info, LEDInfo *led, unsigned int mask; if (arrayNdx) - return ReportIndicatorNotArray(info, led, field); + return ReportLedNotArray(info, ledi, field); - if (!ExprResolveMask(keymap->ctx, value, &mask, + if (!ExprResolveMask(info->ctx, value, &mask, modComponentMaskNames)) - return ReportIndicatorBadType(info, led, field, - "mask of modifier state components"); + return ReportLedBadType(info, ledi, field, + "mask of modifier state components"); - led->im.which_mods = mask; + ledi->led.which_mods = mask; } else if (istreq(field, "whichgroupstate")) { unsigned mask; if (arrayNdx) - return ReportIndicatorNotArray(info, led, field); + return ReportLedNotArray(info, ledi, field); - if (!ExprResolveMask(keymap->ctx, value, &mask, + if (!ExprResolveMask(info->ctx, value, &mask, groupComponentMaskNames)) - return ReportIndicatorBadType(info, led, field, - "mask of group state components"); + return ReportLedBadType(info, ledi, field, + "mask of group state components"); - led->im.which_groups = mask; + ledi->led.which_groups = mask; } else if (istreq(field, "driveskbd") || istreq(field, "driveskeyboard") || @@ -779,21 +612,21 @@ SetIndicatorMapField(CompatInfo *info, LEDInfo *led, istreq(field, "leddriveskeyboard") || istreq(field, "indicatordriveskbd") || istreq(field, "indicatordriveskeyboard")) { - log_dbg(info->keymap->ctx, + log_dbg(info->ctx, XKB_LOG_MESSAGE_NO_ID, "The \"%s\" field in indicator statements is unsupported; " "Ignored\n", field); } else if (istreq(field, "index")) { /* Users should see this, it might cause unexpected behavior. */ - log_err(info->keymap->ctx, + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, "The \"index\" field in indicator statements is unsupported; " "Ignored\n"); } else { - log_err(info->keymap->ctx, + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Unknown field %s in map for %s indicator; " "Definition ignored\n", - field, xkb_atom_text(keymap->ctx, led->im.name)); + field, xkb_atom_text(info->ctx, ledi->led.name)); ok = false; } @@ -807,16 +640,17 @@ HandleGlobalVar(CompatInfo *info, VarDef *stmt) ExprDef *ndx; bool ret; - if (!ExprResolveLhs(info->keymap->ctx, stmt->name, &elem, &field, &ndx)) + if (!ExprResolveLhs(info->ctx, stmt->name, &elem, &field, &ndx)) ret = false; else if (elem && istreq(elem, "interpret")) - ret = SetInterpField(info, &info->dflt, field, ndx, stmt->value); + ret = SetInterpField(info, &info->default_interp, field, ndx, + stmt->value); else if (elem && istreq(elem, "indicator")) - ret = SetIndicatorMapField(info, &info->ledDflt, field, ndx, - stmt->value); + ret = SetLedMapField(info, &info->default_led, field, ndx, + stmt->value); else - ret = SetActionField(info->keymap, elem, field, ndx, stmt->value, - info->actions); + ret = SetActionField(info->ctx, info->actions, &info->mods, + elem, field, ndx, stmt->value); return ret; } @@ -828,16 +662,15 @@ HandleInterpBody(CompatInfo *info, VarDef *def, SymInterpInfo *si) ExprDef *arrayNdx; for (; def; def = (VarDef *) def->common.next) { - if (def->name && def->name->op == EXPR_FIELD_REF) { - log_err(info->keymap->ctx, + if (def->name && def->name->expr.op == EXPR_FIELD_REF) { + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Cannot set a global default value from within an interpret statement; " "Move statements to the global file scope\n"); ok = false; continue; } - ok = ExprResolveLhs(info->keymap->ctx, def->name, &elem, &field, - &arrayNdx); + ok = ExprResolveLhs(info->ctx, def->name, &elem, &field, &arrayNdx); if (!ok) continue; @@ -855,26 +688,16 @@ HandleInterpDef(CompatInfo *info, InterpDef *def, enum merge_mode merge) SymInterpInfo si; if (!ResolveStateAndPredicate(def->match, &pred, &mods, info)) { - log_err(info->keymap->ctx, + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Couldn't determine matching modifiers; " "Symbol interpretation ignored\n"); return false; } - si = info->dflt; - - si.merge = merge = (def->merge == MERGE_DEFAULT ? merge : def->merge); - - if (!LookupKeysym(def->sym, &si.interp.sym)) { - log_err(info->keymap->ctx, - "Could not resolve keysym %s; " - "Symbol interpretation ignored\n", - def->sym); - return false; - } - - si.interp.match = pred & MATCH_OP_MASK; - + si = info->default_interp; + si.merge = (def->merge == MERGE_DEFAULT ? merge : def->merge); + si.interp.sym = def->sym; + si.interp.match = pred; si.interp.mods = mods; if (!HandleInterpBody(info, def->def, &si)) { @@ -882,7 +705,7 @@ HandleInterpDef(CompatInfo *info, InterpDef *def, enum merge_mode merge) return false; } - if (!AddInterp(info, &si)) { + if (!AddInterp(info, &si, true)) { info->errorCount++; return false; } @@ -891,44 +714,41 @@ HandleInterpDef(CompatInfo *info, InterpDef *def, enum merge_mode merge) } static bool -HandleIndicatorMapDef(CompatInfo *info, IndicatorMapDef *def, - enum merge_mode merge) +HandleLedMapDef(CompatInfo *info, LedMapDef *def, enum merge_mode merge) { - LEDInfo led; + LedInfo ledi; VarDef *var; bool ok; if (def->merge != MERGE_DEFAULT) merge = def->merge; - led = info->ledDflt; - led.merge = merge; - led.im.name = def->name; + ledi = info->default_led; + ledi.merge = merge; + ledi.led.name = def->name; ok = true; for (var = def->body; var != NULL; var = (VarDef *) var->common.next) { const char *elem, *field; ExprDef *arrayNdx; - if (!ExprResolveLhs(info->keymap->ctx, var->name, &elem, &field, - &arrayNdx)) { + if (!ExprResolveLhs(info->ctx, var->name, &elem, &field, &arrayNdx)) { ok = false; continue; } if (elem) { - log_err(info->keymap->ctx, + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, "Cannot set defaults for \"%s\" element in indicator map; " "Assignment to %s.%s ignored\n", elem, elem, field); ok = false; } else { - ok = SetIndicatorMapField(info, &led, field, arrayNdx, - var->value) && ok; + ok = SetLedMapField(info, &ledi, field, arrayNdx, var->value) && ok; } } if (ok) - return AddIndicatorMap(info, &led); + return AddLedMap(info, &ledi, true); return false; } @@ -937,14 +757,13 @@ static void HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge) { bool ok; - ParseCommon *stmt; merge = (merge == MERGE_DEFAULT ? MERGE_AUGMENT : merge); free(info->name); info->name = strdup_safe(file->name); - for (stmt = file->defs; stmt; stmt = stmt->next) { + for (ParseCommon *stmt = file->defs; stmt; stmt = stmt->next) { switch (stmt->type) { case STMT_INCLUDE: ok = HandleIncludeCompatMap(info, (IncludeStmt *) stmt); @@ -953,23 +772,23 @@ HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge) ok = HandleInterpDef(info, (InterpDef *) stmt, merge); break; case STMT_GROUP_COMPAT: - log_dbg(info->keymap->ctx, + log_dbg(info->ctx, XKB_LOG_MESSAGE_NO_ID, "The \"group\" statement in compat is unsupported; " "Ignored\n"); ok = true; break; - case STMT_INDICATOR_MAP: - ok = HandleIndicatorMapDef(info, (IndicatorMapDef *) stmt, merge); + case STMT_LED_MAP: + ok = HandleLedMapDef(info, (LedMapDef *) stmt, merge); break; case STMT_VAR: ok = HandleGlobalVar(info, (VarDef *) stmt); break; case STMT_VMOD: - ok = HandleVModDef(info->keymap, (VModDef *) stmt); + ok = HandleVModDef(info->ctx, &info->mods, (VModDef *) stmt, merge); break; default: - log_err(info->keymap->ctx, - "Interpretation files may not include other types; " + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, + "Compat files may not include other types; " "Ignoring %s\n", stmt_type_to_string(stmt->type)); ok = false; break; @@ -979,77 +798,78 @@ HandleCompatMapFile(CompatInfo *info, XkbFile *file, enum merge_mode merge) info->errorCount++; if (info->errorCount > 10) { - log_err(info->keymap->ctx, - "Abandoning compatibility map \"%s\"\n", file->topName); + log_err(info->ctx, XKB_LOG_MESSAGE_NO_ID, + "Abandoning compatibility map \"%s\"\n", file->name); break; } } } +/* Temporary struct for CopyInterps. */ +struct collect { + darray(struct xkb_sym_interpret) sym_interprets; +}; + static void -CopyInterps(CompatInfo *info, bool needSymbol, enum xkb_match_operation pred) +CopyInterps(CompatInfo *info, bool needSymbol, enum xkb_match_operation pred, + struct collect *collect) { SymInterpInfo *si; - darray_foreach(si, info->interps) { - if (((si->interp.match & MATCH_OP_MASK) != pred) || - (needSymbol && si->interp.sym == XKB_KEY_NoSymbol) || - (!needSymbol && si->interp.sym != XKB_KEY_NoSymbol)) - continue; - - darray_append(info->keymap->sym_interpret, si->interp); - } + darray_foreach(si, info->interps) + if (si->interp.match == pred && + (si->interp.sym != XKB_KEY_NoSymbol) == needSymbol) + darray_append(collect->sym_interprets, si->interp); } static void -CopyIndicatorMapDefs(CompatInfo *info) +CopyLedMapDefsToKeymap(struct xkb_keymap *keymap, CompatInfo *info) { - LEDInfo *led; - xkb_led_index_t i; - struct xkb_indicator_map *im; - struct xkb_keymap *keymap = info->keymap; + for (xkb_led_index_t idx = 0; idx < info->num_leds; idx++) { + LedInfo *ledi = &info->leds[idx]; + xkb_led_index_t i; + struct xkb_led *led; - darray_foreach(led, info->leds) { /* - * Find the indicator with the given name, if it was already - * declared in keycodes. + * Find the LED with the given name, if it was already declared + * in keycodes. */ - darray_enumerate(i, im, keymap->indicators) - if (im->name == led->im.name) + xkb_leds_enumerate(i, led, keymap) + if (led->name == ledi->led.name) break; /* Not previously declared; create it with next free index. */ - if (i >= darray_size(keymap->indicators)) { - log_dbg(keymap->ctx, + if (i >= keymap->num_leds) { + log_dbg(keymap->ctx, XKB_LOG_MESSAGE_NO_ID, "Indicator name \"%s\" was not declared in the keycodes section; " "Adding new indicator\n", - xkb_atom_text(keymap->ctx, led->im.name)); + xkb_atom_text(keymap->ctx, ledi->led.name)); - darray_enumerate(i, im, keymap->indicators) - if (im->name == XKB_ATOM_NONE) + xkb_leds_enumerate(i, led, keymap) + if (led->name == XKB_ATOM_NONE) break; - if (i >= darray_size(keymap->indicators)) { + if (i >= keymap->num_leds) { /* Not place to put it; ignore. */ if (i >= XKB_MAX_LEDS) { - log_err(keymap->ctx, + log_err(keymap->ctx, XKB_LOG_MESSAGE_NO_ID, "Too many indicators (maximum is %d); " "Indicator name \"%s\" ignored\n", XKB_MAX_LEDS, - xkb_atom_text(keymap->ctx, led->im.name)); + xkb_atom_text(keymap->ctx, ledi->led.name)); continue; } - /* Add a new indicator. */ - darray_resize(keymap->indicators, i + 1); - im = &darray_item(keymap->indicators, i); + + /* Add a new LED. */ + led = &keymap->leds[keymap->num_leds++]; } } - *im = led->im; - if (im->groups != 0 && im->which_groups == 0) - im->which_groups = XKB_STATE_EFFECTIVE; - if (im->mods.mods != 0 && im->which_mods == 0) - im->which_mods = XKB_STATE_EFFECTIVE; + *led = ledi->led; + if (led->groups != 0 && led->which_groups == 0) + led->which_groups = XKB_STATE_LAYOUT_EFFECTIVE; + if (led->mods.mods != 0 && led->which_mods == 0) + led->which_mods = XKB_STATE_MODS_EFFECTIVE; } } @@ -1057,20 +877,31 @@ static bool CopyCompatToKeymap(struct xkb_keymap *keymap, CompatInfo *info) { keymap->compat_section_name = strdup_safe(info->name); + XkbEscapeMapName(keymap->compat_section_name); + + keymap->mods = info->mods; if (!darray_empty(info->interps)) { + struct collect collect; + darray_init(collect.sym_interprets); + /* Most specific to least specific. */ - CopyInterps(info, true, MATCH_EXACTLY); - CopyInterps(info, true, MATCH_ALL | MATCH_NONE); - CopyInterps(info, true, MATCH_ANY); - CopyInterps(info, true, MATCH_ANY_OR_NONE); - CopyInterps(info, false, MATCH_EXACTLY); - CopyInterps(info, false, MATCH_ALL | MATCH_NONE); - CopyInterps(info, false, MATCH_ANY); - CopyInterps(info, false, MATCH_ANY_OR_NONE); + CopyInterps(info, true, MATCH_EXACTLY, &collect); + CopyInterps(info, true, MATCH_ALL, &collect); + CopyInterps(info, true, MATCH_NONE, &collect); + CopyInterps(info, true, MATCH_ANY, &collect); + CopyInterps(info, true, MATCH_ANY_OR_NONE, &collect); + CopyInterps(info, false, MATCH_EXACTLY, &collect); + CopyInterps(info, false, MATCH_ALL, &collect); + CopyInterps(info, false, MATCH_NONE, &collect); + CopyInterps(info, false, MATCH_ANY, &collect); + CopyInterps(info, false, MATCH_ANY_OR_NONE, &collect); + + darray_steal(collect.sym_interprets, + &keymap->sym_interprets, &keymap->num_sym_interprets); } - CopyIndicatorMapDefs(info); + CopyLedMapDefsToKeymap(keymap, info); return true; } @@ -1086,9 +917,9 @@ CompileCompatMap(XkbFile *file, struct xkb_keymap *keymap, if (!actions) return false; - InitCompatInfo(&info, keymap, file->id, actions); - info.dflt.merge = merge; - info.ledDflt.merge = merge; + InitCompatInfo(&info, keymap->ctx, actions, &keymap->mods); + info.default_interp.merge = merge; + info.default_led.merge = merge; HandleCompatMapFile(&info, file, merge); if (info.errorCount != 0)