diff options
| -rwxr-xr-x | aerial_screensaver.py | 258 | ||||
| -rw-r--r-- | test_screensaver.py | 115 |
2 files changed, 323 insertions, 50 deletions
diff --git a/aerial_screensaver.py b/aerial_screensaver.py index 452f7e5..42e1982 100755 --- a/aerial_screensaver.py +++ b/aerial_screensaver.py @@ -5,6 +5,7 @@ from __future__ import annotations import logging import os +import re import subprocess import sys import threading @@ -54,6 +55,28 @@ def _connector_is_builtin(connector: str) -> bool: return connector.startswith(BUILTIN_CONNECTOR_PREFIXES) +def xrandr_geometry(connector: str) -> str | None: + """Return mpv --geometry string (WxH+X+Y) for a connector via xrandr.""" + try: + out = subprocess.check_output( + ["xrandr", "--listmonitors"], + text=True, + stderr=subprocess.DEVNULL, + ) + except (FileNotFoundError, subprocess.CalledProcessError): + return None + # Example: 0: +*DP-1 6144/700x3456/390+0+0 DP-1 + pat = re.compile( + r"(\d+)/\d+x(\d+)/\d+\+(\d+)\+(\d+)\s+" + re.escape(connector) + r"\s*$" + ) + for line in out.splitlines(): + m = pat.search(line.strip()) + if m: + w, h, x, y = m.group(1), m.group(2), m.group(3), m.group(4) + return f"{w}x{h}+{x}+{y}" + return None + + def _pci_attrs_for_render(render: Path) -> tuple[str, str]: """Return (pci_class, vendor) hex strings for a render node.""" try: @@ -228,7 +251,20 @@ class AerialScreensaver: -1, None, ) - _serial, _monitors, logical_monitors, _props = reply.unpack() + _serial, monitors, logical_monitors, _props = reply.unpack() + # connector -> (width, height) of current mode + mode_size: dict[str, tuple[int, int]] = {} + for mon in monitors: + try: + connector = mon[0][0] + for mode in mon[1]: + props = mode[6] if len(mode) > 6 else {} + if isinstance(props, dict) and props.get("is-current"): + mode_size[connector] = (int(mode[1]), int(mode[2])) + break + except (IndexError, TypeError, ValueError): + continue + screens: list[dict] = [] for index, lm in enumerate(logical_monitors): # (x, y, scale, transform, primary, monitors, properties) @@ -236,12 +272,20 @@ class AerialScreensaver: connectors = [mon[0] for mon in lm[5]] connector = connectors[0] if connectors else f"screen-{index}" builtin = any(_connector_is_builtin(c) for c in connectors) + width, height = mode_size.get(connector, (1920, 1080)) + # Prefer Mutter logical coords (Wayland). xrandr uses physical + # pixels under fractional scaling and mis-places secondary outputs. + geom = f"{width}x{height}+{int(lm[0])}+{int(lm[1])}" + xrandr_geom = xrandr_geometry(connector) screens.append( { "index": index, "connector": connector, "primary": primary, "builtin": builtin, + "geometry": geom, + "xrandr_geometry": xrandr_geom, + "product": lm[5][0][2] if lm[5] else "", } ) return screens @@ -322,19 +366,32 @@ class AerialScreensaver: and ".partial." not in f.lower() ) - def _mpv_base_command(self) -> list[str]: + def _session_env(self) -> dict[str, str]: + env = os.environ.copy() + runtime = env.get("XDG_RUNTIME_DIR", f"/run/user/{os.getuid()}") + if not env.get("WAYLAND_DISPLAY"): + for name in ("wayland-0", "wayland-1"): + if Path(runtime, name).exists(): + env["WAYLAND_DISPLAY"] = name + break + if not env.get("DISPLAY"): + env["DISPLAY"] = ":0" + return env + + def _mpv_base_command(self, gpu_context: str = "wayland") -> list[str]: cmd = [ "nice", "-n", "19", "mpv", + "--force-window=immediate", "--fullscreen", "--no-stop-screensaver", "--loop-playlist=inf", "--shuffle", "--hwdec=vaapi", "--vo=gpu", - "--gpu-context=wayland", + f"--gpu-context={gpu_context}", "--gpu-api=opengl", "--scale=bilinear", "--cscale=bilinear", @@ -350,6 +407,7 @@ class AerialScreensaver: "--osd-level=0", "--cursor-autohide=always", "--no-audio", + "--msg-level=vo=v,cplayer=status,wayland=v,x11=v", "--playlist=-", ] if self.vaapi_device: @@ -359,6 +417,94 @@ class AerialScreensaver: def _any_running(self) -> bool: return any(p.poll() is None for p in self.processes) + def _mpv_log_path(self, connector: str) -> Path: + safe = re.sub(r"[^\w.-]+", "_", connector) + return Path.home() / f"aerial_mpv_{safe}.log" + + def _spawn_mpv( + self, + urls: str, + target: dict, + gpu_context: str, + use_screen_name: bool, + ) -> subprocess.Popen: + connector = target["connector"] + screen = int(target["index"]) + # x11egl prefers xrandr physical pixels; wayland wants Mutter logical. + if gpu_context == "x11egl" and target.get("xrandr_geometry"): + geometry = target["xrandr_geometry"] + else: + geometry = target.get("geometry") or "1920x1080+0+0" + ipc = f"{IPC_SOCKET_PREFIX}{screen}" + mpv_log = self._mpv_log_path(connector) + try: + os.unlink(ipc) + except FileNotFoundError: + pass + try: + mpv_log.unlink() + except FileNotFoundError: + pass + + cmd = self._mpv_base_command(gpu_context) + [ + f"--input-ipc-server={ipc}", + f"--log-file={mpv_log}", + f"--geometry={geometry}", + ] + # Never pass --screen/--fs-screen integers (Mutter order ≠ mpv wl_output). + if use_screen_name: + cmd += [ + f"--screen-name={connector}", + f"--fs-screen-name={connector}", + ] + + proc = subprocess.Popen( + cmd, + stdin=subprocess.PIPE, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + text=True, + env=self._session_env(), + ) + if proc.stdin: + proc.stdin.write(urls) + proc.stdin.close() + logging.info( + "mpv spawn connector=%s geometry=%s context=%s screen-name=%s PID=%s log=%s", + connector, + geometry, + gpu_context, + use_screen_name, + proc.pid, + mpv_log, + ) + return proc + + def _mpv_landed_on_target(self, connector: str, log_path: Path) -> bool: + """True when mpv log shows the window on the requested connector.""" + if not log_path.is_file() or log_path.stat().st_size == 0: + return False + text = log_path.read_text(encoding="utf-8", errors="replace") + # Wayland: "Surface entered output … (DP-1)" + if f"({connector})" in text and "Surface entered output" in text: + # Prefer the last enter event (can move between outputs during setup) + last_enter = "" + for line in text.splitlines(): + if "Surface entered output" in line and "(" in line: + last_enter = line + if last_enter and f"({connector})" in last_enter: + return True + if last_enter: + return False + # Explicit failure of --screen-name / --fs-screen-name + if "Falling back to screen 0" in text: + return _connector_is_builtin(connector) + # X11/XWayland: listed our display and completed a vo reconfig + if f"({connector})" in text and "reconfig to" in text: + return True + # Geometry-only spawn with no name: accept a living vo reconfig + return "reconfig to" in text and "Falling back to screen 0" not in text + def start_screensaver(self) -> None: if self._any_running(): return @@ -375,57 +521,75 @@ class AerialScreensaver: self.video_dir, len(targets), ", ".join( - f"{t['connector']}(idx={t['index']},primary={t['primary']})" + f"{t['connector']}(geom={t.get('geometry')},primary={t['primary']})" for t in targets ), ) urls = "\n".join(videos) - base = self._mpv_base_command() self.processes = [] for target in targets: - screen = int(target["index"]) connector = target["connector"] - ipc = f"{IPC_SOCKET_PREFIX}{screen}" - mpv_log = Path.home() / f"aerial_mpv_{connector.replace('/', '_')}.log" - try: - os.unlink(ipc) - except FileNotFoundError: - pass - # IMPORTANT: On GNOME Wayland, mpv's --screen index order is NOT - # Mutter's logical-monitor order (eDP is often mpv screen 0 while - # the external primary is Mutter index 0). Target by connector - # name and do NOT pass --screen/--fs-screen integers (those - # override --screen-name / --fs-screen-name). - cmd = base + [ - f"--input-ipc-server={ipc}", - f"--screen-name={connector}", - f"--fs-screen-name={connector}", - ] - log_fh = open(mpv_log, "w", encoding="utf-8") - proc = subprocess.Popen( - cmd, - stdin=subprocess.PIPE, - stdout=subprocess.DEVNULL, - stderr=log_fh, - text=True, - ) - # File handle kept open for mpv lifetime; close on stop. - if not hasattr(self, "_mpv_log_handles"): - self._mpv_log_handles = [] - self._mpv_log_handles.append(log_fh) - if proc.stdin: - proc.stdin.write(urls) - proc.stdin.close() + log_path = self._mpv_log_path(connector) + + # 1) Wayland + geometry + connector name + proc = self._spawn_mpv(urls, target, "wayland", use_screen_name=True) self.processes.append(proc) - logging.info( - "mpv started on connector %s (mutter idx %s, primary=%s) " - "via --fs-screen-name, PID %s, log %s", + time.sleep(1.2) + if proc.poll() is not None: + logging.error( + "mpv exited early on %s (code %s). See %s", + connector, + proc.returncode, + log_path, + ) + self.processes.remove(proc) + continue + if self._mpv_landed_on_target(connector, log_path): + logging.info("mpv confirmed on %s (wayland)", connector) + continue + + # 2) Retry with X11/XWayland + geometry only (reliable on GNOME) + logging.warning( + "wayland placement uncertain for %s; retrying via x11egl+geometry. Log: %s", connector, - screen, - target["primary"], - proc.pid, - mpv_log, + log_path, ) + proc.terminate() + try: + proc.wait(timeout=2) + except subprocess.TimeoutExpired: + proc.kill() + self.processes.remove(proc) + + proc = self._spawn_mpv(urls, target, "x11egl", use_screen_name=False) + self.processes.append(proc) + time.sleep(1.2) + if proc.poll() is not None: + logging.error( + "mpv x11egl exited early on %s (code %s). See %s", + connector, + proc.returncode, + log_path, + ) + self.processes.remove(proc) + continue + if self._mpv_landed_on_target(connector, log_path): + logging.info("mpv confirmed on %s (x11egl)", connector) + else: + # Dump a short hint into the main debug log + tail = "" + if log_path.is_file(): + lines = log_path.read_text(errors="replace").splitlines() + tail = "\n".join(lines[-30:]) + logging.error( + "mpv still not confirmed on %s; last log lines:\n%s", + connector, + tail, + ) + + if not self.processes: + logging.error("No mpv instances running after start attempts") + return threading.Thread(target=self.monitor_activity, daemon=True).start() except Exception as e: logging.error("Error starting mpv: %s", e) @@ -467,12 +631,6 @@ class AerialScreensaver: except subprocess.TimeoutExpired: proc.kill() self.processes = [] - for fh in getattr(self, "_mpv_log_handles", []): - try: - fh.close() - except Exception: - pass - self._mpv_log_handles = [] for i in range(8): try: os.unlink(f"{IPC_SOCKET_PREFIX}{i}") 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() |
