leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #211 from Ralith/transparent-ids

Browse source 
Transparent axis/button IDs
This commit is contained in:
tomaka 2017-07-17 07:37:26 +02:00 • committed by GitHub
commit 2e079fe9a2
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ pub use self::xdisplay::{XConnection, XNotSupported, XError};
pub mod ffi;
use platform::PlatformSpecificWindowBuilderAttributes;
use {CreationError, Event, EventsLoopClosed, WindowEvent, DeviceEvent, AxisId, ButtonId,
use {CreationError, Event, EventsLoopClosed, WindowEvent, DeviceEvent,
KeyboardInput, ControlFlow};
use std::{mem, ptr, slice};
@ -420,7 +420,7 @@ impl EventsLoop {
} else {
events.push(Event::WindowEvent { window_id: wid, event: AxisMotion {
device_id: did,
axis: AxisId(i as u32),
axis: i as u32,
value: unsafe { *value },
}});
}
@ -490,7 +490,7 @@ impl EventsLoop {
let xev: &ffi::XIRawEvent = unsafe { &*(xev.data as *const _) };
if xev.flags & ffi::XIPointerEmulated == 0 {
callback(Event::DeviceEvent { device_id: mkdid(xev.deviceid), event: DeviceEvent::Button {
button: ButtonId(xev.detail as u32),
button: xev.detail as u32,
state: match xev.evtype {
ffi::XI_RawButtonPress => Pressed,
ffi::XI_RawButtonRelease => Released,
@ -509,7 +509,7 @@ impl EventsLoop {
for i in 0..xev.valuators.mask_len*8 {
if ffi::XIMaskIsSet(mask, i) {
callback(Event::DeviceEvent { device_id: did, event: DeviceEvent::Motion {
axis: AxisId(i as u32),
axis: i as u32,
value: unsafe { *value },
}});
value = unsafe { value.offset(1) };