Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 213 insertions, 0 deletions

diff --git a/xorg-server/hw/dmx/dmxdpms.c b/xorg-server/hw/dmx/dmxdpms.c
new file mode 100644
index 000000000..2af160556
--- /dev/null
+++ b/xorg-server/hw/dmx/dmxdpms.c
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+ * Author:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * Provides DPMS support and unifies all DPMS and other screen-saver
+ * support in one file.  If -dpms is given on the command line, or the
+ * Xdmx server is not compiled with DPMS support, then the DPMS extension
+ * does not work for clients, but DPMS on the backends is still disables
+ * (and restored at Xdmx server shutdown time).
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxdpms.h"
+#include "dmxlog.h"
+#include "dmxsync.h"
+#ifdef DPMSExtension
+#include "dpmsproc.h"
+#endif
+#include "windowstr.h"          /* For screenIsSaved */
+#include <X11/extensions/dpms.h>
+
+static unsigned long dpmsGeneration = 0;
+static Bool          dpmsSupported  = TRUE;
+
+static void _dmxDPMSInit(DMXScreenInfo *dmxScreen)
+{
+    int        event_base, error_base;
+    int        major, minor;
+    CARD16     level, standby, suspend, off;
+    BOOL       state;
+    const char *monitor;
+
+    if (dpmsGeneration != serverGeneration) {
+        dpmsSupported  = TRUE;  /* On unless a backend doesn't support it */
+        dpmsGeneration = serverGeneration;
+    }
+
+#ifdef DPMSExtension
+    if (DPMSDisabledSwitch) dpmsSupported = FALSE; /* -dpms turns off */
+#endif
+
+    dmxScreen->dpmsCapable = 0;
+    
+    if (!dmxScreen->beDisplay) {
+        dmxLogOutput(dmxScreen,
+		     "Cannot determine if DPMS supported (detached screen)\n");
+        dpmsSupported = FALSE;
+        return;
+    }
+
+    if (!DPMSQueryExtension(dmxScreen->beDisplay,
+                            &event_base, &error_base)) {
+        dmxLogOutput(dmxScreen, "DPMS not supported\n");
+        dpmsSupported = FALSE;
+        return;
+    }
+    if (!DPMSGetVersion(dmxScreen->beDisplay, &major, &minor)) {
+        dmxLogOutput(dmxScreen, "DPMS not supported\n");
+        dpmsSupported = FALSE;
+        return;
+    }
+    if (!DPMSCapable(dmxScreen->beDisplay)) {
+        dmxLogOutput(dmxScreen, "DPMS %d.%d (not DPMS capable)\n",
+                     major, minor);
+        dpmsSupported = FALSE;
+        return;
+    }
+
+    DPMSInfo(dmxScreen->beDisplay, &level, &state);
+    DPMSGetTimeouts(dmxScreen->beDisplay, &standby, &suspend, &off);
+    DPMSSetTimeouts(dmxScreen->beDisplay, 0, 0, 0);
+    DPMSEnable(dmxScreen->beDisplay);
+    DPMSForceLevel(dmxScreen->beDisplay, DPMSModeOn);
+    dmxScreen->dpmsCapable = 1;
+    dmxScreen->dpmsEnabled = !!state;
+    dmxScreen->dpmsStandby = standby;
+    dmxScreen->dpmsSuspend = suspend;
+    dmxScreen->dpmsOff     = off;
+
+    switch (level) {
+    case DPMSModeOn:      monitor = "on";      break;
+    case DPMSModeStandby: monitor = "standby"; break;
+    case DPMSModeSuspend: monitor = "suspend"; break;
+    case DPMSModeOff:     monitor = "off";     break;
+    default:              monitor = "unknown"; break;
+    }
+        
+    dmxLogOutput(dmxScreen,
+                 "DPMS %d.%d (%s, %s, %d %d %d)\n",
+                 major, minor, monitor, state ? "enabled" : "disabled",
+                 standby, suspend, off);
+}
+
+/** Initialize DPMS support.  We save the current settings and turn off
+ * DPMS.  The settings are restored in #dmxDPMSTerm. */
+void dmxDPMSInit(DMXScreenInfo *dmxScreen)
+{
+    int    interval, preferBlanking, allowExposures;
+
+                                /* Turn off DPMS */
+    _dmxDPMSInit(dmxScreen);
+
+    if (!dmxScreen->beDisplay)
+	return;
+
+                                /* Turn off screen saver */
+    XGetScreenSaver(dmxScreen->beDisplay, &dmxScreen->savedTimeout, &interval,
+		    &preferBlanking, &allowExposures);
+    XSetScreenSaver(dmxScreen->beDisplay, 0, interval,
+		    preferBlanking, allowExposures);
+    XResetScreenSaver(dmxScreen->beDisplay);
+    dmxSync(dmxScreen, FALSE);
+}
+
+/** Terminate DPMS support on \a dmxScreen.  We restore the settings
+ * saved in #dmxDPMSInit. */
+void dmxDPMSTerm(DMXScreenInfo *dmxScreen)
+{
+    int    timeout, interval, preferBlanking, allowExposures;
+
+    if (!dmxScreen->beDisplay)
+	return;
+
+    XGetScreenSaver(dmxScreen->beDisplay, &timeout, &interval,
+		    &preferBlanking, &allowExposures);
+    XSetScreenSaver(dmxScreen->beDisplay, dmxScreen->savedTimeout, interval,
+		    preferBlanking, allowExposures);
+    if (dmxScreen->dpmsCapable) {
+                                /* Restore saved state */
+        DPMSForceLevel(dmxScreen->beDisplay, DPMSModeOn);
+        DPMSSetTimeouts(dmxScreen->beDisplay, dmxScreen->dpmsStandby,
+                        dmxScreen->dpmsSuspend, dmxScreen->dpmsOff);
+        if (dmxScreen->dpmsEnabled) DPMSEnable(dmxScreen->beDisplay);
+        else                        DPMSDisable(dmxScreen->beDisplay);
+    }
+    dmxSync(dmxScreen, FALSE);
+}
+
+/** Called when activity is detected so that DPMS power-saving mode can
+ * be deactivated. */
+void dmxDPMSWakeup(void)
+{
+    if (screenIsSaved == SCREEN_SAVER_ON)
+        dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
+#ifdef DPMSExtension
+    if (DPMSPowerLevel) DPMSSet(serverClient, 0);
+#endif
+}
+
+#ifdef DPMSExtension
+/** This is called on each server generation.  It should determine if
+ * DPMS is supported on all of the backends and, if so, return TRUE. */
+Bool DPMSSupported(void)
+{
+    return dpmsSupported;
+}
+
+/** This is used by clients (e.g., xset) to set the DPMS level. */
+int DPMSSet(ClientPtr client, int level)
+{
+    int i;
+
+    if (!dpmsSupported) return Success;
+
+    if (level < 0) level = DPMSModeOn;
+    if (level > 3) level = DPMSModeOff;
+    
+    DPMSPowerLevel = level;
+
+    for (i = 0; i < dmxNumScreens; i++) {
+        DMXScreenInfo *dmxScreen = &dmxScreens[i];
+	if (dmxScreen->beDisplay) {
+	    DPMSForceLevel(dmxScreen->beDisplay, level);
+	    dmxSync(dmxScreen, FALSE);
+	}
+    }
+    return Success;
+}
+#endif