diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-10-21 01:47:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-07 23:15:57 +0100 |
| commit | 4ab18725cd088cbb401ef63e93ef41d8d7c78b2a (patch) | |
| tree | d55148c500dde99d2f178e23466af8d18d72e4ee /nx-X11/programs/Xserver/dix | |
| parent | cbdae3b71bfc654cfc0c81b1ddf51975bcb93146 (diff) | |
| download | nx-libs-4ab18725cd088cbb401ef63e93ef41d8d7c78b2a.tar.gz nx-libs-4ab18725cd088cbb401ef63e93ef41d8d7c78b2a.tar.bz2 nx-libs-4ab18725cd088cbb401ef63e93ef41d8d7c78b2a.zip | |
Xext: lift screensaver extension to XORG-7_1 state
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/globals.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index 1024de965..ccdae3b82 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -132,7 +132,7 @@ NormalLibraryTarget(dix,$(OBJS)) LintLibraryTarget(dix,$(SRCS) $(XPSRC)) NormalLintTarget($(SRCS) $(XPSRC)) -SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES)) +SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES) $(EXT_DEFINES)) SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES)) SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_)) SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_)) diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index f9fa544ed..6f4774a5c 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -127,6 +127,10 @@ int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES; int logoScreenSaver = DEFAULT_LOGO_SCREEN_SAVER; #endif +#ifdef SCREENSAVER +Bool screenSaverSuspended = FALSE; +#endif + char *defaultFontPath = COMPILEDDEFAULTFONTPATH; char *defaultTextFont = COMPILEDDEFAULTFONT; char *defaultCursorFont = COMPILEDCURSORFONT; |