diff options
Diffstat (limited to 'src/api/cocoa')
| -rw-r--r-- | src/api/cocoa/mod.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index 4502405..429572f 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -42,7 +42,7 @@ use std::sync::Mutex; use std::ascii::AsciiExt; use std::ops::Deref; -use events::Event::{Awakened, MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel, Closed, Focused}; +use events::Event::{Awakened, MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel, Closed, Focused, TouchpadPressure}; use events::ElementState::{Pressed, Released}; use events::MouseButton; use events; @@ -225,7 +225,7 @@ impl<'a> Iterator for PollEventsIterator<'a> { let event: Option<Event>; unsafe { let nsevent = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask.bits(), + NSAnyEventMask.bits() | NSEventMaskPressure.bits(), NSDate::distantPast(nil), NSDefaultRunLoopMode, YES); @@ -250,7 +250,7 @@ impl<'a> Iterator for WaitEventsIterator<'a> { let event: Option<Event>; unsafe { let nsevent = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask.bits(), + NSAnyEventMask.bits() | NSEventMaskPressure.bits(), NSDate::distantFuture(nil), NSDefaultRunLoopMode, YES); @@ -810,7 +810,7 @@ impl Clone for IdRef { unsafe fn NSEventToEvent(window: &Window, nsevent: id) -> Option<Event> { if nsevent == nil { return None; } - let event_type = msg_send![nsevent, type]; + let event_type = nsevent.eventType(); NSApp().sendEvent_(if let NSKeyDown = event_type { nil } else { nsevent }); match event_type { @@ -893,6 +893,9 @@ unsafe fn NSEventToEvent(window: &Window, nsevent: id) -> Option<Event> { }; Some(MouseWheel(delta)) }, + NSEventTypePressure => { + Some(TouchpadPressure(nsevent.pressure(), nsevent.stage())) + }, _ => { None }, } } |