summaryrefslogtreecommitdiffstats
path: root/video/out/x11_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-04 15:03:02 +0200
committerwm4 <wm4@nowhere>2014-10-04 15:03:02 +0200
commit54fd93856a3b34c92d0dd9e8cc972b57a92d1a5e (patch)
tree3fccf15af634e3369df219aa158f51f9cd93406b /video/out/x11_common.c
parentf679c5de1bc27ac87179b6ef3869319aeba5e3f4 (diff)
downloadmpv-54fd93856a3b34c92d0dd9e8cc972b57a92d1a5e.tar.bz2
mpv-54fd93856a3b34c92d0dd9e8cc972b57a92d1a5e.tar.xz
x11: stupid workaround for XMonad
--x11-netwm=yes now forces NetWM fullscreen, while --x11-netwm=auto (detect whether NetWM fullsctreen support is available) is the old behavior and still the default. See #888.
Diffstat (limited to 'video/out/x11_common.c')
-rw-r--r--video/out/x11_common.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 140069e289..aed54f9010 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -308,7 +308,7 @@ static int vo_wm_detect(struct vo *vo)
&nitems);
if (args) {
MP_VERBOSE(x11, "Detected wm supports NetWM.\n");
- if (vo->opts->x11_netwm) {
+ if (vo->opts->x11_netwm >= 0) {
for (i = 0; i < nitems; i++)
wm |= net_wm_support_state_test(vo->x11, args[i]);
} else {
@@ -319,6 +319,10 @@ static int vo_wm_detect(struct vo *vo)
if (wm == 0)
MP_VERBOSE(x11, "Unknown wm type...\n");
+ if (vo->opts->x11_netwm > 0 && !(wm & vo_wm_FULLSCREEN)) {
+ MP_WARN(x11, "Forcing NetWM FULLSCREEN support.\n");
+ wm |= vo_wm_FULLSCREEN;
+ }
return wm;
}