/*

 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the

 * "Software"), to deal in the Software without restriction, including

 * without limitation the rights to use, copy, modify, merge, publish,

 * distribute, and/or sell copies of the Software, and to permit persons

 * to whom the Software is furnished to do so, provided that the above

 * copyright notice(s) and this permission notice appear in all copies of

 * the Software and that both the above copyright notice(s) and this

 * permission notice appear in supporting documentation.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

 * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

 * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

 * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

 * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

 * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 *

 * Except as contained in this notice, the name of a copyright holder

 * shall not be used in advertising or otherwise to promote the sale, use

 * or other dealings in this Software without prior written authorization

 * of the copyright holder.

 *

 */

Allow xset dpms settings to override .xscreensaver.

diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.11/driver/timers.c xscreensaver-5.11/driver/timers.c

--- xscreensaver-5.11/driver/timers.c	2009-05-27 17:19:00.463193000 -0700

+++ xscreensaver-5.11/driver/timers.c	2009-05-27 17:19:17.662370000 -0700

@@ -1499,6 +1499,8 @@ watchdog_timer (XtPointer closure, XtInt

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

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

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

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

   sync_server_dpms_settings (si->dpy,

                              (p->dpms_enabled_p  &&

                               p->mode != DONT_BLANK),

@@ -1506,6 +1508,7 @@ watchdog_timer (XtPointer closure, XtInt

                              p->dpms_suspend / 1000,

                              p->dpms_off / 1000,

                              False);

+  **/

   if (si->screen_blanked_p)

     {

diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.11/driver/xscreensaver.c xscreensaver-5.11/driver/xscreensaver.c

--- xscreensaver-5.11/driver/xscreensaver.c	2009-05-27 17:19:00.469448000 -0700

+++ xscreensaver-5.11/driver/xscreensaver.c	2009-05-27 17:19:17.663626000 -0700

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

   init_sigchld ();

   disable_builtin_screensaver (si, True);

+/*****

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

+  setting dpms values through xset.

+ *****/

   sync_server_dpms_settings (si->dpy,

                              (p->dpms_enabled_p  &&

                               p->mode != DONT_BLANK),