From fa7c329dde86d08107f63b92b06be0d08a06b64d Mon Sep 17 00:00:00 2001
From: WilliamSolari <118758182+B077AS@users.noreply.github.com>
Date: Sun, 30 Aug 2026 19:50:59 +0200
Subject: [PATCH] feat: offer both screens and windows in the Wayland portal
 picker

Use DesktopCapturer::CreateGenericCapturer (CaptureType::kAnyScreenContent,
the same type Chromium uses for getDisplayMedia) when running under Wayland
with PipeWire, so the xdg-desktop-portal dialog shows both the monitor and
the application window tabs. Falls back to the type-specific capturers when
the generic capturer is unavailable (X11, Windows, macOS unchanged).
---
 .../media/video/VideoTrackDesktopSource.cpp   | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/webrtc-jni/src/main/cpp/src/media/video/VideoTrackDesktopSource.cpp b/webrtc-jni/src/main/cpp/src/media/video/VideoTrackDesktopSource.cpp
index 75a35f02..2f18b5b5 100644
--- a/webrtc-jni/src/main/cpp/src/media/video/VideoTrackDesktopSource.cpp
+++ b/webrtc-jni/src/main/cpp/src/media/video/VideoTrackDesktopSource.cpp
@@ -266,19 +266,28 @@ namespace jni
 		options.set_prefer_cursor_embedded(true);
 #endif
 
-		std::unique_ptr<webrtc::DesktopCapturer> capturer;
+		std::unique_ptr<webrtc::DesktopCapturer> inner;
 
-		if (sourceIsWindow) {
-			capturer.reset(new webrtc::DesktopAndCursorComposer(
-				webrtc::DesktopCapturer::CreateWindowCapturer(options),
-				options));
-		}
-		else {
-			capturer.reset(new webrtc::DesktopAndCursorComposer(
-				webrtc::DesktopCapturer::CreateScreenCapturer(options),
-				options));
+#if defined(WEBRTC_USE_PIPEWIRE)
+		// Wayland: request "any screen content" so the xdg-desktop-portal picker
+		// offers both monitors and application windows in a single dialog (the
+		// same CaptureType::kAnyScreenContent Chromium uses for getDisplayMedia).
+		// CreateGenericCapturer returns null when not running under Wayland or
+		// when PipeWire is disallowed, in which case we fall back to the
+		// type-specific capturers below. The portal handles the actual source
+		// selection, so sourceIsWindow is irrelevant on this path.
+		inner = webrtc::DesktopCapturer::CreateGenericCapturer(options);
+#endif
+
+		if (!inner) {
+			inner = sourceIsWindow
+				? webrtc::DesktopCapturer::CreateWindowCapturer(options)
+				: webrtc::DesktopCapturer::CreateScreenCapturer(options);
 		}
 
+		std::unique_ptr<webrtc::DesktopCapturer> capturer;
+		capturer.reset(new webrtc::DesktopAndCursorComposer(std::move(inner), options));
+
 		if (!capturer->SelectSource(sourceId)) {
 			terminate();
 			return;