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

wayland_common: add support for embedding

This commit is contained in:
Rostislav Pehlivanov 2017-10-05 16:17:05 +01:00
parent bee6ca5225
commit 8d8d4c5cb1
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/options.rst
View File

@ -2471,6 +2471,10 @@ Window
window fully. The value ``0`` is interpreted specially, and mpv will
draw directly on the root window.
On wayland, the ID is interpreted as ``struct zxdg_toplevel_v6 *``. Pass it
as value cast to ``intptr_t``. mpv will create its own window, and set the
wid toplevel as its parent.
On win32, the ID is interpreted as ``HWND``. Pass it as value cast to
``intptr_t``. mpv will create its own window, and set the wid window as
parent, like with X11.

4
video/out/wayland_common.c
View File

@ -879,6 +879,10 @@ static int create_surface(struct vo_wayland_state *wl)
wl->xdg_toplevel = zxdg_surface_v6_get_toplevel(wl->xdg_surface);
zxdg_toplevel_v6_add_listener(wl->xdg_toplevel, &xdg_toplevel_listener, wl);
if (wl->vo->opts->WinID >= 0)
wl->xdg_tl_parent = (struct zxdg_toplevel_v6 *)(intptr_t)wl->vo->opts->WinID;
zxdg_toplevel_v6_set_parent(wl->xdg_toplevel, wl->xdg_tl_parent);
zxdg_toplevel_v6_set_title (wl->xdg_toplevel, "mpv");
zxdg_toplevel_v6_set_app_id(wl->xdg_toplevel, "mpv");

1
video/out/wayland_common.h
View File

@ -75,6 +75,7 @@ struct vo_wayland_state {
struct wl_surface *surface;
struct zxdg_shell_v6 *shell;
struct zxdg_toplevel_v6 *xdg_toplevel;
struct zxdg_toplevel_v6 *xdg_tl_parent;
struct zxdg_surface_v6 *xdg_surface;
struct org_kde_kwin_server_decoration_manager *server_decoration_manager;
struct org_kde_kwin_server_decoration *server_decoration;