summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorDavid Olsson <david.olsson@softhouse.se>2017-01-18 22:58:49 +0100
committerDavid Olsson <david.olsson@softhouse.se>2017-01-18 22:58:49 +0100
commitf35adb4f37965489b846468567f9dc65c5eec05a (patch)
tree1e8c5673cf99b056c70e1b7a45bd0799ffe14655 /quantum
parentd910b94a3c9101dbe89a877236346ede1751c0da (diff)
parent3d264adfc5e4538b57315cb8d3d429b9ed310f25 (diff)
downloadqmk_firmware-f35adb4f37965489b846468567f9dc65c5eec05a.tar.gz
qmk_firmware-f35adb4f37965489b846468567f9dc65c5eec05a.zip
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum')
-rw-r--r--quantum/quantum_keycodes.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 5cd3c8e780..4853655f95 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)