diff --git a/right/src/action.c b/right/src/action.c index c19c972..5cd04b1 100644 --- a/right/src/action.c +++ b/right/src/action.c @@ -40,17 +40,17 @@ static bool pressKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t *r return false; } - if (!key.simple.key) { + if (!key.keystroke.key) { return false; } for (uint8_t i = 0; i < 8; i++) { - if (key.simple.mods & (1 << i) || key.simple.key == HID_KEYBOARD_SC_LEFT_CONTROL + i) { + if (key.keystroke.mods & (1 << i) || key.keystroke.key == HID_KEYBOARD_SC_LEFT_CONTROL + i) { report->modifiers |= (1 << i); } } - report->scancodes[scancodeIdx] = key.simple.key; + report->scancodes[scancodeIdx] = key.keystroke.key; return true; } @@ -78,7 +78,7 @@ static bool handleKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t * break; case KEY_ACTION_SWITCH_LAYER: if (hasKeyPressed(prevKeyStates, currKeyStates, keyId)) { - ActiveLayer = key.layer.target; + ActiveLayer = key.switchLayer.layer; } if (hasKeyReleased(prevKeyStates, currKeyStates, keyId)) { ActiveLayer = LAYER_ID_BASE; diff --git a/right/src/action.h b/right/src/action.h index f82bcf6..cc6bef4 100644 --- a/right/src/action.h +++ b/right/src/action.h @@ -68,7 +68,7 @@ typedef struct { uint8_t __unused_bits; uint8_t mods; uint8_t key; - } __attribute__ ((packed)) simple; + } __attribute__ ((packed)) keystroke; struct { uint8_t buttonActions; // bitfield uint8_t scrollActions; // bitfield @@ -76,26 +76,16 @@ typedef struct { } __attribute__ ((packed)) mouse; struct { uint16_t __unused_bits; - uint8_t target; - } __attribute__ ((packed)) layer; + uint8_t layer; + } __attribute__ ((packed)) switchLayer; struct { uint16_t __unused_bits; - uint8_t target; - } __attribute__ ((packed)) keymap; + uint8_t layer; + } __attribute__ ((packed)) switchKeymap; struct { uint8_t __unused_bits; uint16_t index; - } __attribute__ ((packed)) macro; - struct { - uint8_t longPressMod; // single mod, or bitfield? - uint8_t mods; // for the alternate action - uint8_t key; - } __attribute__ ((packed)) longpressMod; - struct { - uint8_t longPressLayer; - uint8_t mods; - uint8_t key; - } __attribute__ ((packed)) longpressLayer; + } __attribute__ ((packed)) playMacro; }; } __attribute__ ((packed)) key_action_t; diff --git a/right/src/default_layout.c b/right/src/default_layout.c index 7207ede..77e8c84 100644 --- a/right/src/default_layout.c +++ b/right/src/default_layout.c @@ -6,96 +6,96 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // Right { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_7_AND_AMPERSAND }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_8_AND_ASTERISK }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_EQUAL_AND_PLUS }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_BACKSPACE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_7_AND_AMPERSAND }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_8_AND_ASTERISK }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_EQUAL_AND_PLUS }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_BACKSPACE }}, // Row 2 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_U }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_I }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_O }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_P }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_Y }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_U }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_I }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_O }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_P }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_Y }}, // Row 3 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_J }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_K }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_L }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_ENTER }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_H }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_J }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_K }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_L }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_ENTER }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_H }}, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_N }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_M }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_N }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_M }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_NONE }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SPACE }}, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_SPACE }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_1_AND_EXCLAMATION }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_2_AND_AT }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_3_AND_HASHMARK }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_4_AND_DOLLAR }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_5_AND_PERCENTAGE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_6_AND_CARET }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_1_AND_EXCLAMATION }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_2_AND_AT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_3_AND_HASHMARK }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_4_AND_DOLLAR }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_5_AND_PERCENTAGE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_6_AND_CARET }}, // Row 2 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_TAB }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_Q }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_W }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_E }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_R }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_TAB }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_Q }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_W }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_E }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_R }}, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_T }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_T }}, // Row 3 - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOUSE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_A }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_S }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_D }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOUSE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_A }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_S }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_D }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F }}, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_G }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_G }}, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_Z }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_X }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_C }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_V }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_B }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_Z }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_X }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_C }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_V }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_B }}, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SPACE }}, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_SPACE }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, { .type = KEY_ACTION_NONE }, } }, @@ -105,32 +105,32 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // Right { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F7 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F8 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F9 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F10 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F11 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F12 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DELETE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F7 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F8 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F9 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F10 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F11 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F12 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_DELETE }}, // Row 2 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_HOME }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_UP_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_END }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DELETE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PRINT_SCREEN }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SCROLL_LOCK }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAUSE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_UP }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_HOME }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_UP_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_END }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_DELETE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_PRINT_SCREEN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_SCROLL_LOCK }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_PAUSE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_PAGE_UP }}, // Row 3 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DOWN_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_INSERT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_DOWN_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_INSERT }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_DOWN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_PAGE_DOWN }}, // Row 4 { .type = KEY_ACTION_NONE }, @@ -138,63 +138,63 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_NONE }, // Row 5 { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_ESCAPE }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F1 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F2 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F3 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F4 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F5 }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F6 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_ESCAPE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F1 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F2 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F3 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F4 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F5 }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_F6 }}, // Row 2 { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_UP, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_T, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_DOWN, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [>] tab next + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_PAGE_UP, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_T, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_PAGE_DOWN, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [>] tab next { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, // Row 3 { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace prev - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_TAB, .mods = HID_KEYBOARD_MODIFIER_LEFTALT }}, // Window switch? - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace next + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace prev + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_TAB, .mods = HID_KEYBOARD_MODIFIER_LEFTALT }}, // Window switch? + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace next { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_W, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [x] tab close + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_W, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [x] tab close { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, { .type = KEY_ACTION_NONE }, } }, @@ -213,19 +213,19 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_NONE }, // Row 2 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_PLAY }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_UP }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_PLAY }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_UP }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_SLEEP }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_SLEEP }}, { .type = KEY_ACTION_NONE }, // Row 3 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_PREVIOUS_TRACK }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_DOWN }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_NEXT_TRACK }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_PREVIOUS_TRACK }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_DOWN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_NEXT_TRACK }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, @@ -234,19 +234,19 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // Row 4 { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_MUTE }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_MUTE }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_NONE }, // Row 5 { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left @@ -263,8 +263,8 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // Row 2 { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_RELOAD }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_RELOAD }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, @@ -273,25 +273,25 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, // TODO: hist- - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_WWW }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_WWW }}, { .type = KEY_ACTION_NONE }, // TODO: hist+ { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_LOCK }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_SEARCH }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_CALCULATOR }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_EJECT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_LOCK }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_SEARCH }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_CALCULATOR }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_MEDIA_EJECT }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, @@ -336,16 +336,16 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_NONE }, // Row 5 { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left @@ -369,7 +369,7 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_NONE }, // Row 3 - { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOUSE }}, + { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOUSE }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_LEFT }}, { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_MIDDLE }}, @@ -378,7 +378,7 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_NONE }, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE }, @@ -387,9 +387,9 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_NONE }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, { .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_DECELERATE }}, { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_ACCELERATE }},