X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Ftimers.c;h=f2fdb24b9119205df6d5d850fcb0fbe52788b156;hb=3c58fb6311db49c46f1670922933b27c6ea0c065;hp=61a0155d097f26d2d73d1224d877ae2d1acc9e4b;hpb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1;p=xscreensaver

diff --git a/driver/timers.c b/driver/timers.c
index 61a0155d..f2fdb24b 100644
--- a/driver/timers.c
+++ b/driver/timers.c
@@ -230,8 +230,6 @@ cycle_timer (XtPointer closure, XtIntervalId *id)
   else
     {
       maybe_reload_init_file (si);
-      if (p->verbose_p)
-	fprintf (stderr, "%s: changing graphics hacks.\n", blurb());
       kill_screenhack (si);
 
       if (!si->throttled_p)
@@ -245,14 +243,25 @@ cycle_timer (XtPointer closure, XtIntervalId *id)
         }
     }
 
-  si->cycle_id = XtAppAddTimeOut (si->app, how_long, cycle_timer,
-				  (XtPointer) si);
+  if (how_long > 0)
+    {
+      si->cycle_id = XtAppAddTimeOut (si->app, how_long, cycle_timer,
+                                      (XtPointer) si);
 
-#ifdef DEBUG_TIMERS
-  if (p->verbose_p)
-    fprintf (stderr, "%s: starting cycle_timer (%ld, %ld)\n",
-	    blurb(), how_long, si->cycle_id);
-#endif /* DEBUG_TIMERS */
+# ifdef DEBUG_TIMERS
+      if (p->verbose_p)
+        fprintf (stderr, "%s: starting cycle_timer (%ld, %ld)\n",
+                 blurb(), how_long, si->cycle_id);
+# endif /* DEBUG_TIMERS */
+    }
+# ifdef DEBUG_TIMERS
+  else
+    {
+      if (p->verbose_p)
+        fprintf (stderr, "%s: not starting cycle_timer: how_long == %d\n",
+                 blurb(), how_long);
+    }
+# endif /* DEBUG_TIMERS */
 }
 
 
@@ -1073,9 +1082,18 @@ static void
 watchdog_timer (XtPointer closure, XtIntervalId *id)
 {
   saver_info *si = (saver_info *) closure;
+  saver_preferences *p = &si->prefs;
 
   disable_builtin_screensaver (si, False);
 
+  /* If the DPMS settings on the server have changed, change them back to
+     what ~/.xscreensaver says they should be. */
+  sync_server_dpms_settings (si->dpy, p->dpms_enabled_p,
+                             p->dpms_standby / 1000,
+                             p->dpms_suspend / 1000,
+                             p->dpms_off / 1000,
+                             False);
+
   if (si->screen_blanked_p)
     {
       Bool running_p = screenhack_running_p (si);
@@ -1099,11 +1117,12 @@ watchdog_timer (XtPointer closure, XtIntervalId *id)
           raise_window (si, True, True, running_p);
         }
 
-      if (!monitor_powered_on_p (si))
+      if (screenhack_running_p (si) &&
+          !monitor_powered_on_p (si))
 	{
 	  if (si->prefs.verbose_p)
 	    fprintf (stderr,
-		     "%s: server reports that monitor has powered down; "
+		     "%s: X says monitor has powered down; "
 		     "killing running hacks.\n", blurb());
 	  kill_screenhack (si);
 	}