summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-02 21:21:53 +0200
committerwm4 <wm4@nowhere>2016-05-02 21:21:53 +0200
commit8a26e139af6e1534d63947d2ef0aed920248b051 (patch)
treebe1a9c3d49471b3b3497824eb6dea63a19ac4789 /options
parentf54e555d27ba4e2bf2209002a8f1582cd5837f33 (diff)
downloadmpv-8a26e139af6e1534d63947d2ef0aed920248b051.tar.bz2
mpv-8a26e139af6e1534d63947d2ef0aed920248b051.tar.xz
x11: extend --x11-bypass-compositor with fs-only option
The "fs-only" choice sets the _NET_WM_BYPASS_COMPOSITOR to 1 if the window is fullscreened, and 0 otherwise. (0 is specified to be the implicit default - i.e. no change is requested in windowed mode.) In particular, change the default to "fs-only". Fixes #2582.
Diffstat (limited to 'options')
-rw-r--r--options/options.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/options/options.c b/options/options.c
index 16725e0478..0487986f8f 100644
--- a/options/options.c
+++ b/options/options.c
@@ -460,7 +460,8 @@ const m_option_t mp_opts[] = {
#if HAVE_X11
OPT_CHOICE("x11-netwm", vo.x11_netwm, 0,
({"auto", 0}, {"no", -1}, {"yes", 1})),
- OPT_FLAG("x11-bypass-compositor", vo.x11_bypass_compositor, 0),
+ OPT_CHOICE("x11-bypass-compositor", vo.x11_bypass_compositor, 0,
+ ({"no", 0}, {"yes", 1}, {"fs-only", 2})),
#endif
#if HAVE_WIN32
OPT_STRING("vo-mmcss-profile", vo.mmcss_profile, M_OPT_FIXED),
@@ -712,7 +713,7 @@ const struct MPOpts mp_default_opts = {
.fit_border = 1,
.WinID = -1,
.window_scale = 1.0,
- .x11_bypass_compositor = 0,
+ .x11_bypass_compositor = 2,
.mmcss_profile = "Playback",
},
.allow_win_drag = 1,