]> git.donarmstrong.com Git - qmk_firmware.git/blobdiff - common/action.c
Add oneshot modifier action.
[qmk_firmware.git] / common / action.c
index 425a2b00ff17bc6a7e884fe2bf6774dbef5e16b2..22f0bf0a0db9edac1f417ae2985c3d39fc7a35e9 100644 (file)
 #include "debug.h"
 #include "action.h"
 
-#define Kdebug(s)       do { if (debug_keyboard) debug(s); } while(0)
-#define Kdebug_P(s)     do { if (debug_keyboard) debug_P(s); } while(0)
-#define Kdebug_hex(s)   do { if (debug_keyboard) debug_hex(s); } while(0)
 
+static void process(keyrecord_t *record);
 
-/*
- *
- * Event/State|IDLE          PRESSING      DELAYING[f]      WAITING[f,k]         
- * -----------+------------------------------------------------------------------
- * Fn  Down   |(L+)          -*1           WAITING(Sk)      IDLE(Rf,Ps)*7        
- *     Up     |(L-)          IDLE(L-)*8    IDLE(L-)*8       IDLE(L-)*8           
- * Fnk Down   |DELAYING(Sf)* (Rf)          WAITING(Sk)      IDLE(Rf,Ps,Rf)       
- *     Up     |(L-)          IDLE(L-/Uf)*8 IDLE(Rf,Uf/L-)*3 IDLE(Rf,Ps,Uf/L-)*3  
- * Key Down   |PRESSING(Rk)  (Rk)          WAITING(Sk)      IDLE(Rf,Ps,Rk)       
- *     Up     |(Uk)          IDLE(Uk)*4    (Uk)             IDLE(L+,Ps,Pk)/(Uk)*a
- *            |
- * Delay      |-             -             IDLE(L+)         IDLE(L+,Ps)          
- * Magic Key  |COMMAND*5
- *
- * *1: ignore Fn if other key is down.
- * *2: register Fnk if any key is pressing
- * *3: register/unregister delayed Fnk and move to IDLE if code == delayed Fnk, else *8
- * *4: if no keys registered to host
- * *5: unregister all keys
- * *6: only if no keys down
- * *7: ignore Fn because Fnk key and stored key are down.
- * *8: move to IDLE if layer switch(off) occurs, else stay at current state
- * *9: repeat key if pressing Fnk twice quickly(move to PRESSING)
- * *a: layer switch and process waiting key and code if code == wainting key, else unregister key
- *
- * States:
- *      IDLE: No key is down except modifiers
- *      DELAYING: delay layer switch after pressing Fn with alt keycode
- *      WAITING: key is pressed during DELAYING
- *
- * Events:
- *      Fn: Fn key without alternative keycode
- *      Fnk: Fn key with alternative keycode
- *      -: ignore
- *      Delay: layer switch delay term is elapsed
- *
- * Actions:
- *      Rk: register key
- *      Uk: unregister key
- *      Rf: register Fn(alt keycode)
- *      Uf: unregister Fn(alt keycode)
- *      Rs: register stored key
- *      Us: unregister stored key
- *      Sk: Store key(waiting Key)
- *      Sf: Store Fn(delayed Fn)
- *      Ps: Process stored key
- *      Ps: Process key
- *      Is: Interpret stored keys in current layer
- *      L+: Switch to new layer(*unregister* all keys but modifiers)
- *      L-: Switch back to last layer(*unregister* all keys but modifiers)
- *      Ld: Switch back to default layer(*unregister* all keys but modifiers)
- */
+// TODO
+/* layer */
+uint8_t default_layer = 0;
+uint8_t current_layer = 0;
 
+/* tap term(ms) */
+#define TAP_TERM    200
 
-typedef enum { IDLE, DELAYING, WAITING, PRESSING } kbdstate_t;
-#define NEXT(state)     do { \
-    Kdebug("NEXT: "); Kdebug_P(state_str(kbdstate)); \
-    kbdstate = state; \
-    Kdebug(" -> "); Kdebug_P(state_str(kbdstate)); Kdebug("\n"); \
-} while (0)
+/* This counts up when tap occurs */
+uint8_t tap_count = 0;
+keyevent_t tapping_event = {};
+keyrecord_t tapping_key = {};
 
