[feat] add argument to ignore devices

--ignore-device takes the same format as --device and ignores the devices
listed, separated by semicolon. If a device is listed both in the --device
argument and --ignore-device argument, it is not added.

Author: aadilshabier

docs/swhkd.1.scd

@@ -38,9 +38,12 @@ More about the config file syntax in `swhkd(5)`
 *-d*, *--debug*
 	Enable debug mode.
 
-*-D, --device* <DEVICE_NAME>
+*-D, --device* <DEVICE_NAMES>
 	Manually set the keyboard devices to use. Can occur multiple times.
 
+*-I, --ignore-device* <DEVICE_NAMES>
+	Manually set the keyboard devices to ignore. Can occur multiple times.
+
 # SIGNALS
 
 	- Reload config file: `sudo pkill -HUP swhkd`

swhkd/src/daemon.rs

@@ -143,15 +143,25 @@ async fn main() -> Result<(), Box<dyn Error>> {
         };
     }
 
-    let arg_devices: Vec<&str> = args.values_of("device").unwrap_or_default().collect();
+    let arg_add_devices: Vec<&str> = args.values_of("device").unwrap_or_default().collect();
+    let arg_ignore_devices: Vec<&str> =
+        args.values_of("ignore-device").unwrap_or_default().collect();
 
     let keyboard_devices: Vec<_> = {
-        if arg_devices.is_empty() {
+        if arg_add_devices.is_empty() {
             log::trace!("Attempting to find all keyboard file descriptors.");
-            evdev::enumerate().filter(|(_, dev)| check_device_is_keyboard(dev)).collect()
+            evdev::enumerate()
+                .filter(|(_, dev)| {
+                    !arg_ignore_devices.contains(&dev.name().unwrap_or(""))
+                        && check_device_is_keyboard(dev)
+                })
+                .collect()
         } else {
             evdev::enumerate()
-                .filter(|(_, dev)| arg_devices.contains(&dev.name().unwrap_or("")))
+                .filter(|(_, dev)| {
+                    !arg_ignore_devices.contains(&dev.name().unwrap_or(""))
+                        && arg_add_devices.contains(&dev.name().unwrap_or(""))
+                })
                 .collect()
         }
     };
@@ -309,7 +319,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                             Ok(device) => device
                         };
                         let name = device.name().unwrap_or("[unknown]");
-                        if arg_devices.contains(&name) || check_device_is_keyboard(&device) {
+                        if !arg_ignore_devices.contains(&name) && (arg_add_devices.contains(&name) || check_device_is_keyboard(&device)) {
                             log::info!("Device '{}' at '{}' added.", name, node);
                             let _ = device.grab();
                             keyboard_states.insert(node.to_string(), KeyboardState::new());
@@ -490,14 +500,22 @@ pub fn set_command_line_args() -> Command<'static> {
         )
         .arg(arg!(-d - -debug).required(false).help("Enable debug mode."))
         .arg(
-            arg!(-D --device <DEVICE_NAME>)
+            arg!(-D --device <DEVICE_NAMES>)
                 .required(false)
                 .takes_value(true)
                 .multiple_occurrences(true)
                 .help(
-                    "Specific keyboard devices to use. Seperate multiple devices with semicolon.",
+                    "Specific keyboard devices to use. Separate multiple devices with semicolon.",
                 ),
-        );
+        )
+        .arg(arg!(-I --ignore-device <DEVICE_NAMES>)
+            .required(false)
+            .takes_value(true)
+            .multiple_occurrences(true)
+            .help(
+                "Specific keyboard devices to ignore. Separate multiple devices with semicolon."
+            )
+    );
     app
 }