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>

4 files changed, 130 insertions, 124 deletions

diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index 5389a03..5f1fd65 100644
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -221,9 +221,9 @@ ReportActionNotArray(struct xkb_context *ctx, enum xkb_action_type action,
 }
 
 static bool
-HandleNoAction(struct xkb_keymap *keymap, union xkb_action *action,
-               enum action_field field, const ExprDef *array_ndx,
-               const ExprDef *value)
+HandleNoAction(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+               union xkb_action *action, enum action_field field,
+               const ExprDef *array_ndx, const ExprDef *value)
 
 {
     return true;
@@ -252,16 +252,17 @@ CheckBooleanFlag(struct xkb_context *ctx, enum xkb_action_type action,
 }
 
 static bool
-CheckModifierField(struct xkb_keymap *keymap, enum xkb_action_type action,
-                   const ExprDef *array_ndx, const ExprDef *value,
-                   enum xkb_action_flags *flags_inout, xkb_mod_mask_t *mods_rtrn)
+CheckModifierField(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+                   enum xkb_action_type action, const ExprDef *array_ndx,
+                   const ExprDef *value, enum xkb_action_flags *flags_inout,
+                   xkb_mod_mask_t *mods_rtrn)
 {
     if (array_ndx)
-        return ReportActionNotArray(keymap->ctx, action, ACTION_FIELD_MODIFIERS);
+        return ReportActionNotArray(ctx, action, ACTION_FIELD_MODIFIERS);
 
     if (value->expr.op == EXPR_IDENT) {
         const char *valStr;
-        valStr = xkb_atom_text(keymap->ctx, value->ident.ident);
+        valStr = xkb_atom_text(ctx, value->ident.ident);
         if (valStr && (istreq(valStr, "usemodmapmods") ||
                        istreq(valStr, "modmapmods"))) {
             *mods_rtrn = 0;
@@ -270,9 +271,8 @@ CheckModifierField(struct xkb_keymap *keymap, enum xkb_action_type action,
         }
     }
 
-    if (!ExprResolveModMask(keymap->ctx, value, MOD_BOTH, &keymap->mods,
-                            mods_rtrn))
-        return ReportMismatch(keymap->ctx, action,
+    if (!ExprResolveModMask(ctx, value, MOD_BOTH, mods, mods_rtrn))
+        return ReportMismatch(ctx, action,
                               ACTION_FIELD_MODIFIERS, "modifier mask");
 
     *flags_inout &= ~ACTION_MODS_LOOKUP_MODMAP;
@@ -307,32 +307,32 @@ CheckAffectField(struct xkb_context *ctx, enum xkb_action_type action,
 }
 
 static bool
-HandleSetLatchLockMods(struct xkb_keymap *keymap, union xkb_action *action,
-                       enum action_field field, const ExprDef *array_ndx,
-                       const ExprDef *value)
+HandleSetLatchLockMods(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+                       union xkb_action *action, enum action_field field,
+                       const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_mod_action *act = &action->mods;
     const enum xkb_action_type type = action->type;
 
     if (field == ACTION_FIELD_MODIFIERS)
-        return CheckModifierField(keymap, action->type, array_ndx, value,
+        return CheckModifierField(ctx, mods, action->type, array_ndx, value,
                                   &act->flags, &act->mods.mods);
     if ((type == ACTION_TYPE_MOD_SET || type == ACTION_TYPE_MOD_LATCH) &&
         field == ACTION_FIELD_CLEAR_LOCKS)
-        return CheckBooleanFlag(keymap->ctx, action->type, field,
+        return CheckBooleanFlag(ctx, action->type, field,
                                 ACTION_LOCK_CLEAR, array_ndx, value,
                                 &act->flags);
     if (type == ACTION_TYPE_MOD_LATCH &&
         field == ACTION_FIELD_LATCH_TO_LOCK)
-        return CheckBooleanFlag(keymap->ctx, action->type, field,
+        return CheckBooleanFlag(ctx, action->type, field,
                                 ACTION_LATCH_TO_LOCK, array_ndx, value,
                                 &act->flags);
     if (type == ACTION_TYPE_MOD_LOCK &&
         field == ACTION_FIELD_AFFECT)
-        return CheckAffectField(keymap->ctx, action->type, array_ndx, value,
+        return CheckAffectField(ctx, action->type, array_ndx, value,
                                 &act->flags);
 
-    return ReportIllegal(keymap->ctx, action->type, field);
+    return ReportIllegal(ctx, action->type, field);
 }
 
 static bool
@@ -374,34 +374,34 @@ CheckGroupField(struct xkb_context *ctx, enum xkb_action_type action,
 }
 
 static bool
-HandleSetLatchLockGroup(struct xkb_keymap *keymap, union xkb_action *action,
-                        enum action_field field, const ExprDef *array_ndx,
-                        const ExprDef *value)
+HandleSetLatchLockGroup(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+                        union xkb_action *action, enum action_field field,
+                        const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_group_action *act = &action->group;
     const enum xkb_action_type type = action->type;
 
     if (field == ACTION_FIELD_GROUP)
-        return CheckGroupField(keymap->ctx, action->type, array_ndx, value,
+        return CheckGroupField(ctx, action->type, array_ndx, value,
                                &act->flags, &act->group);
     if ((type == ACTION_TYPE_GROUP_SET || type == ACTION_TYPE_GROUP_LATCH) &&
         field == ACTION_FIELD_CLEAR_LOCKS)
-        return CheckBooleanFlag(keymap->ctx, action->type, field,
+        return CheckBooleanFlag(ctx, action->type, field,
                                 ACTION_LOCK_CLEAR, array_ndx, value,
                                 &act->flags);
     if (type == ACTION_TYPE_GROUP_LATCH &&
         field == ACTION_FIELD_LATCH_TO_LOCK)
-        return CheckBooleanFlag(keymap->ctx, action->type, field,
+        return CheckBooleanFlag(ctx, action->type, field,
                                 ACTION_LATCH_TO_LOCK, array_ndx, value,
                                 &act->flags);
 
-    return ReportIllegal(keymap->ctx, action->type, field);
+    return ReportIllegal(ctx, action->type, field);
 }
 
 static bool
-HandleMovePtr(struct xkb_keymap *keymap, union xkb_action *action,
-              enum action_field field, const ExprDef *array_ndx,
-              const ExprDef *value)
+HandleMovePtr(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+              union xkb_action *action, enum action_field field,
+              const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_pointer_action *act = &action->ptr;
 
@@ -411,13 +411,13 @@ HandleMovePtr(struct xkb_keymap *keymap, union xkb_action *action,
                                value->expr.op != EXPR_UNARY_PLUS);
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
-        if (!ExprResolveInteger(keymap->ctx, value, &val))
-            return ReportMismatch(keymap->ctx, action->type, field, "integer");
+        if (!ExprResolveInteger(ctx, value, &val))
+            return ReportMismatch(ctx, action->type, field, "integer");
 
         if (val < INT16_MIN || val > INT16_MAX) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "The %s field in the %s action must be in range %d..%d; "
                     "Action definition ignored\n",
                     fieldText(field), ActionTypeText(action->type),
@@ -439,17 +439,17 @@ HandleMovePtr(struct xkb_keymap *keymap, union xkb_action *action,
         return true;
     }
     else if (field == ACTION_FIELD_ACCEL) {
-        return CheckBooleanFlag(keymap->ctx, action->type, field,
+        return CheckBooleanFlag(ctx, action->type, field,
                                 ACTION_ACCEL, array_ndx, value, &act->flags);
     }
 
-    return ReportIllegal(keymap->ctx, action->type, field);
+    return ReportIllegal(ctx, action->type, field);
 }
 
 static bool
-HandlePtrBtn(struct xkb_keymap *keymap, union xkb_action *action,
-             enum action_field field, const ExprDef *array_ndx,
-             const ExprDef *value)
+HandlePtrBtn(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+             union xkb_action *action, enum action_field field,
+             const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_pointer_button_action *act = &action->btn;
 
@@ -457,14 +457,14 @@ HandlePtrBtn(struct xkb_keymap *keymap, union xkb_action *action,
         int btn;
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
-        if (!ExprResolveButton(keymap->ctx, value, &btn))
-            return ReportMismatch(keymap->ctx, action->type, field,
+        if (!ExprResolveButton(ctx, value, &btn))
+            return ReportMismatch(ctx, action->type, field,
                                   "integer (range 1..5)");
 
         if (btn < 0 || btn > 5) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "Button must specify default or be in the range 1..5; "
                     "Illegal button value %d ignored\n", btn);
             return false;
@@ -475,20 +475,20 @@ HandlePtrBtn(struct xkb_keymap *keymap, union xkb_action *action,
     }
     else if (action->type == ACTION_TYPE_PTR_LOCK &&
              field == ACTION_FIELD_AFFECT) {
-        return CheckAffectField(keymap->ctx, action->type, array_ndx, value,
+        return CheckAffectField(ctx, action->type, array_ndx, value,
                                 &act->flags);
     }
     else if (field == ACTION_FIELD_COUNT) {
         int val;
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
-        if (!ExprResolveInteger(keymap->ctx, value, &val))
-            return ReportMismatch(keymap->ctx, action->type, field, "integer");
+        if (!ExprResolveInteger(ctx, value, &val))
+            return ReportMismatch(ctx, action->type, field, "integer");
 
         if (val < 0 || val > 255) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "The count field must have a value in the range 0..255; "
                     "Illegal count %d ignored\n", val);
             return false;
@@ -498,7 +498,7 @@ HandlePtrBtn(struct xkb_keymap *keymap, union xkb_action *action,
         return true;
     }
 
-    return ReportIllegal(keymap->ctx, action->type, field);
+    return ReportIllegal(ctx, action->type, field);
 }
 
 static const LookupEntry ptrDflts[] = {
@@ -509,9 +509,9 @@ static const LookupEntry ptrDflts[] = {
 };
 
 static bool
-HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action,
-                 enum action_field field, const ExprDef *array_ndx,
-                 const ExprDef *value)
+HandleSetPtrDflt(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+                 union xkb_action *action, enum action_field field,
+                 const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_pointer_default_action *act = &action->dflt;
 
@@ -519,10 +519,10 @@ HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action,
         unsigned int val;
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
-        if (!ExprResolveEnum(keymap->ctx, value, &val, ptrDflts))
-            return ReportMismatch(keymap->ctx, action->type, field,
+        if (!ExprResolveEnum(ctx, value, &val, ptrDflts))
+            return ReportMismatch(ctx, action->type, field,
                                   "pointer component");
         return true;
     }
@@ -531,7 +531,7 @@ HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action,
         int btn;
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
         if (value->expr.op == EXPR_NEGATE ||
             value->expr.op == EXPR_UNARY_PLUS) {
@@ -543,18 +543,18 @@ HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action,
             button = value;
         }
 
-        if (!ExprResolveButton(keymap->ctx, button, &btn))
-            return ReportMismatch(keymap->ctx, action->type, field,
+        if (!ExprResolveButton(ctx, button, &btn))
+            return ReportMismatch(ctx, action->type, field,
                                   "integer (range 1..5)");
 
         if (btn < 0 || btn > 5) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "New default button value must be in the range 1..5; "
                     "Illegal default button value %d ignored\n", btn);
             return false;
         }
         if (btn == 0) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "Cannot set default pointer button to \"default\"; "
                     "Illegal default button setting ignored\n");
             return false;
@@ -564,13 +564,13 @@ HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action,
         return true;
     }
 
-    return ReportIllegal(keymap->ctx, action->type, field);
+    return ReportIllegal(ctx, action->type, field);
 }
 
 static bool
-HandleSwitchScreen(struct xkb_keymap *keymap, union xkb_action *action,
-                   enum action_field field, const ExprDef *array_ndx,
-                   const ExprDef *value)
+HandleSwitchScreen(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+                   union xkb_action *action, enum action_field field,
+                   const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_switch_screen_action *act = &action->screen;
 
@@ -579,7 +579,7 @@ HandleSwitchScreen(struct xkb_keymap *keymap, union xkb_action *action,
         int val;
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
         if (value->expr.op == EXPR_NEGATE ||
             value->expr.op == EXPR_UNARY_PLUS) {
@@ -591,12 +591,12 @@ HandleSwitchScreen(struct xkb_keymap *keymap, union xkb_action *action,
             scrn = value;
         }
 
-        if (!ExprResolveInteger(keymap->ctx, scrn, &val))
-            return ReportMismatch(keymap->ctx, action->type, field,
+        if (!ExprResolveInteger(ctx, scrn, &val))
+            return ReportMismatch(ctx, action->type, field,
                                   "integer (0..255)");
 
         if (val < 0 || val > 255) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "Screen index must be in the range 1..255; "
                     "Illegal screen value %d ignored\n", val);
             return false;
@@ -606,18 +606,18 @@ HandleSwitchScreen(struct xkb_keymap *keymap, union xkb_action *action,
         return true;
     }
     else if (field == ACTION_FIELD_SAME) {
-        return CheckBooleanFlag(keymap->ctx, action->type, field,
+        return CheckBooleanFlag(ctx, action->type, field,
                                 ACTION_SAME_SCREEN, array_ndx, value,
                                 &act->flags);
     }
 
-    return ReportIllegal(keymap->ctx, action->type, field);
+    return ReportIllegal(ctx, action->type, field);
 }
 
 static bool
-HandleSetLockControls(struct xkb_keymap *keymap, union xkb_action *action,
-                      enum action_field field, const ExprDef *array_ndx,
-                      const ExprDef *value)
+HandleSetLockControls(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+                      union xkb_action *action, enum action_field field,
+                      const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_controls_action *act = &action->ctrls;
 
@@ -625,27 +625,27 @@ HandleSetLockControls(struct xkb_keymap *keymap, union xkb_action *action,
         enum xkb_action_controls mask;
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
-        if (!ExprResolveMask(keymap->ctx, value, &mask, ctrlMaskNames))
-            return ReportMismatch(keymap->ctx, action->type, field,
+        if (!ExprResolveMask(ctx, value, &mask, ctrlMaskNames))
+            return ReportMismatch(ctx, action->type, field,
                                   "controls mask");
 
         act->ctrls = mask;
         return true;
     }
     else if (field == ACTION_FIELD_AFFECT) {
-        return CheckAffectField(keymap->ctx, action->type, array_ndx, value,
+        return CheckAffectField(ctx, action->type, array_ndx, value,
                                 &act->flags);
     }
 
-    return ReportIllegal(keymap->ctx, action->type, field);
+    return ReportIllegal(ctx, action->type, field);
 }
 
 static bool
-HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action,
-              enum action_field field, const ExprDef *array_ndx,
-              const ExprDef *value)
+HandlePrivate(struct xkb_context *ctx, const struct xkb_mod_set *mods,
+              union xkb_action *action, enum action_field field,
+              const ExprDef *array_ndx, const ExprDef *value)
 {
     struct xkb_private_action *act = &action->priv;
 
@@ -653,13 +653,13 @@ HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action,
         int type;
 
         if (array_ndx)
-            return ReportActionNotArray(keymap->ctx, action->type, field);
+            return ReportActionNotArray(ctx, action->type, field);
 
-        if (!ExprResolveInteger(keymap->ctx, value, &type))
-            return ReportMismatch(keymap->ctx, ACTION_TYPE_PRIVATE, field, "integer");
+        if (!ExprResolveInteger(ctx, value, &type))
+            return ReportMismatch(ctx, ACTION_TYPE_PRIVATE, field, "integer");
 
         if (type < 0 || type > 255) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "Private action type must be in the range 0..255; "
                     "Illegal type %d ignored\n", type);
             return false;
@@ -676,7 +676,7 @@ HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action,
          * make actions like these no-ops for now.
          */
         if (type < ACTION_TYPE_PRIVATE) {
-            log_info(keymap->ctx,
+            log_info(ctx,
                      "Private actions of type %s are not supported; Ignored\n",
                      ActionTypeText(type));
             act->type = ACTION_TYPE_NONE;
@@ -693,13 +693,13 @@ HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action,
             const char *str;
             size_t len;
 
-            if (!ExprResolveString(keymap->ctx, value, &val))
-                return ReportMismatch(keymap->ctx, action->type, field, "string");
+            if (!ExprResolveString(ctx, value, &val))
+                return ReportMismatch(ctx, action->type, field, "string");
 
-            str = xkb_atom_text(keymap->ctx, val);
+            str = xkb_atom_text(ctx, val);
             len = strlen(str);
             if (len < 1 || len > 7) {
-                log_warn(keymap->ctx,
+                log_warn(ctx,
                          "A private action has 7 data bytes; "
                          "Illegal data ignored\n");
                 return false;
@@ -711,26 +711,26 @@ HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action,
         else {
             int ndx, datum;
 
-            if (!ExprResolveInteger(keymap->ctx, array_ndx, &ndx)) {
-                log_err(keymap->ctx,
+            if (!ExprResolveInteger(ctx, array_ndx, &ndx)) {
+                log_err(ctx,
                         "Array subscript must be integer; "
                         "Illegal subscript ignored\n");
                 return false;
             }
 
             if (ndx < 0 || (size_t) ndx >= sizeof(act->data)) {
-                log_err(keymap->ctx,
+                log_err(ctx,
                         "The data for a private action is %lu bytes long; "
                         "Attempt to use data[%d] ignored\n",
                         (unsigned long) sizeof(act->data), ndx);
                 return false;
             }
 
-            if (!ExprResolveInteger(keymap->ctx, value, &datum))
-                return ReportMismatch(keymap->ctx, act->type, field, "integer");
+            if (!ExprResolveInteger(ctx, value, &datum))
+                return ReportMismatch(ctx, act->type, field, "integer");
 
             if (datum < 0 || datum > 255) {
-                log_err(keymap->ctx,
+                log_err(ctx,
                         "All data for a private action must be 0..255; "
                         "Illegal datum %d ignored\n", datum);
                 return false;
@@ -741,10 +741,11 @@ HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action,
         }
     }
 
-    return ReportIllegal(keymap->ctx, ACTION_TYPE_NONE, field);
+    return ReportIllegal(ctx, ACTION_TYPE_NONE, field);
 }
 
-typedef bool (*actionHandler)(struct xkb_keymap *keymap,
+typedef bool (*actionHandler)(struct xkb_context *ctx,
+                              const struct xkb_mod_set *mods,
                               union xkb_action *action,
                               enum action_field field,
                               const ExprDef *array_ndx,
@@ -772,22 +773,23 @@ static const actionHandler handleAction[_ACTION_TYPE_NUM_ENTRIES] = {
 /***====================================================================***/
 
 bool
-HandleActionDef(ExprDef *def, struct xkb_keymap *keymap,
-                union xkb_action *action, ActionsInfo *info)
+HandleActionDef(struct xkb_context *ctx, ActionsInfo *info,
+                const struct xkb_mod_set *mods, ExprDef *def,
+                union xkb_action *action)
 {
     ExprDef *arg;
     const char *str;
-    unsigned handler_type;
+    enum xkb_action_type handler_type;
 
     if (def->expr.op != EXPR_ACTION_DECL) {
-        log_err(keymap->ctx, "Expected an action definition, found %s\n",
+        log_err(ctx, "Expected an action definition, found %s\n",
                 expr_op_type_to_string(def->expr.op));
         return false;
     }
 
-    str = xkb_atom_text(keymap->ctx, def->action.name);
+    str = xkb_atom_text(ctx, def->action.name);
     if (!stringToAction(str, &handler_type)) {
-        log_err(keymap->ctx, "Unknown action %s\n", str);
+        log_err(ctx, "Unknown action %s\n", str);
         return false;
     }
 
@@ -823,12 +825,11 @@ HandleActionDef(ExprDef *def, struct xkb_keymap *keymap,
             value = (const ExprDef *) &constTrue;
         }
 
-        if (!ExprResolveLhs(keymap->ctx, field, &elemRtrn, &fieldRtrn,
-                            &arrayRtrn))
+        if (!ExprResolveLhs(ctx, field, &elemRtrn, &fieldRtrn, &arrayRtrn))
             return false;
 
         if (elemRtrn) {
-            log_err(keymap->ctx,
+            log_err(ctx,
                     "Cannot change defaults in an action definition; "
                     "Ignoring attempt to change %s.%s\n",
                     elemRtrn, fieldRtrn);
@@ -836,12 +837,12 @@ HandleActionDef(ExprDef *def, struct xkb_keymap *keymap,
         }
 
         if (!stringToField(fieldRtrn, &fieldNdx)) {
-            log_err(keymap->ctx, "Unknown field name %s\n", fieldRtrn);
+            log_err(ctx, "Unknown field name %s\n", fieldRtrn);
             return false;
         }
 
-        if (!handleAction[handler_type](keymap, action, fieldNdx, arrayRtrn,
-                                        value))
+        if (!handleAction[handler_type](ctx, mods, action, fieldNdx,
+                                        arrayRtrn, value))
             return false;
     }
 
@@ -849,8 +850,9 @@ HandleActionDef(ExprDef *def, struct xkb_keymap *keymap,
 }
 
 bool
-SetActionField(struct xkb_keymap *keymap, const char *elem, const char *field,
-               ExprDef *array_ndx, ExprDef *value, ActionsInfo *info)
+SetActionField(struct xkb_context *ctx, ActionsInfo *info,
+               struct xkb_mod_set *mods, const char *elem,
+               const char *field, ExprDef *array_ndx, ExprDef *value)
 {
     enum xkb_action_type action;
     enum action_field action_field;
@@ -859,10 +861,10 @@ SetActionField(struct xkb_keymap *keymap, const char *elem, const char *field,
         return false;
 
     if (!stringToField(field, &action_field)) {
-        log_err(keymap->ctx, "\"%s\" is not a legal field name\n", field);
+        log_err(ctx, "\"%s\" is not a legal field name\n", field);
         return false;
     }
 
-    return handleAction[action](keymap, &info->actions[action],
+    return handleAction[action](ctx, mods, &info->actions[action],
                                 action_field, array_ndx, value);
 }
diff --git a/src/xkbcomp/action.h b/src/xkbcomp/action.h
index 82915ef..1f92e7b 100644
--- a/src/xkbcomp/action.h
+++ b/src/xkbcomp/action.h
@@ -43,11 +43,14 @@ void
 FreeActionsInfo(ActionsInfo *info);
 
 bool
-HandleActionDef(ExprDef *def, struct xkb_keymap *keymap,
-                union xkb_action *action, ActionsInfo *info);
+HandleActionDef(struct xkb_context *ctx, ActionsInfo *info,
+                const struct xkb_mod_set *mods, ExprDef *def,
+                union xkb_action *action);
 
 bool
-SetActionField(struct xkb_keymap *keymap, const char *elem, const char *field,
-               ExprDef *array_ndx, ExprDef *value, ActionsInfo *info);
+SetActionField(struct xkb_context *ctx, ActionsInfo *info,
+               struct xkb_mod_set *mods, const char *elem,
+               const char *field, ExprDef *array_ndx, ExprDef *value);
+
 
 #endif
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;
 }
 
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 3803ea5..310fc0c 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -754,7 +754,8 @@ AddActionsToKey(SymbolsInfo *info, KeyInfo *keyi, ExprDef *arrayNdx,
     for (unsigned i = 0; i < nActs; i++) {
         union xkb_action *toAct = &darray_item(groupi->levels, i).action;
 
-        if (!HandleActionDef(act, info->keymap, toAct, info->actions))
+        if (!HandleActionDef(info->ctx, info->actions, &info->keymap->mods,
+                             act, toAct))
             log_err(info->ctx,
                     "Illegal action definition for %s; "
                     "Action for group %u/level %u ignored\n",
@@ -1024,8 +1025,8 @@ HandleGlobalVar(SymbolsInfo *info, VarDef *stmt)
         ret = true;
     }
     else {
-        ret = SetActionField(info->keymap, elem, field, arrayNdx, stmt->value,
-                             info->actions);
+        ret = SetActionField(info->ctx, info->actions, &info->keymap->mods,
+                             elem, field, arrayNdx, stmt->value);
     }
 
     return ret;