From 2c2c1704b542f29fe5ac9917e1141040a0dbd3e9 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu, 29 Apr 2004 23:59:15 +0000
Subject: [PATCH] Fix for
 http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 -     Xorg
 Xprt starts to consume 100% CPU when being idle for some time     (internal
 screensaver goes mad after 10mins)

---
 Xprint/Init.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Xprint/Init.c b/Xprint/Init.c
index d773ccf62..ce13d6534 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -303,6 +303,11 @@ void XprintInitGlobals(void)
      * ("Xfree86's "smart scheduler" breaks Xprt") */
     SmartScheduleDisable = TRUE;
 #endif /* SMART_SCHEDULE */
+
+    /* Disable internal screensaver for Xprint (workaround for
+     * http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 ("Xorg
+     * Xprt starts to consume 100% CPU when being idle for some time")) */
+    defaultScreenSaverTime = 0;
 }
 
 /*
@@ -1296,11 +1301,22 @@ PrinterInitOutput(
       FatalError("Internal error: XprintInitGlobals() not called.");
     }
 #ifdef SMART_SCHEDULE
+    /* |XprintInitGlobals| should have set |SmartScheduleDisable| to
+     * |TRUE| - if not we will trigger this safeguard. */
     if( SmartScheduleDisable != TRUE )
     {
       FatalError("Internal error: XF86 smart scheduler incompatible to Xprint DDX.");
     }
 #endif /* SMART_SCHEDULE */
+    /* Safeguard for
+     * http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 ("Xorg
+     * Xprt starts to consume 100% CPU when being idle for some time")
+     * |XprintInitGlobals| should have set |defaultScreenSaverTime| to
+     * |0| - if not we will trigger this trap. */
+    if( defaultScreenSaverTime != 0 )
+    {
+      FatalError("Internal screen saver must be OFF for printing.");
+    }
 
     /* 
      * this little test is just a warning at startup to make sure