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

Add MouseEntered/MouseLeft for Windows, X11, Wayland, & Cocoa

Browse source
This commit is contained in:
Andy Barron 2016-11-03 01:31:16 -07:00
parent 705f5f50fa
commit db45e58390
5 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/api/wayland/context.rs
View file

@ -397,9 +397,9 @@ impl wl_pointer::Handler for WaylandEnv {
if window.equals(surface) {
self.mouse_focus = Some(eviter.clone());
let (w, h) = self.mouse_location;
eviter.lock().unwrap().push_back(
Event::MouseMoved(w, h)
);
let mut event_queue = eviter.lock().unwrap();
event_queue.push_back(Event::MouseEntered);
event_queue.push_back(Event::MouseMoved(w, h));
break;
}
}
@ -409,9 +409,16 @@ impl wl_pointer::Handler for WaylandEnv {
_evqh: &mut EventQueueHandle,
_proxy: &wl_pointer::WlPointer,
_serial: u32,
_surface: &wl_surface::WlSurface)
surface: &wl_surface::WlSurface)
{
self.mouse_focus = None
self.mouse_focus = None;
for &(ref window, ref eviter) in &self.windows {
if window.equals(surface) {
let mut event_queue = eviter.lock().unwrap();
event_queue.push_back(Event::MouseLeft);
break;
}
}
}
fn motion(&mut self,

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

@ -170,7 +170,7 @@ impl XInputEventHandler {
}
pub fn translate_event(&mut self, cookie: &ffi::XGenericEventCookie) -> Option<Event> {
use events::Event::{Focused, MouseInput, MouseMoved, MouseWheel};
use events::Event::{Focused, MouseEntered, MouseInput, MouseLeft, MouseMoved, MouseWheel};
use events::ElementState::{Pressed, Released};
use events::MouseButton::{Left, Right, Middle};
use events::MouseScrollDelta::LineDelta;
@ -254,9 +254,9 @@ impl XInputEventHandler {
// our window however, so clear the previous axis state whenever
// the cursor re-enters the window
self.current_state.axis_values.clear();
None
Some(MouseEntered)
},
ffi::XI_Leave => None,
ffi::XI_Leave => Some(MouseLeft),
ffi::XI_FocusIn => Some(Focused(true)),
ffi::XI_FocusOut => Some(Focused(false)),
ffi::XI_TouchBegin | ffi::XI_TouchUpdate | ffi::XI_TouchEnd => {