Revert "command: make current-window-scale writeable"

This reverts commit 873ae0de2af3bb84a11e5e57f6e3a8942b2263c2.

The next commit will restore this functionality, with the
following differences from the reverted commit:
- Smaller and simpler code change.
- On bad scale: use "Invalid value" (compared to "no such property").
- Doesn't combine the docs for window-scale and current-window-scale.
- Doesn't remove the docs for window-scale behavior prior to 0.31.0.

2 files changed, 14 insertions, 9 deletions

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index ee84bc8f1c..b4927470fa 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -42,7 +42,6 @@ Interface changes
       instead be used to specifically set the contrast to any value.
     - add a `--watch-later-options` option to allow configuring which
       options quit-watch-later saves
-    - make `current-window-scale` writeable and use it in the default input.conf
  --- mpv 0.33.0 ---
     - add `--d3d11-exclusive-fs` flag to enable D3D11 exclusive fullscreen mode
       when the player enters fullscreen.
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 26735bf819..75841dba99 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -2518,20 +2518,26 @@ Property list
     enabled, or after precise seeking). Files with imprecise timestamps (such
     as Matroska) might lead to unstable results.
 
-``current-window-scale`` (RW)
+``window-scale`` (RW)
     Window size multiplier. Setting this will resize the video window to the
     values contained in ``dwidth`` and ``dheight`` multiplied with the value
     set with this property. Setting ``1`` will resize to original video size
     (or to be exact, the size the video filters output). ``2`` will set the
-    double size, ``0.5`` halves the size. When reading this property, this
-    returns the scale value calculated from the current window size.
+    double size, ``0.5`` halves the size.
 
-    The similarly named ``window-scale`` option behaves like a typical mpv
-    option. It does not pay attention to realtime window changes and only
-    updates if the user changes its value. In most cases, you probably want
-    to set ``current-window-scale`` directly.
+    See ``current-window-scale`` for the value derived from the actual window
+    size.
+
+    Since mpv 0.31.0, this always returns the previously set value (or the
+    default value), instead of the value implied by the actual window size.
+    Before mpv 0.31.0, this returned what ``current-window-scale`` returns now,
+    after the window was created.
 
-    ``current-window-scale`` is unavailable if no video is active.
+``current-window-scale``
+    The ``window-scale`` value calculated from the current window size. This
+    has the same value as ``window-scale`` if the window size was not changed
+    since setting the option, and the window size was not restricted in other
+    ways. The property is unavailable if no video is active.
 
 ``focused``
     Whether the window has focus. Might not be supported by all VOs.