monolith

public

Star0

Fork 0

Watch0

126 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `ea84a35c5001`

tarball

atagen <boss@atagen.co>2026-10-18 02:53 UTC

4 files changed+71-6

monolith: apply output transform and position on reload

Neither needs a modeset, as DrmCompositor reads the transform from the Output every frame, so a restart or replug was never required for them. Outputs without a position are laid out again so a rotated one does not overlap its neighbours.

Modified file: crates/config/default.toml+3 additions−3 deletions@@ -34,9 +34,9 @@ unfocused = "#3b4252"
 # Variable refresh rate on outputs that support it, off, on, or fullscreen.
 vrr = "fullscreen"
 
-# Per connector, read when the output connects. 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. 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.
 # [output.DP-1]
 # transform = "90"
 # position = [2560, 0]

Modified file: crates/config/src/lib.rs+2 additions−2 deletions@@ -86,8 +86,8 @@ pub struct Outputs {
     pub named: std::collections::BTreeMap<String, OutputConfig>,
 }
 
-/// Applied when the output connects. Changing them needs a restart or a
-/// replug, since a new mode or rotation means a modeset.
+/// Transform and position 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 {

Modified file: crates/monolith/src/commands.rs+1

@@ -224,6 +224,7 @@ impl State {

224224 if keyboard_changed {

225225 self.reconfigure_keyboard();

226226 }

227+ crate::drm::reconfigure_outputs(self);

227228 tracing::info!("config reloaded");

228229 Ok(())

229230 }

Modified file: crates/monolith/src/drm.rs+65 additions−1 deletions@@ -34,7 +34,7 @@ use smithay::reexports::drm::Device as _;
 use smithay::reexports::drm::control::{self, ModeTypeFlags, connector, crtc};
 use smithay::reexports::input::Libinput;
 use smithay::reexports::rustix::fs::OFlags;
-use smithay::utils::{DeviceFd, Point, Transform};
+use smithay::utils::{DeviceFd, Logical, Point, Transform};
 use smithay::wayland::drm_syncobj::{DrmSyncobjState, supports_syncobj_eventfd};
 use smithay_drm_extras::drm_scanner::{DrmScanEvent, DrmScanner};
 use std::collections::HashMap;
@@ -438,6 +438,70 @@ fn transform(t: OutputTransform) -> Transform {
     }
 }
 
+/// Outputs without a configured position are laid out left to right in
+/// their current order, so one rotating pushes its neighbours along.
+pub fn reconfigure_outputs(state: &mut State) {
+    let State {
+        backend: Backend::Drm(drm),
+        wm: Wm { layout, space, .. },
+        settings,
+        ..
+    } = state
+    else {
+        return;
+    };
+    let mut surfaces: Vec<&mut Surface> = drm.surfaces.values_mut().collect();
+    surfaces.sort_by_key(|s| s.output.current_location().x);
+    let mut right = 0;
+    let mut changed = false;
+    for s in surfaces {
+        let config = settings
+            .config
+            .output
+            .named
+            .get(&s.output.name())
+            .cloned()
+            .unwrap_or_default();
+        let Some(mode) = s.output.current_mode() else {
+            continue;
+        };
+        let transform = transform(config.transform);
+        let size = transform.transform_size(mode.size);
+        let position: Point<i32, Logical> = match config.position {
+            Some([x, y]) => (x, y).into(),
+            None => (right, 0).into(),
+        };
+        right = right.max(position.x + size.w);
+        if s.output.current_transform() == transform && s.output.current_location() == position {
+            continue;
+        }
+        s.output
+            .change_current_state(None, Some(transform), None, Some(position));
+        space.map_output(&s.output, position);
+        let area = Rect::new(
+            f64::from(position.x),
+            f64::from(position.y),
+            f64::from(size.w),
+            f64::from(size.h),
+        );
+        layout.set_output_area(s.id, area);
+        s.redraw = true;
+        changed = true;
+        tracing::info!(
+            name = s.output.name(),
+            ?transform,
+            x = position.x,
+            y = position.y,
+            "output reconfigured"
+        );
+    }
+    if changed {
+        state.reserve_layers();
+        state.reconfigure_lock();
+        state.apply_layout();
+    }
+}
+
 fn disconnect(state: &mut State, crtc: crtc::Handle) {
     let Some(drm) = state.backend.drm_mut() else {
         return;

monolith

Commit ea84a35c5001

Commit `ea84a35c5001`