19033N/A/*
19033N/A * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
19033N/A *
19033N/A * Permission is hereby granted, free of charge, to any person obtaining a
19033N/A * copy of this software and associated documentation files (the "Software"),
19033N/A * to deal in the Software without restriction, including without limitation
19033N/A * the rights to use, copy, modify, merge, publish, distribute, sublicense,
19033N/A * and/or sell copies of the Software, and to permit persons to whom the
19033N/A * Software is furnished to do so, subject to the following conditions:
19033N/A *
19033N/A * The above copyright notice and this permission notice (including the next
19033N/A * paragraph) shall be included in all copies or substantial portions of the
19033N/A * Software.
19033N/A *
19033N/A * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19033N/A * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19033N/A * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
19033N/A * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19033N/A * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19033N/A * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
19033N/A * DEALINGS IN THE SOFTWARE.
19033N/A */
19033N/A
19033N/AAllow xset dpms settings to override .xscreensaver.
19033N/A---
19033N/A driver/timers.c | 3 +++
19033N/A driver/xscreensaver.c | 4 ++++
19033N/A 2 files changed, 7 insertions(+), 0 deletions(-)
19033N/A
19033N/Adiff --git xscreensaver-5.12/driver/timers.c xscreensaver-5.12/driver/timers.c
19033N/A--- xscreensaver-5.12/driver/timers.c
19033N/A+++ xscreensaver-5.12/driver/timers.c
19033N/A@@ -1513,6 +1513,8 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
19033N/A
19033N/A /* If the DPMS settings on the server have changed, change them back to
19033N/A what ~/.xscreensaver says they should be. */
19033N/A+ /* mali- No!! if someone uses xset then let the changes be picked by
19033N/A+ * xscreensaver...do not have to regulate everything from .xscreensaver.
19033N/A sync_server_dpms_settings (si->dpy,
19033N/A (p->dpms_enabled_p &&
19033N/A p->mode != DONT_BLANK),
19033N/A@@ -1520,6 +1522,7 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
19033N/A p->dpms_suspend / 1000,
19033N/A p->dpms_off / 1000,
19033N/A False);
19033N/A+ **/
19033N/A
19033N/A if (si->screen_blanked_p)
19033N/A {
19033N/Adiff --git xscreensaver-5.12/driver/xscreensaver.c xscreensaver-5.12/driver/xscreensaver.c
19033N/A--- xscreensaver-5.12/driver/xscreensaver.c
19033N/A+++ xscreensaver-5.12/driver/xscreensaver.c
19117N/A@@ -1551,6 +1551,10 @@ main (int argc, char **argv)
19033N/A init_sigchld ();
19033N/A
19033N/A disable_builtin_screensaver (si, True);
19033N/A+/*****
19033N/A+ mali- this may need to be taken out in future if it hinders user
19033N/A+ setting dpms values through xset.
19033N/A+ *****/
19033N/A sync_server_dpms_settings (si->dpy,
19033N/A (p->dpms_enabled_p &&
19033N/A p->mode != DONT_BLANK),
19033N/A