diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | aerial_screensaver.py | 30 | ||||
| -rw-r--r-- | test_screensaver.py | 20 |
3 files changed, 44 insertions, 8 deletions
@@ -91,7 +91,7 @@ VAAPI_DEVICE=/dev/dri/renderD128 On hybrid GPUs, leave `VAAPI_DEVICE` on the **iGPU** (Intel on T480, AMD display-class on Framework). `install.sh` auto-detects. -**Clamshell / lid closed:** with `ALLOW_CLAMSHELL=1` (default), the screensaver still runs when the lid is closed **if an external display is active** (typical docked T480). In that mode it targets **only external monitors** (skips eDP), preferring the GNOME primary. Lid closed with no external display still skips/stops playback. +**Clamshell / lid closed:** with `ALLOW_CLAMSHELL=1` (default), the screensaver still runs when the lid is closed **if an external display is active** (typical docked T480). In that mode it targets **only external monitors** (skips eDP), preferring the GNOME primary, using mpv `--fs-screen-name=<connector>` (Mutter screen indexes do not match mpv’s Wayland output order). Lid closed with no external display still skips/stops playback. ## Sharing (LocalSend) diff --git a/aerial_screensaver.py b/aerial_screensaver.py index e1a0753..452f7e5 100755 --- a/aerial_screensaver.py +++ b/aerial_screensaver.py @@ -386,35 +386,45 @@ class AerialScreensaver: 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 - # Target by Mutter logical index (mpv --screen). When the lid is - # closed we only include external connectors, so we never put - # fullscreen video on a blank eDP panel that is still "screen 0". + # 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={screen}", - f"--fs-screen={screen}", + 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=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() self.processes.append(proc) logging.info( - "mpv started on %s (screen idx %s, primary=%s) with PID: %s", + "mpv started on connector %s (mutter idx %s, primary=%s) " + "via --fs-screen-name, PID %s, log %s", connector, screen, target["primary"], proc.pid, + mpv_log, ) threading.Thread(target=self.monitor_activity, daemon=True).start() except Exception as e: @@ -457,6 +467,12 @@ 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 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() |
