70e42489de
With this change, tap dance will now store the pressed state of the tap-dance key, and allow one to make an action sooner, while the key is still held, and only unregister when the key is released. The registration must happen in the `on_dance_finished` callback, while unregistering goes to `on_reset`. The surrounding code makes sure not to call either multiple times. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
136 lines
3.3 KiB
C
136 lines
3.3 KiB
C
#include "quantum.h"
|
|
|
|
static qk_tap_dance_state_t qk_tap_dance_state;
|
|
|
|
static void _process_tap_dance_action_pair (qk_tap_dance_state_t *state,
|
|
uint16_t kc1, uint16_t kc2) {
|
|
uint16_t kc;
|
|
|
|
if (state->count == 0)
|
|
return;
|
|
|
|
kc = (state->count == 1) ? kc1 : kc2;
|
|
|
|
register_code (kc);
|
|
unregister_code (kc);
|
|
|
|
if (state->count >= 2) {
|
|
reset_tap_dance (state);
|
|
}
|
|
}
|
|
|
|
static void _process_tap_dance_action_fn (qk_tap_dance_state_t *state,
|
|
qk_tap_dance_user_fn_t fn)
|
|
{
|
|
if (fn) {
|
|
fn(state);
|
|
}
|
|
}
|
|
|
|
void process_tap_dance_action_on_each_tap (uint16_t keycode)
|
|
{
|
|
uint16_t idx = keycode - QK_TAP_DANCE;
|
|
qk_tap_dance_action_t action;
|
|
|
|
action = tap_dance_actions[idx];
|
|
|
|
switch (action.type) {
|
|
case QK_TAP_DANCE_TYPE_FN:
|
|
_process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.on_each_tap);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void process_tap_dance_action_on_dance_finished (uint16_t keycode)
|
|
{
|
|
uint16_t idx = keycode - QK_TAP_DANCE;
|
|
qk_tap_dance_action_t action;
|
|
|
|
action = tap_dance_actions[idx];
|
|
|
|
switch (action.type) {
|
|
case QK_TAP_DANCE_TYPE_PAIR:
|
|
_process_tap_dance_action_pair (&qk_tap_dance_state,
|
|
action.pair.kc1, action.pair.kc2);
|
|
break;
|
|
case QK_TAP_DANCE_TYPE_FN:
|
|
_process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.on_dance_finished);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
|
bool r = true;
|
|
|
|
switch(keycode) {
|
|
case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
|
|
process_tap_dance_action_on_each_tap (qk_tap_dance_state.keycode);
|
|
if (qk_tap_dance_state.keycode && qk_tap_dance_state.keycode != keycode) {
|
|
process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);
|
|
} else if (qk_tap_dance_state.active && qk_tap_dance_state.pressed) {
|
|
reset_tap_dance (&qk_tap_dance_state);
|
|
} else {
|
|
r = false;
|
|
}
|
|
|
|
qk_tap_dance_state.active = true;
|
|
qk_tap_dance_state.pressed = record->event.pressed;
|
|
if (record->event.pressed) {
|
|
qk_tap_dance_state.keycode = keycode;
|
|
qk_tap_dance_state.timer = timer_read ();
|
|
qk_tap_dance_state.count++;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
if (qk_tap_dance_state.keycode) {
|
|
// if we are here, the tap dance was interrupted by a different key
|
|
process_tap_dance_action_on_each_tap (qk_tap_dance_state.keycode);
|
|
process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);
|
|
reset_tap_dance (&qk_tap_dance_state);
|
|
qk_tap_dance_state.active = false;
|
|
}
|
|
break;
|
|
}
|
|
|
|
return r;
|
|
}
|
|
|
|
void matrix_scan_tap_dance () {
|
|
if (qk_tap_dance_state.active && timer_elapsed (qk_tap_dance_state.timer) > TAPPING_TERM) {
|
|
// if we are here, the tap dance was timed out
|
|
process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);
|
|
reset_tap_dance (&qk_tap_dance_state);
|
|
}
|
|
}
|
|
|
|
void reset_tap_dance (qk_tap_dance_state_t *state) {
|
|
uint16_t idx = state->keycode - QK_TAP_DANCE;
|
|
qk_tap_dance_action_t action;
|
|
|
|
if (state->pressed)
|
|
return;
|
|
|
|
action = tap_dance_actions[idx];
|
|
switch (action.type) {
|
|
case QK_TAP_DANCE_TYPE_FN:
|
|
if (action.fn.on_reset) {
|
|
action.fn.on_reset(state);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
state->keycode = 0;
|
|
state->count = 0;
|
|
state->active = false;
|
|
}
|