summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-09-19 22:16:55 +0900
committertmk <nobody@nowhere>2013-09-19 22:16:55 +0900
commit58ca7b904b4410416f6b7edf1051ec58f6cdb6c4 (patch)
treea3a89fe51e3b8a8c897060e97b6c56bcd67b1e0e /common
parent9f29fa6bf39ff9b703de132b7f8b8a794b078471 (diff)
parent4d0b3aace09e26b92ae207f94cf889878e709b35 (diff)
Merge branch 'tapping_fix60'
Diffstat (limited to 'common')
-rw-r--r--common/action_tapping.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/common/action_tapping.c b/common/action_tapping.c
index a6292535ed..542949ddd3 100644
--- a/common/action_tapping.c
+++ b/common/action_tapping.c
@@ -27,9 +27,7 @@ static uint8_t waiting_buffer_tail = 0;
static bool process_tapping(keyrecord_t *record);
static bool waiting_buffer_enq(keyrecord_t record);
static void waiting_buffer_clear(void);
-#if TAPPING_TERM >= 500
static bool waiting_buffer_typed(keyevent_t event);
-#endif
static bool waiting_buffer_has_anykey_pressed(void);
static void waiting_buffer_scan_tap(void);
static void debug_tapping_key(void);
@@ -109,6 +107,13 @@ bool process_tapping(keyrecord_t *keyp)
return false;
}
#endif
+ /* release a key pressed before tapping */
+ else if (!event.pressed && !waiting_buffer_typed(event)) {
+ /* Unexpected repeating occurs unless this event is processed immedately. */
+ debug("Tapping: release a key pressed before tapping\n");
+ process_action(keyp);
+ return true;
+ }
else {
// set interrupted flag when other key preesed during tapping
if (event.pressed) {
@@ -289,7 +294,6 @@ void waiting_buffer_clear(void)
waiting_buffer_tail = 0;
}
-#if TAPPING_TERM >= 500
bool waiting_buffer_typed(keyevent_t event)
{
for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
@@ -299,7 +303,6 @@ bool waiting_buffer_typed(keyevent_t event)
}
return false;
}
-#endif
bool waiting_buffer_has_anykey_pressed(void)
{