summaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2025-12-01 06:25:13 +1100
committerGitHub <noreply@github.com>2025-11-30 19:25:13 +0000
commit6ed61c65dd66cdbb450a4920a69bae193ec73f15 (patch)
tree2d8cf989fba3622bbde9ea1d2da0f9bfe65edd95 /quantum/process_keycode
parent330a8597f8fb136374285d2b52a978e311b46ede (diff)
[CI] Format code according to conventions (#25827)
Format code according to conventions
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_autocorrect.c2
-rw-r--r--quantum/process_keycode/process_combo.c14
-rw-r--r--quantum/process_keycode/process_combo.h10
-rw-r--r--quantum/process_keycode/process_key_lock.c2
-rw-r--r--quantum/process_keycode/process_key_override.c3
-rw-r--r--quantum/process_keycode/process_tap_dance.h44
6 files changed, 46 insertions, 29 deletions
diff --git a/quantum/process_keycode/process_autocorrect.c b/quantum/process_keycode/process_autocorrect.c
index 0cde520778..6696ea25a8 100644
--- a/quantum/process_keycode/process_autocorrect.c
+++ b/quantum/process_keycode/process_autocorrect.c
@@ -309,7 +309,7 @@ bool process_autocorrect(uint16_t keycode, keyrecord_t *record) {
309 309
310 if (code & 128) { // A typo was found! Apply autocorrect. 310 if (code & 128) { // A typo was found! Apply autocorrect.
311 const uint8_t backspaces = (code & 63) + !record->event.pressed; 311 const uint8_t backspaces = (code & 63) + !record->event.pressed;
312 const char * changes = (const char *)(autocorrect_data + state + 1); 312 const char *changes = (const char *)(autocorrect_data + state + 1);
313 313
314 /* Gather info about the typo'd word 314 /* Gather info about the typo'd word
315 * 315 *
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index c99a66a74b..3fdb732c41 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -225,7 +225,7 @@ static inline void dump_key_buffer(void) {
225 key_buffer_next = key_buffer_i + 1; 225 key_buffer_next = key_buffer_i + 1;
226 226
227 queued_record_t *qrecord = &key_buffer[key_buffer_i]; 227 queued_record_t *qrecord = &key_buffer[key_buffer_i];
228 keyrecord_t * record = &qrecord->record; 228 keyrecord_t *record = &qrecord->record;
229 229
230 if (IS_NOEVENT(record->event)) { 230 if (IS_NOEVENT(record->event)) {
231 continue; 231 continue;
@@ -318,14 +318,14 @@ void apply_combo(uint16_t combo_index, combo_t *combo) {
318#if defined(EXTRA_EXTRA_LONG_COMBOS) 318#if defined(EXTRA_EXTRA_LONG_COMBOS)
319 uint32_t state = 0; 319 uint32_t state = 0;
320#elif defined(EXTRA_LONG_COMBOS) 320#elif defined(EXTRA_LONG_COMBOS)
321 uint16_t state = 0; 321 uint16_t state = 0;
322#else 322#else
323 uint8_t state = 0; 323 uint8_t state = 0;
324#endif 324#endif
325 325
326 for (uint8_t key_buffer_i = 0; key_buffer_i < key_buffer_size; key_buffer_i++) { 326 for (uint8_t key_buffer_i = 0; key_buffer_i < key_buffer_size; key_buffer_i++) {
327 queued_record_t *qrecord = &key_buffer[key_buffer_i]; 327 queued_record_t *qrecord = &key_buffer[key_buffer_i];
328 keyrecord_t * record = &qrecord->record; 328 keyrecord_t *record = &qrecord->record;
329 uint16_t keycode = qrecord->keycode; 329 uint16_t keycode = qrecord->keycode;
330 330
331 uint8_t key_count = 0; 331 uint8_t key_count = 0;
@@ -361,7 +361,7 @@ static inline void apply_combos(void) {
361 // Apply all buffered normal combos. 361 // Apply all buffered normal combos.
362 for (uint8_t i = combo_buffer_read; i != combo_buffer_write; INCREMENT_MOD(i)) { 362 for (uint8_t i = combo_buffer_read; i != combo_buffer_write; INCREMENT_MOD(i)) {
363 queued_combo_t *buffered_combo = &combo_buffer[i]; 363 queued_combo_t *buffered_combo = &combo_buffer[i];
364 combo_t * combo = combo_get(buffered_combo->combo_index); 364 combo_t *combo = combo_get(buffered_combo->combo_index);
365 365
366#ifdef COMBO_MUST_TAP_PER_COMBO 366#ifdef COMBO_MUST_TAP_PER_COMBO
367 if (get_combo_must_tap(buffered_combo->combo_index, combo)) { 367 if (get_combo_must_tap(buffered_combo->combo_index, combo)) {
@@ -466,7 +466,7 @@ static combo_key_action_t process_single_combo(combo_t *combo, uint16_t keycode,
466 combo_t *drop = NULL; 466 combo_t *drop = NULL;
467 for (uint8_t combo_buffer_i = combo_buffer_read; combo_buffer_i != combo_buffer_write; INCREMENT_MOD(combo_buffer_i)) { 467 for (uint8_t combo_buffer_i = combo_buffer_read; combo_buffer_i != combo_buffer_write; INCREMENT_MOD(combo_buffer_i)) {
468 queued_combo_t *qcombo = &combo_buffer[combo_buffer_i]; 468 queued_combo_t *qcombo = &combo_buffer[combo_buffer_i];
469 combo_t * buffered_combo = combo_get(qcombo->combo_index); 469 combo_t *buffered_combo = combo_get(qcombo->combo_index);
470 470
471 if ((drop = overlaps(buffered_combo, combo))) { 471 if ((drop = overlaps(buffered_combo, combo))) {
472 DISABLE_COMBO(drop); 472 DISABLE_COMBO(drop);
@@ -574,8 +574,8 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
574 /* Only check keycodes from one layer. */ 574 /* Only check keycodes from one layer. */
575 keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key); 575 keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
576#else 576#else
577 uint8_t highest_layer = get_highest_layer(layer_state | default_layer_state); 577 uint8_t highest_layer = get_highest_layer(layer_state | default_layer_state);
578 uint8_t ref_layer = combo_ref_from_layer(highest_layer); 578 uint8_t ref_layer = combo_ref_from_layer(highest_layer);
579 if (ref_layer != highest_layer) { 579 if (ref_layer != highest_layer) {
580 keycode = keymap_key_to_keycode(ref_layer, record->event.key); 580 keycode = keymap_key_to_keycode(ref_layer, record->event.key);
581 } 581 }
diff --git a/quantum/process_keycode/process_combo.h b/quantum/process_keycode/process_combo.h
index f1d534236e..201a53e259 100644
--- a/quantum/process_keycode/process_combo.h
+++ b/quantum/process_keycode/process_combo.h
@@ -45,8 +45,8 @@ typedef struct combo_t {
45#ifdef EXTRA_SHORT_COMBOS 45#ifdef EXTRA_SHORT_COMBOS
46 uint8_t state; 46 uint8_t state;
47#else 47#else
48 bool disabled; 48 bool disabled;
49 bool active; 49 bool active;
50# if defined(EXTRA_EXTRA_LONG_COMBOS) 50# if defined(EXTRA_EXTRA_LONG_COMBOS)
51 uint32_t state; 51 uint32_t state;
52# elif defined(EXTRA_LONG_COMBOS) 52# elif defined(EXTRA_LONG_COMBOS)
@@ -57,10 +57,8 @@ typedef struct combo_t {
57#endif 57#endif
58} combo_t; 58} combo_t;
59 59
60#define COMBO(ck, ca) \ 60#define COMBO(ck, ca) {.keys = &(ck)[0], .keycode = (ca)}
61 { .keys = &(ck)[0], .keycode = (ca) } 61#define COMBO_ACTION(ck) {.keys = &(ck)[0]}
62#define COMBO_ACTION(ck) \
63 { .keys = &(ck)[0] }
64 62
65#define COMBO_END 0 63#define COMBO_END 0
66#ifndef COMBO_TERM 64#ifndef COMBO_TERM
diff --git a/quantum/process_keycode/process_key_lock.c b/quantum/process_keycode/process_key_lock.c
index 2542e32ec2..cd691f6f5e 100644
--- a/quantum/process_keycode/process_key_lock.c
+++ b/quantum/process_keycode/process_key_lock.c
@@ -20,7 +20,7 @@
20 20
21#define BV_64(shift) (((uint64_t)1) << (shift)) 21#define BV_64(shift) (((uint64_t)1) << (shift))
22#define GET_KEY_ARRAY(code) (((code) < 0x40) ? key_state[0] : ((code) < 0x80) ? key_state[1] : ((code) < 0xC0) ? key_state[2] : key_state[3]) 22#define GET_KEY_ARRAY(code) (((code) < 0x40) ? key_state[0] : ((code) < 0x80) ? key_state[1] : ((code) < 0xC0) ? key_state[2] : key_state[3])
23#define GET_CODE_INDEX(code) (((code) < 0x40) ? (code) : ((code) < 0x80) ? (code)-0x40 : ((code) < 0xC0) ? (code)-0x80 : (code)-0xC0) 23#define GET_CODE_INDEX(code) (((code) < 0x40) ? (code) : ((code) < 0x80) ? (code) - 0x40 : ((code) < 0xC0) ? (code) - 0x80 : (code) - 0xC0)
24#define KEY_STATE(code) (GET_KEY_ARRAY(code) & BV_64(GET_CODE_INDEX(code))) == BV_64(GET_CODE_INDEX(code)) 24#define KEY_STATE(code) (GET_KEY_ARRAY(code) & BV_64(GET_CODE_INDEX(code))) == BV_64(GET_CODE_INDEX(code))
25#define SET_KEY_ARRAY_STATE(code, val) \ 25#define SET_KEY_ARRAY_STATE(code, val) \
26 do { \ 26 do { \
diff --git a/quantum/process_keycode/process_key_override.c b/quantum/process_keycode/process_key_override.c
index ce30477ee8..871af874c0 100644
--- a/quantum/process_keycode/process_key_override.c
+++ b/quantum/process_keycode/process_key_override.c
@@ -39,7 +39,8 @@
39# define key_override_printf dprintf 39# define key_override_printf dprintf
40#else 40#else
41# define key_override_printf(str, ...) \ 41# define key_override_printf(str, ...) \
42 {} 42 { \
43 }
43#endif 44#endif
44 45
45// Helpers 46// Helpers
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index 5cccbdf439..b64321da0c 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -57,23 +57,41 @@ typedef struct {
57 void (*layer_function)(uint8_t); 57 void (*layer_function)(uint8_t);
58} tap_dance_dual_role_t; 58} tap_dance_dual_role_t;
59 59
60#define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \ 60#define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \
61 { .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset, NULL}, .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), } 61 { \
62 62 .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset, NULL}, \
63#define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \ 63 .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), \
64 { .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), } 64 }
65 65
66#define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \ 66#define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \
67 { .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), } 67 { \
68 68 .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, \
69#define ACTION_TAP_DANCE_FN(user_fn) \ 69 .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), \
70 { .fn = {NULL, user_fn, NULL, NULL}, .user_data = NULL, } 70 }
71
72#define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
73 { \
74 .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset, NULL}, \
75 .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), \
76 }
77
78#define ACTION_TAP_DANCE_FN(user_fn) \
79 { \
80 .fn = {NULL, user_fn, NULL, NULL}, \
81 .user_data = NULL, \
82 }
71 83
72#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) \ 84#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) \
73 { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, NULL}, .user_data = NULL, } 85 { \
86 .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, NULL}, \
87 .user_data = NULL, \
88 }
74 89
75#define ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(user_fn_on_each_tap, user_fn_on_each_release, user_fn_on_dance_finished, user_fn_on_dance_reset) \ 90#define ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(user_fn_on_each_tap, user_fn_on_each_release, user_fn_on_dance_finished, user_fn_on_dance_reset) \
76 { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, user_fn_on_each_release}, .user_data = NULL, } 91 { \
92 .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, user_fn_on_each_release}, \
93 .user_data = NULL, \
94 }
77 95
78#define TD_INDEX(code) QK_TAP_DANCE_GET_INDEX(code) 96#define TD_INDEX(code) QK_TAP_DANCE_GET_INDEX(code)
79#define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions) 97#define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions)