From ebd5bbd241f2b88b99a84fb899d3802e7c9b989d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 16 May 2014 00:47:13 +0200
Subject: x11: replace--[x11-]fstype option with --x11-netwm

Simplifies the code a lot. You can still use --x11-netwm=no to disable
NetWM for whatever reasons.
---
 DOCS/man/en/changes.rst |  2 +-
 DOCS/man/en/options.rst | 50 ++++++++++++-------------------------------------
 2 files changed, 13 insertions(+), 39 deletions(-)

(limited to 'DOCS/man/en')

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 93e2c0bdac..3a649144d6 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -160,7 +160,7 @@ Command Line Switches
     ``-forcedsubsonly``         ``--sub-forced-only``
     ``-format``                 ``--audio-format``
     ``-fsmode-dontuse``         (removed)
-    ``-fstype``                 ``--x11-fstype``
+    ``-fstype``                 ``--x11-netwm`` (changed semantics)
     ``-hardframedrop``          ``--framedrop=hard``
     ``-identify``               (removed; use TOOLS/mpv_identify.sh)
     ``-lavdopts ...``           ``--vd-lavc-...``
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index ddeb82fd36..28e6bee880 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -889,44 +889,6 @@ OPTIONS
 
     See also ``--screen``.
 
-``--x11-fstype=<type1,type2,...>``
-    (X11 only)
-    Specify a priority list of fullscreen modes to be used. You can negate the
-    modes by prefixing them with '-'. If you experience problems like the
-    fullscreen window being covered by other windows, try using a different
-    order.
-
-    .. note::
-
-        See ``--x11-fstype=help`` for a full list of available modes.
-
-    The available types are:
-
-    above
-        Use the ``_NETWM_STATE_ABOVE`` hint if available.
-    below
-        Use the ``_NETWM_STATE_BELOW`` hint if available.
-    fullscreen
-        Use the ``_NETWM_STATE_FULLSCREEN`` hint if available.
-    layer
-        Use the ``_WIN_LAYER`` hint with the default layer.
-    layer=<0...15>
-        Use the ``_WIN_LAYER`` hint with the given layer number.
-    netwm
-        Force NETWM style.
-    none
-        Clear the list of modes; you can add modes to enable afterward.
-    stays_on_top
-        Use ``_NETWM_STATE_STAYS_ON_TOP`` hint if available.
-
-    .. admonition:: Examples
-
-        ``--x11-fstype=layer,stays_on_top,above,fullscreen``
-            Default order, will be used as a fallback if incorrect or
-            unsupported modes are specified.
-        ``--x11-fstype=fullscreen``
-            Fixes fullscreen switching on OpenBox 1.x.
-
 ``--fs-missioncontrol``
     (OS X only)
     Use OS X Mission Control's fullscreen feature instead of the custom one
@@ -2802,3 +2764,15 @@ OPTIONS
     fully, and will add black bars to compensate for the video aspect ratio.
 
     See also ``--slave-broken``.
+
+``--x11-netwm=no``
+    (X11 only)
+    Disable use of the NetWM protocol when switching to or from fullscreen.
+    This may or may not help with broken window managers. This provides some
+    functionality that was implemented by the now removed ``--fstype`` option.
+    Actually, it is not known to the developers to which degree this option
+    was needed, so feedback is welcome.
+
+    By default, NetWM support is autodetected, and using this option forces
+    autodetection to fail.
+
-- 
cgit v1.2.3