StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

symbols: add CopySymbolsToKeymap 

Like in the other sections.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-09-12 23:29:49 +03:00
parent 376e45eb6d
commit 1d6bffc904
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/xkbcomp/symbols.c
View File

@ -1682,23 +1682,52 @@ CopyModMapDef(SymbolsInfo *info, ModMapEntry *entry)
return true; return true;
} }
/** static bool
* Handle the xkb_symbols section of an xkb file. CopySymbolsToKeymap(struct xkb_keymap *keymap, SymbolsInfo *info)
* {
* @param file The parsed xkb_symbols section of the xkb file. KeyInfo *keyi;
* @param keymap Handle to the keyboard description to store the symbols in. ModMapEntry *mm;
* @param merge Merge strategy (e.g. MERGE_OVERRIDE). xkb_group_index_t i;
*/ struct xkb_key *key;
keymap->symbols_section_name = strdup_safe(info->name);
for (i = 0; i < XKB_NUM_GROUPS; i++)
if (info->groupNames[i] != XKB_ATOM_NONE)
keymap->group_names[i] = info->groupNames[i];
darray_foreach(keyi, info->keys) {
PrepareKeyDef(keyi);
if (!CopySymbolsDef(info, keyi))
info->errorCount++;
}
if (xkb_get_log_verbosity(keymap->ctx) > 3) {
xkb_foreach_key(key, keymap) {
if (key->name[0] == '\0')
continue;
if (key->num_groups < 1)
log_info(keymap->ctx,
"No symbols defined for %s\n",
KeyNameText(key->name));
}
}
darray_foreach(mm, info->modMaps)
if (!CopyModMapDef(info, mm))
info->errorCount++;
/* XXX: If we don't ignore errorCount, things break. */
return true;
}
bool bool
CompileSymbols(XkbFile *file, struct xkb_keymap *keymap, CompileSymbols(XkbFile *file, struct xkb_keymap *keymap,
enum merge_mode merge) enum merge_mode merge)
{ {
xkb_group_index_t i;
struct xkb_key *key;
SymbolsInfo info; SymbolsInfo info;
ActionsInfo *actions; ActionsInfo *actions;
KeyInfo *keyi;
ModMapEntry *mm;
actions = NewActionsInfo(); actions = NewActionsInfo();
if (!actions) if (!actions)
@ -1715,37 +1744,8 @@ CompileSymbols(XkbFile *file, struct xkb_keymap *keymap,
if (info.errorCount != 0) if (info.errorCount != 0)
goto err_info; goto err_info;
if (info.name) if (!CopySymbolsToKeymap(keymap, &info))
keymap->symbols_section_name = strdup(info.name); goto err_info;
for (i = 0; i < XKB_NUM_GROUPS; i++)
if (info.groupNames[i] != XKB_ATOM_NONE)
keymap->group_names[i] = info.groupNames[i];
/* sanitize keys */
darray_foreach(keyi, info.keys)
PrepareKeyDef(keyi);
/* copy! */
darray_foreach(keyi, info.keys)
if (!CopySymbolsDef(&info, keyi))
info.errorCount++;
if (xkb_get_log_verbosity(keymap->ctx) > 3) {
xkb_foreach_key(key, keymap) {
if (key->name[0] == '\0')
continue;
if (key->num_groups < 1)
log_info(info.keymap->ctx,
"No symbols defined for %s\n",
KeyNameText(key->name));
}
}
darray_foreach(mm, info.modMaps)
if (!CopyModMapDef(&info, mm))
info.errorCount++;
ClearSymbolsInfo(&info); ClearSymbolsInfo(&info);
FreeActionsInfo(actions); FreeActionsInfo(actions);