# HG changeset patch # User reimar # Date 1315412158 0 # Node ID 6b9553934e5daea415a420a45fa48718deed072d # Parent e1a74e3ddee708a50aaefaeb82766986f117d9d9 Change stop_xscreensaver default to 1 to be more user-friendly. diff -r e1a74e3ddee7 -r 6b9553934e5d DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Wed Sep 07 15:46:58 2011 +0000 +++ b/DOCS/man/en/mplayer.1 Wed Sep 07 16:15:58 2011 +0000 @@ -3602,8 +3602,9 @@ 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 -r e1a74e3ddee7 -r 6b9553934e5d libvo/x11_common.c --- a/libvo/x11_common.c Wed Sep 07 15:46:58 2011 +0000 +++ b/libvo/x11_common.c Wed Sep 07 16:15:58 2011 +0000 @@ -89,7 +89,7 @@ static int orig_layer = 0; static int old_gravity = NorthWestGravity; -int stop_xscreensaver = 0; +int stop_xscreensaver = 1; static int dpms_disabled = 0;