diff options
| author | David Olsson <david.olsson@softhouse.se> | 2017-02-11 10:50:37 +0100 |
|---|---|---|
| committer | David Olsson <david.olsson@softhouse.se> | 2017-02-11 10:50:37 +0100 |
| commit | 052f81aacaa3b5afa93f9db3667f31f9365348ce (patch) | |
| tree | dcfde5c6fed00e248535ac4d975831f33316cc8a /quantum/process_keycode/process_unicode.c | |
| parent | aa69337cf563d7b37722aabfcd1c5bae6c185208 (diff) | |
| parent | 835556da9111d91b71c545d6a273e843f07631ae (diff) | |
| download | qmk_firmware-052f81aacaa3b5afa93f9db3667f31f9365348ce.tar.gz qmk_firmware-052f81aacaa3b5afa93f9db3667f31f9365348ce.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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 { |