console.lua,wayland_common: also detect Wayland if WAYLAND_SOCKET set

While most Wayland compositors provide a socket path indicated by environment variable WAYLAND_DISPLAY, others may sometimes bequeath a socket file descriptor specified by WAYLAND_SOCKET.
mpv-player · Nov 17, 2024 · 747019a · 747019a
1 parent e8fd7b8
commit 747019a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/player/lua/console.lua b/player/lua/console.lua
@@ -19,7 +19,7 @@ local function detect_platform()
     local platform = mp.get_property_native('platform')
     if platform == 'darwin' or platform == 'windows' then
         return platform
-    elseif os.getenv('WAYLAND_DISPLAY') then
+    elseif os.getenv('WAYLAND_DISPLAY') or os.getenv('WAYLAND_SOCKET') then
         return 'wayland'
     end
     return 'x11'

diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
@@ -3024,7 +3024,7 @@ bool vo_wayland_valid_format(struct vo_wayland_state *wl, uint32_t drm_format, u
 
 bool vo_wayland_init(struct vo *vo)
 {
-    if (!getenv("WAYLAND_DISPLAY"))
+    if (!getenv("WAYLAND_DISPLAY") && !getenv("WAYLAND_SOCKET"))
         goto err;
 
     vo->wl = talloc_zero(NULL, struct vo_wayland_state);