x11: manually bind display_get_egl_display

Signed-off-by: Marc-André Lureau <[email protected]>

Author: elmarco

gdk4-wayland/src/lib.rs

@@ -9,6 +9,9 @@ pub use gio;
 pub use glib;
 pub use wayland_client;
 
+#[cfg(any(feature = "v4_4", feature = "dox"))]
+pub use khronos_egl;
+
 #[cfg(any(feature = "v4_4", feature = "dox"))]
 pub use xkb;
 

gdk4-x11/Cargo.toml

@@ -12,8 +12,8 @@ repository = "https://github.com/gtk-rs/gtk4-rs"
 version = "0.2.0"
 
 [features]
-v4_4 = ["ffi/v4_4"]
-dox = ["ffi/dox"]
+v4_4 = ["ffi/v4_4", "khronos-egl"]
+dox = ["ffi/dox", "khronos-egl"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
@@ -25,6 +25,7 @@ gio = {git = "https://github.com/gtk-rs/gtk-rs-core", features = ["v2_66"]}
 glib = {git = "https://github.com/gtk-rs/gtk-rs-core", features = ["v2_66"]}
 libc = "0.2"
 x11 = "2.18"
+khronos-egl = {version = "4.1.0", optional = true}
 
 [dev-dependencies]
 gir-format-check = "^0.1"

gdk4-x11/Gir.toml

@@ -102,6 +102,9 @@ generate_builder = true
 [[object]]
 name = "GdkX11.X11Display"
 status = "generate"
+    [[object.function]]
+    name = "get_egl_display"
+    manual = true
     [[object.function]]
     name = "get_xdisplay"
     manual = true

gdk4-x11/src/auto/x11_display.rs

@@ -54,14 +54,6 @@ impl X11Display {
         }
     }
 
-    //#[cfg(any(feature = "v4_4", feature = "dox"))]
-    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_4")))]
-    //#[doc(alias = "gdk_x11_display_get_egl_display")]
-    //#[doc(alias = "get_egl_display")]
-    //pub fn egl_display(&self) -> /*Unimplemented*/Option<Fundamental: Pointer> {
-    //    unsafe { TODO: call ffi:gdk_x11_display_get_egl_display() }
-    //}
-
     #[cfg(any(feature = "v4_4", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_4")))]
     #[doc(alias = "gdk_x11_display_get_egl_version")]

gdk4-x11/src/x11_display.rs

@@ -2,9 +2,26 @@
 
 use crate::X11Display;
 use glib::translate::ToGlibPtr;
+#[cfg(any(feature = "v4_4", feature = "dox"))]
+use khronos_egl as egl;
 use x11::xlib;
 
 impl X11Display {
+    #[cfg(any(feature = "v4_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_4")))]
+    #[doc(alias = "gdk_x11_display_get_egl_display")]
+    #[doc(alias = "get_egl_display")]
+    pub fn egl_display(&self) -> Option<egl::Display> {
+        unsafe {
+            let ptr = ffi::gdk_x11_display_get_egl_display(self.to_glib_none().0);
+            if ptr.is_null() {
+                None
+            } else {
+                Some(egl::Display::from_ptr(ptr))
+            }
+        }
+    }
+
     #[doc(alias = "gdk_x11_display_get_xdisplay")]
     #[doc(alias = "get_xdisplay")]
     pub unsafe fn xdisplay(&self) -> *mut xlib::Display {