kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

config: move keymap schema into schema crate

Browse source
This commit is contained in:
kossLAN 2026-05-29 17:08:55 -04:00
parent d9261414c2
commit e21670f3f6
No known key found for this signature in database
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jay-config-schema/src/keymap.rs Normal file
View file

@ -0,0 +1,8 @@
use jay_config::keyboard::Keymap;
#[derive(Debug, Clone)]
pub enum ConfigKeymap {
Named(String),
Literal(Keymap),
Defined { name: String, map: Keymap },
}

2
jay-config-schema/src/lib.rs
View file

@ -7,6 +7,7 @@
pub mod animations; pub mod animations;
pub mod command; pub mod command;
pub mod input; pub mod input;
pub mod keymap;
pub mod options; pub mod options;
pub mod output; pub mod output;
pub mod rules; pub mod rules;
@ -15,6 +16,7 @@ pub mod theme;
pub use animations::{AnimationCurveConfig, Animations}; pub use animations::{AnimationCurveConfig, Animations};
pub use command::{Exec, Status}; pub use command::{Exec, Status};
pub use input::InputMatch; pub use input::InputMatch;
pub use keymap::ConfigKeymap;
pub use options::{ pub use options::{
ColorManagement, Float, FocusHistory, Libei, RepeatRate, SimpleIm, Tearing, UiDrag, Vrr, ColorManagement, Float, FocusHistory, Libei, RepeatRate, SimpleIm, Tearing, UiDrag, Vrr,
Xwayland, Xwayland,

15
toml-config/src/config.rs
View file

@ -25,7 +25,7 @@ use {
FallbackOutputMode, LayerDirection, SwitchEvent, Timeline, acceleration::AccelProfile, FallbackOutputMode, LayerDirection, SwitchEvent, Timeline, acceleration::AccelProfile,
clickmethod::ClickMethod, clickmethod::ClickMethod,
}, },
keyboard::{Keymap, ModifiedKeySym, mods::Modifiers, syms::KeySym}, keyboard::{ModifiedKeySym, mods::Modifiers, syms::KeySym},
logging::LogLevel, logging::LogLevel,
video::GfxApi, video::GfxApi,
window::TileState, window::TileState,
@ -43,9 +43,9 @@ use {
pub use jay_config_schema::{ pub use jay_config_schema::{
AnimationCurveConfig, Animations, ClientMatch, ColorManagement, ConfigConnector, AnimationCurveConfig, Animations, ClientMatch, ColorManagement, ConfigConnector,
ConfigDrmDevice, ConnectorMatch, DrmDeviceMatch, Exec, Float, FocusHistory, GenericMatch, ConfigDrmDevice, ConfigKeymap, ConnectorMatch, DrmDeviceMatch, Exec, Float, FocusHistory,
InputMatch, Libei, MatchExactly, Mode, Output, OutputMatch, RepeatRate, SimpleIm, Status, GenericMatch, InputMatch, Libei, MatchExactly, Mode, Output, OutputMatch, RepeatRate,
Tearing, Theme, UiDrag, Vrr, WindowMatch, Xwayland, SimpleIm, Status, Tearing, Theme, UiDrag, Vrr, WindowMatch, Xwayland,
}; };
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
@ -243,13 +243,6 @@ pub struct Input {
pub calibration_matrix: Option<[[f32; 3]; 2]>, pub calibration_matrix: Option<[[f32; 3]; 2]>,
} }
#[derive(Debug, Clone)]
pub enum ConfigKeymap {
Named(String),
Literal(Keymap),
Defined { name: String, map: Keymap },
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Shortcut { pub struct Shortcut {
pub mask: Modifiers, pub mask: Modifiers,