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

Fix handling of numpad keys w.r.t. numlock (derived from fix mentioned at http://www.kaffe.org/pipermail/kaffe/2000-April/175201.html).

Browse source 
Conflicts:
	src/api/x11/window.rs
This commit is contained in:
Avi Weinstock 2015-05-15 18:30:40 -04:00
parent ff829f7d9d
commit b6a63ad11f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/x11/window.rs
View file

@ -177,6 +177,8 @@ impl<'a> Iterator for PollEventsIterator<'a> {
let state = if xev.get_type() == ffi::KeyPress { Pressed } else { Released }; let state = if xev.get_type() == ffi::KeyPress { Pressed } else { Released };
let mut kp_keysym = 0;
let written = unsafe { let written = unsafe {
use std::str; use std::str;
@ -184,7 +186,7 @@ impl<'a> Iterator for PollEventsIterator<'a> {
let raw_ev: *mut ffi::XKeyEvent = event; let raw_ev: *mut ffi::XKeyEvent = event;
let count = (self.window.x.display.xlib.Xutf8LookupString)(self.window.x.ic, mem::transmute(raw_ev), let count = (self.window.x.display.xlib.Xutf8LookupString)(self.window.x.ic, mem::transmute(raw_ev),
mem::transmute(buffer.as_mut_ptr()), mem::transmute(buffer.as_mut_ptr()),
buffer.len() as libc::c_int, ptr::null_mut(), ptr::null_mut()); buffer.len() as libc::c_int, &mut kp_keysym, ptr::null_mut());
str::from_utf8(&buffer[..count as usize]).unwrap_or("").to_string() str::from_utf8(&buffer[..count as usize]).unwrap_or("").to_string()
}; };
@ -196,10 +198,14 @@ impl<'a> Iterator for PollEventsIterator<'a> {
} }
} }
let keysym = unsafe { let mut keysym = unsafe {
(self.window.x.display.xlib.XKeycodeToKeysym)(self.window.x.display.display, event.keycode as ffi::KeyCode, 0) (self.window.x.display.xlib.XKeycodeToKeysym)(self.window.x.display.display, event.keycode as ffi::KeyCode, 0)
}; };
if (ffi::XK_KP_Space as u64 <= keysym) || (keysym <= ffi::XK_KP_9 as u64) {
keysym = kp_keysym
};
let vkey = events::keycode_to_element(keysym as libc::c_uint); let vkey = events::keycode_to_element(keysym as libc::c_uint);
return Some(KeyboardInput(state, event.keycode as u8, vkey)); return Some(KeyboardInput(state, event.keycode as u8, vkey));