diff options
| -rw-r--r-- | src/text.c | 2 | ||||
| -rw-r--r-- | src/xkbcomp/action.c | 21 |
2 files changed, 21 insertions, 2 deletions
@@ -279,7 +279,7 @@ ModNameToIndex(const struct xkb_keymap *keymap, xkb_atom_t name, } const char * -ActionTypeText(unsigned type) +ActionTypeText(enum xkb_action_type type) { const char *name = LookupValue(actionTypeNames, type); return name ? name : "Private"; diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c index f83c220..d0e18dd 100644 --- a/src/xkbcomp/action.c +++ b/src/xkbcomp/action.c @@ -748,7 +748,26 @@ HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action, return false; } - act->type = (enum xkb_action_type) type; + /* + * It's possible for someone to write something like this: + * actions = [ Private(type=3,data[0]=1,data[1]=3,data[2]=3) ] + * where the type refers to some existing action type, e.g. LockMods. + * This assumes that this action's struct is layed out in memory + * exactly as described in the XKB specification and libraries. + * We, however, have changed these structs in various ways, so this + * assumption is no longer true. Since this is a lousy "feature", we + * make actions like these no-ops for now. + */ + if (type < ACTION_TYPE_PRIVATE) { + log_info(keymap->ctx, + "Private actions of type %s are not supported; Ignored\n", + ActionTypeText(type)); + act->type = ACTION_TYPE_NONE; + } + else { + act->type = (enum xkb_action_type) type; + } + return true; } else if (field == ACTION_FIELD_DATA) { |