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

Merge pull request #573 from mbrubeck/x11-touch

Browse source 
Handle touch events on X11
This commit is contained in:
tomaka 2015-08-19 07:45:56 +02:00
parent a4e2f82ba7 93ce9c24f5
commit a982c599d0
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/api/x11/input.rs
View file

@ -75,7 +75,7 @@ impl XInputEventHandler {
// Button clicks and mouse events are handled via XInput // Button clicks and mouse events are handled via XInput
// events. Key presses are still handled via plain core // events. Key presses are still handled via plain core
// X11 events. // X11 events.
let mut mask: [libc::c_uchar; 2] = [0, 0]; let mut mask: [libc::c_uchar; 3] = [0; 3];
let mut input_event_mask = ffi::XIEventMask { let mut input_event_mask = ffi::XIEventMask {
deviceid: ffi::XIAllMasterDevices, deviceid: ffi::XIAllMasterDevices,
mask_len: mask.len() as i32, mask_len: mask.len() as i32,
@ -88,7 +88,10 @@ impl XInputEventHandler {
ffi::XI_Enter, ffi::XI_Enter,
ffi::XI_Leave, ffi::XI_Leave,
ffi::XI_FocusIn, ffi::XI_FocusIn,
ffi::XI_FocusOut ffi::XI_FocusOut,
ffi::XI_TouchBegin,
ffi::XI_TouchUpdate,
ffi::XI_TouchEnd,
]; ];
for event in events { for event in events {
ffi::XISetMask(&mut mask, *event); ffi::XISetMask(&mut mask, *event);
@ -165,6 +168,7 @@ impl XInputEventHandler {
use events::ElementState::{Pressed, Released}; use events::ElementState::{Pressed, Released};
use events::MouseButton::{Left, Right, Middle}; use events::MouseButton::{Left, Right, Middle};
use events::MouseScrollDelta::{PixelDelta, LineDelta}; use events::MouseScrollDelta::{PixelDelta, LineDelta};
use events::{Touch, TouchPhase};
match cookie.evtype { match cookie.evtype {
ffi::XI_ButtonPress | ffi::XI_ButtonRelease => { ffi::XI_ButtonPress | ffi::XI_ButtonRelease => {
@ -240,6 +244,20 @@ impl XInputEventHandler {
ffi::XI_Leave => None, ffi::XI_Leave => None,
ffi::XI_FocusIn => Some(Focused(true)), ffi::XI_FocusIn => Some(Focused(true)),
ffi::XI_FocusOut => Some(Focused(false)), ffi::XI_FocusOut => Some(Focused(false)),
ffi::XI_TouchBegin | ffi::XI_TouchUpdate | ffi::XI_TouchEnd => {
let event_data: &ffi::XIDeviceEvent = unsafe{mem::transmute(cookie.data)};
let phase = match cookie.evtype {
ffi::XI_TouchBegin => TouchPhase::Started,
ffi::XI_TouchUpdate => TouchPhase::Moved,
ffi::XI_TouchEnd => TouchPhase::Ended,
_ => unreachable!()
};
Some(Event::Touch(Touch {
phase: phase,
location: (event_data.event_x, event_data.event_y),
id: event_data.detail as u64,
}))
}
_ => None _ => None
} }
} }