From a4710d792a1b16698fc30b9e97e6c08c82129d6d Mon Sep 17 00:00:00 2001 From: srdusr <99972264+srdusr@users.noreply.github.com> Date: Wed, 29 Oct 2025 22:24:00 +0200 Subject: Fix set_monitor_split never actually reaching srd monitors Live-tested right after shipping it and caught immediately: srd dispatch set output split returned ok, but srd monitors kept reporting the whole, unsplit output. WindowManager::monitors is a passive cache, only refreshed when a backend re-queries and calls set_monitors again - the IPC handler mutated the split map directly but never triggered that requery, unlike set_output_position's own drain site, which already pushes a "just go recompute" event after applying. Makes it a proper queued cross-boundary request instead, the same shape as every other backend-owned effect on this socket: WindowManager:: request_monitor_split/drain_monitor_split_requests, dispatch queues instead of mutating, the udev backend's poll drains it, applies via set_monitor_split, and pushes the same recompute event. srd.monitor. split's Lua config-time path is untouched - it runs before the very first startup query, so it never had this problem. --- crates/core/src/manager/monitors.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'crates/core/src/manager/monitors.rs') diff --git a/crates/core/src/manager/monitors.rs b/crates/core/src/manager/monitors.rs index bff3bc9..c79f76f 100644 --- a/crates/core/src/manager/monitors.rs +++ b/crates/core/src/manager/monitors.rs @@ -233,6 +233,24 @@ impl WindowManager { self.monitor_splits.get(name).copied() } + /// Queues a live `srd dispatch set output split` request - see + /// `monitor_split_requests`' own doc comment for why this can't just + /// call `set_monitor_split` directly from the IPC dispatch handler. + /// Same "replace, don't accumulate" per-name semantics as `request_ + /// output_position`. + pub fn request_monitor_split(&mut self, name: String, parts: u32, rows: bool) { + self.monitor_split_requests.retain(|(existing, _, _)| *existing != name); + self.monitor_split_requests.push((name, parts, rows)); + } + + /// [`Self::drain_output_position_requests`]'s counterpart for split + /// requests - the backend applies each via `set_monitor_split` and + /// pushes its own "just go recompute" event afterward, same as that + /// function's own drain site. + pub fn drain_monitor_split_requests(&mut self) -> Vec<(String, u32, bool)> { + std::mem::take(&mut self.monitor_split_requests) + } + /// `srd.monitor.scale(name, factor)` - a backend applies this the /// next time it brings connector `name`'s head up (startup, hotplug, /// or re-enable). `factor <= 0.0` clears any existing override rather -- cgit v1.2.3