diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-09-10 20:40:05 +0100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-09-10 20:40:32 +0100 |
| commit | 461f8a7697695e2455a7da929a5966f7a98dcedc (patch) | |
| tree | 646127c20865d1d103e49eefc6c5691093055bf4 /src/xkbcomp/action.c | |
| parent | 70c775f69d2a5ac529468a7d296523ecc171f547 (diff) | |
| download | xorg-lib-libxkbcommon-461f8a7697695e2455a7da929a5966f7a98dcedc.tar.gz | |
actions: Remove PointerDefault affect field
This was always set to affect the default button, so no need for it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/xkbcomp/action.c')
| -rw-r--r-- | src/xkbcomp/action.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c index f5b3264..98484b0 100644 --- a/src/xkbcomp/action.c +++ b/src/xkbcomp/action.c @@ -87,7 +87,6 @@ NewActionsInfo(void) /* Apply some "factory defaults". */ /* Increment default button. */ - info->actions[ACTION_TYPE_PTR_DEFAULT].dflt.affect = XkbSA_AffectDfltBtn; info->actions[ACTION_TYPE_PTR_DEFAULT].dflt.flags = 0; info->actions[ACTION_TYPE_PTR_DEFAULT].dflt.value = 1; @@ -558,9 +557,9 @@ HandlePtrBtn(struct xkb_keymap *keymap, union xkb_action *action, } static const LookupEntry ptrDflts[] = { - { "dfltbtn", XkbSA_AffectDfltBtn }, - { "defaultbutton", XkbSA_AffectDfltBtn }, - { "button", XkbSA_AffectDfltBtn }, + { "dfltbtn", 1 }, + { "defaultbutton", 1 }, + { "button", 1 }, { NULL, 0 } }; @@ -580,7 +579,6 @@ HandleSetPtrDflt(struct xkb_keymap *keymap, union xkb_action *action, if (!ExprResolveEnum(keymap->ctx, value, &val, ptrDflts)) return ReportMismatch(keymap, action->type, field, "pointer component"); - act->affect = val; return true; } else if (field == ACTION_FIELD_BUTTON || field == ACTION_FIELD_VALUE) { |