Event Loop 2.0 API and Windows implementation (#638)

* Rename EventsLoop and associated types to EventLoop * Rename WindowEvent::Refresh to WindowEvent::Redraw * Remove second thread from win32 backend * Update run_forever to hijack thread * Replace windows Mutex with parking_lot Mutex * Implement new ControlFlow and associated events * Add StartCause::Init support, timer example * Add ability to send custom user events * Fully invert windows control flow so win32 calls into winit's callback * Add request_redraw * Rename platform to platform_impl * Rename os to platform, add Ext trait postfixes * Add platform::desktop module with EventLoopExt::run_return * Re-organize into module structure * Improve documentation * Small changes to examples * Improve docs for run and run_return * Change instances of "events_loop" to "event_loop" * Rename MonitorId to MonitorHandle * Add CHANGELOG entry * Improve WaitUntil timer precision * When SendEvent is called during event closure, buffer events * Fix resize lag when waiting in some situations * Update send test and errors that broke some examples/APIs * Improve clarity/fix typos in docs * Fix unreachable panic after setting ControlFlow to Poll during some RedrawRequested events. * Fix crash when running in release mode * Remove crossbeam dependency and make drop events work again * Remove serde implementations from ControlFlow * Fix 1.24.1 build * Fix freeze when setting decorations * Replace &EventLoop in callback with &EventLoopWindowTarget * Document and implement Debug for EventLoopWindowTarget * Fix some deadlocks that could occur when changing window state * Fix thread executor not executing closure when called from non-loop thread * Fix buffered events not getting dispatched * Fix crash with runner refcell not getting dropped * Address review feedback * Fix CHANGELOG typo * Catch panics in user callback
2019-02-05 10:30:33 -05:00 · 2019-02-05 10:30:33 -05:00 · 9602716ed2
commit 9602716ed2
parent 7be1d16263
92 changed files with 3467 additions and 1260 deletions
--- a/src/platform_impl/macos/ffi.rs
+++ b/src/platform_impl/macos/ffi.rs
@ -0,0 +1,107 @@
+// TODO: Upstream these
+
+#![allow(dead_code, non_snake_case, non_upper_case_globals)]
+
+use cocoa::base::id;
+use cocoa::foundation::{NSInteger, NSUInteger};
+use objc;
+
+pub const NSNotFound: NSInteger = NSInteger::max_value();
+
+#[repr(C)]
+pub struct NSRange {
+    pub location: NSUInteger,
+    pub length: NSUInteger,
+}
+
+impl NSRange {
+    #[inline]
+    pub fn new(location: NSUInteger, length: NSUInteger) -> NSRange {
+        NSRange { location, length }
+    }
+}
+
+unsafe impl objc::Encode for NSRange {
+    fn encode() -> objc::Encoding {
+        let encoding = format!(
+            // TODO: Verify that this is correct
+            "{{NSRange={}{}}}",
+            NSUInteger::encode().as_str(),
+            NSUInteger::encode().as_str(),
+        );
+        unsafe { objc::Encoding::from_str(&encoding) }
+    }
+}
+
+pub trait NSMutableAttributedString: Sized {
+    unsafe fn alloc(_: Self) -> id {
+        msg_send![class!(NSMutableAttributedString), alloc]
+    }
+
+    unsafe fn init(self) -> id; // *mut NSMutableAttributedString
+    unsafe fn initWithString(self, string: id) -> id;
+    unsafe fn initWithAttributedString(self, string: id) -> id;
+
+    unsafe fn string(self) -> id; // *mut NSString
+    unsafe fn mutableString(self) -> id; // *mut NSMutableString
+    unsafe fn length(self) -> NSUInteger;
+}
+
+impl NSMutableAttributedString for id {
+    unsafe fn init(self) -> id {
+        msg_send![self, init]
+    }
+
+    unsafe fn initWithString(self, string: id) -> id {
+        msg_send![self, initWithString:string]
+    }
+
+    unsafe fn initWithAttributedString(self, string: id) -> id {
+        msg_send![self, initWithAttributedString:string]
+    }
+
+    unsafe fn string(self) -> id {
+        msg_send![self, string]
+    }
+
+    unsafe fn mutableString(self) -> id {
+        msg_send![self, mutableString]
+    }
+
+    unsafe fn length(self) -> NSUInteger {
+        msg_send![self, length]
+    }
+}
+
+pub const kCGBaseWindowLevelKey: NSInteger = 0;
+pub const kCGMinimumWindowLevelKey: NSInteger = 1;
+pub const kCGDesktopWindowLevelKey: NSInteger = 2;
+pub const kCGBackstopMenuLevelKey: NSInteger = 3;
+pub const kCGNormalWindowLevelKey: NSInteger = 4;
+pub const kCGFloatingWindowLevelKey: NSInteger = 5;
+pub const kCGTornOffMenuWindowLevelKey: NSInteger = 6;
+pub const kCGDockWindowLevelKey: NSInteger = 7;
+pub const kCGMainMenuWindowLevelKey: NSInteger = 8;
+pub const kCGStatusWindowLevelKey: NSInteger = 9;
+pub const kCGModalPanelWindowLevelKey: NSInteger = 10;
+pub const kCGPopUpMenuWindowLevelKey: NSInteger = 11;
+pub const kCGDraggingWindowLevelKey: NSInteger = 12;
+pub const kCGScreenSaverWindowLevelKey: NSInteger = 13;
+pub const kCGMaximumWindowLevelKey: NSInteger = 14;
+pub const kCGOverlayWindowLevelKey: NSInteger = 15;
+pub const kCGHelpWindowLevelKey: NSInteger = 16;
+pub const kCGUtilityWindowLevelKey: NSInteger = 17;
+pub const kCGDesktopIconWindowLevelKey: NSInteger = 18;
+pub const kCGCursorWindowLevelKey: NSInteger = 19;
+pub const kCGNumberOfWindowLevelKeys: NSInteger = 20;
+
+pub enum NSWindowLevel {
+    NSNormalWindowLevel = kCGBaseWindowLevelKey as _,
+    NSFloatingWindowLevel = kCGFloatingWindowLevelKey as _,
+    NSTornOffMenuWindowLevel = kCGTornOffMenuWindowLevelKey as _,
+    NSModalPanelWindowLevel = kCGModalPanelWindowLevelKey as _,
+    NSMainMenuWindowLevel = kCGMainMenuWindowLevelKey as _,
+    NSStatusWindowLevel = kCGStatusWindowLevelKey as _,
+    NSPopUpMenuWindowLevel = kCGPopUpMenuWindowLevelKey as _,
+    NSScreenSaverWindowLevel = kCGScreenSaverWindowLevelKey as _,
+}