RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
M Stoeckl 2024-11-17 14:11:57 -05:00 committed by Dudemanguy
parent 998bdef1d0
commit 46574d479d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
player/lua/console.lua
View File

@ -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'

2
video/out/wayland_common.c
View File

@ -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);