summaryrefslogtreecommitdiff
path: root/aerial_screensaver.py
diff options
context:
space:
mode:
Diffstat (limited to 'aerial_screensaver.py')
-rwxr-xr-xaerial_screensaver.py30
1 files changed, 23 insertions, 7 deletions
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}")