summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-15 23:22:21 +0200
committerwm4 <wm4@nowhere>2014-09-15 23:22:21 +0200
commitcfdeb9d8ced819053eca80a49803506ca2891a05 (patch)
tree7d379241ac0ff61853d62857346a7a4bf6625bf7
parentb2b1b848da38f6576b2d711eaf86958976b52bde (diff)
downloadmpv-cfdeb9d8ced819053eca80a49803506ca2891a05.tar.bz2
mpv-cfdeb9d8ced819053eca80a49803506ca2891a05.tar.xz
input.conf: map ESC to exiting fullscreen
Apparently making ESC exit fullscreen mode is the more popular convention compared to ESC quitting the program. It was also concluded that ESC should do nothing when the windows is already in normal state. See discussion in #973.
-rw-r--r--DOCS/man/mpv.rst5
-rw-r--r--etc/input.conf2
2 files changed, 5 insertions, 2 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index b3f75dc930..59e8bf7d07 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -73,7 +73,7 @@ p / SPACE
Step backward. Pressing once will pause, every consecutive press will
play one frame in reverse and then go into pause mode again.
-q / ESC
+q
Stop playing and quit.
Q
@@ -98,6 +98,9 @@ m
f
Toggle fullscreen (see also ``--fs``).
+ESC
+ Exit fullscreen mode.
+
T
Toggle stay-on-top (see also ``--ontop``).
diff --git a/etc/input.conf b/etc/input.conf
index 97118e14e5..eac4d539c8 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -67,7 +67,7 @@
#q quit
#Q quit_watch_later
#q {encode} quit
-#ESC quit
+#ESC set fullscreen no
#ESC {encode} quit
#p cycle pause # toggle pause/playback mode
#. frame_step # advance one frame and pause