monolith

public

Star0

Fork 0

Watch0

82 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `b22c0511d5af`

tarball

atagen <boss@atagen.co>2026-10-17 03:59 UTC

12 files changed+75-55

monolith: share enums, modifier mapping and rect tests across crates

ipc now re-exports layout's Dir and Axis, which serialize under a layout feature, in place of copies mapped by hand. The config's Mods learned has, and one held() turns smithay's modifier state into it for binds and drags. Rect::contains replaces four inline point tests, and window keys for clients come from one place, resolved without a scan. A test now holds default.toml to the Default impls, and it caught the border colours drifting by rounding.

Modified file: crates/config/src/lib.rs+28 additions−4 deletions@@ -98,8 +98,8 @@ impl Default for Decoration {
     fn default() -> Self {
         Self {
             border: 2,
-            focused: Color([0.53, 0.75, 0.82, 1.0]),
-            unfocused: Color([0.23, 0.26, 0.32, 1.0]),
+            focused: Color::rgb(0x88, 0xbf, 0xd1),
+            unfocused: Color::rgb(0x3b, 0x42, 0x52),
         }
     }
 }
@@ -108,6 +108,12 @@ impl Default for Decoration {
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Color(pub [f32; 4]);
 
+impl Color {
+    pub const fn rgb(r: u8, g: u8, b: u8) -> Self {
+        Self([r as f32 / 255.0, g as f32 / 255.0, b as f32 / 255.0, 1.0])
+    }
+}
+
 impl<'de> Deserialize<'de> for Color {
     fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
         let s = String::deserialize(d)?;
@@ -199,6 +205,15 @@ pub struct Mods {
 }
 
 impl Mods {
+    pub fn has(&self, m: Modifier) -> bool {
+        match m {
+            Modifier::Super => self.logo,
+            Modifier::Alt => self.alt,
+            Modifier::Ctrl => self.ctrl,
+            Modifier::Shift => self.shift,
+        }
+    }
+
     fn set(&mut self, m: Modifier) {
         match m {
             Modifier::Super => self.logo = true,
@@ -411,9 +426,18 @@ fn parse_bind(combo: &str, words: Words, mod_key: Modifier) -> Result<Bind, Erro
 
 #[cfg(test)]
 mod tests {
+    use super::*;
+
+    /// default.toml documents the defaults for users, and the Default impls
+    /// apply them to sections a user config leaves out. They must agree.
     #[test]
-    fn the_default_config_parses() {
-        let c = super::Config::parse(super::DEFAULT).unwrap();
+    fn default_toml_states_the_defaults() {
+        let c = Config::parse(DEFAULT).unwrap();
+        assert_eq!(c.general, General::default());
+        assert_eq!(c.output, Outputs::default());
+        assert_eq!(c.decoration, Decoration::default());
+        assert_eq!(c.animation, Animation::default());
+        assert_eq!(c.keyboard, Keyboard::default());
         assert!(c.binds.len() > 40);
     }
 }

Modified file: crates/ipc/Cargo.toml+1

@@ -9,4 +9,5 @@ publish.workspace = true

99 workspace = true

1010

1111 [dependencies]

12+monolith-layout = { workspace = true, features = ["serde"] }

1213 serde.workspace = true

Modified file: crates/ipc/src/lib.rs+1 additions−15 deletions@@ -25,21 +25,7 @@ pub fn socket_path() -> Option<PathBuf> {
     socket_path_for(&std::env::var("WAYLAND_DISPLAY").ok()?)
 }
 
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
-#[serde(rename_all = "kebab-case")]
-pub enum Dir {
-    Left,
-    Right,
-    Up,
-    Down,
-}
-
-#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
-#[serde(rename_all = "kebab-case")]
-pub enum Axis {
-    Horizontal,
-    Vertical,
-}
+pub use monolith_layout::{Axis, Dir};
 
 #[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case")]

Modified file: crates/layout/Cargo.toml+4 additions@@ -8,8 +8,12 @@ publish.workspace = true
 [lints]
 workspace = true
 
+[features]
+serde = ["dep:serde"]
+
 [dependencies]
 monolith-planner.workspace = true
+serde = { workspace = true, optional = true }
 slotmap.workspace = true
 
 [dev-dependencies]

Modified file: crates/layout/src/tree.rs+4 additions@@ -6,6 +6,8 @@ use std::hash::Hash;
 new_key_type! { pub struct NodeId; }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
 pub enum Axis {
     Horizontal,
     Vertical,
@@ -21,6 +23,8 @@ impl Axis {
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
 pub enum Dir {
     Left,
     Right,

Modified file: crates/monolith/src/commands.rs+15 additions−23 deletions@@ -1,7 +1,7 @@
 use crate::state::State;
 use monolith_config::{Config, Mods, MoveMode};
 use monolith_ipc::Command;
-use monolith_layout::{Axis, Dir, ExpandScope, WindowId};
+use monolith_layout::{ExpandScope, WindowId};
 use smithay::input::keyboard::{Keysym, ModifiersState, xkb};
 use std::process::Stdio;
 
@@ -26,12 +26,7 @@ impl Binds {
 
     /// Matches on the unshifted keysyms so `Mod+Shift+1` means the 1 key.
     pub fn find(&self, mods: &ModifiersState, syms: &[Keysym]) -> Option<Command> {
-        let held = Mods {
-            logo: mods.logo,
-            alt: mods.alt,
-            ctrl: mods.ctrl,
-            shift: mods.shift,
-        };
+        let held = held(mods);
         self.0
             .iter()
             .find(|(m, sym, _)| *m == held && syms.contains(sym))
@@ -39,12 +34,13 @@ impl Binds {
     }
 }
 
-fn dir(d: monolith_ipc::Dir) -> Dir {
-    match d {
-        monolith_ipc::Dir::Left => Dir::Left,
-        monolith_ipc::Dir::Right => Dir::Right,
-        monolith_ipc::Dir::Up => Dir::Up,
-        monolith_ipc::Dir::Down => Dir::Down,
+/// The config's view of what smithay reports held.
+pub fn held(mods: &ModifiersState) -> Mods {
+    Mods {
+        logo: mods.logo,
+        alt: mods.alt,
+        ctrl: mods.ctrl,
+        shift: mods.shift,
     }
 }
 
@@ -69,26 +65,22 @@ impl State {
             Command::Quit => self.core.signal.stop(),
             Command::Reload => self.reload()?,
             Command::Focus { dir: d } => {
-                self.wm.layout.focus_dir(dir(d));
+                self.wm.layout.focus_dir(d);
             }
             Command::Move { dir: d } if merge => {
-                self.wm.layout.merge_window(dir(d));
+                self.wm.layout.merge_window(d);
             }
             Command::Move { dir: d } => {
-                self.wm.layout.move_window(dir(d));
+                self.wm.layout.move_window(d);
             }
             Command::MoveContainer { dir: d } => {
-                self.wm.layout.move_container(dir(d));
+                self.wm.layout.move_container(d);
             }
             Command::Maximize => {
                 self.wm.layout.expand(ExpandScope::All);
             }
             Command::InvertMove => self.input.move_inverted = !inverted,
             Command::Resize { axis, delta } => {
-                let axis = match axis {
-                    monolith_ipc::Axis::Horizontal => Axis::Horizontal,
-                    monolith_ipc::Axis::Vertical => Axis::Vertical,
-                };
                 self.wm.layout.resize(axis, delta);
             }
             Command::Expand { scope } => {
@@ -130,7 +122,7 @@ impl State {
                 self.wm.layout.reorder_tag(t, index);
             }
             Command::FocusOutput { dir: d } => {
-                if let Some(o) = output.and_then(|o| self.wm.layout.output_towards(o, dir(d))) {
+                if let Some(o) = output.and_then(|o| self.wm.layout.output_towards(o, d)) {
                     self.wm.layout.set_active_output(o);
                     if let Some(w) = self.wm.layout.focused_on(o) {
                         self.wm.layout.focus(w);
@@ -140,7 +132,7 @@ impl State {
             Command::SendToOutput { dir: d } => {
                 if let (Some(w), Some(o)) = (
                     focused,
-                    output.and_then(|o| self.wm.layout.output_towards(o, dir(d))),
+                    output.and_then(|o| self.wm.layout.output_towards(o, d)),
                 ) {
                     self.wm.layout.send_to_output(w, o);
                 }

Modified file: crates/monolith/src/drm.rs+1 additions−3 deletions@@ -786,9 +786,7 @@ fn clamp(
     state: &State,
     pos: Point<f64, smithay::utils::Logical>,
 ) -> Point<f64, smithay::utils::Logical> {
-    let inside = |a: &Rect, p: Point<f64, smithay::utils::Logical>| {
-        p.x >= a.x && p.y >= a.y && p.x < a.right() && p.y < a.bottom()
-    };
+    let inside = |a: &Rect, p: Point<f64, smithay::utils::Logical>| a.contains(p.x, p.y);
     let areas: Vec<Rect> = state.wm.layout.outputs().map(|(_, o)| o.area).collect();
     if areas.iter().any(|a| inside(a, pos)) {
         return pos;

Modified file: crates/monolith/src/frame.rs+3 additions−2 deletions@@ -36,8 +36,9 @@ pub fn compose(
 ) -> Vec<Draw> {
     let mut elements = Vec::new();
     if cursor && let Some(area) = ctx.wm.layout.output(o).map(|out| out.area) {
-        let local = ctx.input.pointer_pos - Point::from((area.x, area.y));
-        if local.x >= 0.0 && local.y >= 0.0 && local.x < area.w && local.y < area.h {
+        let pos = ctx.input.pointer_pos;
+        if area.contains(pos.x, pos.y) {
+            let local = pos - Point::from((area.x, area.y));
             elements.extend(ctx.input.cursor.elements(
                 ctx.renderer,
                 &ctx.input.cursor_status,

Modified file: crates/monolith/src/input.rs+1 additions−7 deletions@@ -2,7 +2,6 @@
 //! into these calls, with pointer positions in global logical coordinates.
 
 use crate::state::State;
-use monolith_config::Modifier;
 use monolith_layout::{Rect, WindowId};
 use smithay::backend::input::{ButtonState, InputTime, KeyState};
 use smithay::backend::session::Session;
@@ -184,12 +183,7 @@ fn start_drag(state: &mut State, button: u32) -> bool {
         .seat
         .get_keyboard()
         .map(|k| k.modifier_state())
-        .is_some_and(|m| match state.settings.config.general.mod_key {
-            Modifier::Super => m.logo,
-            Modifier::Alt => m.alt,
-            Modifier::Ctrl => m.ctrl,
-            Modifier::Shift => m.shift,
-        });
+        .is_some_and(|m| crate::commands::held(&m).has(state.settings.config.general.mod_key));
     let Some(id) = state.wm.layout.focused() else {
         return false;
     };

Modified file: crates/monolith/src/ipc.rs+1−1

@@ -179,7 +179,7 @@ fn snapshot(state: &State) -> monolith_ipc::State {

179179 .map(|w| (w.app_id.clone(), w.title.clone()))

180180 .unwrap_or_default();

181181 monolith_ipc::Window {

182- id: slotmap::Key::data(&id).as_ffi(),

182+ id: crate::wm::key(id),

183183 app_id,

184184 title,

185185 tag: l

Modified file: crates/monolith/src/wm.rs+11 additions@@ -45,6 +45,11 @@ pub struct WindowState {
     pub title: String,
 }
 
+/// The id clients see for a window, stable for its lifetime.
+pub fn key(id: WindowId) -> u64 {
+    slotmap::Key::data(&id).as_ffi()
+}
+
 /// Asks a window to close, through xdg-shell or X11.
 pub fn close(window: &Window) {
     match (window.toplevel(), window.x11_surface()) {
@@ -115,6 +120,12 @@ impl Wm {
         }
     }
 
+    /// The window a client named by `key`, if it still exists.
+    pub fn by_key(&self, key: u64) -> Option<WindowId> {
+        let id = WindowId::from(slotmap::KeyData::from_ffi(key));
+        self.windows.contains_key(id).then_some(id)
+    }
+
     pub fn id_of(&self, surface: &WlSurface) -> Option<WindowId> {
         self.by_surface.get(surface).copied()
     }

Modified file: crates/planner/src/geom.rs+5 additions@@ -21,6 +21,11 @@ impl Rect {
         self.y + self.h
     }
 
+    /// Whether the point lies inside, counting the left and top edges only.
+    pub fn contains(&self, x: f64, y: f64) -> bool {
+        x >= self.x && y >= self.y && x < self.right() && y < self.bottom()
+    }
+
     pub fn center_x(&self) -> f64 {
         self.x + self.w / 2.0
     }

monolith

Commit b22c0511d5af

Commit `b22c0511d5af`