diff options
| author | mplayer-svn <svn@mplayerhq.hu> | 2011-09-07 16:15:58 +0000 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-03 01:26:33 +0200 |
| commit | c0c47c34747a1958af4eac0c7c167264fddfee4f (patch) | |
| tree | 7bc317b97c8f58e48bd2992a6aa4a26de5cdcb9d | |
| parent | 9c76680dfb927518932b9f817b5ff2c2c24c083e (diff) | |
| download | mpv-c0c47c34747a1958af4eac0c7c167264fddfee4f.tar.bz2 mpv-c0c47c34747a1958af4eac0c7c167264fddfee4f.tar.xz | |
x11: change stop_xscreensaver default to 1 to be more user-friendly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34076 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
| -rw-r--r-- | DOCS/man/en/mplayer-old.1 | 5 | ||||
| -rw-r--r-- | libvo/x11_common.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/DOCS/man/en/mplayer-old.1 b/DOCS/man/en/mplayer-old.1 index 51f3f938d5..477244cc58 100644 --- a/DOCS/man/en/mplayer-old.1 +++ b/DOCS/man/en/mplayer-old.1 @@ -3345,8 +3345,9 @@ Specify the screen width for video output drivers which do not know the screen resolution like fbdev, x11 and TV-out. . .TP -.B \-stop\-xscreensaver (X11 only) -Turns off xscreensaver at startup and turns it on again on exit. +.B \-(no)stop\-xscreensaver (X11 only) +Turns off xscreensaver at startup and turns it on again on exit +(default: enabled). If your screensaver supports neither the XSS nor XResetScreenSaver API please use \-heartbeat\-cmd instead. . diff --git a/libvo/x11_common.c b/libvo/x11_common.c index edf32792ee..9f580ba47a 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -85,7 +85,7 @@ int fs_layer = WIN_LAYER_ABOVE_DOCK; -int stop_xscreensaver = 0; +int stop_xscreensaver = 1; static int dpms_disabled = 0; |