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

Fix x11 ModifiersState

Browse source
This commit is contained in:
Rukai 2017-07-15 23:25:19 +10:00 committed by Benjamin Saunders
parent a1d2ee6ecf
commit e1e21ded28
2 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "winit" name = "winit"
version = "0.7.4" version = "0.7.5"
authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"] authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
description = "Cross-platform window creation library." description = "Cross-platform window creation library."
keywords = ["windowing"] keywords = ["windowing"]

32
src/platform/linux/x11/mod.rs
View file

@ -266,8 +266,16 @@ impl EventsLoop {
let xkev: &mut ffi::XKeyEvent = xev.as_mut(); let xkev: &mut ffi::XKeyEvent = xev.as_mut();
let ev_mods = {
let mut ev_mods = ModifiersState::default(); // Translate x event state to mods
let state = xkev.state;
ModifiersState {
alt: state & ffi::Mod1Mask != 0,
shift: state & ffi::ShiftMask != 0,
ctrl: state & ffi::ControlMask != 0,
logo: state & ffi::Mod4Mask != 0,
}
};
let keysym = unsafe { let keysym = unsafe {
(self.display.xlib.XKeycodeToKeysym)(self.display.display, xkev.keycode as ffi::KeyCode, 0) (self.display.xlib.XKeycodeToKeysym)(self.display.display, xkev.keycode as ffi::KeyCode, 0)
@ -311,26 +319,6 @@ impl EventsLoop {
&mut keysym, &mut status); &mut keysym, &mut status);
} }
{
// Translate x event state to mods
let state = xkev.state;
if (state & ffi::Mod1Mask) != 0 {
ev_mods.alt = true;
}
if (state & ffi::ShiftMask) != 0 {
ev_mods.shift = true;
}
if (state & ffi::ControlMask) != 0 {
ev_mods.ctrl = true;
}
if (state & ffi::Mod4Mask) != 0 {
ev_mods.logo = true;
}
}
str::from_utf8(&buffer[..count as usize]).unwrap_or("").to_string() str::from_utf8(&buffer[..count as usize]).unwrap_or("").to_string()
}; };