Set the right Ozone platform on Linux

Forcing CEF to use the right Ozone platform allows to avoid having a dependency on XWayland (a X11 socket) under Wayland.
obsproject · Aug 25, 2024 · 8e2b31f · 8e2b31f
1 parent 98d94a4
commit 8e2b31f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/browser-app.cpp b/browser-app.cpp
@@ -96,6 +96,9 @@ void BrowserApp::OnBeforeCommandLineProcessing(
 					    "no-user-gesture-required");
 #ifdef __APPLE__
 	command_line->AppendSwitch("use-mock-keychain");
+#elif !defined(_WIN32)
+	command_line->AppendSwitchWithValue("ozone-platform",
+					    wayland ? "wayland" : "x11");
 #endif
 }
 

diff --git a/browser-app.hpp b/browser-app.hpp
@@ -77,10 +77,20 @@ class BrowserApp : public CefApp,
 	bool shared_texture_available;
 	CallbackMap callbackMap;
 	int callbackId;
+#if !defined(__APPLE__) && !defined(_WIN32)
+	bool wayland;
+#endif
 
 public:
+#if defined(__APPLE__) || defined(_WIN32)
 	inline BrowserApp(bool shared_texture_available_ = false)
 		: shared_texture_available(shared_texture_available_)
+#else
+	inline BrowserApp(bool shared_texture_available_ = false,
+			  bool wayland_ = false)
+		: shared_texture_available(shared_texture_available_),
+		  wayland(wayland_)
+#endif
 	{
 	}
 

diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp
@@ -46,6 +46,10 @@
 #include "signal-restore.hpp"
 #endif
 
+#ifdef ENABLE_WAYLAND
+#include <obs-nix-platform.h>
+#endif
+
 #ifdef ENABLE_BROWSER_QT_LOOP
 #include <QApplication>
 #include <QThread>
@@ -386,7 +390,13 @@ static void BrowserInit(void)
 	}
 #endif
 
+#if defined(__APPLE__) || defined(_WIN32) || !defined(ENABLE_WAYLAND)
 	app = new BrowserApp(tex_sharing_avail);
+#else
+	app = new BrowserApp(tex_sharing_avail,
+			     obs_get_nix_platform() ==
+				     OBS_NIX_PLATFORM_WAYLAND);
+#endif
 
 #ifdef _WIN32
 	CefExecuteProcess(args, app, nullptr);