diff options
author | Konstantin Đorđević <vomindoraan@gmail.com> | 2018-11-06 06:34:54 +0100 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-11-06 00:34:54 -0500 |
commit | 4636f0f623c71f1eda8628cbae4784fe08a8faf7 (patch) | |
tree | 18461a85035f946d6f4fd31b1a6ab161a3903899 | |
parent | 5729380530ca28049a193f84b0199e77ba3e8edd (diff) | |
download | qmk_firmware-4636f0f623c71f1eda8628cbae4784fe08a8faf7.tar.gz qmk_firmware-4636f0f623c71f1eda8628cbae4784fe08a8faf7.zip |
Remove ALTG(kc) as it's misleading and is not actually AltGr (#4338)
* Remove ALTG(kc) as it's misleading and is not actually AltGr
* Add temporary alias for ALGR in keyboards/planck/keymaps/pevecyan/keymap.c
-rw-r--r-- | docs/feature_advanced_keycodes.md | 1 | ||||
-rw-r--r-- | docs/keycodes.md | 1 | ||||
-rw-r--r-- | keyboards/planck/keymaps/pevecyan/keymap.c | 2 | ||||
-rw-r--r-- | quantum/keymap_extras/keymap_slovenian.h | 30 | ||||
-rw-r--r-- | quantum/quantum_keycodes.h | 1 |
5 files changed, 19 insertions, 16 deletions
diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md index f2e4909d8..f9a5c3980 100644 --- a/docs/feature_advanced_keycodes.md +++ b/docs/feature_advanced_keycodes.md | |||
@@ -73,7 +73,6 @@ These allow you to combine a modifier with a keycode. When pressed, the keydown | |||
73 | |`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`| | 73 | |`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`| |
74 | |`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` | | 74 | |`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` | |
75 | |`LCAG(kc)`| |Hold Left Control, Alt and GUI and press `kc` | | 75 | |`LCAG(kc)`| |Hold Left Control, Alt and GUI and press `kc` | |
76 | |`ALTG(kc)`| |Hold Right Control and Alt and press `kc` | | ||
77 | |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc` | | 76 | |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc` | |
78 | |`LCA(kc)` | |Hold Left Control and Alt and press `kc` | | 77 | |`LCA(kc)` | |Hold Left Control and Alt and press `kc` | |
79 | 78 | ||
diff --git a/docs/keycodes.md b/docs/keycodes.md index 6676bb53c..e5d35b2b4 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md | |||
@@ -333,7 +333,6 @@ This is a reference only. Each group of keys links to the page documenting their | |||
333 | |`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`| | 333 | |`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc`| |
334 | |`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` | | 334 | |`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` | |
335 | |`LCAG(kc)`| |Hold Left Control, Alt and GUI and press `kc` | | 335 | |`LCAG(kc)`| |Hold Left Control, Alt and GUI and press `kc` | |
336 | |`ALTG(kc)`| |Hold Right Control and Alt and press `kc` | | ||
337 | |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc` | | 336 | |`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc` | |
338 | |`LCA(kc)` | |Hold Left Control and Alt and press `kc` | | 337 | |`LCA(kc)` | |Hold Left Control and Alt and press `kc` | |
339 | 338 | ||
diff --git a/keyboards/planck/keymaps/pevecyan/keymap.c b/keyboards/planck/keymaps/pevecyan/keymap.c index 4d76f09b0..57f9f0e7f 100644 --- a/keyboards/planck/keymaps/pevecyan/keymap.c +++ b/keyboards/planck/keymaps/pevecyan/keymap.c | |||
@@ -20,6 +20,8 @@ | |||
20 | #include "muse.h" | 20 | #include "muse.h" |
21 | #include "keymap_slovenian.h" | 21 | #include "keymap_slovenian.h" |
22 | 22 | ||
23 | #define ALTG(kc) ALGR(kc) // FIXME: Remove this | ||
24 | |||
23 | extern keymap_config_t keymap_config; | 25 | extern keymap_config_t keymap_config; |
24 | 26 | ||
25 | enum planck_layers { | 27 | enum planck_layers { |
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h index a9db17bec..f27123c2a 100644 --- a/quantum/keymap_extras/keymap_slovenian.h +++ b/quantum/keymap_extras/keymap_slovenian.h | |||
@@ -17,8 +17,12 @@ | |||
17 | 17 | ||
18 | #ifndef KEYMAP_SLOVENIAN | 18 | #ifndef KEYMAP_SLOVENIAN |
19 | #define KEYMAP_SLOVENIAN | 19 | #define KEYMAP_SLOVENIAN |
20 | |||
20 | #include "keymap.h" | 21 | #include "keymap.h" |
21 | 22 | ||
23 | // Alt gr | ||
24 | #define ALGR(kc) RALT(kc) | ||
25 | #define SI_ALGR KC_RALT | ||
22 | 26 | ||
23 | //Swapped Z and Y | 27 | //Swapped Z and Y |
24 | #define SI_Z KC_Y | 28 | #define SI_Z KC_Y |
@@ -90,18 +94,18 @@ | |||
90 | #define SI_UNDS LSFT(SI_MINS) // _ | 94 | #define SI_UNDS LSFT(SI_MINS) // _ |
91 | 95 | ||
92 | // Alt Gr-ed characters | 96 | // Alt Gr-ed characters |
93 | #define SI_CIRC ALTG(KC_3) // ^ | 97 | #define SI_CIRC ALGR(KC_3) // ^ |
94 | #define SI_DEG ALTG(KC_5) // ° | 98 | #define SI_DEG ALGR(KC_5) // ° |
95 | #define SI_GRV ALTG(KC_7) // ` | 99 | #define SI_GRV ALGR(KC_7) // ` |
96 | #define SI_ACCU ALTG(KC_9) // ´ | 100 | #define SI_ACCU ALGR(KC_9) // ´ |
97 | #define SI_LCBR ALTG(KC_B) // { | 101 | #define SI_LCBR ALGR(KC_B) // { |
98 | #define SI_RCBR ALTG(KC_N) // } | 102 | #define SI_RCBR ALGR(KC_N) // } |
99 | #define SI_LBRC ALTG(KC_F) // [ | 103 | #define SI_LBRC ALGR(KC_F) // [ |
100 | #define SI_RBRC ALTG(KC_G) // ] | 104 | #define SI_RBRC ALGR(KC_G) // ] |
101 | #define SI_BSLS ALTG(KC_Q) // backslash | 105 | #define SI_BSLS ALGR(KC_Q) // backslash |
102 | #define SI_AT ALTG(KC_V) // @ | 106 | #define SI_AT ALGR(KC_V) // @ |
103 | #define SI_EURO ALTG(KC_E) // € | 107 | #define SI_EURO ALGR(KC_E) // € |
104 | #define SI_TILD ALTG(KC_1) // ~ | 108 | #define SI_TILD ALGR(KC_1) // ~ |
105 | #define SI_PIPE ALTG(KC_W) // | | 109 | #define SI_PIPE ALGR(KC_W) // | |
106 | 110 | ||
107 | #endif | 111 | #endif |
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index e983798f2..53fece21c 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
@@ -475,7 +475,6 @@ enum quantum_keycodes { | |||
475 | #define HYPR(kc) (QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI | (kc)) | 475 | #define HYPR(kc) (QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI | (kc)) |
476 | #define MEH(kc) (QK_LCTL | QK_LSFT | QK_LALT | (kc)) | 476 | #define MEH(kc) (QK_LCTL | QK_LSFT | QK_LALT | (kc)) |
477 | #define LCAG(kc) (QK_LCTL | QK_LALT | QK_LGUI | (kc)) | 477 | #define LCAG(kc) (QK_LCTL | QK_LALT | QK_LGUI | (kc)) |
478 | #define ALTG(kc) (QK_RCTL | QK_RALT | (kc)) | ||
479 | #define SGUI(kc) (QK_LGUI | QK_LSFT | (kc)) | 478 | #define SGUI(kc) (QK_LGUI | QK_LSFT | (kc)) |
480 | #define SCMD(kc) SGUI(kc) | 479 | #define SCMD(kc) SGUI(kc) |
481 | #define SWIN(kc) SGUI(kc) | 480 | #define SWIN(kc) SGUI(kc) |