diff options
| author | Ran Benita <ran@unusedvar.com> | 2020-11-23 19:51:04 +0200 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2020-11-23 20:03:17 +0200 |
| commit | fbf087ea94cb5e7886ac928220112d6833269e3c (patch) | |
| tree | 20ed22b853157e986ac3c22af4590d891d4c837b /src | |
| parent | ac6cd20c55a9772b8e3cd975320e6418edcbb70c (diff) | |
| download | xorg-lib-libxkbcommon-fbf087ea94cb5e7886ac928220112d6833269e3c.tar.gz | |
keymap-dump: follow xkbcomp in printing affect=both in pointer actions
It is equivalent to nothing but good to match up.
Signed-off-by: Ran Benita <ran@unusedvar.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/xkbcomp/keymap-dump.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/xkbcomp/keymap-dump.c b/src/xkbcomp/keymap-dump.c index e6b438a..b7828bf 100644 --- a/src/xkbcomp/keymap-dump.c +++ b/src/xkbcomp/keymap-dump.c @@ -277,9 +277,11 @@ write_led_map(struct xkb_keymap *keymap, struct buf *buf, } static const char * -affect_lock_text(enum xkb_action_flags flags) +affect_lock_text(enum xkb_action_flags flags, bool show_both) { switch (flags & (ACTION_LOCK_NO_LOCK | ACTION_LOCK_NO_UNLOCK)) { + case 0: + return show_both ? ",affect=both" : ""; case ACTION_LOCK_NO_UNLOCK: return ",affect=lock"; case ACTION_LOCK_NO_LOCK: @@ -317,7 +319,7 @@ write_action(struct xkb_keymap *keymap, struct buf *buf, write_buf(buf, "%s%s(modifiers=%s%s%s%s)%s", prefix, type, args, (action->type != ACTION_TYPE_MOD_LOCK && (action->mods.flags & ACTION_LOCK_CLEAR)) ? ",clearLocks" : "", (action->type != ACTION_TYPE_MOD_LOCK && (action->mods.flags & ACTION_LATCH_TO_LOCK)) ? ",latchToLock" : "", - (action->type == ACTION_TYPE_MOD_LOCK) ? affect_lock_text(action->mods.flags) : "", + (action->type == ACTION_TYPE_MOD_LOCK) ? affect_lock_text(action->mods.flags, false) : "", suffix); break; @@ -347,7 +349,7 @@ write_action(struct xkb_keymap *keymap, struct buf *buf, break; case ACTION_TYPE_PTR_LOCK: - args = affect_lock_text(action->btn.flags); + args = affect_lock_text(action->btn.flags, true); /* fallthrough */ case ACTION_TYPE_PTR_BUTTON: write_buf(buf, "%s%s(button=", prefix, type); @@ -382,7 +384,7 @@ write_action(struct xkb_keymap *keymap, struct buf *buf, case ACTION_TYPE_CTRL_LOCK: write_buf(buf, "%s%s(controls=%s%s)%s", prefix, type, ControlMaskText(keymap->ctx, action->ctrls.ctrls), - (action->type == ACTION_TYPE_CTRL_LOCK) ? affect_lock_text(action->ctrls.flags) : "", + (action->type == ACTION_TYPE_CTRL_LOCK) ? affect_lock_text(action->ctrls.flags, false) : "", suffix); break; |