X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Faction.c;h=b39aa4cbc402125235f1df3e1a75f72e91d40e3b;hb=04b9b62bdc5ed394a06c5c73acdce0b261220e85;hp=f73b0fe807a7f2fec83c09e900948b064de697cc;hpb=55d675025430df2d22bdafdc76d9493af53b7eb8;p=qmk_firmware.git
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index f73b0fe80..b39aa4cbc 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -36,6 +36,10 @@ along with this program. If not, see .
int tp_buttons;
+#ifdef RETRO_TAPPING
+int retro_tapping_counter = 0;
+#endif
+
#ifdef FAUXCLICKY_ENABLE
#include
#endif
@@ -45,6 +49,9 @@ void action_exec(keyevent_t event)
if (!IS_NOEVENT(event)) {
dprint("\n---- action_exec: start -----\n");
dprint("EVENT: "); debug_event(event); dprintln();
+#ifdef RETRO_TAPPING
+ retro_tapping_counter++;
+#endif
}
#ifdef FAUXCLICKY_ENABLE
@@ -67,9 +74,11 @@ void action_exec(keyevent_t event)
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
if (has_oneshot_layer_timed_out()) {
- dprintf("Oneshot layer: timeout\n");
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
}
+ if (has_oneshot_mods_timed_out()) {
+ clear_oneshot_mods();
+ }
#endif
#ifndef NO_ACTION_TAPPING
@@ -324,9 +333,10 @@ void process_action(keyrecord_t *record, action_t action)
tp_buttons |= (1<<2);
break;
default:
- mousekey_on(action.key.code);
- mousekey_send();
+ break;
}
+ mousekey_on(action.key.code);
+ mousekey_send();
} else {
switch (action.key.code) {
case KC_MS_BTN1:
@@ -339,9 +349,10 @@ void process_action(keyrecord_t *record, action_t action)
tp_buttons &= ~(1<<2);
break;
default:
- mousekey_off(action.key.code);
- mousekey_send();
+ break;
}
+ mousekey_off(action.key.code);
+ mousekey_send();
}
break;
#endif
@@ -582,6 +593,32 @@ void process_action(keyrecord_t *record, action_t action)
}
#endif
+#ifndef NO_ACTION_TAPPING
+ #ifdef RETRO_TAPPING
+ if (!is_tap_key(record->event.key)) {
+ retro_tapping_counter = 0;
+ } else {
+ if (event.pressed) {
+ if (tap_count > 0) {
+ retro_tapping_counter = 0;
+ } else {
+
+ }
+ } else {
+ if (tap_count > 0) {
+ retro_tapping_counter = 0;
+ } else {
+ if (retro_tapping_counter == 2) {
+ register_code(action.layer_tap.code);
+ unregister_code(action.layer_tap.code);
+ }
+ retro_tapping_counter = 0;
+ }
+ }
+ }
+ #endif
+#endif
+
#ifndef NO_ACTION_ONESHOT
/* Because we switch layers after a oneshot event, we need to release the
* key before we leave the layer or no key up event will be generated.
@@ -615,6 +652,7 @@ void register_code(uint8_t code)
#endif
add_key(KC_CAPSLOCK);
send_keyboard_report();
+ wait_ms(100);
del_key(KC_CAPSLOCK);
send_keyboard_report();
}
@@ -625,6 +663,7 @@ void register_code(uint8_t code)
#endif
add_key(KC_NUMLOCK);
send_keyboard_report();
+ wait_ms(100);
del_key(KC_NUMLOCK);
send_keyboard_report();
}
@@ -635,6 +674,7 @@ void register_code(uint8_t code)
#endif
add_key(KC_SCROLLLOCK);
send_keyboard_report();
+ wait_ms(100);
del_key(KC_SCROLLLOCK);
send_keyboard_report();
}