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

dix: Move default screensaver defaults into globals.c

This commit is contained in:
Adam Jackson 2019-10-16 14:43:36 -04:00 committed by Adam Jackson
parent 43fc530780
commit ff4e2c24ec
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dix/globals.c
View File

@ -93,10 +93,11 @@ CARD32 ScreenSaverInterval;
int ScreenSaverBlanking; int ScreenSaverBlanking;
int ScreenSaverAllowExposures; int ScreenSaverAllowExposures;
CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME; /* default time of 10 minutes */
CARD32 defaultScreenSaverInterval = DEFAULT_SCREEN_SAVER_INTERVAL; CARD32 defaultScreenSaverTime = (10 * (60 * 1000));
int defaultScreenSaverBlanking = DEFAULT_SCREEN_SAVER_BLANKING; CARD32 defaultScreenSaverInterval = (10 * (60 * 1000));
int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES; int defaultScreenSaverBlanking = PreferBlanking;
int defaultScreenSaverAllowExposures = AllowExposures;
#ifdef SCREENSAVER #ifdef SCREENSAVER
Bool screenSaverSuspended = FALSE; Bool screenSaverSuspended = FALSE;

4
include/site.h
View File

@ -51,9 +51,5 @@ SOFTWARE.
* The following constants contain default values for all of the variables * The following constants contain default values for all of the variables
* that can be initialized on the server command line or in the environment. * that can be initialized on the server command line or in the environment.
*/ */
#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
#endif /* SITE_H */ #endif /* SITE_H */