Update linux.

Author: Narsil

src/linux/grab.rs

@@ -375,7 +375,7 @@ where
                     let (_, event) = match device.next_event(evdev_rs::ReadFlag::NORMAL) {
                         Ok(event) => event,
                         Err(_) => {
-                            let device_fd = device.fd().unwrap().into_raw_fd();
+                            let device_fd = device.file().unwrap().into_raw_fd();
                             let empty_event = epoll::Event::new(epoll::Events::empty(), 0);
                             epoll::ctl(epoll_fd, EPOLL_CTL_DEL, device_fd, empty_event)?;
                             continue 'events;
@@ -405,7 +405,7 @@ where
 }
 
 static DEV_PATH: &str = "/dev/input";
-const INOTIFY_DATA: u64 = u64::max_value();
+const INOTIFY_DATA: u64 = u64::MAX;
 const EPOLLIN: epoll::Events = epoll::Events::EPOLLIN;
 
 /// Whether to continue grabbing events or to stop
@@ -470,7 +470,7 @@ where
 
 fn inotify_devices() -> io::Result<Inotify> {
     let mut inotify = Inotify::init()?;
-    inotify.add_watch(DEV_PATH, WatchMask::CREATE)?;
+    inotify.watches().add(DEV_PATH, WatchMask::CREATE)?;
     Ok(inotify)
 }
 
@@ -485,7 +485,7 @@ fn add_device_to_epoll_from_inotify_event(
     // new plug events
     let file = File::open(device_path)?;
     let fd = file.as_raw_fd();
-    let device = Device::new_from_fd(file)?;
+    let device = Device::new_from_file(file)?;
     let event = epoll::Event::new(EPOLLIN, devices.len() as u64);
     devices.push(device);
     epoll::ctl(epoll_fd, EPOLL_CTL_ADD, fd, event)?;
@@ -501,7 +501,7 @@ fn setup_devices() -> io::Result<(RawFd, Vec<Device>, Vec<UInputDevice>)> {
     let epoll_fd = epoll_watch_all(device_files.iter())?;
     let devices = device_files
         .into_iter()
-        .map(Device::new_from_fd)
+        .map(Device::new_from_file)
         .collect::<io::Result<Vec<Device>>>()?;
     let output_devices = devices
         .iter()

src/linux/keyboard.rs

@@ -220,13 +220,10 @@ impl KeyboardState for Keyboard {
                     unsafe { self.name_from_code(keycode, state) }
                 }
             },
-            EventType::KeyRelease(key) => match key {
-                Key::ShiftLeft | Key::ShiftRight => {
-                    self.state.shift = false;
-                    None
-                }
-                _ => None,
-            },
+            EventType::KeyRelease(Key::ShiftLeft | Key::ShiftRight) => {
+                self.state.shift = false;
+                None
+            }
             _ => None,
         }
     }

src/linux/listen.rs

@@ -40,10 +40,11 @@ where
         record_range.device_events.last = xlib::MotionNotify as c_uchar;
 
         // Create context
+        let ptr = &raw mut RECORD_ALL_CLIENTS;
         let context = xrecord::XRecordCreateContext(
             dpy_control,
             0,
-            &mut RECORD_ALL_CLIENTS,
+            &mut *ptr,
             1,
             &mut &mut record_range as *mut &mut xrecord::XRecordRange
                 as *mut *mut xrecord::XRecordRange,
@@ -105,8 +106,10 @@ unsafe extern "C" fn record_callback(
     let x = xdatum.root_x as f64;
     let y = xdatum.root_y as f64;
 
-    if let Some(event) = convert(&mut KEYBOARD, code, type_, x, y) {
-        if let Some(callback) = &mut GLOBAL_CALLBACK {
+    let ptr = &raw mut KEYBOARD;
+    if let Some(event) = convert(&mut &ptr, code, type_, x, y) {
+        let ptr = &raw mut GLOBAL_CALLBACK;
+        if let Some(callback) = &mut *ptr {
             callback(event);
         }
     }

src/linux/simulate.rs

@@ -21,31 +21,23 @@ unsafe fn send_native(event_type: &EventType, display: *mut xlib::Display) -> Op
             Button::Left => xtest::XTestFakeButtonEvent(display, 1, TRUE, 0),
             Button::Middle => xtest::XTestFakeButtonEvent(display, 2, TRUE, 0),
             Button::Right => xtest::XTestFakeButtonEvent(display, 3, TRUE, 0),
-            Button::Unknown(code) => {
-                xtest::XTestFakeButtonEvent(display, (*code).try_into().ok()?, TRUE, 0)
-            }
+            Button::Unknown(code) => xtest::XTestFakeButtonEvent(display, (*code).into(), TRUE, 0),
         },
         EventType::ButtonRelease(button) => match button {
             Button::Left => xtest::XTestFakeButtonEvent(display, 1, FALSE, 0),
             Button::Middle => xtest::XTestFakeButtonEvent(display, 2, FALSE, 0),
             Button::Right => xtest::XTestFakeButtonEvent(display, 3, FALSE, 0),
-            Button::Unknown(code) => {
-                xtest::XTestFakeButtonEvent(display, (*code).try_into().ok()?, FALSE, 0)
-            }
+            Button::Unknown(code) => xtest::XTestFakeButtonEvent(display, (*code).into(), FALSE, 0),
         },
         EventType::MouseMove { x, y } => {
             //TODO: replace with clamp if it is stabalized
             let x = if x.is_finite() {
-                x.min(c_int::max_value().into())
-                    .max(c_int::min_value().into())
-                    .round() as c_int
+                x.min(c_int::MAX.into()).max(c_int::MIN.into()).round() as c_int
             } else {
                 0
             };
             let y = if y.is_finite() {
-                y.min(c_int::max_value().into())
-                    .max(c_int::min_value().into())
-                    .round() as c_int
+                y.min(c_int::MAX.into()).max(c_int::MIN.into()).round() as c_int
             } else {
                 0
             };