From bbeb03504ab2a5ef20b7b639f21b9bfc8d0dfd16 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 24 Nov 2019 12:27:39 +0100 Subject: Stop emitting private use characters on macOS --- winit/src/application.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'winit/src/application.rs') diff --git a/winit/src/application.rs b/winit/src/application.rs index 4a5fd66b..ec1444f6 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -286,7 +286,9 @@ pub trait Application: Sized { )); } }, - WindowEvent::ReceivedCharacter(c) => { + WindowEvent::ReceivedCharacter(c) + if !is_private_use_character(c) => + { events.push(Event::Keyboard( keyboard::Event::CharacterReceived(c), )); @@ -379,3 +381,14 @@ fn spawn( thread_pool.spawn_ok(future); } } + +// As defined in: http://www.unicode.org/faq/private_use.html +// TODO: Remove once https://github.com/rust-windowing/winit/pull/1254 lands +fn is_private_use_character(c: char) -> bool { + match c { + '\u{E000}'..='\u{F8FF}' + | '\u{F0000}'..='\u{FFFFD}' + | '\u{100000}'..='\u{10FFFD}' => true, + _ => false, + } +} -- cgit