1 Allow xset dpms settings to override .xscreensaver.

     2 

     3 Upstream rejected:

     4 

     5 You can't have *two* places that specify the same preference.

     6 Therefore, xscreensaver should be the one and only place.

     7 

     8 

     9 ---

    10  driver/timers.c       |    3 +++

    11  driver/xscreensaver.c |    4 ++++

    12  2 files changed, 7 insertions(+), 0 deletions(-)

    13 

    14 diff --git a/driver/timers.c b/driver/timers.c

    15 --- a/driver/timers.c

    16 +++ b/driver/timers.c

    17 @@ -1549,6 +1549,8 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)

    18  

    19    /* If the DPMS settings on the server have changed, change them back to

    20       what ~/.xscreensaver says they should be. */

    21 +  /* mali- No!! if someone uses xset then let the changes be picked by

    22 +   * xscreensaver...do not have to regulate everything from .xscreensaver.

    23    sync_server_dpms_settings (si->dpy,

    24                               (p->dpms_enabled_p  &&

    25                                p->mode != DONT_BLANK),

    26 @@ -1556,6 +1558,7 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)

    27                               p->dpms_suspend / 1000,

    28                               p->dpms_off / 1000,

    29                               False);

    30 +  **/

    31  

    32    if (si->screen_blanked_p)

    33      {

    34 diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c

    35 --- a/driver/xscreensaver.c

    36 +++ b/driver/xscreensaver.c

    37 @@ -1587,6 +1587,10 @@ main (int argc, char **argv)

    38    init_sigchld ();

    39  

    40    disable_builtin_screensaver (si, True);

    41 +/*****

    42 +  mali- this may need to be taken out in future if it hinders user

    43 +  setting dpms values through xset.

    44 + *****/

    45    sync_server_dpms_settings (si->dpy,

    46                               (p->dpms_enabled_p  &&

    47                                p->mode != DONT_BLANK),

    48