ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow one-shot modifiers to be chained

Browse source 
Many a times one would want to use multiple modifiers with the same key,
preferably without having to hold anything, like `Ctrl+Shift+C` or
`Ctrl+Shift+V` to copy/paste in GNOME Terminal. To make this possible, we need
to be able to chain one-shot modifiers, so that we can have multiple of them
active at the same time.

The easiest way to accomplish this is that whenever we activate a one-shot
modifier, we apply it on top of the existing set, instead of re-setting the
state. When deactivating, either due to an interrupt, or due to a timeout, we
deactivate all oneshots anyway, so the clearing part is covered. When we turn
the one-shot modifier into a toggle, that will also clear all one-shot modifiers
first, so we covered that case too.

Fixes #2796, #1580, and #856.

Signed-off-by: Gergely Nagy <qmk@gergo.csillger.hu>
This commit is contained in:
Gergely Nagy 2018-04-24 16:41:38 +02:00 • committed by Jack Humbert
parent e76eee2d0a
commit 38f204db30
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tmk_core/common/action.c
View file

@ -258,10 +258,10 @@ void process_action(keyrecord_t *record, action_t action)
if (event.pressed) { if (event.pressed) {
if (tap_count == 0) { if (tap_count == 0) {
dprint("MODS_TAP: Oneshot: 0\n"); dprint("MODS_TAP: Oneshot: 0\n");
register_mods(mods); register_mods(mods | get_oneshot_mods());
} else if (tap_count == 1) { } else if (tap_count == 1) {
dprint("MODS_TAP: Oneshot: start\n"); dprint("MODS_TAP: Oneshot: start\n");
set_oneshot_mods(mods); set_oneshot_mods(mods | get_oneshot_mods());
#if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1 #if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1
} else if (tap_count == ONESHOT_TAP_TOGGLE) { } else if (tap_count == ONESHOT_TAP_TOGGLE) {
dprint("MODS_TAP: Toggling oneshot"); dprint("MODS_TAP: Toggling oneshot");
@ -270,7 +270,7 @@ void process_action(keyrecord_t *record, action_t action)
register_mods(mods); register_mods(mods);
#endif #endif
} else { } else {
register_mods(mods); register_mods(mods | get_oneshot_mods());
} }
} else { } else {
if (tap_count == 0) { if (tap_count == 0) {