Update to libXScrnSaver 1.2.0

3 files changed, 73 insertions, 29 deletions

diff --git a/lib/libXScrnSaver/src/Makefile.am b/lib/libXScrnSaver/src/Makefile.am
index 3430a278a..b0498bea0 100644
--- a/lib/libXScrnSaver/src/Makefile.am
+++ b/lib/libXScrnSaver/src/Makefile.am
@@ -1,4 +1,9 @@
-AM_CFLAGS = $(XSCRNSAVER_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/include/X11 \
+            -I$(top_srcdir)/include/X11/extensions \
+            $(XSCRNSAVER_CFLAGS) \
+            $(MALLOC_ZERO_CFLAGS)
+
 lib_LTLIBRARIES = libXss.la
 
 libXss_la_SOURCES = \
@@ -8,6 +13,9 @@ libXss_la_LIBADD = $(XSCRNSAVER_LIBS)
 
 libXss_la_LDFLAGS = -version-info 1:0:0 -no-undefined
 
+libXScrnSaverincludedir = $(includedir)/X11/extensions
+libXScrnSaverinclude_HEADERS = $(top_srcdir)/include/X11/extensions/scrnsaver.h
+
 if LINT
 ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
diff --git a/lib/libXScrnSaver/src/Makefile.in b/lib/libXScrnSaver/src/Makefile.in
index 8f12efca4..403e99db8 100644
--- a/lib/libXScrnSaver/src/Makefile.in
+++ b/lib/libXScrnSaver/src/Makefile.in
@@ -15,6 +15,7 @@
 @SET_MAKE@
 
 
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -38,7 +39,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(libXScrnSaverinclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -52,7 +54,8 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" \
+	"$(DESTDIR)$(libXScrnSaverincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
@@ -74,6 +77,8 @@ SOURCES = $(libXss_la_SOURCES)
 DIST_SOURCES = $(libXss_la_SOURCES)
 lintlibDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(lintlib_DATA)
+libXScrnSaverincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libXScrnSaverinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -93,8 +98,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -115,6 +122,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -161,15 +169,9 @@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
 XSCRNSAVER_CFLAGS = @XSCRNSAVER_CFLAGS@
 XSCRNSAVER_LIBS = @XSCRNSAVER_LIBS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_NMEDIT = @ac_ct_NMEDIT@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -186,34 +188,48 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = $(XSCRNSAVER_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/include/X11 \
+            -I$(top_srcdir)/include/X11/extensions \
+            $(XSCRNSAVER_CFLAGS) \
+            $(MALLOC_ZERO_CFLAGS)
+
 lib_LTLIBRARIES = libXss.la
 libXss_la_SOURCES = \
          XScrnSaver.c
 
 libXss_la_LIBADD = $(XSCRNSAVER_LIBS)
 libXss_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libXScrnSaverincludedir = $(includedir)/X11/extensions
+libXScrnSaverinclude_HEADERS = $(top_srcdir)/include/X11/extensions/scrnsaver.h
 @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 @LINT_TRUE@		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
 
@@ -337,6 +353,23 @@ uninstall-lintlibDATA:
 	  echo " rm -f '$(DESTDIR)$(lintlibdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(lintlibdir)/$$f"; \
 	done
+install-libXScrnSaverincludeHEADERS: $(libXScrnSaverinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libXScrnSaverincludedir)" || $(mkdir_p) "$(DESTDIR)$(libXScrnSaverincludedir)"
+	@list='$(libXScrnSaverinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libXScrnSaverincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libXScrnSaverincludedir)/$$f'"; \
+	  $(libXScrnSaverincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libXScrnSaverincludedir)/$$f"; \
+	done
+
+uninstall-libXScrnSaverincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libXScrnSaverinclude_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libXScrnSaverincludedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libXScrnSaverincludedir)/$$f"; \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -387,6 +420,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../include/X11/extensions
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -415,9 +449,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" "$(DESTDIR)$(libXScrnSaverincludedir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -465,7 +499,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-lintlibDATA
+install-data-am: install-libXScrnSaverincludeHEADERS \
+	install-lintlibDATA
 
 install-exec-am: install-libLTLIBRARIES
 
@@ -494,7 +529,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-lintlibDATA
+	uninstall-libXScrnSaverincludeHEADERS uninstall-lintlibDATA
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
@@ -502,12 +537,13 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-lintlibDATA install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES \
+	install-libLTLIBRARIES install-libXScrnSaverincludeHEADERS \
+	install-lintlibDATA install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-libLTLIBRARIES uninstall-libXScrnSaverincludeHEADERS \
 	uninstall-lintlibDATA
 
 
diff --git a/lib/libXScrnSaver/src/XScrnSaver.c b/lib/libXScrnSaver/src/XScrnSaver.c
index 8ccc44b2a..0bbdc6068 100644
--- a/lib/libXScrnSaver/src/XScrnSaver.c
+++ b/lib/libXScrnSaver/src/XScrnSaver.c
@@ -156,14 +156,14 @@ static Status event_to_wire (
 
 Bool XScreenSaverQueryExtension (
     Display	*dpy,
-    int		*event_basep,
-    int		*error_basep)
+    int		*event_base_return,
+    int		*error_base_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
     if (XextHasExtension(info)) {
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
+	*event_base_return = info->codes->first_event;
+	*error_base_return = info->codes->first_error;
 	return True;
     } else {
 	return False;
@@ -173,8 +173,8 @@ Bool XScreenSaverQueryExtension (
 
 Status XScreenSaverQueryVersion(
     Display	*dpy,
-    int		*major_versionp,
-    int		*minor_versionp)
+    int		*major_version_return,
+    int		*minor_version_return)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xScreenSaverQueryVersionReply	    rep;
@@ -193,8 +193,8 @@ Status XScreenSaverQueryVersion(
 	SyncHandle ();
 	return 0;
     }
-    *major_versionp = rep.majorVersion;
-    *minor_versionp = rep.minorVersion;
+    *major_version_return = rep.majorVersion;
+    *minor_version_return = rep.minorVersion;
     UnlockDisplay (dpy);
     SyncHandle ();
     return 1;
@@ -351,7 +351,7 @@ void XScreenSaverSetAttributes (
     req->borderWidth = border_width;
     req->c_class = class;
     req->depth = depth;
-    if (visual == CopyFromParent)
+    if (visual == (Visual *)CopyFromParent)
 	req->visualID = CopyFromParent;
     else
 	req->visualID = visual->visualid;