drashna/qmk_firmware
1
0
Fork 0
Code Activity

[MERGE] Make One Shot Layer clearing configurable

Browse source
This commit is contained in:
Drashna Jael're 2023-07-06 12:36:26 -07:00
parent d19b2b24bc
commit 4ed967335a
Signed by: drashna
GPG key ID: DBA1FD3A860D1B11
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
quantum/action.c
View file

@ -66,6 +66,16 @@ __attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *reco
} }
#endif #endif
#ifndef NO_ACTION_ONESHOT
__attribute__((weak)) bool get_clear_oneshot_layer(uint16_t keycode, keyrecord_t *record, bool default_value) {
return default_value;
}
static bool should_clear_oneshot_layer(keyrecord_t *record, bool default_value) {
return get_clear_oneshot_layer(get_record_keycode(record, false), record, default_value);
}
#endif
/** \brief Called to execute an action. /** \brief Called to execute an action.
* *
* FIXME: Needs documentation. * FIXME: Needs documentation.
@ -273,7 +283,7 @@ void process_record(keyrecord_t *record) {
if (!process_record_quantum(record)) { if (!process_record_quantum(record)) {
#ifndef NO_ACTION_ONESHOT #ifndef NO_ACTION_ONESHOT
if (is_oneshot_layer_active() && record->event.pressed && keymap_config.oneshot_enable) { if (is_oneshot_layer_active() && record->event.pressed && keymap_config.oneshot_enable && should_clear_oneshot_layer(record, false)) {
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
} }
#endif #endif
@ -371,7 +381,7 @@ void process_action(keyrecord_t *record, action_t action) {
#ifndef NO_ACTION_ONESHOT #ifndef NO_ACTION_ONESHOT
bool do_release_oneshot = false; bool do_release_oneshot = false;
// notice we only clear the one shot layer if the pressed key is not a modifier. // notice we only clear the one shot layer if the pressed key is not a modifier.
if (is_oneshot_layer_active() && event.pressed && if (is_oneshot_layer_active() && event.pressed && should_clear_oneshot_layer(record,
(action.kind.id == ACT_USAGE || !(IS_MODIFIER_KEYCODE(action.key.code) (action.kind.id == ACT_USAGE || !(IS_MODIFIER_KEYCODE(action.key.code)
# ifndef NO_ACTION_TAPPING # ifndef NO_ACTION_TAPPING
|| ((action.kind.id == ACT_LMODS_TAP || action.kind.id == ACT_RMODS_TAP) && (action.layer_tap.code <= MODS_TAP_TOGGLE || tap_count == 0)) || ((action.kind.id == ACT_LMODS_TAP || action.kind.id == ACT_RMODS_TAP) && (action.layer_tap.code <= MODS_TAP_TOGGLE || tap_count == 0))
@ -380,7 +390,7 @@ void process_action(keyrecord_t *record, action_t action) {
# ifdef SWAP_HANDS_ENABLE # ifdef SWAP_HANDS_ENABLE
&& !(action.kind.id == ACT_SWAP_HANDS && action.swap.code == OP_SH_ONESHOT) && !(action.kind.id == ACT_SWAP_HANDS && action.swap.code == OP_SH_ONESHOT)
# endif # endif
&& keymap_config.oneshot_enable) { ) && keymap_config.oneshot_enable) {
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
do_release_oneshot = !is_oneshot_layer_active(); do_release_oneshot = !is_oneshot_layer_active();
} }

6
quantum/action.h
View file

@ -132,6 +132,11 @@ bool is_tap_action(action_t action);
void process_record_tap_hint(keyrecord_t *record); void process_record_tap_hint(keyrecord_t *record);
#endif #endif
#ifndef NO_ACTION_ONESHOT
bool get_clear_oneshot_layer(uint16_t keycode, keyrecord_t *record, bool default_value);
uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache);
#endif
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Helpers // Helpers
@ -145,6 +150,7 @@ void process_record_tap_hint(keyrecord_t *record);
} while (0) } while (0)
#endif #endif
/* debug */
void debug_event(keyevent_t event); void debug_event(keyevent_t event);
void debug_record(keyrecord_t record); void debug_record(keyrecord_t record);
void debug_action(action_t action); void debug_action(action_t action);