alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Added events handling for left/right mouse clicking

Browse source
This commit is contained in:
David Partouche 2014-10-06 17:54:15 +02:00
parent db578e6e1c
commit 989fd1b505
1 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/osx/mod.rs
View file

@ -170,24 +170,49 @@ impl Window {
} }
pub fn poll_events(&self) -> Vec<Event> { pub fn poll_events(&self) -> Vec<Event> {
unimplemented!() let mut events = Vec::new();
}
pub fn wait_events(&self) -> Vec<Event> {
loop { loop {
unsafe { unsafe {
use {MouseInput, Pressed, Released, LeftMouseButton, RightMouseButton};
let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
NSAnyEventMask as u64, NSAnyEventMask as u64,
nil, NSDate::distantPast(nil),
NSDefaultRunLoopMode, NSDefaultRunLoopMode,
true); true);
if event == nil { break; } if event == nil { break; }
match event.get_type() {
NSLeftMouseDown => { events.push(MouseInput(Pressed, LeftMouseButton)); },
NSLeftMouseUp => { events.push(MouseInput(Released, LeftMouseButton)); },
NSRightMouseDown => { events.push(MouseInput(Pressed, RightMouseButton)); },
NSRightMouseUp => { events.push(MouseInput(Released, RightMouseButton)); },
NSMouseMoved => { },
NSKeyDown => { },
NSKeyUp => { },
NSFlagsChanged => { },
NSScrollWheel => { },
NSOtherMouseDown => { },
NSOtherMouseUp => { },
NSOtherMouseDragged => { },
_ => { },
}
}
}
events
}
pub fn wait_events(&self) -> Vec<Event> {
unsafe {
let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
NSAnyEventMask as u64,
NSDate::distantFuture(nil),
NSDefaultRunLoopMode,
true);
NSApp().sendEvent_(event); NSApp().sendEvent_(event);
self.poll_events()
} }
} }
// TODO: Remove fake implementation
Vec::new()
}
pub unsafe fn make_current(&self) { pub unsafe fn make_current(&self) {
self.context.makeCurrentContext(); self.context.makeCurrentContext();