Merge branch 'master' of github.com:jackhumbert/qmk_firmware
commit
449ab9109a
|
@ -141,7 +141,16 @@ bool process_unicode_map(uint16_t keycode, keyrecord_t *record) {
|
||||||
const uint32_t* map = unicode_map;
|
const uint32_t* map = unicode_map;
|
||||||
uint16_t index = keycode & 0x7FF;
|
uint16_t index = keycode & 0x7FF;
|
||||||
uint32_t code = pgm_read_dword_far(&map[index]);
|
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
|
// when character is out of range supported by the OS
|
||||||
unicode_map_input_error();
|
unicode_map_input_error();
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue