diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-09-22 17:20:56 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-09-22 17:20:56 +0000 |
| commit | de68a3339b9f19630e29a17773cad060b1f65300 (patch) | |
| tree | 6d4c3bac795f42f800af672f0048c42b57634160 /dix | |
| parent | d7514b9162648f894211884b199ef2edc458aa86 (diff) | |
Allow overriding DPMS defaults (timeouts & default for on/off) from
#defines/-D options.
programs/Xserver/hw/xfree86/common/xf86DPMS.c Use defaultDPMSEnabled global
for the default state of DPMS if not set in any config files.
programs/Xserver/hw/xfree86/os-support/sunos/solaris-sparcv8plus.S Add
support for required assembly inline functions for Sun compilers on
Solaris/sparc.
Add support for Solaris/sparc libraries.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/globals.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/dix/globals.c b/dix/globals.c index 0682ed7c7..23fbd1039 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */ /* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ @@ -94,14 +94,23 @@ int ScreenSaverBlanking; int ScreenSaverAllowExposures; #ifdef DPMSExtension -#define DEFAULT_STANDBY_TIME DEFAULT_SCREEN_SAVER_TIME * 2 -#define DEFAULT_SUSPEND_TIME DEFAULT_SCREEN_SAVER_TIME * 3 -#define DEFAULT_OFF_TIME DEFAULT_SCREEN_SAVER_TIME * 4 +# 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 FALSE +# endif CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME; CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME; CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME; CARD16 DPMSPowerLevel = 0; -Bool defaultDPMSEnabled = FALSE; +Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED; Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command line */ Bool DPMSDisabledSwitch = FALSE; /* switch states */ Bool DPMSCapableFlag = FALSE; |