Fixing a few things, x11 overrides wayland.

Author: Narsil

.github/workflows/rust.yml

@@ -20,14 +20,11 @@ jobs:
         include:
         - os: ubuntu-latest
           headless: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-        - os: ubuntu-latest
           dependencies: sudo apt-get install libxtst-dev libevdev-dev --assume-yes
+          test: cargo test --verbose --features=serialize,x11
         - os: macos-latest
           # TODO: We can't test this on github, we can't set accessibility yet.
           test: cargo test --verbose --all-features -- --skip test_listen_and_simulate --skip test_grab
-        - os: ubuntu-latest
-          # TODO unstable_grab feature is not supported on Linux.
-          test: cargo test --verbose --features=serialize,x11
         - os: windows-latest
           test: cargo test --verbose --all-features
 

Cargo.toml

@@ -18,10 +18,11 @@ serde = {version = "1.0", features = ["derive"], optional=true}
 lazy_static = "1.4"
 
 [features]
-default = []
+default = ["x11"]
 serialize = ["serde"]
 unstable_grab = ["evdev-rs", "epoll", "inotify"]
 wayland = ["input", "input-linux"]
+x11 = ["dep:x11"]
 
 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa = "0.26"
@@ -33,7 +34,7 @@ dispatch = "0.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "0.2"
-x11 = {version = "2.18", features = ["xlib", "xrecord", "xinput"]}
+x11 = {version = "2.18", features = ["xlib", "xrecord", "xinput"], optional = true}
 evdev-rs = {version = "0.6", optional=true}
 epoll = {version = "4.1.0", optional=true}
 inotify = {version = "0.11", default-features=false, optional=true}

src/linux/mod.rs

@@ -4,10 +4,10 @@ mod x11;
 #[cfg(feature = "x11")]
 pub use x11::*;
 
-#[cfg(feature = "wayland")]
+#[cfg(all(feature = "wayland", not(feature = "x11")))]
 mod wayland;
 
-#[cfg(feature = "wayland")]
+#[cfg(all(feature = "wayland", not(feature = "x11")))]
 pub use wayland::*;
 
 #[cfg(not(any(feature = "wayland", feature = "x11")))]

src/linux/wayland/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().as_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;
@@ -469,8 +469,8 @@ where
 }
 
 fn inotify_devices() -> io::Result<Inotify> {
-    let mut inotify = Inotify::init()?;
-    inotify.add_watch(DEV_PATH, WatchMask::CREATE)?;
+    let inotify = Inotify::init()?;
+    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/x11/common.rs

@@ -1,5 +1,5 @@
-use crate::linux::keyboard::Keyboard;
-use crate::linux::keycodes::key_from_code;
+use super::keyboard::Keyboard;
+use super::keycodes::key_from_code;
 use crate::rdev::{Button, Event, EventType, KeyboardState};
 use std::convert::TryInto;
 use std::os::raw::{c_int, c_uchar, c_uint};

src/linux/x11/display.rs

@@ -1,4 +1,4 @@
-use crate::linux::common::Display;
+use super::common::Display;
 use crate::rdev::DisplayError;
 
 pub fn display_size() -> Result<(u64, u64), DisplayError> {

src/linux/x11/grab.rs

@@ -1,5 +1,5 @@
-use crate::linux::common::Display;
-use crate::linux::keyboard::Keyboard;
+use super::common::Display;
+use super::keyboard::Keyboard;
 use crate::rdev::{Button, Event, EventType, GrabError, Key, KeyboardState};
 use epoll::ControlOptions::{EPOLL_CTL_ADD, EPOLL_CTL_DEL};
 use evdev_rs::{

src/linux/x11/keyboard.rs

@@ -1,5 +1,5 @@
 extern crate x11;
-use crate::linux::keycodes::code_from_key;
+use super::keycodes::code_from_key;
 use crate::rdev::{EventType, Key, KeyboardState};
 use std::ffi::CString;
 use std::os::raw::{c_char, c_int, c_uint, c_ulong, c_void};

src/linux/x11/listen.rs

@@ -1,7 +1,7 @@
 extern crate libc;
 extern crate x11;
-use crate::linux::common::{convert, FALSE, KEYBOARD};
-use crate::linux::keyboard::Keyboard;
+use super::common::{convert, FALSE, KEYBOARD};
+use super::keyboard::Keyboard;
 use crate::rdev::{Event, ListenError};
 use std::convert::TryInto;
 use std::ffi::CStr;

src/linux/x11/mod.rs

@@ -10,9 +10,9 @@ mod keycodes;
 mod listen;
 mod simulate;
 
-pub use crate::linux::display::display_size;
+pub use display::display_size;
 #[cfg(feature = "unstable_grab")]
-pub use crate::linux::grab::grab;
-pub use crate::linux::keyboard::Keyboard;
-pub use crate::linux::listen::listen;
-pub use crate::linux::simulate::simulate;
+pub use grab::grab;
+pub use keyboard::Keyboard;
+pub use listen::listen;
+pub use simulate::simulate;