diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:39 -0800 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:39 -0800 |
| commit | b0537f75df73ca5a55355c7546d45577cb2c6a38 (patch) | |
| tree | 0da100dc4fcbe21629a10879b53e13d02c25c170 /quantum/process_keycode/process_unicode.c | |
| parent | 5ac0e6e6aee64c9b8fade79aaf22bc839e2c6b47 (diff) | |
| parent | 41c93575a838e9b201ca113165085f47198e109d (diff) | |
Merge branch 'master' into sculpt2
Diffstat (limited to 'quantum/process_keycode/process_unicode.c')
| -rw-r--r-- | quantum/process_keycode/process_unicode.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c index a30e93ae32..9995ba9bde 100644 --- a/quantum/process_keycode/process_unicode.c +++ b/quantum/process_keycode/process_unicode.c @@ -141,7 +141,16 @@ bool process_unicode_map(uint16_t keycode, keyrecord_t *record) { const uint32_t* map = unicode_map; uint16_t index = keycode & 0x7FF; uint32_t code = pgm_read_dword_far(&map[index]); - if ((code > 0xFFFF && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) { + if (code > 0xFFFF && code <= 0x10ffff && input_mode == UC_OSX) { + // Convert to UTF-16 surrogate pair + code -= 0x10000; + uint32_t lo = code & 0x3ff; + uint32_t hi = (code & 0xffc00) >> 10; + unicode_input_start(); + 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)) { // when character is out of range supported by the OS unicode_map_input_error(); } else { |