diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-06 18:28:50 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-02-06 18:28:50 -0500 |
| commit | 449ab9109ab0d04944de8430d8d910cf7f1e8856 (patch) | |
| tree | 2db5f51ff90ad4cb0f45737017250023a1f7b9d4 | |
| parent | 35edb382ee6390e1208806ce74d7dc1f4ab08f5d (diff) | |
| parent | 0a3c5c06fe31d794bfe0fe7fe558e3331973e881 (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware0.5.4
| -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 { |