From 403b0addea48548abdbde6203d8673f2b77164a7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 21:14:29 +0000 Subject: Align magic keycodes (#19877) --- quantum/keycodes.h | 142 ++++++++++++++++---------------- quantum/process_keycode/process_magic.c | 70 ++++++++-------- quantum/quantum_keycodes_legacy.h | 48 +++++++++++ 3 files changed, 154 insertions(+), 106 deletions(-) (limited to 'quantum') diff --git a/quantum/keycodes.h b/quantum/keycodes.h index e47286a443..ec51459272 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -317,41 +317,41 @@ enum qk_keycode_defines { QK_SWAP_HANDS_OFF = 0x56F4, QK_SWAP_HANDS_ON = 0x56F5, QK_SWAP_HANDS_ONE_SHOT = 0x56F6, - MAGIC_SWAP_CONTROL_CAPSLOCK = 0x7000, - MAGIC_UNSWAP_CONTROL_CAPSLOCK = 0x7001, - MAGIC_TOGGLE_CONTROL_CAPSLOCK = 0x7002, - MAGIC_UNCAPSLOCK_TO_CONTROL = 0x7003, - MAGIC_CAPSLOCK_TO_CONTROL = 0x7004, - MAGIC_SWAP_LALT_LGUI = 0x7005, - MAGIC_UNSWAP_LALT_LGUI = 0x7006, - MAGIC_SWAP_RALT_RGUI = 0x7007, - MAGIC_UNSWAP_RALT_RGUI = 0x7008, - MAGIC_UNNO_GUI = 0x7009, - MAGIC_NO_GUI = 0x700A, - MAGIC_TOGGLE_GUI = 0x700B, - MAGIC_SWAP_GRAVE_ESC = 0x700C, - MAGIC_UNSWAP_GRAVE_ESC = 0x700D, - MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E, - MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F, - MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010, - MAGIC_HOST_NKRO = 0x7011, - MAGIC_UNHOST_NKRO = 0x7012, - MAGIC_TOGGLE_NKRO = 0x7013, - MAGIC_SWAP_ALT_GUI = 0x7014, - MAGIC_UNSWAP_ALT_GUI = 0x7015, - MAGIC_TOGGLE_ALT_GUI = 0x7016, - MAGIC_SWAP_LCTL_LGUI = 0x7017, - MAGIC_UNSWAP_LCTL_LGUI = 0x7018, - MAGIC_SWAP_RCTL_RGUI = 0x7019, - MAGIC_UNSWAP_RCTL_RGUI = 0x701A, - MAGIC_SWAP_CTL_GUI = 0x701B, - MAGIC_UNSWAP_CTL_GUI = 0x701C, - MAGIC_TOGGLE_CTL_GUI = 0x701D, - MAGIC_EE_HANDS_LEFT = 0x701E, - MAGIC_EE_HANDS_RIGHT = 0x701F, - MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020, - MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021, - MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022, + QK_MAGIC_SWAP_CONTROL_CAPS_LOCK = 0x7000, + QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK = 0x7001, + QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK = 0x7002, + QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF = 0x7003, + QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON = 0x7004, + QK_MAGIC_SWAP_LALT_LGUI = 0x7005, + QK_MAGIC_UNSWAP_LALT_LGUI = 0x7006, + QK_MAGIC_SWAP_RALT_RGUI = 0x7007, + QK_MAGIC_UNSWAP_RALT_RGUI = 0x7008, + QK_MAGIC_GUI_ON = 0x7009, + QK_MAGIC_GUI_OFF = 0x700A, + QK_MAGIC_TOGGLE_GUI = 0x700B, + QK_MAGIC_SWAP_GRAVE_ESC = 0x700C, + QK_MAGIC_UNSWAP_GRAVE_ESC = 0x700D, + QK_MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E, + QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F, + QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010, + QK_MAGIC_NKRO_ON = 0x7011, + QK_MAGIC_NKRO_OFF = 0x7012, + QK_MAGIC_TOGGLE_NKRO = 0x7013, + QK_MAGIC_SWAP_ALT_GUI = 0x7014, + QK_MAGIC_UNSWAP_ALT_GUI = 0x7015, + QK_MAGIC_TOGGLE_ALT_GUI = 0x7016, + QK_MAGIC_SWAP_LCTL_LGUI = 0x7017, + QK_MAGIC_UNSWAP_LCTL_LGUI = 0x7018, + QK_MAGIC_SWAP_RCTL_RGUI = 0x7019, + QK_MAGIC_UNSWAP_RCTL_RGUI = 0x701A, + QK_MAGIC_SWAP_CTL_GUI = 0x701B, + QK_MAGIC_UNSWAP_CTL_GUI = 0x701C, + QK_MAGIC_TOGGLE_CTL_GUI = 0x701D, + QK_MAGIC_EE_HANDS_LEFT = 0x701E, + QK_MAGIC_EE_HANDS_RIGHT = 0x701F, + QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK = 0x7020, + QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK = 0x7021, + QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK = 0x7022, QK_MIDI_ON = 0x7100, QK_MIDI_OFF = 0x7101, QK_MIDI_TOGGLE = 0x7102, @@ -880,41 +880,41 @@ enum qk_keycode_defines { SH_OFF = QK_SWAP_HANDS_OFF, SH_ON = QK_SWAP_HANDS_ON, SH_OS = QK_SWAP_HANDS_ONE_SHOT, - CL_SWAP = MAGIC_SWAP_CONTROL_CAPSLOCK, - CL_NORM = MAGIC_UNSWAP_CONTROL_CAPSLOCK, - CL_TOGG = MAGIC_TOGGLE_CONTROL_CAPSLOCK, - CL_CAPS = MAGIC_UNCAPSLOCK_TO_CONTROL, - CL_CTRL = MAGIC_CAPSLOCK_TO_CONTROL, - LAG_SWP = MAGIC_SWAP_LALT_LGUI, - LAG_NRM = MAGIC_UNSWAP_LALT_LGUI, - RAG_SWP = MAGIC_SWAP_RALT_RGUI, - RAG_NRM = MAGIC_UNSWAP_RALT_RGUI, - GUI_ON = MAGIC_UNNO_GUI, - GUI_OFF = MAGIC_NO_GUI, - GUI_TOG = MAGIC_TOGGLE_GUI, - GE_SWAP = MAGIC_SWAP_GRAVE_ESC, - GE_NORM = MAGIC_UNSWAP_GRAVE_ESC, - BS_SWAP = MAGIC_SWAP_BACKSLASH_BACKSPACE, - BS_NORM = MAGIC_UNSWAP_BACKSLASH_BACKSPACE, - BS_TOGG = MAGIC_TOGGLE_BACKSLASH_BACKSPACE, - NK_ON = MAGIC_HOST_NKRO, - NK_OFF = MAGIC_UNHOST_NKRO, - NK_TOGG = MAGIC_TOGGLE_NKRO, - AG_SWAP = MAGIC_SWAP_ALT_GUI, - AG_NORM = MAGIC_UNSWAP_ALT_GUI, - AG_TOGG = MAGIC_TOGGLE_ALT_GUI, - LCG_SWP = MAGIC_SWAP_LCTL_LGUI, - LCG_NRM = MAGIC_UNSWAP_LCTL_LGUI, - RCG_SWP = MAGIC_SWAP_RCTL_RGUI, - RCG_NRM = MAGIC_UNSWAP_RCTL_RGUI, - CG_SWAP = MAGIC_SWAP_CTL_GUI, - CG_NORM = MAGIC_UNSWAP_CTL_GUI, - CG_TOGG = MAGIC_TOGGLE_CTL_GUI, - EH_LEFT = MAGIC_EE_HANDS_LEFT, - EH_RGHT = MAGIC_EE_HANDS_RIGHT, - EC_SWAP = MAGIC_SWAP_ESCAPE_CAPSLOCK, - EC_NORM = MAGIC_UNSWAP_ESCAPE_CAPSLOCK, - EC_TOGG = MAGIC_TOGGLE_ESCAPE_CAPSLOCK, + CL_SWAP = QK_MAGIC_SWAP_CONTROL_CAPS_LOCK, + CL_NORM = QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK, + CL_TOGG = QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK, + CL_CAPS = QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF, + CL_CTRL = QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON, + AG_LSWP = QK_MAGIC_SWAP_LALT_LGUI, + AG_LNRM = QK_MAGIC_UNSWAP_LALT_LGUI, + AG_RSWP = QK_MAGIC_SWAP_RALT_RGUI, + AG_RNRM = QK_MAGIC_UNSWAP_RALT_RGUI, + GU_ON = QK_MAGIC_GUI_ON, + GU_OFF = QK_MAGIC_GUI_OFF, + GU_TOGG = QK_MAGIC_TOGGLE_GUI, + GE_SWAP = QK_MAGIC_SWAP_GRAVE_ESC, + GE_NORM = QK_MAGIC_UNSWAP_GRAVE_ESC, + BS_SWAP = QK_MAGIC_SWAP_BACKSLASH_BACKSPACE, + BS_NORM = QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE, + BS_TOGG = QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE, + NK_ON = QK_MAGIC_NKRO_ON, + NK_OFF = QK_MAGIC_NKRO_OFF, + NK_TOGG = QK_MAGIC_TOGGLE_NKRO, + AG_SWAP = QK_MAGIC_SWAP_ALT_GUI, + AG_NORM = QK_MAGIC_UNSWAP_ALT_GUI, + AG_TOGG = QK_MAGIC_TOGGLE_ALT_GUI, + CG_LSWP = QK_MAGIC_SWAP_LCTL_LGUI, + CG_LNRM = QK_MAGIC_UNSWAP_LCTL_LGUI, + CG_RSWP = QK_MAGIC_SWAP_RCTL_RGUI, + CG_RNRM = QK_MAGIC_UNSWAP_RCTL_RGUI, + CG_SWAP = QK_MAGIC_SWAP_CTL_GUI, + CG_NORM = QK_MAGIC_UNSWAP_CTL_GUI, + CG_TOGG = QK_MAGIC_TOGGLE_CTL_GUI, + EH_LEFT = QK_MAGIC_EE_HANDS_LEFT, + EH_RGHT = QK_MAGIC_EE_HANDS_RIGHT, + EC_SWAP = QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK, + EC_NORM = QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK, + EC_TOGG = QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK, MI_ON = QK_MIDI_ON, MI_OFF = QK_MIDI_OFF, MI_TOGG = QK_MIDI_TOGGLE, @@ -1340,7 +1340,7 @@ enum qk_keycode_defines { #define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2) #define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT) -#define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK) +#define IS_MAGIC_KEYCODE(code) ((code) >= QK_MAGIC_SWAP_CONTROL_CAPS_LOCK && (code) <= QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK) #define IS_MIDI_KEYCODE(code) ((code) >= QK_MIDI_ON && (code) <= QK_MIDI_PITCH_BEND_UP) #define IS_SEQUENCER_KEYCODE(code) ((code) >= QK_SEQUENCER_ON && (code) <= QK_SEQUENCER_STEPS_CLEAR) #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31) diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c index 72332b20d7..5fafe8550f 100644 --- a/quantum/process_keycode/process_magic.c +++ b/quantum/process_keycode/process_magic.c @@ -44,99 +44,99 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) { /* keymap config */ keymap_config.raw = eeconfig_read_keymap(); switch (keycode) { - case MAGIC_SWAP_CONTROL_CAPSLOCK: + case QK_MAGIC_SWAP_CONTROL_CAPS_LOCK: keymap_config.swap_control_capslock = true; break; - case MAGIC_SWAP_ESCAPE_CAPSLOCK: + case QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK: keymap_config.swap_escape_capslock = true; break; - case MAGIC_CAPSLOCK_TO_CONTROL: + case QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON: keymap_config.capslock_to_control = true; break; - case MAGIC_SWAP_LALT_LGUI: + case QK_MAGIC_SWAP_LALT_LGUI: keymap_config.swap_lalt_lgui = true; break; - case MAGIC_SWAP_RALT_RGUI: + case QK_MAGIC_SWAP_RALT_RGUI: keymap_config.swap_ralt_rgui = true; break; - case MAGIC_SWAP_LCTL_LGUI: + case QK_MAGIC_SWAP_LCTL_LGUI: keymap_config.swap_lctl_lgui = true; break; - case MAGIC_SWAP_RCTL_RGUI: + case QK_MAGIC_SWAP_RCTL_RGUI: keymap_config.swap_rctl_rgui = true; break; - case MAGIC_NO_GUI: + case QK_MAGIC_GUI_OFF: keymap_config.no_gui = true; break; - case MAGIC_SWAP_GRAVE_ESC: + case QK_MAGIC_SWAP_GRAVE_ESC: keymap_config.swap_grave_esc = true; break; - case MAGIC_SWAP_BACKSLASH_BACKSPACE: + case QK_MAGIC_SWAP_BACKSLASH_BACKSPACE: keymap_config.swap_backslash_backspace = true; break; - case MAGIC_HOST_NKRO: + case QK_MAGIC_NKRO_ON: clear_keyboard(); // clear first buffer to prevent stuck keys keymap_config.nkro = true; break; - case MAGIC_SWAP_ALT_GUI: + case QK_MAGIC_SWAP_ALT_GUI: keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; #ifdef AUDIO_ENABLE PLAY_SONG(ag_swap_song); #endif break; - case MAGIC_SWAP_CTL_GUI: + case QK_MAGIC_SWAP_CTL_GUI: keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true; #ifdef AUDIO_ENABLE PLAY_SONG(cg_swap_song); #endif break; - case MAGIC_UNSWAP_CONTROL_CAPSLOCK: + case QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK: keymap_config.swap_control_capslock = false; break; - case MAGIC_UNSWAP_ESCAPE_CAPSLOCK: + case QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK: keymap_config.swap_escape_capslock = false; break; - case MAGIC_UNCAPSLOCK_TO_CONTROL: + case QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF: keymap_config.capslock_to_control = false; break; - case MAGIC_UNSWAP_LALT_LGUI: + case QK_MAGIC_UNSWAP_LALT_LGUI: keymap_config.swap_lalt_lgui = false; break; - case MAGIC_UNSWAP_RALT_RGUI: + case QK_MAGIC_UNSWAP_RALT_RGUI: keymap_config.swap_ralt_rgui = false; break; - case MAGIC_UNSWAP_LCTL_LGUI: + case QK_MAGIC_UNSWAP_LCTL_LGUI: keymap_config.swap_lctl_lgui = false; break; - case MAGIC_UNSWAP_RCTL_RGUI: + case QK_MAGIC_UNSWAP_RCTL_RGUI: keymap_config.swap_rctl_rgui = false; break; - case MAGIC_UNNO_GUI: + case QK_MAGIC_GUI_ON: keymap_config.no_gui = false; break; - case MAGIC_UNSWAP_GRAVE_ESC: + case QK_MAGIC_UNSWAP_GRAVE_ESC: keymap_config.swap_grave_esc = false; break; - case MAGIC_UNSWAP_BACKSLASH_BACKSPACE: + case QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE: keymap_config.swap_backslash_backspace = false; break; - case MAGIC_UNHOST_NKRO: + case QK_MAGIC_NKRO_OFF: clear_keyboard(); // clear first buffer to prevent stuck keys keymap_config.nkro = false; break; - case MAGIC_UNSWAP_ALT_GUI: + case QK_MAGIC_UNSWAP_ALT_GUI: keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; #ifdef AUDIO_ENABLE PLAY_SONG(ag_norm_song); #endif break; - case MAGIC_UNSWAP_CTL_GUI: + case QK_MAGIC_UNSWAP_CTL_GUI: keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false; #ifdef AUDIO_ENABLE PLAY_SONG(cg_norm_song); #endif break; - case MAGIC_TOGGLE_ALT_GUI: + case QK_MAGIC_TOGGLE_ALT_GUI: keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui; #ifdef AUDIO_ENABLE @@ -147,7 +147,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) { } #endif break; - case MAGIC_TOGGLE_CTL_GUI: + case QK_MAGIC_TOGGLE_CTL_GUI: keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui; keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui; #ifdef AUDIO_ENABLE @@ -158,26 +158,26 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) { } #endif break; - case MAGIC_TOGGLE_BACKSLASH_BACKSPACE: + case QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE: keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace; break; - case MAGIC_TOGGLE_NKRO: + case QK_MAGIC_TOGGLE_NKRO: clear_keyboard(); // clear first buffer to prevent stuck keys keymap_config.nkro = !keymap_config.nkro; break; - case MAGIC_EE_HANDS_LEFT: + case QK_MAGIC_EE_HANDS_LEFT: eeconfig_update_handedness(true); break; - case MAGIC_EE_HANDS_RIGHT: + case QK_MAGIC_EE_HANDS_RIGHT: eeconfig_update_handedness(false); break; - case MAGIC_TOGGLE_GUI: + case QK_MAGIC_TOGGLE_GUI: keymap_config.no_gui = !keymap_config.no_gui; break; - case MAGIC_TOGGLE_CONTROL_CAPSLOCK: + case QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK: keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock; break; - case MAGIC_TOGGLE_ESCAPE_CAPSLOCK: + case QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK: keymap_config.swap_escape_capslock = !keymap_config.swap_escape_capslock; break; } diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index b23ed00e98..120c98bc62 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -5,3 +5,51 @@ // Deprecated Quantum keycodes #define SH_TG QK_SWAP_HANDS_TOGGLE #define SQ_TOG QK_SEQUENCER_TOGGLE + +#define MAGIC_SWAP_CONTROL_CAPSLOCK QK_MAGIC_SWAP_CONTROL_CAPS_LOCK +#define MAGIC_UNSWAP_CONTROL_CAPSLOCK QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK +#define MAGIC_TOGGLE_CONTROL_CAPSLOCK QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK +#define MAGIC_UNCAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF +#define MAGIC_CAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON +#define MAGIC_SWAP_LALT_LGUI QK_MAGIC_SWAP_LALT_LGUI +#define MAGIC_UNSWAP_LALT_LGUI QK_MAGIC_UNSWAP_LALT_LGUI +#define MAGIC_SWAP_RALT_RGUI QK_MAGIC_SWAP_RALT_RGUI +#define MAGIC_UNSWAP_RALT_RGUI QK_MAGIC_UNSWAP_RALT_RGUI +#define MAGIC_UNNO_GUI QK_MAGIC_GUI_ON +#define MAGIC_NO_GUI QK_MAGIC_GUI_OFF +#define MAGIC_TOGGLE_GUI QK_MAGIC_TOGGLE_GUI +#define MAGIC_SWAP_GRAVE_ESC QK_MAGIC_SWAP_GRAVE_ESC +#define MAGIC_UNSWAP_GRAVE_ESC QK_MAGIC_UNSWAP_GRAVE_ESC +#define MAGIC_SWAP_BACKSLASH_BACKSPACE QK_MAGIC_SWAP_BACKSLASH_BACKSPACE +#define MAGIC_UNSWAP_BACKSLASH_BACKSPACE QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE +#define MAGIC_TOGGLE_BACKSLASH_BACKSPACE QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE +#define MAGIC_HOST_NKRO QK_MAGIC_NKRO_ON +#define MAGIC_UNHOST_NKRO QK_MAGIC_NKRO_OFF +#define MAGIC_TOGGLE_NKRO QK_MAGIC_TOGGLE_NKRO +#define MAGIC_SWAP_ALT_GUI QK_MAGIC_SWAP_ALT_GUI +#define MAGIC_UNSWAP_ALT_GUI QK_MAGIC_UNSWAP_ALT_GUI +#define MAGIC_TOGGLE_ALT_GUI QK_MAGIC_TOGGLE_ALT_GUI +#define MAGIC_SWAP_LCTL_LGUI QK_MAGIC_SWAP_LCTL_LGUI +#define MAGIC_UNSWAP_LCTL_LGUI QK_MAGIC_UNSWAP_LCTL_LGUI +#define MAGIC_SWAP_RCTL_RGUI QK_MAGIC_SWAP_RCTL_RGUI +#define MAGIC_UNSWAP_RCTL_RGUI QK_MAGIC_UNSWAP_RCTL_RGUI +#define MAGIC_SWAP_CTL_GUI QK_MAGIC_SWAP_CTL_GUI +#define MAGIC_UNSWAP_CTL_GUI QK_MAGIC_UNSWAP_CTL_GUI +#define MAGIC_TOGGLE_CTL_GUI QK_MAGIC_TOGGLE_CTL_GUI +#define MAGIC_EE_HANDS_LEFT QK_MAGIC_EE_HANDS_LEFT +#define MAGIC_EE_HANDS_RIGHT QK_MAGIC_EE_HANDS_RIGHT +#define MAGIC_SWAP_ESCAPE_CAPSLOCK QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK +#define MAGIC_UNSWAP_ESCAPE_CAPSLOCK QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK +#define MAGIC_TOGGLE_ESCAPE_CAPSLOCK QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK + +#define LCG_SWP QK_MAGIC_SWAP_LCTL_LGUI +#define LCG_NRM QK_MAGIC_UNSWAP_LCTL_LGUI +#define RCG_SWP QK_MAGIC_SWAP_RCTL_RGUI +#define RCG_NRM QK_MAGIC_UNSWAP_RCTL_RGUI +#define LAG_SWP QK_MAGIC_SWAP_LALT_LGUI +#define LAG_NRM QK_MAGIC_UNSWAP_LALT_LGUI +#define RAG_SWP QK_MAGIC_SWAP_RALT_RGUI +#define RAG_NRM QK_MAGIC_UNSWAP_RALT_RGUI +#define GUI_ON QK_MAGIC_GUI_ON +#define GUI_OFF QK_MAGIC_GUI_OFF +#define GUI_TOG QK_MAGIC_TOGGLE_GUI -- cgit v1.2.3