diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:12:20 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:12:20 +0100 |
| commit | a9787fc2e79065e8f56fdace41f4e565667c22bb (patch) | |
| tree | 19559f26bed90d12689ee47145b27fcd7619820a /nx-X11/programs/Xserver/dix/globals.c | |
| parent | b40dec982d17b010cedc183ebdc4c75ca7de785f (diff) | |
| parent | 6dcfcbabe6b87467a6f811d0dc03efba7bfce8e4 (diff) | |
| download | nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.tar.gz nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.tar.bz2 nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.zip | |
Merge branch 'uli42-pr/update_dix' into 3.6.x
Attributes GH PR #646: https://github.com/ArcticaProject/nx-libs/pull/646
Diffstat (limited to 'nx-X11/programs/Xserver/dix/globals.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/globals.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index 6f4774a5c..8bfd84606 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -89,7 +89,7 @@ unsigned long serverGeneration = 0; /* these next four are initialized in main.c */ CARD32 ScreenSaverTime; CARD32 ScreenSaverInterval; -int ScreenSaverBlanking; +int ScreenSaverBlanking; int ScreenSaverAllowExposures; #ifdef DPMSExtension @@ -103,15 +103,15 @@ int ScreenSaverAllowExposures; # define DEFAULT_OFF_TIME DEFAULT_SCREEN_SAVER_TIME * 4 # endif # ifndef DEFAULT_DPMS_ENABLED -# define DEFAULT_DPMS_ENABLED FALSE +# define DEFAULT_DPMS_ENABLED TRUE # endif CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME; CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME; CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME; CARD16 DPMSPowerLevel = 0; Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED; -Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command line */ -Bool DPMSDisabledSwitch = FALSE; /* switch states */ +Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */ +Bool DPMSDisabledSwitch = FALSE; /* line switch states */ Bool DPMSCapableFlag = FALSE; CARD32 DPMSStandbyTime; CARD32 DPMSSuspendTime; @@ -140,15 +140,12 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in Bool loadableFonts = FALSE; CursorPtr rootCursor; Bool blackRoot=FALSE; +Bool whiteRoot=FALSE; ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */ TimeStamp currentTime; TimeStamp lastDeviceEventTime; -Bool permitOldBugs = FALSE; /* turn off some error checking, to permit certain - * old broken clients (like R2/R3 xterms) to work - */ - int defaultColorVisualClass = -1; int monitorResolution = 0; |