#include "util.h"
#include "debug.h"
#include "action.h"
+#include "layer_switch.h"
static void process_action(keyrecord_t *record);
}
}
+static action_t get_action(key_t key)
+{
+ action_t action;
+ action.code = ACTION_NO;
+
+ /* layer_switch */
+ action = layer_switch_get_action(key);
+ if (action.code != ACTION_TRANSPARENT) {
+ return action;
+ }
+
+ /* default layer */
+ //debug("get_aciton: default layer: "); debug_dec(default_layer); debug("\n");
+ action = action_for_key(default_layer, key);
+ return action;
+}
+
static void process_action(keyrecord_t *record)
{
keyevent_t event = record->event;
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("d\n"); else debug("u\n");
- debug("ACTION: "); debug_action(action); debug("\n");
+ action_t action = get_action(event.key);
+ debug("ACTION: "); debug_action(action); debug(" ");
+ layer_switch_debug(); debug("["); debug_dec(default_layer); debug("]\n");
switch (action.kind.id) {
/* Key and Mods */
} else {
if (tap_count == 0) {
debug("MODS_TAP: Oneshot: cancel/del_mods\n");
- // cancel oneshot by holding.
+ // cancel oneshot on hold
oneshot_cancel();
del_mods(mods);
}
case ACT_USAGE:
#ifdef EXTRAKEY_ENABLE
switch (action.usage.page) {
- case ACTION_USAGE_PAGE_SYSTEM:
+ case PAGE_SYSTEM:
if (event.pressed) {
host_system_send(action.usage.code);
} else {
host_system_send(0);
}
break;
- case ACTION_USAGE_PAGE_CONSUMER:
+ case PAGE_CONSUMER:
if (event.pressed) {
host_consumer_send(action.usage.code);
} else {
break;
/* Layer key */
- case ACT_LAYER_PRESSED:
- // layer action when pressed
+ case ACT_LAYER_SET:
switch (action.layer.code) {
- case 0x00:
+ case LAYER_MOMENTARY: /* momentary */
if (event.pressed) {
- layer_switch(action.layer.val);
+ layer_switch_move(action.layer.val);
}
-//TODO: this is ok?
else {
- layer_switch(default_layer);
+ // NOTE: This is needed by legacy keymap support
+ layer_switch_move(0);
}
break;
- case 0xF0:
- // tap toggle
+ case LAYER_ON_PRESS:
+ if (event.pressed) {
+ layer_switch_move(action.layer.val);
+ }
+ break;
+ case LAYER_ON_RELEASE:
+ if (!event.pressed) {
+ layer_switch_move(action.layer.val);
+ }
+ break;
+ case LAYER_ON_BOTH:
+ layer_switch_move(action.layer.val);
+ break;
+ case LAYER_TAP_TOGGLE: /* switch on hold and toggle on several taps */
if (event.pressed) {
if (tap_count < TAPPING_TOGGLE) {
- layer_switch(action.layer.val);
+ layer_switch_move(action.layer.val);
}
} else {
if (tap_count >= TAPPING_TOGGLE) {
debug("LAYER_PRESSED: tap toggle.\n");
- layer_switch(action.layer.val);
+ layer_switch_move(action.layer.val);
}
}
break;
- case 0xFF:
- // change default layer
+ case LAYER_SET_DEFAULT_ON_PRESS:
if (event.pressed) {
default_layer = action.layer.val;
- layer_switch(default_layer);
+ layer_switch_move(0);
}
break;
+ case LAYER_SET_DEFAULT_ON_RELEASE:
+ if (!event.pressed) {
+ default_layer = action.layer.val;
+ layer_switch_move(0);
+ }
+ break;
+ case LAYER_SET_DEFAULT_ON_BOTH:
+ default_layer = action.layer.val;
+ layer_switch_move(0);
+ break;
default:
- // with tap key
+ /* tap key */
if (event.pressed) {
- if (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.val);
- }
+ if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+ debug("LAYER_SET: Tap: register_code\n");
+ register_code(action.layer.code);
+ } else {
+ debug("LAYER_SET: No tap: layer_set(on press)\n");
+ layer_switch_move(action.layer.val);
+ }
} else {
- if (tap_count > 0) {
- debug("LAYER_PRESSED: Tap: unregister_code\n");
+ if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+ debug("LAYER_SET: Tap: unregister_code\n");
unregister_code(action.layer.code);
} else {
- //debug("LAYER_PRESSED: No tap: NO ACTION\n");
-//TODO: this is ok?
- debug("LAYER_PRESSED: No tap: return to default layer\n");
- layer_switch(default_layer);
+ // NOTE: This is needed by legacy keymap support
+ debug("LAYER_SET: No tap: return to default layer(on release)\n");
+ layer_switch_move(0);
}
}
break;
}
break;
- case ACT_LAYER_RELEASED:
+ case ACT_LAYER_BIT:
switch (action.layer.code) {
- case 0x00:
+ case LAYER_MOMENTARY: /* momentary */
+ if (event.pressed) {
+ layer_switch_move(layer_switch_get_layer() | action.layer.val);
+ } else {
+ layer_switch_move(layer_switch_get_layer() & ~action.layer.val);
+ }
+ break;
+ case LAYER_ON_PRESS:
+ if (event.pressed) {
+ layer_switch_move(layer_switch_get_layer() ^ action.layer.val);
+ }
+ break;
+ case LAYER_ON_RELEASE:
if (!event.pressed) {
- layer_switch(action.layer.val);
+ layer_switch_move(layer_switch_get_layer() ^ action.layer.val);
}
break;
- case 0xF0:
- // tap toggle
+ case LAYER_ON_BOTH:
+ layer_switch_move(layer_switch_get_layer() ^ action.layer.val);
+ break;
+ case LAYER_TAP_TOGGLE: /* switch on hold and toggle on several taps */
if (event.pressed) {
- if (tap_count >= TAPPING_TOGGLE) {
- debug("LAYER_RELEASED: tap toggle.\n");
- layer_switch(action.layer.val);
+ if (tap_count < TAPPING_TOGGLE) {
+ debug("LAYER_BIT: tap toggle(press).\n");
+ layer_switch_move(layer_switch_get_layer() ^ action.layer.val);
}
} else {
- if (tap_count < TAPPING_TOGGLE) {
- layer_switch(action.layer.val);
+ if (tap_count <= TAPPING_TOGGLE) {
+ debug("LAYER_BIT: tap toggle(release).\n");
+ layer_switch_move(layer_switch_get_layer() ^ action.layer.val);
}
}
break;
- case 0xFF:
- // change default layer
+ case LAYER_SET_DEFAULT_ON_PRESS:
+ if (event.pressed) {
+ default_layer = default_layer ^ action.layer.val;
+ layer_switch_move(default_layer);
+ }
+ break;
+ case LAYER_SET_DEFAULT_ON_RELEASE:
if (!event.pressed) {
- default_layer = action.layer.val;
- layer_switch(default_layer);
+ default_layer = default_layer ^ action.layer.val;
+ layer_switch_move(default_layer);
}
break;
+ case LAYER_SET_DEFAULT_ON_BOTH:
+ default_layer = default_layer ^ action.layer.val;
+ layer_switch_move(default_layer);
+ break;
default:
- // with tap key
+ // tap key
if (event.pressed) {
- if (tap_count > 0) {
- debug("LAYER_RELEASED: Tap: register_code\n");
+ if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+ debug("LAYER_BIT: Tap: register_code\n");
register_code(action.layer.code);
- } else {
- debug("LAYER_RELEASED: No tap: NO ACTION\n");
- }
+ } else {
+ debug("LAYER_BIT: No tap: layer_bit(on press)\n");
+ layer_switch_move(layer_switch_get_layer() ^ action.layer.val);
+ }
} else {
- if (tap_count > 0) {
- debug("LAYER_RELEASED: Tap: unregister_code\n");
+ if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
+ debug("LAYER_BIT: Tap: unregister_code\n");
unregister_code(action.layer.code);
} else {
- debug("LAYER_RELEASED: No tap: layer_switch\n");
- layer_switch(action.layer.val);
+ debug("LAYER_BIT: No tap: layer_bit(on release)\n");
+ layer_switch_move(layer_switch_get_layer() ^ action.layer.val);
}
}
break;
}
break;
- case ACT_LAYER_BIT:
+ case ACT_LAYER_SWITCH:
switch (action.layer.code) {
- case 0x00:
+ case LAYER_MOMENTARY: /* momentary */
if (event.pressed) {
- layer_switch(current_layer ^ action.layer.val);
+ layer_switch_on(action.layer.val);
} else {
- layer_switch(current_layer ^ action.layer.val);
+ layer_switch_off(action.layer.val);
+ }
+ break;
+ case LAYER_ON_PRESS:
+ if (event.pressed) {
+ layer_switch_invert(action.layer.val);
}
break;
- case 0xF0:
- // tap toggle
+ case LAYER_ON_RELEASE:
+ if (!event.pressed) {
+ layer_switch_invert(action.layer.val);
+ }
+ break;
+ case LAYER_ON_BOTH:
+ layer_switch_invert(action.layer.val);
+ break;
+ case LAYER_TAP_TOGGLE: /* switch on hold and toggle on several taps */
if (event.pressed) {
if (tap_count < TAPPING_TOGGLE) {
- debug("LAYER_BIT: tap toggle(press).\n");
- layer_switch(current_layer ^ action.layer.val);
+ debug("LAYER_SWITCH: tap toggle(press).\n");
+ layer_switch_invert(action.layer.val);
}
} else {
if (tap_count <= TAPPING_TOGGLE) {
- debug("LAYER_BIT: tap toggle(release).\n");
- layer_switch(current_layer ^ action.layer.val);
+ debug("LAYER_SWITCH: tap toggle(release).\n");
+ layer_switch_invert(action.layer.val);
}
}
break;
- case 0xFF:
- // change default layer
- if (event.pressed) {
- default_layer = current_layer ^ action.layer.val;
- layer_switch(default_layer);
- } else {
- default_layer = current_layer ^ action.layer.val;
- layer_switch(default_layer);
- }
- break;
default:
- // with tap key
+ // tap key
if (event.pressed) {
if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
- debug("LAYER_BIT: Tap: register_code\n");
+ debug("LAYER_SWITCH: 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.val);
+ debug("LAYER_SWITCH: No tap: layer_switch on press\n");
+ layer_switch_invert(action.layer.val);
}
} else {
if (IS_TAPPING_KEY(event.key) && tap_count > 0) {
- debug("LAYER_BIT: Tap: unregister_code\n");
+ debug("LAYER_SWITCH: 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.val);
+ debug("LAYER_SWITCH: No tap: layer_switch on release\n");
+ layer_switch_invert(action.layer.val);
}
}
break;
}
break;
- case ACT_LAYER_EXT:
- switch (action.layer.val) {
- case 0x00:
- // set default layer when pressed
- switch (action.layer.code) {
- case 0x00:
- if (event.pressed) {
- layer_switch(default_layer);
- }
- break;
- case 0xF0:
- // tap toggle
- if (event.pressed) {
- if (tap_count < TAPPING_TOGGLE) {
- layer_switch(default_layer);
- }
- } else {
- if (tap_count >= TAPPING_TOGGLE) {
- debug("LAYER_EXT_PRESSED: tap toggle.\n");
- layer_switch(default_layer);
- }
- }
- break;
- case 0xFF:
- // change default layer
- if (event.pressed) {
- default_layer = current_layer;
- layer_switch(default_layer);
- }
- break;
- default:
- // with tap key
- if (event.pressed) {
- if (tap_count > 0) {
- debug("LAYER_EXT_PRESSED: Tap: register_code\n");
- register_code(action.layer.code);
- } else {
- debug("LAYER_EXT_PRESSED: No tap: layer_switch\n");
- layer_switch(default_layer);
- }
- } else {
- if (tap_count > 0) {
- debug("LAYER_EXT_PRESSED: Tap: unregister_code\n");
- unregister_code(action.layer.code);
- } else {
- debug("LAYER_EXT_PRESSED: No tap: NO ACTION\n");
- }
- }
- break;
- }
- break;
- case 0x01:
- // set default layer when released
- switch (action.layer.code) {
- case 0x00:
- if (!event.pressed) {
- layer_switch(default_layer);
- }
- break;
- case 0xF0:
- // tap toggle
- if (event.pressed) {
- if (tap_count >= TAPPING_TOGGLE) {
- debug("LAYER_EXT_RELEASED: tap toggle.\n");
- layer_switch(default_layer);
- }
- } else {
- if (tap_count < TAPPING_TOGGLE) {
- layer_switch(default_layer);
- }
- }
- break;
- case 0xFF:
- // change default layer
- if (!event.pressed) {
- default_layer = current_layer;
- layer_switch(default_layer);
- }
- break;
- default:
- // with tap key
- if (event.pressed) {
- if (tap_count > 0) {
- debug("LAYER_EXT_RELEASED: Tap: register_code\n");
- register_code(action.layer.code);
- } else {
- debug("LAYER_EXT_RELEASED: No tap: NO ACTION\n");
- }
- } else {
- if (tap_count > 0) {
- debug("LAYER_EXT_RELEASED: Tap: unregister_code\n");
- unregister_code(action.layer.code);
- } else {
- debug("LAYER_EXT_RELEASED: No tap: layer_switch\n");
- layer_switch(default_layer);
- }
- }
- break;
- }
- break;
- }
- break;
/* Extentions */
case ACT_MACRO:
+ // TODO
break;
case ACT_COMMAND:
break;
case ACT_FUNCTION:
- // TODO
- keymap_call_function(record, action.func.id);
+ action_function(record, action.func.id, action.func.opt);
break;
default:
break;
host_last_sysytem_report() || host_last_consumer_report());
}
-void layer_switch(uint8_t new_layer)
-{
- if (current_layer != new_layer) {
- 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
- // NOTE: 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);
+ action_t action = get_action(key);
+
switch (action.kind.id) {
case ACT_LMODS_TAP:
case ACT_RMODS_TAP:
return true;
- case ACT_LAYER_PRESSED:
+ case ACT_LAYER_SET:
case ACT_LAYER_BIT:
switch (action.layer.code) {
- case 0x00:
- case 0xF1 ... 0xFF:
+ case LAYER_MOMENTARY:
+ case LAYER_ON_PRESS:
+ case LAYER_ON_RELEASE:
+ case LAYER_ON_BOTH:
+ case LAYER_SET_DEFAULT_ON_PRESS:
+ case LAYER_SET_DEFAULT_ON_RELEASE:
+ case LAYER_SET_DEFAULT_ON_BOTH:
return false;
- case 0xF0:
- default:
+ case LAYER_TAP_TOGGLE:
+ default: /* tap key */
return true;
}
return false;
case ACT_FUNCTION:
- if (action.func.opt & O_TAP) {
- return true;
- }
+ if (action.func.opt & FUNC_TAP) { return true; }
return false;
}
return false;
*/
static void debug_event(keyevent_t event)
{
- debug_hex16(event.key.raw);
+ debug_hex16((event.key.row<<8) | event.key.col);
if (event.pressed) debug("d("); else debug("u(");
debug_dec(event.time); debug(")");
}
case ACT_RMODS_TAP: debug("ACT_RMODS_TAP"); break;
case ACT_USAGE: debug("ACT_USAGE"); break;
case ACT_MOUSEKEY: debug("ACT_MOUSEKEY"); break;
- case ACT_LAYER_PRESSED: debug("ACT_LAYER_PRESSED"); break;
- case ACT_LAYER_RELEASED: debug("ACT_LAYER_RELEASED"); break;
+ case ACT_LAYER_SET: debug("ACT_LAYER_SET"); break;
case ACT_LAYER_BIT: debug("ACT_LAYER_BIT"); break;
- case ACT_LAYER_EXT: debug("ACT_LAYER_EXT"); break;
+ case ACT_LAYER_SWITCH: debug("ACT_LAYER_SWITCH"); break;
case ACT_MACRO: debug("ACT_MACRO"); break;
case ACT_COMMAND: debug("ACT_COMMAND"); break;
case ACT_FUNCTION: debug("ACT_FUNCTION"); break;
projects / tmk_firmware.git / blobdiff