gdk4-macos: manually implement native_window method

For now we need to depend on the cocoa crate in order to implement
this method since it is the only decent crate implementing
the cocoa api.

Author: nacho

.github/workflows/macos.yml

@@ -59,14 +59,14 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --features v4_8 --manifest-path ./gdk4-macos/Cargo.toml
+          args: --features cocoa,v4_8 --manifest-path ./gdk4-macos/Cargo.toml
       - name: Clippy gdk4-macos
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --features v4_8 --manifest-path ./gdk4-macos/Cargo.toml
+          args: --features cocoa,v4_8 --manifest-path ./gdk4-macos/Cargo.toml
       - name: Tests gdk4-macos
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --features v4_8 --manifest-path ./gdk4-macos/Cargo.toml
+          args: --features cocoa,v4_8 --manifest-path ./gdk4-macos/Cargo.toml

Cargo.lock

@@ -15,13 +15,15 @@ version.workspace = true
 
 [features]
 v4_8 = ["gdk4-macos-sys/v4_8"]
+cocoa = ["dep:cocoa"]
 
 [dependencies]
 gdk4-macos-sys.workspace = true
 gdk.workspace = true
 gio.workspace = true
 glib.workspace = true
 libc.workspace = true
+cocoa = { version = "0.26", optional = true }
 
 [dev-dependencies]
 gir-format-check.workspace = true

gdk4-macos/Cargo.toml

@@ -17,7 +17,6 @@ generate = [
     "GdkMacos.MacosGLContext",
     "GdkMacos.MacosKeymap",
     "GdkMacos.MacosSeat",
-    "GdkMacos.MacosSurface",
 ]
 
 manual = [
@@ -36,4 +35,14 @@ name = "GdkMacos.MacosMonitor"
 status = "generate"
     [[object.function]]
     name = "get_geometry"
-    ignore = true # The function does not exists
+    ignore = true # The function does not exists
+
+[[object]]
+name = "GdkMacos.MacosSurface"
+status = "generate"
+    [[object.function]]
+    name = "get_native_window"
+    manual = true
+    [[object.property]]
+    name = "native"
+    ignore = true # Same as native_window

gdk4-macos/Gir.toml

@@ -3,12 +3,6 @@
 // DO NOT EDIT
 
 use crate::ffi;
-use glib::{
-    prelude::*,
-    signal::{connect_raw, SignalHandlerId},
-    translate::*,
-};
-use std::boxed::Box as Box_;
 
 glib::wrapper! {
     #[doc(alias = "GdkMacosSurface")]
@@ -19,39 +13,4 @@ glib::wrapper! {
     }
 }
 
-impl MacosSurface {
-    //#[cfg(feature = "v4_8")]
-    //#[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
-    //#[doc(alias = "gdk_macos_surface_get_native_window")]
-    //#[doc(alias = "get_native_window")]
-    //pub fn native_window(&self) -> /*Unimplemented*/Option<Basic: Pointer> {
-    //    unsafe { TODO: call ffi:gdk_macos_surface_get_native_window() }
-    //}
-
-    //pub fn native(&self) -> /*Unimplemented*/Basic: Pointer {
-    //    ObjectExt::property(self, "native")
-    //}
-
-    #[doc(alias = "native")]
-    pub fn connect_native_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_native_trampoline<F: Fn(&MacosSurface) + 'static>(
-            this: *mut ffi::GdkMacosSurface,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(&from_glib_borrow(this))
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                b"notify::native\0".as_ptr() as *const _,
-                Some(std::mem::transmute::<*const (), unsafe extern "C" fn()>(
-                    notify_native_trampoline::<F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
-}
+impl MacosSurface {}

gdk4-macos/src/auto/macos_surface.rs

@@ -16,3 +16,6 @@ mod auto;
 pub mod prelude;
 
 pub use auto::*;
+
+#[cfg(feature = "cocoa")]
+mod macos_surface;

gdk4-macos/src/lib.rs

@@ -0,0 +1,26 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+#[cfg(feature = "v4_8")]
+use crate::ffi;
+use crate::MacosSurface;
+#[cfg(feature = "v4_8")]
+use cocoa::base::id;
+#[cfg(feature = "v4_8")]
+use glib::translate::*;
+
+impl MacosSurface {
+    #[cfg(feature = "v4_8")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
+    #[doc(alias = "gdk_macos_surface_get_native_window")]
+    #[doc(alias = "get_native_window")]
+    pub fn native_window(&self) -> Option<id> {
+        unsafe {
+            let native_window_ptr = ffi::gdk_macos_surface_get_native_window(self.to_glib_none().0);
+            if native_window_ptr.is_null() {
+                None
+            } else {
+                Some(native_window_ptr as id)
+            }
+        }
+    }
+}