summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2017-10-05 17:43:47 +0100
committerRostislav Pehlivanov <atomnuker@gmail.com>2017-10-05 17:43:47 +0100
commit9c806bc299b25210d96a8cc9b2acf3b08d2d7936 (patch)
treec428628e57270f9e8d56c7fe2646c1d1ffbdf5b2
parentda30f0ba2be3c326fdf728a83882f2a8f5eb54f9 (diff)
downloadmpv-9c806bc299b25210d96a8cc9b2acf3b08d2d7936.tar.bz2
mpv-9c806bc299b25210d96a8cc9b2acf3b08d2d7936.tar.xz
Revert "wayland_common: add support for embedding"
This reverts commit 8d8d4c5cb1b3553215a8ba547d4db463fdc88831.
-rw-r--r--DOCS/man/options.rst4
-rw-r--r--video/out/wayland_common.c5
-rw-r--r--video/out/wayland_common.h1
3 files changed, 0 insertions, 10 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index baf998d074..8b1bc8c3d8 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2471,10 +2471,6 @@ 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.
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 52fa40b744..83b1e82970 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -881,11 +881,6 @@ 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");
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h
index 0a6965b8ac..60d5924efa 100644
--- a/video/out/wayland_common.h
+++ b/video/out/wayland_common.h
@@ -75,7 +75,6 @@ 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;