monolith

public

Star0

Fork 0

Watch0

216 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `fc167134b65d`

tarball

atagen <boss@atagen.co>2026-10-19 08:38 UTC

2 files changed+69-8

config: add a per-output scale and allow [output.nested]

Output settings had no way to ask for a scale, and the nested backend could not be configured at all because its name tripped the connector check. Scale is rounded to the 1/120 steps wp_fractional_scale_v1 can express.

Modified file: crates/config/default.toml+8 additions−3 deletions@@ -39,13 +39,18 @@ urgent = "#ebcb8b"
 # Variable refresh rate on outputs that support it, off, on, or fullscreen.
 vrr = "fullscreen"
 
-# Per connector. transform and position follow a reload, mode needs a replug.
-# transform is normal, 90, 180, 270, flipped, flipped-90, flipped-180 or
-# flipped-270. Outputs without a position line up left to right.
+# Per connector, or [output.nested] for the nested backend's window. transform,
+# position and scale follow a reload, mode needs a replug. transform is normal,
+# 90, 180, 270, flipped, flipped-90, flipped-180 or flipped-270. Outputs without
+# a position line up left to right. position is in logical pixels, the size of
+# the output divided by its scale. scale is 0.5 to 4.0 and fractional values
+# are rounded to the nearest 1/120. X11 clients are drawn at scale 1 and
+# stretched.
 # [output.DP-1]
 # transform = "90"
 # position = [2560, 0]
 # mode = "1920x1080@60"
+# scale = 1.5
 
 [animation]
 enabled = true

Modified file: crates/config/src/lib.rs+61 additions−5 deletions@@ -113,13 +113,14 @@ impl Default for Gaps {
 #[serde(default)]
 pub struct Outputs {
     pub vrr: Vrr,
-    /// Settings for one connector, by name, like `DP-1`.
+    /// Settings for one connector, by name, like `DP-1`, or `nested` for the
+    /// nested backend's window.
     #[serde(flatten)]
     pub named: std::collections::BTreeMap<String, OutputConfig>,
 }
 
-/// Transform and position follow a reload. A new mode waits for a restart
-/// or a replug, since it means a modeset.
+/// Transform, position and scale follow a reload. A new mode waits for a
+/// restart or a replug, since it means a modeset.
 #[derive(Deserialize, Debug, Clone, PartialEq, Default)]
 #[serde(default, deny_unknown_fields)]
 pub struct OutputConfig {
@@ -130,8 +131,34 @@ pub struct OutputConfig {
     /// `WIDTHxHEIGHT` or `WIDTHxHEIGHT@HZ`. Without a rate the highest one
     /// for that size wins.
     pub mode: Option<String>,
+    /// How many physical pixels make a logical one, `0.5` to `4.0` in steps of
+    /// 1/120. Positions are in logical pixels.
+    pub scale: Option<f64>,
 }
 
+impl OutputConfig {
+    pub fn scale(&self) -> f64 {
+        self.scale.unwrap_or(1.0)
+    }
+
+    fn validate(&mut self, name: &str, w: &mut Vec<String>) {
+        let Some(s) = self.scale else {
+            return;
+        };
+        if !(MIN_SCALE..=MAX_SCALE).contains(&s) {
+            w.push(format!(
+                "{name}.scale: {s} is outside {MIN_SCALE} to {MAX_SCALE}, ignored"
+            ));
+            self.scale = None;
+        } else {
+            self.scale = Some((s * 120.0).round() / 120.0);
+        }
+    }
+}
+
+const MIN_SCALE: f64 = 0.5;
+const MAX_SCALE: f64 = 4.0;
+
 /// Counterclockwise rotation, optionally after flipping horizontally.
 #[derive(Deserialize, Debug, Clone, Copy, PartialEq, Eq, Default)]
 #[serde(rename_all = "kebab-case")]
@@ -576,12 +603,19 @@ impl Config {
         let animation = section("animation", table.remove("animation"), w);
         let xwayland = section("xwayland", table.remove("xwayland"), w);
         let decoration = section("decoration", table.remove("decoration"), w);
-        let output: Outputs = section("output", table.remove("output"), w);
-        for name in output.named.keys().filter(|n| !connector_like(n)) {
+        let mut output: Outputs = section("output", table.remove("output"), w);
+        for name in output
+            .named
+            .keys()
+            .filter(|n| *n != "nested" && !connector_like(n))
+        {
             w.push(format!(
                 "output.{name}: not a connector name like DP-1 or HDMI-A-1, matches nothing"
             ));
         }
+        for (name, config) in &mut output.named {
+            config.validate(&format!("output.{name}"), w);
+        }
         let startup = items("startup", table.remove("startup"), w);
         let mut binds = Vec::new();
         if let Some(value) = table.remove("binds") {
@@ -876,6 +910,28 @@ mod tests {
     }
 
     #[test]
+    fn output_scale_is_snapped_and_range_checked() {
+        let loaded = Config::parse(
+            r#"
+            [output.DP-1]
+            scale = 1.5
+            [output.DP-2]
+            scale = 1.3333
+            [output.DP-3]
+            scale = 9.0
+            [output.nested]
+            scale = 2.0
+            "#,
+        )
+        .unwrap();
+        let named = &loaded.config.output.named;
+        assert_eq!(named["DP-1"].scale(), 1.5);
+        assert_eq!(named["DP-2"].scale(), 160.0 / 120.0);
+        assert_eq!(named["DP-3"].scale(), 1.0);
+        assert_eq!(loaded.warnings.len(), 1, "{:#?}", loaded.warnings);
+    }
+
+    #[test]
     fn a_bad_option_costs_only_itself() {
         let loaded = Config::parse(
             r##"

monolith

Commit fc167134b65d

Commit `fc167134b65d`