From 787c9fb94d041ff3ce039ef986be3d0d846407df Mon Sep 17 00:00:00 2001 From: Christopher Warner Date: Wed, 14 Oct 2026 14:39:53 -0400 Subject: fix: capture mpv --log-file and place window by geometry Stderr redirects left aerial_mpv_*.log empty; --log-file records output placement. Mutter logical geometry plus x11egl fallback avoids silent Wayland screen-0 fallback onto a closed lid panel. Co-authored-by: Cursor --- test_screensaver.py | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) (limited to 'test_screensaver.py') diff --git a/test_screensaver.py b/test_screensaver.py index 172b45a..b7ee5ac 100644 --- a/test_screensaver.py +++ b/test_screensaver.py @@ -192,6 +192,121 @@ class TestAerialScreensaver(unittest.TestCase): self.assertNotIn("--screen=0", joined) self.assertNotIn("--fs-screen=0", joined) + def test_xrandr_geometry_parses_listmonitors(self): + sample = ( + "Monitors: 2\n" + " 0: +*DP-1 6144/700x3456/390+0+0 DP-1\n" + " 1: +eDP-2 3840/340x2400/220+6144+1056 eDP-2\n" + ) + with patch( + "aerial_screensaver.subprocess.check_output", + return_value=sample, + ): + self.assertEqual( + aerial_screensaver.xrandr_geometry("DP-1"), + "6144x3456+0+0", + ) + self.assertEqual( + aerial_screensaver.xrandr_geometry("eDP-2"), + "3840x2400+6144+1056", + ) + self.assertIsNone(aerial_screensaver.xrandr_geometry("HDMI-1")) + + def test_mpv_log_path_sanitizes_connector(self): + app = aerial_screensaver.AerialScreensaver.__new__(aerial_screensaver.AerialScreensaver) + path = app._mpv_log_path("DP-1") + self.assertTrue(str(path).endswith("aerial_mpv_DP-1.log")) + path2 = app._mpv_log_path("HDMI-A/1") + self.assertNotIn("/", path2.name) + + def test_mpv_landed_on_target_wayland_enter(self): + app = aerial_screensaver.AerialScreensaver.__new__(aerial_screensaver.AerialScreensaver) + with tempfile.TemporaryDirectory() as tmp: + log = Path(tmp) / "mpv.log" + log.write_text( + "Surface entered output BNQ BenQ RD320UA (eDP-2) (0x31)\n" + "Surface entered output BNQ BenQ RD320UA (DP-1) (0x32)\n" + ) + self.assertTrue(app._mpv_landed_on_target("DP-1", log)) + self.assertFalse(app._mpv_landed_on_target("eDP-2", log)) + + def test_mpv_landed_rejects_fallback_for_external(self): + app = aerial_screensaver.AerialScreensaver.__new__(aerial_screensaver.AerialScreensaver) + with tempfile.TemporaryDirectory() as tmp: + log = Path(tmp) / "mpv.log" + log.write_text("Falling back to screen 0\nreconfig to 1920x1080\n") + self.assertFalse(app._mpv_landed_on_target("DP-1", log)) + self.assertTrue(app._mpv_landed_on_target("eDP-2", log)) + + def test_mpv_landed_empty_log_is_failure(self): + app = aerial_screensaver.AerialScreensaver.__new__(aerial_screensaver.AerialScreensaver) + with tempfile.TemporaryDirectory() as tmp: + log = Path(tmp) / "empty.log" + log.write_text("") + self.assertFalse(app._mpv_landed_on_target("DP-1", log)) + + def test_spawn_mpv_uses_log_file_and_geometry(self): + app = aerial_screensaver.AerialScreensaver.__new__(aerial_screensaver.AerialScreensaver) + app.vaapi_device = None + app.processes = [] + target = { + "index": 0, + "connector": "DP-1", + "primary": True, + "builtin": False, + "geometry": "3840x2160+0+0", + "xrandr_geometry": "6144x3456+0+0", + } + captured = {} + + def fake_popen(cmd, **kwargs): + captured["cmd"] = cmd + proc = MagicMock() + proc.pid = 12345 + proc.stdin = MagicMock() + return proc + + with patch("aerial_screensaver.subprocess.Popen", side_effect=fake_popen): + with patch.object(app, "_session_env", return_value={}): + app._spawn_mpv("a.mp4\n", target, "wayland", use_screen_name=True) + + joined = " ".join(captured["cmd"]) + self.assertIn("--log-file=", joined) + self.assertIn("--geometry=3840x2160+0+0", joined) + self.assertIn("--screen-name=DP-1", joined) + self.assertIn("--fs-screen-name=DP-1", joined) + self.assertNotIn("--screen=0", joined) + self.assertIn("aerial_mpv_DP-1.log", joined) + + def test_spawn_mpv_x11egl_prefers_xrandr_geometry(self): + app = aerial_screensaver.AerialScreensaver.__new__(aerial_screensaver.AerialScreensaver) + app.vaapi_device = None + target = { + "index": 0, + "connector": "DP-1", + "primary": True, + "builtin": False, + "geometry": "3840x2160+0+0", + "xrandr_geometry": "6144x3456+0+0", + } + captured = {} + + def fake_popen(cmd, **kwargs): + captured["cmd"] = cmd + proc = MagicMock() + proc.pid = 1 + proc.stdin = MagicMock() + return proc + + with patch("aerial_screensaver.subprocess.Popen", side_effect=fake_popen): + with patch.object(app, "_session_env", return_value={}): + app._spawn_mpv("a.mp4\n", target, "x11egl", use_screen_name=False) + + joined = " ".join(captured["cmd"]) + self.assertIn("--geometry=6144x3456+0+0", joined) + self.assertIn("--gpu-context=x11egl", joined) + self.assertNotIn("--screen-name=", joined) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3