+/* TAPPING: This indicates that whether tap or not is not decided yet. */
+// NOTE:  keyevent_t.time 0 means no event.
+#define IS_TAPPING()            (tapping_key.event.time != 0)
+#define IS_TAPPING_PRESSED()    (IS_TAPPING() && tapping_key.event.pressed)
+#define IS_TAPPING_RELEASED()   (IS_TAPPING() && !tapping_key.event.pressed)
+#define IS_TAPPING_KEY(k)       (IS_TAPPING() && KEYEQ(tapping_key.event.key, (k)))
+#define WITHIN_TAP_TERM(e)      (TIMER_DIFF_16(e.time, tapping_key.event.time) < TAP_TERM)
 
-static kbdstate_t kbdstate = IDLE;
-static uint8_t fn_state_bits = 0;
+/* waiting keys buffer */
+#define WAITING_BUFFER_SIZE 8
+static keyrecord_t waiting_buffer[WAITING_BUFFER_SIZE] = {};
+/* point to empty cell to enq */
+static uint8_t waiting_buffer_head = 0;
+/* point to the oldest data cell to deq */
+static uint8_t waiting_buffer_tail = 0;
 
-static const char *state_str(kbdstate_t state)
+static bool waiting_buffer_enq(keyrecord_t record)
 {
-    if (state == IDLE)      return PSTR("IDLE");
-    if (state == DELAYING)  return PSTR("DELAYING");
-    if (state == WAITING)   return PSTR("WAITING");
-    if (state == PRESSING)  return PSTR("PRESSING");
-    return PSTR("UNKNOWN");
+    if (IS_NOEVENT(record.event)) {
+        return true;
+    }
+
+    if ((waiting_buffer_head + 1) % WAITING_BUFFER_SIZE == waiting_buffer_tail) {
+        debug("waiting_buffer_enq: Over flow.\n");
+        return false;
+    }
+
+    debug("waiting_buffer_enq["); debug_dec(waiting_buffer_head); debug("] = ");
+    debug_hex16(record.event.key.raw); debug("\n");
+
+    waiting_buffer[waiting_buffer_head] = record;
+    waiting_buffer_head = (waiting_buffer_head + 1) % WAITING_BUFFER_SIZE;
+    return true;
 }
-static bool anykey_sent_to_host(void)
+static keyrecord_t waiting_buffer_deq(void)
+{
+    if (waiting_buffer_head == waiting_buffer_tail) {
+        return (keyrecord_t){};
+    }
+    uint8_t last_tail = waiting_buffer_tail;
+    waiting_buffer_tail = waiting_buffer_tail + 1 % WAITING_BUFFER_SIZE;
+    return waiting_buffer[last_tail];
+}
+static bool waiting_buffer_is_empty(void)
+{
+    return (waiting_buffer_head == waiting_buffer_tail);
+}
+static void waiting_buffer_clear(void)
+{
+    waiting_buffer_head = 0;
+    waiting_buffer_tail = 0;
+}
+static bool waiting_buffer_typed(keyevent_t event)
+{
+    for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
+        if (KEYEQ(event.key, waiting_buffer[i].event.key) && event.pressed !=  waiting_buffer[i].event.pressed) {
+            return true;
+        }
+    }
+    return false;
+}
+static bool waiting_buffer_has_anykey_pressed(void)
+{
+    for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
+        if (waiting_buffer[i].event.pressed) return true;
+    }
+    return false;
+}
+static void waiting_buffer_process(void)
 {
-    return (host_has_anykey() || host_mouse_in_use() ||
-            host_last_sysytem_report() || host_last_consumer_report());
 }
 
+/* Oneshot modifier
+ *
+ * Problem: Want to capitalize like 'The' but the result tends to be 'THe'.
+ * Solution: Oneshot modifier have its effect on only one key coming next.
+ *           Tap Shift, then type 't', 'h' and 'e'. Not need to hold Shift key.
+ *
+ *  Hold:       works as normal modifier.
+ *  Tap:        one shot modifier.
+ *  2 Tap:      cancel one shot modifier.
+ *  5-Tap:      toggles enable/disable oneshot feature.
+ */
+static struct {
+    uint8_t mods;
+    uint8_t time;
+    bool    ready;
+    bool    disabled;
+}   oneshot_state;
+static void oneshot_start(uint8_t mods, uint16_t time)
+{
+    oneshot_state.mods = mods;
+    oneshot_state.time = time;
+    oneshot_state.ready = true;
+}
+static void oneshot_cancel(void)
+{
+    oneshot_state.mods = 0;
+    oneshot_state.time = 0;
+    oneshot_state.ready = false;
+}
+static void oneshot_toggle(void)
+{
+    oneshot_state.disabled = !oneshot_state.disabled;
+}
 
-static void register_code(uint8_t code);
-static void unregister_code(uint8_t code);
-static void register_mods(uint8_t mods);
-static void unregister_mods(uint8_t mods);
-static void clear_keyboard(void);
-static void clear_keyboard_but_mods(void);
-static void layer_switch(uint8_t new_layer);
 
