From f1d3ba0e3318eb4b0ac5686fed4b80acb3753919 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 14 Jun 2013 00:24:41 +0200 Subject: x11: enable screensaver when paused, rename/change --stop-xscreensaver Use the recently introduced screensaver VOCTRLs to control the screensaver in the X11 backend. This means the behavior when paused changes: the old code always kept the screensaver disabled, but now the screensaver is reenabled on pausing. Rename the --stop-xscreensaver option to --stop-screensaver and make it more generic. Now it affects all backends that respond to the screensaver VOCTRLs. --- DOCS/man/en/changes.rst | 1 + DOCS/man/en/options.rst | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 49d27c9415..de3b24b710 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -127,6 +127,7 @@ Command line switches -a52drc level --ad-lavc-ac3drc=level -dumpstream --stream-dump= -capture --stream-capture= + -stop-xscreensaver --stop-screensaver =================================== =================================== *NOTE*: ``-opt val`` becomes ``--opt=val``. diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 61dbf7bd98..f8a999758e 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -781,7 +781,7 @@ ``-vo=null``). This can be "misused" to disable screensavers that do not support the - proper X API (see also ``--stop-xscreensaver``). If you think this is too + proper X API (see also ``--stop-screensaver``). If you think this is too complicated, ask the author of the screensaver program to support the proper X APIs. @@ -1973,11 +1973,13 @@ *NOTE*: without ``--hr-seek``, skipping will snap to keyframes. ---stop-xscreensaver - (X11 only) - Turns off xscreensaver at startup and turns it on again on exit. If your - screensaver supports neither the XSS nor XResetScreenSaver API please use - ``--heartbeat-cmd`` instead. +--stop-screensaver, --no-stop-screensaver + Turns off the screensaver (or screen blanker and similar mechanisms) at + startup and turns it on again on exit. (Default: yes) + + This is not supported on all video outputs or platforms. Sometimes it is + implemented, but doesn't work (happens often on GNOME). You might be able + to to work this around using ``--heartbeat-cmd`` instead. --sub= Use/display these subtitle files. Only one file can be displayed at the -- cgit v1.2.3