summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Sevander <pete.sevander@gmail.com>2021-08-14 07:45:52 +0300
committerGitHub <noreply@github.com>2021-08-14 14:45:52 +1000
commitfd3dc3a997d86be0ab9cdccd0099c4f4c219747a (patch)
treeb2021695a424f2e18dbe53eecd9e45e53fbae28c
parente80772da401e545887b84b8addc4169b090cfa3e (diff)
downloadqmk_firmware-fd3dc3a997d86be0ab9cdccd0099c4f4c219747a.tar.gz
qmk_firmware-fd3dc3a997d86be0ab9cdccd0099c4f4c219747a.zip
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.
-rw-r--r--quantum/process_keycode/process_combo.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index b4e698decd..e8661839c7 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -164,11 +164,15 @@ void clear_combos(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) {
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];
keyrecord_t *record = &qrecord->record;
@@ -189,7 +193,7 @@ static inline void dump_key_buffer(void) {
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))
@@ -340,9 +344,9 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
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);
if (!COMBO_ACTIVE(combo)) {
KEY_STATE_DOWN(combo->state, key_index);
@@ -472,10 +476,6 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
return true;
}
- if (!is_combo_enabled()) {
- return true;
- }
-
#ifdef COMBO_ONLY_FROM_LAYER
/* Only check keycodes from one layer. */
keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
@@ -550,6 +550,8 @@ void combo_disable(void) {
#endif
b_combo_enable = false;
combo_buffer_read = combo_buffer_write;
+ clear_combos();
+ dump_key_buffer();
}
void combo_toggle(void) {