diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-04 23:51:30 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 04:54:35 +0100 |
commit | 50a33794069fd22e615f6208cd4c82a64452b485 (patch) | |
tree | c272cfb28c3d5c1940332d118993514907993188 /nx-X11/programs/Xserver/dix/globals.c | |
parent | b40dec982d17b010cedc183ebdc4c75ca7de785f (diff) | |
download | nx-libs-50a33794069fd22e615f6208cd4c82a64452b485.tar.gz nx-libs-50a33794069fd22e615f6208cd4c82a64452b485.tar.bz2 nx-libs-50a33794069fd22e615f6208cd4c82a64452b485.zip |
Lift dix to xorg-xserver-7.1/1.1.0 state
Diffstat (limited to 'nx-X11/programs/Xserver/dix/globals.c')
-rw-r--r-- | nx-X11/programs/Xserver/dix/globals.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index 6f4774a5c..04e6585dd 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -103,7 +103,7 @@ 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; @@ -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; |