alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-17 23:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #800 from emilio/compose-upstream

Browse source 
x11: handle X11's multi-key, a.k.a compose key.
This commit is contained in:
tomaka 2016-07-05 19:36:30 +02:00 committed by GitHub
parent 1a3f2e031a 952ca7cfed
commit 9a26f29a36
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/x11/events.rs
View file

@ -14,7 +14,7 @@ pub fn keycode_to_element(scancode: libc::c_uint) -> Option<VirtualKeyCode> {
//ffi::XK_Sys_Req => events::VirtualKeyCode::Sys_req, //ffi::XK_Sys_Req => events::VirtualKeyCode::Sys_req,
ffi::XK_Escape => events::VirtualKeyCode::Escape, ffi::XK_Escape => events::VirtualKeyCode::Escape,
ffi::XK_Delete => events::VirtualKeyCode::Delete, ffi::XK_Delete => events::VirtualKeyCode::Delete,
//ffi::XK_Multi_key => events::VirtualKeyCode::Multi_key, ffi::XK_Multi_key => events::VirtualKeyCode::Compose,
//ffi::XK_Kanji => events::VirtualKeyCode::Kanji, //ffi::XK_Kanji => events::VirtualKeyCode::Kanji,
//ffi::XK_Muhenkan => events::VirtualKeyCode::Muhenkan, //ffi::XK_Muhenkan => events::VirtualKeyCode::Muhenkan,
//ffi::XK_Henkan_Mode => events::VirtualKeyCode::Henkan_mode, //ffi::XK_Henkan_Mode => events::VirtualKeyCode::Henkan_mode,

3
src/events.rs
View file

@ -220,6 +220,9 @@ pub enum VirtualKeyCode {
/// The space bar. /// The space bar.
Space, Space,
/// The "Compose" key on Linux.
Compose,
Numlock, Numlock,
Numpad0, Numpad0,
Numpad1, Numpad1,