alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

UTF8 keyboard events for wayland.

Browse source
This commit is contained in:
Victor Berger 2015-05-15 12:20:25 +02:00
parent 02bd3758ee
commit 178b7b133b
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/api/wayland/context.rs
View file

@ -137,17 +137,27 @@ impl WaylandContext {
KeyState::WL_KEYBOARD_KEY_STATE_RELEASED => ElementState::Released, KeyState::WL_KEYBOARD_KEY_STATE_RELEASED => ElementState::Released,
KeyState::WL_KEYBOARD_KEY_STATE_PRESSED => ElementState::Pressed KeyState::WL_KEYBOARD_KEY_STATE_PRESSED => ElementState::Pressed
}; };
let event = Event::KeyboardInput( let mut events = Vec::new();
// key event
events.push(Event::KeyboardInput(
kstate, kstate,
(keycode & 0xff) as u8, (keycode & 0xff) as u8,
keycode_to_vkey(state, keycode) keycode_to_vkey(state, keycode)
); ));
// utf8 events
if kstate == ElementState::Pressed {
if let Some(txt) = state.get_utf8(keycode) {
events.extend(
txt.chars().map(Event::ReceivedCharacter)
);
}
}
// dispatch to the appropriate queue // dispatch to the appropriate queue
let sid = *current_surface.lock().unwrap(); let sid = *current_surface.lock().unwrap();
if let Some(sid) = sid { if let Some(sid) = sid {
let map = event_queues.lock().unwrap(); let map = event_queues.lock().unwrap();
if let Some(queue) = map.get(&sid) { if let Some(queue) = map.get(&sid) {
queue.lock().unwrap().push_back(event); queue.lock().unwrap().extend(events.into_iter());
} }
} }
}); });