frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DPMS: Remove the defaultDPMS* variables

This commit is contained in:
Adam Jackson 2009-04-03 18:03:43 -04:00
parent c1cf36ee29
commit 6574ab092f
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/globals.c
View File

@ -95,11 +95,7 @@ int ScreenSaverBlanking;
int ScreenSaverAllowExposures; int ScreenSaverAllowExposures;
#ifdef DPMSExtension #ifdef DPMSExtension
CARD32 defaultDPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME;
CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
CARD16 DPMSPowerLevel = 0; CARD16 DPMSPowerLevel = 0;
Bool defaultDPMSEnabled = TRUE;
Bool DPMSDisabledSwitch = FALSE; Bool DPMSDisabledSwitch = FALSE;
Bool DPMSCapableFlag = FALSE; Bool DPMSCapableFlag = FALSE;
CARD32 DPMSStandbyTime; CARD32 DPMSStandbyTime;

8
dix/main.c
View File

@ -269,10 +269,10 @@ int main(int argc, char *argv[], char *envp[])
ScreenSaverBlanking = defaultScreenSaverBlanking; ScreenSaverBlanking = defaultScreenSaverBlanking;
ScreenSaverAllowExposures = defaultScreenSaverAllowExposures; ScreenSaverAllowExposures = defaultScreenSaverAllowExposures;
#ifdef DPMSExtension #ifdef DPMSExtension
DPMSStandbyTime = defaultDPMSStandbyTime; DPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME;
DPMSSuspendTime = defaultDPMSSuspendTime; DPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME;
DPMSOffTime = defaultDPMSOffTime; DPMSOffTime = DEFAULT_SCREEN_SAVER_TIME;
DPMSEnabled = defaultDPMSEnabled; DPMSEnabled = TRUE;
DPMSPowerLevel = 0; DPMSPowerLevel = 0;
#endif #endif
InitBlockAndWakeupHandlers(); InitBlockAndWakeupHandlers();

6
hw/xfree86/common/xf86Config.c
View File

@ -986,21 +986,21 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
i = -1; i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_STANDBYTIME, &i); xf86GetOptValInteger(FlagOptions, FLAG_DPMS_STANDBYTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN)) if ((i >= 0) && (i < MAX_TIME_IN_MIN))
DPMSStandbyTime = defaultDPMSStandbyTime = i * MILLI_PER_MIN; DPMSStandbyTime = i * MILLI_PER_MIN;
else if (i != -1) else if (i != -1)
xf86ConfigError("StandbyTime value %d outside legal range of 0 - %d minutes", xf86ConfigError("StandbyTime value %d outside legal range of 0 - %d minutes",
i, MAX_TIME_IN_MIN); i, MAX_TIME_IN_MIN);
i = -1; i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_SUSPENDTIME, &i); xf86GetOptValInteger(FlagOptions, FLAG_DPMS_SUSPENDTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN)) if ((i >= 0) && (i < MAX_TIME_IN_MIN))
DPMSSuspendTime = defaultDPMSSuspendTime = i * MILLI_PER_MIN; DPMSSuspendTime = i * MILLI_PER_MIN;
else if (i != -1) else if (i != -1)
xf86ConfigError("SuspendTime value %d outside legal range of 0 - %d minutes", xf86ConfigError("SuspendTime value %d outside legal range of 0 - %d minutes",
i, MAX_TIME_IN_MIN); i, MAX_TIME_IN_MIN);
i = -1; i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i); xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN)) if ((i >= 0) && (i < MAX_TIME_IN_MIN))
DPMSOffTime = defaultDPMSOffTime = i * MILLI_PER_MIN; DPMSOffTime = i * MILLI_PER_MIN;
else if (i != -1) else if (i != -1)
xf86ConfigError("OffTime value %d outside legal range of 0 - %d minutes", xf86ConfigError("OffTime value %d outside legal range of 0 - %d minutes",
i, MAX_TIME_IN_MIN); i, MAX_TIME_IN_MIN);

2
hw/xfree86/common/xf86DPMS.c
View File

@ -83,7 +83,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
} }
else { else {
enabled_from = X_DEFAULT; enabled_from = X_DEFAULT;
DPMSEnabled = defaultDPMSEnabled; DPMSEnabled = TRUE;
} }
if (DPMSEnabled) if (DPMSEnabled)
xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n"); xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");

4
include/globals.h
View File

@ -28,14 +28,10 @@ extern _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS];
extern _X_EXPORT char *ConnectionInfo; extern _X_EXPORT char *ConnectionInfo;
#ifdef DPMSExtension #ifdef DPMSExtension
extern CARD32 defaultDPMSStandbyTime;
extern CARD32 defaultDPMSSuspendTime;
extern CARD32 defaultDPMSOffTime;
extern CARD32 DPMSStandbyTime; extern CARD32 DPMSStandbyTime;
extern CARD32 DPMSSuspendTime; extern CARD32 DPMSSuspendTime;
extern CARD32 DPMSOffTime; extern CARD32 DPMSOffTime;
extern CARD16 DPMSPowerLevel; extern CARD16 DPMSPowerLevel;
extern Bool defaultDPMSEnabled;
extern Bool DPMSEnabled; extern Bool DPMSEnabled;
extern Bool DPMSDisabledSwitch; extern Bool DPMSDisabledSwitch;
extern Bool DPMSCapableFlag; extern Bool DPMSCapableFlag;