config: move command schema into schema crate
This commit is contained in:
parent
81a1a865a1
commit
f0e7bd31cb
3 changed files with 19 additions and 17 deletions
15
jay-config-schema/src/command.rs
Normal file
15
jay-config-schema/src/command.rs
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
use jay_config::status::MessageFormat;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Exec {
|
||||
pub prog: String,
|
||||
pub args: Vec<String>,
|
||||
pub envs: Vec<(String, String)>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Status {
|
||||
pub format: MessageFormat,
|
||||
pub exec: Exec,
|
||||
pub separator: Option<String>,
|
||||
}
|
||||
|
|
@ -5,12 +5,14 @@
|
|||
//! generated config documentation, and compositor-side application code.
|
||||
|
||||
pub mod animations;
|
||||
pub mod command;
|
||||
pub mod input;
|
||||
pub mod options;
|
||||
pub mod output;
|
||||
pub mod theme;
|
||||
|
||||
pub use animations::{AnimationCurveConfig, Animations};
|
||||
pub use command::{Exec, Status};
|
||||
pub use input::InputMatch;
|
||||
pub use options::{
|
||||
ColorManagement, Float, FocusHistory, Libei, RepeatRate, SimpleIm, Tearing, UiDrag, Vrr,
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ use {
|
|||
},
|
||||
keyboard::{Keymap, ModifiedKeySym, mods::Modifiers, syms::KeySym},
|
||||
logging::LogLevel,
|
||||
status::MessageFormat,
|
||||
video::GfxApi,
|
||||
window::{ContentType, TileState, WindowType},
|
||||
workspace::WorkspaceDisplayOrder,
|
||||
|
|
@ -44,8 +43,8 @@ use {
|
|||
|
||||
pub use jay_config_schema::{
|
||||
AnimationCurveConfig, Animations, ColorManagement, ConfigConnector, ConfigDrmDevice,
|
||||
ConnectorMatch, DrmDeviceMatch, Float, FocusHistory, InputMatch, Libei, Mode, Output,
|
||||
OutputMatch, RepeatRate, SimpleIm, Tearing, Theme, UiDrag, Vrr, Xwayland,
|
||||
ConnectorMatch, DrmDeviceMatch, Exec, Float, FocusHistory, InputMatch, Libei, Mode, Output,
|
||||
OutputMatch, RepeatRate, SimpleIm, Status, Tearing, Theme, UiDrag, Vrr, Xwayland,
|
||||
};
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
|
|
@ -204,13 +203,6 @@ pub enum Action {
|
|||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Status {
|
||||
pub format: MessageFormat,
|
||||
pub exec: Exec,
|
||||
pub separator: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Default, Debug, Clone)]
|
||||
pub struct GenericMatch<Match> {
|
||||
pub name: Option<String>,
|
||||
|
|
@ -312,13 +304,6 @@ pub struct Input {
|
|||
pub calibration_matrix: Option<[[f32; 3]; 2]>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Exec {
|
||||
pub prog: String,
|
||||
pub args: Vec<String>,
|
||||
pub envs: Vec<(String, String)>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum ConfigKeymap {
|
||||
Named(String),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue