From 54fd93856a3b34c92d0dd9e8cc972b57a92d1a5e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 4 Oct 2014 15:03:02 +0200
Subject: 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.
---
 options/options.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index bc016dfd14..1639719dfe 100644
--- a/options/options.c
+++ b/options/options.c
@@ -431,7 +431,8 @@ const m_option_t mp_opts[] = {
 
     OPT_INT64("wid", vo.WinID, CONF_GLOBAL),
 #if HAVE_X11
-    OPT_FLAG("x11-netwm", vo.x11_netwm, 0),
+    OPT_CHOICE("x11-netwm", vo.x11_netwm, 0,
+               ({"auto", 0}, {"no", -1}, {"yes", 1})),
 #endif
     OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0),
     OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0),
@@ -573,7 +574,6 @@ const struct MPOpts mp_default_opts = {
         .keepaspect = 1,
         .border = 1,
         .WinID = -1,
-        .x11_netwm = 1,
     },
     .allow_win_drag = 1,
     .wintitle = "mpv - ${media-title}",
-- 
cgit v1.2.3