Use D-Bus portal detection instead of WAYLAND_DISPLAY env var (#206)

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>

Author: bquenin

pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     # Linux only - window capture (X11 fallback)
     "python-xlib>=0.33; sys_platform == 'linux'",
     # Linux only - window capture (Wayland via PipeWire portal)
-    "pipewire-capture>=0.2.6; sys_platform == 'linux'",
+    "pipewire-capture>=0.2.8; sys_platform == 'linux'",
     # GPU acceleration (CUDA 12) - Windows and Linux
     "nvidia-cublas-cu12; sys_platform == 'win32' or sys_platform == 'linux'",
     "nvidia-cudnn-cu12; sys_platform == 'win32' or sys_platform == 'linux'",

src/interpreter/capture/__init__.py

@@ -71,6 +71,7 @@ def stop(self) -> None:
     )
 
     CaptureStream = MacOSCaptureStream
+    _is_wayland_session = False
 
     def is_window_foreground(window_id: int) -> bool:
         # TODO: Implement for macOS if needed
@@ -88,9 +89,12 @@ def is_window_foreground(window_id: int) -> bool:
     )
 
     CaptureStream = WindowsCaptureStream
+    _is_wayland_session = False
 elif _system == "Linux":
-    # Detect session type: Wayland or X11
-    _is_wayland_session = bool(os.environ.get("WAYLAND_DISPLAY"))
+    # Detect session type: check if PipeWire portal is available (works on gamescope/Steam Deck)
+    from pipewire_capture import is_available as _pipewire_available
+
+    _is_wayland_session = _pipewire_available()
 
     if _is_wayland_session:
         # Wayland session: use pipewire-capture

src/interpreter/gui/app.py

@@ -138,7 +138,9 @@ def run():
     log.configure(level="DEBUG" if args.debug else "INFO")
 
     # Configure pipewire-capture logging on Wayland (must be after log.configure)
-    if platform.system() == "Linux" and os.environ.get("WAYLAND_DISPLAY"):
+    from ..capture import _is_wayland_session
+
+    if _is_wayland_session:
         from ..capture.linux_wayland import configure_logging as configure_wayland_logging
 
         configure_wayland_logging(args.debug)

src/interpreter/gui/main_window.py

@@ -24,7 +24,7 @@
 )
 
 from .. import log
-from ..capture import Capture, WindowCapture
+from ..capture import Capture, WindowCapture, _is_wayland_session
 from ..capture.convert import bgra_to_rgb_pil
 from ..config import Config, OverlayMode
 from ..overlay import BannerOverlay, InplaceOverlay
@@ -69,8 +69,8 @@ def __init__(self, config: Config):
         self._mode = config.overlay_mode
         self._windows_list: list[dict] = []
         self._paused = False
-        # Detect session type: Wayland or X11-only
-        self._is_wayland_session = bool(os.environ.get("WAYLAND_DISPLAY"))
+        # Wayland session detection (from capture module, uses D-Bus portal check)
+        self._is_wayland_session = _is_wayland_session
         self._wayland_portal = None  # WaylandPortalCapture instance (for managing portal session lifecycle)
         self._wayland_selecting = False  # Guard against re-entry during portal flow
         self._fixing_ocr = False  # Track if we're re-downloading OCR model
@@ -257,7 +257,7 @@ def _setup_ui(self):
         overlay_layout.addWidget(self._mode_hotkey)
 
         # Wayland limitation warning (only shown on Wayland)
-        if os.environ.get("WAYLAND_DISPLAY"):
+        if self._is_wayland_session:
             wayland_warning = QLabel("<a href='#' style='color: #ffa500;'>⚠️ Wayland limitations</a>")
             wayland_warning.setToolTip("Click for details about inplace mode on Wayland")
             wayland_warning.linkActivated.connect(self._show_wayland_warning)