Moving to Fn(Event) -> () instead of fn pointer. (Narsil#63)

* Bump version number

* Clippy.

* FnMut.

Author: Narsil

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rdev"
-version = "0.4.5"
+version = "0.5.0"
 authors = ["Nicolas Patry <[email protected]>"]
 edition = "2018"
 

src/lib.rs

@@ -217,9 +217,9 @@ use crate::windows::{display_size as _display_size, listen as _listen, simulate
 ///     }
 /// }
 /// ```
-pub fn listen<T: 'static>(callback: T) -> Result<(), ListenError>
+pub fn listen<T>(callback: T) -> Result<(), ListenError>
 where
-    T: Fn(Event) -> (),
+    T: FnMut(Event) + 'static,
 {
     _listen(callback)
 }

src/linux/listen.rs

@@ -11,11 +11,11 @@ use x11::xlib;
 use x11::xrecord;
 
 static mut RECORD_ALL_CLIENTS: c_ulong = xrecord::XRecordAllClients;
-static mut GLOBAL_CALLBACK: Option<Box<dyn Fn(Event) -> ()>> = None;
+static mut GLOBAL_CALLBACK: Option<Box<dyn FnMut(Event)>> = None;
 
 pub fn listen<T>(callback: T) -> Result<(), ListenError>
 where
-    T: Fn(Event) -> () + 'static,
+    T: FnMut(Event) + 'static,
 {
     let keyboard = Keyboard::new().ok_or(ListenError::KeyboardError)?;
 
@@ -106,7 +106,7 @@ unsafe extern "C" fn record_callback(
     let y = xdatum.root_y as f64;
 
     if let Some(event) = convert(&mut KEYBOARD, code, type_, x, y) {
-        if let Some(callback) = &GLOBAL_CALLBACK {
+        if let Some(callback) = &mut GLOBAL_CALLBACK {
             callback(event);
         }
     }

src/macos/grab.rs

@@ -6,7 +6,7 @@ use cocoa::foundation::NSAutoreleasePool;
 use core_graphics::event::{CGEventTapLocation, CGEventType};
 use std::os::raw::c_void;
 
-static mut GLOBAL_CALLBACK: Option<Box<dyn Fn(Event) -> Option<Event>>> = None;
+static mut GLOBAL_CALLBACK: Option<Box<dyn FnMut(Event) -> Option<Event>>> = None;
 
 unsafe extern "C" fn raw_callback(
     _proxy: CGEventTapProxy,
@@ -19,7 +19,7 @@ unsafe extern "C" fn raw_callback(
     let opt = KEYBOARD_STATE.lock();
     if let Ok(mut keyboard) = opt {
         if let Some(event) = convert(_type, &cg_event, &mut keyboard) {
-            if let Some(callback) = &GLOBAL_CALLBACK {
+            if let Some(callback) = &mut GLOBAL_CALLBACK {
                 if callback(event).is_none() {
                     cg_event.set_type(CGEventType::Null);
                 }
@@ -32,7 +32,7 @@ unsafe extern "C" fn raw_callback(
 #[link(name = "Cocoa", kind = "framework")]
 pub fn grab<T>(callback: T) -> Result<(), GrabError>
 where
-    T: Fn(Event) -> Option<Event> + 'static,
+    T: FnMut(Event) -> Option<Event> + 'static,
 {
     unsafe {
         GLOBAL_CALLBACK = Some(Box::new(callback));

src/macos/listen.rs

@@ -6,7 +6,7 @@ use cocoa::foundation::NSAutoreleasePool;
 use core_graphics::event::{CGEventTapLocation, CGEventType};
 use std::os::raw::c_void;
 
-static mut GLOBAL_CALLBACK: Option<Box<dyn Fn(Event) -> ()>> = None;
+static mut GLOBAL_CALLBACK: Option<Box<dyn FnMut(Event)>> = None;
 
 unsafe extern "C" fn raw_callback(
     _proxy: CGEventTapProxy,
@@ -19,7 +19,7 @@ unsafe extern "C" fn raw_callback(
     let opt = KEYBOARD_STATE.lock();
     if let Ok(mut keyboard) = opt {
         if let Some(event) = convert(_type, &cg_event, &mut keyboard) {
-            if let Some(callback) = &GLOBAL_CALLBACK {
+            if let Some(callback) = &mut GLOBAL_CALLBACK {
                 callback(event);
             }
         }
@@ -32,7 +32,7 @@ unsafe extern "C" fn raw_callback(
 #[link(name = "Cocoa", kind = "framework")]
 pub fn listen<T>(callback: T) -> Result<(), ListenError>
 where
-    T: Fn(Event) -> () + 'static,
+    T: FnMut(Event) + 'static,
 {
     unsafe {
         GLOBAL_CALLBACK = Some(Box::new(callback));

src/windows/grab.rs

@@ -4,7 +4,7 @@ use std::ptr::null_mut;
 use std::time::SystemTime;
 use winapi::um::winuser::{CallNextHookEx, GetMessageA, HC_ACTION};
 
-static mut GLOBAL_CALLBACK: Option<Box<dyn Fn(Event) -> Option<Event>>> = None;
+static mut GLOBAL_CALLBACK: Option<Box<dyn FnMut(Event) -> Option<Event>>> = None;
 
 unsafe extern "system" fn raw_callback(code: i32, param: usize, lpdata: isize) -> isize {
     if code == HC_ACTION {
@@ -22,7 +22,7 @@ unsafe extern "system" fn raw_callback(code: i32, param: usize, lpdata: isize) -
                 time: SystemTime::now(),
                 name,
             };
-            if let Some(callback) = &GLOBAL_CALLBACK {
+            if let Some(callback) = &mut GLOBAL_CALLBACK {
                 if callback(event).is_none() {
                     // https://stackoverflow.com/questions/42756284/blocking-windows-mouse-click-using-setwindowshookex
                     // https://android.developreference.com/article/14560004/Blocking+windows+mouse+click+using+SetWindowsHookEx()
@@ -46,7 +46,7 @@ impl From<HookError> for GrabError {
 
 pub fn grab<T>(callback: T) -> Result<(), GrabError>
 where
-    T: Fn(Event) -> Option<Event> + 'static,
+    T: FnMut(Event) -> Option<Event> + 'static,
 {
     unsafe {
         GLOBAL_CALLBACK = Some(Box::new(callback));

src/windows/listen.rs

@@ -6,7 +6,7 @@ use std::time::SystemTime;
 use winapi::shared::minwindef::{LPARAM, LRESULT, WPARAM};
 use winapi::um::winuser::{CallNextHookEx, GetMessageA, HC_ACTION};
 
-static mut GLOBAL_CALLBACK: Option<Box<dyn Fn(Event) -> ()>> = None;
+static mut GLOBAL_CALLBACK: Option<Box<dyn FnMut(Event)>> = None;
 
 impl From<HookError> for ListenError {
     fn from(error: HookError) -> Self {
@@ -33,7 +33,7 @@ unsafe extern "system" fn raw_callback(code: c_int, param: WPARAM, lpdata: LPARA
                 time: SystemTime::now(),
                 name,
             };
-            if let Some(callback) = &GLOBAL_CALLBACK {
+            if let Some(callback) = &mut GLOBAL_CALLBACK {
                 callback(event);
             }
         }
@@ -43,7 +43,7 @@ unsafe extern "system" fn raw_callback(code: c_int, param: WPARAM, lpdata: LPARA
 
 pub fn listen<T>(callback: T) -> Result<(), ListenError>
 where
-    T: Fn(Event) -> () + 'static,
+    T: FnMut(Event) + 'static,
 {
     unsafe {
         GLOBAL_CALLBACK = Some(Box::new(callback));