diff options
author | Xyverz <xyverz@gmail.com> | 2017-01-19 06:54:18 -0800 |
---|---|---|
committer | Xyverz <xyverz@gmail.com> | 2017-01-19 06:54:18 -0800 |
commit | b8b2a55973b689fb4e827f6e967163114c575cd6 (patch) | |
tree | bc30ea43e345d0e212c27d77e2a36f97e1b49371 /quantum | |
parent | 80bc59858539383713c9d9f771ae293b1153674f (diff) | |
parent | 10ff9623214ee62935a17b3f68d5180756b7a27b (diff) | |
download | qmk_firmware-b8b2a55973b689fb4e827f6e967163114c575cd6.tar.gz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/quantum_keycodes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 5cd3c8e78..4853655f9 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -159,6 +159,8 @@ enum quantum_keycodes { #define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT) #define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI) #define ALTG(kc) (kc | QK_RCTL | QK_RALT) +#define SCMD(kc) (kc | QK_LGUI | QK_LSFT) +#define SWIN(kc) SCMD(kc) #define MOD_HYPR 0xf #define MOD_MEH 0x7 @@ -293,6 +295,8 @@ enum quantum_keycodes { #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl #define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui #define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ +#define SCMD_T(kc) MT((MOD_LGUI | MOD_LSFT), kc) +#define SWIN_T(kc) SCMD_T(kc) // Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap #define KC_HYPR HYPR(KC_NO) |