add: ActiveEventLoop::create_proxy()

Co-authored-by: Kirill Chibisov <contact@kchibisov.com>

src/platform_impl/apple/appkit/app_state.rs

@@ -80,13 +80,12 @@ impl ApplicationDelegate {
     pub(super) fn new(
         mtm: MainThreadMarker,
         activation_policy: NSApplicationActivationPolicy,
-        proxy_wake_up: Arc<AtomicBool>,
         default_menu: bool,
         activate_ignoring_other_apps: bool,
     ) -> Retained<Self> {
         let this = mtm.alloc().set_ivars(AppState {
             activation_policy,
-            proxy_wake_up,
+            proxy_wake_up: Arc::new(AtomicBool::new(false)),
             default_menu,
             activate_ignoring_other_apps,
             run_loop: RunLoop::main(mtm),
@@ -179,6 +178,10 @@ impl ApplicationDelegate {
         self.ivars().event_handler.set(handler, closure)
     }
 
+    pub fn proxy_wake_up(&self) -> Arc<AtomicBool> {
+        self.ivars().proxy_wake_up.clone()
+    }
+
     /// If `pump_events` is called to progress the event loop then we
     /// bootstrap the event loop via `-[NSApplication run]` but will use
     /// `CFRunLoopRunInMode` for subsequent calls to `pump_events`.

src/platform_impl/apple/appkit/event_loop.rs

@@ -71,6 +71,10 @@ pub struct ActiveEventLoop {
 }
 
 impl ActiveEventLoop {
+    pub fn create_proxy(&self) -> EventLoopProxy {
+        EventLoopProxy::new(self.delegate.proxy_wake_up())
+    }
+
     pub(super) fn new_root(delegate: Retained<ApplicationDelegate>) -> RootWindowTarget {
         let mtm = MainThreadMarker::from(&*delegate);
         let p = Self { delegate, mtm };
@@ -166,8 +170,6 @@ pub struct EventLoop {
     /// keep it around here as well.
     delegate: Retained<ApplicationDelegate>,
 
-    proxy_wake_up: Arc<AtomicBool>,
-
     window_target: RootWindowTarget,
     panic_info: Rc<PanicInfo>,
 }
@@ -212,12 +214,9 @@ impl EventLoop {
             ActivationPolicy::Prohibited => NSApplicationActivationPolicy::Prohibited,
         };
 
-        let proxy_wake_up = Arc::new(AtomicBool::new(false));
-
         let delegate = ApplicationDelegate::new(
             mtm,
             activation_policy,
-            proxy_wake_up.clone(),
             attributes.default_menu,
             attributes.activate_ignoring_other_apps,
         );
@@ -236,7 +235,6 @@ impl EventLoop {
                 p: ActiveEventLoop { delegate, mtm },
                 _marker: PhantomData,
             },
-            proxy_wake_up,
             panic_info,
         })
     }
@@ -358,10 +356,6 @@ impl EventLoop {
             })
         })
     }
-
-    pub fn create_proxy(&self) -> EventLoopProxy {
-        EventLoopProxy::new(self.proxy_wake_up.clone())
-    }
 }
 
 #[derive(Clone)]

src/platform_impl/apple/uikit/app_state.rs

@@ -3,6 +3,7 @@
 use std::cell::{RefCell, RefMut};
 use std::collections::HashSet;
 use std::os::raw::c_void;
+use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Instant;
 use std::{fmt, mem, ptr};
@@ -135,6 +136,7 @@ pub(crate) struct AppState {
     app_state: Option<AppStateImpl>,
     control_flow: ControlFlow,
     waker: EventLoopWaker,
+    proxy_wake_up: Arc<AtomicBool>,
 }
 
 impl AppState {
@@ -158,6 +160,7 @@ impl AppState {
                     }),
                     control_flow: ControlFlow::default(),
                     waker,
+                    proxy_wake_up: Arc::new(AtomicBool::new(false)),
                 });
             }
             init_guard(&mut guard);
@@ -402,6 +405,10 @@ impl AppState {
         }
     }
 
+    pub(crate) fn proxy_wake_up(&self) -> Arc<AtomicBool> {
+        self.proxy_wake_up.clone()
+    }
+
     pub(crate) fn set_control_flow(&mut self, control_flow: ControlFlow) {
         self.control_flow = control_flow;
     }

src/platform_impl/apple/uikit/event_loop.rs

@@ -34,6 +34,10 @@ pub struct ActiveEventLoop {
 }
 
 impl ActiveEventLoop {
+    pub fn create_proxy(&self) -> EventLoopProxy {
+        EventLoopProxy::new(AppState::get_mut(self.mtm).proxy_wake_up())
+    }
+
     pub fn create_custom_cursor(&self, source: CustomCursorSource) -> CustomCursor {
         let _ = source.inner;
         CustomCursor { inner: super::PlatformCustomCursor }
@@ -134,7 +138,6 @@ fn map_user_event<A: ApplicationHandler>(
 
 pub struct EventLoop {
     mtm: MainThreadMarker,
-    proxy_wake_up: Arc<AtomicBool>,
     window_target: RootActiveEventLoop,
 }
 
@@ -160,11 +163,8 @@ impl EventLoop {
         // this line sets up the main run loop before `UIApplicationMain`
         setup_control_flow_observers();
 
-        let proxy_wake_up = Arc::new(AtomicBool::new(false));
-
         Ok(EventLoop {
             mtm,
-            proxy_wake_up,
             window_target: RootActiveEventLoop { p: ActiveEventLoop { mtm }, _marker: PhantomData },
         })
     }
@@ -179,7 +179,7 @@ impl EventLoop {
              `EventLoop::run_app` calls `UIApplicationMain` on iOS",
         );
 
-        let handler = map_user_event(app, self.proxy_wake_up.clone());
+        let handler = map_user_event(app, AppState::get_mut(self.mtm).proxy_wake_up());
 
         let handler = unsafe {
             std::mem::transmute::<
@@ -212,10 +212,6 @@ impl EventLoop {
         unreachable!()
     }
 
-    pub fn create_proxy(&self) -> EventLoopProxy {
-        EventLoopProxy::new(self.proxy_wake_up.clone())
-    }
-
     pub fn window_target(&self) -> &RootActiveEventLoop {
         &self.window_target
     }