Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.12
diff -u -r1.12 ChangeLog
--- a/xc/ChangeLog	29 Apr 2004 23:00:06 -0000	1.12
+++ b/xc/ChangeLog	29 Apr 2004 23:54:15 -0000
@@ -1,4 +1,9 @@
 2004-04-30 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Xserver/Xprint/Init.c
+        BugZilla #558: Xorg Xprt starts to consume 100% CPU when being
+        idle for some time (internal screensaver goes mad after 10mins)
+
+2004-04-30 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/programs/glxgears/Imakefile
         * xc/programs/glxgears/glxgears.c
         BugZilla #558: Add print support to glxgears.
Index: xc/programs/Xserver/Xprint/Init.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/Init.c,v
retrieving revision 1.2
diff -u -r1.2 Init.c
--- a/xc/programs/Xserver/Xprint/Init.c	23 Apr 2004 18:57:32 -0000	1.2
+++ b/xc/programs/Xserver/Xprint/Init.c	29 Apr 2004 23:54:34 -0000
@@ -303,6 +303,11 @@
      * ("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 @@
       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