vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #82 from Smithay/fix/winit_timestamp 

Replace time stub with proper timestamps
This commit is contained in:
Victor Brekenfeld 2018-03-21 15:55:53 +01:00 committed by GitHub
parent 79d99c1cc5 d005cd4fc6
commit 943ee66be3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/backend/winit.rs
View File

@ -16,6 +16,7 @@ use std::cmp;
use std::error; use std::error;
use std::fmt; use std::fmt;
use std::rc::Rc; use std::rc::Rc;
use std::time::Instant;
use wayland_client::egl as wegl; use wayland_client::egl as wegl;
use wayland_server::{Display, EventLoopHandle}; use wayland_server::{Display, EventLoopHandle};
use winit::{ElementState, Event, EventsLoop, KeyboardInput, MouseButton as WinitMouseButton, MouseCursor, use winit::{ElementState, Event, EventsLoop, KeyboardInput, MouseButton as WinitMouseButton, MouseCursor,
@ -73,7 +74,7 @@ pub struct WinitInputBackend {
events_loop: EventsLoop, events_loop: EventsLoop,
events_handler: Option<Box<WinitEventsHandler>>, events_handler: Option<Box<WinitEventsHandler>>,
window: Rc<Window>, window: Rc<Window>,
time_counter: u32, time: Instant,
key_counter: u32, key_counter: u32,
seat: Seat, seat: Seat,
input_config: (), input_config: (),
@ -163,7 +164,7 @@ where
events_loop, events_loop,
events_handler: None, events_handler: None,
window, window,
time_counter: 0, time: Instant::now(),
key_counter: 0, key_counter: 0,
seat: Seat::new( seat: Seat::new(
0, 0,
@ -675,7 +676,7 @@ impl InputBackend for WinitInputBackend {
// wrong interference. // wrong interference.
let mut closed_ptr = &mut closed; let mut closed_ptr = &mut closed;
let mut key_counter = &mut self.key_counter; let mut key_counter = &mut self.key_counter;
let mut time_counter = &mut self.time_counter; let time = &self.time;
let seat = &self.seat; let seat = &self.seat;
let window = &self.window; let window = &self.window;
let mut handler = self.handler.as_mut(); let mut handler = self.handler.as_mut();
@ -684,6 +685,9 @@ impl InputBackend for WinitInputBackend {
self.events_loop.poll_events(move |event| { self.events_loop.poll_events(move |event| {
if let Event::WindowEvent { event, .. } = event { if let Event::WindowEvent { event, .. } = event {
let duration = Instant::now().duration_since(*time);
let nanos = duration.subsec_nanos() as u64;
let time = ((1000 * duration.as_secs()) + (nanos / 1_000_000)) as u32;
match (event, handler.as_mut(), events_handler.as_mut()) { match (event, handler.as_mut(), events_handler.as_mut()) {
(WindowEvent::Resized(w, h), _, events_handler) => { (WindowEvent::Resized(w, h), _, events_handler) => {
trace!(logger, "Resizing window to {:?}", (w, h)); trace!(logger, "Resizing window to {:?}", (w, h));
@ -734,7 +738,7 @@ impl InputBackend for WinitInputBackend {
evlh, evlh,
seat, seat,
WinitKeyboardInputEvent { WinitKeyboardInputEvent {
time: *time_counter, time,
key: scancode, key: scancode,
count: *key_counter, count: *key_counter,
state: state, state: state,
@ -754,7 +758,7 @@ impl InputBackend for WinitInputBackend {
seat, seat,
WinitMouseMovedEvent { WinitMouseMovedEvent {
window: window.clone(), window: window.clone(),
time: *time_counter, time,
x: x, x: x,
y: y, y: y,
}, },
@ -765,7 +769,7 @@ impl InputBackend for WinitInputBackend {
if x != 0.0 { if x != 0.0 {
let event = WinitMouseWheelEvent { let event = WinitMouseWheelEvent {
axis: Axis::Horizontal, axis: Axis::Horizontal,
time: *time_counter, time,
delta: delta, delta: delta,
}; };
trace!( trace!(
@ -778,7 +782,7 @@ impl InputBackend for WinitInputBackend {
if y != 0.0 { if y != 0.0 {
let event = WinitMouseWheelEvent { let event = WinitMouseWheelEvent {
axis: Axis::Vertical, axis: Axis::Vertical,
time: *time_counter, time,
delta: delta, delta: delta,
}; };
trace!( trace!(
@ -800,7 +804,7 @@ impl InputBackend for WinitInputBackend {
evlh, evlh,
seat, seat,
WinitMouseInputEvent { WinitMouseInputEvent {
time: *time_counter, time,
button: button, button: button,
state: state, state: state,
}, },
@ -822,7 +826,7 @@ impl InputBackend for WinitInputBackend {
seat, seat,
WinitTouchStartedEvent { WinitTouchStartedEvent {
window: window.clone(), window: window.clone(),
time: *time_counter, time,
location: (x, y), location: (x, y),
id: id, id: id,
}, },
@ -844,7 +848,7 @@ impl InputBackend for WinitInputBackend {
seat, seat,
WinitTouchMovedEvent { WinitTouchMovedEvent {
window: window.clone(), window: window.clone(),
time: *time_counter, time,
location: (x, y), location: (x, y),
id: id, id: id,
}, },
@ -866,20 +870,13 @@ impl InputBackend for WinitInputBackend {
seat, seat,
WinitTouchMovedEvent { WinitTouchMovedEvent {
window: window.clone(), window: window.clone(),
time: *time_counter, time,
location: (x, y), location: (x, y),
id: id, id: id,
}, },
); );
trace!(logger, "Calling on_touch_up"); trace!(logger, "Calling on_touch_up");
handler.on_touch_up( handler.on_touch_up(evlh, seat, WinitTouchEndedEvent { time, id: id });
evlh,
seat,
WinitTouchEndedEvent {
time: *time_counter,
id: id,
},
);
} }
( (
WindowEvent::Touch(Touch { WindowEvent::Touch(Touch {
@ -891,14 +888,7 @@ impl InputBackend for WinitInputBackend {
_, _,
) => { ) => {
trace!(logger, "Calling on_touch_cancel"); trace!(logger, "Calling on_touch_cancel");
handler.on_touch_cancel( handler.on_touch_cancel(evlh, seat, WinitTouchCancelledEvent { time, id: id })
evlh,
seat,
WinitTouchCancelledEvent {
time: *time_counter,
id: id,
},
)
} }
(WindowEvent::Closed, _, _) => { (WindowEvent::Closed, _, _) => {
warn!(logger, "Window closed"); warn!(logger, "Window closed");
@ -906,7 +896,6 @@ impl InputBackend for WinitInputBackend {
} }
_ => {} _ => {}
} }
*time_counter += 1;
} }
}); });
} }