Merge branch 'main' into randomized-tests-operation-script

crates/gpui/src/app.rs

@@ -3952,6 +3952,19 @@ impl<'a, T: View> ViewContext<'a, T> {
         })
     }
 
+    pub fn observe_global<G, F>(&mut self, mut callback: F) -> Subscription
+    where
+        G: Any,
+        F: 'static + FnMut(&mut T, &mut ViewContext<T>),
+    {
+        let observer = self.weak_handle();
+        self.app.observe_global::<G, _>(move |cx| {
+            if let Some(observer) = observer.upgrade(cx) {
+                observer.update(cx, |observer, cx| callback(observer, cx));
+            }
+        })
+    }
+
     pub fn observe_focus<F, V>(&mut self, handle: &ViewHandle<V>, mut callback: F) -> Subscription
     where
         F: 'static + FnMut(&mut T, ViewHandle<V>, bool, &mut ViewContext<T>),

crates/gpui/src/elements.rs

@@ -227,6 +227,7 @@ pub enum Lifecycle<T: Element> {
         paint: T::PaintState,
     },
 }
+
 pub struct ElementBox(ElementRc);
 
 #[derive(Clone)]

crates/gpui/src/platform/mac/screen.rs

@@ -65,8 +65,15 @@ impl platform::Screen for Screen {
             // This approach is similar to that which winit takes
             // https://github.com/rust-windowing/winit/blob/402cbd55f932e95dbfb4e8b5e8551c49e56ff9ac/src/platform_impl/macos/monitor.rs#L99
             let device_description = self.native_screen.deviceDescription();
+
             let key = ns_string("NSScreenNumber");
             let device_id_obj = device_description.objectForKey_(key);
+            if device_id_obj.is_null() {
+                // Under some circumstances, especially display re-arrangements or display locking, we seem to get a null pointer
+                // to the device id. See: https://linear.app/zed-industries/issue/Z-257/lock-screen-crash-with-multiple-monitors
+                return None;
+            }
+
             let mut device_id: u32 = 0;
             CFNumberGetValue(
                 device_id_obj as CFNumberRef,