leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix surrogate pair handling on Windows (#1165)

Browse source 
* Fix surrogate pair handling on Windows

* Change high_surrogate to Option<u16>

* Format
This commit is contained in:
Osspial 2019-09-15 22:09:08 -04:00 • committed by GitHub
parent 28a5feef28
commit c03ef852a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/platform_impl/windows/event_loop.rs
View file

@ -1031,11 +1031,29 @@ unsafe extern "system" fn public_window_callback<T>(
winuser::WM_CHAR => {
use crate::event::WindowEvent::ReceivedCharacter;
let chr: char = mem::transmute(wparam as u32);
subclass_input.send_event(Event::WindowEvent {
window_id: RootWindowId(WindowId(window)),
event: ReceivedCharacter(chr),
});
let high_surrogate = 0xD800 <= wparam && wparam <= 0xDBFF;
let low_surrogate = 0xDC00 <= wparam && wparam <= 0xDFFF;
if high_surrogate {
subclass_input.window_state.lock().high_surrogate = Some(wparam as u16);
} else if low_surrogate {
let mut window_state = subclass_input.window_state.lock();
if let Some(high_surrogate) = window_state.high_surrogate.take() {
let pair = [high_surrogate, wparam as u16];
if let Some(Ok(chr)) = std::char::decode_utf16(pair.iter().copied()).next() {
subclass_input.send_event(Event::WindowEvent {
window_id: RootWindowId(WindowId(window)),
event: ReceivedCharacter(chr),
});
}
}
} else {
let chr: char = mem::transmute(wparam as u32);
subclass_input.send_event(Event::WindowEvent {
window_id: RootWindowId(WindowId(window)),
event: ReceivedCharacter(chr),
});
}
0
}