gdk-win32: implement Win32Display.add_filter()

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

Author: elmarco

gdk4-win32/Gir.toml

@@ -95,6 +95,9 @@ status = "generate"
     [[object.function]]
     name = "get_egl_display"
     manual = true
+    [[object.function]]
+    pattern = "(add|remove)_filter"
+    manual = true
 
 [[object]]
 name = "GdkWin32.Win32HCursor"

gdk4-win32/src/auto/win32_display.rs

@@ -18,11 +18,6 @@ glib::wrapper! {
 }
 
 impl Win32Display {
-    //#[doc(alias = "gdk_win32_display_add_filter")]
-    //pub fn add_filter(&self, function: /*Unimplemented*/Fn(&Win32Display, /*Ignored*/win32::MSG, i32) -> Win32MessageFilterReturn, data: /*Unimplemented*/Option<Basic: Pointer>) {
-    //    unsafe { TODO: call ffi:gdk_win32_display_add_filter() }
-    //}
-
     #[doc(alias = "gdk_win32_display_get_win32hcursor")]
     #[doc(alias = "get_win32hcursor")]
     pub fn win32hcursor(&self, cursor: &gdk::Cursor) -> Win32HCursor {
@@ -34,11 +29,6 @@ impl Win32Display {
         }
     }
 
-    //#[doc(alias = "gdk_win32_display_remove_filter")]
-    //pub fn remove_filter(&self, function: /*Unimplemented*/Fn(&Win32Display, /*Ignored*/win32::MSG, i32) -> Win32MessageFilterReturn, data: /*Unimplemented*/Option<Basic: Pointer>) {
-    //    unsafe { TODO: call ffi:gdk_win32_display_remove_filter() }
-    //}
-
     #[doc(alias = "gdk_win32_display_set_cursor_theme")]
     pub fn set_cursor_theme(&self, name: Option<&str>, size: i32) {
         unsafe {

gdk4-win32/src/lib.rs

@@ -21,6 +21,8 @@ mod auto;
 pub use auto::*;
 
 mod win32_display;
+pub use win32_display::Win32DisplayFilterHandle;
+
 mod win32_hcursor;
 mod win32_surface;
 
@@ -33,7 +35,33 @@ pub struct HICON(pub isize);
 #[cfg(not(feature = "win32"))]
 pub struct HWND(pub isize);
 
+#[cfg(not(feature = "win32"))]
+#[repr(transparent)]
+pub struct WPARAM(pub usize);
+#[cfg(not(feature = "win32"))]
+#[repr(transparent)]
+pub struct LPARAM(pub isize);
+
+#[cfg(not(feature = "win32"))]
+#[repr(C)]
+pub struct POINT {
+    pub x: i32,
+    pub y: i32,
+}
+
+#[allow(non_snake_case)]
+#[cfg(not(feature = "win32"))]
+#[repr(C)]
+pub struct MSG {
+    pub hwnd: HWND,
+    pub message: u32,
+    pub wParam: WPARAM,
+    pub lParam: LPARAM,
+    pub time: u32,
+    pub pt: POINT,
+}
+
 #[cfg(feature = "win32")]
 pub use windows::Win32::Foundation::{HANDLE, HWND};
 #[cfg(feature = "win32")]
-pub use windows::Win32::UI::WindowsAndMessaging::{HCURSOR, HICON};
+pub use windows::Win32::UI::WindowsAndMessaging::{HCURSOR, HICON, MSG};

gdk4-win32/src/win32_display.rs

@@ -1,6 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::Win32Display;
+use crate::{ffi, glib, Win32Display, Win32MessageFilterReturn, MSG};
+use glib::translate::*;
 
 #[cfg(any(all(feature = "v4_4", feature = "egl"), feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(all(feature = "v4_4", feature = "egl"))))]
@@ -24,4 +25,75 @@ impl Win32Display {
             }
         }
     }
+
+    #[doc(alias = "gdk_win32_display_add_filter")]
+    pub fn add_filter<F>(&self, filter_func: F) -> Win32DisplayFilterHandle
+    where
+        F: Fn(&Self, &mut MSG, &mut i32) -> Win32MessageFilterReturn + 'static,
+    {
+        unsafe extern "C" fn trampoline<
+            F: Fn(&Win32Display, &mut MSG, &mut i32) -> Win32MessageFilterReturn + 'static,
+        >(
+            display: *mut ffi::GdkWin32Display,
+            msg: glib::ffi::gpointer,
+            return_value: *mut libc::c_int,
+            box_: glib::ffi::gpointer,
+        ) -> i32 {
+            let f: &F = &*(box_ as *const F);
+            f(
+                &from_glib_borrow(display as *mut ffi::GdkWin32Display),
+                &mut *(msg as *mut MSG),
+                &mut *return_value,
+            )
+            .into_glib()
+        }
+
+        let box_ = Box::into_raw(Box::new(filter_func)) as *mut _;
+        let func = unsafe {
+            let func: ffi::GdkWin32MessageFilterFunc = Some(trampoline::<F>);
+            ffi::gdk_win32_display_add_filter(self.to_glib_none().0, func, box_);
+            func
+        };
+
+        let display = glib::WeakRef::new();
+        display.set(Some(self));
+
+        let drop_ = |b| unsafe {
+            let _ = Box::<F>::from_raw(b as *mut _);
+        };
+        Win32DisplayFilterHandle {
+            display,
+            func,
+            box_,
+            drop_,
+        }
+    }
+}
+
+// rustdoc-stripper-ignore-next
+/// An owned `Win32Display` filter.
+///
+/// A `Win32DisplayFilterHandle` removes itself from the `Win32Display` it is
+/// attached to when it is dropped.
+#[derive(Debug)]
+pub struct Win32DisplayFilterHandle {
+    display: glib::WeakRef<Win32Display>,
+    func: ffi::GdkWin32MessageFilterFunc,
+    box_: glib::ffi::gpointer,
+    drop_: fn(*mut libc::c_void),
+}
+
+impl Drop for Win32DisplayFilterHandle {
+    fn drop(&mut self) {
+        unsafe {
+            if let Some(display) = self.display.upgrade() {
+                ffi::gdk_win32_display_remove_filter(
+                    display.to_glib_none().0,
+                    self.func,
+                    self.box_,
+                );
+            }
+            (self.drop_)(self.box_);
+        }
+    }
 }