config: move input match schema into schema crate

jay-config-schema/src/input.rs

@@ -0,0 +1,17 @@
+#[derive(Debug, Clone)]
+pub enum InputMatch {
+    Any(Vec<InputMatch>),
+    All {
+        tag: Option<String>,
+        name: Option<String>,
+        syspath: Option<String>,
+        devnode: Option<String>,
+        is_keyboard: Option<bool>,
+        is_pointer: Option<bool>,
+        is_touch: Option<bool>,
+        is_tablet_tool: Option<bool>,
+        is_tablet_pad: Option<bool>,
+        is_gesture: Option<bool>,
+        is_switch: Option<bool>,
+    },
+}

jay-config-schema/src/lib.rs

@@ -5,11 +5,13 @@
 //! generated config documentation, and compositor-side application code.
 
 pub mod animations;
+pub mod input;
 pub mod options;
 pub mod output;
 pub mod theme;
 
 pub use animations::{AnimationCurveConfig, Animations};
+pub use input::InputMatch;
 pub use options::{
     ColorManagement, Float, FocusHistory, Libei, RepeatRate, SimpleIm, Tearing, UiDrag, Vrr,
     Xwayland,

toml-config/src/config.rs

@@ -44,8 +44,8 @@ use {
 
 pub use jay_config_schema::{
     AnimationCurveConfig, Animations, ColorManagement, ConfigConnector, ConfigDrmDevice,
-    ConnectorMatch, DrmDeviceMatch, Float, FocusHistory, Libei, Mode, Output, OutputMatch,
-    RepeatRate, SimpleIm, Tearing, Theme, UiDrag, Vrr, Xwayland,
+    ConnectorMatch, DrmDeviceMatch, Float, FocusHistory, InputMatch, Libei, Mode, Output,
+    OutputMatch, RepeatRate, SimpleIm, Tearing, Theme, UiDrag, Vrr, Xwayland,
 };
 
 #[derive(Debug, Copy, Clone)]
@@ -291,24 +291,6 @@ pub struct WindowMatch {
     pub content_types: Option<ContentType>,
 }
 
-#[derive(Debug, Clone)]
-pub enum InputMatch {
-    Any(Vec<InputMatch>),
-    All {
-        tag: Option<String>,
-        name: Option<String>,
-        syspath: Option<String>,
-        devnode: Option<String>,
-        is_keyboard: Option<bool>,
-        is_pointer: Option<bool>,
-        is_touch: Option<bool>,
-        is_tablet_tool: Option<bool>,
-        is_tablet_pad: Option<bool>,
-        is_gesture: Option<bool>,
-        is_switch: Option<bool>,
-    },
-}
-
 #[derive(Debug, Clone)]
 pub struct Input {
     pub tag: Option<String>,

toml-config/src/lib.rs

@@ -637,7 +637,18 @@ impl DrmDeviceMatchExt for DrmDeviceMatch {
     }
 }
 
-impl InputMatch {
+trait InputMatchExt {
+    fn matches(&self, d: InputDevice, state: &State) -> bool;
+
+    fn matches_<'a>(
+        &'a self,
+        d: InputDevice,
+        state: &'a State,
+        active: &mut AHashSet<&'a str>,
+    ) -> bool;
+}
+
+impl InputMatchExt for InputMatch {
     fn matches(&self, d: InputDevice, state: &State) -> bool {
         self.matches_(d, state, &mut AHashSet::new())
     }