From 086cec6e0a0f51c64837e7c499c64289a9f7dc38 Mon Sep 17 00:00:00 2001 From: Christopher Warner Date: Wed, 14 Oct 2026 14:29:48 -0400 Subject: fix: target mpv outputs by connector name on Wayland Mutter logical-monitor indexes do not match mpv's Wayland wl_output order (eDP is often mpv screen 0). Use --screen-name/--fs-screen-name with the DRM connector and keep stderr logs for each instance. Co-authored-by: Cursor --- test_screensaver.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'test_screensaver.py') diff --git a/test_screensaver.py b/test_screensaver.py index 98f661e..172b45a 100644 --- a/test_screensaver.py +++ b/test_screensaver.py @@ -172,6 +172,26 @@ class TestAerialScreensaver(unittest.TestCase): self.assertEqual(targets[0]["connector"], "DP-1") self.assertEqual([t["connector"] for t in targets], ["DP-1", "HDMI-1"]) + def test_mpv_command_uses_screen_name_not_index(self): + """Regression: Mutter idx must not be passed as mpv --screen on Wayland.""" + app = aerial_screensaver.AerialScreensaver.__new__(aerial_screensaver.AerialScreensaver) + app.vaapi_device = None + app.processes = [] + app.video_dir = Path("/tmp") + base = app._mpv_base_command() + # Simulate the argv we build for a connector target + connector = "DP-1" + cmd = base + [ + "--input-ipc-server=/tmp/mpv_aerial_0", + f"--screen-name={connector}", + f"--fs-screen-name={connector}", + ] + joined = " ".join(cmd) + self.assertIn("--screen-name=DP-1", joined) + self.assertIn("--fs-screen-name=DP-1", joined) + self.assertNotIn("--screen=0", joined) + self.assertNotIn("--fs-screen=0", joined) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3