jay/qmk_firmware
1
0
Fork 0
mirror of https://github.com/jmwtsn/qmk_firmware.git synced 2026-06-03 19:53:31 -03:00
Code Issues Packages Projects Releases Wiki Activity

[Core] Options to constrain Speculative Hold: SPECULATIVE_HOLD_ONE_KEY and SPECULATIVE_HOLD_FLOW_TERM. (#26099)

Browse Source
This commit is contained in:
Pascal Getreuer
2026-05-22 14:50:52 -07:00
committed by GitHub
parent 4b19065f7b
commit 9d47119457
13 changed files with 525 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quantum/action.c
+2 -2
View File
@@ -286,9 +286,9 @@ void process_record(keyrecord_t *record) {
speculative_key_settled(record);
}
#endif // SPECULATIVE_HOLD
#ifdef FLOW_TAP_TERM
#if defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
flow_tap_update_last_event(record);
#endif // FLOW_TAP_TERM
#endif // defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
if (!process_record_quantum(record)) {
#ifndef NO_ACTION_ONESHOT
quantum/action_tapping.c
+21 -6
View File
@@ -119,11 +119,13 @@ __attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyreco
# include "process_auto_shift.h"
# endif
# if defined(FLOW_TAP_TERM)
# if defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
static uint16_t flow_tap_prev_keycode = KC_NO;
static uint16_t flow_tap_prev_time = 0;
static bool flow_tap_expired = true;
# endif // defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
# if defined(FLOW_TAP_TERM)
static bool flow_tap_key_if_within_term(keyrecord_t *record, uint16_t prev_time);
# endif // defined(FLOW_TAP_TERM)
@@ -191,11 +193,11 @@ void action_tapping_process(keyrecord_t record) {
if (IS_EVENT(record.event)) {
ac_dprintf("\n");
} else {
# ifdef FLOW_TAP_TERM
# if defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
if (!flow_tap_expired && TIMER_DIFF_16(record.event.time, flow_tap_prev_time) >= INT16_MAX / 2) {
flow_tap_expired = true;
}
# endif // FLOW_TAP_TERM
# endif // defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
}
}
@@ -770,17 +772,28 @@ static void speculative_key_press(keyrecord_t *record) {
if (speculative_keys_find(record->event.key) < num_speculative_keys) {
return; // Don't trigger: key is already in speculative_keys.
}
# ifdef SPECULATIVE_HOLD_FLOW_TERM
if (!flow_tap_expired && TIMER_DIFF_16(record->event.time, flow_tap_prev_time) <= SPECULATIVE_HOLD_FLOW_TERM) {
return; // Don't trigger: within flow term of previous key.
}
# endif // SPECULATIVE_HOLD_FLOW_TERM
const uint16_t keycode = get_record_keycode(record, false);
if (!IS_QK_MOD_TAP(keycode)) {
return; // Don't trigger: not a mod-tap key.
}
uint8_t mods = mod_config(QK_MOD_TAP_GET_MODS(keycode));
uint8_t mods = mod_config(QK_MOD_TAP_GET_MODS(keycode));
const uint8_t active_mods = get_mods() | speculative_mods;
# ifdef SPECULATIVE_HOLD_ONE_KEY
if (active_mods != 0) {
return; // Don't trigger: some mod is already active.
}
# endif // SPECULATIVE_HOLD_ONE_KEY
if ((mods & 0x10) != 0) { // Unpack 5-bit mods to 8-bit representation.
mods <<= 4;
}
if ((~(get_mods() | speculative_mods) & mods) == 0) {
if ((~active_mods & mods) == 0) {
return; // Don't trigger: mods are already active.
}
@@ -988,7 +1001,7 @@ static void waiting_buffer_process_regular(void) {
}
# endif // CHORDAL_HOLD
# ifdef FLOW_TAP_TERM
# if defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
void flow_tap_update_last_event(keyrecord_t *record) {
const uint16_t keycode = get_record_keycode(record, false);
// Don't update while a tap-hold key is unsettled.
@@ -1028,7 +1041,9 @@ void flow_tap_update_last_event(keyrecord_t *record) {
flow_tap_prev_time = record->event.time;
flow_tap_expired = false;
}
# endif // defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
# ifdef FLOW_TAP_TERM
static bool flow_tap_key_if_within_term(keyrecord_t *record, uint16_t prev_time) {
const uint16_t idle_time = TIMER_DIFF_16(record->event.time, prev_time);
if (flow_tap_expired || idle_time >= 500) {
quantum/action_tapping.h
+5 -3
View File
@@ -197,9 +197,6 @@ bool is_flow_tap_key(uint16_t keycode);
*/
uint16_t get_flow_tap_term(uint16_t keycode, keyrecord_t *record, uint16_t prev_keycode);
/** Updates the Flow Tap last key and timer. */
void flow_tap_update_last_event(keyrecord_t *record);
/**
* Checks if the pressed key is within the flow tap term.
* Can be used to avoid triggering combos or other actions within the flow tap term.
@@ -211,6 +208,11 @@ void flow_tap_update_last_event(keyrecord_t *record);
bool within_flow_tap_term(uint16_t keycode, keyrecord_t *record);
#endif // FLOW_TAP_TERM
#if defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
/** Updates the Flow Tap last key and timer. */
void flow_tap_update_last_event(keyrecord_t *record);
#endif // defined(FLOW_TAP_TERM) || defined(SPECULATIVE_HOLD_FLOW_TERM)
#ifdef DYNAMIC_TAPPING_TERM_ENABLE
extern uint16_t g_tapping_term;
#endif