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

config: move simple command schema into schema crate

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

56
jay-config-schema/src/action.rs Normal file
View file

@ -0,0 +1,56 @@
use jay_config::{
Direction,
input::{LayerDirection, Timeline},
};
#[derive(Debug, Copy, Clone)]
pub enum SimpleCommand {
Close,
DisablePointerConstraint,
Focus(Direction),
FocusParent,
Move(Direction),
None,
Quit,
ReloadConfigToml,
ToggleFloating,
SetFloating(bool),
ToggleFullscreen,
SetFullscreen(bool),
Forward(bool),
EnableWindowManagement(bool),
SetFloatAboveFullscreen(bool),
ToggleFloatAboveFullscreen,
SetFloatPinned(bool),
ToggleFloatPinned,
KillClient,
ShowBar(bool),
ToggleBar,
ShowTitles(bool),
ToggleTitles,
FloatTitles(bool),
ToggleFloatTitles,
FocusHistory(Timeline),
FocusLayerRel(LayerDirection),
FocusTiles,
ToggleFocusFloatTiled,
CreateMark,
JumpToMark,
PopMode(bool),
EnableSimpleIm(bool),
ToggleSimpleImEnabled,
ReloadSimpleIm,
EnableUnicodeInput,
WarpMouseToFocus,
ToggleTab,
MakeGroupH,
MakeGroupV,
MakeGroupTab,
ChangeGroupOpposite,
Equalize,
EqualizeRecursive,
MoveTabLeft,
MoveTabRight,
SetAutotile(bool),
ToggleAutotile,
}

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

@ -4,6 +4,7 @@
//! policy, and docs metadata that need to be consumed by TOML parsing, //! policy, and docs metadata that need to be consumed by TOML parsing,
//! generated config documentation, and compositor-side application code. //! generated config documentation, and compositor-side application code.
pub mod action;
pub mod animations; pub mod animations;
pub mod command; pub mod command;
pub mod input; pub mod input;
@ -13,6 +14,7 @@ pub mod output;
pub mod rules; pub mod rules;
pub mod theme; pub mod theme;
pub use action::SimpleCommand;
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;

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

@ -22,8 +22,7 @@ use {
jay_config::{ jay_config::{
Direction, Workspace, Direction, Workspace,
input::{ input::{
FallbackOutputMode, LayerDirection, SwitchEvent, Timeline, acceleration::AccelProfile, FallbackOutputMode, SwitchEvent, acceleration::AccelProfile, clickmethod::ClickMethod,
clickmethod::ClickMethod,
}, },
keyboard::{ModifiedKeySym, mods::Modifiers, syms::KeySym}, keyboard::{ModifiedKeySym, mods::Modifiers, syms::KeySym},
logging::LogLevel, logging::LogLevel,
@ -45,61 +44,9 @@ pub use jay_config_schema::{
AnimationCurveConfig, Animations, ClientMatch, ColorManagement, ConfigConnector, AnimationCurveConfig, Animations, ClientMatch, ColorManagement, ConfigConnector,
ConfigDrmDevice, ConfigKeymap, ConnectorMatch, DrmDeviceMatch, Exec, Float, FocusHistory, ConfigDrmDevice, ConfigKeymap, ConnectorMatch, DrmDeviceMatch, Exec, Float, FocusHistory,
GenericMatch, InputMatch, Libei, MatchExactly, Mode, Output, OutputMatch, RepeatRate, GenericMatch, InputMatch, Libei, MatchExactly, Mode, Output, OutputMatch, RepeatRate,
SimpleIm, Status, Tearing, Theme, UiDrag, Vrr, WindowMatch, Xwayland, SimpleCommand, SimpleIm, Status, Tearing, Theme, UiDrag, Vrr, WindowMatch, Xwayland,
}; };
#[derive(Debug, Copy, Clone)]
pub enum SimpleCommand {
Close,
DisablePointerConstraint,
Focus(Direction),
FocusParent,
Move(Direction),
None,
Quit,
ReloadConfigToml,
ToggleFloating,
SetFloating(bool),
ToggleFullscreen,
SetFullscreen(bool),
Forward(bool),
EnableWindowManagement(bool),
SetFloatAboveFullscreen(bool),
ToggleFloatAboveFullscreen,
SetFloatPinned(bool),
ToggleFloatPinned,
KillClient,
ShowBar(bool),
ToggleBar,
ShowTitles(bool),
ToggleTitles,
FloatTitles(bool),
ToggleFloatTitles,
FocusHistory(Timeline),
FocusLayerRel(LayerDirection),
FocusTiles,
ToggleFocusFloatTiled,
CreateMark,
JumpToMark,
PopMode(bool),
EnableSimpleIm(bool),
ToggleSimpleImEnabled,
ReloadSimpleIm,
EnableUnicodeInput,
WarpMouseToFocus,
ToggleTab,
MakeGroupH,
MakeGroupV,
MakeGroupTab,
ChangeGroupOpposite,
Equalize,
EqualizeRecursive,
MoveTabLeft,
MoveTabRight,
SetAutotile(bool),
ToggleAutotile,
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[expect(clippy::enum_variant_names)] #[expect(clippy::enum_variant_names)]
pub enum Action { pub enum Action {