X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Faction.c;h=4fafbfa79f58f86a0c1cf1638f859efa2fc3b1f2;hb=9a106537f64fe61af6048b41262f002ce6a716d9;hp=294ce00fb1914ef5873ccd382206da1a1766373b;hpb=59e073e82b0a8bee13270bf328945ee6b8769c36;p=max%2Ftmk_keyboard.git
diff --git a/common/action.c b/common/action.c
index 294ce00f..4fafbfa7 100644
--- a/common/action.c
+++ b/common/action.c
@@ -23,8 +23,10 @@ along with this program. If not, see .
#include "command.h"
#include "util.h"
#include "debug.h"
-#include "action.h"
+#include "led.h"
#include "layer_switch.h"
+#include "action_macro.h"
+#include "action.h"
static void process_action(keyrecord_t *record);
@@ -205,7 +207,7 @@ void action_exec(keyevent_t event)
static void process_action(keyrecord_t *record)
{
keyevent_t event = record->event;
- uint8_t tap_count = record->tap_count;
+ uint8_t tap_count = record->tap.count;
if (IS_NOEVENT(event)) { return; }
@@ -294,7 +296,7 @@ static void process_action(keyrecord_t *record)
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;
+ record->tap.count = 0;
add_mods(mods);
} else {
debug("MODS_TAP: Tap: register_code\n");
@@ -359,6 +361,7 @@ static void process_action(keyrecord_t *record)
case OP_RESET:
switch (action.layer.val & 0x03) {
case 0:
+ // NOTE: reserved
overlay_clear();
keymap_clear();
break;
@@ -378,26 +381,21 @@ static void process_action(keyrecord_t *record)
overlay_clear();
keymap_clear();
break;
+ /* NOTE: 4-7 rserved */
}
break;
/* Keymap Reset default layer */
case (OP_RESET | ON_PRESS):
if (event.pressed) {
- overlay_clear();
- keymap_clear();
default_layer_set(action.layer.val);
}
break;
case (OP_RESET | ON_RELEASE):
if (!event.pressed) {
- overlay_clear();
- keymap_clear();
default_layer_set(action.layer.val);
}
break;
case (OP_RESET | ON_BOTH):
- overlay_clear();
- keymap_clear();
default_layer_set(action.layer.val);
break;
@@ -524,6 +522,7 @@ static void process_action(keyrecord_t *record)
// Overlay Invert bit4
case OP_INV4 | 0:
if (action.layer.val == 0) {
+ // NOTE: reserved for future use
overlay_clear();
} else {
overlay_set(overlay_stat ^ action.layer.val);
@@ -531,6 +530,7 @@ static void process_action(keyrecord_t *record)
break;
case OP_INV4 | 1:
if (action.layer.val == 0) {
+ // on pressed
if (event.pressed) overlay_clear();
} else {
overlay_set(overlay_stat ^ action.layer.val<<4);
@@ -538,6 +538,7 @@ static void process_action(keyrecord_t *record)
break;
case OP_INV4 | 2:
if (action.layer.val == 0) {
+ // on released
if (!event.pressed) overlay_clear();
} else {
overlay_set(overlay_stat ^ action.layer.val<<8);
@@ -545,6 +546,7 @@ static void process_action(keyrecord_t *record)
break;
case OP_INV4 | 3:
if (action.layer.val == 0) {
+ // on both
overlay_clear();
} else {
overlay_set(overlay_stat ^ action.layer.val<<12);
@@ -671,7 +673,7 @@ static void process_action(keyrecord_t *record)
/* Extentions */
case ACT_MACRO:
- // TODO
+ action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
break;
case ACT_COMMAND:
break;
@@ -696,16 +698,17 @@ static bool process_tapping(keyrecord_t *keyp)
// if tapping
if (IS_TAPPING_PRESSED()) {
if (WITHIN_TAPPING_TERM(event)) {
- if (tapping_key.tap_count == 0) {
+ if (tapping_key.tap.count == 0) {
if (IS_TAPPING_KEY(event.key) && !event.pressed) {
// first tap!
debug("Tapping: First tap(0->1).\n");
- tapping_key.tap_count = 1;
+ tapping_key.tap.count = 1;
+ tapping_key.tap.interrupted = (waiting_buffer_has_anykey_pressed() ? true : false);
debug_tapping_key();
process_action(&tapping_key);
// enqueue
- keyp->tap_count = tapping_key.tap_count;
+ keyp->tap = tapping_key.tap;
return false;
}
#if TAPPING_TERM >= 500
@@ -729,19 +732,19 @@ static bool process_tapping(keyrecord_t *keyp)
// tap_count > 0
else {
if (IS_TAPPING_KEY(event.key) && !event.pressed) {
- debug("Tapping: Tap release("); debug_dec(tapping_key.tap_count); debug(")\n");
- keyp->tap_count = tapping_key.tap_count;
+ debug("Tapping: Tap release("); debug_dec(tapping_key.tap.count); debug(")\n");
+ keyp->tap = tapping_key.tap;
process_action(keyp);
tapping_key = *keyp;
debug_tapping_key();
return true;
}
else if (is_tap_key(keyp->event.key) && event.pressed) {
- if (tapping_key.tap_count > 1) {
+ if (tapping_key.tap.count > 1) {
debug("Tapping: Start new tap with releasing last tap(>1).\n");
// unregister key
process_action(&(keyrecord_t){
- .tap_count = tapping_key.tap_count,
+ .tap = tapping_key.tap,
.event.key = tapping_key.event.key,
.event.time = event.time,
.event.pressed = false
@@ -765,7 +768,7 @@ static bool process_tapping(keyrecord_t *keyp)
}
// after TAPPING_TERM
else {
- if (tapping_key.tap_count == 0) {
+ if (tapping_key.tap.count == 0) {
debug("Tapping: End. Timeout. Not tap(0): ");
debug_event(event); debug("\n");
process_action(&tapping_key);
@@ -775,17 +778,17 @@ static bool process_tapping(keyrecord_t *keyp)
} else {
if (IS_TAPPING_KEY(event.key) && !event.pressed) {
debug("Tapping: End. last timeout tap release(>0).");
- keyp->tap_count = tapping_key.tap_count;
+ keyp->tap = tapping_key.tap;
process_action(keyp);
tapping_key = (keyrecord_t){};
return true;
}
else if (is_tap_key(keyp->event.key) && event.pressed) {
- if (tapping_key.tap_count > 1) {
+ if (tapping_key.tap.count > 1) {
debug("Tapping: Start new tap with releasing last timeout tap(>1).\n");
// unregister key
process_action(&(keyrecord_t){
- .tap_count = tapping_key.tap_count,
+ .tap = tapping_key.tap,
.event.key = tapping_key.event.key,
.event.time = event.time,
.event.pressed = false
@@ -809,10 +812,11 @@ static bool process_tapping(keyrecord_t *keyp)
}
} else if (IS_TAPPING_RELEASED()) {
if (WITHIN_TAPPING_TERM(event)) {
- if (tapping_key.tap_count > 0 && IS_TAPPING_KEY(event.key) && event.pressed) {
+ 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");
+ keyp->tap = tapping_key.tap;
+ keyp->tap.count += 1;
+ debug("Tapping: Tap press("); debug_dec(keyp->tap.count); debug(")\n");
process_action(keyp);
tapping_key = *keyp;
debug_tapping_key();
@@ -857,16 +861,16 @@ static bool process_tapping(keyrecord_t *keyp)
static void waiting_buffer_scan_tap(void)
{
// tapping already is settled
- if (tapping_key.tap_count > 0) return;
- // invalid state: tapping_key released && tap_count == 0
+ if (tapping_key.tap.count > 0) return;
+ // invalid state: tapping_key released && tap.count == 0
if (!tapping_key.event.pressed) return;
for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {
if (IS_TAPPING_KEY(waiting_buffer[i].event.key) &&
!waiting_buffer[i].event.pressed &&
WITHIN_TAPPING_TERM(waiting_buffer[i].event)) {
- tapping_key.tap_count = 1;
- waiting_buffer[i].tap_count = 1;
+ tapping_key.tap.count = 1;
+ waiting_buffer[i].tap.count = 1;
process_action(&tapping_key);
debug("waiting_buffer_scan_tap: found at ["); debug_dec(i); debug("]\n");
@@ -886,6 +890,18 @@ void register_code(uint8_t code)
if (code == KC_NO) {
return;
}
+#ifdef CAPSLOCK_LOCKING_ENABLE
+ else if (KC_LOCKING_CAPS == code) {
+#ifdef CAPSLOCK_LOCKING_RESYNC_ENABLE
+ // Resync: ignore if caps lock already is on
+ if (host_keyboard_leds() & (1<