monolith

public

Star0

Fork 0

Watch0

330 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `eacaaa02eca5`

tarball

atagen <boss@atagen.co>2026-10-22 05:38 UTC

4 files changed+41-46

scene: mark an extended window with its own border colour

The double ring doubled the loudest signal in the scene, which already encodes focus, and its 3b width overflowed an 8px half-gap onto neighbours. A colour costs no geometry. Focused extended windows get a separate extended-focused colour, since the extended window is usually the focused one and focus alone would hide the cue.

Modified file: crates/config/default.toml+3 additions@@ -34,6 +34,9 @@ focused = "#88bfd1"
 unfocused = "#3b4252"
 # A window asking for attention that is not focused.
 urgent = "#ebcb8b"
+# A window extended over others in its container.
+extended = "#5e4b6e"
+extended-focused = "#b48ead"
 
 [output]
 # Variable refresh rate on outputs that support it, off, on, or fullscreen.

Modified file: crates/config/src/lib.rs+5 additions−1 deletions@@ -191,7 +191,7 @@ pub enum Vrr {
 }
 
 #[derive(Deserialize, Debug, Clone, PartialEq)]
-#[serde(default, deny_unknown_fields)]
+#[serde(default, deny_unknown_fields, rename_all = "kebab-case")]
 pub struct Decoration {
     /// Border width in logical pixels, drawn in the gap around each window.
     pub border: u32,
@@ -199,6 +199,8 @@ pub struct Decoration {
     pub focused: Color,
     pub unfocused: Color,
     pub urgent: Color,
+    pub extended: Color,
+    pub extended_focused: Color,
 }
 
 /// Corner radii in logical pixels, top left, top right, bottom right and
@@ -234,6 +236,8 @@ impl Default for Decoration {
             focused: Color::rgb(0x88, 0xbf, 0xd1),
             unfocused: Color::rgb(0x3b, 0x42, 0x52),
             urgent: Color::rgb(0xeb, 0xcb, 0x8b),
+            extended: Color::rgb(0x5e, 0x4b, 0x6e),
+            extended_focused: Color::rgb(0xb4, 0x8e, 0xad),
         }
     }
 }

Modified file: crates/monolith/src/scene.rs+31 additions−43 deletions@@ -185,32 +185,26 @@ pub fn build(
             clip_window(&mut out, first, clip);
         }
         if framed && deco.border > 0 {
+            let extended = layout.grouped(id);
             let color = if focused == Some(id) {
-                deco.focused.0
+                if extended {
+                    deco.extended_focused.0
+                } else {
+                    deco.focused.0
+                }
             } else if layout.window(id).is_some_and(|w| w.urgent) {
                 deco.urgent.0
+            } else if extended {
+                deco.extended.0
             } else {
                 deco.unfocused.0
             };
             let alpha = effect.map_or(1.0, |e| e.progress) * opacity;
-            let b = border_width(deco, scale);
-            let radius = deco.radius.0.into_iter().max().unwrap_or(0);
-            let radius = (f64::from(radius) * scale).round() as i32;
-            let rings = if layout.grouped(id) { 2 } else { 1 };
-            let Some((at, size)) = pixels(r, scale) else {
-                continue;
-            };
-            let window = Rectangle::new(at.into(), size.into());
-            for (k, borders) in state.borders.iter_mut().take(rings).enumerate() {
-                let by = 2 * b * k as i32;
-                let frame = outset_rect(window, by);
-                let reach = if radius > 0 { radius + by } else { 0 };
-                let reach = reach.min(frame.size.w / 2).min(frame.size.h / 2);
-                let first = out.len();
-                border_elements(&mut out, borders, frame, b, reach, color, alpha);
-                if let Some(clip) = clip {
-                    ring_borders(&mut out, first, outset(clip, by), b);
-                }
+            let borders = &mut state.borders;
+            let first = out.len();
+            border_elements(&mut out, borders, r, deco, color, alpha, scale);
+            if let Some(clip) = clip {
+                ring_borders(&mut out, first, clip, border_width(deco, scale));
             }
         }
     }
