diff options
Diffstat (limited to 'quantum/process_keycode/process_tap_dance.c')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 149 | 
1 files changed, 100 insertions, 49 deletions
| diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 9b172e1b6c..403dca5380 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -1,90 +1,141 @@  #include "quantum.h" +#include "action_tapping.h" -static qk_tap_dance_state_t qk_tap_dance_state; +static uint16_t last_td; +static int8_t highest_td = -1; -static void _process_tap_dance_action_pair (qk_tap_dance_state_t *state, -                                            uint16_t kc1, uint16_t kc2) { -  uint16_t kc; +void qk_tap_dance_pair_finished (qk_tap_dance_state_t *state, void *user_data) { +  qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; -  if (state->count == 0) -    return; - -  kc = (state->count == 1) ? kc1 : kc2; +  if (state->count == 1) { +    register_code16 (pair->kc1); +  } else if (state->count == 2) { +    register_code16 (pair->kc2); +  } +} -  register_code (kc); -  unregister_code (kc); +void qk_tap_dance_pair_reset (qk_tap_dance_state_t *state, void *user_data) { +  qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; -  if (state->count >= 2) { -    reset_tap_dance (state); +  if (state->count == 1) { +    unregister_code16 (pair->kc1); +  } else if (state->count == 2) { +    unregister_code16 (pair->kc2);    }  } -static void _process_tap_dance_action_fn (qk_tap_dance_state_t *state, -                                          qk_tap_dance_user_fn_t fn) +static inline void _process_tap_dance_action_fn (qk_tap_dance_state_t *state, +                                                 void *user_data, +                                                 qk_tap_dance_user_fn_t fn)  { -  fn(state); +  if (fn) { +    fn(state, user_data); +  }  } -void process_tap_dance_action (uint16_t keycode) +static inline void process_tap_dance_action_on_each_tap (qk_tap_dance_action_t *action)  { -  uint16_t idx = keycode - QK_TAP_DANCE; -  qk_tap_dance_action_t action; - -  action = tap_dance_actions[idx]; +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_each_tap); +} -  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); -    break; +static inline void process_tap_dance_action_on_dance_finished (qk_tap_dance_action_t *action) +{ +  if (action->state.finished) +    return; +  action->state.finished = true; +  add_mods(action->state.oneshot_mods); +  send_keyboard_report(); +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_dance_finished); +} -  default: -    break; -  } +static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t *action) +{ +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_reset); +  del_mods(action->state.oneshot_mods); +  send_keyboard_report();  }  bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { -  bool r = true; +  uint16_t idx = keycode - QK_TAP_DANCE; +  qk_tap_dance_action_t *action; + +  if (last_td && last_td != keycode) { +    (&tap_dance_actions[last_td - QK_TAP_DANCE])->state.interrupted = true; +  }    switch(keycode) {    case QK_TAP_DANCE ... QK_TAP_DANCE_MAX: -    if (qk_tap_dance_state.keycode && qk_tap_dance_state.keycode != keycode) { -      process_tap_dance_action (qk_tap_dance_state.keycode); -    } else { -      r = false; -    } +    if ((int16_t)idx > highest_td) +      highest_td = idx; +    action = &tap_dance_actions[idx]; +    action->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++; +      action->state.keycode = keycode; +      action->state.count++; +      action->state.timer = timer_read(); +      action->state.oneshot_mods = get_oneshot_mods(); +      process_tap_dance_action_on_each_tap (action); + +      if (last_td && last_td != keycode) { +        qk_tap_dance_action_t *paction = &tap_dance_actions[last_td - QK_TAP_DANCE]; +        paction->state.interrupted = true; +        process_tap_dance_action_on_dance_finished (paction); +        reset_tap_dance (&paction->state); +      } + +      last_td = keycode;      } +      break;    default: -    if (qk_tap_dance_state.keycode) { -      process_tap_dance_action (qk_tap_dance_state.keycode); - -      reset_tap_dance (&qk_tap_dance_state); +    if (!record->event.pressed) +      return true; + +    if (highest_td == -1) +      return true; + +    for (int i = 0; i <= highest_td; i++) { +      action = &tap_dance_actions[i]; +      if (action->state.count == 0) +        continue; +      action->state.interrupted = true; +      process_tap_dance_action_on_dance_finished (action); +      reset_tap_dance (&action->state);      }      break;    } -  return r; +  return true;  }  void matrix_scan_tap_dance () { -  if (qk_tap_dance_state.keycode && timer_elapsed (qk_tap_dance_state.timer) > TAPPING_TERM) { -    process_tap_dance_action (qk_tap_dance_state.keycode); +  if (highest_td == -1) +    return; -    reset_tap_dance (&qk_tap_dance_state); +for (int i = 0; i <= highest_td; i++) { +    qk_tap_dance_action_t *action = &tap_dance_actions[i]; + +    if (action->state.count && timer_elapsed (action->state.timer) > TAPPING_TERM) { +      process_tap_dance_action_on_dance_finished (action); +      reset_tap_dance (&action->state); +    }    }  }  void reset_tap_dance (qk_tap_dance_state_t *state) { -  state->keycode = 0; +  qk_tap_dance_action_t *action; + +  if (state->pressed) +    return; + +  action = &tap_dance_actions[state->keycode - QK_TAP_DANCE]; + +  process_tap_dance_action_on_reset (action); +    state->count = 0; +  state->interrupted = false; +  state->finished = false; +  last_td = 0;  } | 