+/*
+ * Rule to judge tap:
+ * Tap key is typed(pressed and released) within TAP_TERM
+ * without interfaring by typing other key.
+ */
+/* return true when key event is processed. */
+static bool process_tap(keyrecord_t *keyp)
+{
+    keyevent_t event = keyp->event;
 
-/* tap */
-#define TAP_TIME    200
-#define LAYER_DELAY 200
-static keyevent_t last_event = {};
-static uint16_t last_event_time = 0;
-static uint8_t tap_count = 0;
+    // if tapping
+    if (IS_TAPPING_PRESSED()) {
+        if (WITHIN_TAP_TERM(event)) {
+            if (tapping_key.tap_count == 0) {
+                if (IS_TAPPING_KEY(event.key) && !event.pressed) {
+                    // first tap!
+                    debug("Tapping: First tap.\n");
+                    tapping_key.tap_count = 1;
+                    process(&tapping_key);
 
-/* layer */
-uint8_t default_layer = 0;
-uint8_t current_layer = 0;
-keyrecord_t delaying_layer = {};
+                    // enqueue
+                    keyp->tap_count = tapping_key.tap_count;
+                    return false;
+                } else if (!event.pressed && waiting_buffer_typed(event)) {
+                    // other key typed. not tap.
+                    debug("Tapping: End(No tap. Interfered by typing key).\n");
+                    process(&tapping_key);
+                    tapping_key = (keyrecord_t){};
 
+                    // enqueue
+                    return false;
+                } else {
+                    // other key events shall be stored till tapping state settles.
+                    return false;
+                }
+            } else {
+                if (IS_TAPPING_KEY(event.key) && !event.pressed) {
+                    keyp->tap_count = tapping_key.tap_count;
+                    debug("Tapping: tap release("); debug_dec(keyp->tap_count); debug(")\n");
+                    tapping_key = *keyp;
+                    return false;
+                }
+                else if (is_tap_key(keyp->event.key) && event.pressed) {
+                    debug("Tapping: Start with forcing to release last tap.\n");
+                    process(&(keyrecord_t){
+                            .tap_count = tapping_key.tap_count,
+                            .event.key = tapping_key.event.key,
+                            .event.time = event.time,
+                            .event.pressed = false
+                    });
+                    tapping_key = *keyp;
+                    return false;
+                }
+                else {
+                    if (!IS_NOEVENT(keyp->event)) debug("Tapping: key event while tap.\n");
+                    process(keyp);
+                    return true;
+                }
+            }
+        }
+        // not within TAP_TERM
+        else {
+            if (tapping_key.tap_count == 0) {
+                // timeout. not tap.
+                debug("Tapping: End. Not tap(time out).\n");
+                process(&tapping_key);
+                tapping_key = (keyrecord_t){};
+                return false;
+            }  else {
+                if (IS_TAPPING_KEY(event.key) && !event.pressed) {
+                    debug("Tapping: End. tap release.");
+                    keyp->tap_count = tapping_key.tap_count;
+                    process(keyp);
+                    tapping_key = (keyrecord_t){};
+                    return true;
+                } else {
+                    // other key after tap time out.
+                    process(keyp);
+                    return true;
+                }
+            }
+        }
+    } else if (IS_TAPPING_RELEASED()) {
+        if (WITHIN_TAP_TERM(event)) {
+            if (tapping_key.tap_count > 0 && IS_TAPPING_KEY(event.key) && event.pressed) {
+                // sequential tap.
+                keyp->tap_count = tapping_key.tap_count + 1;
+                debug("Tapping: tap press("); debug_dec(keyp->tap_count); debug(")\n");
+                process(keyp);
+                tapping_key = *keyp;
+                return true;
+            } else if (event.pressed && is_tap_key(event.key)) {
+                // Sequential tap can be interfered with other tap key.
+                debug("Tapping: Start with interfering other tap.\n");
+                tapping_key = *keyp;
+                return true;
+            } else {
+                if (!IS_NOEVENT(keyp->event)) debug("Tapping: other key just after tap.\n");
+                process(keyp);
+                return true;
+            }
+        } else {
+            // timeout. no sequential tap.
+            debug("Tapping: End(Time out after releasing last tap).\n");
+            tapping_key = (keyrecord_t){};
+            process(keyp);
+            return true;
+        }
+    } else {
+        if (event.pressed && is_tap_key(event.key)) {
+            debug("Tapping: Start(Press tap key).\n");
+            tapping_key = *keyp;
+            return true;
+        } else {
+            process(keyp);
+            return true;
+        }
+    }
+}
 
 void action_exec(keyevent_t event)
 {
-    /* count tap when key is up */
-    if (KEYEQ(event.key, last_event.key) && timer_elapsed(last_event_time) < TAP_TIME) {
-        if (!event.pressed) tap_count++;
+    if (!IS_NOEVENT(event)) {
+        debug("event: "); 
+        debug_hex16(event.time); debug(": ");
+        debug_hex16(event.key.raw);
+        debug("[");
+        if (event.pressed) debug("down"); else debug("up");
+        debug("]\n");
+    }
+
+    keyrecord_t record = { .event = event };
+
+    // pre-process on tapping
+    if (process_tap(&record)) {
+        if (!IS_NOEVENT(record.event)) debug("processed.\n");
     } else {
-        tap_count = 0;
+        if (!IS_NOEVENT(record.event)) debug("enqueued.\n");
+        if (!waiting_buffer_enq(record)) {
+            // clear all in case of overflow.
+            clear_keyboard();
+            waiting_buffer_clear();
+            tapping_key = (keyrecord_t){};
+        }
     }
 
-    /* layer switch after LAYER_DELAY */
-    if (delaying_layer.action.code && timer_elapsed(delaying_layer.event.time) > LAYER_DELAY) {
-        switch (delaying_layer.action.kind.id) {
-            case ACT_LAYER_PRESSED:
-                layer_switch(delaying_layer.action.layer.opt);
-                break;
-            case ACT_LAYER_BIT:
-                layer_switch(current_layer | delaying_layer.action.layer.opt);
-                break;
+    // TODO: need to process every time?
+    // process waiting_buffer
+    for (; waiting_buffer_tail != waiting_buffer_head; waiting_buffer_tail = (waiting_buffer_tail + 1) % WAITING_BUFFER_SIZE) {
+        if (process_tap(&waiting_buffer[waiting_buffer_tail])) {
+            debug("processed: waiting_buffer["); debug_dec(waiting_buffer_tail); debug("] = ");
+            debug_hex16(waiting_buffer[waiting_buffer_tail].event.key.raw); debug("\n");
+        } else {
+            break;
         }
-        delaying_layer = (keyrecord_t){};
     }
-    action_t action = keymap_get_action(current_layer, event.key.row, event.key.col);
+}
+
+static void process(keyrecord_t *record)
+{
+    // TODO: use record
+    keyevent_t event = record->event;
+    uint8_t tap_count = record->tap_count;
 
-    debug("action: "); debug_hex16(action.code); debug("\n");
-    debug("kind.id: "); debug_hex(action.kind.id); debug("\n");
-    debug("kind.param: "); debug_hex16(action.kind.param); debug("\n");
-    debug("key.code: "); debug_hex(action.key.code); debug("\n");
-    debug("key.mods: "); debug_hex(action.key.mods); debug("\n");
+    if (IS_NOEVENT(event)) { return; }
+
+    action_t action = keymap_get_action(current_layer, event.key.pos.row, event.key.pos.col);
+    debug("action: "); debug_hex16(action.code);
+    if (event.pressed) debug("[down]\n"); else debug("[up]\n");
 
     switch (action.kind.id) {
+        /* Key and Mods */
         case ACT_LMODS:
-            // normal key or key plus mods
-            if (event.pressed) {
-                register_mods(action.key.mods);
-                register_code(action.key.code);
-            } else {
-                unregister_code(action.key.code);
-                unregister_mods(action.key.mods);
-            }
-            break;
         case ACT_RMODS:
-            if (event.pressed) {
-                register_mods(action.key.mods<<4);
-                register_code(action.key.code);
-            } else {
-                unregister_code(action.key.code);
-                unregister_mods(action.key.mods<<4);
+            {
+                uint8_t mods = (action.kind.id == ACT_LMODS) ?  action.key.mods :
+                                                                action.key.mods<<4;
+                if (event.pressed) {
+                    uint8_t tmp_mods = host_get_mods();
+                    if (mods) {
+                        host_add_mods(mods);
+                        host_send_keyboard_report();
+                    }
+                    register_code(action.key.code);
+                    if (mods && action.key.code) {
+                        host_set_mods(tmp_mods);
+                        host_send_keyboard_report();
+                    }
+                } else {
+                    if (mods && !action.key.code) {
+                        host_del_mods(mods);
+                        host_send_keyboard_report();
+                    }
+                    unregister_code(action.key.code);
+                }
             }
             break;
-        case ACT_LMOD_TAP:
-            break;
-        case ACT_RMOD_TAP:
+        case ACT_LMODS_TAP:
+        case ACT_RMODS_TAP:
+            {
+                uint8_t mods = (action.kind.id == ACT_LMODS_TAP) ?  action.key.mods :
+                                                                    action.key.mods<<4;
+                switch (action.layer.code) {
+                    case 0x00:
+                        // Oneshot modifier
+                        if (event.pressed) {
+                            if (tap_count == 0) {
+                                debug("MODS_TAP: Oneshot: add_mods\n");
+                                add_mods(mods);
+                            }
+                            else if (tap_count == 1) {
+                                debug("MODS_TAP: Oneshot: start\n");
+                                oneshot_start(mods, event.time);
+                            }
+                            else if (tap_count == 5) {
+                                debug("MODS_TAP: Oneshot: toggle\n");
+                                oneshot_toggle();
+                            }
+                            else {
+                                debug("MODS_TAP: Oneshot: cancel&add_mods\n");
+                                // double tap cancels oneshot and works as normal modifier.
+                                oneshot_cancel();
+                                add_mods(mods);
+                            }
+                        } else {
+                            if (tap_count == 0) {
+                                debug("MODS_TAP: Oneshot: cancel/del_mods\n");
+                                // cancel oneshot by holding.
+                                oneshot_cancel();
+                                del_mods(mods);
+                            }
+                            else if (tap_count == 1) {
+                                debug("MODS_TAP: Oneshot: del_mods\n");
+                                // retain Oneshot
+                                del_mods(mods);
+                            }
+                            else {
+                                debug("MODS_TAP: Oneshot: del_mods\n");
+                                // cancel Mods
+                                del_mods(mods);
+                            }
+                        }
+                        break;
+                    default:
+                        if (event.pressed) {
+                            if (tap_count > 0) {
+                                if (waiting_buffer_has_anykey_pressed()) {
+                                    debug("MODS_TAP: Tap: Cancel: add_mods\n");
+                                    // ad hoc: set 0 to cancel tap
+                                    record->tap_count = 0;
+                                    add_mods(mods);
+                                } else {
+                                    debug("MODS_TAP: Tap: register_code\n");
+                                    register_code(action.key.code);
+                                }
+                            } else {
+                                debug("MODS_TAP: No tap: add_mods\n");
+                                add_mods(mods);
+                            }
+                        } else {
+                            if (tap_count > 0) {
+                                debug("MODS_TAP: Tap: unregister_code\n");
+                                unregister_code(action.key.code);
+                            } else {
+                                debug("MODS_TAP: No tap: add_mods\n");
+                                del_mods(mods);
+                            }
+                        }
+                        break;
+                }
+            }
             break;
+
+        /* other HID usage */
         case ACT_USAGE:
 #ifdef EXTRAKEY_ENABLE
             switch (action.usage.page) {
@@ -189,6 +426,8 @@ void action_exec(keyevent_t event)
             }
 #endif
             break;
+
+        /* Mouse key */
         case ACT_MOUSEKEY:
 #ifdef MOUSEKEY_ENABLE
             if (event.pressed) {
@@ -200,6 +439,8 @@ void action_exec(keyevent_t event)
             }
 #endif
             break;
+
+        /* Layer key */
         case ACT_LAYER_PRESSED:
             // layer action when pressed
             switch (action.layer.code) {
@@ -219,28 +460,36 @@ void action_exec(keyevent_t event)
                     break;
                 default:
                     // with tap key
-                    debug("tap: "); debug_hex(tap_count); debug("\n");
                     if (event.pressed) {
-                        if (tap_count == 0) {
-                            if (host_has_anykey()) {
+                        if (IS_TAPPING_KEY(event.key)) {
+                           if (tap_count > 0) {
+                                debug("LAYER_PRESSED: Tap: register_code\n");
                                 register_code(action.layer.code);
-                            } else {
-                                delaying_layer = (keyrecord_t){
-                                    .event = event,
-                                    .action = action,
-                                    .mods = keyboard_report->mods
-                                };
-                            }
-                        } else if (tap_count > 0) {
+                           } else {
+                                debug("LAYER_PRESSED: No tap: layer_switch\n");
+                                layer_switch(action.layer.opt);
+                           }
+                        } else {
+                            // TODO: while other key tapping
+                                debug("LAYER_PRESSED: No tap: layer_switch\n");
+                                layer_switch(action.layer.opt);
+                        }
+/*
+                        if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+                            debug("LAYER_PRESSED: Tap: register_code\n");
                             register_code(action.layer.code);
+                        } else {
+                            debug("LAYER_PRESSED: No tap: layer_switch\n");
+                            layer_switch(action.layer.opt);
                         }
+*/
                     } else {
-                        // type key after tap
-                        if (tap_count == 1) {
-                            delaying_layer = (keyrecord_t){};
-                            register_code(action.layer.code);
+                        if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+                            debug("LAYER_PRESSED: Tap: unregister_code\n");
+                            unregister_code(action.layer.code);
+                        } else {
+                            debug("LAYER_PRESSED: No tap: NO ACTION\n");
                         }
-                        unregister_code(action.layer.code);
                     }
                     break;
             }
@@ -248,7 +497,7 @@ void action_exec(keyevent_t event)
         case ACT_LAYER_RELEASED:
             switch (action.layer.code) {
                 case 0x00:
-                    if (event.pressed) {
+                    if (!event.pressed) {
                         layer_switch(action.layer.opt);
                     }
                     break;
@@ -290,30 +539,22 @@ void action_exec(keyevent_t event)
                     break;
                 default:
                     // with tap key
-                    debug("tap: "); debug_hex(tap_count); debug("\n");
                     if (event.pressed) {
-                        if (tap_count == 0) {
-                            if (host_has_anykey()) {
-                                register_code(action.layer.code);
-                            } else {
-                                delaying_layer = (keyrecord_t){
-                                    .event = event,
-                                    .action = action,
-                                    .mods = keyboard_report->mods
-                                };
-                            }
-                        } else if (tap_count > 0) {
+                        if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+                            debug("LAYER_BIT: Tap: register_code\n");
                             register_code(action.layer.code);
+                        } else {
+                            debug("LAYER_BIT: No tap: layer_switch(bit on)\n");
+                            layer_switch(current_layer | action.layer.opt);
                         }
                     } else {
-                        if (tap_count == 0) {
-                            // no tap
+                        if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+                            debug("LAYER_BIT: Tap: unregister_code\n");
+                            unregister_code(action.layer.code);
+                        } else {
+                            debug("LAYER_BIT: No tap: layer_switch(bit off)\n");
                             layer_switch(current_layer & ~action.layer.opt);
-                        } else if (tap_count == 1) {
-                            // tap
-                            register_code(action.layer.code);
                         }
-                        unregister_code(action.layer.code);
                     }
                     break;
             }
@@ -366,27 +607,42 @@ void action_exec(keyevent_t event)
                     break;
             }
             break;
+
+        /* Extentions */
         case ACT_MACRO:
+            break;
         case ACT_COMMAND:
+            break;
         case ACT_FUNCTION:
+            action_call_function(event, action.func.id);
+            break;
         default:
             break;
     }
-
-    /* last event */
-    last_event = event;
-    last_event_time = timer_read();
 }
 
 
-static void register_code(uint8_t code)
+/*
+ * Utilities for actions.
+ */
+void register_code(uint8_t code)
 {
     if (code == KC_NO) {
         return;
     }
     else if IS_KEY(code) {
         // TODO: should push command_proc out of this block?
-        if (!command_proc(code)) {
+        if (command_proc(code)) return;
+
+        if (oneshot_state.mods && oneshot_state.ready && !oneshot_state.disabled) {
+            uint8_t tmp_mods = host_get_mods();
+            host_add_mods(oneshot_state.mods);
+            host_add_key(code);
+            host_send_keyboard_report();
+
+            host_set_mods(tmp_mods);
+            oneshot_state.ready = false;
+        } else {
             host_add_key(code);
             host_send_keyboard_report();
         }
@@ -397,7 +653,7 @@ static void register_code(uint8_t code)
     }
 }
 
-static void unregister_code(uint8_t code)
+void unregister_code(uint8_t code)
 {
     if IS_KEY(code) {
         host_del_key(code);
@@ -409,27 +665,35 @@ static void unregister_code(uint8_t code)
     }
 }
 
-static void register_mods(uint8_t mods)
+void add_mods(uint8_t mods)
 {
-    if (!mods) return;
-    host_add_mods(mods);
-    host_send_keyboard_report();
+    if (mods) {
+        host_add_mods(mods);
+        host_send_keyboard_report();
+    }
 }
 
-static void unregister_mods(uint8_t mods)
+void del_mods(uint8_t mods)
 {
-    if (!mods) return;
-    host_del_mods(mods);
+    if (mods) {
+        host_del_mods(mods);
+        host_send_keyboard_report();
+    }
+}
+
+void set_mods(uint8_t mods)
+{
+    host_set_mods(mods);
     host_send_keyboard_report();
 }
 
-static void clear_keyboard(void)
+void clear_keyboard(void)
 {
     host_clear_mods();
     clear_keyboard_but_mods();
 }
 
-static void clear_keyboard_but_mods(void)
+void clear_keyboard_but_mods(void)
 {
     host_clear_keys();
     host_send_keyboard_report();
@@ -443,13 +707,47 @@ static void clear_keyboard_but_mods(void)
 #endif
 }
 
-static void layer_switch(uint8_t new_layer)
+bool sending_anykey(void)
+{
+    return (host_has_anykey() || host_mouse_in_use() ||
+            host_last_sysytem_report() || host_last_consumer_report());
+}
+
+void layer_switch(uint8_t new_layer)
 {
     if (current_layer != new_layer) {
-        Kdebug("Layer Switch: "); Kdebug_hex(current_layer);
-        Kdebug(" -> "); Kdebug_hex(new_layer); Kdebug("\n");
+        debug("Layer Switch: "); debug_hex(current_layer);
+        debug(" -> "); debug_hex(new_layer); debug("\n");
 
         current_layer = new_layer;
         clear_keyboard_but_mods(); // To avoid stuck keys
+        // TODO: update mods with full scan of matrix? if modifier changes between layers
+    }
+}
+
+bool is_tap_key(key_t key)
+{
+    action_t action = keymap_get_action(current_layer, key.pos.row, key.pos.col);
+    switch (action.kind.id) {
+        case ACT_LMODS_TAP:
+        case ACT_RMODS_TAP:
+            return true;
+        case ACT_LAYER_PRESSED:
+        case ACT_LAYER_BIT:
+            switch (action.layer.code) {
+                case 0x00:
+                case 0xF1 ... 0xFF:
+                    return false;
+                case 0xF0:
+                default:
+                    return true;
+            }
+            return false;
+        case ACT_FUNCTION:
+            if (action.func.opt & 0x1) {
+                return true;
+            }
+            return false;
     }
+    return false;
 }