From 81c076b2f8c8b0da0ebcf1c8aadf4c7dfb5e5d22 Mon Sep 17 00:00:00 2001
From: Martin Herkt <lachs0r@srsfckn.biz>
Date: Thu, 24 Apr 2014 18:36:40 +0200
Subject: options: remove obsolete --fsmode-dontuse

---
 DOCS/man/en/changes.rst |  1 +
 DOCS/man/en/options.rst |  4 ----
 options/options.c       |  3 ---
 options/options.h       |  1 -
 video/out/x11_common.c  | 10 ++--------
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index c11d9c02e2..36ea47b3ef 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -164,6 +164,7 @@ Command Line Switches
     ``-font``                   ``--osd-font``
     ``-forcedsubsonly``         ``--sub-forced-only``
     ``-format``                 ``--audio-format``
+    ``-fsmode-dontuse``         (removed)
     ``-fstype``                 ``--x11-fstype``
     ``-hardframedrop``          ``--framedrop=hard``
     ``-lavdopts ...``           ``--vd-lavc-...``
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 126cd601de..c9e514e457 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -889,10 +889,6 @@ OPTIONS
 
     See also ``--screen``.
 
-``--fsmode-dontuse=<0-31>``
-    *OBSOLETE*, use the ``--fs`` option.
-    Try this option if you still experience fullscreen problems.
-
 ``--x11-fstype=<type1,type2,...>``
     (X11 only)
     Specify a priority list of fullscreen modes to be used. You can negate the
diff --git a/options/options.c b/options/options.c
index 8c0268b170..dc3bce5f68 100644
--- a/options/options.c
+++ b/options/options.c
@@ -480,8 +480,6 @@ const m_option_t mp_opts[] = {
     // start in fullscreen mode:
     OPT_FLAG("fullscreen", vo.fullscreen, M_OPT_FIXED),
     OPT_FLAG("fs", vo.fullscreen, M_OPT_FIXED),
-    // set fullscreen switch method (workaround for buggy WMs)
-    OPT_INTRANGE("fsmode-dontuse", vo.fsmode, 0, 31, 4096),
     OPT_FLAG("native-keyrepeat", vo.native_keyrepeat, M_OPT_FIXED),
     OPT_FLOATRANGE("panscan", vo.panscan, 0, 0.0, 1.0),
     OPT_FLOATRANGE("video-zoom", vo.zoom, 0, -20.0, 20.0),
@@ -662,7 +660,6 @@ const struct MPOpts mp_default_opts = {
         .screen_id = -1,
         .fsscreen_id = -1,
         .enable_mouse_movements = 1,
-        .fsmode = 0,
         .panscan = 0.0f,
         .keepaspect = 1,
         .border = 1,
diff --git a/options/options.h b/options/options.h
index 4561af06b2..cd714a7c78 100644
--- a/options/options.h
+++ b/options/options.h
@@ -28,7 +28,6 @@ typedef struct mp_vo_opts {
     struct m_geometry autofit;
     struct m_geometry autofit_larger;
 
-    int fsmode;
     int keepaspect;
     int border;
 
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 537e1124f1..8ebe206606 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -633,11 +633,6 @@ static void vo_x11_decoration(struct vo *vo, int d)
     if (!vo->opts->WinID)
         return;
 
-    if (vo->opts->fsmode & 8) {
-        XSetTransientForHint(x11->display, x11->window,
-                             RootWindow(x11->display, x11->screen));
-    }
-
     vo_MotifHints = XInternAtom(x11->display, "_MOTIF_WM_HINTS", 0);
     if (vo_MotifHints != None) {
         if (!x11->got_motif_hints) {
@@ -664,13 +659,12 @@ static void vo_x11_decoration(struct vo *vo, int d)
             vo_MotifWmHints.functions = x11->oldfuncs;
             d = x11->olddecor;
         }
-        vo_MotifWmHints.decorations =
-            d | ((vo->opts->fsmode & 2) ? MWM_DECOR_MENU : 0);
+        vo_MotifWmHints.decorations = d;
         XChangeProperty(x11->display, x11->window, vo_MotifHints,
                         vo_MotifHints, 32,
                         PropModeReplace,
                         (unsigned char *) &vo_MotifWmHints,
-                        (vo->opts->fsmode & 4) ? 4 : 5);
+                        5);
     }
 }
 
-- 
cgit v1.2.3