darray(char *) includes;
/* xkbcomp needs to assign sequential IDs to XkbFile's it creates. */
- int file_id;
+ unsigned file_id;
struct atom_table *atom_table;
};
return darray_item(ctx->includes, idx);
}
-int
+unsigned
xkb_context_take_file_id(struct xkb_context *ctx)
{
return ctx->file_id++;
const struct xkb_component_names *kccgst,
enum xkb_map_compile_flags flags);
-extern int
+extern unsigned
xkb_context_take_file_id(struct xkb_context *ctx);
bool
{
if (strncmp(new->real, old->real, XkbKeyNameLength) == 0)
{
- if (((new->def.fileID == old->def.fileID) && (warningLevel > 0)) ||
+ if (((new->def.file_id == old->def.file_id) && (warningLevel > 0)) ||
(warningLevel > 9))
{
WARN("Alias of %s for %s declared more than once\n",
use = new->real;
ignore = old->real;
}
- if (((old->def.fileID == new->def.fileID) && (warningLevel > 0)) ||
+ if (((old->def.file_id == new->def.file_id) && (warningLevel > 0)) ||
(warningLevel > 9))
{
WARN("Multiple definitions for alias %s\n",
if (use != old->real)
memcpy(old->real, use, XkbKeyNameLength);
}
- old->def.fileID = new->def.fileID;
+ old->def.file_id = new->def.file_id;
old->def.merge = new->def.merge;
}
{
memset(info, 0, sizeof(AliasInfo));
info->def.merge = merge;
- info->def.fileID = file_id;
+ info->def.file_id = file_id;
strncpy(info->alias, alias, XkbKeyNameLength);
strncpy(info->real, real, XkbKeyNameLength);
}
WSGO("Allocation failure in HandleAliasDef\n");
return false;
}
- info->def.fileID = file_id;
+ info->def.file_id = file_id;
info->def.merge = merge;
info->def.next = (CommonInfo *) * info_in;
memcpy(info->alias, def->alias, XkbKeyNameLength);
def.merge = how_merge;
memcpy(def.alias, tmp->alias, XkbKeyNameLength);
memcpy(def.real, tmp->real, XkbKeyNameLength);
- if (!HandleAliasDef(&def, def.merge, tmp->def.fileID, into))
+ if (!HandleAliasDef(&def, def.merge, tmp->def.file_id, into))
return false;
}
return true;
typedef struct _GroupCompatInfo
{
- unsigned char fileID;
+ unsigned file_id;
unsigned char merge;
bool defined;
unsigned char real_mods;
typedef struct _CompatInfo
{
char *name;
- unsigned fileID;
+ unsigned file_id;
int errorCount;
int nInterps;
SymInterpInfo *interps;
}
static void
-InitCompatInfo(CompatInfo *info, struct xkb_keymap *keymap)
+InitCompatInfo(CompatInfo *info, struct xkb_keymap *keymap, unsigned file_id)
{
unsigned int i;
info->keymap = keymap;
info->name = NULL;
- info->fileID = 0;
+ info->file_id = file_id;
info->errorCount = 0;
info->nInterps = 0;
info->interps = NULL;
info->act = NULL;
- info->dflt.defs.fileID = info->fileID;
+ info->dflt.defs.file_id = file_id;
info->dflt.defs.defined = 0;
info->dflt.defs.merge = MERGE_OVERRIDE;
info->dflt.interp.flags = 0;
for (i = 0; i < sizeof(info->dflt.interp.act.any.data); i++)
info->dflt.interp.act.any.data[i] = 0;
ClearIndicatorMapInfo(keymap->ctx, &info->ledDflt);
- info->ledDflt.defs.fileID = info->fileID;
+ info->ledDflt.defs.file_id = file_id;
info->ledDflt.defs.defined = 0;
info->ledDflt.defs.merge = MERGE_OVERRIDE;
memset(&info->groupCompat[0], 0,
if (new->defs.merge == MERGE_REPLACE)
{
SymInterpInfo *next = (SymInterpInfo *) old->defs.next;
- if (((old->defs.fileID == new->defs.fileID)
+ if (((old->defs.file_id == new->defs.file_id)
&& (warningLevel > 0)) || (warningLevel > 9))
{
WARN("Multiple definitions for \"%s\"\n", siText(new, info));
{
return true;
}
- if (((gc->fileID == newGC->fileID) && (warningLevel > 0))
+ if (((gc->file_id == newGC->file_id) && (warningLevel > 0))
|| (warningLevel > 9))
{
WARN("Compat map for group %d redefined\n", group + 1);
else if (ProcessIncludeFile(keymap->ctx, stmt, FILE_TYPE_COMPAT, &rtrn,
&newMerge))
{
- InitCompatInfo(&included, keymap);
- included.fileID = rtrn->id;
+ InitCompatInfo(&included, keymap, rtrn->id);
included.dflt = info->dflt;
- included.dflt.defs.fileID = rtrn->id;
included.dflt.defs.merge = newMerge;
- included.ledDflt.defs.fileID = rtrn->id;
included.ledDflt.defs.merge = newMerge;
included.act = info->act;
HandleCompatMapFile(rtrn, keymap, MERGE_OVERRIDE, &included);
else if (ProcessIncludeFile(keymap->ctx, next, FILE_TYPE_COMPAT,
&rtrn, &op))
{
- InitCompatInfo(&next_incl, keymap);
- next_incl.fileID = rtrn->id;
+ InitCompatInfo(&next_incl, keymap, rtrn->id);
+ next_incl.file_id = rtrn->id;
next_incl.dflt = info->dflt;
- next_incl.dflt.defs.fileID = rtrn->id;
+ next_incl.dflt.defs.file_id = rtrn->id;
next_incl.dflt.defs.merge = op;
- next_incl.ledDflt.defs.fileID = rtrn->id;
+ next_incl.ledDflt.defs.file_id = rtrn->id;
next_incl.ledDflt.defs.merge = op;
next_incl.act = info->act;
HandleCompatMapFile(rtrn, keymap, MERGE_OVERRIDE, &next_incl);
def->group);
return false;
}
- tmp.fileID = info->fileID;
+ tmp.file_id = info->file_id;
tmp.merge = merge;
if (!ExprResolveVModMask(def->def, &val, keymap))
{
CompatInfo info;
GroupCompatInfo *gcm;
- InitCompatInfo(&info, keymap);
+ InitCompatInfo(&info, keymap, file->id);
info.dflt.defs.merge = merge;
info.ledDflt.defs.merge = merge;
}
for (i = 0, gcm = &info.groupCompat[0]; i < XkbNumKbdGroups; i++, gcm++) {
- if ((gcm->fileID != 0) || (gcm->real_mods != 0) || (gcm->vmods != 0)) {
+ if ((gcm->file_id != 0) || (gcm->real_mods != 0) || (gcm->vmods != 0)) {
keymap->compat->groups[i].mask = gcm->real_mods;
keymap->compat->groups[i].real_mods = gcm->real_mods;
keymap->compat->groups[i].vmods = gcm->vmods;
if (new->defs.merge == MERGE_REPLACE)
{
CommonInfo *next = old->defs.next;
- if (((old->defs.fileID == new->defs.fileID)
+ if (((old->defs.file_id == new->defs.file_id)
&& (warningLevel > 0)) || (warningLevel > 9))
{
WARN("Map for indicator %s redefined\n",
{
char *name; /* e.g. evdev+aliases(qwerty) */
int errorCount;
- unsigned fileID;
+ unsigned file_id;
enum merge_mode merge;
xkb_keycode_t computedMin; /* lowest keycode stored */
xkb_keycode_t computedMax; /* highest keycode stored */
{
ii->defs.defined = 0;
ii->defs.merge = info->merge;
- ii->defs.fileID = info->fileID;
+ ii->defs.file_id = info->file_id;
ii->defs.next = NULL;
ii->ndx = 0;
ii->name = XKB_ATOM_NONE;
old = FindIndicatorByName(info, new->name);
if (old)
{
- if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
+ if (((old->defs.file_id == new->defs.file_id) && (warningLevel > 0))
|| (warningLevel > 9))
{
WARN("Multiple indicators named %s\n",
old = FindIndicatorByIndex(info, new->ndx);
if (old)
{
- if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
+ if (((old->defs.file_id == new->defs.file_id) && (warningLevel > 0))
|| (warningLevel > 9))
{
WARN("Multiple names for indicator %d\n", new->ndx);
}
static void
-InitKeyNamesInfo(KeyNamesInfo * info)
+InitKeyNamesInfo(KeyNamesInfo * info, unsigned file_id)
{
info->name = NULL;
info->leds = NULL;
info->aliases = NULL;
+ info->file_id = file_id;
darray_init(info->names);
darray_init(info->files);
ClearKeyNamesInfo(info);
*/
static bool
AddKeyName(KeyNamesInfo * info,
- xkb_keycode_t kc,
- char *name, enum merge_mode merge, unsigned fileID, bool reportCollisions)
+ xkb_keycode_t kc, char *name, enum merge_mode merge,
+ unsigned file_id, bool reportCollisions)
{
xkb_keycode_t old;
unsigned long lval;
{
reportCollisions = (warningLevel > 7 ||
(warningLevel > 0 &&
- fileID == darray_item(info->files, kc)));
+ file_id == darray_item(info->files, kc)));
}
if (darray_item(info->names, kc) != 0)
}
}
darray_item(info->names, kc) = lval;
- darray_item(info->files, kc) = fileID;
+ darray_item(info->files, kc) = file_id;
return true;
}
continue;
LongToKeyName(darray_item(from->names, i), buf);
buf[4] = '\0';
- if (!AddKeyName(into, i, buf, merge, from->fileID, false))
+ if (!AddKeyName(into, i, buf, merge, from->file_id, false))
into->errorCount++;
}
if (from->leds)
else if (ProcessIncludeFile(keymap->ctx, stmt, FILE_TYPE_KEYCODES, &rtrn,
&newMerge))
{
- InitKeyNamesInfo(&included);
+ InitKeyNamesInfo(&included, rtrn->id);
HandleKeycodesFile(rtrn, keymap, MERGE_OVERRIDE, &included);
if (stmt->stmt != NULL)
{
else if (ProcessIncludeFile(keymap->ctx, next, FILE_TYPE_KEYCODES,
&rtrn, &op))
{
- InitKeyNamesInfo(&next_incl);
+ InitKeyNamesInfo(&next_incl, rtrn->id);
HandleKeycodesFile(rtrn, keymap, MERGE_OVERRIDE, &next_incl);
MergeIncludedKeycodes(&included, keymap, &next_incl, op);
ClearKeyNamesInfo(&next_incl);
else
merge = stmt->merge;
}
- return AddKeyName(info, stmt->value, stmt->name, merge, info->fileID,
+ return AddKeyName(info, stmt->value, stmt->name, merge, info->file_id,
true);
}
info->errorCount++;
break;
case StmtKeyAliasDef: /* e.g. alias <MENU> = <COMP>; */
- if (!HandleAliasDef((KeyAliasDef *) stmt, merge, info->fileID,
+ if (!HandleAliasDef((KeyAliasDef *) stmt, merge, info->file_id,
&info->aliases))
info->errorCount++;
break;
{
KeyNamesInfo info; /* contains all the info after parsing */
- InitKeyNamesInfo(&info);
+ InitKeyNamesInfo(&info, file->id);
HandleKeycodesFile(file, keymap, merge, &info);
{
CommonInfo defs;
xkb_atom_t name;
- int fileID;
+ unsigned file_id;
unsigned mask;
unsigned vmask;
bool groupInfo;
{
char *name;
int errorCount;
- int fileID;
+ unsigned file_id;
unsigned stdPresent;
unsigned nTypes;
KeyTypeInfo *types;
static void
InitKeyTypesInfo(KeyTypesInfo *info, struct xkb_keymap *keymap,
- KeyTypesInfo *from)
+ KeyTypesInfo *from, unsigned file_id)
{
tok_ONE_LEVEL = xkb_atom_intern(keymap->ctx, "ONE_LEVEL");
tok_TWO_LEVEL = xkb_atom_intern(keymap->ctx, "TWO_LEVEL");
info->stdPresent = 0;
info->nTypes = 0;
info->types = NULL;
+ info->file_id = file_id;
info->dflt.defs.defined = 0;
- info->dflt.defs.fileID = 0;
+ info->dflt.defs.file_id = file_id;
info->dflt.defs.merge = MERGE_OVERRIDE;
info->dflt.defs.next = NULL;
info->dflt.name = XKB_ATOM_NONE;
if (type != NULL)
{
memset(type, 0, sizeof(KeyTypeInfo));
- type->defs.fileID = info->fileID;
+ type->defs.file_id = info->file_id;
info->types = AddCommonInfo(&info->types->defs, &type->defs);
info->nTypes++;
}
|| (new->defs.merge == MERGE_OVERRIDE))
{
KeyTypeInfo *next = (KeyTypeInfo *) old->defs.next;
- if (((old->defs.fileID == new->defs.fileID)
+ if (((old->defs.file_id == new->defs.file_id)
&& (warningLevel > 0)) || (warningLevel > 9))
{
WARN("Multiple definitions of the %s key type\n",
old->defs.next = &next->defs;
return true;
}
- report = (old->defs.fileID == new->defs.fileID) && (warningLevel > 0);
+ report = (old->defs.file_id == new->defs.file_id) && (warningLevel > 0);
if (report)
{
WARN("Multiple definitions of the %s key type\n",
else if (ProcessIncludeFile(keymap->ctx, stmt, FILE_TYPE_TYPES, &rtrn,
&newMerge))
{
- InitKeyTypesInfo(&included, keymap, info);
- included.fileID = included.dflt.defs.fileID = rtrn->id;
+ InitKeyTypesInfo(&included, keymap, info, rtrn->id);
included.dflt.defs.merge = newMerge;
HandleKeyTypesFile(rtrn, keymap, newMerge, &included);
else if (ProcessIncludeFile(keymap->ctx, next, FILE_TYPE_TYPES,
&rtrn, &op))
{
- InitKeyTypesInfo(&next_incl, keymap, &included);
- next_incl.fileID = next_incl.dflt.defs.fileID = rtrn->id;
+ InitKeyTypesInfo(&next_incl, keymap, &included, rtrn->id);
next_incl.dflt.defs.merge = op;
HandleKeyTypesFile(rtrn, keymap, op, &next_incl);
MergeIncludedKeyTypes(&included, &next_incl, op, keymap);
merge = def->merge;
type.defs.defined = 0;
- type.defs.fileID = info->fileID;
+ type.defs.file_id = info->file_id;
type.defs.merge = merge;
type.defs.next = NULL;
type.name = def->name;
KeyTypesInfo info;
KeyTypeInfo *def;
- InitKeyTypesInfo(&info, keymap, NULL);
- info.fileID = file->id;
+ InitKeyTypesInfo(&info, keymap, NULL, file->id);
HandleKeyTypesFile(file, keymap, merge, &info);
{
if (newDefs->defined & field)
{
- if (((oldDefs->fileID == newDefs->fileID)
+ if (((oldDefs->file_id == newDefs->file_id)
&& (warningLevel > 0)) || (warningLevel > 9))
{
*pCollide |= field;
* Init the given key info to sane values.
*/
static void
-InitKeyInfo(KeyInfo * info)
+InitKeyInfo(KeyInfo * info, unsigned file_id)
{
int i;
static const char dflt[4] = "*";
info->defs.defined = 0;
- info->defs.fileID = 0;
+ info->defs.file_id = file_id;
info->defs.merge = MERGE_OVERRIDE;
info->defs.next = NULL;
info->name = KeyNameToLong(dflt);
int i;
info->defs.defined = 0;
- info->defs.fileID = 0;
+ info->defs.file_id = 0;
info->defs.merge = MERGE_OVERRIDE;
info->defs.next = NULL;
info->groupInfo = 0;
{
char *name; /* e.g. pc+us+inet(evdev) */
int errorCount;
- unsigned fileID;
+ unsigned file_id;
enum merge_mode merge;
unsigned explicit_group;
darray(KeyInfo) keys;
} SymbolsInfo;
static void
-InitSymbolsInfo(SymbolsInfo * info, struct xkb_keymap *keymap)
+InitSymbolsInfo(SymbolsInfo * info, struct xkb_keymap *keymap,
+ unsigned file_id)
{
int i;
info->name = NULL;
info->explicit_group = 0;
info->errorCount = 0;
- info->fileID = 0;
+ info->file_id = file_id;
info->merge = MERGE_OVERRIDE;
darray_init(info->keys);
darray_growalloc(info->keys, 110);
info->modMap = NULL;
for (i = 0; i < XkbNumKbdGroups; i++)
info->groupNames[i] = XKB_ATOM_NONE;
- InitKeyInfo(&info->dflt);
+ InitKeyInfo(&info->dflt, file_id);
InitVModInfo(&info->vmods, keymap);
info->action = NULL;
info->aliases = NULL;
clobber = (from->defs.merge != MERGE_AUGMENT);
report = (warningLevel > 9) ||
- ((into->defs.fileID == from->defs.fileID) && (warningLevel > 0));
+ ((into->defs.file_id == from->defs.file_id) && (warningLevel > 0));
darray_init(resultSyms);
return true;
}
report = ((warningLevel > 9) ||
- ((into->defs.fileID == from->defs.fileID)
+ ((into->defs.file_id == from->defs.file_id)
&& (warningLevel > 0)));
for (i = 0; i < XkbNumKbdGroups; i++)
{
else if (ProcessIncludeFile(keymap->ctx, stmt, FILE_TYPE_SYMBOLS, &rtrn,
&newMerge))
{
- InitSymbolsInfo(&included, keymap);
- included.fileID = included.dflt.defs.fileID = rtrn->id;
+ InitSymbolsInfo(&included, keymap, rtrn->id);
included.merge = included.dflt.defs.merge = MERGE_OVERRIDE;
if (stmt->modifier)
{
else if (ProcessIncludeFile(keymap->ctx, next, FILE_TYPE_SYMBOLS,
&rtrn, &op))
{
- InitSymbolsInfo(&next_incl, keymap);
- next_incl.fileID = next_incl.dflt.defs.fileID = rtrn->id;
+ InitSymbolsInfo(&next_incl, keymap, rtrn->id);
next_incl.merge = next_incl.dflt.defs.merge = MERGE_OVERRIDE;
if (next->modifier)
{
{
KeyInfo key;
- InitKeyInfo(&key);
+ InitKeyInfo(&key, info->file_id);
CopyKeyInfo(&info->dflt, &key, false);
key.defs.merge = stmt->merge;
key.name = KeyNameToLong(stmt->keyName);
SymbolsInfo info;
KeyInfo *key;
- InitSymbolsInfo(&info, keymap);
- info.dflt.defs.fileID = file->id;
+ InitSymbolsInfo(&info, keymap, file->id);
info.dflt.defs.merge = merge;
HandleSymbolsFile(file, keymap, merge, &info);
typedef struct _CommonInfo
{
unsigned short defined;
- unsigned char fileID;
+ unsigned file_id;
unsigned char merge;
struct _CommonInfo *next;
} CommonInfo;