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

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
parent e1e21ded28 3d9e8da9ec
commit 2e079fe9a2
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/events.rs
View file

@ -1,5 +1,5 @@
use std::path::PathBuf; use std::path::PathBuf;
use {WindowId, DeviceId, AxisId, ButtonId}; use {WindowId, DeviceId};
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum Event { pub enum Event {
@ -157,6 +157,12 @@ pub struct Touch {
pub type ScanCode = u32; pub type ScanCode = u32;
/// Identifier for a specific analog axis on some device.
pub type AxisId = u32;
/// Identifier for a specific button on some device.
pub type ButtonId = u32;
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)] #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub enum ElementState { pub enum ElementState {
Pressed, Pressed,

8
src/lib.rs
View file

@ -168,14 +168,6 @@ pub struct WindowId(platform::WindowId);
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct DeviceId(platform::DeviceId); pub struct DeviceId(platform::DeviceId);
/// Identifier for a specific analog axis on some device.
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct AxisId(u32);
/// Identifier for a specific button on some device.
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct ButtonId(u32);
/// Provides a way to retreive events from the windows that were registered to it. /// Provides a way to retreive events from the windows that were registered to it.
/// ///
/// To wake up an `EventsLoop` from a another thread, see the `EventsLoopProxy` docs. /// To wake up an `EventsLoop` from a another thread, see the `EventsLoopProxy` docs.

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

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