diff options
author | Ran Benita <ran234@gmail.com> | 2013-02-08 14:32:47 +0200 |
---|---|---|
committer | Ran Benita <ran234@gmail.com> | 2014-04-19 16:23:48 +0300 |
commit | 0b7c8d619889b7c04a6dd9936c163e0b7c801025 (patch) | |
tree | a0620dde240b403f662818a51d40040154d63ccd /src/xkbcomp/compat.c | |
parent | 9fbcf6bb1800152674f9b05fa5915481d0a97d72 (diff) | |
download | libxkbcommon-0b7c8d619889b7c04a6dd9936c163e0b7c801025.tar.gz libxkbcommon-0b7c8d619889b7c04a6dd9936c163e0b7c801025.tar.bz2 libxkbcommon-0b7c8d619889b7c04a6dd9936c163e0b7c801025.zip |
action: take xkb_mod_set instead of the entire keymap
A couple of modiifer actions need this information, but not the entire
keymap.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/compat.c')
-rw-r--r-- | src/xkbcomp/compat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c index e94c231..772e3f3 100644 --- a/src/xkbcomp/compat.c +++ b/src/xkbcomp/compat.c @@ -461,8 +461,8 @@ SetInterpField(CompatInfo *info, SymInterpInfo *si, const char *field, if (arrayNdx) return ReportSINotArray(info, si, field); - if (!HandleActionDef(value, info->keymap, &si->interp.action, - info->actions)) + if (!HandleActionDef(info->ctx, info->actions, &info->keymap->mods, + value, &si->interp.action)) return false; si->defined |= SI_FIELD_ACTION; @@ -633,8 +633,8 @@ HandleGlobalVar(CompatInfo *info, VarDef *stmt) 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->keymap->mods, + elem, field, ndx, stmt->value); return ret; } |