summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorMarco Fontani <MFONTANI@cpan.org>2017-08-28 20:05:42 +0200
committerJack Humbert <jack.humb@gmail.com>2017-08-30 17:38:03 +0200
commitda83f04a30903a98b9a8dbe29c2d6cef4f9da3a7 (patch)
treeaac5317daca48e2598e97a1e6f9484f39ab5d1a7 /quantum
parent9987f9dcffa8b33e09dc3147088a102df5a6da7d (diff)
downloadqmk_firmware-da83f04a30903a98b9a8dbe29c2d6cef4f9da3a7.tar.gz
qmk_firmware-da83f04a30903a98b9a8dbe29c2d6cef4f9da3a7.tar.xz
add UC_OSX_RALT to make unicode use the Right Alt key on OSX
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_unicode_common.c6
-rw-r--r--quantum/process_keycode/process_unicode_common.h1
-rw-r--r--quantum/process_keycode/process_unicodemap.c4
3 files changed, 9 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 84b5d673d..7f34ad57c 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -49,6 +49,9 @@ void unicode_input_start (void) {
case UC_OSX:
register_code(KC_LALT);
break;
+ case UC_OSX_RALT:
+ register_code(KC_RALT);
+ break;
case UC_LNX:
register_code(KC_LCTL);
register_code(KC_LSFT);
@@ -78,6 +81,9 @@ void unicode_input_finish (void) {
case UC_WIN:
unregister_code(KC_LALT);
break;
+ case UC_OSX_RALT:
+ unregister_code(KC_RALT);
+ break;
case UC_LNX:
register_code(KC_SPC);
unregister_code(KC_SPC);
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index f5be1da5c..4d2b04fb3 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -37,6 +37,7 @@ void register_hex(uint16_t hex);
#define UC_WIN 2 // Windows 'HexNumpad'
#define UC_BSD 3 // BSD (not implemented)
#define UC_WINC 4 // WinCompose https://github.com/samhocevar/wincompose
+#define UC_OSX_RALT 5 // Mac OS X using Right Alt key for Unicode Compose
#define UC_BSPC UC(0x0008)
diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index 75f35112b..47c27b911 100644
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -50,7 +50,7 @@ bool process_unicode_map(uint16_t keycode, keyrecord_t *record) {
const uint32_t* map = unicode_map;
uint16_t index = keycode - QK_UNICODE_MAP;
uint32_t code = pgm_read_dword(&map[index]);
- if (code > 0xFFFF && code <= 0x10ffff && input_mode == UC_OSX) {
+ if (code > 0xFFFF && code <= 0x10ffff && (input_mode == UC_OSX || input_mode == UC_OSX_RALT)) {
// Convert to UTF-16 surrogate pair
code -= 0x10000;
uint32_t lo = code & 0x3ff;
@@ -59,7 +59,7 @@ bool process_unicode_map(uint16_t keycode, keyrecord_t *record) {
register_hex32(hi + 0xd800);
register_hex32(lo + 0xdc00);
unicode_input_finish();
- } else if ((code > 0x10ffff && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) {
+ } else if ((code > 0x10ffff && (input_mode == UC_OSX || input_mode == UC_OSX_RALT)) || (code > 0xFFFFF && input_mode == UC_LNX)) {
// when character is out of range supported by the OS
unicode_map_input_error();
} else {