summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DOCS/man/en/options.rst20
-rw-r--r--video/out/x11_common.c68
2 files changed, 44 insertions, 44 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 359a194480..2d685f0217 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -226,7 +226,7 @@
are applied after this option.
See ``--geometry`` for details how this is handled with multi-monitor
- setups, or if the ``--wid`` option is used.
+ setups.
Use ``--autofit-larger`` instead if you don't want the window to get larger.
Use ``--geometry`` if you want to force both window width and height to a
@@ -737,11 +737,11 @@
lower border" and "--20+-10" means "place 20 pixels beyond the right and
10 pixels beyond the top border".
- If an external window is specified using the ``--wid`` option,
- then the x and y coordinates are relative to the top-left corner of the
- window rather than the screen. The coordinates are relative to the screen
- given with ``--screen`` for the video output drivers that fully
- support ``--screen``.
+ If an external window is specified using the ``--wid`` option, this
+ option is ignored.
+
+ The coordinates are relative to the screen given with ``--screen`` for the
+ video output drivers that fully support ``--screen``.
*NOTE*: Generally only supported by GUI VOs. Ignored for encoding.
@@ -2343,4 +2343,10 @@
--wid=<ID>
(X11 and win32 only)
- This tells mpv to attach to an existing window.See ``--slave-broken``.
+ This tells mpv to attach to an existing window. The ID is interpreted as
+ "Window" on X11, and as HWND on win32. If a VO is selected that supports
+ this option, a new window will be created and the given window will be set
+ as parent. The window will always be resized to cover the parent window
+ fully, and will add black bars to compensate for the video aspect ratio.
+
+ See ``--slave-broken``.
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index b6ee15f95d..3424d75cef 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -638,17 +638,15 @@ void vo_x11_uninit(struct vo *vo)
XFreeGC(vo->x11->display, x11->vo_gc);
if (x11->window != None) {
XClearWindow(x11->display, x11->window);
- if (WinID < 0) {
- XEvent xev;
-
- XUnmapWindow(x11->display, x11->window);
- XSelectInput(x11->display, x11->window, StructureNotifyMask);
- XDestroyWindow(x11->display, x11->window);
- do {
- XNextEvent(x11->display, &xev);
- } while (xev.type != DestroyNotify ||
- xev.xdestroywindow.event != x11->window);
- }
+ XUnmapWindow(x11->display, x11->window);
+
+ XSelectInput(x11->display, x11->window, StructureNotifyMask);
+ XDestroyWindow(x11->display, x11->window);
+ XEvent xev;
+ do {
+ XNextEvent(x11->display, &xev);
+ } while (xev.type != DestroyNotify ||
+ xev.xdestroywindow.event != x11->window);
}
if (x11->xic)
XDestroyIC(x11->xic);
@@ -798,6 +796,11 @@ int vo_x11_check_events(struct vo *vo)
break;
}
}
+ if (WinID >= 0 && (ret & (VO_EVENT_MOVE | VO_EVENT_RESIZE))) {
+ int x = vo->dx, y = vo->dy;
+ unsigned int w = vo->dwidth, h = vo->dheight;
+ XMoveResizeWindow(x11->display, x11->window, x, y, w, h);
+ }
return ret;
}
@@ -960,13 +963,14 @@ static Window vo_x11_create_smooth_window(struct vo_x11_state *x11,
{
unsigned long xswamask;
XSetWindowAttributes xswa;
- Window ret_win;
setup_window_params(x11, vis, &xswamask, &xswa);
- ret_win =
- XCreateWindow(x11->display, x11->rootwin, x, y, width, height, 0,
- vis->depth, CopyFromParent, vis->visual, xswamask, &xswa);
+ Window parent = WinID >= 0 ? WinID : x11->rootwin;
+
+ Window ret_win =
+ XCreateWindow(x11->display, parent, x, y, width, height, 0, vis->depth,
+ CopyFromParent, vis->visual, xswamask, &xswa);
XSetWMProtocols(x11->display, ret_win, &x11->XAWM_DELETE_WINDOW, 1);
if (x11->f_gc == None)
x11->f_gc = XCreateGC(x11->display, ret_win, 0, 0);
@@ -991,33 +995,19 @@ void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
struct MPOpts *opts = vo->opts;
struct vo_x11_state *x11 = vo->x11;
Display *mDisplay = vo->x11->display;
- bool force_change_xy = opts->vo_geometry.xy_valid || opts->vo_screen_id >= 0;
+ bool force_change_xy = opts->vo_geometry.xy_valid ||
+ opts->vo_screen_id >= 0 ||
+ WinID >= 0;
XVisualInfo vinfo_storage;
if (!vis) {
vis = &vinfo_storage;
find_default_visual(x11, vis);
}
if (WinID >= 0) {
- unsigned long xswamask;
- XSetWindowAttributes xswa;
- vo_fs = flags & VOFLAG_FULLSCREEN;
- x11->window = WinID ? (Window)WinID : x11->rootwin;
- setup_window_params(x11, vis, &xswamask, &xswa);
- XChangeWindowAttributes(mDisplay, x11->window, xswamask, &xswa);
- if (WinID) {
- // Expose events can only really be handled by us, so request them.
- vo_x11_selectinput_witherr(mDisplay, x11->window, ExposureMask);
- } else {
- // Do not capture events since it might break the parent application
- // if it relies on events being forwarded to the parent of WinID.
- // It also is consistent with the w32_common.c code.
- vo_x11_selectinput_witherr(mDisplay, x11->window,
- StructureNotifyMask | KeyPressMask |
- ButtonPressMask | ButtonReleaseMask |
- PointerMotionMask | ExposureMask);
- }
+ XSelectInput(mDisplay, WinID, StructureNotifyMask);
vo_x11_update_geometry(vo, true);
- goto final;
+ x = vo->dx; y = vo->dy;
+ width = vo->dwidth; height = vo->dheight;
}
if (x11->window == None) {
vo_fs = 0;
@@ -1263,13 +1253,17 @@ static void vo_x11_update_geometry(struct vo *vo, bool update_pos)
unsigned w, h, dummy_uint;
int dummy_int;
Window dummy_win;
- XGetGeometry(x11->display, x11->window, &dummy_win, &dummy_int, &dummy_int,
+ Window win = WinID >= 0 ? WinID : x11->window;
+ XGetGeometry(x11->display, win, &dummy_win, &dummy_int, &dummy_int,
&w, &h, &dummy_int, &dummy_uint);
if (w <= INT_MAX && h <= INT_MAX) {
vo->dwidth = w;
vo->dheight = h;
}
- if (update_pos) {
+ if (WinID >= 0) {
+ vo->dx = 0;
+ vo->dy = 0;
+ } else if (update_pos) {
XTranslateCoordinates(x11->display, x11->window, x11->rootwin, 0, 0,
&vo->dx, &vo->dy, &dummy_win);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 00:55:10 +0000