[PATCH] xfree86: don't force the screensaver off on DPMS unblank, merely suggest it

[Egbert Eich]

On Thu, Jul 10, 2014 at 03:57:30PM +1000, Peter Hutterer wrote:
> Commit 41d4beb2616ceb3f1a1b8694733e85bae70de59a added symmetry to the
> screensaver/DPMS invocations so that one (en|dis)ables the other. Having
> dependencies between DPMS and the screensaver is subject to further arguments,
> but in this particular case using SCREENSAVER_FORCER is detrimental.
> SCREENSAVER_FORCER(ScreenSaverReset) resets the idle time for all
> devices on DPMS unblank.
> 
> It prevents at least one use-case that GNOME tries to implement:
> GNOME displays a notification before suspending. If the display is
> currently blanked, GNOME lights it up to display the message. With the
> original patch in place DPMS unblank also resets the device idle times, thus
> restarting the timeout ad infinitum.
> 
> Switch this to a more suggestive SCREENSAVER_OFF(ScreenSaverReset). This keeps
> the symmetry in blanking mode (DPMS and screensaver turn each other on/off as
> expected) but does not reset the idle time on the devices.
> 
> https://bugzilla.gnome.org/show_bug.cgi?id=731241
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

Sounds reasonable. Thanks for looking into this!

Reviewed-By: Egbert Eich <eich at freedesktop.org>