@@ -355,19 +349,24 @@ fn window_elements(
     );
 }
 
-/// Four strips `b` wide just outside `frame`, in the gap, so the client keeps
-/// its size. With rounded corners they `reach` in by the largest radius, to
-/// cover the band the ring curves through inside the frame's corners.
+/// Four strips just outside `r`, in the gap, so the client keeps its size.
+/// With rounded corners they reach in by the largest radius, to cover the
+/// band the ring curves through inside the window's corners.
 fn border_elements(
     out: &mut Vec<Draw>,
     borders: &mut Option<[SolidColorBuffer; 4]>,
-    frame: Rectangle<i32, Physical>,
-    b: i32,
-    reach: i32,
+    r: Rect,
+    deco: &Decoration,
     color: [f32; 4],
     alpha: f32,
+    scale: f64,
 ) {
-    let (x, y, w, h) = (frame.loc.x, frame.loc.y, frame.size.w, frame.size.h);
+    let Some(((x, y), (w, h))) = pixels(r, scale) else {
+        return;
+    };
+    let b = border_width(deco, scale);
+    let reach = (f64::from(deco.radius.0.into_iter().max().unwrap_or(0)) * scale).round() as i32;
+    let reach = reach.min(w / 2).min(h / 2);
     let strips = [
         ((x - b, y - b), (w + 2 * b, b + reach)),
         ((x - b, y + h - reach), (w + 2 * b, b + reach)),
@@ -670,31 +669,20 @@ fn clip_window(out: &mut [Draw], first: usize, clip: Clip) {
 /// Turns the border strips from `first` on into a ring around the window's
 /// rounded outline.
 fn ring_borders(out: &mut [Draw], first: usize, window: Clip, b: i32) {
+    let grow = |r: f32| if r > 0.0 { r + b as f32 } else { 0.0 };
     let ring = Clip {
+        rect: Rectangle::new(
+            window.rect.loc - Point::from((b, b)),
+            window.rect.size + Size::from((2 * b, 2 * b)),
+        ),
+        radii: window.radii.map(grow),
         ring: b as f32,
-        ..outset(window, b)
     };
     for draw in &mut out[first..] {
         wrap(draw, ring);
     }
 }
 
-fn outset(clip: Clip, by: i32) -> Clip {
-    let grow = |r: f32| if r > 0.0 { r + by as f32 } else { 0.0 };
-    Clip {
-        rect: outset_rect(clip.rect, by),
-        radii: clip.radii.map(grow),
-        ring: clip.ring,
-    }
-}
-
-fn outset_rect(r: Rectangle<i32, Physical>, by: i32) -> Rectangle<i32, Physical> {
-    Rectangle::new(
-        r.loc - Point::from((by, by)),
-        r.size + Size::from((2 * by, 2 * by)),
-    )
-}
-
 fn wrap(draw: &mut Draw, clip: Clip) {
     let inner = std::mem::replace(draw, Draw::Clipped(ClipElement::empty()));
     *draw = Draw::Clipped(ClipElement::new(inner, clip));

Modified file: crates/monolith/src/wm.rs+2 additions−2 deletions@@ -99,7 +99,7 @@ pub struct WindowState {
     /// A rule sent it somewhere, so activation tokens leave it alone.
     pub placed_by_rule: bool,
     pub list_handle: Option<ForeignToplevelHandle>,
-    pub borders: [Option<[SolidColorBuffer; 4]>; 2],
+    pub borders: Option<[SolidColorBuffer; 4]>,
     pub app_id: String,
     pub title: String,
     /// The title it mapped with, which `initial_title` rules match.
@@ -172,7 +172,7 @@ impl Wm {
                 reclassify: false,
                 placed_by_rule,
                 list_handle: None,
-                borders: [None, None],
+                borders: None,
                 app_id,
                 initial_title: title.clone(),
                 title,

monolith

Commit eacaaa02eca5

Commit `eacaaa02eca5`