gdk-wayland: Manually implement WaylandToplevel.get_xdg_toplevel

Author: bilelmoussaoui

Cargo.lock

@@ -20,7 +20,7 @@ v4_12 = ["gdk4-wayland-sys/v4_12", "v4_10", "gdk/v4_12"]
 v4_16 = ["gdk4-wayland-sys/v4_16", "v4_12", "gdk/v4_16"]
 v4_18 = ["gdk4-wayland-sys/v4_18", "v4_16", "gdk/v4_18"]
 v4_20 = ["gdk4-wayland-sys/v4_20", "v4_18", "gdk/v4_20"]
-wayland_crate = ["wayland-client", "wayland-backend"]
+wayland_crate = ["wayland-client", "wayland-backend", "wayland-protocols"]
 egl = ["khronos-egl"]
 
 [dependencies]
@@ -31,6 +31,7 @@ glib.workspace = true
 libc.workspace = true
 wayland-client = {version = "0.31.10", optional = true}
 wayland-backend = {version = "0.3.0", optional = true, features = ["client_system"]}
+wayland-protocols = {version = "0.32", optional = true, features = ["client"]}
 khronos-egl = {version = "6.0", optional = true}
 
 [dev-dependencies]

gdk4-wayland/Cargo.toml

@@ -113,4 +113,8 @@ name = "GdkWayland.WaylandToplevel"
 status = "generate"
     [[object.function]]
     name = "export_handle"
-    manual = true
+    manual = true
+    [[object.function]]
+    name = "get_xdg_toplevel"
+    rename = "xdg_toplevel"
+    manual = true

gdk4-wayland/Gir.toml

@@ -28,14 +28,6 @@ impl WaylandToplevel {
         }
     }
 
-    //#[cfg(feature = "v4_20")]
-    //#[cfg_attr(docsrs, doc(cfg(feature = "v4_20")))]
-    //#[doc(alias = "gdk_wayland_toplevel_get_xdg_toplevel")]
-    //#[doc(alias = "get_xdg_toplevel")]
-    //pub fn xdg_toplevel(&self) -> /*Unimplemented*/Option<Basic: Pointer> {
-    //    unsafe { TODO: call ffi:gdk_wayland_toplevel_get_xdg_toplevel() }
-    //}
-
     #[doc(alias = "gdk_wayland_toplevel_set_application_id")]
     pub fn set_application_id(&self, application_id: &str) {
         unsafe {

gdk4-wayland/src/auto/wayland_toplevel.rs

@@ -4,7 +4,35 @@ use crate::{ffi, WaylandToplevel};
 use glib::translate::*;
 use std::boxed::Box as Box_;
 
+#[cfg(all(feature = "v4_20", feature = "wayland_crate"))]
+#[cfg_attr(docsrs, doc(cfg(all(feature = "v4_20", feature = "wayland_crate"))))]
+use wayland_client::{backend::ObjectId, Proxy};
+#[cfg(all(feature = "v4_20", feature = "wayland_crate"))]
+#[cfg_attr(docsrs, doc(cfg(all(feature = "v4_20", feature = "wayland_crate"))))]
+use wayland_protocols::xdg::shell::client::xdg_toplevel::XdgToplevel;
+
 impl WaylandToplevel {
+    #[cfg(all(feature = "v4_20", feature = "wayland_crate"))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "v4_20", feature = "wayland_crate"))))]
+    #[doc(alias = "gdk_wayland_toplevel_get_xdg_toplevel")]
+    #[doc(alias = "get_xdg_toplevel")]
+    pub fn xdg_toplevel(&self) -> Option<XdgToplevel> {
+        use gdk::prelude::*;
+        let display = self.display().downcast::<crate::WaylandDisplay>().unwrap();
+        unsafe {
+            let toplevel_ptr = ffi::gdk_wayland_toplevel_get_xdg_toplevel(self.to_glib_none().0);
+            if toplevel_ptr.is_null() {
+                None
+            } else {
+                let cnx = display.connection();
+                let id =
+                    ObjectId::from_ptr(XdgToplevel::interface(), toplevel_ptr as *mut _).unwrap();
+
+                XdgToplevel::from_id(&cnx, id).ok()
+            }
+        }
+    }
+
     #[doc(alias = "gdk_wayland_toplevel_export_handle")]
     pub fn export_handle<P: Fn(&WaylandToplevel, Result<&str, glib::BoolError>) + 'static>(
         &self,