Tap Dance: remove qk_
prefix (#19313)
This commit is contained in:
parent
83e8e5845a
commit
1978007fae
298 changed files with 1327 additions and 1327 deletions
|
@ -18,8 +18,8 @@
|
|||
static uint16_t active_td;
|
||||
static uint16_t last_tap_time;
|
||||
|
||||
void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data) {
|
||||
qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
|
||||
void tap_dance_pair_on_each_tap(tap_dance_state_t *state, void *user_data) {
|
||||
tap_dance_pair_t *pair = (tap_dance_pair_t *)user_data;
|
||||
|
||||
if (state->count == 2) {
|
||||
register_code16(pair->kc2);
|
||||
|
@ -27,14 +27,14 @@ void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data)
|
|||
}
|
||||
}
|
||||
|
||||
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;
|
||||
void tap_dance_pair_finished(tap_dance_state_t *state, void *user_data) {
|
||||
tap_dance_pair_t *pair = (tap_dance_pair_t *)user_data;
|
||||
|
||||
register_code16(pair->kc1);
|
||||
}
|
||||
|
||||
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;
|
||||
void tap_dance_pair_reset(tap_dance_state_t *state, void *user_data) {
|
||||
tap_dance_pair_t *pair = (tap_dance_pair_t *)user_data;
|
||||
|
||||
if (state->count == 1) {
|
||||
wait_ms(TAP_CODE_DELAY);
|
||||
|
@ -44,8 +44,8 @@ void qk_tap_dance_pair_reset(qk_tap_dance_state_t *state, void *user_data) {
|
|||
}
|
||||
}
|
||||
|
||||
void qk_tap_dance_dual_role_on_each_tap(qk_tap_dance_state_t *state, void *user_data) {
|
||||
qk_tap_dance_dual_role_t *pair = (qk_tap_dance_dual_role_t *)user_data;
|
||||
void tap_dance_dual_role_on_each_tap(tap_dance_state_t *state, void *user_data) {
|
||||
tap_dance_dual_role_t *pair = (tap_dance_dual_role_t *)user_data;
|
||||
|
||||
if (state->count == 2) {
|
||||
layer_move(pair->layer);
|
||||
|
@ -53,8 +53,8 @@ void qk_tap_dance_dual_role_on_each_tap(qk_tap_dance_state_t *state, void *user_
|
|||
}
|
||||
}
|
||||
|
||||
void qk_tap_dance_dual_role_finished(qk_tap_dance_state_t *state, void *user_data) {
|
||||
qk_tap_dance_dual_role_t *pair = (qk_tap_dance_dual_role_t *)user_data;
|
||||
void tap_dance_dual_role_finished(tap_dance_state_t *state, void *user_data) {
|
||||
tap_dance_dual_role_t *pair = (tap_dance_dual_role_t *)user_data;
|
||||
|
||||
if (state->count == 1) {
|
||||
register_code16(pair->kc);
|
||||
|
@ -63,8 +63,8 @@ void qk_tap_dance_dual_role_finished(qk_tap_dance_state_t *state, void *user_dat
|
|||
}
|
||||
}
|
||||
|
||||
void qk_tap_dance_dual_role_reset(qk_tap_dance_state_t *state, void *user_data) {
|
||||
qk_tap_dance_dual_role_t *pair = (qk_tap_dance_dual_role_t *)user_data;
|
||||
void tap_dance_dual_role_reset(tap_dance_state_t *state, void *user_data) {
|
||||
tap_dance_dual_role_t *pair = (tap_dance_dual_role_t *)user_data;
|
||||
|
||||
if (state->count == 1) {
|
||||
wait_ms(TAP_CODE_DELAY);
|
||||
|
@ -72,13 +72,13 @@ void qk_tap_dance_dual_role_reset(qk_tap_dance_state_t *state, void *user_data)
|
|||
}
|
||||
}
|
||||
|
||||
static inline void _process_tap_dance_action_fn(qk_tap_dance_state_t *state, void *user_data, qk_tap_dance_user_fn_t fn) {
|
||||
static inline void _process_tap_dance_action_fn(tap_dance_state_t *state, void *user_data, tap_dance_user_fn_t fn) {
|
||||
if (fn) {
|
||||
fn(state, user_data);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *action) {
|
||||
static inline void process_tap_dance_action_on_each_tap(tap_dance_action_t *action) {
|
||||
action->state.count++;
|
||||
action->state.weak_mods = get_mods();
|
||||
action->state.weak_mods |= get_weak_mods();
|
||||
|
@ -88,17 +88,17 @@ static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *a
|
|||
_process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap);
|
||||
}
|
||||
|
||||
static inline void process_tap_dance_action_on_reset(qk_tap_dance_action_t *action) {
|
||||
static inline void process_tap_dance_action_on_reset(tap_dance_action_t *action) {
|
||||
_process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_reset);
|
||||
del_weak_mods(action->state.weak_mods);
|
||||
#ifndef NO_ACTION_ONESHOT
|
||||
del_mods(action->state.oneshot_mods);
|
||||
#endif
|
||||
send_keyboard_report();
|
||||
action->state = (const qk_tap_dance_state_t){0};
|
||||
action->state = (const tap_dance_state_t){0};
|
||||
}
|
||||
|
||||
static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_action_t *action) {
|
||||
static inline void process_tap_dance_action_on_dance_finished(tap_dance_action_t *action) {
|
||||
if (!action->state.finished) {
|
||||
action->state.finished = true;
|
||||
add_weak_mods(action->state.weak_mods);
|
||||
|
@ -116,7 +116,7 @@ static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_actio
|
|||
}
|
||||
|
||||
bool preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
||||
qk_tap_dance_action_t *action;
|
||||
tap_dance_action_t *action;
|
||||
|
||||
if (!record->event.pressed) return false;
|
||||
|
||||
|
@ -139,7 +139,7 @@ bool preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
|
||||
bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
||||
qk_tap_dance_action_t *action;
|
||||
tap_dance_action_t *action;
|
||||
|
||||
switch (keycode) {
|
||||
case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
|
||||
|
@ -163,7 +163,7 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
|
||||
void tap_dance_task() {
|
||||
qk_tap_dance_action_t *action;
|
||||
tap_dance_action_t *action;
|
||||
|
||||
if (!active_td || timer_elapsed(last_tap_time) <= GET_TAPPING_TERM(active_td, &(keyrecord_t){})) return;
|
||||
|
||||
|
@ -173,7 +173,7 @@ void tap_dance_task() {
|
|||
}
|
||||
}
|
||||
|
||||
void reset_tap_dance(qk_tap_dance_state_t *state) {
|
||||
void reset_tap_dance(tap_dance_state_t *state) {
|
||||
active_td = 0;
|
||||
process_tap_dance_action_on_reset((qk_tap_dance_action_t *)state);
|
||||
process_tap_dance_action_on_reset((tap_dance_action_t *)state);
|
||||
}
|
||||
|
|
|
@ -31,39 +31,39 @@ typedef struct {
|
|||
bool pressed : 1;
|
||||
bool finished : 1;
|
||||
bool interrupted : 1;
|
||||
} qk_tap_dance_state_t;
|
||||
} tap_dance_state_t;
|
||||
|
||||
typedef void (*qk_tap_dance_user_fn_t)(qk_tap_dance_state_t *state, void *user_data);
|
||||
typedef void (*tap_dance_user_fn_t)(tap_dance_state_t *state, void *user_data);
|
||||
|
||||
typedef struct {
|
||||
qk_tap_dance_state_t state;
|
||||
tap_dance_state_t state;
|
||||
struct {
|
||||
qk_tap_dance_user_fn_t on_each_tap;
|
||||
qk_tap_dance_user_fn_t on_dance_finished;
|
||||
qk_tap_dance_user_fn_t on_reset;
|
||||
tap_dance_user_fn_t on_each_tap;
|
||||
tap_dance_user_fn_t on_dance_finished;
|
||||
tap_dance_user_fn_t on_reset;
|
||||
} fn;
|
||||
void *user_data;
|
||||
} qk_tap_dance_action_t;
|
||||
} tap_dance_action_t;
|
||||
|
||||
typedef struct {
|
||||
uint16_t kc1;
|
||||
uint16_t kc2;
|
||||
} qk_tap_dance_pair_t;
|
||||
} tap_dance_pair_t;
|
||||
|
||||
typedef struct {
|
||||
uint16_t kc;
|
||||
uint8_t layer;
|
||||
void (*layer_function)(uint8_t);
|
||||
} qk_tap_dance_dual_role_t;
|
||||
} tap_dance_dual_role_t;
|
||||
|
||||
# define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \
|
||||
{ .fn = {qk_tap_dance_pair_on_each_tap, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset}, .user_data = (void *)&((qk_tap_dance_pair_t){kc1, kc2}), }
|
||||
{ .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset}, .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), }
|
||||
|
||||
# define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \
|
||||
{ .fn = {qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_move}), }
|
||||
{ .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), }
|
||||
|
||||
# define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
|
||||
{ .fn = {NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_invert}), }
|
||||
{ .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), }
|
||||
|
||||
# define ACTION_TAP_DANCE_FN(user_fn) \
|
||||
{ .fn = {NULL, user_fn, NULL}, .user_data = NULL, }
|
||||
|
@ -73,11 +73,11 @@ typedef struct {
|
|||
|
||||
# define TD(n) (QK_TAP_DANCE | TD_INDEX(n))
|
||||
# define TD_INDEX(code) ((code)&0xFF)
|
||||
# define TAP_DANCE_KEYCODE(state) TD(((qk_tap_dance_action_t *)state) - tap_dance_actions)
|
||||
# define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions)
|
||||
|
||||
extern qk_tap_dance_action_t tap_dance_actions[];
|
||||
extern tap_dance_action_t tap_dance_actions[];
|
||||
|
||||
void reset_tap_dance(qk_tap_dance_state_t *state);
|
||||
void reset_tap_dance(tap_dance_state_t *state);
|
||||
|
||||
/* To be used internally */
|
||||
|
||||
|
@ -85,13 +85,13 @@ bool preprocess_tap_dance(uint16_t keycode, keyrecord_t *record);
|
|||
bool process_tap_dance(uint16_t keycode, keyrecord_t *record);
|
||||
void tap_dance_task(void);
|
||||
|
||||
void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data);
|
||||
void qk_tap_dance_pair_finished(qk_tap_dance_state_t *state, void *user_data);
|
||||
void qk_tap_dance_pair_reset(qk_tap_dance_state_t *state, void *user_data);
|
||||
void tap_dance_pair_on_each_tap(tap_dance_state_t *state, void *user_data);
|
||||
void tap_dance_pair_finished(tap_dance_state_t *state, void *user_data);
|
||||
void tap_dance_pair_reset(tap_dance_state_t *state, void *user_data);
|
||||
|
||||
void qk_tap_dance_dual_role_on_each_tap(qk_tap_dance_state_t *state, void *user_data);
|
||||
void qk_tap_dance_dual_role_finished(qk_tap_dance_state_t *state, void *user_data);
|
||||
void qk_tap_dance_dual_role_reset(qk_tap_dance_state_t *state, void *user_data);
|
||||
void tap_dance_dual_role_on_each_tap(tap_dance_state_t *state, void *user_data);
|
||||
void tap_dance_dual_role_finished(tap_dance_state_t *state, void *user_data);
|
||||
void tap_dance_dual_role_reset(tap_dance_state_t *state, void *user_data);
|
||||
|
||||
#else
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue