xserver: Branch 'master' - 8 commits
Adam Jackson
ajax at kemper.freedesktop.org
Fri Apr 3 15:22:56 PDT 2009
Xext/dpms.c | 42 +++++++----------------------------------
Xext/dpmsproc.h | 2 -
Xext/dpmsstubs.c | 5 ----
dix/globals.c | 19 ------------------
dix/main.c | 8 +++----
hw/kdrive/src/kdrive.c | 6 -----
hw/xfree86/common/xf86.h | 2 -
hw/xfree86/common/xf86Config.c | 6 ++---
hw/xfree86/common/xf86DPMS.c | 42 +++++++----------------------------------
include/globals.h | 19 ++++++------------
os/utils.c | 3 --
11 files changed, 32 insertions(+), 122 deletions(-)
New commits:
commit 6574ab092fb80b7731e06ede653b6af92fa7684e
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 18:03:43 2009 -0400
DPMS: Remove the defaultDPMS* variables
diff --git a/dix/globals.c b/dix/globals.c
index 0df3fbe..c24a94f 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -95,11 +95,7 @@ int ScreenSaverBlanking;
int ScreenSaverAllowExposures;
#ifdef DPMSExtension
-CARD32 defaultDPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME;
-CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
-CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
CARD16 DPMSPowerLevel = 0;
-Bool defaultDPMSEnabled = TRUE;
Bool DPMSDisabledSwitch = FALSE;
Bool DPMSCapableFlag = FALSE;
CARD32 DPMSStandbyTime;
diff --git a/dix/main.c b/dix/main.c
index 6a45332..e10f7e1 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -269,10 +269,10 @@ int main(int argc, char *argv[], char *envp[])
ScreenSaverBlanking = defaultScreenSaverBlanking;
ScreenSaverAllowExposures = defaultScreenSaverAllowExposures;
#ifdef DPMSExtension
- DPMSStandbyTime = defaultDPMSStandbyTime;
- DPMSSuspendTime = defaultDPMSSuspendTime;
- DPMSOffTime = defaultDPMSOffTime;
- DPMSEnabled = defaultDPMSEnabled;
+ DPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME;
+ DPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
+ DPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
+ DPMSEnabled = TRUE;
DPMSPowerLevel = 0;
#endif
InitBlockAndWakeupHandlers();
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index b9ab11a..9a25c7b 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -986,21 +986,21 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_STANDBYTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN))
- DPMSStandbyTime = defaultDPMSStandbyTime = i * MILLI_PER_MIN;
+ DPMSStandbyTime = i * MILLI_PER_MIN;
else if (i != -1)
xf86ConfigError("StandbyTime value %d outside legal range of 0 - %d minutes",
i, MAX_TIME_IN_MIN);
i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_SUSPENDTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN))
- DPMSSuspendTime = defaultDPMSSuspendTime = i * MILLI_PER_MIN;
+ DPMSSuspendTime = i * MILLI_PER_MIN;
else if (i != -1)
xf86ConfigError("SuspendTime value %d outside legal range of 0 - %d minutes",
i, MAX_TIME_IN_MIN);
i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN))
- DPMSOffTime = defaultDPMSOffTime = i * MILLI_PER_MIN;
+ DPMSOffTime = i * MILLI_PER_MIN;
else if (i != -1)
xf86ConfigError("OffTime value %d outside legal range of 0 - %d minutes",
i, MAX_TIME_IN_MIN);
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 46d105c..0f40e1b 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -83,7 +83,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
}
else {
enabled_from = X_DEFAULT;
- DPMSEnabled = defaultDPMSEnabled;
+ DPMSEnabled = TRUE;
}
if (DPMSEnabled)
xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");
diff --git a/include/globals.h b/include/globals.h
index 79c959a..a7ef48a 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -28,14 +28,10 @@ extern _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS];
extern _X_EXPORT char *ConnectionInfo;
#ifdef DPMSExtension
-extern CARD32 defaultDPMSStandbyTime;
-extern CARD32 defaultDPMSSuspendTime;
-extern CARD32 defaultDPMSOffTime;
extern CARD32 DPMSStandbyTime;
extern CARD32 DPMSSuspendTime;
extern CARD32 DPMSOffTime;
extern CARD16 DPMSPowerLevel;
-extern Bool defaultDPMSEnabled;
extern Bool DPMSEnabled;
extern Bool DPMSDisabledSwitch;
extern Bool DPMSCapableFlag;
commit c1cf36ee29e41901ecd382f0258110ebb4a0124e
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 17:51:55 2009 -0400
DPMS: Simplify command line parsing
diff --git a/dix/globals.c b/dix/globals.c
index aa15de9..0df3fbe 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -100,8 +100,7 @@ CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
CARD16 DPMSPowerLevel = 0;
Bool defaultDPMSEnabled = TRUE;
-Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */
-Bool DPMSDisabledSwitch = FALSE; /* line switch states */
+Bool DPMSDisabledSwitch = FALSE;
Bool DPMSCapableFlag = FALSE;
CARD32 DPMSStandbyTime;
CARD32 DPMSSuspendTime;
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 1687f2c..46d105c 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -64,8 +64,6 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
DPMSKey = &DPMSKeyIndex;
- if (DPMSDisabledSwitch)
- DPMSEnabled = FALSE;
if (!dixSetPrivate(&pScreen->devPrivates, DPMSKey,
xcalloc(sizeof(DPMSRec), 1)))
return FALSE;
@@ -74,9 +72,9 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
pScrn->DPMSSet = set;
pDPMS->Flags = flags;
DPMSOpt = xf86FindOption(pScrn->options, "dpms");
- if (DPMSEnabledSwitch || DPMSDisabledSwitch) {
+ if (DPMSDisabledSwitch) {
enabled_from = X_CMDLINE;
- DPMSEnabled = !DPMSDisabledSwitch && DPMSEnabledSwitch;
+ DPMSEnabled = FALSE;
}
else if (DPMSOpt) {
enabled_from = X_CONFIG;
diff --git a/include/globals.h b/include/globals.h
index 90cfa71..79c959a 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -37,7 +37,6 @@ extern CARD32 DPMSOffTime;
extern CARD16 DPMSPowerLevel;
extern Bool defaultDPMSEnabled;
extern Bool DPMSEnabled;
-extern Bool DPMSEnabledSwitch;
extern Bool DPMSDisabledSwitch;
extern Bool DPMSCapableFlag;
#endif
diff --git a/os/utils.c b/os/utils.c
index 56095b1..d05c437 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -487,7 +487,6 @@ void UseMsg(void)
ErrorF("-core generate core dump on fatal error\n");
ErrorF("-dpi int screen resolution in dots per inch\n");
#ifdef DPMSExtension
- ErrorF("dpms enables VESA DPMS monitor control\n");
ErrorF("-dpms disables VESA DPMS monitor control\n");
#endif
ErrorF("-deferglyphs [none|all|16] defer loading of [no|all|16-bit] glyphs\n");
@@ -673,7 +672,7 @@ ProcessCommandLine(int argc, char *argv[])
}
#ifdef DPMSExtension
else if ( strcmp( argv[i], "dpms") == 0)
- DPMSEnabledSwitch = TRUE;
+ /* ignored for compatibility */ ;
else if ( strcmp( argv[i], "-dpms") == 0)
DPMSDisabledSwitch = TRUE;
#endif
commit 2d0a4fff7985f58c21023cc4757090ee67067593
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 13:44:37 2009 -0400
DPMS: Remove unused DPMSGet()
diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index d57f573..c1df56f 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -1,4 +1,3 @@
-
/* Prototypes for functions that the DDX must provide */
#ifdef HAVE_DIX_CONFIG_H
@@ -11,7 +10,6 @@
#include "dixstruct.h"
int DPMSSet(ClientPtr client, int level);
-int DPMSGet(int *plevel);
Bool DPMSSupported(void);
#endif
diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index 0f59d51..f0f54d2 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -39,11 +39,6 @@ Bool DPMSSupported(void)
return FALSE;
}
-int DPMSGet(int *plevel)
-{
- return -1;
-}
-
int DPMSSet(ClientPtr client, int level)
{
return Success;
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 162a3db..76355e8 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1371,12 +1371,6 @@ DPMSSet(ClientPtr client, int level)
{
}
-int
-DPMSGet (int *level)
-{
- return -1;
-}
-
Bool
DPMSSupported (void)
{
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index eb0ef43..0c0320f 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
@@ -175,7 +174,6 @@ extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VR
extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags);
#ifdef DPMSExtension
-extern _X_EXPORT int DPMSGet(int *level);
extern _X_EXPORT int DPMSSet(ClientPtr client, int level);
extern _X_EXPORT Bool DPMSSupported(void);
#endif
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 03a6d0c..1687f2c 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -198,25 +198,4 @@ DPMSSupported(void)
return FALSE;
}
-
-/*
- * DPMSGet --
- * Device dependent DPMS mode getting hook. This returns the current
- * DPMS mode, or -1 if DPMS is not supported.
- *
- * This should hook in to the appropriate driver-level function, which
- * will be added to the ScrnInfoRec.
- *
- * NOTES:
- * 1. the calling interface should be changed to specify which
- * screen to check.
- * 2. It isn't clear that this function is ever used or what it should
- * return.
- */
-int
-DPMSGet(int *level)
-{
- return DPMSPowerLevel;
-}
-
#endif /* DPMSExtension */
commit d52fddefaeb43f15b677eefbea4a288a9948373b
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 13:33:03 2009 -0400
DPMS: Align the default timeouts with the default screensaver timeout.
On a typical LCD, a black screensaver is actually worse for power
consumption than a normal screen, because it takes more energy to turn
the crystals opaque. Also, the intermediate DPMS states are essentially
useless and most monitors alias them to the 'off' state, so we may as
well do the same.
As a pleasant side effect, this brings the default DPMS timeouts in line
with the EnergyStar Program Requirements for Computers:
http://www.energystar.gov/index.cfm?c=revisions.computer_spec
which state that products must be "shipped with the display's Sleep mode
set to activate within 15 minutes of user inactivity".
diff --git a/dix/globals.c b/dix/globals.c
index 805621a..aa15de9 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -95,9 +95,9 @@ int ScreenSaverBlanking;
int ScreenSaverAllowExposures;
#ifdef DPMSExtension
-CARD32 defaultDPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME * 2;
-CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME * 3;
-CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME * 4;
+CARD32 defaultDPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME;
+CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
+CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
CARD16 DPMSPowerLevel = 0;
Bool defaultDPMSEnabled = TRUE;
Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */
commit 38576dc3ae8ddec2baedd2f7e64abdfc56bedf93
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 11:55:41 2009 -0400
DPMS: Simplify some macro silliness.
diff --git a/dix/globals.c b/dix/globals.c
index 2585798..805621a 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -95,25 +95,13 @@ int ScreenSaverBlanking;
int ScreenSaverAllowExposures;
#ifdef DPMSExtension
-# ifndef DEFAULT_STANDBY_TIME
-# define DEFAULT_STANDBY_TIME DEFAULT_SCREEN_SAVER_TIME * 2
-# endif
-# ifndef DEFAULT_SUSPEND_TIME
-# define DEFAULT_SUSPEND_TIME DEFAULT_SCREEN_SAVER_TIME * 3
-# endif
-# ifndef DEFAULT_OFF_TIME
-# define DEFAULT_OFF_TIME DEFAULT_SCREEN_SAVER_TIME * 4
-# endif
-# ifndef DEFAULT_DPMS_ENABLED
-# define DEFAULT_DPMS_ENABLED TRUE
-# endif
-CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME;
-CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME;
-CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME;
+CARD32 defaultDPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME * 2;
+CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME * 3;
+CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME * 4;
CARD16 DPMSPowerLevel = 0;
-Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED;
+Bool defaultDPMSEnabled = TRUE;
Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */
-Bool DPMSDisabledSwitch = FALSE; /* lind switch states */
+Bool DPMSDisabledSwitch = FALSE; /* line switch states */
Bool DPMSCapableFlag = FALSE;
CARD32 DPMSStandbyTime;
CARD32 DPMSSuspendTime;
commit 1c01127a214731a21c4784249a429c74f17bd424
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 11:39:18 2009 -0400
DPMS: Unexport all the various setup variables.
The drivers don't need to know any of this.
diff --git a/include/globals.h b/include/globals.h
index 5ac3905..90cfa71 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -28,18 +28,18 @@ extern _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS];
extern _X_EXPORT char *ConnectionInfo;
#ifdef DPMSExtension
-extern _X_EXPORT CARD32 defaultDPMSStandbyTime;
-extern _X_EXPORT CARD32 defaultDPMSSuspendTime;
-extern _X_EXPORT CARD32 defaultDPMSOffTime;
-extern _X_EXPORT CARD32 DPMSStandbyTime;
-extern _X_EXPORT CARD32 DPMSSuspendTime;
-extern _X_EXPORT CARD32 DPMSOffTime;
-extern _X_EXPORT CARD16 DPMSPowerLevel;
-extern _X_EXPORT Bool defaultDPMSEnabled;
-extern _X_EXPORT Bool DPMSEnabled;
-extern _X_EXPORT Bool DPMSEnabledSwitch;
-extern _X_EXPORT Bool DPMSDisabledSwitch;
-extern _X_EXPORT Bool DPMSCapableFlag;
+extern CARD32 defaultDPMSStandbyTime;
+extern CARD32 defaultDPMSSuspendTime;
+extern CARD32 defaultDPMSOffTime;
+extern CARD32 DPMSStandbyTime;
+extern CARD32 DPMSSuspendTime;
+extern CARD32 DPMSOffTime;
+extern CARD16 DPMSPowerLevel;
+extern Bool defaultDPMSEnabled;
+extern Bool DPMSEnabled;
+extern Bool DPMSEnabledSwitch;
+extern Bool DPMSDisabledSwitch;
+extern Bool DPMSCapableFlag;
#endif
#ifdef PANORAMIX
commit a99b0ab918998c9a1b9f8692591b8cb59a12eb9e
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 11:32:00 2009 -0400
DPMS: Fix cast abuse
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 85be603..03a6d0c 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
@@ -71,7 +70,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
xcalloc(sizeof(DPMSRec), 1)))
return FALSE;
- pDPMS = (DPMSPtr)dixLookupPrivate(&pScreen->devPrivates, DPMSKey);
+ pDPMS = dixLookupPrivate(&pScreen->devPrivates, DPMSKey);
pScrn->DPMSSet = set;
pDPMS->Flags = flags;
DPMSOpt = xf86FindOption(pScrn->options, "dpms");
@@ -112,7 +111,7 @@ DPMSClose(int i, ScreenPtr pScreen)
if (DPMSKey == NULL)
return FALSE;
- pDPMS = (DPMSPtr)dixLookupPrivate(&pScreen->devPrivates, DPMSKey);
+ pDPMS = dixLookupPrivate(&pScreen->devPrivates, DPMSKey);
/* This shouldn't happen */
if (!pDPMS)
@@ -130,7 +129,7 @@ DPMSClose(int i, ScreenPtr pScreen)
xf86Screens[i]->DPMSSet(xf86Screens[i],DPMSModeOn,0);
}
- xfree((pointer)pDPMS);
+ xfree(pDPMS);
dixSetPrivate(&pScreen->devPrivates, DPMSKey, NULL);
if (--DPMSCount == 0)
DPMSKey = NULL;
@@ -164,8 +163,7 @@ DPMSSet(ClientPtr client, int level)
/* For each screen, set the DPMS level */
for (i = 0; i < xf86NumScreens; i++) {
pScrn = xf86Screens[i];
- pDPMS = (DPMSPtr)dixLookupPrivate(&screenInfo.screens[i]->devPrivates,
- DPMSKey);
+ pDPMS = dixLookupPrivate(&screenInfo.screens[i]->devPrivates, DPMSKey);
if (pDPMS && pScrn->DPMSSet && pDPMS->Enabled && pScrn->vtSema) {
xf86EnableAccess(pScrn);
pScrn->DPMSSet(pScrn, level, 0);
@@ -193,8 +191,7 @@ DPMSSupported(void)
/* For each screen, check if DPMS is supported */
for (i = 0; i < xf86NumScreens; i++) {
pScrn = xf86Screens[i];
- pDPMS = (DPMSPtr)dixLookupPrivate(&screenInfo.screens[i]->devPrivates,
- DPMSKey);
+ pDPMS = dixLookupPrivate(&screenInfo.screens[i]->devPrivates, DPMSKey);
if (pDPMS && pScrn->DPMSSet)
return TRUE;
}
commit 4da347adb1fcc39e8f4fb2cadd98e887d7ac877a
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 3 11:18:21 2009 -0400
DPMS: Code motion.
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 672cf17..8464f9e 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -26,13 +26,6 @@ Equipment Corporation.
******************************************************************/
-/*
- * HISTORY
- *
- * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00
- */
-
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -50,33 +43,6 @@ Equipment Corporation.
#include "dpmsproc.h"
#include "modinit.h"
-static DISPATCH_PROC(ProcDPMSDispatch);
-static DISPATCH_PROC(SProcDPMSDispatch);
-static DISPATCH_PROC(ProcDPMSGetVersion);
-static DISPATCH_PROC(SProcDPMSGetVersion);
-static DISPATCH_PROC(ProcDPMSGetTimeouts);
-static DISPATCH_PROC(SProcDPMSGetTimeouts);
-static DISPATCH_PROC(ProcDPMSSetTimeouts);
-static DISPATCH_PROC(SProcDPMSSetTimeouts);
-static DISPATCH_PROC(ProcDPMSEnable);
-static DISPATCH_PROC(SProcDPMSEnable);
-static DISPATCH_PROC(ProcDPMSDisable);
-static DISPATCH_PROC(SProcDPMSDisable);
-static DISPATCH_PROC(ProcDPMSForceLevel);
-static DISPATCH_PROC(SProcDPMSForceLevel);
-static DISPATCH_PROC(ProcDPMSInfo);
-static DISPATCH_PROC(SProcDPMSInfo);
-static DISPATCH_PROC(ProcDPMSCapable);
-static DISPATCH_PROC(SProcDPMSCapable);
-
-void
-DPMSExtensionInit(INITARGS)
-{
- AddExtension(DPMSExtensionName, 0, 0,
- ProcDPMSDispatch, SProcDPMSDispatch,
- NULL, StandardMinorOpcode);
-}
-
static int
ProcDPMSGetVersion(ClientPtr client)
{
@@ -414,3 +380,11 @@ SProcDPMSDispatch (ClientPtr client)
return BadRequest;
}
}
+
+void
+DPMSExtensionInit(INITARGS)
+{
+ AddExtension(DPMSExtensionName, 0, 0,
+ ProcDPMSDispatch, SProcDPMSDispatch,
+ NULL, StandardMinorOpcode);
+}
More information about the xorg-commit
mailing list