path: root/
diff options
authorwm4 <wm4@nowhere>2014-05-06 20:22:32 +0200
committerwm4 <wm4@nowhere>2014-05-06 20:22:32 +0200
commitfeb1f8f18fc2bf1de81ea43d7b57e318c1bf4e69 (patch)
tree65498de7e44716f35d79bedec935e5eb79fd69c5 /
parent587f42b56c7cba07fadbb3b73032cdd186f76f5f (diff)
video/out: separate out code to compute window size
Currently, vo_reconfig() calculates the requested window size and sets the vo->dwidth/dheight fields _if_ VOCTRL_UPDATE_SCREENINFO is implemented by the VO or the windowing backend. The window size can be different from the display size if e.g. the --geometry option is used. It will also set the vo->dx/dy fields and read vo->xinerama_x/y. It turned out that this is very backwards and actually requires the windowing backends to workaround these things. There's also MPOpts.screenwidth/screenheight, which used to map to actual options, but is now used only to communicate the screen size to the vo.c code calculating the window size and position. Change this by making the window geometry calculations available as separate functions. This commit doesn't change any VO code yet, and just emulates the old way using the new functions. VO code will remove its usage of VOCTRL_UPDATE_SCREENINFO and use the new functions directly.
Diffstat (limited to '')
1 files changed, 1 insertions, 0 deletions
diff --git a/ b/
index 82a0b12344..c8058b6fe6 100644
--- a/
+++ b/
@@ -360,6 +360,7 @@ def build(ctx):
( "video/out/vo_xv.c", "xv" ),
( "video/out/w32_common.c", "gdi" ),
( "video/out/wayland_common.c", "wayland" ),
+ ( "video/out/win_state.c"),
( "video/out/x11_common.c", "x11" ),
## osdep