summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorKonstantin Đorđević <vomindoraan@gmail.com>2018-12-12 19:17:19 +0100
committerDrashna Jaelre <drashna@live.com>2018-12-12 10:17:19 -0800
commit28fbf84cc5ff52f545011ea4198a6cc6d054f896 (patch)
treecaf444ec1231e5f0852eca8d07e2f8595a153002 /quantum
parent8b6cdd17886db9847ff91be9c10a1788a7c74a6a (diff)
Add standard definitions for ALGR and KC_ALGR (#4389)
* Add standard ALGR defition, remove (re)definitions from language files * Use ALGR(kc) consistently in ALTGR(kc) aliases * Non-Nordic keymaps should not use NO_ALGR * Add standard KC_ALGR definition * Update docs with ALGR and KC_ALGR * Update SS_ALGR and ALGR_T aliases
Diffstat (limited to 'quantum')
-rw-r--r--quantum/keymap_extras/keymap_belgian.h5
-rw-r--r--quantum/keymap_extras/keymap_bepo.h5
-rw-r--r--quantum/keymap_extras/keymap_canadian_multilingual.h5
-rw-r--r--quantum/keymap_extras/keymap_fr_ch.h1
-rw-r--r--quantum/keymap_extras/keymap_french.h5
-rw-r--r--quantum/keymap_extras/keymap_german.h1
-rw-r--r--quantum/keymap_extras/keymap_german_ch.h1
-rw-r--r--quantum/keymap_extras/keymap_hungarian.h1
-rw-r--r--quantum/keymap_extras/keymap_italian.h1
-rw-r--r--quantum/keymap_extras/keymap_nordic.h1
-rw-r--r--quantum/keymap_extras/keymap_slovenian.h1
-rw-r--r--quantum/keymap_extras/keymap_spanish.h3
-rw-r--r--quantum/keymap_extras/keymap_uk.h3
-rw-r--r--quantum/quantum.h1
-rw-r--r--quantum/quantum_keycodes.h5
15 files changed, 10 insertions, 29 deletions
diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
index 764c561417..573fa2e8a4 100644
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -22,10 +22,7 @@
#define BE_LALT KC_LGUI
// Alt gr
-#ifndef ALGR
-#define ALGR(kc) RALT(kc)
-#endif
-#define NO_ALGR KC_RALT
+#define BE_ALGR KC_RALT
// Normal characters
// Line 1
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 05fd2b0023..e6545a7a83 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -21,10 +21,7 @@
// Alt gr
#ifndef ALTGR
-#define ALTGR(kc) RALT(kc)
-#endif
-#ifndef ALGR
-#define ALGR(kc) ALTGR(kc)
+#define ALTGR(kc) ALGR(kc)
#endif
#define BP_ALGR KC_RALT
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index 1d45bee32e..fbeef21874 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -20,10 +20,7 @@
// Alt gr
#ifndef ALTGR
-#define ALTGR(kc) RALT(kc)
-#endif
-#ifndef ALGR
-#define ALGR(kc) ALTGR(kc)
+#define ALTGR(kc) ALGR(kc)
#endif
#define CSA_ALTGR KC_RALT
diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h
index c0ca832a6f..4eeca7209f 100644
--- a/quantum/keymap_extras/keymap_fr_ch.h
+++ b/quantum/keymap_extras/keymap_fr_ch.h
@@ -19,7 +19,6 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
#define FR_CH_ALGR KC_RALT
// normal characters
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index 3308dc5f77..d2de859ee7 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -19,10 +19,7 @@
#include "keymap.h"
// Alt gr
-#ifndef ALGR
-#define ALGR(kc) RALT(kc)
-#endif
-#define NO_ALGR KC_RALT
+#define FR_ALGR KC_RALT
// Normal characters
#define FR_SUP2 KC_GRV
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index e007c26ef5..a215570fd3 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -20,7 +20,6 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
#define DE_ALGR KC_RALT
// normal characters
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index 67350d6602..f0376a17c0 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -19,7 +19,6 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
#define CH_ALGR KC_RALT
// normal characters
diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h
index b372440928..cd2dc94cfe 100644
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@@ -20,7 +20,6 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
#define HU_ALGR KC_RALT
// basic letters
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index 0ff6ce8762..f629081507 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -20,7 +20,6 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
#define IT_ALGR KC_RALT
// normal characters
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 6b34db5588..4210d37145 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -19,7 +19,6 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
#define NO_ALGR KC_RALT
// Normal characters
diff --git a/quantum/keymap_extras/keymap_slovenian.h b/quantum/keymap_extras/keymap_slovenian.h
index f27123c2a2..47f5bceed2 100644
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@@ -21,7 +21,6 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
#define SI_ALGR KC_RALT
//Swapped Z and Y
diff --git a/quantum/keymap_extras/keymap_spanish.h b/quantum/keymap_extras/keymap_spanish.h
index 224db7be16..19d12551a6 100644
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@@ -19,8 +19,7 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
-#define NO_ALGR KC_RALT
+#define ES_ALGR KC_RALT
// Normal characters
#define ES_OVRR KC_GRV
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index de47103cb9..a7bcd697e0 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -19,8 +19,7 @@
#include "keymap.h"
// Alt gr
-#define ALGR(kc) RALT(kc)
-#define NO_ALGR KC_RALT
+#define UK_ALGR KC_RALT
// Normal characters
#define UK_HASH KC_NUHS
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 41c7d8351a..5920e4b139 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -197,6 +197,7 @@ extern uint32_t default_layer_state;
#define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT)
#define SS_LSFT(string) SS_DOWN(X_LSHIFT) string SS_UP(X_LSHIFT)
#define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT)
+#define SS_ALGR(string) SS_RALT(string)
#define SEND_STRING(str) send_string_P(PSTR(str))
extern const bool ascii_to_shift_lut[0x80];
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 7670d53e96..283b4a65ca 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -470,6 +470,7 @@ enum quantum_keycodes {
#define RCTL(kc) (QK_RCTL | (kc))
#define RSFT(kc) (QK_RSFT | (kc))
#define RALT(kc) (QK_RALT | (kc))
+#define ALGR(kc) RALT(kc)
#define RGUI(kc) (QK_RGUI | (kc))
#define RCMD(kc) RGUI(kc)
#define RWIN(kc) RGUI(kc)
@@ -480,7 +481,7 @@ enum quantum_keycodes {
#define SGUI(kc) (QK_LGUI | QK_LSFT | (kc))
#define SCMD(kc) SGUI(kc)
#define SWIN(kc) SGUI(kc)
-#define LCA(kc) (QK_LCTL | QK_LALT | (kc))
+#define LCA(kc) (QK_LCTL | QK_LALT | (kc))
#define MOD_HYPR 0xf
#define MOD_MEH 0x7
@@ -645,7 +646,7 @@ enum quantum_keycodes {
#define ALT_T(kc) MT(MOD_LALT, kc)
#define LALT_T(kc) MT(MOD_LALT, kc)
#define RALT_T(kc) MT(MOD_RALT, kc)
-#define ALGR_T(kc) MT(MOD_RALT, kc) // dual-function AltGR
+#define ALGR_T(kc) RALT_T(kc)
#define GUI_T(kc) MT(MOD_LGUI, kc)
#define CMD_T(kc) GUI_T(kc)