tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix `combo_disable` (#13988) 

- Dump key buffer when combos are disabled.
- Recursive calls to `dump_key_buffer` need to start dumping the buffer
  from index i+1 to avoid possible infinite loops.
- Handle combo key releases even though combo processing is disabled.
master
Pete Sevander 2021-08-14 07:45:52 +03:00 committed by GitHub
parent e80772da40
commit fd3dc3a997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
quantum/process_keycode/process_combo.c
View File

@ -164,11 +164,15 @@ void clear_combos(void) {
} }
static inline void dump_key_buffer(void) { static inline void dump_key_buffer(void) {
/* First call start from 0 index; recursive calls need to start from i+1 index */
static uint8_t key_buffer_next = 0;
if (key_buffer_size == 0) { if (key_buffer_size == 0) {
return; return;
} }
for (uint8_t key_buffer_i = 0; key_buffer_i < key_buffer_size; key_buffer_i++) { for (uint8_t key_buffer_i = key_buffer_next; key_buffer_i < key_buffer_size; key_buffer_i++) {
key_buffer_next = key_buffer_i + 1;
queued_record_t *qrecord = &key_buffer[key_buffer_i]; queued_record_t *qrecord = &key_buffer[key_buffer_i];
keyrecord_t *record = &qrecord->record; keyrecord_t *record = &qrecord->record;
@ -189,7 +193,7 @@ static inline void dump_key_buffer(void) {
record->event.time = 0; record->event.time = 0;
} }
key_buffer_size = 0; key_buffer_next = key_buffer_size = 0;
} }
#define NO_COMBO_KEYS_ARE_DOWN (0 == COMBO_STATE(combo)) #define NO_COMBO_KEYS_ARE_DOWN (0 == COMBO_STATE(combo))
@ -340,9 +344,9 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
return false; return false;
} }
bool key_is_part_of_combo = !COMBO_DISABLED(combo); bool key_is_part_of_combo = !COMBO_DISABLED(combo) && is_combo_enabled();
if (record->event.pressed && !COMBO_DISABLED(combo)) { if (record->event.pressed && key_is_part_of_combo) {
uint16_t time = _get_combo_term(combo_index, combo); uint16_t time = _get_combo_term(combo_index, combo);
if (!COMBO_ACTIVE(combo)) { if (!COMBO_ACTIVE(combo)) {
KEY_STATE_DOWN(combo->state, key_index); KEY_STATE_DOWN(combo->state, key_index);
@ -472,10 +476,6 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
if (!is_combo_enabled()) {
return true;
}
#ifdef COMBO_ONLY_FROM_LAYER #ifdef COMBO_ONLY_FROM_LAYER
/* Only check keycodes from one layer. */ /* Only check keycodes from one layer. */
keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key); keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
@ -550,6 +550,8 @@ void combo_disable(void) {
#endif #endif
b_combo_enable = false; b_combo_enable = false;
combo_buffer_read = combo_buffer_write; combo_buffer_read = combo_buffer_write;
clear_combos();
dump_key_buffer();
} }
void combo_toggle(void) { void combo_toggle(void) {