summaryrefslogtreecommitdiffstats
path: root/DOCS/man/osc.rst
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:13:15 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:13:15 +0000
commitbff6c10f6909412899de6ab7c902f96080905550 (patch)
tree616d06233c652837e0d36657306ed0c157821a9a /DOCS/man/osc.rst
parentReleasing progress-linux version 0.37.0-1~progress7.99u1. (diff)
downloadmpv-bff6c10f6909412899de6ab7c902f96080905550.tar.xz
mpv-bff6c10f6909412899de6ab7c902f96080905550.zip
Merging upstream version 0.38.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'DOCS/man/osc.rst')
-rw-r--r--DOCS/man/osc.rst16
1 files changed, 15 insertions, 1 deletions
diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
index c791d75..9ed338a 100644
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@@ -211,6 +211,13 @@ Configurable Options
Alpha of the seekable ranges, 0 (opaque) to 255 (fully transparent).
+``scrollcontrols``
+ Default: yes
+
+ By default, going up or down with the mouse wheel can trigger certain
+ actions (such as seeking) if the mouse is hovering an OSC element.
+ Set to ``no`` to disable any special mouse wheel behavior.
+
``deadzonesize``
Default: 0.5
@@ -300,7 +307,7 @@ Configurable Options
String that supports property expansion that will be displayed as
OSC title.
- ASS tags are escaped, and newlines and trailing slashes are stripped.
+ ASS tags are escaped and newlines are converted to spaces.
``tooltipborder``
Default: 1
@@ -393,6 +400,13 @@ Configurable Options
Supports ``left`` and ``right`` which will place the controls on those
respective sides.
+``windowcontrols_title``
+ Default: ${media-title}
+
+ String that supports property expansion that will be displayed as the
+ windowcontrols title.
+ ASS tags are escaped, and newlines and trailing slashes are stripped.
+
``greenandgrumpy``
Default: no