From 3b4a915984b3136f6fddb0cdfdec01cf64715c46 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 11:46:07 +0100 Subject: Build nxcompshad against nx-X11 (002_nxcompshad_build-against-nx-x11-only.full.patch). Make sure nxcompshad get built against nx-X11. . Furthermore /usr/X11R6/lib is an outdated path on current Debian systems. --- nxcompshad/Makefile.in | 4 ++-- nxcompshad/configure.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nxcompshad') diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 1580a3594..c6aeaf0cb 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -48,7 +48,7 @@ CCINCLUDES = CCDEFINES = LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -L/usr/X11R6/lib -lX11 +LIBS = @LIBS@ -lX11 # # Only if THREADS is defined. @@ -162,7 +162,7 @@ $(LIBDLL): $(LIBARCHIVE) -Wl,--enable-auto-import \ -Wl,--whole-archive ${LIBARCHIVE} \ -Wl,--no-whole-archive \ - ${LIBS} -L/usr/X11R6/lib + ${LIBS} $(PROGRAM): $(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL) # $(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS) diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 3f16ee97f..f0bdecd12 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -19,7 +19,7 @@ dnl Prefer headers and libraries from nx-X11, if present. if test -d "../nx-X11/exports/include" ; then CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include" - LIBS="$LIBS -L../nx-X11/exports/lib" + LIBS="-L../nx-X11/exports/lib" fi dnl Check whether --with-ipaq was given. -- cgit v1.2.3 From b3496d0a7a76cb0808bbe0f7c84355e4e88878d0 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 9 Feb 2015 11:53:47 +0100 Subject: gcc43 fix (003_nxcompshad_gcc43.full.patch) Use builtin includes to build with gcc43. --- debian/patches/003_nxcompshad_gcc43.full.patch | 33 -------------------------- debian/patches/series | 1 - nxcompshad/Logger.h | 4 ++-- nxcompshad/Misc.h | 4 ++-- 4 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 debian/patches/003_nxcompshad_gcc43.full.patch (limited to 'nxcompshad') diff --git a/debian/patches/003_nxcompshad_gcc43.full.patch b/debian/patches/003_nxcompshad_gcc43.full.patch deleted file mode 100644 index 165c30035..000000000 --- a/debian/patches/003_nxcompshad_gcc43.full.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: gcc43 fix - Use builtin includes to build with gcc43. - . - Originally contributed by Marcelo Boveto Shima . -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nxcompshad/Logger.h -+++ b/nxcompshad/Logger.h -@@ -18,8 +18,8 @@ - #ifndef Logger_H - #define Logger_H - --#include --#include -+#include -+#include - - // - // Error handling macros. ---- a/nxcompshad/Misc.h -+++ b/nxcompshad/Misc.h -@@ -20,8 +20,8 @@ - - #include - --#include --#include -+#include -+#include - - using namespace std; - diff --git a/debian/patches/series b/debian/patches/series index e410e2024..3dfca5e33 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch diff --git a/nxcompshad/Logger.h b/nxcompshad/Logger.h index 94e4da857..2e6430b48 100644 --- a/nxcompshad/Logger.h +++ b/nxcompshad/Logger.h @@ -18,8 +18,8 @@ #ifndef Logger_H #define Logger_H -#include -#include +#include +#include // // Error handling macros. diff --git a/nxcompshad/Misc.h b/nxcompshad/Misc.h index 6dc86359f..27f267036 100644 --- a/nxcompshad/Misc.h +++ b/nxcompshad/Misc.h @@ -20,8 +20,8 @@ #include -#include -#include +#include +#include using namespace std; -- cgit v1.2.3 From a720908a60a2bc8da177582f80537ecf3eee45d8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 14:18:50 +0100 Subject: Remove .gch files during cleanup (007_nxcompshad_clean-gch-files.full.patch). When building nxcompshad .gch files get created. On cleanup these should be removed. --- .../patches/007_nxcompshad_clean-gch-files.full.patch | 17 ----------------- debian/patches/series | 1 - nxcompshad/Makefile.in | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 debian/patches/007_nxcompshad_clean-gch-files.full.patch (limited to 'nxcompshad') diff --git a/debian/patches/007_nxcompshad_clean-gch-files.full.patch b/debian/patches/007_nxcompshad_clean-gch-files.full.patch deleted file mode 100644 index 897e27890..000000000 --- a/debian/patches/007_nxcompshad_clean-gch-files.full.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove .gch files during cleanup. - When building nxcompshad .gch files get created. On - cleanup these should be removed. -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2012-12-31 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -185,7 +185,7 @@ - install.man: - - clean: -- -rm -f *~ *.o *.bak st?????? core core.* *.out.* *.exe.stackdump \ -+ -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe - - distclean: clean diff --git a/debian/patches/series b/debian/patches/series index f82c87bf0..81a71d3a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -007_nxcompshad_clean-gch-files.full.patch 008_nxcomp_sa-restorer.full+lite.patch 009_nxproxy_add-man-page.full+lite.patch 009_nxagent_add-man-page.full.patch diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index c6aeaf0cb..caf9eb14c 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -185,7 +185,7 @@ install.bin: install.man: clean: - -rm -f *~ *.o *.bak st?????? core core.* *.out.* *.exe.stackdump \ + -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe distclean: clean -- cgit v1.2.3 From 4bc550e867f6168c1090aa4e1959a22238be84f1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 14:26:02 +0100 Subject: nxcomp*,nxproxy: Add clean rules to Makefile.in templates. --- ...omp_makefile-uninstall+autoconf.full+lite.patch | 74 ---------------------- ...xcompext_makefile-uninstall+autoconf.full.patch | 66 ------------------- ...compshad_makefile-uninstall+autoconf.full.patch | 70 -------------------- .../015_nxproxy_makefile-uninstall.full+lite.patch | 40 ------------ debian/patches/series | 4 -- nxcomp/Makefile.in | 39 +++++++++++- nxcompext/Makefile.in | 31 ++++++++- nxcompshad/Makefile.in | 35 +++++++++- nxproxy/Makefile.in | 17 ++++- 9 files changed, 115 insertions(+), 261 deletions(-) delete mode 100644 debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch delete mode 100644 debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch delete mode 100644 debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch (limited to 'nxcompshad') diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch deleted file mode 100644 index af778fefc..000000000 --- a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch +++ /dev/null @@ -1,74 +0,0 @@ -Description: Add install and uninstall stanzas to nxcomp/Makefile, honor ac dirs - Provide install and uninstall functionality in nxcomp/Makefile. - . - Honor autoconf's libdir (and includedir, while at it). This is a - must-have for multiarch platforms like x86_64 et al where multiple - forms of libraries can be installed at the same time. -Forwarded: pending... -Author: Mike Gabriel -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- a/nxcomp/Makefile.in -+++ b/nxcomp/Makefile.in -@@ -64,10 +64,15 @@ - bindir = @bindir@ - man1dir = @mandir@/man1 - VPATH = @srcdir@ -+libdir = @libdir@ -+includedir = @includedir@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -264,12 +269,44 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)${libdir} -+ ./mkinstalldirs $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir} -+ $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir} -+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3 -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch deleted file mode 100644 index 300c0a39e..000000000 --- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch +++ /dev/null @@ -1,66 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompext/Makefile, honor autoconf dirs. - Provide install and uninstall functionality in nxcompext/Makefile. - . - Honor autoconf's libdir (and includedir, while at it). This is a - must-have for multiarch platforms like x86_64 et al where multiple - forms of libraries can be installed at the same time. -Forwarded: pending... -Author: Mike Gabriel -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- a/nxcompext/Makefile.in -+++ b/nxcompext/Makefile.in -@@ -56,11 +56,15 @@ - bindir = @bindir@ - man1dir = @mandir@/man1 - VPATH = @srcdir@ -+libdir = @libdir@ -+includedir = @includedir@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -- -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f - # - # This should be autodetected. - # -@@ -147,12 +151,35 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ ./mkinstalldirs $(DESTDIR)${libdir} -+ ./mkinstalldirs $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir} -+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3 -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h -+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ - @ALL@ diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch deleted file mode 100644 index 921eccc4f..000000000 --- a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch +++ /dev/null @@ -1,70 +0,0 @@ -Description: Add install and uninstall stanzas to nxcompshad/Makefile, honor autoconf dirs - Provide install and uninstall functionality in nxcompshad/Makefile. - . - Honor autoconf's libdir (and includedir, while at it). This is a - must-have for multiarch platforms like x86_64 et al where multiple - forms of libraries can be installed at the same time. -Forwarded: pending... -Author: Mike Gabriel -Author: Jan Engelhardt -Last-Update: 2012-02-14 ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -74,10 +74,17 @@ - bindir = @bindir@ - man1dir = @mandir@/man1 - VPATH = @srcdir@ -+libdir = @libdir@ -+includedir = @includedir@ - - INSTALL = @INSTALL@ -+INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LINK = cp -av -+DESTDIR = -+RM_FILE = rm -f -+RM_DIR = rmdir -p --ignore-fail-on-non-empty - - # - # This should be autodetected. -@@ -178,12 +185,38 @@ - fi - touch depend.status - --install: install.bin install.man -+install: install.bin install.lib install.man - - install.bin: - -+install.lib: all -+ $(INSTALL_DIR) $(DESTDIR)${libdir} -+ $(INSTALL_DIR) $(DESTDIR)${includedir}/nx -+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir} -+ $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir} -+ $(INSTALL_DATA) *.a $(DESTDIR)${libdir} -+ $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ - install.man: - -+uninstall: uninstall.bin uninstall.lib uninstall.man -+ -+uninstall.bin: -+ -+uninstall.lib: -+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3 -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so -+ $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a -+ for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done -+ $(RM_DIR) $(DESTDIR)${libdir}/nx/ -+ $(RM_DIR) $(DESTDIR)${includedir}/nx/ -+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true -+ -+uninstall.man: -+ - clean: - -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch b/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch deleted file mode 100644 index 554c86aa4..000000000 --- a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Add install and uninstall stanzas to nxcomp/Makefile - Provide install and uninstall functionality in nxcomp/Makefile. -Forwarded: pending... -Author: Mike Gabriel -Last-Update: 2011-12-31 ---- a/nxproxy/Makefile.in -+++ b/nxproxy/Makefile.in -@@ -41,6 +41,8 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+DESTDIR = -+RM_FILE = rm -f - - # - # This should be autodetected. -@@ -87,11 +89,20 @@ - install: install.bin install.man - - install.bin: $(PROGRAM) -- $(srcdir)/mkinstalldirs $(bindir) -- $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) - - install.man: -- $(srcdir)/mkinstalldirs $(man1dir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) -+ $(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1 -+ -+uninstall: uninstall.bin uninstall.man -+ -+uninstall.bin: -+ $(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM) -+ -+uninstall.man: -+ $(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1 - - clean: - -rm -f *~ *.o *.bak st?????? core core.* *.out.* \ diff --git a/debian/patches/series b/debian/patches/series index 8bbb69182..f3678f428 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,3 @@ -012_nxcomp_makefile-uninstall+autoconf.full+lite.patch -013_nxcompext_makefile-uninstall+autoconf.full.patch -014_nxcompshad_makefile-uninstall+autoconf.full.patch -015_nxproxy_makefile-uninstall.full+lite.patch 016_nx-X11_install-location.full.patch 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 434118b4e..d291c3967 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -64,10 +64,15 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_LINK = cp -av +DESTDIR = +RM_FILE = rm -f # # This should be autodetected. @@ -264,12 +269,44 @@ depend.status: fi touch depend.status -install: install.bin install.man +install: install.bin install.lib install.man install.bin: +install.lib: all + ./mkinstalldirs $(DESTDIR)${libdir} + ./mkinstalldirs $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} + $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir} + $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir} + $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir} + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + install.man: +uninstall: uninstall.bin uninstall.lib uninstall.man + +uninstall.bin: + +uninstall.lib: + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so + $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + +uninstall.man: + clean: -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ @ALL@ diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index cdf0b1cd9..51bc06ed2 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -56,11 +56,15 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ - +INSTALL_LINK = cp -av +DESTDIR = +RM_FILE = rm -f # # This should be autodetected. # @@ -147,12 +151,35 @@ depend.status: fi touch depend.status -install: install.bin install.man +install: install.bin install.lib install.man install.bin: +install.lib: all + ./mkinstalldirs $(DESTDIR)${libdir} + ./mkinstalldirs $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} + $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir} + $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir} + $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + install.man: +uninstall: uninstall.bin uninstall.lib uninstall.man + +uninstall.bin: + +uninstall.lib: + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h + $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + +uninstall.man: + clean: -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ @ALL@ diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index caf9eb14c..26a92bdce 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -74,10 +74,17 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ INSTALL = @INSTALL@ +INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_LINK = cp -av +DESTDIR = +RM_FILE = rm -f +RM_DIR = rmdir -p --ignore-fail-on-non-empty # # This should be autodetected. @@ -178,12 +185,38 @@ depend.status: fi touch depend.status -install: install.bin install.man +install: install.bin install.lib install.man install.bin: +install.lib: all + $(INSTALL_DIR) $(DESTDIR)${libdir} + $(INSTALL_DIR) $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} + $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir} + $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir} + $(INSTALL_DATA) *.a $(DESTDIR)${libdir} + $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + install.man: +uninstall: uninstall.bin uninstall.lib uninstall.man + +uninstall.bin: + +uninstall.lib: + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) + $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3 + $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so + $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a + for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done + $(RM_DIR) $(DESTDIR)${libdir}/nx/ + $(RM_DIR) $(DESTDIR)${includedir}/nx/ + echo "Running ldconfig tool, this may take a while..." && ldconfig || true + +uninstall.man: + clean: -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in index 928e0d34e..5d78972b9 100644 --- a/nxproxy/Makefile.in +++ b/nxproxy/Makefile.in @@ -41,6 +41,8 @@ VPATH = @srcdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +DESTDIR = +RM_FILE = rm -f # # This should be autodetected. @@ -87,11 +89,20 @@ depend.status: install: install.bin install.man install.bin: $(PROGRAM) - $(srcdir)/mkinstalldirs $(bindir) - $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM) + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) install.man: - $(srcdir)/mkinstalldirs $(man1dir) + $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) + $(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1 + +uninstall: uninstall.bin uninstall.man + +uninstall.bin: + $(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM) + +uninstall.man: + $(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1 clean: -rm -f *~ *.o *.bak st?????? core core.* *.out.* \ -- cgit v1.2.3 From 236ee4ffa8e4fa92bb748301986307841ef060ab Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 9 Feb 2015 15:16:30 +0100 Subject: nxcomp*, nxproxy: Fix clean-up of source tree via Makefile.in templates. 024_fix-make-clean.full.patch 024_fix-make-clean.full+lite.patch --- debian/patches/024_fix-make-clean.full+lite.patch | 19 --------- debian/patches/024_fix-make-clean.full.patch | 51 ----------------------- debian/patches/series | 2 - nx-X11/Makefile | 10 ++++- nxcomp/Makefile.in | 2 +- nxcompext/Makefile.in | 2 +- nxcompshad/Makefile.in | 2 +- nxproxy/Makefile.in | 2 +- 8 files changed, 12 insertions(+), 78 deletions(-) delete mode 100644 debian/patches/024_fix-make-clean.full+lite.patch delete mode 100644 debian/patches/024_fix-make-clean.full.patch (limited to 'nxcompshad') diff --git a/debian/patches/024_fix-make-clean.full+lite.patch b/debian/patches/024_fix-make-clean.full+lite.patch deleted file mode 100644 index 7f0b327cf..000000000 --- a/debian/patches/024_fix-make-clean.full+lite.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: fix clean rule in nxcomp's Makefile.in -Author: Mike Gabriel - ---- a/nxcomp/Makefile.in -+++ b/nxcomp/Makefile.in -@@ -313,4 +313,4 @@ - - distclean: clean - -rm -rf autom4te.cache config.status config.log \ -- config.cache depend.status Makefile tags -+ config.cache depend.status Makefile tags configure ---- a/nxproxy/Makefile.in -+++ b/nxproxy/Makefile.in -@@ -109,4 +109,4 @@ - $(PROGRAM) $(PROGRAM).exe $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) - - distclean: clean -- -rm -f config.status config.log config.cache depend.status Makefile tags -+ -rm -rf autom4te.cache config.status config.log config.cache depend.status Makefile tags configure diff --git a/debian/patches/024_fix-make-clean.full.patch b/debian/patches/024_fix-make-clean.full.patch deleted file mode 100644 index 356ce47d8..000000000 --- a/debian/patches/024_fix-make-clean.full.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Provide main Makefile for whole source tree - By design this patch is not needed to be sent upstream. -Forwarded: not-needed -Author: Mike Gabriel -Last-Update: 2012-10-19 ---- a/nx-X11/Makefile -+++ b/nx-X11/Makefile -@@ -138,6 +138,7 @@ - - xmakefile: Imakefile - $(RM) xmakefile -+ @rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def; - $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - - World.Win32: -@@ -197,11 +198,16 @@ - # a copy of every rule that might be invoked at top level - - clean: -- $(MAKE_CMD) $@ -+ -$(MAKE_CMD) $@ -+ find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done -+ rm -f config/cf/{version.def,date.def} - dangerous_strip_clean: - $(MAKE_CMD) $@ - distclean: -- $(MAKE_CMD) $@ -+ -$(MAKE_CMD) $@ - $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def - depend: - $(MAKE_CMD) $@ ---- a/nxcompext/Makefile.in -+++ b/nxcompext/Makefile.in -@@ -185,5 +185,5 @@ - @ALL@ - - distclean: clean -- -rm -rf autom4te.cache config.status config.log \ -+ -rm -rf autom4te.cache config.status config.log configure \ - config.cache depend.status Makefile tags ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -222,4 +222,4 @@ - $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe - - distclean: clean -- -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache -+ -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure diff --git a/debian/patches/series b/debian/patches/series index 70c573c38..63bc3dc43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -024_fix-make-clean.full.patch -024_fix-make-clean.full+lite.patch 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch 026_nxcompext_honour-optflags.full.patch 026_nxcomp_honour-optflags.full+lite.patch diff --git a/nx-X11/Makefile b/nx-X11/Makefile index 3aefb7974..7c4090a95 100644 --- a/nx-X11/Makefile +++ b/nx-X11/Makefile @@ -138,6 +138,7 @@ Makefile:: xmakefile: Imakefile $(RM) xmakefile + @rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def; $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) World.Win32: @@ -197,11 +198,16 @@ World.OS2: # a copy of every rule that might be invoked at top level clean: - $(MAKE_CMD) $@ + -$(MAKE_CMD) $@ + find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + rm -f config/cf/{version.def,date.def} dangerous_strip_clean: $(MAKE_CMD) $@ distclean: - $(MAKE_CMD) $@ + -$(MAKE_CMD) $@ $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def depend: $(MAKE_CMD) $@ diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index d291c3967..1be928167 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -313,4 +313,4 @@ clean: distclean: clean -rm -rf autom4te.cache config.status config.log \ - config.cache depend.status Makefile tags + config.cache depend.status Makefile tags configure diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index 51bc06ed2..9fd2c7d7d 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -185,5 +185,5 @@ clean: @ALL@ distclean: clean - -rm -rf autom4te.cache config.status config.log \ + -rm -rf autom4te.cache config.status config.log configure \ config.cache depend.status Makefile tags diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 26a92bdce..00bca25c9 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -222,4 +222,4 @@ clean: $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe distclean: clean - -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache + -rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in index 5d78972b9..c00df91dc 100644 --- a/nxproxy/Makefile.in +++ b/nxproxy/Makefile.in @@ -109,4 +109,4 @@ clean: $(PROGRAM) $(PROGRAM).exe $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) distclean: clean - -rm -f config.status config.log config.cache depend.status Makefile tags + -rm -rf autom4te.cache config.status config.log config.cache depend.status Makefile tags configure -- cgit v1.2.3 From 3384aba386c44ec26d3f131b897f77da440324d7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Feb 2015 15:22:07 +0100 Subject: Honour compiler/linker option flags. 026_nxcompext_honour-optflags.full.patch 026_nxcomp_honour-optflags.full+lite.patch 026_nxcompshad_honour-optflags.full.patch --- .../026_nxcomp_honour-optflags.full+lite.patch | 31 ---------------------- .../026_nxcompext_honour-optflags.full.patch | 17 ------------ .../026_nxcompshad_honour-optflags.full.patch | 17 ------------ debian/patches/series | 3 --- nxcomp/configure.in | 4 +-- nxcompext/configure.in | 4 +-- nxcompshad/configure.in | 4 +-- nxproxy/configure.in | 4 +-- 8 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 debian/patches/026_nxcomp_honour-optflags.full+lite.patch delete mode 100644 debian/patches/026_nxcompext_honour-optflags.full.patch delete mode 100644 debian/patches/026_nxcompshad_honour-optflags.full.patch (limited to 'nxcompshad') diff --git a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch b/debian/patches/026_nxcomp_honour-optflags.full+lite.patch deleted file mode 100644 index a2713a1bc..000000000 --- a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Honour compiler/linker option flags -Forwarded: pending -Author: Orion Poplawski -diff -up a/nxcomp/configure.in b/nxcomp/configure.in ---- a/nxcomp/configure.in 2012-11-10 06:40:55.000000000 -0700 -+++ b/nxcomp/configure.in 2012-12-11 13:13:19.390229196 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Set our default compilation flags. - --CXXFLAGS="-O3 -fno-rtti -fno-exceptions" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" -+CFLAGS="$CFLAGS -O3" - - dnl Reset default linking directives. - -diff -up a/nxproxy/configure.in b/nxproxy/configure.in ---- a/nxproxy/configure.in 2012-11-10 06:40:55.000000000 -0700 -+++ b/nxproxy/configure.in 2012-12-11 13:16:19.955301045 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Reset default compilation flags. - --CXXFLAGS="-O3" --CPPFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3" -+CPPFLAGS="$CPPFLAGS -O3" - - dnl Prefer headers and libraries from nx-X11 if present. - diff --git a/debian/patches/026_nxcompext_honour-optflags.full.patch b/debian/patches/026_nxcompext_honour-optflags.full.patch deleted file mode 100644 index 4d5df3e6b..000000000 --- a/debian/patches/026_nxcompext_honour-optflags.full.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Honour compiler/linker option flags -Forwarded: pending -Author: Orion Poplawski -diff -up a/nxcompext/configure.in b/nxcompext/configure.in ---- a/nxcompext/configure.in 2012-11-10 06:40:55.000000000 -0700 -+++ b/nxcompext/configure.in 2012-12-11 13:15:26.712576302 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Reset default compilation flags. - --CXXFLAGS="-O3" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3" -+CFLAGS="$CFLAGS -O3" - - dnl Reset default linking directives. - diff --git a/debian/patches/026_nxcompshad_honour-optflags.full.patch b/debian/patches/026_nxcompshad_honour-optflags.full.patch deleted file mode 100644 index ea1d2ad80..000000000 --- a/debian/patches/026_nxcompshad_honour-optflags.full.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Honour compiler/linker option flags -Forwarded: pending -Author: Orion Poplawski -diff -up a/nxcompshad/configure.in b/nxcompshad/configure.in ---- a/nxcompshad/configure.in 2012-11-10 06:40:56.000000000 -0700 -+++ b/nxcompshad/configure.in 2012-12-11 13:13:25.915196300 -0700 -@@ -7,8 +7,8 @@ AC_PREREQ(2.13) - - dnl Reset default compilation flags. - --CXXFLAGS="-O3" --CPPFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -O3" -+CPPFLAGS="$CPPFLAGS -O3" - - dnl Reset default linking directives. - diff --git a/debian/patches/series b/debian/patches/series index 6eadd7bd9..ca6b6dcdc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -026_nxcompext_honour-optflags.full.patch -026_nxcomp_honour-optflags.full+lite.patch -026_nxcompshad_honour-optflags.full.patch 027_nxcomp_abstract-X11-socket.full+lite.patch 028_nx-X11_abstract-kernel-sockets.full.patch 029_nxcomp_ppc64.full+lite.patch diff --git a/nxcomp/configure.in b/nxcomp/configure.in index e9ab81da8..6fa9757a7 100644 --- a/nxcomp/configure.in +++ b/nxcomp/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Set our default compilation flags. -CXXFLAGS="-O3 -fno-rtti -fno-exceptions" -CFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" +CFLAGS="$CFLAGS -O3" dnl Reset default linking directives. diff --git a/nxcompext/configure.in b/nxcompext/configure.in index fe5abf7cb..08c48a751 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CFLAGS="$CFLAGS -O3" dnl Reset default linking directives. diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index f0bdecd12..13149b3a0 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CPPFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CPPFLAGS="$CPPFLAGS -O3" dnl Reset default linking directives. diff --git a/nxproxy/configure.in b/nxproxy/configure.in index bd930f166..b86828d02 100644 --- a/nxproxy/configure.in +++ b/nxproxy/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CPPFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CPPFLAGS="$CPPFLAGS -O3" dnl Prefer headers and libraries from nx-X11 if present. -- cgit v1.2.3 From c4a8556c45786c83b04b2e958234cb4c724e1910 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 13 Feb 2015 13:27:42 +0100 Subject: Unique Library Names Patch (600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch). We really want to make use of rpm's automatic dependency finding. Binaries are scanned for DT_NEEDED entries, the latter of which are then used for populating the "Requires"-type deps. The "nxagent" binary for example would require libX11.so.6. That incurs problems: 1. A package manager told to install nxagent could select xorg-x11 rather than nx-libs, even though nxagent depends on the NX version. 2. A package manager told to install $some_program could select nx-libs rather than xorg-x11 (since both provide libX11.so.6), but, since the NX library is in an obscure directory, running $some_program would fail as libX11.so.6 is not found. To solve this, give the NX libraries unique names different from the Xorg ones. --- ...nxcompext+nxcompshad_unique-libnames.full.patch | 1183 -------------------- debian/patches/series | 1 - nx-X11/config/cf/Imake.rules | 12 +- nx-X11/config/cf/X11.tmpl | 240 ++-- nx-X11/config/cf/lnxLib.rules | 16 +- nx-X11/config/cf/lnxLib.tmpl | 4 +- nx-X11/lib/X11/Imakefile | 2 +- nx-X11/lib/XRes/Imakefile | 2 +- nx-X11/lib/Xau/Imakefile | 2 +- nx-X11/lib/Xcomposite/Imakefile | 2 +- nx-X11/lib/Xcomposite/xcomposite.pc.in | 2 +- nx-X11/lib/Xcursor/Imakefile | 2 +- nx-X11/lib/Xcursor/xcursor.pc.in | 2 +- nx-X11/lib/Xdamage/Imakefile | 2 +- nx-X11/lib/Xdamage/xdamage.pc.in | 2 +- nx-X11/lib/Xdmcp/Imakefile | 2 +- nx-X11/lib/Xext/Imakefile | 2 +- nx-X11/lib/Xfixes/Imakefile | 2 +- nx-X11/lib/Xfixes/xfixes.pc.in | 2 +- nx-X11/lib/Xinerama/Imakefile | 2 +- nx-X11/lib/Xpm/Imakefile | 2 +- nx-X11/lib/Xrandr/Imakefile | 2 +- nx-X11/lib/Xrender/Imakefile | 2 +- nx-X11/lib/Xrender/xrender.pc.in | 2 +- nx-X11/lib/Xtst/Imakefile | 2 +- nx-X11/lib/font/Imakefile | 2 +- nx-X11/lib/oldX/Imakefile | 2 +- nx-X11/lib/xkbfile/Imakefile | 2 +- nx-X11/lib/xkbui/Imakefile | 2 +- nx-X11/programs/Xserver/Imakefile | 18 +- nxcompext/Makefile.in | 4 +- nxcompshad/Makefile.in | 4 +- 32 files changed, 172 insertions(+), 1356 deletions(-) delete mode 100644 debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch (limited to 'nxcompshad') diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch deleted file mode 100644 index 7c21c6fe5..000000000 --- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch +++ /dev/null @@ -1,1183 +0,0 @@ -Description: Unique Library Names Patch - Patch from the RPM folks... - . - We really want to make use of rpm's automatic dependency finding. - Binaries are scanned for DT_NEEDED entries, the latter of which are - then used for populating the "Requires"-type deps. The "nxagent" - binary for example would require libX11.so.6. That incurs problems: - . - 1. A package manager told to install nxagent could select xorg-x11 - rather than nx-libs, even though nxagent depends on the NX version. - . - 2. A package manager told to install $some_program could select nx-libs - rather than xorg-x11 (since both provide libX11.so.6), but, since - the NX library is in an obscure directory, running $some_program - would fail as libX11.so.6 is not found. - . - To solve this, give the NX libraries unique names different from the - Xorg ones. -Forward: pending -Author: Jan Engelhardt -Last-Update: 2012-02-15 ---- - nx-X11/config/cf/Imake.rules | 12 - - nx-X11/config/cf/X11.tmpl | 240 ++++++++++---------- - nx-X11/config/cf/lnxLib.rules | 16 - - nx-X11/config/cf/lnxLib.tmpl | 4 - nx-X11/lib/X11/Imakefile | 2 - nx-X11/lib/XRes/Imakefile | 2 - nx-X11/lib/Xau/Imakefile | 2 - nx-X11/lib/Xcomposite/Imakefile | 2 - nx-X11/lib/Xcomposite/xcomposite.pc.in | 2 - nx-X11/lib/Xcursor/Imakefile | 2 - nx-X11/lib/Xcursor/xcursor.pc.in | 2 - nx-X11/lib/Xdamage/Imakefile | 2 - nx-X11/lib/Xdamage/xdamage.pc.in | 2 - nx-X11/lib/Xdmcp/Imakefile | 2 - nx-X11/lib/Xext/Imakefile | 2 - nx-X11/lib/Xfixes/Imakefile | 2 - nx-X11/lib/Xfixes/xfixes.pc.in | 2 - nx-X11/lib/Xinerama/Imakefile | 2 - nx-X11/lib/Xpm/Imakefile | 2 - nx-X11/lib/Xrandr/Imakefile | 2 - nx-X11/lib/Xrender/Imakefile | 2 - nx-X11/lib/Xrender/xrender.pc.in | 2 - nx-X11/lib/Xtst/Imakefile | 2 - nx-X11/lib/font/Imakefile | 2 - nx-X11/lib/oldX/Imakefile | 2 - nx-X11/lib/xkbfile/Imakefile | 2 - nx-X11/lib/xkbui/Imakefile | 2 - nx-X11/programs/Xserver/Imakefile | 18 - - nxcompext/Makefile.in | 4 - nxcompshad/Makefile.in | 4 - 103 files changed, 294 insertions(+), 294 deletions(-) - ---- a/nx-X11/config/cf/Imake.rules -+++ b/nx-X11/config/cf/Imake.rules -@@ -2124,9 +2124,9 @@ - */ - #ifndef ProjectUnsharedFontLibReferences - #define ProjectUnsharedFontLibReferences() @@\ --DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\ --FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\ -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - #endif - - /* -@@ -2142,9 +2142,9 @@ - #ifndef SharedFontLibReferences - #define SharedFontLibReferences() @@\ - SOFONTREV = SharedFontRev @@\ --DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ --FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - #endif - - /* ---- a/nx-X11/config/cf/X11.tmpl -+++ b/nx-X11/config/cf/X11.tmpl -@@ -1835,9 +1835,9 @@ - #ifndef SharedX11Rev - #define SharedX11Rev 6.2 - #endif --SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) -+SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) - #else --ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) - #endif - /* Common alternate spellings */ - DEPXLIBONLY = $(DEPXONLYLIB) -@@ -2466,9 +2466,9 @@ - #ifndef SharedXextRev - #define SharedXextRev 6.4 - #endif --SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) -+SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) - #else --ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir) - #endif - LINTEXTENSIONLIB = $(LINTEXTENSION) - DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) -@@ -2480,9 +2480,9 @@ - #ifndef SharedXssRev - #define SharedXssRev 1.0 - #endif --SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) -+SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) - #else --ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir) - #endif - - XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -@@ -2490,9 +2490,9 @@ - #ifndef SharedXxf86miscRev - #define SharedXxf86miscRev 1.1 - #endif --SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) -+SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) - #else --ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) - #endif - - XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -@@ -2500,9 +2500,9 @@ - #ifndef SharedXxf86vmRev - #define SharedXxf86vmRev 1.0 - #endif --SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) -+SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) - #else --ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) - #endif - - XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -@@ -2510,9 +2510,9 @@ - #ifndef SharedXxf86dgaRev - #define SharedXxf86dgaRev 1.0 - #endif --SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) -+SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) - #else --ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) - #endif - - #if BuildDmxLibrary -@@ -2544,9 +2544,9 @@ - #ifndef SharedXxf86rushRev - #define SharedXxf86rushRev 1.0 - #endif --SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) -+SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) - #else --ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) - #endif - - -@@ -2555,9 +2555,9 @@ - #ifndef SharedXvRev - #define SharedXvRev 1.0 - #endif --SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) -+SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) - #else --ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir) - #endif - - -@@ -2566,9 +2566,9 @@ - #ifndef SharedXvMCRev - #define SharedXvMCRev 1.0 - #endif --SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) -+SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) - #else --ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir) - #endif - - XINERAMALIBSRC = $(LIBSRC)/Xinerama -@@ -2576,9 +2576,9 @@ - #ifndef SharedXineramaRev - #define SharedXineramaRev 1.0 - #endif --SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) -+SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) - #else --ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) - #endif - - XRESLIBSRC = $(LIBSRC)/XRes -@@ -2586,9 +2586,9 @@ - #ifndef SharedXResRev - #define SharedXResRev 1.0 - #endif --SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) -+SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) - #else --ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) - #endif - - DMXLIBSRC = $(LIBSRC)/dmx -@@ -2596,9 +2596,9 @@ - #ifndef SharedDmxRev - #define SharedDmxRev 1.0 - #endif --SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) -+SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) - #else --ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir) - #endif - - DPSLIBSRC = $(LIBSRC)/dps -@@ -2606,9 +2606,9 @@ - #ifndef SharedDpsRev - #define SharedDpsRev 1.0 - #endif --SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) -+SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) - #else --ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir) - #endif - - DPSTKLIBSRC = $(LIBSRC)/dpstk -@@ -2616,9 +2616,9 @@ - #ifndef SharedDpsTkRev - #define SharedDpsTkRev 1.0 - #endif --SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) -+SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) - #else --ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir) - #endif - - PSRESLIBSRC = $(LIBSRC)/psres -@@ -2626,9 +2626,9 @@ - #ifndef SharedPSResRev - #define SharedPSResRev 1.0 - #endif --SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) -+SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) - #else --ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir) - #endif - - GLULIBSRC = $(LIBSRC)/GLU -@@ -2636,9 +2636,9 @@ - #ifndef SharedGluRev - #define SharedGluRev 1.3 - #endif --SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) -+SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) - #else --ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir) - #endif - - GLXLIBSRC = $(LIBSRC)/GL -@@ -2646,18 +2646,18 @@ - #ifndef SharedGlxRev - #define SharedGlxRev 1.2 - #endif --SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) -+SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) - #else --ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) - #endif - GLWIDGETSRC = $(LIBSRC)/GLw - #if SharedLibGLw - #ifndef SharedGLwRev - #define SharedGLwRev 1.0 /* used to name the shared library */ - #endif --SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) -+SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) - #else --ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir) - #endif - - XRENDERLIBSRC = $(LIBSRC)/Xrender -@@ -2665,9 +2665,9 @@ - #ifndef SharedXrenderRev - #define SharedXrenderRev 1.2.2 - #endif --SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) -+SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) - #else --ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) - #endif - - XRANDRLIBSRC = $(LIBSRC)/Xrandr -@@ -2675,9 +2675,9 @@ - #ifndef SharedXrandrRev - #define SharedXrandrRev 2.0 - #endif --SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) -+SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) - #else --ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) - #endif - - XFIXESLIBSRC = $(LIBSRC)/Xfixes -@@ -2685,9 +2685,9 @@ - #ifndef SharedXfixesRev - #define SharedXfixesRev 3.0 - #endif --SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) -+SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) - #else --ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) - #endif - - XDAMAGELIBSRC = $(LIBSRC)/Xdamage -@@ -2695,9 +2695,9 @@ - #ifndef SharedXdamageRev - #define SharedXdamageRev 1.0 - #endif --SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) -+SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) - #else --ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) - #endif - - XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite -@@ -2705,9 +2705,9 @@ - #ifndef SharedXcompositeRev - #define SharedXcompositeRev 1.0 - #endif --SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) -+SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) - #else --ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) - #endif - - XEVIELIBSRC = $(LIBSRC)/Xevie -@@ -2715,9 +2715,9 @@ - #ifndef SharedXevieRev - #define SharedXevieRev 1.0 - #endif --SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) -+SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) - #else --ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir) - #endif - - XCURSORLIBSRC = $(LIBSRC)/Xcursor -@@ -2725,9 +2725,9 @@ - #ifndef SharedXcursorRev - #define SharedXcursorRev 1.0.2 - #endif --SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) -+SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) - #else --ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir) - #endif - - APPLEWMLIBSRC = $(LIBSRC)/apple -@@ -2735,9 +2735,9 @@ - #ifndef SharedAppleWMRev - #define SharedAppleWMRev 1.0 - #endif --SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) -+SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) - #else --ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) - #endif - - WINDOWSWMLIBSRC = $(LIBSRC)/windows -@@ -2745,9 +2745,9 @@ - #ifndef SharedWindowsWMRev - #define SharedWindowsWMRev 1.0 - #endif --SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) -+SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) - #else --ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) - #endif - - # ifndef SharedLibXfontcache -@@ -2768,9 +2768,9 @@ - #ifndef SharedXfontcacheRev - #define SharedXfontcacheRev 1.2 - #endif --SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) -+SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) - #else --ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXau -@@ -2790,12 +2790,12 @@ - #ifndef SharedXauRev - #define SharedXauRev 6.0 - #endif --SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) -+SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) - #else - #if !UseInstalledXauLib --ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir) - #else --ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) -+ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) - #endif - #endif - -@@ -2816,12 +2816,12 @@ - #ifndef SharedXdmcpRev - #define SharedXdmcpRev 6.0 - #endif --SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) -+SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) - #else - #if !UseInstalledXdmcpLib --ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) - #else --ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) -+ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) - #endif - #endif - -@@ -2842,9 +2842,9 @@ - #ifndef SharedXmuRev - #define SharedXmuRev 6.2 - #endif --SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) -+SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) - #else --ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXmuu -@@ -2864,9 +2864,9 @@ - #ifndef SharedXmuuRev - #define SharedXmuuRev 1.0 - #endif --SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) -+SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) - #else --ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir) - #endif - - #ifndef SharedOldX -@@ -2886,9 +2886,9 @@ - #ifndef SharedOldXRev - #define SharedOldXRev 6.0 - #endif --SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) -+SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) - #else --ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXp -@@ -2908,9 +2908,9 @@ - #ifndef SharedXpRev - #define SharedXpRev 6.2 - #endif --SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) -+SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) - #else --ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXt -@@ -2930,9 +2930,9 @@ - #ifndef SharedXtRev - #define SharedXtRev 6.0 - #endif --SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) -+SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) - #else --ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir) - #endif - DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) - XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) -@@ -2956,9 +2956,9 @@ - #ifndef SharedXaRev - #define SharedXaRev 1.0 - #endif --SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev) -+SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev) - #else --UnsharedLibReferences(XA,Xa,$(XALIBSRC)) -+UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) - #endif - - #ifndef BuildXaw -@@ -2985,9 +2985,9 @@ - #ifndef SharedXawRev - #define SharedXawRev 8.0 - #endif --SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) -+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) - #else --ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir) - #endif - #endif - -@@ -3013,14 +3013,14 @@ - #ifndef SharedXaw7Rev - #define SharedXaw7Rev 7.0 - #endif --SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) -+SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) - #if !BuildXaw --SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) -+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) - #endif - #else --ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) - #if !BuildXaw --ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) - #endif - #endif - #endif -@@ -3048,14 +3048,14 @@ - #ifndef SharedXaw6Rev - #define SharedXaw6Rev 6.1 - #endif --SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) -+SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) - #if !BuildXaw && !BuildXaw7 --SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) -+SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) - #endif - #else --ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) - #if !BuildXaw && !BuildXaw7 --ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) - #endif - #endif - #endif -@@ -3077,9 +3077,9 @@ - #ifndef SharedXiRev - #define SharedXiRev 6.0 - #endif --SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) -+SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) - #else --ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXtst -@@ -3099,12 +3099,12 @@ - #ifndef SharedXtstRev - #define SharedXtstRev 6.1 - #endif --SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) -+SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) - #else --ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir) - #endif - --ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) -+ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) - - #ifndef SharedLibICE - #define SharedLibICE HasSharedLibraries -@@ -3123,9 +3123,9 @@ - #ifndef SharedICERev - #define SharedICERev 6.4 - #endif --SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) -+SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev) - #else --ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) -+ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir) - #endif - - #ifndef SharedLibSM -@@ -3145,9 +3145,9 @@ - #ifndef SharedSMRev - #define SharedSMRev 6.0 - #endif --SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) -+SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev) - #else --ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXkey -@@ -3167,9 +3167,9 @@ - #ifndef SharedXkeyRev - #define SharedXkeyRev 6.0 - #endif --SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) -+SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) - #else --ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir) - #endif - - #ifndef SharedLibFS -@@ -3189,9 +3189,9 @@ - #ifndef SharedFSRev - #define SharedFSRev 6.0 - #endif --SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) -+SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev) - #else --ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibFont -@@ -3212,14 +3212,14 @@ - #define SharedFontRev 1.5 - #endif - SharedFontLibReferences() --XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) -+XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) - #else - ProjectUnsharedFontLibReferences() --XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) -+XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir) - #endif - - FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs --ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) - DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) - FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) - -@@ -3241,9 +3241,9 @@ - #ifndef SharedFontEncRev - #define SharedFontEncRev 1.0 - #endif --SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) -+SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) - #else --ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) - #endif - - #ifndef SharedLibXpm -@@ -3263,9 +3263,9 @@ - #ifndef SharedXpmRev - #define SharedXpmRev 4.11 - #endif --SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) -+SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) - #else --ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) - #endif - - #if UseFreetype2 -@@ -3313,9 +3313,9 @@ - #define SharedFreetype2Rev 9.0 - #endif - #endif --SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) -+SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) - #else --ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir) - #endif - - #ifdef UseInstalled -@@ -3470,9 +3470,9 @@ - #define SharedExpatRev 4.0 - #endif - #endif --SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) -+SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) - #else --ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir) - #endif - - #if UseExpat -@@ -3552,9 +3552,9 @@ - #ifndef SharedXft1Rev - #define SharedXft1Rev 1.1 - #endif --SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) -+SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) - #else --ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir) - #endif - - #ifndef Xft1ClientDepLibs -@@ -3589,9 +3589,9 @@ - #ifndef SharedXftRev - #define SharedXftRev 2.1.2 - #endif --SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) -+SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) - #else --ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir) - #endif - - #ifndef XftClientDepLibs -@@ -3622,9 +3622,9 @@ - #ifndef SharedFontconfigRev - #define SharedFontconfigRev 1.0.4 - #endif --SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) -+SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) - #else --ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) - #endif - - #ifdef UseInstalled -@@ -3827,9 +3827,9 @@ - # ifndef SharedxkbfileRev - # define SharedxkbfileRev 1.0 - # endif --SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) -+SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) - #else --ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) - #endif - - #if BuildXKBlib -@@ -3899,9 +3899,9 @@ - # ifndef SharedxkbuiRev - # define SharedxkbuiRev 1.0 - # endif --SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) -+SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) - #else --ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir) - #endif - - #ifndef XkbuiLibs -@@ -3974,9 +3974,9 @@ - #ifndef SharedXTrapRev - #define SharedXTrapRev 6.4 - #endif --SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) -+SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) - #else --ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) -+ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir) - #endif - - #ifndef NeedDefaultDepLibs ---- a/nx-X11/config/cf/lnxLib.rules -+++ b/nx-X11/config/cf/lnxLib.rules -@@ -389,7 +389,7 @@ - XCOMM libX11.so (X11, SM, ICE) - JUMP_ROOT_X11 = $(XLIBSRC) - JUMP_IS_HOST_X11 = YES --JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa -+JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa - JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) - JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared - JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) -@@ -400,9 +400,9 @@ - JUMP_ADDRESS_X11 = 0x60200000 - JUMP_JUMPTABLESIZE_X11 = 0x4000 - JUMP_GOTSIZE_X11 = 4096 --JUMP_STUBNAMES_X11 = libX11 libSM libICE -+JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE - JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) --JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~ -+JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~ - JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) - - XCOMM libSM (part of libX11.so) -@@ -435,9 +435,9 @@ - JUMP_GOTSIZE_Xt = 4096 - JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp - JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) --JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~ --JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \ -- $(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -+JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~ -+JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \ -+ $(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc) - - XCOMM libXmu (part of libXt.so) - JUMP_ROOT_Xmu = $(XMUSRC) -@@ -485,8 +485,8 @@ - JUMP_GOTSIZE_Xaw = 4096 - JUMP_STUBNAMES_Xaw = libXaw - JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) --JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \ -- $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \ -+JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \ -+ $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \ - $(JUMP_LDLIBS_libc) - - # endif /* !UseInstalled */ ---- a/nx-X11/config/cf/lnxLib.tmpl -+++ b/nx-X11/config/cf/lnxLib.tmpl -@@ -9,7 +9,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - -@@ -66,7 +66,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIB = -lXmu $(XLIB) -+XMULIB = -lNX_Xmu $(XLIB) - #endif - - #endif /* UseElfFormat */ ---- a/nx-X11/lib/X11/Imakefile -+++ b/nx-X11/lib/X11/Imakefile -@@ -82,7 +82,7 @@ - #define DoExtraLib SharedLibX11 - #define DoDebugLib DebugLibX11 - #define DoProfileLib ProfileLibX11 --#define LibName X11 -+#define LibName NX_X11 - #define SoRev SOXLIBREV - #define HugeLibrary YES - #define IncSubdir X11 ---- a/nx-X11/lib/XRes/Imakefile -+++ b/nx-X11/lib/XRes/Imakefile -@@ -4,7 +4,7 @@ - #define DoSharedLib SharedLibXRes - #define DoDebugLib DebugLibXRes - #define DoProfileLib ProfileLibXRes --#define LibName XRes -+#define LibName NX_XRes - #define SoRev SOXRESREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xau/Imakefile -+++ b/nx-X11/lib/Xau/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXau - #define DoDebugLib DebugLibXau - #define DoProfileLib ProfileLibXau --#define LibName Xau -+#define LibName NX_Xau - #define SoRev SOXAUTHREV - #define IncSubdir X11 - ---- a/nx-X11/lib/Xcomposite/Imakefile -+++ b/nx-X11/lib/Xcomposite/Imakefile -@@ -14,7 +14,7 @@ - #define DoDebugLib DebugLibXcomposite - #define DoProfileLib ProfileLibXcomposite - --#define LibName Xcomposite -+#define LibName NX_Xcomposite - #define SoRev SOXCOMPOSITEREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xcomposite/xcomposite.pc.in -+++ b/nx-X11/lib/Xcomposite/xcomposite.pc.in -@@ -7,4 +7,4 @@ - Description: X Composite Library - Version: @VERSION@ - Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ --Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ -+Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ ---- a/nx-X11/lib/Xcursor/Imakefile -+++ b/nx-X11/lib/Xcursor/Imakefile -@@ -15,7 +15,7 @@ - #define DoDebugLib DebugLibXcursor - #define DoProfileLib ProfileLibXcursor - --#define LibName Xcursor -+#define LibName NX_Xcursor - #define SoRev SOXCURSORREV - #define IncSubdir X11 - #define IncSubSubdir Xcursor ---- a/nx-X11/lib/Xcursor/xcursor.pc.in -+++ b/nx-X11/lib/Xcursor/xcursor.pc.in -@@ -12,4 +12,4 @@ - Version: @VERSION@ - Requires: xrender - Cflags: -I${includedir} ${xrendercflags} ${xcflags} --Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} -+Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs} ---- a/nx-X11/lib/Xdamage/Imakefile -+++ b/nx-X11/lib/Xdamage/Imakefile -@@ -14,7 +14,7 @@ - #define DoDebugLib DebugLibXdamage - #define DoProfileLib ProfileLibXdamage - --#define LibName Xdamage -+#define LibName NX_Xdamage - #define SoRev SOXDAMAGEREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xdamage/xdamage.pc.in -+++ b/nx-X11/lib/Xdamage/xdamage.pc.in -@@ -7,4 +7,4 @@ - Description: X Damage Library - Version: @VERSION@ - Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ --Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@ -+Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@ ---- a/nx-X11/lib/Xdmcp/Imakefile -+++ b/nx-X11/lib/Xdmcp/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXdmcp - #define DoDebugLib DebugLibXdmcp - #define DoProfileLib ProfileLibXdmcp --#define LibName Xdmcp -+#define LibName NX_Xdmcp - #define SoRev SOXDMCPREV - #define IncSubdir X11 - ---- a/nx-X11/lib/Xext/Imakefile -+++ b/nx-X11/lib/Xext/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXext - #define DoDebugLib DebugLibXext - #define DoProfileLib ProfileLibXext --#define LibName Xext -+#define LibName NX_Xext - #define SoRev SOXEXTREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xfixes/Imakefile -+++ b/nx-X11/lib/Xfixes/Imakefile -@@ -14,7 +14,7 @@ - #define DoDebugLib DebugLibXfixes - #define DoProfileLib ProfileLibXfixes - --#define LibName Xfixes -+#define LibName NX_Xfixes - #define SoRev SOXFIXESREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xfixes/xfixes.pc.in -+++ b/nx-X11/lib/Xfixes/xfixes.pc.in -@@ -7,4 +7,4 @@ - Description: X Fixes Library - Version: @VERSION@ - Cflags: -I${includedir} @X_CFLAGS@ --Libs: -L${libdir} -lXfixes @X_LIBS@ -+Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ ---- a/nx-X11/lib/Xinerama/Imakefile -+++ b/nx-X11/lib/Xinerama/Imakefile -@@ -4,7 +4,7 @@ - #define DoSharedLib SharedLibXinerama - #define DoDebugLib DebugLibXinerama - #define DoProfileLib ProfileLibXinerama --#define LibName Xinerama -+#define LibName NX_Xinerama - #define SoRev SOXINERAMAREV - #define LibHeaders NO - ---- a/nx-X11/lib/Xpm/Imakefile -+++ b/nx-X11/lib/Xpm/Imakefile -@@ -12,7 +12,7 @@ - #define DoDebugLib DebugLibXpm - #define DoProfileLib ProfileLibXpm - #define HasSharedData NO --#define LibName Xpm -+#define LibName NX_Xpm - #define SoRev SOXPMREV - #define IncSubdir X11 - ---- a/nx-X11/lib/Xrandr/Imakefile -+++ b/nx-X11/lib/Xrandr/Imakefile -@@ -5,7 +5,7 @@ - #define DoSharedLib SharedLibXrandr - #define DoDebugLib DebugLibXrandr - #define DoProfileLib ProfileLibXrandr --#define LibName Xrandr -+#define LibName NX_Xrandr - #define SoRev SOXRANDRREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/Xrender/Imakefile -+++ b/nx-X11/lib/Xrender/Imakefile -@@ -74,7 +74,7 @@ - #define DoSharedLib SharedLibXrender - #define DoDebugLib DebugLibXrender - #define DoProfileLib ProfileLibXrender --#define LibName Xrender -+#define LibName NX_Xrender - #define SoRev SOXRENDERREV - - #ifdef XBuildIncDir ---- a/nx-X11/lib/Xrender/xrender.pc.in -+++ b/nx-X11/lib/Xrender/xrender.pc.in -@@ -8,4 +8,4 @@ - Version: @VERSION@ - Requires: @X_REQUIRES@ - Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ --Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ -+Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ ---- a/nx-X11/lib/Xtst/Imakefile -+++ b/nx-X11/lib/Xtst/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedLibXtst - #define DoDebugLib DebugLibXtst - #define DoProfileLib ProfileLibXtst --#define LibName Xtst -+#define LibName NX_Xtst - #define SoRev SOXTESTREV - #define LibHeaders NO - ---- a/nx-X11/lib/font/Imakefile -+++ b/nx-X11/lib/font/Imakefile -@@ -31,7 +31,7 @@ - STUBDIRS = stubs - #endif - --LIBNAME = Xfont -+LIBNAME = NX_Xfont - SOREV = $(SOFONTREV) - - #ifndef SeparateSharedCompile ---- a/nx-X11/lib/oldX/Imakefile -+++ b/nx-X11/lib/oldX/Imakefile -@@ -10,7 +10,7 @@ - #define DoExtraLib SharedOldX - #define DoDebugLib DebugOldX - #define DoProfileLib ProfileOldX --#define LibName oldX -+#define LibName NX_oldX - #define SoRev SOOLDXREV - #define IncSubdir X11 - ---- a/nx-X11/lib/xkbfile/Imakefile -+++ b/nx-X11/lib/xkbfile/Imakefile -@@ -11,7 +11,7 @@ - #define DoDebugLib DebugLibxkbfile - #define DoProfileLib ProfileLibxkbfile - #define HasSharedData NO --#define LibName xkbfile -+#define LibName NX_xkbfile - #define SoRev SOXKBFILEREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/lib/xkbui/Imakefile -+++ b/nx-X11/lib/xkbui/Imakefile -@@ -6,7 +6,7 @@ - #define DoDebugLib DebugLibxkbui - #define DoProfileLib ProfileLibxkbui - #define HasSharedData NO --#define LibName xkbui -+#define LibName NX_xkbui - #define SoRev SOXKBUIREV - #define IncSubdir X11 - #define IncSubSubdir extensions ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -313,7 +313,7 @@ - FONTBASE = $(FONTLIBSRC)/fontbase.o \ - $(FONTLIBSRC)/LibraryTargetName(fontbase) - #if XserverStaticFontLib -- FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) -+ FONT = $(FONTLIBSRC)/LibraryTargetName(NX_Xfont) $(FREETYPE2LIB) - #else - FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) - #endif -@@ -994,7 +994,7 @@ - dix/main.o - #endif - --XPMLIB = -lXpm -+XPMLIB = -lNX_Xpm - NXAGENT = hw/nxagent/LibraryTargetName(nxagent) - NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) - NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) -@@ -1012,18 +1012,18 @@ - - #if defined(SunArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -- -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \ -+ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \ -+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp \ - `pkg-config --libs libxml-2.0` - #elif defined(cygwinArchitecture) - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ -+ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ -+ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \ - `pkg-config --libs libxml-2.0` - #else - NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \ -+ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \ -+ -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp \ - `pkg-config --libs libxml-2.0` - #endif - -@@ -1078,7 +1078,7 @@ - else exit 0; fi - $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ - $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ -- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS) -+ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS) - #endif /* NXAgentServer */ - - #if defined(XnonServer) && XnonServer ---- a/nxcompext/Makefile.in -+++ b/nxcompext/Makefile.in -@@ -42,12 +42,12 @@ - CCDEFINES = - - LDFLAGS = @LDFLAGS@ -L../nxcomp --LIBS = @LIBS@ -lz -lX11 -lXcomp -+LIBS = @LIBS@ -lz -lNX_X11 -lXcomp - - # - # Only if THREADS is defined - # --# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp -+# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp - # - - srcdir = @srcdir@ ---- a/nxcompshad/Makefile.in -+++ b/nxcompshad/Makefile.in -@@ -48,7 +48,7 @@ - CCDEFINES = - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -lX11 -+LIBS = @LIBS@ -lNX_X11 - - # - # Only if THREADS is defined. -@@ -139,7 +139,7 @@ - - else - --EXTRALIBS = -lXtst -lXrandr -lXdamage -+EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage - - all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) - diff --git a/debian/patches/series b/debian/patches/series index b00553eed..6a20a8f47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ #401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch -600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch 601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch 602_nx-X11_initgroups.full.patch 603_nx-X11_compilation_warnings.full.patch diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index 21c223d8e..3923e4a10 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsource) */ #ifndef ProjectUnsharedFontLibReferences #define ProjectUnsharedFontLibReferences() @@\ -DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\ -FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ -LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) +DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\ +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ +LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) #endif /* @@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) #ifndef SharedFontLibReferences #define SharedFontLibReferences() @@\ SOFONTREV = SharedFontRev @@\ -DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ -FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ -LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) +DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ +LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) #endif /* diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index accba403c..778e3099a 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1835,9 +1835,9 @@ VENDORSUPPORTDEFS = VendorSupportDefines #ifndef SharedX11Rev #define SharedX11Rev 6.2 #endif -SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) +SharedLibReferences(XONLY,NX_X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) #else -ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #endif /* Common alternate spellings */ DEPXLIBONLY = $(DEPXONLYLIB) @@ -2466,9 +2466,9 @@ ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir) #ifndef SharedXextRev #define SharedXextRev 6.4 #endif -SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) +SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev) #else -ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir) #endif LINTEXTENSIONLIB = $(LINTEXTENSION) DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) @@ -2480,9 +2480,9 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) #ifndef SharedXssRev #define SharedXssRev 1.0 #endif -SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) +SharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev) #else -ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XSS,NX_Xss,$(XSSLIBSRC),XBuildLibDir) #endif XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc @@ -2490,9 +2490,9 @@ ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir) #ifndef SharedXxf86miscRev #define SharedXxf86miscRev 1.1 #endif -SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) +SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) #else -ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) #endif XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm @@ -2500,9 +2500,9 @@ ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir #ifndef SharedXxf86vmRev #define SharedXxf86vmRev 1.0 #endif -SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) +SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) #else -ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) #endif XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga @@ -2510,9 +2510,9 @@ ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) #ifndef SharedXxf86dgaRev #define SharedXxf86dgaRev 1.0 #endif -SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) +SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) #else -ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) #endif #if BuildDmxLibrary @@ -2544,9 +2544,9 @@ ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) #ifndef SharedXxf86rushRev #define SharedXxf86rushRev 1.0 #endif -SharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) +SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) #else -ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) #endif @@ -2555,9 +2555,9 @@ ProjectUnsharedLibReferences(XXF86RUSH,Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir #ifndef SharedXvRev #define SharedXvRev 1.0 #endif -SharedLibReferences(XV,Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) +SharedLibReferences(XV,NX_Xv,$(XVLIBSRC),SOXVREV,SharedXvRev) #else -ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XV,NX_Xv,$(XVLIBSRC),XBuildLibDir) #endif @@ -2566,9 +2566,9 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir) #ifndef SharedXvMCRev #define SharedXvMCRev 1.0 #endif -SharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) +SharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),SOXVMCREV,SharedXvMCRev) #else -ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XVMC,NX_XvMC,$(XVMCLIBSRC),XBuildLibDir) #endif XINERAMALIBSRC = $(LIBSRC)/Xinerama @@ -2576,9 +2576,9 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir) #ifndef SharedXineramaRev #define SharedXineramaRev 1.0 #endif -SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) +SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) #else -ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) #endif XRESLIBSRC = $(LIBSRC)/XRes @@ -2586,9 +2586,9 @@ ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) #ifndef SharedXResRev #define SharedXResRev 1.0 #endif -SharedLibReferences(XRES,XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) +SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) #else -ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) #endif DMXLIBSRC = $(LIBSRC)/dmx @@ -2596,9 +2596,9 @@ ProjectUnsharedLibReferences(XRES,XRes,$(XRESLIBSRC),XBuildLibDir) #ifndef SharedDmxRev #define SharedDmxRev 1.0 #endif -SharedLibReferences(DMX,dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) +SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev) #else -ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir) #endif DPSLIBSRC = $(LIBSRC)/dps @@ -2606,9 +2606,9 @@ ProjectUnsharedLibReferences(DMX,dmx,$(DMXLIBSRC),XBuildLibDir) #ifndef SharedDpsRev #define SharedDpsRev 1.0 #endif -SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) +SharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev) #else -ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(DPS,NX_dps,$(DPSLIBSRC),XBuildLibDir) #endif DPSTKLIBSRC = $(LIBSRC)/dpstk @@ -2616,9 +2616,9 @@ ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir) #ifndef SharedDpsTkRev #define SharedDpsTkRev 1.0 #endif -SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) +SharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev) #else -ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(DPSTK,NX_dpstk,$(DPSTKLIBSRC),XBuildLibDir) #endif PSRESLIBSRC = $(LIBSRC)/psres @@ -2626,9 +2626,9 @@ ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir) #ifndef SharedPSResRev #define SharedPSResRev 1.0 #endif -SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) +SharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev) #else -ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(PSRES,NX_psres,$(PSRESLIBSRC),XBuildLibDir) #endif GLULIBSRC = $(LIBSRC)/GLU @@ -2636,9 +2636,9 @@ ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) #ifndef SharedGluRev #define SharedGluRev 1.3 #endif -SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) +SharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) #else -ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(GLU,NX_GLU,$(GLULIBSRC),XBuildLibDir) #endif GLXLIBSRC = $(LIBSRC)/GL @@ -2646,18 +2646,18 @@ ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) #ifndef SharedGlxRev #define SharedGlxRev 1.2 #endif -SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) +SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) #else -ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) #endif GLWIDGETSRC = $(LIBSRC)/GLw #if SharedLibGLw #ifndef SharedGLwRev #define SharedGLwRev 1.0 /* used to name the shared library */ #endif -SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) +SharedDSLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev) #else -ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) +ProjectUnsharedLibReferences(GLW,NX_GLw,$(GLWIDGETSRC),XBuildLibDir) #endif XRENDERLIBSRC = $(LIBSRC)/Xrender @@ -2665,9 +2665,9 @@ ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) #ifndef SharedXrenderRev #define SharedXrenderRev 1.2.2 #endif -SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) +SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) #else -ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) #endif XRANDRLIBSRC = $(LIBSRC)/Xrandr @@ -2675,9 +2675,9 @@ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) #ifndef SharedXrandrRev #define SharedXrandrRev 2.0 #endif -SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) +SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) #else -ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) #endif XFIXESLIBSRC = $(LIBSRC)/Xfixes @@ -2685,9 +2685,9 @@ ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) #ifndef SharedXfixesRev #define SharedXfixesRev 3.0 #endif -SharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) +SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) #else -ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) #endif XDAMAGELIBSRC = $(LIBSRC)/Xdamage @@ -2695,9 +2695,9 @@ ProjectUnsharedLibReferences(XFIXES,Xfixes,$(XFIXESLIBSRC),XBuildLibDir) #ifndef SharedXdamageRev #define SharedXdamageRev 1.0 #endif -SharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) +SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) #else -ProjectUnsharedLibReferences(XDAMAGE,Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) #endif XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite @@ -2705,9 +2705,9 @@ XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite #ifndef SharedXcompositeRev #define SharedXcompositeRev 1.0 #endif -SharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) +SharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),SOXCOMPOSITEREV,SharedXcompositeRev) #else -ProjectUnsharedLibReferences(XCOMPOSITE,Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XCOMPOSITE,NX_Xcomposite,$(XCOMPOSITELIBSRC),XBuildLibDir) #endif XEVIELIBSRC = $(LIBSRC)/Xevie @@ -2715,9 +2715,9 @@ XEVIELIBSRC = $(LIBSRC)/Xevie #ifndef SharedXevieRev #define SharedXevieRev 1.0 #endif -SharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) +SharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),SOXEVIEREV,SharedXevieRev) #else -ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XEVIE,NX_Xevie,$(XEVIELIBSRC),XBuildLibDir) #endif XCURSORLIBSRC = $(LIBSRC)/Xcursor @@ -2725,9 +2725,9 @@ ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir) #ifndef SharedXcursorRev #define SharedXcursorRev 1.0.2 #endif -SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) +SharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev) #else -ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XCURSOR,NX_Xcursor,$(XCURSORLIBSRC),XBuildLibDir) #endif APPLEWMLIBSRC = $(LIBSRC)/apple @@ -2735,9 +2735,9 @@ ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir) #ifndef SharedAppleWMRev #define SharedAppleWMRev 1.0 #endif -SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) +SharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMRev) #else -ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(APPLEWM,NX_AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) #endif WINDOWSWMLIBSRC = $(LIBSRC)/windows @@ -2745,9 +2745,9 @@ ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir) #ifndef SharedWindowsWMRev #define SharedWindowsWMRev 1.0 #endif -SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) +SharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev) #else -ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(WINDOWSWM,NX_WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir) #endif # ifndef SharedLibXfontcache @@ -2768,9 +2768,9 @@ ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir #ifndef SharedXfontcacheRev #define SharedXfontcacheRev 1.2 #endif -SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) +SharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev) #else -ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFONTCACHE,NX_Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir) #endif #ifndef SharedLibXau @@ -2790,12 +2790,12 @@ ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLib #ifndef SharedXauRev #define SharedXauRev 6.0 #endif -SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) +SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev) #else #if !UseInstalledXauLib -ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir) #else -ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) +ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR)) #endif #endif @@ -2816,12 +2816,12 @@ ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR)) #ifndef SharedXdmcpRev #define SharedXdmcpRev 6.0 #endif -SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) +SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev) #else #if !UseInstalledXdmcpLib -ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir) #else -ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) +ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) #endif #endif @@ -2842,9 +2842,9 @@ ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR)) #ifndef SharedXmuRev #define SharedXmuRev 6.2 #endif -SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) +SharedDSLibReferences(XMU,NX_Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev) #else -ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XMU,NX_Xmu,$(XMUSRC),XBuildLibDir) #endif #ifndef SharedLibXmuu @@ -2864,9 +2864,9 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) #ifndef SharedXmuuRev #define SharedXmuuRev 1.0 #endif -SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) +SharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) #else -ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XMUU,NX_Xmuu,$(XMUUSRC),XBuildLibDir) #endif #ifndef SharedOldX @@ -2886,9 +2886,9 @@ ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) #ifndef SharedOldXRev #define SharedOldXRev 6.0 #endif -SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) +SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) #else -ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) #endif #ifndef SharedLibXp @@ -2908,9 +2908,9 @@ ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) #ifndef SharedXpRev #define SharedXpRev 6.2 #endif -SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) +SharedLibReferences(XP,NX_Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) #else -ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XP,NX_Xp,$(XPLIBSRC),XBuildLibDir) #endif #ifndef SharedLibXt @@ -2930,9 +2930,9 @@ ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) #ifndef SharedXtRev #define SharedXtRev 6.0 #endif -SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) +SharedDSLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) #else -ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XTOOLONLY,NX_Xt,$(TOOLKITSRC),XBuildLibDir) #endif DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) @@ -2956,9 +2956,9 @@ ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir) #ifndef SharedXaRev #define SharedXaRev 1.0 #endif -SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev) +SharedLibReferences(XA,NX_Xa,$(XALIBSRC),SOXAREV,SharedXaRev) #else -UnsharedLibReferences(XA,Xa,$(XALIBSRC)) +UnsharedLibReferences(XA,NX_Xa,$(XALIBSRC)) #endif #ifndef BuildXaw @@ -2985,9 +2985,9 @@ UnsharedLibReferences(XA,Xa,$(XALIBSRC)) #ifndef SharedXawRev #define SharedXawRev 8.0 #endif -SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) +SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) #else -ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGETSRC),XBuildLibDir) #endif #endif @@ -3013,14 +3013,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) #ifndef SharedXaw7Rev #define SharedXaw7Rev 7.0 #endif -SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) +SharedDSLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) #if !BuildXaw -SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) +SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) #endif #else -ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW7,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) #if !BuildXaw -ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET7SRC),XBuildLibDir) #endif #endif #endif @@ -3048,14 +3048,14 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) #ifndef SharedXaw6Rev #define SharedXaw6Rev 6.1 #endif -SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) +SharedDSLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) #if !BuildXaw && !BuildXaw7 -SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) +SharedDSLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) #endif #else -ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW6,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) #if !BuildXaw && !BuildXaw7 -ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) +ProjectUnsharedLibReferences(XAW,NX_Xaw,$(AWIDGET6SRC),XBuildLibDir) #endif #endif #endif @@ -3077,9 +3077,9 @@ ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) #ifndef SharedXiRev #define SharedXiRev 6.0 #endif -SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) +SharedLibReferences(XI,NX_Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev) #else -ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XI,NX_Xi,$(XILIBSRC),XBuildLibDir) #endif #ifndef SharedLibXtst @@ -3099,12 +3099,12 @@ ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir) #ifndef SharedXtstRev #define SharedXtstRev 6.1 #endif -SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) +SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) #else -ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir) #endif -ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) +ProjectUnsharedLibReferences(XBSD,NX_Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) #ifndef SharedLibICE #define SharedLibICE HasSharedLibraries @@ -3123,9 +3123,9 @@ ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir) #ifndef SharedICERev #define SharedICERev 6.4 #endif -SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev) +SharedLibReferences(ICE,NX_ICE,$(ICESRC),SOICEREV,SharedICERev) #else -ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) +ProjectUnsharedLibReferences(ICE,NX_ICE,$(ICESRC),XBuildLibDir) #endif #ifndef SharedLibSM @@ -3145,9 +3145,9 @@ ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir) #ifndef SharedSMRev #define SharedSMRev 6.0 #endif -SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev) +SharedLibReferences(SM,NX_SM,$(SMSRC),SOSMREV,SharedSMRev) #else -ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) +ProjectUnsharedLibReferences(SM,NX_SM,$(SMSRC),XBuildLibDir) #endif #ifndef SharedLibXkey @@ -3167,9 +3167,9 @@ ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir) #ifndef SharedXkeyRev #define SharedXkeyRev 6.0 #endif -SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) +SharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev) #else -ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XKEY,NX_Xkey,$(XKEYSRC),XBuildLibDir) #endif #ifndef SharedLibFS @@ -3189,9 +3189,9 @@ ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir) #ifndef SharedFSRev #define SharedFSRev 6.0 #endif -SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev) +SharedLibReferences(FS,NX_FS,$(FSLIBSRC),SOFSREV,SharedFSRev) #else -ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FS,NX_FS,$(FSLIBSRC),XBuildLibDir) #endif #ifndef SharedLibFont @@ -3212,14 +3212,14 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) #define SharedFontRev 1.5 #endif SharedFontLibReferences() -XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) +XCOMM SharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) #else ProjectUnsharedFontLibReferences() -XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir) +XCOMM ProjectUnsharedLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC),XBuildLibDir) #endif FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs -ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FONTSTUB,NX_fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) @@ -3241,9 +3241,9 @@ ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) #ifndef SharedFontEncRev #define SharedFontEncRev 1.0 #endif -SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) +SharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) #else -ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) #endif #ifndef SharedLibXpm @@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) #ifndef SharedXpmRev #define SharedXpmRev 4.11 #endif -SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) +SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) #else -ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) #endif #if UseFreetype2 @@ -3313,9 +3313,9 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) #define SharedFreetype2Rev 9.0 #endif #endif -SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) +SharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) #else -ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FREETYPE2,NX_freetype,$(FREETYPE2LIBSRC),XBuildLibDir) #endif #ifdef UseInstalled @@ -3470,9 +3470,9 @@ MOTIFINCLUDES = -I$(MOTIFINCDIR) #define SharedExpatRev 4.0 #endif #endif -SharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) +SharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),SOEXPATREV,SharedExpatRev) #else -ProjectUnsharedLibReferences(EXPAT,expat,$(EXPATLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(EXPAT,NX_expat,$(EXPATLIBSRC),XBuildLibDir) #endif #if UseExpat @@ -3552,9 +3552,9 @@ EXPATDEFINES = -DEXPAT #ifndef SharedXft1Rev #define SharedXft1Rev 1.1 #endif -SharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) +SharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),SOXFT1REV,SharedXft1Rev) #else -ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFT1,NX_Xft,$(XFT1LIBSRC),XBuildLibDir) #endif #ifndef Xft1ClientDepLibs @@ -3589,9 +3589,9 @@ ProjectUnsharedLibReferences(XFT1,Xft,$(XFT1LIBSRC),XBuildLibDir) #ifndef SharedXftRev #define SharedXftRev 2.1.2 #endif -SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) +SharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) #else -ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XFT,NX_Xft,$(XFTLIBSRC),XBuildLibDir) #endif #ifndef XftClientDepLibs @@ -3622,9 +3622,9 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) #ifndef SharedFontconfigRev #define SharedFontconfigRev 1.0.4 #endif -SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) +SharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) #else -ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FONTCONFIG,NX_fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir) #endif #ifdef UseInstalled @@ -3827,9 +3827,9 @@ LIBPNGLIB = -L$(LIBPNGLIBDIR) LinkerRuntimeLibraryPathFlag($(LIBPNGLIBDIR)) -lpn # ifndef SharedxkbfileRev # define SharedxkbfileRev 1.0 # endif -SharedLibReferences(XKBFILE,xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) +SharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILESRC),SOXKBFILEREV, SharedxkbfileRev) #else -ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) #endif #if BuildXKBlib @@ -3899,9 +3899,9 @@ ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) # ifndef SharedxkbuiRev # define SharedxkbuiRev 1.0 # endif -SharedLibReferences(XKBUI,xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) +SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) #else -ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir) #endif #ifndef XkbuiLibs @@ -3974,9 +3974,9 @@ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs #ifndef SharedXTrapRev #define SharedXTrapRev 6.4 #endif -SharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) +SharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),SOXTRAPREV,SharedXTrapRev) #else -ProjectUnsharedLibReferences(XTRAP,XTrap,$(XTRAPLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XTRAP,NX_XTrap,$(XTRAPLIBSRC),XBuildLibDir) #endif #ifndef NeedDefaultDepLibs diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index 0cc71d325..409203137 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc XCOMM libX11.so (X11, SM, ICE) JUMP_ROOT_X11 = $(XLIBSRC) JUMP_IS_HOST_X11 = YES -JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa +JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE) JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES) @@ -400,9 +400,9 @@ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars JUMP_ADDRESS_X11 = 0x60200000 JUMP_JUMPTABLESIZE_X11 = 0x4000 JUMP_GOTSIZE_X11 = 4096 -JUMP_STUBNAMES_X11 = libX11 libSM libICE +JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE JUMP_STUBS_IMPORT_X11 = $(LIBC_SA) -JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~ +JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~ JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc) XCOMM libSM (part of libX11.so) @@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000 JUMP_GOTSIZE_Xt = 4096 JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11) -JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~ -JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \ - $(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) +JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~ +JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \ + $(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc) XCOMM libXmu (part of libXt.so) JUMP_ROOT_Xmu = $(XMUSRC) @@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000 JUMP_GOTSIZE_Xaw = 4096 JUMP_STUBNAMES_Xaw = libXaw JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11) -JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \ - $(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \ +JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \ + $(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \ $(JUMP_LDLIBS_libc) # endif /* !UseInstalled */ diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index f1eb5ac4b..788733c1f 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIBONLY = -lXmu @@\ +XMULIBONLY = -lNX_Xmu @@\ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif @@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #ifndef FixupLibReferences #define FixupLibReferences() @@\ -XMULIB = -lXmu $(XLIB) +XMULIB = -lNX_Xmu $(XLIB) #endif #endif /* UseElfFormat */ diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index c0ae81071..9f0b682b3 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -82,7 +82,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status #define DoExtraLib SharedLibX11 #define DoDebugLib DebugLibX11 #define DoProfileLib ProfileLibX11 -#define LibName X11 +#define LibName NX_X11 #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 diff --git a/nx-X11/lib/XRes/Imakefile b/nx-X11/lib/XRes/Imakefile index 410f57ff5..fbc067a4a 100644 --- a/nx-X11/lib/XRes/Imakefile +++ b/nx-X11/lib/XRes/Imakefile @@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XRes/Imakefile,v 1.3 2003/10/13 21:19:28 herrb Exp $ #define DoSharedLib SharedLibXRes #define DoDebugLib DebugLibXRes #define DoProfileLib ProfileLibXRes -#define LibName XRes +#define LibName NX_XRes #define SoRev SOXRESREV #define LibHeaders NO diff --git a/nx-X11/lib/Xau/Imakefile b/nx-X11/lib/Xau/Imakefile index 49cb7dcd3..331d29c09 100644 --- a/nx-X11/lib/Xau/Imakefile +++ b/nx-X11/lib/Xau/Imakefile @@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $ #define DoExtraLib SharedLibXau #define DoDebugLib DebugLibXau #define DoProfileLib ProfileLibXau -#define LibName Xau +#define LibName NX_Xau #define SoRev SOXAUTHREV #define IncSubdir X11 diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile index 053df3d70..a3b94145c 100644 --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -14,7 +14,7 @@ SOXCOMPOSITEREV=1.0.0 #define DoDebugLib DebugLibXcomposite #define DoProfileLib ProfileLibXcomposite -#define LibName Xcomposite +#define LibName NX_Xcomposite #define SoRev SOXCOMPOSITEREV #define IncSubdir X11 #define IncSubSubdir extensions diff --git a/nx-X11/lib/Xcomposite/xcomposite.pc.in b/nx-X11/lib/Xcomposite/xcomposite.pc.in index 770adf515..c319694f1 100644 --- a/nx-X11/lib/Xcomposite/xcomposite.pc.in +++ b/nx-X11/lib/Xcomposite/xcomposite.pc.in @@ -7,4 +7,4 @@ Name: Xcomposite Description: X Composite Library Version: @VERSION@ Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ +Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ diff --git a/nx-X11/lib/Xcursor/Imakefile b/nx-X11/lib/Xcursor/Imakefile index 3e50841ff..53b41e893 100644 --- a/nx-X11/lib/Xcursor/Imakefile +++ b/nx-X11/lib/Xcursor/Imakefile @@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2 #define DoDebugLib DebugLibXcursor #define DoProfileLib ProfileLibXcursor -#define LibName Xcursor +#define LibName NX_Xcursor #define SoRev SOXCURSORREV #define IncSubdir X11 #define IncSubSubdir Xcursor diff --git a/nx-X11/lib/Xcursor/xcursor.pc.in b/nx-X11/lib/Xcursor/xcursor.pc.in index c39fce712..87aba1209 100644 --- a/nx-X11/lib/Xcursor/xcursor.pc.in +++ b/nx-X11/lib/Xcursor/xcursor.pc.in @@ -12,4 +12,4 @@ Description: X Cursor Library Version: @VERSION@ Requires: xrender Cflags: -I${includedir} ${xrendercflags} ${xcflags} -Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs} +Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs} diff --git a/nx-X11/lib/Xdamage/Imakefile b/nx-X11/lib/Xdamage/Imakefile index 260dfeb56..d0d767a20 100644 --- a/nx-X11/lib/Xdamage/Imakefile +++ b/nx-X11/lib/Xdamage/Imakefile @@ -14,7 +14,7 @@ SOXDAMAGEREV=1.0.1 #define DoDebugLib DebugLibXdamage #define DoProfileLib ProfileLibXdamage -#define LibName Xdamage +#define LibName NX_Xdamage #define SoRev SOXDAMAGEREV #define IncSubdir X11 #define IncSubSubdir extensions diff --git a/nx-X11/lib/Xdamage/xdamage.pc.in b/nx-X11/lib/Xdamage/xdamage.pc.in index dbf77ac57..d1c9f5de6 100644 --- a/nx-X11/lib/Xdamage/xdamage.pc.in +++ b/nx-X11/lib/Xdamage/xdamage.pc.in @@ -7,4 +7,4 @@ Name: Xdamage Description: X Damage Library Version: @VERSION@ Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@ +Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@ diff --git a/nx-X11/lib/Xdmcp/Imakefile b/nx-X11/lib/Xdmcp/Imakefile index 08b91cd45..1fc7b6de3 100644 --- a/nx-X11/lib/Xdmcp/Imakefile +++ b/nx-X11/lib/Xdmcp/Imakefile @@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $ #define DoExtraLib SharedLibXdmcp #define DoDebugLib DebugLibXdmcp #define DoProfileLib ProfileLibXdmcp -#define LibName Xdmcp +#define LibName NX_Xdmcp #define SoRev SOXDMCPREV #define IncSubdir X11 diff --git a/nx-X11/lib/Xext/Imakefile b/nx-X11/lib/Xext/Imakefile index b323dc7c2..c43361f12 100644 --- a/nx-X11/lib/Xext/Imakefile +++ b/nx-X11/lib/Xext/Imakefile @@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.12 2002/10/16 00:37:27 dawes Exp $ #define DoExtraLib SharedLibXext #define DoDebugLib DebugLibXext #define DoProfileLib ProfileLibXext -#define LibName Xext +#define LibName NX_Xext #define SoRev SOXEXTREV #define LibHeaders NO diff --git a/nx-X11/lib/Xfixes/Imakefile b/nx-X11/lib/Xfixes/Imakefile index c053aa2b5..bbf88e1d0 100644 --- a/nx-X11/lib/Xfixes/Imakefile +++ b/nx-X11/lib/Xfixes/Imakefile @@ -14,7 +14,7 @@ SOXFIXESREV=3.0.0 #define DoDebugLib DebugLibXfixes #define DoProfileLib ProfileLibXfixes -#define LibName Xfixes +#define LibName NX_Xfixes #define SoRev SOXFIXESREV #define IncSubdir X11 #define IncSubSubdir extensions diff --git a/nx-X11/lib/Xfixes/xfixes.pc.in b/nx-X11/lib/Xfixes/xfixes.pc.in index 6180ea371..54e9ac709 100644 --- a/nx-X11/lib/Xfixes/xfixes.pc.in +++ b/nx-X11/lib/Xfixes/xfixes.pc.in @@ -7,4 +7,4 @@ Name: Xfixes Description: X Fixes Library Version: @VERSION@ Cflags: -I${includedir} @X_CFLAGS@ -Libs: -L${libdir} -lXfixes @X_LIBS@ +Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ diff --git a/nx-X11/lib/Xinerama/Imakefile b/nx-X11/lib/Xinerama/Imakefile index 99271306b..910f98da6 100644 --- a/nx-X11/lib/Xinerama/Imakefile +++ b/nx-X11/lib/Xinerama/Imakefile @@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xinerama/Imakefile,v 1.4 2002/10/16 00:37:31 dawes Exp $ #define DoSharedLib SharedLibXinerama #define DoDebugLib DebugLibXinerama #define DoProfileLib ProfileLibXinerama -#define LibName Xinerama +#define LibName NX_Xinerama #define SoRev SOXINERAMAREV #define LibHeaders NO diff --git a/nx-X11/lib/Xpm/Imakefile b/nx-X11/lib/Xpm/Imakefile index dd98b2fb8..35e961083 100644 --- a/nx-X11/lib/Xpm/Imakefile +++ b/nx-X11/lib/Xpm/Imakefile @@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.1 1999/01/11 14:40:02 dawes Exp $ #define DoDebugLib DebugLibXpm #define DoProfileLib ProfileLibXpm #define HasSharedData NO -#define LibName Xpm +#define LibName NX_Xpm #define SoRev SOXPMREV #define IncSubdir X11 diff --git a/nx-X11/lib/Xrandr/Imakefile b/nx-X11/lib/Xrandr/Imakefile index 15167a9f6..5cf70a516 100644 --- a/nx-X11/lib/Xrandr/Imakefile +++ b/nx-X11/lib/Xrandr/Imakefile @@ -5,7 +5,7 @@ XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile,v 1.5 2005/10/24 23:30:21 alanc Exp $ #define DoSharedLib SharedLibXrandr #define DoDebugLib DebugLibXrandr #define DoProfileLib ProfileLibXrandr -#define LibName Xrandr +#define LibName NX_Xrandr #define SoRev SOXRANDRREV #define IncSubdir X11 #define IncSubSubdir extensions diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile index c690dc0f0..c4fd0aa67 100644 --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile @@ -74,7 +74,7 @@ clean:: #define DoSharedLib SharedLibXrender #define DoDebugLib DebugLibXrender #define DoProfileLib ProfileLibXrender -#define LibName Xrender +#define LibName NX_Xrender #define SoRev SOXRENDERREV #ifdef XBuildIncDir diff --git a/nx-X11/lib/Xrender/xrender.pc.in b/nx-X11/lib/Xrender/xrender.pc.in index 5cc898b0a..ec8abb5aa 100644 --- a/nx-X11/lib/Xrender/xrender.pc.in +++ b/nx-X11/lib/Xrender/xrender.pc.in @@ -8,4 +8,4 @@ Description: X Render Library Version: @VERSION@ Requires: @X_REQUIRES@ Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ -Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@ +Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ diff --git a/nx-X11/lib/Xtst/Imakefile b/nx-X11/lib/Xtst/Imakefile index b3dd9f7e7..f32129436 100644 --- a/nx-X11/lib/Xtst/Imakefile +++ b/nx-X11/lib/Xtst/Imakefile @@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.2 1998/12/20 11:57:12 dawes Exp $ #define DoExtraLib SharedLibXtst #define DoDebugLib DebugLibXtst #define DoProfileLib ProfileLibXtst -#define LibName Xtst +#define LibName NX_Xtst #define SoRev SOXTESTREV #define LibHeaders NO diff --git a/nx-X11/lib/font/Imakefile b/nx-X11/lib/font/Imakefile index 02ddd8eaa..f47fe963c 100644 --- a/nx-X11/lib/font/Imakefile +++ b/nx-X11/lib/font/Imakefile @@ -31,7 +31,7 @@ XCOMM $XFree86: xc/lib/font/Imakefile,v 3.37 2003/10/24 16:21:12 tsi Exp $ STUBDIRS = stubs #endif -LIBNAME = Xfont +LIBNAME = NX_Xfont SOREV = $(SOFONTREV) #ifndef SeparateSharedCompile diff --git a/nx-X11/lib/oldX/Imakefile b/nx-X11/lib/oldX/Imakefile index ae80d268e..663d11019 100644 --- a/nx-X11/lib/oldX/Imakefile +++ b/nx-X11/lib/oldX/Imakefile @@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $ #define DoExtraLib SharedOldX #define DoDebugLib DebugOldX #define DoProfileLib ProfileOldX -#define LibName oldX +#define LibName NX_oldX #define SoRev SOOLDXREV #define IncSubdir X11 diff --git a/nx-X11/lib/xkbfile/Imakefile b/nx-X11/lib/xkbfile/Imakefile index 7b751c903..d7693819e 100644 --- a/nx-X11/lib/xkbfile/Imakefile +++ b/nx-X11/lib/xkbfile/Imakefile @@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $ #define DoDebugLib DebugLibxkbfile #define DoProfileLib ProfileLibxkbfile #define HasSharedData NO -#define LibName xkbfile +#define LibName NX_xkbfile #define SoRev SOXKBFILEREV #define IncSubdir X11 #define IncSubSubdir extensions diff --git a/nx-X11/lib/xkbui/Imakefile b/nx-X11/lib/xkbui/Imakefile index f27bad64d..a017d681c 100644 --- a/nx-X11/lib/xkbui/Imakefile +++ b/nx-X11/lib/xkbui/Imakefile @@ -6,7 +6,7 @@ XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.4 2003/10/15 21:23:38 herrb Exp $ #define DoDebugLib DebugLibxkbui #define DoProfileLib ProfileLibxkbui #define HasSharedData NO -#define LibName xkbui +#define LibName NX_xkbui #define SoRev SOXKBUIREV #define IncSubdir X11 #define IncSubSubdir extensions diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index c31102bbc..24e8850d9 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -313,7 +313,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs) FONTBASE = $(FONTLIBSRC)/fontbase.o \ $(FONTLIBSRC)/LibraryTargetName(fontbase) #if XserverStaticFontLib - FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) + FONT = $(FONTLIBSRC)/LibraryTargetName(NX_Xfont) $(FREETYPE2LIB) #else FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) #endif @@ -994,7 +994,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ dix/main.o #endif -XPMLIB = -lXpm +XPMLIB = -lNX_Xpm NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) @@ -1012,18 +1012,18 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ - -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ + -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lNX_Xcomposite -lNX_Xfixes \ + -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdmcp \ `pkg-config --libs libxml-2.0` #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ - -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp \ + -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lNX_Xdmcp \ `pkg-config --libs libxml-2.0` #endif @@ -1078,7 +1078,7 @@ nxagent_static_nolibs: nxagent else exit 0; fi $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \ - $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS) + $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS) #endif /* NXAgentServer */ #if defined(XnonServer) && XnonServer diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index 9fd2c7d7d..7987c7563 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -42,12 +42,12 @@ CCINCLUDES = -I. -I../nxcomp CCDEFINES = LDFLAGS = @LDFLAGS@ -L../nxcomp -LIBS = @LIBS@ -lz -lX11 -lXcomp +LIBS = @LIBS@ -lz -lNX_X11 -lXcomp # # Only if THREADS is defined # -# LIBS = @LIBS@ -lz -ljpeg -lpthread -lX11 -lXcomp +# LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp # srcdir = @srcdir@ diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 00bca25c9..f7e89a6f2 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -48,7 +48,7 @@ CCINCLUDES = CCDEFINES = LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -lX11 +LIBS = @LIBS@ -lNX_X11 # # Only if THREADS is defined. @@ -139,7 +139,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lXtst -lXrandr -lXdamage +EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) -- cgit v1.2.3 From ce531230f148a8c586a6e29c340e2db03d7bd3bb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 14 Feb 2015 15:14:23 +0100 Subject: VERSION file: master VERSION file is in base folder, symlinked from nx*/VERSION and hw/nxagent/VERSION. This commit removes the debian/VERSION file at makes it now unnecessary to copy/symlink the VERSION file at build time. These build scripts got adapted: debian/roll-tarballs.sh debian/rules nx-libs.spec Furthermore, all NX component now use the main VERSION file as reference. typechange: nxcomp/VERSION typechange: nxcompext/VERSION typechange: nxcompshad/VERSION typechange: nxproxy/VERSION --- VERSION | 1 + VERSION.x2goagent | 1 + debian/VERSION | 1 - debian/roll-tarballs.sh | 2 -- debian/rules | 6 +----- nx-X11/programs/Xserver/hw/nxagent/VERSION | 1 + nx-libs.spec | 2 -- nxcomp/VERSION | 2 +- nxcompext/VERSION | 2 +- nxcompshad/VERSION | 2 +- nxproxy/VERSION | 2 +- 11 files changed, 8 insertions(+), 14 deletions(-) create mode 100644 VERSION create mode 120000 VERSION.x2goagent delete mode 100644 debian/VERSION create mode 120000 nx-X11/programs/Xserver/hw/nxagent/VERSION mode change 100644 => 120000 nxcomp/VERSION mode change 100644 => 120000 nxcompext/VERSION mode change 100644 => 120000 nxcompshad/VERSION mode change 100644 => 120000 nxproxy/VERSION (limited to 'nxcompshad') diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..9af1780f9 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3.5.99.0 diff --git a/VERSION.x2goagent b/VERSION.x2goagent new file mode 120000 index 000000000..974cf28e0 --- /dev/null +++ b/VERSION.x2goagent @@ -0,0 +1 @@ +VERSION \ No newline at end of file diff --git a/debian/VERSION b/debian/VERSION deleted file mode 100644 index 9af1780f9..000000000 --- a/debian/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.5.99.0 diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 02a25dff5..03ab6778b 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -90,7 +90,6 @@ if [ "x$MODE" = "xfull" ]; then cp -v debian/rgb ./etc/ cp -v debian/nxagent.keyboard ./etc/ cp -v debian/x2goagent.keyboard ./etc/ - cp -v debian/VERSION ./VERSION.x2goagent else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* @@ -101,7 +100,6 @@ else echo ${file##*/} >> doc/applied-patches/series done fi -cp -v debian/VERSION ./nxcomp/VERSION cp -v debian/COPYING.full+lite COPYING cp -v debian/nxagent.keyboard nxagent.keyboard cp -v debian/x2goagent.keyboard x2goagent.keyboard diff --git a/debian/rules b/debian/rules index ad9ddded6..e0b4166f5 100755 --- a/debian/rules +++ b/debian/rules @@ -24,10 +24,9 @@ override_dh_clean: rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done - rm -fR bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard + rm -fR bin etc/rgb etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard rm -f debian/libnx-xinerama1.postinst rm -fR .preserve/ - if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi dh_clean override_dh_installchangelog: @@ -91,7 +90,6 @@ override_dh_auto_build: # create copies of upstream changelogs so that names apply to Debian policy... cp -a nx-X11/CHANGELOG nx-X11/changelog cp -a nxcomp/CHANGELOG nxcomp/changelog - if [ -f nxcomp/VERSION ]; then cp nxcomp/VERSION nxcomp/.VERSION.NoMachine; fi cp -a nxcompext/CHANGELOG nxcompext/changelog cp -a nxcompshad/CHANGELOG nxcompshad/changelog cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog @@ -105,8 +103,6 @@ override_dh_auto_build: ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard mkdir -p doc/ ln -s ../debian/changelog doc/changelog - ln -sf debian/VERSION VERSION.x2goagent - ln -sf ../debian/VERSION nxcomp/VERSION # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst diff --git a/nx-X11/programs/Xserver/hw/nxagent/VERSION b/nx-X11/programs/Xserver/hw/nxagent/VERSION new file mode 120000 index 000000000..9ca2cfb9d --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/VERSION @@ -0,0 +1 @@ +../../../../../VERSION \ No newline at end of file diff --git a/nx-libs.spec b/nx-libs.spec index b5ac8d92f..c037a2662 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -668,8 +668,6 @@ cp -v debian/keystrokes.cfg etc/keystrokes.cfg cp -v debian/rgb etc/rgb cp -v debian/nxagent.keyboard etc/nxagent.keyboard cp -v debian/x2goagent.keyboard etc/x2goagent.keyboard -cp -v debian/VERSION VERSION.x2goagent -cp -v debian/VERSION nxcomp/VERSION # remove build cruft that is in Git (also taken from roll-tarball.sh) rm -Rf nx*/configure nx*/autom4te.cache* diff --git a/nxcomp/VERSION b/nxcomp/VERSION deleted file mode 100644 index 1545d9665..000000000 --- a/nxcomp/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.5.0 diff --git a/nxcomp/VERSION b/nxcomp/VERSION new file mode 120000 index 000000000..6ff19de4b --- /dev/null +++ b/nxcomp/VERSION @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/nxcompext/VERSION b/nxcompext/VERSION deleted file mode 100644 index 1545d9665..000000000 --- a/nxcompext/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.5.0 diff --git a/nxcompext/VERSION b/nxcompext/VERSION new file mode 120000 index 000000000..6ff19de4b --- /dev/null +++ b/nxcompext/VERSION @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION deleted file mode 100644 index 1545d9665..000000000 --- a/nxcompshad/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.5.0 diff --git a/nxcompshad/VERSION b/nxcompshad/VERSION new file mode 120000 index 000000000..6ff19de4b --- /dev/null +++ b/nxcompshad/VERSION @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/nxproxy/VERSION b/nxproxy/VERSION deleted file mode 100644 index 1545d9665..000000000 --- a/nxproxy/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.5.0 diff --git a/nxproxy/VERSION b/nxproxy/VERSION new file mode 120000 index 000000000..6ff19de4b --- /dev/null +++ b/nxproxy/VERSION @@ -0,0 +1 @@ +../VERSION \ No newline at end of file -- cgit v1.2.3 From 5464a6dba5742a9f22ba18c9b307d4ee42394378 Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Sun, 15 Mar 2015 17:22:38 +0100 Subject: nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft. --- debian/changelog | 4 ++-- nxcomp/configure.in | 15 +-------------- nxcompext/configure.in | 15 +-------------- nxcompshad/configure.in | 15 +-------------- nxproxy/configure.in | 15 +-------------- 5 files changed, 6 insertions(+), 58 deletions(-) (limited to 'nxcompshad') diff --git a/debian/changelog b/debian/changelog index 3b4175f92..664717898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,8 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low - [ X2Go Release Manager ] - * Continue development + [ Clemens Lang ] + * Use path discovery for finding makedepend. Remove old cruft. -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 diff --git a/nxcomp/configure.in b/nxcomp/configure.in index 6fa9757a7..2378a9398 100644 --- a/nxcomp/configure.in +++ b/nxcomp/configure.in @@ -362,20 +362,7 @@ fi dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) - -if test -x "../nx-X11/config/makedepend/makedepend" ; then - MAKEDEPEND=../nx-X11/config/makedepend/makedepend -else - if test -x "/usr/X11R6/bin/makedepend" ; then - MAKEDEPEND=/usr/X11R6/bin/makedepend - else - if test -x "/usr/openwin/bin/makedepend" ; then - MAKEDEPEND=/usr/openwin/bin/makedepend - else - MAKEDEPEND=/usr/bin/makedepend - fi - fi -fi +MAKEDEPEND="$(which makedepend)" dnl Determine what to build based on the platform. dnl Override the LIBS settings on Cygwin32 so that diff --git a/nxcompext/configure.in b/nxcompext/configure.in index 08c48a751..6159e84c1 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -219,20 +219,7 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}\\\"" dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) - -if test -x "../nx-X11/config/makedepend/makedepend" ; then - MAKEDEPEND=../nx-X11/config/makedepend/makedepend -else - if test -x "/usr/X11R6/bin/makedepend" ; then - MAKEDEPEND=/usr/X11R6/bin/makedepend - else - if test -x "/usr/openwin/bin/makedepend" ; then - MAKEDEPEND=/usr/openwin/bin/makedepend - else - MAKEDEPEND=/usr/bin/makedepend - fi - fi -fi +MAKEDEPEND="$(which makedepend)" dnl Determine what to build based on the platform. dnl Override the LIBS settings on Cygwin32 so that diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 13149b3a0..a76c6b9a1 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -269,19 +269,6 @@ fi dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) - -if test -x "../nx-X11/config/makedepend/makedepend" ; then - MAKEDEPEND=../nx-X11/config/makedepend/makedepend -else - if test -x "/usr/X11R6/bin/makedepend" ; then - MAKEDEPEND=/usr/X11R6/bin/makedepend - else - if test -x "/usr/openwin/bin/makedepend" ; then - MAKEDEPEND=/usr/openwin/bin/makedepend - else - MAKEDEPEND=makedepend - fi - fi -fi +MAKEDEPEND="$(which makedepend)" AC_OUTPUT(Makefile) diff --git a/nxproxy/configure.in b/nxproxy/configure.in index b86828d02..914e70738 100644 --- a/nxproxy/configure.in +++ b/nxproxy/configure.in @@ -167,19 +167,6 @@ fi dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) - -if test -x "../nx-X11/config/makedepend/makedepend" ; then - MAKEDEPEND=../nx-X11/config/makedepend/makedepend -else - if test -x "/usr/X11R6/bin/makedepend" ; then - MAKEDEPEND=/usr/X11R6/bin/makedepend - else - if test -x "/usr/openwin/bin/makedepend" ; then - MAKEDEPEND=/usr/openwin/bin/makedepend - else - MAKEDEPEND=makedepend - fi - fi -fi +MAKEDEPEND="$(which makedepend)" AC_OUTPUT(Makefile) -- cgit v1.2.3 From ad7e12ed39cc4091ff878ea2b3e748e0147dd57f Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Sun, 15 Mar 2015 17:26:24 +0100 Subject: nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. --- debian/changelog | 1 + nxcomp/configure.in | 4 ++-- nxcompshad/configure.in | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'nxcompshad') diff --git a/debian/changelog b/debian/changelog index 664717898..771139d9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low [ Clemens Lang ] * Use path discovery for finding makedepend. Remove old cruft. + * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 diff --git a/nxcomp/configure.in b/nxcomp/configure.in index 2378a9398..07c88df77 100644 --- a/nxcomp/configure.in +++ b/nxcomp/configure.in @@ -183,11 +183,11 @@ if test "$FreeBSD" = yes; then fi dnl Under Darwin we don't have support for -soname option and -dnl we need the -bundle flag. Under Solaris, instead, we need +dnl we need the -dynamiclib flag. Under Solaris, instead, we need dnl the options -G -h. if test "$DARWIN" = yes; then - LDFLAGS="$LDFLAGS -bundle" + LDFLAGS="$LDFLAGS -dynamiclib" elif test "$SUN" = yes; then LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)" else diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index a76c6b9a1..4e91361ff 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -175,11 +175,11 @@ if test "$FreeBSD" = yes; then fi dnl Under Darwin we don't have support for -soname option and -dnl we need the -bundle flag. Under Solaris, instead, we need +dnl we need the -dynamiclib flag. Under Solaris, instead, we need dnl the options -G -h. if test "$DARWIN" = yes; then - LDFLAGS="$LDFLAGS -bundle" + LDFLAGS="$LDFLAGS -dynamiclib" elif test "$SUN" = yes; then LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)" else -- cgit v1.2.3 From 638e31c2f33723123d35ce65db88071a1be5cdb0 Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Sun, 15 Mar 2015 17:29:50 +0100 Subject: nxcomp{,ext,shad}: use the correct library naming scheme on OS X. It differs from other UNIX-based systems. --- debian/changelog | 2 ++ nxcomp/Makefile.in | 22 +++++++++++++++------- nxcompext/Makefile.in | 18 +++++++++++++----- nxcompshad/Makefile.in | 22 +++++++++++++++------- 4 files changed, 45 insertions(+), 19 deletions(-) (limited to 'nxcompshad') diff --git a/debian/changelog b/debian/changelog index 771139d9a..197b257a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low [ Clemens Lang ] * Use path discovery for finding makedepend. Remove old cruft. * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. + * Use the correct library naming scheme on OS X. It differs from other + UNIX-based systems. -- X2Go Release Manager Sun, 15 Mar 2015 00:48:06 +0100 diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 93bb0b38c..2234474ec 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -91,9 +91,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3 LIBRARY = Xcomp LIBNAME = lib$(LIBRARY) +ifeq ($(shell uname),Darwin) +LIBFULL = lib$(LIBRARY).$(VERSION).dylib +LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib +LIBSHARED = lib$(LIBRARY).dylib +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) LIBSHARED = lib$(LIBRARY).so +LIBFLAGS = +endif LIBARCHIVE = lib$(LIBRARY).a LIBCYGSHARED = cyg$(LIBRARY).dll @@ -232,7 +240,7 @@ COBJ = $(CSRC:.c=.o) CXXOBJ = $(CXXSRC:.cpp=.o) $(LIBFULL): $(CXXOBJ) $(COBJ) - $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) + $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(LIBLOAD): $(LIBFULL) rm -f $(LIBLOAD) @@ -278,9 +286,9 @@ install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} - $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir} - $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir} - $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir} + $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} + $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} + $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx echo "Running ldconfig tool, this may take a while..." && ldconfig || true @@ -293,9 +301,9 @@ uninstall.bin: uninstall.lib: $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) - $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3 - $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so - $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE) $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index 7987c7563..8777ceeed 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -82,9 +82,17 @@ DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3 LIBRARY = Xcompext LIBNAME = lib$(LIBRARY) +ifeq ($(shell uname),Darwin) +LIBFULL = lib$(LIBRARY).$(VERSION).dylib +LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib +LIBSHARED = lib$(LIBRARY).dylib +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) LIBSHARED = lib$(LIBRARY).so +LIBFLAGS = +endif LIBARCHIVE = lib$(LIBRARY).a LIBCYGSHARED = cyg$(LIBRARY).dll @@ -113,7 +121,7 @@ COBJ = $(CSRC:.c=.o) CXXOBJ = $(CXXSRC:.cpp=.o) $(LIBFULL): $(CXXOBJ) $(COBJ) - $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) + $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(LIBLOAD): $(LIBFULL) rm -f $(LIBLOAD) @@ -159,8 +167,8 @@ install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} - $(INSTALL_LINK) libXcompext.so.3 $(DESTDIR)${libdir} - $(INSTALL_LINK) libXcompext.so $(DESTDIR)${libdir} + $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} + $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx echo "Running ldconfig tool, this may take a while..." && ldconfig || true @@ -172,8 +180,8 @@ uninstall.bin: uninstall.lib: $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) - $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so.3 - $(RM_FILE) $(DESTDIR)${libdir}/libXcompext.so + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED) $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h echo "Running ldconfig tool, this may take a while..." && ldconfig || true diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index f7e89a6f2..2f6e50bf9 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -103,9 +103,17 @@ DEPENDINCLUDES = -I/usr/include/g++ -I/usr/include/g++-3 LIBRARY = Xcompshad LIBNAME = lib$(LIBRARY) +ifeq ($(shell uname),Darwin) +LIBFULL = lib$(LIBRARY).$(VERSION).dylib +LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib +LIBSHARED = lib$(LIBRARY).dylib +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) LIBSHARED = lib$(LIBRARY).so +LIBFLAGS = +endif LIBARCHIVE = lib$(LIBRARY).a MSRC = Main.c @@ -146,7 +154,7 @@ all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) endif $(LIBFULL): $(CXXOBJ) $(COBJ) - $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS) + $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS) $(EXTRALIBS) $(LIBLOAD): $(LIBFULL) rm -f $(LIBLOAD) @@ -193,9 +201,9 @@ install.lib: all $(INSTALL_DIR) $(DESTDIR)${libdir} $(INSTALL_DIR) $(DESTDIR)${includedir}/nx $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} - $(INSTALL_LINK) libXcompshad.so.3 $(DESTDIR)${libdir} - $(INSTALL_LINK) libXcompshad.so $(DESTDIR)${libdir} - $(INSTALL_DATA) *.a $(DESTDIR)${libdir} + $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} + $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} + $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx echo "Running ldconfig tool, this may take a while..." && ldconfig || true @@ -207,9 +215,9 @@ uninstall.bin: uninstall.lib: $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL) - $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so.3 - $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.so - $(RM_FILE) $(DESTDIR)${libdir}/libXcompshad.a + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED) + $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE) for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done $(RM_DIR) $(DESTDIR)${libdir}/nx/ $(RM_DIR) $(DESTDIR)${includedir}/nx/ -- cgit v1.2.3 From d8de5928e1e7a0677ed2d38fa4d9f53a58514ebe Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Mon, 16 Mar 2015 03:29:16 +0100 Subject: nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available. --- nxcomp/Makefile.in | 4 ++-- nxcomp/configure.in | 10 ++++++++++ nxcompext/Makefile.in | 4 ++-- nxcompext/configure.in | 10 ++++++++++ nxcompshad/Makefile.in | 4 ++-- nxcompshad/configure.in | 10 ++++++++++ nxproxy/Makefile.in | 4 ++-- nxproxy/configure.in | 10 ++++++++++ 8 files changed, 48 insertions(+), 8 deletions(-) (limited to 'nxcompshad') diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 2234474ec..e571b3c90 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -271,9 +271,9 @@ depends: depend.status depend: depend.status depend.status: - if [ -x $(MAKEDEPEND) ] ; then \ + if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ - $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ + $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ $(CXXSRC) 2>/dev/null; \ fi touch depend.status diff --git a/nxcomp/configure.in b/nxcomp/configure.in index 07c88df77..43b51573a 100644 --- a/nxcomp/configure.in +++ b/nxcomp/configure.in @@ -364,6 +364,16 @@ dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) MAKEDEPEND="$(which makedepend)" +# Try to desperately find makedepend. +# Set MAKEDEPEND to the shipped makedepend binary. This will not +# exist in nx-libs-lite, though, in which case MAKEDEPEND +# will stay empty. +if test -z "${MAKEDEPEND}"; then + if test -x "../nx-X11/config/makedepend/makedepend"; then + MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi +fi + dnl Determine what to build based on the platform. dnl Override the LIBS settings on Cygwin32 so that dnl we always link with the exact set of libraries. diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index 8777ceeed..da464bd6d 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -152,9 +152,9 @@ depends: depend.status depend: depend.status depend.status: - if [ -x $(MAKEDEPEND) ] ; then \ + if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ - $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ + $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ $(CXXSRC) 2>/dev/null; \ fi touch depend.status diff --git a/nxcompext/configure.in b/nxcompext/configure.in index 6159e84c1..e6f13c0ea 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -221,6 +221,16 @@ dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) MAKEDEPEND="$(which makedepend)" +# Try to desperately find makedepend. +# Set MAKEDEPEND to the shipped makedepend binary. This will not +# exist in nx-libs-lite, though, in which case MAKEDEPEND +# will stay empty. +if test -z "${MAKEDEPEND}"; then + if test -x "../nx-X11/config/makedepend/makedepend"; then + MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi +fi + dnl Determine what to build based on the platform. dnl Override the LIBS settings on Cygwin32 so that dnl we always link with the exact set of libraries. diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 2f6e50bf9..5ea286395 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -187,9 +187,9 @@ depends: depend.status depend: depend.status depend.status: - if [ -x $(MAKEDEPEND) ] ; then \ + if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ - $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ + $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ fi touch depend.status diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 4e91361ff..8dd1b2e21 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -271,4 +271,14 @@ dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) MAKEDEPEND="$(which makedepend)" +# Try to desperately find makedepend. +# Set MAKEDEPEND to the shipped makedepend binary. This will not +# exist in nx-libs-lite, though, in which case MAKEDEPEND +# will stay empty. +if test -z "${MAKEDEPEND}"; then + if test -x "../nx-X11/config/makedepend/makedepend"; then + MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi +fi + AC_OUTPUT(Makefile) diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in index c00df91dc..3a27cbd29 100644 --- a/nxproxy/Makefile.in +++ b/nxproxy/Makefile.in @@ -80,9 +80,9 @@ depends: depend.status depend: depend.status depend.status: - if [ -x $(MAKEDEPEND) ] ; then \ + if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ - $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ + $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ fi touch depend.status diff --git a/nxproxy/configure.in b/nxproxy/configure.in index 914e70738..268584216 100644 --- a/nxproxy/configure.in +++ b/nxproxy/configure.in @@ -169,4 +169,14 @@ dnl Find makedepend somewhere. AC_SUBST(MAKEDEPEND) MAKEDEPEND="$(which makedepend)" +# Try to desperately find makedepend. +# Set MAKEDEPEND to the shipped makedepend binary. This will not +# exist in nx-libs-lite, though, in which case MAKEDEPEND +# will stay empty. +if test -z "${MAKEDEPEND}"; then + if test -x "../nx-X11/config/makedepend/makedepend"; then + MAKEDEPEND="../nx-X11/config/makedepend/makedepend" + fi +fi + AC_OUTPUT(Makefile) -- cgit v1.2.3 From d86ce9c7a44118082612c3cfb3a866b9f8f6098f Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 26 Mar 2015 00:32:27 +0100 Subject: nxcomp{,ext,shad}: only use the first three numbers in the full version for current_version on OS X. ld(1) on 10.6 fails otherwise. --- nxcomp/Makefile.in | 3 ++- nxcompext/Makefile.in | 3 ++- nxcompshad/Makefile.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'nxcompshad') diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index e571b3c90..6022747cb 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -95,7 +95,8 @@ ifeq ($(shell uname),Darwin) LIBFULL = lib$(LIBRARY).$(VERSION).dylib LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib LIBSHARED = lib$(LIBRARY).dylib -LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3) +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER) else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index da464bd6d..b33c5aaf3 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -86,7 +86,8 @@ ifeq ($(shell uname),Darwin) LIBFULL = lib$(LIBRARY).$(VERSION).dylib LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib LIBSHARED = lib$(LIBRARY).dylib -LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3) +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER) else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 5ea286395..41d644f5e 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -107,7 +107,8 @@ ifeq ($(shell uname),Darwin) LIBFULL = lib$(LIBRARY).$(VERSION).dylib LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib LIBSHARED = lib$(LIBRARY).dylib -LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3) +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER) else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) -- cgit v1.2.3 From f2fd794161fbb87b8b2e4ddc49e2777d82bbdd10 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 26 Apr 2015 16:35:14 +0200 Subject: libXcompshad underlinking problem: Fix undefined reference to 'XShmQueryVersion', 'XShmDetach', 'XShmCreateImage', 'XShmAttach', and 'XShmGetImage'. --- nxcompshad/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nxcompshad') diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 41d644f5e..e4ddd7bd4 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -148,7 +148,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage +EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -lNX_Xdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) -- cgit v1.2.3 From 06aa41671963dac9fa4bf84a8fc996a5360c94b0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Apr 2015 16:08:06 +0200 Subject: library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826). --- debian/control | 55 ++--- debian/libnx-xdamage-dev.install.in | 2 - debian/libnx-xdamage1.install.in | 1 - debian/libnx-xdamage1.symbols | 9 - debian/nx-x11proto-damage-dev.install.in | 2 - debian/rules | 1 - nx-X11/config/cf/X11.tmpl | 40 +--- nx-X11/config/cf/host.def | 2 - nx-X11/include/extensions/Imakefile | 4 - nx-X11/include/extensions/damageproto.h | 149 ------------- nx-X11/include/extensions/damagewire.h | 57 ----- nx-X11/lib/Imakefile | 5 - nx-X11/lib/Xdamage/AUTHORS | 2 - nx-X11/lib/Xdamage/COPYING | 22 -- nx-X11/lib/Xdamage/ChangeLog | 13 -- nx-X11/lib/Xdamage/INSTALL | 8 - nx-X11/lib/Xdamage/Imakefile | 68 ------ nx-X11/lib/Xdamage/NEWS | 0 nx-X11/lib/Xdamage/README | 10 - nx-X11/lib/Xdamage/Xdamage.c | 365 ------------------------------- nx-X11/lib/Xdamage/Xdamage.h | 68 ------ nx-X11/lib/Xdamage/autogen.sh | 3 - nx-X11/lib/Xdamage/configure.ac | 93 -------- nx-X11/lib/Xdamage/xdamage.pc.in | 10 - nx-X11/lib/Xdamage/xdamageint.h | 66 ------ nx-X11/programs/Xserver/Imakefile | 4 +- nx-libs.spec | 28 +-- nxcompshad/Makefile.in | 2 +- 28 files changed, 28 insertions(+), 1061 deletions(-) delete mode 100644 debian/libnx-xdamage-dev.install.in delete mode 100644 debian/libnx-xdamage1.install.in delete mode 100644 debian/libnx-xdamage1.symbols delete mode 100644 debian/nx-x11proto-damage-dev.install.in delete mode 100644 nx-X11/include/extensions/damageproto.h delete mode 100644 nx-X11/include/extensions/damagewire.h delete mode 100644 nx-X11/lib/Xdamage/AUTHORS delete mode 100644 nx-X11/lib/Xdamage/COPYING delete mode 100644 nx-X11/lib/Xdamage/ChangeLog delete mode 100644 nx-X11/lib/Xdamage/INSTALL delete mode 100644 nx-X11/lib/Xdamage/Imakefile delete mode 100644 nx-X11/lib/Xdamage/NEWS delete mode 100644 nx-X11/lib/Xdamage/README delete mode 100644 nx-X11/lib/Xdamage/Xdamage.c delete mode 100644 nx-X11/lib/Xdamage/Xdamage.h delete mode 100755 nx-X11/lib/Xdamage/autogen.sh delete mode 100644 nx-X11/lib/Xdamage/configure.ac delete mode 100644 nx-X11/lib/Xdamage/xdamage.pc.in delete mode 100644 nx-X11/lib/Xdamage/xdamageint.h (limited to 'nxcompshad') diff --git a/debian/control b/debian/control index 4e4918999..0f575421f 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Build-Depends: libxpm-dev, libxfont-dev, libxdmcp-dev, + libxdamage-dev, autoconf, pkg-config, x11proto-core-dev, @@ -283,20 +284,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. + This package removes the obsoleted libNX_Xdamage.so.1 library. With + recent versions of NX, the system-wide installed libXdamage gets used. . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package can be safely removed. Package: libnx-xdamage-dev Provides: libnx-xdamage1-dev @@ -304,23 +301,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xdamage1 (= ${binary:Version}), - nx-x11proto-damage-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library (development headers) +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. - . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package removes the obsoleted headers for the libNX_Xdamage.so.1 + library. With recent versions of NX, the system-wide installed libXdamage + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-damage-dev Section: libdevel @@ -328,16 +319,16 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Damage extension wire protocol +Description: nx-X11 Damage extension wire protocol (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides development headers describing the wire protocol - for the Damage extension in nx-X11, used to notify clients of changes - made to particular areas. + This package removes the obsoleted wire protocol headers for the + libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide + installed libXdamage gets used. + . + This package can be safely removed. Package: libnx-xdamage1-dbg Architecture: any @@ -345,22 +336,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xdamage1 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library (debug package) +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. - . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package removes the obsoleted debug symbols for the + libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide + installed libXdamage gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xdmcp6 Architecture: any diff --git a/debian/libnx-xdamage-dev.install.in b/debian/libnx-xdamage-dev.install.in deleted file mode 100644 index 068f3badd..000000000 --- a/debian/libnx-xdamage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xdamage.so -usr/include/*/nx/X11/extensions/Xdamage.h diff --git a/debian/libnx-xdamage1.install.in b/debian/libnx-xdamage1.install.in deleted file mode 100644 index 42bd90874..000000000 --- a/debian/libnx-xdamage1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xdamage.so.* diff --git a/debian/libnx-xdamage1.symbols b/debian/libnx-xdamage1.symbols deleted file mode 100644 index 09310e69a..000000000 --- a/debian/libnx-xdamage1.symbols +++ /dev/null @@ -1,9 +0,0 @@ -libNX_Xdamage.so.1 libnx-xdamage1 #MINVER# - XDamageCreate@Base 3.5.0.29 - XDamageDestroy@Base 3.5.0.29 - XDamageExtensionInfo@Base 3.5.0.29 - XDamageExtensionName@Base 3.5.0.29 - XDamageFindDisplay@Base 3.5.0.29 - XDamageQueryExtension@Base 3.5.0.29 - XDamageQueryVersion@Base 3.5.0.29 - XDamageSubtract@Base 3.5.0.29 diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in deleted file mode 100644 index 949549f17..000000000 --- a/debian/nx-x11proto-damage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx/X11/extensions/damageproto.h -usr/include/*/nx/X11/extensions/damagewire.h \ No newline at end of file diff --git a/debian/rules b/debian/rules index 0da6db71a..16a09fb3f 100755 --- a/debian/rules +++ b/debian/rules @@ -81,7 +81,6 @@ override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg - dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 74b1b5fe7..de60cecaa 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -339,16 +339,12 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildDamage #define BuildDamage BuildXfixes #endif -#ifndef BuildDamageLibrary -#define BuildDamageLibrary !BuildServersOnly -#endif #ifndef BuildComposite #define BuildComposite (BuildXfixes && BuildDamage) #endif #ifndef BuildCompositeLibrary -#define BuildCompositeLibrary !BuildServersOnly && (BuildXfixesLibrary && \ - BuildDamageLibrary) +#define BuildCompositeLibrary !BuildServersOnly && BuildXfixesLibrary #endif #ifndef BuildXevie @@ -1581,30 +1577,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXfixes NO #endif -#if BuildDamageLibrary -#ifndef SharedLibXdamage -#define SharedLibXdamage HasSharedLibraries -#endif -#ifndef NormalLibXdamage -#define NormalLibXdamage (!SharedLibXdamage || ForceNormalLib) -#endif -#ifndef DebugLibXdamage -#define DebugLibXdamage NO -#endif -#ifndef ProfileLibXdamage -#define ProfileLibXdamage NO -#endif -#else -#undef SharedLibXdamage -#define SharedLibXdamage NO -#undef NormalLibXdamage -#define NormalLibXdamage NO -#undef DebugLibXdamage -#define DebugLibXdamage NO -#undef ProfileLibXdamage -#define ProfileLibXdamage NO -#endif - #if BuildCompositeLibrary #ifndef SharedLibXcomposite #define SharedLibXcomposite HasSharedLibraries @@ -1799,16 +1771,6 @@ ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev) #else ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir) -#endif - - XDAMAGELIBSRC = $(LIBSRC)/Xdamage -#if SharedLibXdamage -#ifndef SharedXdamageRev -#define SharedXdamageRev 1.0 -#endif -SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev) -#else -ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir) #endif XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 28e36da82..0566befdd 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -123,8 +123,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildLibraries YES #endif -#define BuildDamageLibrary YES - #define BuildXfixesLibrary YES #define BuildCompositeLibrary YES diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 3f2992b77..4f88d2bab 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -47,9 +47,6 @@ RENDERHEADERS = render.h renderproto.h #if BuildXfixes || BuildXfixesLibrary XFIXESHEADERS = xfixeswire.h xfixesproto.h #endif -#if BuildDamage || BuildDamageLibrary -DAMAGEHEADERS = damagewire.h damageproto.h -#endif #if BuildComposite || BuildCompositeLibrary COMPOSITEHEADERS = composite.h compositeproto.h #endif @@ -82,7 +79,6 @@ EXTRAHEADERS = \ $(RENDERHEADERS) \ $(RANDRHEADERS) \ $(XFIXESHEADERS) \ - $(DAMAGEHEADERS) \ $(COMPOSITEHEADERS) \ $(XEVIEHEADERS) \ $(XTRAPHEADERS) \ diff --git a/nx-X11/include/extensions/damageproto.h b/nx-X11/include/extensions/damageproto.h deleted file mode 100644 index b190d68c7..000000000 --- a/nx-X11/include/extensions/damageproto.h +++ /dev/null @@ -1,149 +0,0 @@ -/* - * $Id: damageproto.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $ - * - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _DAMAGEPROTO_H_ -#define _DAMAGEPROTO_H_ - -#include -#include -#include - -#define Window CARD32 -#define Drawable CARD32 -#define Font CARD32 -#define Pixmap CARD32 -#define Cursor CARD32 -#define Colormap CARD32 -#define GContext CARD32 -#define Atom CARD32 -#define VisualID CARD32 -#define Time CARD32 -#define KeyCode CARD8 -#define KeySym CARD32 -#define Picture CARD32 -#define Region CARD32 -#define Damage CARD32 - -/************** Version 0 ******************/ - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; -} xDamageReq; - -/* - * requests and replies - */ - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; -} xDamageQueryVersionReq; - -#define sz_xDamageQueryVersionReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 majorVersion B32; - CARD32 minorVersion B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xDamageQueryVersionReply; - -#define sz_xDamageQueryVersionReply 32 - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; - Drawable drawable B32; - CARD8 level; - CARD8 pad1; - CARD16 pad2 B16; -} xDamageCreateReq; - -#define sz_xDamageCreateReq 16 - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; -} xDamageDestroyReq; - -#define sz_xDamageDestroyReq 8 - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; - Region repair B32; - Region parts B32; -} xDamageSubtractReq; - -#define sz_xDamageSubtractReq 16 - -/* Events */ - -#define DamageNotifyMore 0x80 - -typedef struct { - CARD8 type; - CARD8 level; - CARD16 sequenceNumber B16; - Drawable drawable B32; - Damage damage B32; - Time timestamp B32; - xRectangle area; - xRectangle geometry; -} xDamageNotifyEvent; - -#undef Damage -#undef Region -#undef Picture -#undef Window -#undef Drawable -#undef Font -#undef Pixmap -#undef Cursor -#undef Colormap -#undef GContext -#undef Atom -#undef VisualID -#undef Time -#undef KeyCode -#undef KeySym - -#endif /* _DAMAGEPROTO_H_ */ diff --git a/nx-X11/include/extensions/damagewire.h b/nx-X11/include/extensions/damagewire.h deleted file mode 100644 index d523cea98..000000000 --- a/nx-X11/include/extensions/damagewire.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * $Id: damagewire.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $ - * - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _DAMAGEWIRE_H_ -#define _DAMAGEWIRE_H_ - -#define DAMAGE_NAME "DAMAGE" -#define DAMAGE_MAJOR 1 -#define DAMAGE_MINOR 0 - -/************* Version 1 ****************/ - -/* Constants */ -#define XDamageReportRawRectangles 0 -#define XDamageReportDeltaRectangles 1 -#define XDamageReportBoundingBox 2 -#define XDamageReportNonEmpty 3 - -/* Requests */ -#define X_DamageQueryVersion 0 -#define X_DamageCreate 1 -#define X_DamageDestroy 2 -#define X_DamageSubtract 3 - -#define XDamageNumberRequests (X_DamageSubtract + 1) - -/* Events */ -#define XDamageNotify 0 - -#define XDamageNumberEvents (XDamageNotify + 1) - -/* Errors */ -#define BadDamage 0 -#define XDamageNumberErrors (BadDamage + 1) - -#endif /* _DAMAGEWIRE_H_ */ diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile index aa780877b..13dc8ac73 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -59,10 +59,6 @@ RANDRLIBDIR = Xrandr XFIXESLIBDIR = Xfixes #endif -#if BuildDamageLibrary -DAMAGELIBDIR = Xdamage -#endif - #if BuildCompositeLibrary COMPOSITELIBDIR = Xcomposite #endif @@ -110,7 +106,6 @@ LINTSUBDIRS = \ $(RANDRLIBDIR) \ $(XRESLIBDIR) \ $(XFIXESLIBDIR) \ - $(DAMAGELIBDIR) \ $(COMPOSITELIBDIR) \ $(NULL) diff --git a/nx-X11/lib/Xdamage/AUTHORS b/nx-X11/lib/Xdamage/AUTHORS deleted file mode 100644 index 57c4efd4e..000000000 --- a/nx-X11/lib/Xdamage/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Keith Packard, HP - diff --git a/nx-X11/lib/Xdamage/COPYING b/nx-X11/lib/Xdamage/COPYING deleted file mode 100644 index e85d981e7..000000000 --- a/nx-X11/lib/Xdamage/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.1 2004/07/31 05:50:39 anholt Exp $ - -Copyright © 2001,2003 Keith Packard - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Keith Packard not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. Keith Packard makes no -representations about the suitability of this software for any purpose. It -is provided "as is" without express or implied warranty. - -KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - diff --git a/nx-X11/lib/Xdamage/ChangeLog b/nx-X11/lib/Xdamage/ChangeLog deleted file mode 100644 index 427091447..000000000 --- a/nx-X11/lib/Xdamage/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -Tue May 17 12:59:47 2005 Søren Sandmann - - * Xdamage.c: Conditionally include config.h - -2004-02-03 Jim Gettys - - * AUTHORS: Add authors. - -2004-01-15 Daniel Stone - * Tag release 1.0.1 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. diff --git a/nx-X11/lib/Xdamage/INSTALL b/nx-X11/lib/Xdamage/INSTALL deleted file mode 100644 index b94098a95..000000000 --- a/nx-X11/lib/Xdamage/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Render is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xdamage/Imakefile b/nx-X11/lib/Xdamage/Imakefile deleted file mode 100644 index f6ad0d22b..000000000 --- a/nx-X11/lib/Xdamage/Imakefile +++ /dev/null @@ -1,68 +0,0 @@ -XCOMM $XdotOrg: xc/lib/Xdamage/Imakefile,v 1.1 2004/07/31 05:50:39 anholt Exp $ - -#ifndef NormalLibXdamage -#define NormalLibXdamage YES -SOXDAMAGEREV=1.0.1 -#endif - -#ifndef SharedLibXdamage -#define SharedLibXdamage YES -#endif - -#define DoNormalLib NormalLibXdamage -#define DoSharedLib SharedLibXdamage -#define DoDebugLib DebugLibXdamage -#define DoProfileLib ProfileLibXdamage - -#define LibName NX_Xdamage -#define SoRev SOXDAMAGEREV -#define IncSubdir X11 -#define IncSubSubdir extensions - -#include - -#ifdef SharedXdamageReqs -REQUIREDLIBS = SharedXdamageReqs -#endif - -XDAMAGE_VERSION=1.0.1 - -X_LIBS=-L$(SHLIBDIR) $(XONLYLIB) -X_CFLAGS=-I$(INCROOT) $(THREADS_DEFINES) -XDAMAGE_LIBS = $(XFIXESLIB) -XDAMAGE_CFLAGS = - -RPATH_CFLAG = HardCodeLibdirFlag - -SRCS = Xdamage.c - -OBJS = Xdamage.o - -HEADERS = Xdamage.h - -SUBSTVARS=prefix="$(PROJECTROOT)" \ - exec_prefix="$(BINDIR)" \ - libdir="$(USRLIBDIR)" \ - hardcode_libdir_flag_spec="$(RPATH_CFLAG)" \ - includedir="$(INCROOT)" \ - X_LIBS="$(X_LIBS)" \ - X_CFLAGS="$(X_CFLAGS)" \ - XDAMAGE_LIBS="$(XDAMAGE_LIBS)" \ - XDAMAGE_CFLAGS="$(XDAMAGE_CFLAGS)" \ - VERSION="$(XDAMAGE_VERSION)" - -#include - -DependTarget() - -all:: xdamage.pc - -xdamage.pc: xdamage.pc.in - RemoveFile($@) - sh ../Xrender/config-subst $(SUBSTVARS) < xdamage.pc.in > $@ - -InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xdamage.pc) - diff --git a/nx-X11/lib/Xdamage/NEWS b/nx-X11/lib/Xdamage/NEWS deleted file mode 100644 index e69de29bb..000000000 diff --git a/nx-X11/lib/Xdamage/README b/nx-X11/lib/Xdamage/README deleted file mode 100644 index 9968c6bdf..000000000 --- a/nx-X11/lib/Xdamage/README +++ /dev/null @@ -1,10 +0,0 @@ - RandR - X RandR Extension - Version 1.0 - 2002-10-4 - -This package contains header files and documentation for the X RandR -extension. Library and server implementations are separate. - -Keith Packard -keithp@keithp.com diff --git a/nx-X11/lib/Xdamage/Xdamage.c b/nx-X11/lib/Xdamage/Xdamage.c deleted file mode 100644 index 48ffa68a9..000000000 --- a/nx-X11/lib/Xdamage/Xdamage.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - * $Id: Xdamage.c,v 1.3 2005/07/03 07:00:56 daniels Exp $ - * - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif -#include "xdamageint.h" - -XDamageExtInfo XDamageExtensionInfo; - -const char XDamageExtensionName[] = DAMAGE_NAME; - -static int -XDamageCloseDisplay (Display *dpy, XExtCodes *codes); - -static Bool -XDamageWireToEvent(Display *dpy, XEvent *event, xEvent *wire); - -static Status -XDamageEventToWire(Display *dpy, XEvent *event, xEvent *wire); - -/* - * XDamageExtAddDisplay - add a display to this extension. (Replaces - * XextAddDisplay) - */ -static XDamageExtDisplayInfo * -XDamageExtAddDisplay (XDamageExtInfo *extinfo, - Display *dpy, - const char *ext_name) -{ - XDamageExtDisplayInfo *info; - int ev; - - info = (XDamageExtDisplayInfo *) Xmalloc (sizeof (XDamageExtDisplayInfo)); - if (!info) return NULL; - info->display = dpy; - - info->codes = XInitExtension (dpy, ext_name); - - /* - * if the server has the extension, then we can initialize the - * appropriate function vectors - */ - if (info->codes) { - xDamageQueryVersionReply rep; - xDamageQueryVersionReq *req; - XESetCloseDisplay (dpy, info->codes->extension, - XDamageCloseDisplay); - for (ev = info->codes->first_event; - ev < info->codes->first_event + XDamageNumberEvents; - ev++) - { - XESetWireToEvent (dpy, ev, XDamageWireToEvent); - XESetEventToWire (dpy, ev, XDamageEventToWire); - } - /* - * Get the version info - */ - LockDisplay (dpy); - GetReq (DamageQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->damageReqType = X_DamageQueryVersion; - req->majorVersion = DAMAGE_MAJOR; - req->minorVersion = DAMAGE_MINOR; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) - { - UnlockDisplay (dpy); - SyncHandle (); - return 0; - } - info->major_version = rep.majorVersion; - info->minor_version = rep.minorVersion; - UnlockDisplay (dpy); - } else { - /* The server doesn't have this extension. - * Use a private Xlib-internal extension to hang the close_display - * hook on so that the "cache" (extinfo->cur) is properly cleaned. - * (XBUG 7955) - */ - XExtCodes *codes = XAddExtension(dpy); - if (!codes) { - XFree(info); - return NULL; - } - XESetCloseDisplay (dpy, codes->extension, XDamageCloseDisplay); - } - - /* - * now, chain it onto the list - */ - _XLockMutex(_Xglobal_lock); - info->next = extinfo->head; - extinfo->head = info; - extinfo->cur = info; - extinfo->ndisplays++; - _XUnlockMutex(_Xglobal_lock); - return info; -} - - -/* - * XDamageExtRemoveDisplay - remove the indicated display from the - * extension object. (Replaces XextRemoveDisplay.) - */ -static int -XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display *dpy) -{ - XDamageExtDisplayInfo *info, *prev; - - /* - * locate this display and its back link so that it can be removed - */ - _XLockMutex(_Xglobal_lock); - prev = NULL; - for (info = extinfo->head; info; info = info->next) { - if (info->display == dpy) break; - prev = info; - } - if (!info) { - _XUnlockMutex(_Xglobal_lock); - return 0; /* hmm, actually an error */ - } - - /* - * remove the display from the list; handles going to zero - */ - if (prev) - prev->next = info->next; - else - extinfo->head = info->next; - - extinfo->ndisplays--; - if (info == extinfo->cur) extinfo->cur = NULL; /* flush cache */ - _XUnlockMutex(_Xglobal_lock); - - Xfree ((char *) info); - return 1; -} - -/* - * XDamageExtFindDisplay - look for a display in this extension; keeps a - * cache of the most-recently used for efficiency. (Replaces - * XextFindDisplay.) - */ -static XDamageExtDisplayInfo * -XDamageExtFindDisplay (XDamageExtInfo *extinfo, - Display *dpy) -{ - XDamageExtDisplayInfo *info; - - /* - * see if this was the most recently accessed display - */ - if ((info = extinfo->cur) && info->display == dpy) - return info; - - /* - * look for display in list - */ - _XLockMutex(_Xglobal_lock); - for (info = extinfo->head; info; info = info->next) { - if (info->display == dpy) { - extinfo->cur = info; /* cache most recently used */ - _XUnlockMutex(_Xglobal_lock); - return info; - } - } - _XUnlockMutex(_Xglobal_lock); - - return NULL; -} - -XDamageExtDisplayInfo * -XDamageFindDisplay (Display *dpy) -{ - XDamageExtDisplayInfo *info; - - info = XDamageExtFindDisplay (&XDamageExtensionInfo, dpy); - if (!info) - info = XDamageExtAddDisplay (&XDamageExtensionInfo, dpy, - XDamageExtensionName); - return info; -} - -static int -XDamageCloseDisplay (Display *dpy, XExtCodes *codes) -{ - return XDamageExtRemoveDisplay (&XDamageExtensionInfo, dpy); -} - -static Bool -XDamageWireToEvent(Display *dpy, XEvent *event, xEvent *wire) -{ - XDamageExtDisplayInfo *info = XDamageFindDisplay(dpy); - - XDamageCheckExtension(dpy, info, False); - - switch ((wire->u.u.type & 0x7F) - info->codes->first_event) - { - case XDamageNotify: { - XDamageNotifyEvent *aevent = (XDamageNotifyEvent *) event; - xDamageNotifyEvent *awire = (xDamageNotifyEvent *) wire; - - aevent->type = awire->type & 0x7F; - aevent->serial = _XSetLastRequestRead(dpy, - (xGenericReply *) wire); - aevent->send_event = (awire->type & 0x80) != 0; - aevent->display = dpy; - aevent->drawable = awire->drawable; - aevent->damage = awire->damage; - aevent->level = awire->level; - aevent->timestamp = awire->timestamp; - aevent->area.x = awire->area.x; - aevent->area.y = awire->area.y; - aevent->area.width = awire->area.width; - aevent->area.height = awire->area.height; - aevent->geometry.x = awire->geometry.x; - aevent->geometry.y = awire->geometry.y; - aevent->geometry.width = awire->geometry.width; - aevent->geometry.height = awire->geometry.height; - return True; - } - } - return False; -} - -static Status -XDamageEventToWire(Display *dpy, XEvent *event, xEvent *wire) -{ - XDamageExtDisplayInfo *info = XDamageFindDisplay(dpy); - - XDamageCheckExtension(dpy, info, False); - - switch ((event->type & 0x7F) - info->codes->first_event) - { - case XDamageNotify: { - XDamageNotifyEvent *aevent; - xDamageNotifyEvent *awire; - awire = (xDamageNotifyEvent *) wire; - aevent = (XDamageNotifyEvent *) event; - awire->type = aevent->type | (aevent->send_event ? 0x80 : 0); - awire->drawable = aevent->drawable; - awire->damage = aevent->damage; - awire->level = aevent->level; - awire->timestamp = aevent->timestamp; - awire->area.x = aevent->area.x; - awire->area.y = aevent->area.y; - awire->area.width = aevent->area.width; - awire->area.height = aevent->area.height; - awire->geometry.x = aevent->geometry.x; - awire->geometry.y = aevent->geometry.y; - awire->geometry.width = aevent->geometry.width; - awire->geometry.height = aevent->geometry.height; - return True; - } - } - return False; -} - -Bool -XDamageQueryExtension (Display *dpy, int *event_basep, int *error_basep) -{ - XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); - - if (XDamageHasExtension(info)) - { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - return True; - } - else - return False; -} - -Status -XDamageQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp) -{ - XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); - - XDamageCheckExtension (dpy, info, 0); - - *major_versionp = info->major_version; - *minor_versionp = info->minor_version; - UnlockDisplay (dpy); - SyncHandle (); - return 1; -} - -Damage -XDamageCreate (Display *dpy, Drawable drawable, int level) -{ - XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); - xDamageCreateReq *req; - Damage damage; - - XDamageCheckExtension (dpy, info, 0); - LockDisplay (dpy); - GetReq (DamageCreate, req); - req->reqType = info->codes->major_opcode; - req->damageReqType = X_DamageCreate; - req->damage = damage = XAllocID (dpy); - req->drawable = drawable; - req->level = level; - UnlockDisplay (dpy); - SyncHandle (); - return damage; -} - -void -XDamageDestroy (Display *dpy, Damage damage) -{ - XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); - xDamageDestroyReq *req; - - XDamageSimpleCheckExtension (dpy, info); - LockDisplay (dpy); - GetReq (DamageDestroy, req); - req->reqType = info->codes->major_opcode; - req->damageReqType = X_DamageDestroy; - req->damage = damage; - UnlockDisplay (dpy); - SyncHandle (); -} - -void -XDamageSubtract (Display *dpy, Damage damage, - XserverRegion repair, XserverRegion parts) -{ - XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); - xDamageSubtractReq *req; - - XDamageSimpleCheckExtension (dpy, info); - LockDisplay (dpy); - GetReq (DamageSubtract, req); - req->reqType = info->codes->major_opcode; - req->damageReqType = X_DamageSubtract; - req->damage = damage; - req->repair = repair; - req->parts = parts; - UnlockDisplay (dpy); - SyncHandle (); -} diff --git a/nx-X11/lib/Xdamage/Xdamage.h b/nx-X11/lib/Xdamage/Xdamage.h deleted file mode 100644 index 3da0606cb..000000000 --- a/nx-X11/lib/Xdamage/Xdamage.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * $Id: Xdamage.h,v 1.3 2005/07/03 07:00:56 daniels Exp $ - * - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _XDAMAGE_H_ -#define _XDAMAGE_H_ - -#include -#include -#include - -typedef XID Damage; - -typedef struct { - int type; /* event base */ - unsigned long serial; - Bool send_event; - Display *display; - Drawable drawable; - Damage damage; - int level; - Bool more; /* more events will be delivered immediately */ - Time timestamp; - XRectangle area; - XRectangle geometry; -} XDamageNotifyEvent; - -_XFUNCPROTOBEGIN - -Bool XDamageQueryExtension (Display *dpy, int *event_basep, int *error_basep); - -Status XDamageQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp); - -Damage -XDamageCreate (Display *dpy, Drawable drawable, int level); - -void -XDamageDestroy (Display *dpy, Damage damage); - -void -XDamageSubtract (Display *dpy, Damage damage, - XserverRegion repair, XserverRegion parts); - -_XFUNCPROTOEND - -#endif /* _XDAMAGE_H_ */ diff --git a/nx-X11/lib/Xdamage/autogen.sh b/nx-X11/lib/Xdamage/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xdamage/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xdamage/configure.ac b/nx-X11/lib/Xdamage/configure.ac deleted file mode 100644 index c2ab2ce26..000000000 --- a/nx-X11/lib/Xdamage/configure.ac +++ /dev/null @@ -1,93 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.1 2004/07/31 05:50:39 anholt Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ([2.57]) - -dnl -dnl Version should match the current XFixes version. XFixesQueryVersion -dnl returns the version from xfixeswire.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n -dnl -AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) - -if test "$x_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - X_LIBS="$X_LIBS -lX11" - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi -fi - -# Check damageext configuration, strip extra digits from package version to -# find the required protocol version - -DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(XDAMAGE, [damageext >= $DAMAGEEXT_VERSION] xfixes) - -AC_OUTPUT([Makefile - xdamage.pc]) - diff --git a/nx-X11/lib/Xdamage/xdamage.pc.in b/nx-X11/lib/Xdamage/xdamage.pc.in deleted file mode 100644 index d1c9f5de6..000000000 --- a/nx-X11/lib/Xdamage/xdamage.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xdamage -Description: X Damage Library -Version: @VERSION@ -Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@ diff --git a/nx-X11/lib/Xdamage/xdamageint.h b/nx-X11/lib/Xdamage/xdamageint.h deleted file mode 100644 index 145d6610f..000000000 --- a/nx-X11/lib/Xdamage/xdamageint.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * $Id: xdamageint.h,v 1.2 2005/07/03 07:00:56 daniels Exp $ - * - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _XDAMAGEINT_H_ -#define _XDAMAGEINT_H_ - -#define NEED_EVENTS -#define NEED_REPLIES -#include -#include -#include -#include -#include -#include "Xdamage.h" - -typedef struct _XDamageExtDisplayInfo { - struct _XDamageExtDisplayInfo *next; /* keep a linked list */ - Display *display; /* which display this is */ - XExtCodes *codes; /* the extension protocol codes */ - int major_version; /* -1 means we don't know */ - int minor_version; /* -1 means we don't know */ -} XDamageExtDisplayInfo; - -/* replaces XExtensionInfo */ -typedef struct _XDamageExtInfo { - XDamageExtDisplayInfo *head; /* start of the list */ - XDamageExtDisplayInfo *cur; /* most recently used */ - int ndisplays; /* number of displays */ -} XDamageExtInfo; - -extern XDamageExtInfo XDamageExtensionInfo; -extern const char XDamageExtensionName[]; - -XDamageExtDisplayInfo * -XDamageFindDisplay (Display *dpy); - -#define XDamageHasExtension(i) ((i) && ((i)->codes)) - -#define XDamageCheckExtension(dpy,i,val) \ - if (!XDamageHasExtension(i)) { return val; } - -#define XDamageSimpleCheckExtension(dpy,i) \ - if (!XDamageHasExtension(i)) { return; } - -#endif /* _XDAMAGEINT_H_ */ diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index b1782eb15..eb65fba19 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -427,7 +427,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lXdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lXdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ @@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \ `pkg-config --libs libxml-2.0` #endif diff --git a/nx-libs.spec b/nx-libs.spec index 294c8739b..9e8a16e4e 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -34,6 +34,7 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xfont) BuildRequires: pkgconfig(xdmcp) +BuildRequires: pkgconfig(xdamage) %else BuildRequires: libexpat-devel BuildRequires: libpng-devel @@ -43,6 +44,7 @@ BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXpm-devel BuildRequires: xorg-x11-libXfont-devel BuildRequires: xorg-x11-libXdmcp-devel +BuildRequires: xorg-x11-libXdamage-devel %endif BuildRequires: xorg-x11-util-devel %endif @@ -53,6 +55,7 @@ BuildRequires: libpng-devel BuildRequires: libxml2-devel BuildRequires: libXfont-devel BuildRequires: libXdmcp-devel +BuildRequires: libXdamage-devel %endif # For imake @@ -202,21 +205,6 @@ off-screen buffer can be automatically merged into the parent window or merged by external programs, called compositing managers. -%package -n libNX_Xdamage1 -Group: System Environment/Libraries -Summary: NX Damage Extension library -Requires: %{name}%{?_isa} >= 3.5.0.29 -Obsoletes: libNX_Xdamage - -%description -n libNX_Xdamage1 -NX is a software suite which implements very efficient compression of -the X11 protocol. This increases performance when using X -applications over a network, especially a slow one. - -The X Damage Extension allows applications to track modified regions -of drawables. - - %package -n libNX_Xext-devel Group: Development/Libraries Summary: Development files for the NX Common Extensions library @@ -656,7 +644,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %post -n libNX_X11-6 -p /sbin/ldconfig %post -n libNX_Xau6 -p /sbin/ldconfig %post -n libNX_Xcomposite1 -p /sbin/ldconfig -%post -n libNX_Xdamage1 -p /sbin/ldconfig %post -n libNX_Xext6 -p /sbin/ldconfig %post -n libNX_Xfixes3 -p /sbin/ldconfig %post -n libNX_Xinerama1 -p /sbin/ldconfig @@ -670,7 +657,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %postun -n libNX_X11-6 -p /sbin/ldconfig %postun -n libNX_Xau6 -p /sbin/ldconfig %postun -n libNX_Xcomposite1 -p /sbin/ldconfig -%postun -n libNX_Xdamage1 -p /sbin/ldconfig %postun -n libNX_Xext6 -p /sbin/ldconfig %postun -n libNX_Xfixes3 -p /sbin/ldconfig %postun -n libNX_Xinerama1 -p /sbin/ldconfig @@ -728,10 +714,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %defattr(-,root,root) %{_libdir}/libNX_Xcomposite.so.1* -%files -n libNX_Xdamage1 -%defattr(-,root,root) -%{_libdir}/libNX_Xdamage.so.1* - %files -n libNX_Xext-devel %defattr(-,root,root) %{_libdir}/libNX_Xext.so @@ -850,7 +832,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %files devel %defattr(-,root,root) %{_libdir}/libNX_Xcomposite.so -%{_libdir}/libNX_Xdamage.so %{_libdir}/libNX_Xinerama.so %{_libdir}/libNX_Xrandr.so %{_libdir}/libNX_Xtst.so @@ -859,7 +840,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_includedir}/nx/X11/extensions/XRes.h %{_includedir}/nx/X11/extensions/XTest.h %{_includedir}/nx/X11/extensions/Xcomposite.h -%{_includedir}/nx/X11/extensions/Xdamage.h %{_includedir}/nx/X11/extensions/Xevie.h %{_includedir}/nx/X11/extensions/Xinerama.h %{_includedir}/nx/X11/extensions/Xrandr.h @@ -909,8 +889,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_includedir}/nx/X11/extensions/bigreqstr.h %{_includedir}/nx/X11/extensions/composite.h %{_includedir}/nx/X11/extensions/compositeproto.h -%{_includedir}/nx/X11/extensions/damageproto.h -%{_includedir}/nx/X11/extensions/damagewire.h %{_includedir}/nx/X11/extensions/panoramiXproto.h %{_includedir}/nx/X11/extensions/randr.h %{_includedir}/nx/X11/extensions/randrproto.h diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index e4ddd7bd4..1480e5ea8 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -148,7 +148,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -lNX_Xdamage +EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -lXdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) -- cgit v1.2.3 From e9dcab679cb686b25df921c2c233198cb9dcfbb8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 1 May 2015 15:57:02 +0200 Subject: library clean-up: Don't build libNX_Xrandr anymore. Use system's libXrandr shared library. --- debian/control | 57 +-- debian/libnx-xrandr-dev.install.in | 2 - debian/libnx-xrandr2.install.in | 1 - debian/libnx-xrandr2.symbols | 23 - debian/nx-x11proto-randr-dev.install.in | 2 - debian/rules | 1 - nx-X11/config/cf/X11.tmpl | 37 -- nx-X11/config/cf/host.def | 2 - nx-X11/config/cf/lnxLib.tmpl | 1 - nx-X11/include/extensions/Imakefile | 4 - nx-X11/include/extensions/randr.h | 74 --- nx-X11/include/extensions/randrproto.h | 209 -------- nx-X11/lib/Imakefile | 5 - nx-X11/lib/Xrandr/Imakefile | 42 -- nx-X11/lib/Xrandr/Xrandr-def.cpp | 36 -- nx-X11/lib/Xrandr/Xrandr.c | 744 ---------------------------- nx-X11/lib/Xrandr/Xrandr.h | 151 ------ nx-X11/lib/Xrandr/Xrandr.man | 351 ------------- nx-X11/lib/Xrandr/Xrandrint.h | 87 ---- nx-X11/lib/Xrandr/test.c | 21 - nx-X11/programs/Xserver/Imakefile | 4 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +- nx-libs.spec | 29 +- nxcompshad/Makefile.in | 2 +- 25 files changed, 29 insertions(+), 1860 deletions(-) delete mode 100644 debian/libnx-xrandr-dev.install.in delete mode 100644 debian/libnx-xrandr2.install.in delete mode 100644 debian/libnx-xrandr2.symbols delete mode 100644 debian/nx-x11proto-randr-dev.install.in delete mode 100644 nx-X11/include/extensions/randr.h delete mode 100644 nx-X11/include/extensions/randrproto.h delete mode 100644 nx-X11/lib/Xrandr/Imakefile delete mode 100644 nx-X11/lib/Xrandr/Xrandr-def.cpp delete mode 100644 nx-X11/lib/Xrandr/Xrandr.c delete mode 100644 nx-X11/lib/Xrandr/Xrandr.h delete mode 100644 nx-X11/lib/Xrandr/Xrandr.man delete mode 100644 nx-X11/lib/Xrandr/Xrandrint.h delete mode 100644 nx-X11/lib/Xrandr/test.c (limited to 'nxcompshad') diff --git a/debian/control b/debian/control index 0f575421f..485c6fe0e 100644 --- a/debian/control +++ b/debian/control @@ -18,12 +18,12 @@ Build-Depends: libxfont-dev, libxdmcp-dev, libxdamage-dev, + libxrandr-dev, autoconf, pkg-config, x11proto-core-dev, expat, Build-Conflicts: - x11proto-randr-dev, x11proto-record-dev, x11proto-xinerama-dev, Standards-Version: 3.9.6 @@ -714,20 +714,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library +Description: nx-X11 RandR extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. + This package removes the obsoleted libNX_Xrandr.so.2 library. With + recent versions of NX, the system-wide installed libXrandr gets used. . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package can be safely removed. Package: libnx-xrandr-dev Provides: libnx-xrandr2-dev @@ -735,41 +731,34 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrandr2 (= ${binary:Version}), - nx-x11proto-randr-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library (development headers) +Description: nx-X11 RandR extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. - . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package removes the obsoleted headers for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-randr-dev Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrandr2 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension wire protocol +Description: nx-X11 RandR extension wire protocol (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides development headers describing the wire protocol - for the RandR extension, used to change display properties such as - resolution, rotation, reflection, et al, on the fly. + This package removes the obsoleted headers for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. + . + This package can be safely removed. Package: libnx-xrandr2-dbg Architecture: any @@ -777,22 +766,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xrandr2 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library (debug package) +Description: nx-X11 RandR extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. - . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package removes the obsoleted debug symbols for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xrender1 Architecture: any diff --git a/debian/libnx-xrandr-dev.install.in b/debian/libnx-xrandr-dev.install.in deleted file mode 100644 index 4711b6a18..000000000 --- a/debian/libnx-xrandr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xrandr.so -usr/include/*/nx/X11/extensions/Xrandr.h \ No newline at end of file diff --git a/debian/libnx-xrandr2.install.in b/debian/libnx-xrandr2.install.in deleted file mode 100644 index f4d1b039f..000000000 --- a/debian/libnx-xrandr2.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xrandr.so.* diff --git a/debian/libnx-xrandr2.symbols b/debian/libnx-xrandr2.symbols deleted file mode 100644 index 7dc2fd1b9..000000000 --- a/debian/libnx-xrandr2.symbols +++ /dev/null @@ -1,23 +0,0 @@ -libNX_Xrandr.so.2 libnx-xrandr2 #MINVER# - XRRConfigCurrentConfiguration@Base 3.5.0.29 - XRRConfigCurrentRate@Base 3.5.0.29 - XRRConfigRates@Base 3.5.0.29 - XRRConfigRotations@Base 3.5.0.29 - XRRConfigSizes@Base 3.5.0.29 - XRRConfigTimes@Base 3.5.0.29 - XRRExtensionInfo@Base 3.5.0.29 - XRRExtensionName@Base 3.5.0.29 - XRRFindDisplay@Base 3.5.0.29 - XRRFreeScreenConfigInfo@Base 3.5.0.29 - XRRGetScreenInfo@Base 3.5.0.29 - XRRQueryExtension@Base 3.5.0.29 - XRRQueryVersion@Base 3.5.0.29 - XRRRates@Base 3.5.0.29 - XRRRootToScreen@Base 3.5.0.29 - XRRRotations@Base 3.5.0.29 - XRRSelectInput@Base 3.5.0.29 - XRRSetScreenConfig@Base 3.5.0.29 - XRRSetScreenConfigAndRate@Base 3.5.0.29 - XRRSizes@Base 3.5.0.29 - XRRTimes@Base 3.5.0.29 - XRRUpdateConfiguration@Base 3.5.0.29 diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in deleted file mode 100644 index d92801663..000000000 --- a/debian/nx-x11proto-randr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx/X11/extensions/randr.h -usr/include/*/nx/X11/extensions/randrproto.h diff --git a/debian/rules b/debian/rules index 16a09fb3f..682c5dab8 100755 --- a/debian/rules +++ b/debian/rules @@ -84,7 +84,6 @@ override_dh_strip: dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg - dh_strip -plibnx-xrandr2 --dbg-package=libnx-xrandr2-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index de60cecaa..37f89696d 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -325,9 +325,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildRandR #define BuildRandR YES #endif -#ifndef BuildRandRLibrary -#define BuildRandRLibrary !BuildServersOnly -#endif #ifndef BuildXfixes #define BuildXfixes YES @@ -1529,30 +1526,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXrender NO #endif -#if BuildRandRLibrary -# ifndef SharedLibXrandr -# define SharedLibXrandr HasSharedLibraries -# endif -# ifndef NormalLibXrandr -# define NormalLibXrandr (!SharedLibXrandr || ForceNormalLib) -# endif -# ifndef DebugLibXrandr -# define DebugLibXrandr NO -# endif -# ifndef ProfileLibXrandr -# define ProfileLibXrandr NO -# endif -#else -# undef SharedLibXrandr -# define SharedLibXrandr NO -# undef NormalLibXrandr -# define NormalLibXrandr NO -# undef DebugLibXrandr -# define DebugLibXrandr NO -# undef ProfileLibXrandr -# define ProfileLibXrandr NO -#endif - #if BuildXfixesLibrary #ifndef SharedLibXfixes #define SharedLibXfixes HasSharedLibraries @@ -1751,16 +1724,6 @@ ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) #else ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) -#endif - - XRANDRLIBSRC = $(LIBSRC)/Xrandr -#if SharedLibXrandr -#ifndef SharedXrandrRev -#define SharedXrandrRev 2.0 -#endif -SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) -#else -ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) #endif XFIXESLIBSRC = $(LIBSRC)/Xfixes diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 0566befdd..02eabbb9f 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -127,8 +127,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildCompositeLibrary YES -#define BuildRandRLibrary YES - #define BuildDocs NO #define BuildComposite YES diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index 23fdf0fe3..33c89e102 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -9,7 +9,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) #define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) -#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXrenderReqs $(LDPRELIB) $(XLIB) #define SharedXtstReqs $(LDPRELIB) $(XLIB) diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 4f88d2bab..549c77018 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -50,9 +50,6 @@ XFIXESHEADERS = xfixeswire.h xfixesproto.h #if BuildComposite || BuildCompositeLibrary COMPOSITEHEADERS = composite.h compositeproto.h #endif -#if BuildRandR || BuildRandRLibrary -RANDRHEADERS = randr.h randrproto.h -#endif #if BuildXTrap XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \ xtraplibp.h xtrapproto.h @@ -77,7 +74,6 @@ EXTRAHEADERS = \ $(XF86RUSHHEADERS) \ $(FONTCACHEHEADERS) \ $(RENDERHEADERS) \ - $(RANDRHEADERS) \ $(XFIXESHEADERS) \ $(COMPOSITEHEADERS) \ $(XEVIEHEADERS) \ diff --git a/nx-X11/include/extensions/randr.h b/nx-X11/include/extensions/randr.h deleted file mode 100644 index 864ddd4fa..000000000 --- a/nx-X11/include/extensions/randr.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $ - * - * Copyright © 2000, Compaq Computer Corporation, - * Copyright © 2002, Hewlett Packard, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Compaq or HP not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. HP makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL HP - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Jim Gettys, HP Labs, Hewlett-Packard, Inc. - */ - -#ifndef _RANDR_H_ -#define _RANDR_H_ - -typedef unsigned short Rotation; -typedef unsigned short SizeID; -typedef unsigned short SubpixelOrder; - -#define RANDR_NAME "RANDR" -#define RANDR_MAJOR 1 -#define RANDR_MINOR 1 - -#define RRNumberErrors 0 -#define RRNumberEvents 1 - -#define X_RRQueryVersion 0 -/* we skip 1 to make old clients fail pretty immediately */ -#define X_RROldGetScreenInfo 1 -#define X_RR1_0SetScreenConfig 2 -/* V1.0 apps share the same set screen config request id */ -#define X_RRSetScreenConfig 2 -#define X_RROldScreenChangeSelectInput 3 -/* 3 used to be ScreenChangeSelectInput; deprecated */ -#define X_RRSelectInput 4 -#define X_RRGetScreenInfo 5 - -/* used in XRRSelectInput */ - -#define RRScreenChangeNotifyMask (1L << 0) - -#define RRScreenChangeNotify 0 - -/* used in the rotation field; rotation and reflection in 0.1 proto. */ -#define RR_Rotate_0 1 -#define RR_Rotate_90 2 -#define RR_Rotate_180 4 -#define RR_Rotate_270 8 - -/* new in 1.0 protocol, to allow reflection of screen */ - -#define RR_Reflect_X 16 -#define RR_Reflect_Y 32 - -#define RRSetConfigSuccess 0 -#define RRSetConfigInvalidConfigTime 1 -#define RRSetConfigInvalidTime 2 -#define RRSetConfigFailed 3 - -#endif /* _RANDR_H_ */ diff --git a/nx-X11/include/extensions/randrproto.h b/nx-X11/include/extensions/randrproto.h deleted file mode 100644 index 04d62fc04..000000000 --- a/nx-X11/include/extensions/randrproto.h +++ /dev/null @@ -1,209 +0,0 @@ -/* - * $XFree86: xc/include/extensions/randrproto.h,v 1.6 2002/09/29 23:39:43 keithp Exp $ - * - * Copyright © 2000 Compaq Computer Corporation - * Copyright © 2002 Hewlett-Packard Company - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Compaq or HP not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. Compaq and HP makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Jim Gettys, Hewlett-Packard Company, Inc. - */ - -/* note that RANDR 1.0 is incompatible with version 0.0, or 0.1 */ -/* V1.0 removes depth switching from the protocol */ -#ifndef _XRANDRP_H_ -#define _XRANDRP_H_ - -#include - -#define Window CARD32 -#define Drawable CARD32 -#define Font CARD32 -#define Pixmap CARD32 -#define Cursor CARD32 -#define Colormap CARD32 -#define GContext CARD32 -#define Atom CARD32 -#define Time CARD32 -#define KeyCode CARD8 -#define KeySym CARD32 - -#define Rotation CARD16 -#define SizeID CARD16 -#define SubpixelOrder CARD16 - -/* - * data structures - */ - -typedef struct { - CARD16 widthInPixels B16; - CARD16 heightInPixels B16; - CARD16 widthInMillimeters B16; - CARD16 heightInMillimeters B16; -} xScreenSizes; -#define sz_xScreenSizes 8 - -/* - * requests and replies - */ - -typedef struct { - CARD8 reqType; - CARD8 randrReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; -} xRRQueryVersionReq; -#define sz_xRRQueryVersionReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 majorVersion B32; - CARD32 minorVersion B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xRRQueryVersionReply; -#define sz_xRRQueryVersionReply 32 - -typedef struct { - CARD8 reqType; - CARD8 randrReqType; - CARD16 length B16; - Window window B32; -} xRRGetScreenInfoReq; -#define sz_xRRGetScreenInfoReq 8 - -/* - * the xRRScreenInfoReply structure is followed by: - * - * the size information - */ - - -typedef struct { - BYTE type; /* X_Reply */ - BYTE setOfRotations; - CARD16 sequenceNumber B16; - CARD32 length B32; - Window root B32; - Time timestamp B32; - Time configTimestamp B32; - CARD16 nSizes B16; - SizeID sizeID B16; - Rotation rotation B16; - CARD16 rate B16; - CARD16 nrateEnts B16; - CARD16 pad B16; -} xRRGetScreenInfoReply; -#define sz_xRRGetScreenInfoReply 32 - -typedef struct { - CARD8 reqType; - CARD8 randrReqType; - CARD16 length B16; - Drawable drawable B32; - Time timestamp B32; - Time configTimestamp B32; - SizeID sizeID B16; - Rotation rotation B16; -} xRR1_0SetScreenConfigReq; -#define sz_xRR1_0SetScreenConfigReq 20 - -typedef struct { - CARD8 reqType; - CARD8 randrReqType; - CARD16 length B16; - Drawable drawable B32; - Time timestamp B32; - Time configTimestamp B32; - SizeID sizeID B16; - Rotation rotation B16; - CARD16 rate B16; - CARD16 pad B16; -} xRRSetScreenConfigReq; -#define sz_xRRSetScreenConfigReq 24 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time newTimestamp B32; - Time newConfigTimestamp B32; - Window root; - CARD16 subpixelOrder B16; - CARD16 pad4 B16; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xRRSetScreenConfigReply; -#define sz_xRRSetScreenConfigReply 32 - -typedef struct { - CARD8 reqType; - CARD8 randrReqType; - CARD16 length B16; - Window window B32; - CARD16 enable B16; - CARD16 pad2 B16; -} xRRSelectInputReq; -#define sz_xRRSelectInputReq 12 - -#define sz_xRRSelectInputReq 12 - -/* - * event - */ -typedef struct { - CARD8 type; /* always evBase + ScreenChangeNotify */ - CARD8 rotation; /* new rotation */ - CARD16 sequenceNumber B16; - Time timestamp B32; /* time screen was changed */ - Time configTimestamp B32; /* time config data was changed */ - Window root B32; /* root window */ - Window window B32; /* window requesting notification */ - SizeID sizeID B16; /* new size ID */ - CARD16 subpixelOrder B16; /* subpixel order */ - CARD16 widthInPixels B16; /* new size */ - CARD16 heightInPixels B16; - CARD16 widthInMillimeters B16; - CARD16 heightInMillimeters B16; -} xRRScreenChangeNotifyEvent; -#define sz_xRRScreenChangeNotifyEvent 32 - -#undef Window -#undef Drawable -#undef Font -#undef Pixmap -#undef Cursor -#undef Colormap -#undef GContext -#undef Atom -#undef Time -#undef KeyCode -#undef KeySym -#undef Rotation -#undef SizeID -#undef SubpixelOrder - -#endif /* _XRANDRP_H_ */ diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile index 13dc8ac73..3e58dfecb 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -51,10 +51,6 @@ GLXLIBDIR = GL RENDERLIBDIR = Xrender #endif -#if BuildRandRLibrary -RANDRLIBDIR = Xrandr -#endif - #if BuildXfixesLibrary XFIXESLIBDIR = Xfixes #endif @@ -103,7 +99,6 @@ LINTSUBDIRS = \ $(GLXLIBDIR) \ $(XINERAMADIR) \ $(RENDERLIBDIR) \ - $(RANDRLIBDIR) \ $(XRESLIBDIR) \ $(XFIXESLIBDIR) \ $(COMPOSITELIBDIR) \ diff --git a/nx-X11/lib/Xrandr/Imakefile b/nx-X11/lib/Xrandr/Imakefile deleted file mode 100644 index 5cf70a516..000000000 --- a/nx-X11/lib/Xrandr/Imakefile +++ /dev/null @@ -1,42 +0,0 @@ -XCOMM $XFree86: xc/lib/Xrandr/Imakefile,v 1.1 2001/05/23 03:29:44 keithp Exp $ -XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile,v 1.5 2005/10/24 23:30:21 alanc Exp $ - -#define DoNormalLib NormalLibXrandr -#define DoSharedLib SharedLibXrandr -#define DoDebugLib DebugLibXrandr -#define DoProfileLib ProfileLibXrandr -#define LibName NX_Xrandr -#define SoRev SOXRANDRREV -#define IncSubdir X11 -#define IncSubSubdir extensions - -#include - -#ifdef SharedXrandrReqs -REQUIREDLIBS = SharedXrandrReqs -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - - DEFINES = $(ALLOC_DEFINES) - INCLUDES = -I. -I$(XLIBSRC) -I$(EXTINCSRC) - SRCS = Xrandr.c - OBJS = Xrandr.o - LINTLIBS = $(LINTXLIB) - -HEADERS = Xrandr.h - -#include - -MANSUFFIX = $(LIBMANSUFFIX) - -#define PreprocessManPages -InstallManPage(Xrandr,$(LIBMANDIR)) - -#if ExpandManNames -InstallManPageAliases(Xrandr,$(LIBMANDIR),XRRQueryExtension XRRQueryVersion XRRGetScreenInfo XRRFreeScreenConfigInfo XRRSetScreenConfig XRRSetScreenConfigAndRate XRRConfigRotations XRRConfigTimes XRRConfigSizes XRRConfigRates XRRConfigCurrentConfiguration XRRConfigCurrentRate XRRRootToScreen XRRScreenConfig XRRConfig XRRSelectInput) -#endif - -DependTarget() diff --git a/nx-X11/lib/Xrandr/Xrandr-def.cpp b/nx-X11/lib/Xrandr/Xrandr-def.cpp deleted file mode 100644 index 8b0d8a754..000000000 --- a/nx-X11/lib/Xrandr/Xrandr-def.cpp +++ /dev/null @@ -1,36 +0,0 @@ -LIBRARY Xrandr -VERSION LIBRARY_VERSION -EXPORTS -#ifndef __UNIXOS2__ -XRRCurrentConfig -#endif - XRRFindDisplay -#ifndef __UNIXOS2__ -XRRFreeScreenInfo -#endif - XRRGetScreenInfo - XRRQueryExtension - XRRQueryVersion - XRRRootToScreen - XRRRotations -#ifndef __UNIXOS2__ -XRRScreenChangeSelectInput -#endif - XRRSetScreenConfig - XRRSizes - XRRTimes -#ifndef __UNIXOS2__ -XRRVisualIDToVisual -XRRVisualToDepth -#else -XRRConfigCurrentConfiguration -XRRConfigSizes -XRRConfigRotations -XRRSelectInput -XRRFreeScreenConfigInfo -XRRUpdateConfiguration -XRRConfigCurrentRate -XRRConfigRates -XRRSetScreenConfigAndRate -#endif /* __UNIXOS2__ -/* $XFree86: xc/lib/Xrandr/Xrandr-def.cpp,v 1.1 2001/08/19 15:22:58 alanh Exp $ */ diff --git a/nx-X11/lib/Xrandr/Xrandr.c b/nx-X11/lib/Xrandr/Xrandr.c deleted file mode 100644 index 32537b403..000000000 --- a/nx-X11/lib/Xrandr/Xrandr.c +++ /dev/null @@ -1,744 +0,0 @@ -/* - * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.13tsi Exp $ - * - * Copyright © 2000 Compaq Computer Corporation, Inc. - * Copyright © 2002 Hewlett Packard Company, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Compaq or HP not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. HP makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Jim Gettys, HP Labs, HP. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -/* we need to be able to manipulate the Display structure on events */ -#include -#include -#include -#include "Xrandrint.h" - -XExtensionInfo XRRExtensionInfo; -char XRRExtensionName[] = RANDR_NAME; - -static Bool XRRWireToEvent(Display *dpy, XEvent *event, xEvent *wire); -static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire); - -static XRRScreenConfiguration *_XRRGetScreenInfo (Display *dpy, Window window); - -static int -XRRCloseDisplay (Display *dpy, XExtCodes *codes); - -static /* const */ XExtensionHooks rr_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - XRRCloseDisplay, /* close_display */ - XRRWireToEvent, /* wire_to_event */ - XRREventToWire, /* event_to_wire */ - NULL, /* error */ - NULL, /* error_string */ -}; - -static Bool XRRWireToEvent(Display *dpy, XEvent *event, xEvent *wire) -{ - XExtDisplayInfo *info = XRRFindDisplay(dpy); - XRRScreenChangeNotifyEvent *aevent; - xRRScreenChangeNotifyEvent *awire; - - RRCheckExtension(dpy, info, False); - - switch ((wire->u.u.type & 0x7F) - info->codes->first_event) - { - case RRScreenChangeNotify: - awire = (xRRScreenChangeNotifyEvent *) wire; - aevent = (XRRScreenChangeNotifyEvent *) event; - aevent->type = awire->type & 0x7F; - aevent->serial = _XSetLastRequestRead(dpy, - (xGenericReply *) wire); - aevent->send_event = (awire->type & 0x80) != 0; - aevent->display = dpy; - aevent->window = awire->window; - aevent->root = awire->root; - aevent->timestamp = awire->timestamp; - aevent->config_timestamp = awire->configTimestamp; - aevent->size_index = awire->sizeID; - aevent->subpixel_order = awire->subpixelOrder; - aevent->rotation = awire->rotation; - aevent->width = awire->widthInPixels; - aevent->height = awire->heightInPixels; - aevent->mwidth = awire->widthInMillimeters; - aevent->mheight = awire->heightInMillimeters; - return True; - } - - return False; -} - -static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire) -{ - XExtDisplayInfo *info = XRRFindDisplay(dpy); - XRRScreenChangeNotifyEvent *aevent; - xRRScreenChangeNotifyEvent *awire; - - RRCheckExtension(dpy, info, False); - - switch ((event->type & 0x7F) - info->codes->first_event) - { - case RRScreenChangeNotify: - awire = (xRRScreenChangeNotifyEvent *) wire; - aevent = (XRRScreenChangeNotifyEvent *) event; - awire->type = aevent->type | (aevent->send_event ? 0x80 : 0); - awire->rotation = (CARD8) aevent->rotation; - awire->sequenceNumber = aevent->serial & 0xFFFF; - awire->timestamp = aevent->timestamp; - awire->configTimestamp = aevent->config_timestamp; - awire->root = aevent->root; - awire->window = aevent->window; - awire->sizeID = aevent->size_index; - awire->subpixelOrder = aevent->subpixel_order; - awire->widthInPixels = aevent->width; - awire->heightInPixels = aevent->height; - awire->widthInMillimeters = aevent->mwidth; - awire->heightInMillimeters = aevent->mheight; - return True; - } - return False; -} - -XExtDisplayInfo * -XRRFindDisplay (Display *dpy) -{ - XExtDisplayInfo *dpyinfo; - XRandRInfo *xrri; - int i, numscreens; - - dpyinfo = XextFindDisplay (&XRRExtensionInfo, dpy); - if (!dpyinfo) { - dpyinfo = XextAddDisplay (&XRRExtensionInfo, dpy, - XRRExtensionName, - &rr_extension_hooks, - RRNumberEvents, 0); - numscreens = ScreenCount(dpy); - xrri = Xmalloc (sizeof(XRandRInfo) + - sizeof(char *) * numscreens); - xrri->config = (XRRScreenConfiguration **)(xrri + 1); - for(i = 0; i < numscreens; i++) - xrri->config[i] = NULL; - xrri->major_version = -1; - dpyinfo->data = (char *) xrri; - } - return dpyinfo; -} - -static int -XRRCloseDisplay (Display *dpy, XExtCodes *codes) -{ - int i; - XRRScreenConfiguration **configs; - XExtDisplayInfo *info = XRRFindDisplay (dpy); - XRandRInfo *xrri; - - LockDisplay(dpy); - /* - * free cached data - */ - if (XextHasExtension(info)) { - xrri = (XRandRInfo *) info->data; - if (xrri) { - configs = xrri->config; - - for (i = 0; i < ScreenCount(dpy); i++) { - if (configs[i] != NULL) XFree (configs[i]); - } - XFree (xrri); - } - } - UnlockDisplay(dpy); - return XextRemoveDisplay (&XRRExtensionInfo, dpy); -} - - -Rotation XRRConfigRotations(XRRScreenConfiguration *config, Rotation *current_rotation) -{ - *current_rotation = config->current_rotation; - return config->rotations; -} - -XRRScreenSize *XRRConfigSizes(XRRScreenConfiguration *config, int *nsizes) -{ - *nsizes = config->nsizes; - return config->sizes; -} - -short *XRRConfigRates (XRRScreenConfiguration *config, int sizeID, int *nrates) -{ - short *r = config->rates; - int nents = config->nrates; - - /* Skip over the intervening rate lists */ - while (sizeID > 0 && nents > 0) - { - int i = (*r + 1); - r += i; - nents -= i; - sizeID--; - } - if (!nents) - { - *nrates = 0; - return 0; - } - *nrates = (int) *r; - return r + 1; -} - -Time XRRConfigTimes (XRRScreenConfiguration *config, Time *config_timestamp) -{ - *config_timestamp = config->config_timestamp; - return config->timestamp; -} - - -SizeID XRRConfigCurrentConfiguration (XRRScreenConfiguration *config, - Rotation *rotation) -{ - *rotation = (Rotation) config->current_rotation; - return (SizeID) config->current_size; -} - -short XRRConfigCurrentRate (XRRScreenConfiguration *config) -{ - return config->current_rate; -} - -/* - * Go get the screen configuration data and salt it away for future use; - * returns NULL if extension not supported - */ -static XRRScreenConfiguration *_XRRValidateCache (Display *dpy, int screen) -{ - XExtDisplayInfo *info = XRRFindDisplay (dpy); - XRRScreenConfiguration **configs; - XRandRInfo *xrri; - - if (XextHasExtension(info)) { - xrri = (XRandRInfo *) info->data; - configs = xrri->config; - - if (configs[screen] == NULL) - configs[screen] = _XRRGetScreenInfo (dpy, RootWindow(dpy, screen)); - return configs[screen]; - } else { - return NULL; - } -} - -/* given a screen, return the information from the (possibly) cached data */ -Rotation XRRRotations(Display *dpy, int screen, Rotation *current_rotation) -{ - XRRScreenConfiguration *config; - Rotation cr; - LockDisplay(dpy); - if ((config = _XRRValidateCache(dpy, screen))) { - *current_rotation = config->current_rotation; - cr = config->rotations; - UnlockDisplay(dpy); - return cr; - } - else { - UnlockDisplay(dpy); - *current_rotation = RR_Rotate_0; - return 0; /* no rotations supported */ - } -} - -/* given a screen, return the information from the (possibly) cached data */ -XRRScreenSize *XRRSizes(Display *dpy, int screen, int *nsizes) -{ - XRRScreenConfiguration *config; - XRRScreenSize *sizes; - - LockDisplay(dpy); - if ((config = _XRRValidateCache(dpy, screen))) { - *nsizes = config->nsizes; - sizes = config->sizes; - UnlockDisplay(dpy); - return sizes; - } - else { - UnlockDisplay(dpy); - *nsizes = 0; - return NULL; - } -} - -short *XRRRates (Display *dpy, int screen, int sizeID, int *nrates) -{ - XRRScreenConfiguration *config; - short *rates; - - LockDisplay(dpy); - if ((config = _XRRValidateCache(dpy, screen))) { - rates = XRRConfigRates (config, sizeID, nrates); - UnlockDisplay(dpy); - return rates; - } - else { - UnlockDisplay(dpy); - *nrates = 0; - return NULL; - } -} - -/* given a screen, return the information from the (possibly) cached data */ -Time XRRTimes (Display *dpy, int screen, Time *config_timestamp) -{ - XRRScreenConfiguration *config; - Time ts; - - LockDisplay(dpy); - if ((config = _XRRValidateCache(dpy, screen))) { - *config_timestamp = config->config_timestamp; - ts = config->timestamp; - UnlockDisplay(dpy); - return ts; - } else { - UnlockDisplay(dpy); - return CurrentTime; - } -} - -int XRRRootToScreen(Display *dpy, Window root) -{ - int snum; - for (snum = 0; snum < ScreenCount(dpy); snum++) { - if (RootWindow(dpy, snum) == root) return snum; - } - return -1; -} - - -Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep) -{ - XExtDisplayInfo *info = XRRFindDisplay (dpy); - - if (XextHasExtension(info)) { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - return True; - } else { - return False; - } -} - -static Bool -_XRRHasRates (int major, int minor) -{ - return major > 1 || (major == 1 && minor >= 1); -} - -Status XRRQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp) -{ - XExtDisplayInfo *info = XRRFindDisplay (dpy); - xRRQueryVersionReply rep; - xRRQueryVersionReq *req; - XRandRInfo *xrri; - - RRCheckExtension (dpy, info, 0); - - xrri = (XRandRInfo *) info->data; - - /* - * only get the version information from the server if we don't have it already - */ - if (xrri->major_version == -1) { - LockDisplay (dpy); - GetReq (RRQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->randrReqType = X_RRQueryVersion; - req->majorVersion = RANDR_MAJOR; - req->minorVersion = RANDR_MINOR; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { - UnlockDisplay (dpy); - SyncHandle (); - return 0; - } - xrri->major_version = rep.majorVersion; - xrri->minor_version = rep.minorVersion; - xrri->has_rates = _XRRHasRates (xrri->major_version, xrri->minor_version); - } - *major_versionp = xrri->major_version; - *minor_versionp = xrri->minor_version; - UnlockDisplay (dpy); - SyncHandle (); - return 1; -} - -typedef struct _randrVersionState { - unsigned long version_seq; - Bool error; - int major_version; - int minor_version; -} _XRRVersionState; - -static Bool -_XRRVersionHandler (Display *dpy, - xReply *rep, - char *buf, - int len, - XPointer data) -{ - xRRQueryVersionReply replbuf; - xRRQueryVersionReply *repl; - _XRRVersionState *state = (_XRRVersionState *) data; - - if (dpy->last_request_read != state->version_seq) - return False; - if (rep->generic.type == X_Error) - { - state->error = True; - return False; - } - repl = (xRRQueryVersionReply *) - _XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len, - (SIZEOF(xRRQueryVersionReply) - SIZEOF(xReply)) >> 2, - True); - state->major_version = repl->majorVersion; - state->minor_version = repl->minorVersion; - return True; -} -/* need a version that does not hold the display lock */ -static XRRScreenConfiguration *_XRRGetScreenInfo (Display *dpy, Window window) -{ - XExtDisplayInfo *info = XRRFindDisplay(dpy); - xRRGetScreenInfoReply rep; - xRRGetScreenInfoReq *req; - _XAsyncHandler async; - _XRRVersionState async_state; - int nbytes, nbytesRead, rbytes; - int i; - xScreenSizes size; - struct _XRRScreenConfiguration *scp; - XRRScreenSize *ssp; - short *rates; - xRRQueryVersionReq *vreq; - XRandRInfo *xrri; - Bool getting_version = False; - - RRCheckExtension (dpy, info, 0); - - xrri = (XRandRInfo *) info->data; - - if (xrri->major_version == -1) - { - /* hide a version query in the request */ - GetReq (RRQueryVersion, vreq); - vreq->reqType = info->codes->major_opcode; - vreq->randrReqType = X_RRQueryVersion; - vreq->majorVersion = RANDR_MAJOR; - vreq->minorVersion = RANDR_MINOR; - - async_state.version_seq = dpy->request; - async_state.error = False; - async.next = dpy->async_handlers; - async.handler = _XRRVersionHandler; - async.data = (XPointer) &async_state; - dpy->async_handlers = &async; - - getting_version = True; - } - - GetReq (RRGetScreenInfo, req); - req->reqType = info->codes->major_opcode; - req->randrReqType = X_RRGetScreenInfo; - req->window = window; - - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) - { - if (getting_version) - DeqAsyncHandler (dpy, &async); - SyncHandle (); - return NULL; - } - if (getting_version) - { - DeqAsyncHandler (dpy, &async); - if (async_state.error) - { - SyncHandle(); - } - xrri->major_version = async_state.major_version; - xrri->minor_version = async_state.minor_version; - xrri->has_rates = _XRRHasRates (xrri->minor_version, xrri->major_version); - } - - /* - * Make the reply compatible with v1.1 - */ - if (!xrri->has_rates) - { - rep.rate = 0; - rep.nrateEnts = 0; - } - - nbytes = (long) rep.length << 2; - - nbytesRead = (long) (rep.nSizes * SIZEOF (xScreenSizes) + - ((rep.nrateEnts + 1)& ~1) * 2 /* SIZEOF (CARD16) */); - - /* - * first we must compute how much space to allocate for - * randr library's use; we'll allocate the structures in a single - * allocation, on cleanlyness grounds. - */ - - rbytes = sizeof (XRRScreenConfiguration) + - (rep.nSizes * sizeof (XRRScreenSize) + - rep.nrateEnts * sizeof (int)); - - scp = (struct _XRRScreenConfiguration *) Xmalloc(rbytes); - if (scp == NULL) { - _XEatData (dpy, (unsigned long) nbytes); - SyncHandle (); - return NULL; - } - - - ssp = (XRRScreenSize *)(scp + 1); - rates = (short *) (ssp + rep.nSizes); - - /* set up the screen configuration structure */ - scp->screen = - ScreenOfDisplay (dpy, XRRRootToScreen(dpy, rep.root)); - - scp->sizes = ssp; - scp->rates = rates; - scp->rotations = rep.setOfRotations; - scp->current_size = rep.sizeID; - scp->current_rate = rep.rate; - scp->current_rotation = rep.rotation; - scp->timestamp = rep.timestamp; - scp->config_timestamp = rep.configTimestamp; - scp->nsizes = rep.nSizes; - scp->nrates = rep.nrateEnts; - - /* - * Time to unpack the data from the server. - */ - - /* - * First the size information - */ - for (i = 0; i < rep.nSizes; i++) { - _XReadPad (dpy, (char *) &size, SIZEOF (xScreenSizes)); - - ssp[i].width = size.widthInPixels; - ssp[i].height = size.heightInPixels; - ssp[i].mwidth = size.widthInMillimeters; - ssp[i].mheight = size.heightInMillimeters; - } - /* - * And the rates - */ - _XRead16Pad (dpy, rates, 2 /* SIZEOF (CARD16) */ * rep.nrateEnts); - - /* - * Skip any extra data - */ - if (nbytes > nbytesRead) - _XEatData (dpy, (unsigned long) (nbytes - nbytesRead)); - - return (XRRScreenConfiguration *)(scp); -} - -XRRScreenConfiguration *XRRGetScreenInfo (Display *dpy, Window window) -{ - XRRScreenConfiguration *config; - XRRFindDisplay(dpy); - LockDisplay (dpy); - config = _XRRGetScreenInfo(dpy, window); - UnlockDisplay (dpy); - SyncHandle (); - return config; -} - - -void XRRFreeScreenConfigInfo (XRRScreenConfiguration *config) -{ - Xfree (config); -} - - -/* - * in protocol version 0.1, routine added to allow selecting for new events. - */ - -void XRRSelectInput (Display *dpy, Window window, int mask) -{ - XExtDisplayInfo *info = XRRFindDisplay (dpy); - xRRSelectInputReq *req; - - RRSimpleCheckExtension (dpy, info); - - LockDisplay (dpy); - GetReq (RRSelectInput, req); - req->reqType = info->codes->major_opcode; - req->randrReqType = X_RRSelectInput; - req->window = window; - req->enable = 0; - if (mask) req->enable = mask; - UnlockDisplay (dpy); - SyncHandle (); - return; -} - -Status XRRSetScreenConfigAndRate (Display *dpy, - XRRScreenConfiguration *config, - Drawable draw, - int size_index, - Rotation rotation, - short rate, - Time timestamp) -{ - XExtDisplayInfo *info = XRRFindDisplay (dpy); - xRRSetScreenConfigReply rep; - XRandRInfo *xrri; - int major, minor; - - RRCheckExtension (dpy, info, 0); - - /* Make sure has_rates is set */ - if (!XRRQueryVersion (dpy, &major, &minor)) - return 0; - - LockDisplay (dpy); - xrri = (XRandRInfo *) info->data; - if (xrri->has_rates) - { - xRRSetScreenConfigReq *req; - GetReq (RRSetScreenConfig, req); - req->reqType = info->codes->major_opcode; - req->randrReqType = X_RRSetScreenConfig; - req->drawable = draw; - req->sizeID = size_index; - req->rotation = rotation; - req->timestamp = timestamp; - req->configTimestamp = config->config_timestamp; - req->rate = rate; - } - else - { - xRR1_0SetScreenConfigReq *req; - GetReq (RR1_0SetScreenConfig, req); - req->reqType = info->codes->major_opcode; - req->randrReqType = X_RRSetScreenConfig; - req->drawable = draw; - req->sizeID = size_index; - req->rotation = rotation; - req->timestamp = timestamp; - req->configTimestamp = config->config_timestamp; - } - - (void) _XReply (dpy, (xReply *) &rep, 0, xTrue); - - if (rep.status == RRSetConfigSuccess) { - /* if we succeed, set our view of reality to what we set it to */ - config->config_timestamp = rep.newConfigTimestamp; - config->timestamp = rep.newTimestamp; - config->screen = ScreenOfDisplay (dpy, XRRRootToScreen(dpy, rep.root)); - config->current_size = size_index; - config->current_rotation = rotation; - } - UnlockDisplay (dpy); - SyncHandle (); - return(rep.status); -} - -Status XRRSetScreenConfig (Display *dpy, - XRRScreenConfiguration *config, - Drawable draw, - int size_index, - Rotation rotation, Time timestamp) -{ - return XRRSetScreenConfigAndRate (dpy, config, draw, size_index, - rotation, 0, timestamp); -} - -int XRRUpdateConfiguration(XEvent *event) -{ - XRRScreenChangeNotifyEvent *scevent; - XConfigureEvent *rcevent; - Display *dpy = event->xany.display; - XExtDisplayInfo *info; - XRandRInfo *xrri; - int snum; - - /* first, see if it is a vanilla configure notify event */ - if (event->type == ConfigureNotify) { - rcevent = (XConfigureEvent *) event; - snum = XRRRootToScreen(dpy, rcevent->window); - dpy->screens[snum].width = rcevent->width; - dpy->screens[snum].height = rcevent->height; - return 1; - } - - info = XRRFindDisplay(dpy); - RRCheckExtension (dpy, info, 0); - - switch (event->type - info->codes->first_event) { - case RRScreenChangeNotify: - scevent = (XRRScreenChangeNotifyEvent *) event; - snum = XRRRootToScreen(dpy, - ((XRRScreenChangeNotifyEvent *) event)->root); - if (scevent->rotation & (RR_Rotate_90 | RR_Rotate_270)) { - dpy->screens[snum].width = scevent->height; - dpy->screens[snum].height = scevent->width; - dpy->screens[snum].mwidth = scevent->mheight; - dpy->screens[snum].mheight = scevent->mwidth; - } else { - dpy->screens[snum].width = scevent->width; - dpy->screens[snum].height = scevent->height; - dpy->screens[snum].mwidth = scevent->mwidth; - dpy->screens[snum].mheight = scevent->mheight; - } - XRenderSetSubpixelOrder (dpy, snum, scevent->subpixel_order); - break; - default: - return 0; - } - xrri = (XRandRInfo *) info->data; - /* - * so the next time someone wants some data, it will be fetched; - * it might be better to force the round trip immediately, but - * I dislike pounding the server simultaneously when not necessary - */ - if (xrri->config[snum] != NULL) { - XFree (xrri->config[snum]); - xrri->config[snum] = NULL; - } - return 1; -} diff --git a/nx-X11/lib/Xrandr/Xrandr.h b/nx-X11/lib/Xrandr/Xrandr.h deleted file mode 100644 index 6a4d7fe98..000000000 --- a/nx-X11/lib/Xrandr/Xrandr.h +++ /dev/null @@ -1,151 +0,0 @@ -/* - * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.9 2002/09/29 23:39:44 keithp Exp $ - * - * Copyright © 2000 Compaq Computer Corporation, Inc. - * Copyright © 2002 Hewlett-Packard Company, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Compaq not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. HP makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Jim Gettys, HP Labs, HP. - */ - -#ifndef _XRANDR_H_ -#define _XRANDR_H_ - -#include - -#include - -_XFUNCPROTOBEGIN - - -typedef struct { - int width, height; - int mwidth, mheight; -} XRRScreenSize; - -/* - * Events. - */ - -typedef struct { - int type; /* event base */ - unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came from a SendEvent request */ - Display *display; /* Display the event was read from */ - Window window; /* window which selected for this event */ - Window root; /* Root window for changed screen */ - Time timestamp; /* when the screen change occurred */ - Time config_timestamp; /* when the last configuration change */ - SizeID size_index; - SubpixelOrder subpixel_order; - Rotation rotation; - int width; - int height; - int mwidth; - int mheight; -} XRRScreenChangeNotifyEvent; - - -/* internal representation is private to the library */ -typedef struct _XRRScreenConfiguration XRRScreenConfiguration; - -Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep); -Status XRRQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp); - -XRRScreenConfiguration *XRRGetScreenInfo (Display *dpy, - Drawable draw); - -void XRRFreeScreenConfigInfo (XRRScreenConfiguration *config); - -/* - * Note that screen configuration changes are only permitted if the client can - * prove it has up to date configuration information. We are trying to - * insist that it become possible for screens to change dynamically, so - * we want to ensure the client knows what it is talking about when requesting - * changes. - */ -Status XRRSetScreenConfig (Display *dpy, - XRRScreenConfiguration *config, - Drawable draw, - int size_index, - Rotation rotation, - Time timestamp); - -/* added in v1.1, sorry for the lame name */ -Status XRRSetScreenConfigAndRate (Display *dpy, - XRRScreenConfiguration *config, - Drawable draw, - int size_index, - Rotation rotation, - short rate, - Time timestamp); - - -Rotation XRRConfigRotations(XRRScreenConfiguration *config, Rotation *current_rotation); - -Time XRRConfigTimes (XRRScreenConfiguration *config, Time *config_timestamp); - -XRRScreenSize *XRRConfigSizes(XRRScreenConfiguration *config, int *nsizes); - -short *XRRConfigRates (XRRScreenConfiguration *config, int sizeID, int *nrates); - -SizeID XRRConfigCurrentConfiguration (XRRScreenConfiguration *config, - Rotation *rotation); - -short XRRConfigCurrentRate (XRRScreenConfiguration *config); - -int XRRRootToScreen(Display *dpy, Window root); - -/* - * returns the screen configuration for the specified screen; does a lazy - * evalution to delay getting the information, and caches the result. - * These routines should be used in preference to XRRGetScreenInfo - * to avoid unneeded round trips to the X server. These are new - * in protocol version 0.1. - */ - - -XRRScreenConfiguration *XRRScreenConfig(Display *dpy, int screen); -XRRScreenConfiguration *XRRConfig(Screen *screen); -void XRRSelectInput(Display *dpy, Window window, int mask); - -/* - * the following are always safe to call, even if RandR is not implemented - * on a screen - */ - - -Rotation XRRRotations(Display *dpy, int screen, Rotation *current_rotation); -XRRScreenSize *XRRSizes(Display *dpy, int screen, int *nsizes); -short *XRRRates (Display *dpy, int screen, int sizeID, int *nrates); -Time XRRTimes (Display *dpy, int screen, Time *config_timestamp); - - -/* - * intended to take RRScreenChangeNotify, or - * ConfigureNotify (on the root window) - * returns 1 if it is an event type it understands, 0 if not - */ -int XRRUpdateConfiguration(XEvent *event); - -_XFUNCPROTOEND - -#endif /* _XRANDR_H_ */ diff --git a/nx-X11/lib/Xrandr/Xrandr.man b/nx-X11/lib/Xrandr/Xrandr.man deleted file mode 100644 index f61d93044..000000000 --- a/nx-X11/lib/Xrandr/Xrandr.man +++ /dev/null @@ -1,351 +0,0 @@ -.\" -.\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.7 2003/08/04 10:32:21 eich Exp $ -.\" $XdotOrg: xc/lib/Xrandr/Xrandr.man,v 1.4 2005/10/13 02:56:42 alanc Exp $ -.\" -.\" Copyright 2002 Hewlett-Packard Company.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation, and that the name of Hewlett-Packard Company not be used in -.\" advertising or publicity pertaining to distribution of the software without -.\" specific, written prior permission. Hewlett Packard Company makes no -.\" representations about the suitability of this software for any purpose. It -.\" is provided "as is" without express or implied warranty. -.\" -.\" Hewlett-Packard DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -.\" EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -.\" CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -.\" DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -.\" PERFORMANCE OF THIS SOFTWARE. -.\" -.de TQ -.br -.ns -.TP \\$1 -.. -.TH XRANDR __libmansuffix__ __vendorversion__ - -.SH NAME - Xrandr \- X Resize, Rotate and Reflection extension. -.SH SYNTAX -\&#include -.nf -.sp -Bool XRRQueryExtension \^(\^Display *\fIdpy\fP, - int *\fIevent_basep\fP, int *\fIerror_basep\fP\^); -.sp -Status XRRQueryVersion \^(\^Display *\fIdpy\fP, - int *\fImajor_versionp\fP, - int *\fIminor_versionp\fP\^); -.sp -XRRScreenConfiguration *XRRGetScreenInfo \^(\^Display *dpy, - Drawable \fIdraw\fP\^); -.sp -void XRRFreeScreenConfigInfo \^(\^ - \fIXRRScreenConfiguration *config\fP\^); -.sp -Status XRRSetScreenConfig \^(\^Display *\fIdpy\fP, - XRRScreenConfiguration *\fIconfig\fP, - Drawable \fIdraw\fP, - int \fIsize_index\fP, - Rotation \fIrotation\fP, - Time \fItimestamp\fP\^); -.sp -Status XRRSetScreenConfigAndRate \^(\^Display *\fIdpy\fP, - XRRScreenConfiguration *\fIconfig\fP, - Drawable \fIdraw\fP, - int \fIsize_index\fP, - Rotation \fIrotation\fP, - short \fIrate\fP, - Time \fItimestamp\fP\^); -.sp -Rotation XRRConfigRotations\^(\^ - XRRScreenConfiguration *\fIconfig\fP, - Rotation *\fIcurrent_rotation\fP\^); -.sp -Time XRRConfigTimes \^(\^ - XRRScreenConfiguration *\fIconfig\fP, - Time *\fIconfig_timestamp\fP\^); -.sp -XRRScreenSize *XRRConfigSizes\^(\^ - XRRScreenConfiguration *\fIconfig\fP, - int *\fInsizes\fP\^); -.sp -short *XRRConfigRates \^(\^ - XRRScreenConfiguration *\fIconfig\fP, - int \fIsize_index\fP, - int *\fInrates\fP\^); -.sp -SizeID XRRConfigCurrentConfiguration \^(\^ - XRRScreenConfiguration *\fIconfig\fP, - Rotation *\fIrotation\fP\^); -.sp -short XRRConfigCurrentRate \^(\^ - XRRScreenConfiguration *\fIconfig\fP\^); -.sp -int XRRRootToScreen\^(\^ - Display *\fIdpy\fP, - Window \fIroot\fP\^); -.sp -XRRScreenConfiguration *XRRScreenConfig\^(\^ - Display *\fIdpy\fP, int \fIscreen\fP\^); -.sp -XRRScreenConfiguration *XRRConfig\^(\^Screen *\fIscreen\fP\^); -.sp -void XRRSelectInput\^(\^Display *\fIdpy\fP, Window \fIwindow\fP, int \fImask\fP\^); -.sp -/\(** - * intended to take RRScreenChangeNotify, or - * ConfigureNotify \^(\^\fIon the root window\fP\^) - * returns 1 if it is an event type it understands, 0 if not - */ -int XRRUpdateConfiguration\^(\^XEvent *\fIevent\fP^); -.sp -/\(** - * the following are always safe to call, even if RandR is - * not implemented on a screen - */ -.br -Rotation XRRRotations\^(\^ - Display *\fIdpy\fP, int \fIscreen\fP, - Rotation *\fIcurrent_rotation\fP\^); -.sp -XRRScreenSize *XRRSizes\^(\^Display *\fIdpy\fP, - int \fIscreen\fP, int *\fInsizes\fP\^); -.sp -short *XRRRates \^(\^Display *\fIdpy\fP, int \fIscreen\fP, - int \fIsize_index\fP, int *\fInrates\fP\^); -.sp -Time XRRTimes \^(\^Display *\fIdpy\fP, int \fIscreen\fP, Time *\fIconfig_timestamp\fP\^); -.fi -.SH ARGUMENTS -.IP \fIdisplay\fP 1i -Specifies the connection to the X server. -.IP \fIscreen\fP 1i -Specifies which screen. -.IP \fIdraw\fP 1i -Specifies the screen. -.IP \fIrotation\fP 1i -Specifies the rotations or reflections possible of the screen. -.IP \fIcurrent_rotation\fP 1i -Specifies the current rotations and reflection of the screen. -.IP \fItimestamp\fP 1i -Specifies the server timestamp. -.IP \fIconfig_timestamp\fP 1i -Specifies the timestamp when the screen was last (re)configured. -.IP \fIconfig\fP 1i -Specifies the screen configuration being used. -.IP \fIsizes\fP 1i -Specifies the array of sizes supported. -.IP \fIrate\fP 1i -Specifies the refresh rate in Hz. - -.SH DATATYPES - -.PP -.B Rotations/Reflections -.PP -Can be any of: -.nf -\&#define RR_Rotate_0 1 -\&#define RR_Rotate_90 2 -\&#define RR_Rotate_180 4 -\&#define RR_Rotate_270 8 - -/\(** new in 1.0 protocol, to allow reflection of screen */ -/\(** reflection is applied after rotation */ - -\&#define RR_Reflect_X 16 -\&#define RR_Reflect_Y 32 - - -typedef struct { - int width, height; - int mwidth, mheight; -} XRRScreenSize; - -typedef struct { - int type; /\(** event base */ - unsigned long serial; /\(** # of last request processed by server */ - Bool send_event; /\(** true if this came from a SendEvent request */ - Display *display; /\(** Display the event was read from */ - Window window; /\(** window which selected for this event */ - Window root; /\(** Root window for changed screen */ - Time timestamp; /\(** when the screen change occurred */ - Time config_timestamp; /\(** when the last configuration change */ - SizeID size_index; - SubpixelOrder subpixel_order; - Rotation rotation; - int width; - int height; - int mwidth; - int mheight; -} XRRScreenChangeNotifyEvent; -.sp -.fi -.B XRRScreenSize -structure contains a possible root size in pixels and in millimeters. -.B XRRScreenChangeNotifyEvent -Is sent to a client that has requested notification whenever the screen -configuration is changed. - -.B XRRScreenConfiguration -This is an opaque data type containing the configuration information -for a screen. - -.B Timestamps -.PP -Time stamps are included and must be used to ensure the client is playing -with a full deck: the screen may change properties -on the fly and this ensures its knowledge of the configuration is up to date. -This is to help issues when screens may become hot-pluggable in the future. - -.SH DESCRIPTION -.B Xrandr -is a simple library designed to interface the X Resize and Rotate -Extension. This allows clients to change the size and rotation of the -root window of a screen, along with the ability to reflect the screen -about either axis (if supported by the implementation). Rotation and -reflection may be implemented by software and may result in slower -performance if rotation and reflection are implemented in this fashion -(as are all implementations as of October 2002). -.PP -The Xrandr library does some minimal caching to avoid roundtrips to -provide clients frequently used information. See "The X Resize and -Rotate Extension" for a detailed description; also note that depth -switching, as described in the document is not implemented, and may -(or may not) ever be implemented, as display memory is growing rapidly, -and toolkits are already beginning to support migration, mitigating the -need for depth switching. If it is implemented in the future, we -expect to do so via an upward compatible extension to the -current library/protocol; functionality described here should continue -to work. -.PP -Rotation and reflection and how they interact can be confusing. In -Randr, the coordinate system is rotated in a counter-clockwise -direction relative to the normal orientation. Reflection is along the -window system coordinate system, not the physical screen X and Y axis, -so that rotation and reflection do not interact. The other way to -consider reflection is to is specified in the "normal" orientation, -before rotation, if you find the other way confusing. -.PP -The -.B XRRScreenChangeNotify -event is sent to clients that ask to be informed whenever the root window -configuration changes. Configuration changes may include resolution, -physical size, subpixel order (see XRender(3)), and rotation. Note -that changes to any or all of these could occur due to external events -(user control in the X server, a different monitor/flat panel display -being hot-plugged) and is not only the result of a protocol/library -request to the X server. -.PP -Additionally, to eliminate a potential race condition, -this event may be generated -immediately upon selecting for notification if the screen has changed -since the client of Xrandr connected to the X server, to enable -reliable screen resolution changing when a user may log in and -change the configuration while one or many clients are starting up. -.PP -.B Xlib notification -.PP -Clients must call back into Xlib using -.B XRRUpdateConfiguration -when screen configuration change notify events are generated -(or root window configuration changes occur, to update Xlib's -view of the resolution, size, rotation, reflection or subpixel order. -Generally, toolkits will perform this operation on behalf of applications; -we did not want to change display structure data behind the back of toolkits, -as in multithreaded clients, various race conditions might occur. -Toolkits should provide clients some mechanism for notification of -screen change, of course. - -.SH FUNCTIONS -There are two classes of interfaces: those which can be safely called -even if RandR is not implemented on a screen (to make common idioms not -dependent on the server having support), and those which will return -errors if the extension is not present. -.PP -.B XRRRotations -returns both the possible set of rotations/reflections supported -(as a bitmask) as the value of the function, along with the current -rotation/reflection of the screen. -.PP -.B XRRSizes -returns the size and a pointer to the current sizes supported by -the specified screen. The first size specified is the default size -of the server. If RandR is not supported, it returns 0 for -the number of sizes. -.PP -.B XRRRates -returns a pointer to a the rates supported by the specified size. -If RandR is not supported, it returns 0 for the number of rates. -.PP -.B XRRTimes -returns the time last reported by the server along with the -timestamp the last configuration changed. -If the configuration has changed since the client last updated -its view of the server time, requests to change the configuration -will fail until the client has an up to date timestamp. -.PP -.B XRRRootToScreen -returns the screen number given a root window (for example, from -an \fBXRRScreenChangeNotifyEvent\fI. -.PP -The rest of the functions will fail if applied to screens not -implementing the RandR extension. -.B XRRSetScreenConfig -sets the screen size and rotation and reflection to the desired -values on the screen specified by \fIdraw\fP, or returns a -.B BadValue -error. -\fIsize_index\fP specifies which size configuration is to be used, -\fIrotation\fP specifies which rotation or reflection is to -be used (or a -.B BadValue -error is returned). -The \fItimestamp\fP is used by the server to make sure the client -has up to date configuration information. Status is returned -to indicate success or failure; a client must refresh its configuration -information if it fails and try the call again (by calling -\fBXRRGetScreenInfo\fP). -.PP -.B XRRSetScreenConfigAndRate -like -.B XRRSetScreenConfig -but also set the refresh rate. If specified rate is not supported a -.B BadValue -error is returned. -.PP -.B XRRConfigRotations, -.B XRRConfigSizes, -.B XRRConfigCurrentConfiguration, -.B XRRConfigTimes, -.B XRRConfigRates, -and -.B XRRConfigCurrentRate -are used to get specific configuration information out of a screen -configuration. -.PP -.B XRRGetScreenInfo -Returns a screen configuration for later use; the information is -private to the library. -Call -.B XRRFreeScreenConfigInfo -to free this information when you are finished with it. -It forces a round trip to the server. - -Other functions include: -.B XRRQueryExtension -which returns the event and error base codes, -.B XRRQueryVersion -, which returns the current version of the extension (this information -is cached by the library). -.SH RESTRICTIONS -.B Xrandr -will remain upward compatible after the current 1.0 release. -.SH AUTHOR -Jim Gettys, and Keith Packard, HP. - diff --git a/nx-X11/lib/Xrandr/Xrandrint.h b/nx-X11/lib/Xrandr/Xrandrint.h deleted file mode 100644 index 78a8fcf11..000000000 --- a/nx-X11/lib/Xrandr/Xrandrint.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.2 2001/06/07 15:33:43 keithp Exp $ - * - * - * Copyright © 2000, Compaq Computer Corporation, - * Copyright © 2002, Hewlett Packard, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Compaq or HP not be used in advertising - * or publicity pertaining to distribution of the software without specific, - * written prior permission. HP makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL HP - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Jim Gettys, HP Labs, Hewlett-Packard, Inc. - */ - -#ifndef _XRANDRINT_H_ -#define _XRANDRINT_H_ - -#define NEED_EVENTS -#define NEED_REPLIES -#include -#include -#include -#include -#include "Xrandr.h" -#include -#include - -extern XExtensionInfo XrandrExtensionInfo; -extern char XrandrExtensionName[]; - -#define RRCheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, XRRExtensionName, val) -#define RRSimpleCheckExtension(dpy,i) \ - XextSimpleCheckExtension (dpy, i, XRRExtensionName) - -XExtDisplayInfo *XRRFindDisplay (Display *dpy); - - -/* deliberately opaque internal data structure; can be extended, - but not reordered */ -struct _XRRScreenConfiguration { - Screen *screen; /* the root window in GetScreenInfo */ - XRRScreenSize *sizes; - Rotation rotations; - Rotation current_rotation; - int nsizes; - int current_size; - short current_rate; - Time timestamp; - Time config_timestamp; - int subpixel_order; /* introduced in randr v0.1 */ - short *rates; /* introduced in randr v1.1 */ - int nrates; -}; - -/* - * if a configure notify on the root is recieved, or - * an XRRScreenChangeNotify is recieved, - * XRRUpdateConfiguration should be called to update the X library's - * view of the screen configuration; it will also invalidate the cache - * provided by XRRScreenConfig and XRRConfig, and force a round trip - * when next used. Returns invalid status if not an event type - * the library routine understand. - */ - -/* we cache one screen configuration/screen */ - -typedef struct _XRandRInfo { - XRRScreenConfiguration **config; - int major_version, minor_version; /* major_version = -1 means we don't know */ - Bool has_rates; /* Server supports refresh rates */ -} XRandRInfo; - -#endif /* _XRANDRINT_H_ */ diff --git a/nx-X11/lib/Xrandr/test.c b/nx-X11/lib/Xrandr/test.c deleted file mode 100644 index 01e67eba0..000000000 --- a/nx-X11/lib/Xrandr/test.c +++ /dev/null @@ -1,21 +0,0 @@ -/* $XFree86$ */ - -#include -#include -#include "Xrandr.h" - -main (int argc, char **argv) - -{ - char *display_name = ":0"; - Display *display; - int major, minor, status; - - if ((display = XOpenDisplay (display_name)) == NULL) { - fprintf(stderr, "Can't open display!\n"); - } - status = XRRQueryVersion (display, &major, &minor); - fprintf(stderr, "status = %d, major = %d, minor = %d\n, - status, major, minor"); - -} diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index eb65fba19..9f730cb97 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -427,7 +427,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lXdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lNX_Xcomposite -lXdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ @@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \ `pkg-config --libs libxml-2.0` #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index d0efa71e6..be5dd9032 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -93,7 +93,7 @@ #include #include "Shadow.h" -#include "Xrandr.h" +#include #include "NXlib.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index d0608a900..37296e80f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -77,7 +77,7 @@ is" without express or implied warranty. #include "Shadow.h" #include "Utils.h" -#include "Xrandr.h" +#include #define GC XlibGC #define Font XlibFont diff --git a/nx-libs.spec b/nx-libs.spec index 9e8a16e4e..327e59e24 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -35,6 +35,7 @@ BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xfont) BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xdamage) +BuildRequires: pkgconfig(xrandr) %else BuildRequires: libexpat-devel BuildRequires: libpng-devel @@ -45,6 +46,7 @@ BuildRequires: xorg-x11-libXpm-devel BuildRequires: xorg-x11-libXfont-devel BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXdamage-devel +BuildRequires: xorg-x11-libXrandr-devel %endif BuildRequires: xorg-x11-util-devel %endif @@ -56,6 +58,7 @@ BuildRequires: libxml2-devel BuildRequires: libXfont-devel BuildRequires: libXdmcp-devel BuildRequires: libXdamage-devel +BuildRequires: libXrandr-devel %endif # For imake @@ -301,22 +304,6 @@ multi-headed X applications and window managers to use two or more physical displays as one large virtual display. -%package -n libNX_Xrandr2 -Group: System Environment/Libraries -Summary: NX Resize, Rotate and Reflection extension library -Requires: %{name}%{?_isa} >= 3.5.0.29 -Obsoletes: libNX_Xrandr - -%description -n libNX_Xrandr2 -NX is a software suite which implements very efficient compression of -the X11 protocol. This increases performance when using X -applications over a network, especially a slow one. - -The X Resize, Rotate and Reflect Extension (RandR) allows clients to -dynamically change X screens, so as to resize, to change the -orientation and layout of the root window of a screen. - - %package -n libNX_Xrender-devel Group: Development/Libraries Summary: Development files for the NX Render Extension library @@ -647,7 +634,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %post -n libNX_Xext6 -p /sbin/ldconfig %post -n libNX_Xfixes3 -p /sbin/ldconfig %post -n libNX_Xinerama1 -p /sbin/ldconfig -%post -n libNX_Xrandr2 -p /sbin/ldconfig %post -n libNX_Xrender1 -p /sbin/ldconfig %post -n libNX_Xtst6 -p /sbin/ldconfig %post -n libXcomp3 -p /sbin/ldconfig @@ -660,7 +646,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %postun -n libNX_Xext6 -p /sbin/ldconfig %postun -n libNX_Xfixes3 -p /sbin/ldconfig %postun -n libNX_Xinerama1 -p /sbin/ldconfig -%postun -n libNX_Xrandr2 -p /sbin/ldconfig %postun -n libNX_Xrender1 -p /sbin/ldconfig %postun -n libNX_Xtst6 -p /sbin/ldconfig %postun -n libXcomp3 -p /sbin/ldconfig @@ -762,10 +747,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %defattr(-,root,root) %{_libdir}/libNX_Xinerama.so.1* -%files -n libNX_Xrandr2 -%defattr(-,root,root) -%{_libdir}/libNX_Xrandr.so.2* - %files -n libNX_Xrender-devel %defattr(-,root,root) %{_libdir}/libNX_Xrender.so @@ -833,7 +814,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %defattr(-,root,root) %{_libdir}/libNX_Xcomposite.so %{_libdir}/libNX_Xinerama.so -%{_libdir}/libNX_Xrandr.so %{_libdir}/libNX_Xtst.so %{_includedir}/nx/X11/X10.h %dir %{_includedir}/nx/X11/extensions @@ -842,7 +822,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_includedir}/nx/X11/extensions/Xcomposite.h %{_includedir}/nx/X11/extensions/Xevie.h %{_includedir}/nx/X11/extensions/Xinerama.h -%{_includedir}/nx/X11/extensions/Xrandr.h %{_includedir}/nx/X11/extensions/lbxbuf.h %{_includedir}/nx/X11/extensions/lbxbufstr.h %{_includedir}/nx/X11/extensions/lbxdeltastr.h @@ -890,8 +869,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_includedir}/nx/X11/extensions/composite.h %{_includedir}/nx/X11/extensions/compositeproto.h %{_includedir}/nx/X11/extensions/panoramiXproto.h -%{_includedir}/nx/X11/extensions/randr.h -%{_includedir}/nx/X11/extensions/randrproto.h %{_includedir}/nx/X11/extensions/recordstr.h %{_includedir}/nx/X11/extensions/render.h %{_includedir}/nx/X11/extensions/renderproto.h diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 1480e5ea8..3e5c33a22 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -148,7 +148,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -lXdamage +EXTRALIBS = -lNX_Xext -lNX_Xtst -lXrandr -lXdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) -- cgit v1.2.3 From 00cec4924157db9498d56e5c1fbde852e8eb3717 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 12 Jul 2015 01:52:29 +0200 Subject: Add pkg-config support to nxcomp, nxcompext and nxcompshad --- nxcomp/Makefile.in | 19 +++++++++++-------- nxcomp/configure.in | 5 ++++- nxcomp/nxcomp.pc.in | 15 +++++++++++++++ nxcompext/Makefile.in | 19 +++++++++++-------- nxcompext/configure.in | 5 ++++- nxcompext/nxcompext.pc.in | 13 +++++++++++++ nxcompshad/Makefile.in | 19 +++++++++++-------- nxcompshad/configure.in | 5 ++++- nxcompshad/nxcompshad.pc.in | 13 +++++++++++++ 9 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 nxcomp/nxcomp.pc.in create mode 100644 nxcompext/nxcompext.pc.in create mode 100644 nxcompshad/nxcompshad.pc.in (limited to 'nxcompshad') diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 6022747cb..a8647cead 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -58,14 +58,15 @@ LIBS = @LIBS@ # Other autoconfigured settings, not used at the moment. # -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -man1dir = @mandir@/man1 -VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +man1dir = @mandir@/man1 +VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -292,6 +293,7 @@ install.lib: all $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcomp.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -313,6 +315,7 @@ uninstall.lib: $(RM_FILE) $(DESTDIR)${includedir}/nx/NXrender.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h + $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc echo "Running ldconfig tool, this may take a while..." && ldconfig || true uninstall.man: diff --git a/nxcomp/configure.in b/nxcomp/configure.in index 43b51573a..206df2ec7 100644 --- a/nxcomp/configure.in +++ b/nxcomp/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(NX.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Set our default compilation flags. CXXFLAGS="$CXXFLAGS -O3 -fno-rtti -fno-exceptions" @@ -387,4 +390,4 @@ else ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)" fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcomp.pc) diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in new file mode 100644 index 000000000..f4d3a7efb --- /dev/null +++ b/nxcomp/nxcomp.pc.in @@ -0,0 +1,15 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcomp +Description: NX Compression Library +Version: @VERSION@ +#libjepg does not provide a pkgconfig-file, zlib does not provide it for older versions +#Requires: libjpeg zlib +Requires: libpng +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcomp + diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index b33c5aaf3..b66a4c361 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -50,14 +50,15 @@ LIBS = @LIBS@ -lz -lNX_X11 -lXcomp # LIBS = @LIBS@ -lz -ljpeg -lpthread -lNX_X11 -lXcomp # -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -man1dir = @mandir@/man1 -VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +man1dir = @mandir@/man1 +VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -171,6 +172,7 @@ install.lib: all $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcompext.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -185,6 +187,7 @@ uninstall.lib: $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED) $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h $(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h + $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompext.pc echo "Running ldconfig tool, this may take a while..." && ldconfig || true uninstall.man: diff --git a/nxcompext/configure.in b/nxcompext/configure.in index e6f13c0ea..eb6604dba 100644 --- a/nxcompext/configure.in +++ b/nxcompext/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(NXlib.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Reset default compilation flags. CXXFLAGS="$CXXFLAGS -O3" @@ -243,4 +246,4 @@ else ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)" fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcompext.pc) diff --git a/nxcompext/nxcompext.pc.in b/nxcompext/nxcompext.pc.in new file mode 100644 index 000000000..669397af6 --- /dev/null +++ b/nxcompext/nxcompext.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcompext +Description: Extension for NX Compression Library +Version: @VERSION@ +Requires: nxcomp +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcompext + diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 3e5c33a22..5b1abebed 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -68,14 +68,15 @@ LIBS = @LIBS@ -lNX_X11 # LIBS = $(LIBS) -lmpatrol -lbfd -liberty # -srcdir = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -man1dir = @mandir@/man1 -VPATH = @srcdir@ -libdir = @libdir@ -includedir = @includedir@ +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +man1dir = @mandir@/man1 +VPATH = @srcdir@ +libdir = @libdir@ +includedir = @includedir@ +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 @@ -206,6 +207,7 @@ install.lib: all $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) nxcompshad.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true install.man: @@ -222,6 +224,7 @@ uninstall.lib: for header in *.h; do $(RM_FILE) $(DESTDIR)${includedir}/nx/$$header; done $(RM_DIR) $(DESTDIR)${libdir}/nx/ $(RM_DIR) $(DESTDIR)${includedir}/nx/ + $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcompshad.pc echo "Running ldconfig tool, this may take a while..." && ldconfig || true uninstall.man: diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 8dd1b2e21..8468b4733 100644 --- a/nxcompshad/configure.in +++ b/nxcompshad/configure.in @@ -5,6 +5,9 @@ dnl Prolog AC_INIT(Shadow.h) AC_PREREQ(2.13) +pkgconfigdir=${libdir}/pkgconfig +AC_SUBST(pkgconfigdir) + dnl Reset default compilation flags. CXXFLAGS="$CXXFLAGS -O3" @@ -281,4 +284,4 @@ if test -z "${MAKEDEPEND}"; then fi fi -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile nxcompshad.pc) diff --git a/nxcompshad/nxcompshad.pc.in b/nxcompshad/nxcompshad.pc.in new file mode 100644 index 000000000..4d4265c76 --- /dev/null +++ b/nxcompshad/nxcompshad.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: nxcompshad +Description: Shadow Session Support for NX Compression Library +Version: @VERSION@ +Requires: nxcomp +Requires.private: x11 +Cflags: -I${includedir} -I${includedir}/nx +Libs: -L${libdir} -lXcompshad + -- cgit v1.2.3 From 39ae817885b1555a3a660b5c80a2d45c1ff29568 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Jul 2015 01:39:17 +0200 Subject: nxcomp{,shad,ext}: Remove nxcomp*.pc file on clean and distclean. --- nxcomp/Makefile.in | 2 +- nxcompext/Makefile.in | 2 +- nxcompshad/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nxcompshad') diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index a8647cead..f01d47b4f 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -321,7 +321,7 @@ uninstall.lib: uninstall.man: clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* *.pc \ @ALL@ distclean: clean diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index b66a4c361..7a83b4fd1 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -193,7 +193,7 @@ uninstall.lib: uninstall.man: clean: - -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \ + -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* *.pc \ @ALL@ distclean: clean diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 5b1abebed..9068b1a30 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -230,7 +230,7 @@ uninstall.lib: uninstall.man: clean: - -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \ + -rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump *.pc \ $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe distclean: clean -- cgit v1.2.3 From ee0ed871a0ba1de21dbd3c035ebdddd2ff248469 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Jul 2015 14:43:34 +0200 Subject: nxcomp{,ext,shad}/Makefile.in: Create pkgconfigdir before putting files in it. --- nxcomp/Makefile.in | 1 + nxcompext/Makefile.in | 1 + nxcompshad/Makefile.in | 1 + 3 files changed, 3 insertions(+) (limited to 'nxcompshad') diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index f01d47b4f..b4d11e53b 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -287,6 +287,7 @@ install.bin: install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${pkgconfigdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index 7a83b4fd1..a8a94353b 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -168,6 +168,7 @@ install.bin: install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${pkgconfigdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 9068b1a30..3b4dc0745 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -202,6 +202,7 @@ install.bin: install.lib: all $(INSTALL_DIR) $(DESTDIR)${libdir} $(INSTALL_DIR) $(DESTDIR)${includedir}/nx + $(INSTALL_DIR) $(DESTDIR)${pkgconfigdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} -- cgit v1.2.3 From 6615de8dd9a08dd3c6cd0d6bebdb6158b32844f6 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 26 Aug 2015 00:29:14 +0200 Subject: create pkgcnfig dir before copying anything --- nxcomp/Makefile.in | 1 + nxcompext/Makefile.in | 1 + nxcompshad/Makefile.in | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'nxcompshad') diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index a8647cead..83da1ec4f 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -287,6 +287,7 @@ install.bin: install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx + ./mkinstalldirs $(DESTDIR)${pkgconfigdir} $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index b66a4c361..66388f86d 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -167,6 +167,7 @@ install.bin: install.lib: all ./mkinstalldirs $(DESTDIR)${libdir} + ./mkinstalldirs $(DESTDIR)${pkgconfigdir} ./mkinstalldirs $(DESTDIR)${includedir}/nx $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 5b1abebed..da10f7cad 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -76,7 +76,7 @@ man1dir = @mandir@/man1 VPATH = @srcdir@ libdir = @libdir@ includedir = @includedir@ -pkgconfigdir = @pkgconfigdir@ +pkgconfigdir = @libdir@/pkgconfig INSTALL = @INSTALL@ INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 @@ -201,6 +201,7 @@ install.bin: install.lib: all $(INSTALL_DIR) $(DESTDIR)${libdir} + $(INSTALL_DIR) $(DESTDIR)${pkgconfigdir} $(INSTALL_DIR) $(DESTDIR)${includedir}/nx $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} -- cgit v1.2.3 From 96a1c5edf09d9a613f142f20599696352aee51fb Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 26 Aug 2015 01:02:34 +0200 Subject: Fix "Makefile.in seems to ignore the --datarootdir setting" warning --- nxcomp/Makefile.in | 2 ++ nxcompext/Makefile.in | 2 ++ nxcompshad/Makefile.in | 2 ++ 3 files changed, 6 insertions(+) (limited to 'nxcompshad') diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index 83da1ec4f..675a71d72 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -60,6 +60,8 @@ LIBS = @LIBS@ srcdir = @srcdir@ prefix = @prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index 66388f86d..62dda4482 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -52,6 +52,8 @@ LIBS = @LIBS@ -lz -lNX_X11 -lXcomp srcdir = @srcdir@ prefix = @prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index da10f7cad..d13ad9fc7 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -70,6 +70,8 @@ LIBS = @LIBS@ -lNX_X11 srcdir = @srcdir@ prefix = @prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ exec_prefix = @exec_prefix@ bindir = @bindir@ man1dir = @mandir@/man1 -- cgit v1.2.3 From f8772b6fc2b40a22f851e20badab975177f50176 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 26 Aug 2015 01:06:28 +0200 Subject: adapt pkgconfigdir in nxcompshad --- nxcompshad/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nxcompshad') diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index d13ad9fc7..2c961897b 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -78,7 +78,7 @@ man1dir = @mandir@/man1 VPATH = @srcdir@ libdir = @libdir@ includedir = @includedir@ -pkgconfigdir = @libdir@/pkgconfig +pkgconfigdir = @pkgconfigdir@ INSTALL = @INSTALL@ INSTALL_DIR = $(INSTALL) -d -o root -g root -m 0755 -- cgit v1.2.3 From 433d8186588698ce6a435fbff5e9d40a37b78be9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 8 Jul 2015 16:16:40 +0200 Subject: Clear header file namespace separation ( vs. ). In the process of building nxagent against more and more system-wide installed X.org libraries, we come to the limit of including structs from this (bundled nx-X11) and that (system-wide X.Org) library. This commit introduces a clear namespace separation of headers provided by nx-X11 and headers provided by X.Org. This approach is only temporary as we want to drop all nx-X11 bundled libraries from nx-libs. However, for a while we need to make this separation clear and also ship some reduced fake X.Org headers that avoid pulling in libX* and libNX_X* symbols at the same time. This patch has been tested on Debian jessie and unstable and requires no overall testing on various distros and distro versions, as we finally will drop all libNX_X* libraries and build against X.org's client libs. For now, this hack eases our development / cleanup process. --- Makefile | 4 +- debian/libnx-x11-dev.install.in | 28 +-- debian/libnx-xau-dev.install.in | 2 +- debian/libnx-xcomposite-dev.install.in | 2 +- debian/libnx-xext-dev.install.in | 66 +++--- debian/libnx-xfixes-dev.install.in | 2 +- debian/libnx-xinerama-dev.install.in | 4 +- debian/libnx-xrender-dev.install.in | 2 +- debian/libnx-xtst-dev.install.in | 2 +- debian/nx-x11proto-composite-dev.install.in | 4 +- debian/nx-x11proto-core-dev.install.in | 46 ++-- debian/nx-x11proto-render-dev.install.in | 4 +- debian/nx-x11proto-xext-dev.install.in | 8 +- debian/nx-x11proto-xfixes-dev.install.in | 4 +- debian/nx-x11proto-xinerama-dev.install.in | 2 +- debian/rules | 44 ++-- nx-X11/config/cf/X11.tmpl | 2 +- nx-X11/include/GL/glx.h | 4 +- nx-X11/include/GL/glxint.h | 4 +- nx-X11/include/Imakefile | 4 +- nx-X11/include/XWDFile.h | 2 +- nx-X11/include/Xdefs.h | 2 +- nx-X11/include/Xfuncs.h | 2 +- nx-X11/include/Xos.h | 6 +- nx-X11/include/Xos_r.h | 14 +- nx-X11/include/Xpoll.h.in | 6 +- nx-X11/include/Xproto.h | 4 +- nx-X11/include/Xprotostr.h | 2 +- nx-X11/include/Xthreads.h | 2 +- nx-X11/include/extensions/Imakefile | 4 +- nx-X11/include/extensions/MITMisc.h | 2 +- nx-X11/include/extensions/XEVI.h | 2 +- nx-X11/include/extensions/XEVIstr.h | 2 +- nx-X11/include/extensions/XInput.h | 4 +- nx-X11/include/extensions/XIproto.h | 4 +- nx-X11/include/extensions/XKBgeom.h | 2 +- nx-X11/include/extensions/XKBproto.h | 4 +- nx-X11/include/extensions/XKBsrv.h | 10 +- nx-X11/include/extensions/XKBstr.h | 2 +- nx-X11/include/extensions/XLbx.h | 6 +- nx-X11/include/extensions/XShm.h | 2 +- nx-X11/include/extensions/XTest.h | 4 +- nx-X11/include/extensions/Xag.h | 2 +- nx-X11/include/extensions/Xagsrv.h | 2 +- nx-X11/include/extensions/Xagstr.h | 2 +- nx-X11/include/extensions/Xcup.h | 2 +- nx-X11/include/extensions/Xcupstr.h | 2 +- nx-X11/include/extensions/Xdbe.h | 4 +- nx-X11/include/extensions/Xevie.h | 2 +- nx-X11/include/extensions/Xext.h | 2 +- nx-X11/include/extensions/Xinerama.h | 2 +- nx-X11/include/extensions/Xv.h | 2 +- nx-X11/include/extensions/XvMC.h | 4 +- nx-X11/include/extensions/XvMClib.h | 6 +- nx-X11/include/extensions/Xvlib.h | 4 +- nx-X11/include/extensions/Xvproto.h | 2 +- nx-X11/include/extensions/composite.h | 2 +- nx-X11/include/extensions/compositeproto.h | 4 +- nx-X11/include/extensions/dpms.h | 4 +- nx-X11/include/extensions/extutil.h | 2 +- nx-X11/include/extensions/fontcache.h | 2 +- nx-X11/include/extensions/fontcacheP.h | 2 +- nx-X11/include/extensions/fontcachstr.h | 2 +- nx-X11/include/extensions/lbxbuf.h | 2 +- nx-X11/include/extensions/lbxbufstr.h | 2 +- nx-X11/include/extensions/lbximage.h | 2 +- nx-X11/include/extensions/lbxstr.h | 2 +- nx-X11/include/extensions/multibuf.h | 2 +- nx-X11/include/extensions/recordstr.h | 2 +- nx-X11/include/extensions/renderproto.h | 4 +- nx-X11/include/extensions/saverproto.h | 2 +- nx-X11/include/extensions/scrnsaver.h | 6 +- nx-X11/include/extensions/security.h | 2 +- nx-X11/include/extensions/securstr.h | 2 +- nx-X11/include/extensions/shape.h | 4 +- nx-X11/include/extensions/sync.h | 2 +- nx-X11/include/extensions/vldXvMC.h | 6 +- nx-X11/include/extensions/xf86bigfont.h | 2 +- nx-X11/include/extensions/xf86bigfstr.h | 2 +- nx-X11/include/extensions/xf86dga.h | 4 +- nx-X11/include/extensions/xf86dga1.h | 2 +- nx-X11/include/extensions/xf86dgastr.h | 2 +- nx-X11/include/extensions/xf86misc.h | 2 +- nx-X11/include/extensions/xf86mscstr.h | 2 +- nx-X11/include/extensions/xf86vmode.h | 4 +- nx-X11/include/extensions/xf86vmstr.h | 2 +- nx-X11/include/extensions/xfixesproto.h | 6 +- nx-X11/include/extensions/xtrapddmi.h | 4 +- nx-X11/include/extensions/xtrapdi.h | 8 +- nx-X11/include/extensions/xtrapemacros.h | 2 +- nx-X11/include/extensions/xtraplib.h | 8 +- nx-X11/include/keysym.h | 2 +- nx-X11/lib/X11/ClDisplay.c | 2 +- nx-X11/lib/X11/ConnDis.c | 8 +- nx-X11/lib/X11/ErrDes.c | 2 +- nx-X11/lib/X11/FSWrap.c | 2 +- nx-X11/lib/X11/FetchName.c | 6 +- nx-X11/lib/X11/Font.c | 2 +- nx-X11/lib/X11/GetDflt.c | 8 +- nx-X11/lib/X11/GetHints.c | 8 +- nx-X11/lib/X11/GetImage.c | 2 +- nx-X11/lib/X11/GetNrmHint.c | 6 +- nx-X11/lib/X11/GetRGBCMap.c | 6 +- nx-X11/lib/X11/GetStCmap.c | 6 +- nx-X11/lib/X11/GetTxtProp.c | 8 +- nx-X11/lib/X11/GetWMCMapW.c | 2 +- nx-X11/lib/X11/GetWMProto.c | 2 +- nx-X11/lib/X11/HVC.c | 2 +- nx-X11/lib/X11/Iconify.c | 8 +- nx-X11/lib/X11/ImUtil.c | 4 +- nx-X11/lib/X11/Imakefile | 2 +- nx-X11/lib/X11/InitExt.c | 4 +- nx-X11/lib/X11/KeyBind.c | 6 +- nx-X11/lib/X11/KeysymStr.c | 4 +- nx-X11/lib/X11/LRGB.c | 4 +- nx-X11/lib/X11/Lab.c | 2 +- nx-X11/lib/X11/Luv.c | 2 +- nx-X11/lib/X11/OpenDis.c | 8 +- nx-X11/lib/X11/ParseCmd.c | 2 +- nx-X11/lib/X11/PolyReg.c | 2 +- nx-X11/lib/X11/Quarks.c | 2 +- nx-X11/lib/X11/RdBitF.c | 2 +- nx-X11/lib/X11/Region.c | 2 +- nx-X11/lib/X11/ScrResStr.c | 2 +- nx-X11/lib/X11/SetHints.c | 8 +- nx-X11/lib/X11/SetLocale.c | 4 +- nx-X11/lib/X11/SetNrmHint.c | 8 +- nx-X11/lib/X11/SetRGBCMap.c | 6 +- nx-X11/lib/X11/SetStCmap.c | 6 +- nx-X11/lib/X11/SetTxtProp.c | 8 +- nx-X11/lib/X11/SetWMCMapW.c | 2 +- nx-X11/lib/X11/SetWMProto.c | 2 +- nx-X11/lib/X11/StBytes.c | 4 +- nx-X11/lib/X11/StName.c | 4 +- nx-X11/lib/X11/StrKeysym.c | 4 +- nx-X11/lib/X11/StrToText.c | 6 +- nx-X11/lib/X11/TextToStr.c | 6 +- nx-X11/lib/X11/WMProps.c | 10 +- nx-X11/lib/X11/Withdraw.c | 8 +- nx-X11/lib/X11/WrBitF.c | 2 +- nx-X11/lib/X11/XDefaultOMIF.c | 4 +- nx-X11/lib/X11/XKB.c | 2 +- nx-X11/lib/X11/XKBAlloc.c | 12 +- nx-X11/lib/X11/XKBBell.c | 2 +- nx-X11/lib/X11/XKBBind.c | 8 +- nx-X11/lib/X11/XKBCompat.c | 2 +- nx-X11/lib/X11/XKBCtrls.c | 2 +- nx-X11/lib/X11/XKBCvt.c | 16 +- nx-X11/lib/X11/XKBExtDev.c | 4 +- nx-X11/lib/X11/XKBGAlloc.c | 12 +- nx-X11/lib/X11/XKBGeom.c | 4 +- nx-X11/lib/X11/XKBGetByName.c | 2 +- nx-X11/lib/X11/XKBGetMap.c | 2 +- nx-X11/lib/X11/XKBList.c | 2 +- nx-X11/lib/X11/XKBMAlloc.c | 12 +- nx-X11/lib/X11/XKBMisc.c | 12 +- nx-X11/lib/X11/XKBNames.c | 2 +- nx-X11/lib/X11/XKBRdBuf.c | 2 +- nx-X11/lib/X11/XKBSetGeom.c | 4 +- nx-X11/lib/X11/XKBSetMap.c | 2 +- nx-X11/lib/X11/XKBUse.c | 2 +- nx-X11/lib/X11/XKBleds.c | 2 +- nx-X11/lib/X11/XKBlib.h | 4 +- nx-X11/lib/X11/XKBlibint.h | 4 +- nx-X11/lib/X11/XYZ.c | 2 +- nx-X11/lib/X11/Xcms.h | 2 +- nx-X11/lib/X11/Xcmsint.h | 2 +- nx-X11/lib/X11/XimThai.h | 2 +- nx-X11/lib/X11/Ximint.h | 2 +- nx-X11/lib/X11/Xintatom.h | 2 +- nx-X11/lib/X11/Xintconn.h | 2 +- nx-X11/lib/X11/Xlcint.h | 4 +- nx-X11/lib/X11/Xlib.h | 6 +- nx-X11/lib/X11/XlibAsync.c | 4 +- nx-X11/lib/X11/XlibInt.c | 6 +- nx-X11/lib/X11/Xlibint.h | 14 +- nx-X11/lib/X11/Xlocale.h | 4 +- nx-X11/lib/X11/Xresource.h | 2 +- nx-X11/lib/X11/Xrm.c | 4 +- nx-X11/lib/X11/Xutil.h | 2 +- nx-X11/lib/X11/cmsColNm.c | 4 +- nx-X11/lib/X11/cmsProp.c | 2 +- nx-X11/lib/X11/evtomask.c | 2 +- nx-X11/lib/X11/globals.c | 2 +- nx-X11/lib/X11/imDefFlt.c | 2 +- nx-X11/lib/X11/imDefIm.c | 2 +- nx-X11/lib/X11/imDefLkup.c | 2 +- nx-X11/lib/X11/imDispch.c | 2 +- nx-X11/lib/X11/imEvToWire.c | 4 +- nx-X11/lib/X11/imExten.c | 2 +- nx-X11/lib/X11/imInt.c | 6 +- nx-X11/lib/X11/imLcFlt.c | 2 +- nx-X11/lib/X11/imLcIc.c | 4 +- nx-X11/lib/X11/imLcIm.c | 8 +- nx-X11/lib/X11/imLcLkup.c | 10 +- nx-X11/lib/X11/imLcPrs.c | 6 +- nx-X11/lib/X11/imLcSIc.c | 6 +- nx-X11/lib/X11/imRm.c | 2 +- nx-X11/lib/X11/imThaiFlt.c | 8 +- nx-X11/lib/X11/imThaiIc.c | 4 +- nx-X11/lib/X11/imThaiIm.c | 8 +- nx-X11/lib/X11/imTrX.c | 2 +- nx-X11/lib/X11/imTrans.c | 8 +- nx-X11/lib/X11/lcCT.c | 2 +- nx-X11/lib/X11/lcDB.c | 4 +- nx-X11/lib/X11/lcFile.c | 2 +- nx-X11/lib/X11/lcPrTxt.c | 4 +- nx-X11/lib/X11/lcTxtPr.c | 4 +- nx-X11/lib/X11/lcUtil.c | 2 +- nx-X11/lib/X11/lcWrap.c | 6 +- nx-X11/lib/X11/locking.h | 2 +- nx-X11/lib/X11/mbWMProps.c | 8 +- nx-X11/lib/X11/omDefault.c | 4 +- nx-X11/lib/X11/omGeneric.c | 4 +- nx-X11/lib/X11/os2Stubs.c | 2 +- nx-X11/lib/X11/utf8WMProps.c | 8 +- nx-X11/lib/X11/util/makekeys.c | 6 +- nx-X11/lib/X11/uvY.c | 2 +- nx-X11/lib/X11/xyY.c | 2 +- nx-X11/lib/Xau/AuDispose.c | 2 +- nx-X11/lib/Xau/AuFileName.c | 4 +- nx-X11/lib/Xau/AuGetAddr.c | 4 +- nx-X11/lib/Xau/AuGetBest.c | 8 +- nx-X11/lib/Xau/AuLock.c | 6 +- nx-X11/lib/Xau/AuRead.c | 2 +- nx-X11/lib/Xau/AuUnlock.c | 4 +- nx-X11/lib/Xau/AuWrite.c | 2 +- nx-X11/lib/Xau/Autest.c | 2 +- nx-X11/lib/Xau/Imakefile | 2 +- nx-X11/lib/Xau/k5encode.c | 8 +- nx-X11/lib/Xcomposite/Imakefile | 2 +- nx-X11/lib/Xcomposite/Xcomposite.h | 6 +- nx-X11/lib/Xcomposite/xcompositeint.h | 10 +- nx-X11/lib/Xext/DPMS.c | 10 +- nx-X11/lib/Xext/MITMisc.c | 10 +- nx-X11/lib/Xext/XAppgroup.c | 10 +- nx-X11/lib/Xext/XEVI.c | 12 +- nx-X11/lib/Xext/XLbx.c | 10 +- nx-X11/lib/Xext/XMultibuf.c | 8 +- nx-X11/lib/Xext/XSecurity.c | 8 +- nx-X11/lib/Xext/XShape.c | 12 +- nx-X11/lib/Xext/XShm.c | 12 +- nx-X11/lib/Xext/XSync.c | 8 +- nx-X11/lib/Xext/XTestExt1.c | 6 +- nx-X11/lib/Xext/Xcup.c | 10 +- nx-X11/lib/Xext/Xdbe.c | 8 +- nx-X11/lib/Xext/extutil.c | 6 +- nx-X11/lib/Xext/globals.c | 4 +- nx-X11/lib/Xfixes/Imakefile | 2 +- nx-X11/lib/Xfixes/Xfixes.h | 4 +- nx-X11/lib/Xfixes/Xfixes.man | 2 +- nx-X11/lib/Xfixes/Xfixesint.h | 8 +- nx-X11/lib/Xinerama/Xinerama.c | 14 +- nx-X11/lib/Xrender/Imakefile | 2 +- nx-X11/lib/Xrender/Picture.c | 2 +- nx-X11/lib/Xrender/Xrender.h | 10 +- nx-X11/lib/Xrender/Xrenderint.h | 6 +- nx-X11/lib/Xtst/XRecord.c | 8 +- nx-X11/lib/Xtst/XTest.c | 14 +- nx-X11/lib/oldX/Imakefile | 2 +- nx-X11/lib/xkbfile/Imakefile | 2 +- nx-X11/lib/xkbfile/XKMformat.h | 6 +- nx-X11/lib/xkbfile/cout.c | 8 +- nx-X11/lib/xkbfile/maprules.c | 34 +-- nx-X11/lib/xkbfile/srvmisc.c | 6 +- nx-X11/lib/xkbfile/xkbatom.c | 6 +- nx-X11/lib/xkbfile/xkbbells.c | 4 +- nx-X11/lib/xkbfile/xkbconfig.c | 22 +- nx-X11/lib/xkbfile/xkbdraw.c | 12 +- nx-X11/lib/xkbfile/xkbmisc.c | 24 +- nx-X11/lib/xkbfile/xkbout.c | 22 +- nx-X11/lib/xkbfile/xkbtext.c | 18 +- nx-X11/lib/xkbfile/xkmout.c | 8 +- nx-X11/lib/xkbfile/xkmread.c | 24 +- nx-X11/lib/xtrans/Imakefile | 2 +- nx-X11/programs/Xserver/GL/glx/glxserver.h | 6 +- nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c | 2 +- nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c | 2 +- nx-X11/programs/Xserver/XTrap/xtrapddmi.c | 10 +- nx-X11/programs/Xserver/XTrap/xtrapdi.c | 12 +- nx-X11/programs/Xserver/XTrap/xtrapdiswp.c | 12 +- nx-X11/programs/Xserver/XTrap/xtrapditbl.c | 12 +- nx-X11/programs/Xserver/Xext/EVI.c | 6 +- nx-X11/programs/Xserver/Xext/appgroup.c | 14 +- nx-X11/programs/Xserver/Xext/bigreq.c | 6 +- nx-X11/programs/Xserver/Xext/cup.c | 8 +- nx-X11/programs/Xserver/Xext/dgaproc.h | 2 +- nx-X11/programs/Xserver/Xext/dpms.c | 8 +- nx-X11/programs/Xserver/Xext/extmod/modinit.c | 2 +- nx-X11/programs/Xserver/Xext/extmod/modinit.h | 40 ++-- nx-X11/programs/Xserver/Xext/fontcache.c | 6 +- nx-X11/programs/Xserver/Xext/mbuf.c | 6 +- nx-X11/programs/Xserver/Xext/mbufbf.c | 6 +- nx-X11/programs/Xserver/Xext/mbufpx.c | 6 +- nx-X11/programs/Xserver/Xext/mitmisc.c | 6 +- nx-X11/programs/Xserver/Xext/panoramiX.c | 8 +- nx-X11/programs/Xserver/Xext/panoramiX.h | 2 +- nx-X11/programs/Xserver/Xext/panoramiXSwap.c | 8 +- nx-X11/programs/Xserver/Xext/panoramiXprocs.c | 4 +- nx-X11/programs/Xserver/Xext/sampleEVI.c | 6 +- nx-X11/programs/Xserver/Xext/saver.c | 6 +- nx-X11/programs/Xserver/Xext/security.c | 10 +- nx-X11/programs/Xserver/Xext/shape.c | 6 +- nx-X11/programs/Xserver/Xext/shm.c | 8 +- nx-X11/programs/Xserver/Xext/sleepuntil.c | 4 +- nx-X11/programs/Xserver/Xext/sync.c | 10 +- nx-X11/programs/Xserver/Xext/xcmisc.c | 6 +- nx-X11/programs/Xserver/Xext/xevie.c | 10 +- nx-X11/programs/Xserver/Xext/xf86bigfont.c | 6 +- nx-X11/programs/Xserver/Xext/xf86dga.c | 8 +- nx-X11/programs/Xserver/Xext/xf86dga2.c | 8 +- nx-X11/programs/Xserver/Xext/xf86misc.c | 12 +- nx-X11/programs/Xserver/Xext/xf86vmode.c | 6 +- nx-X11/programs/Xserver/Xext/xres.c | 6 +- nx-X11/programs/Xserver/Xext/xtest.c | 12 +- nx-X11/programs/Xserver/Xext/xtest1dd.c | 10 +- nx-X11/programs/Xserver/Xext/xtest1di.c | 6 +- nx-X11/programs/Xserver/Xext/xvdisp.c | 10 +- nx-X11/programs/Xserver/Xext/xvdix.h | 2 +- nx-X11/programs/Xserver/Xext/xvmain.c | 8 +- nx-X11/programs/Xserver/Xext/xvmc.c | 12 +- nx-X11/programs/Xserver/Xext/xvmcext.h | 2 +- nx-X11/programs/Xserver/Xext/xvmod.c | 6 +- nx-X11/programs/Xserver/Xi/allowev.c | 8 +- nx-X11/programs/Xserver/Xi/chgdctl.c | 8 +- nx-X11/programs/Xserver/Xi/chgfctl.c | 8 +- nx-X11/programs/Xserver/Xi/chgkbd.c | 8 +- nx-X11/programs/Xserver/Xi/chgkmap.c | 8 +- nx-X11/programs/Xserver/Xi/chgprop.c | 8 +- nx-X11/programs/Xserver/Xi/chgptr.c | 8 +- nx-X11/programs/Xserver/Xi/closedev.c | 8 +- nx-X11/programs/Xserver/Xi/devbell.c | 8 +- nx-X11/programs/Xserver/Xi/exevents.c | 8 +- nx-X11/programs/Xserver/Xi/extinit.c | 8 +- nx-X11/programs/Xserver/Xi/getbmap.c | 8 +- nx-X11/programs/Xserver/Xi/getdctl.c | 8 +- nx-X11/programs/Xserver/Xi/getfctl.c | 8 +- nx-X11/programs/Xserver/Xi/getfocus.c | 8 +- nx-X11/programs/Xserver/Xi/getkmap.c | 8 +- nx-X11/programs/Xserver/Xi/getmmap.c | 8 +- nx-X11/programs/Xserver/Xi/getprop.c | 8 +- nx-X11/programs/Xserver/Xi/getselev.c | 8 +- nx-X11/programs/Xserver/Xi/getvers.c | 8 +- nx-X11/programs/Xserver/Xi/grabdev.c | 8 +- nx-X11/programs/Xserver/Xi/grabdevb.c | 8 +- nx-X11/programs/Xserver/Xi/grabdevk.c | 8 +- nx-X11/programs/Xserver/Xi/gtmotion.c | 8 +- nx-X11/programs/Xserver/Xi/listdev.c | 8 +- nx-X11/programs/Xserver/Xi/opendev.c | 8 +- nx-X11/programs/Xserver/Xi/queryst.c | 8 +- nx-X11/programs/Xserver/Xi/selectev.c | 8 +- nx-X11/programs/Xserver/Xi/sendexev.c | 8 +- nx-X11/programs/Xserver/Xi/setbmap.c | 8 +- nx-X11/programs/Xserver/Xi/setdval.c | 8 +- nx-X11/programs/Xserver/Xi/setfocus.c | 8 +- nx-X11/programs/Xserver/Xi/setmmap.c | 8 +- nx-X11/programs/Xserver/Xi/setmode.c | 8 +- nx-X11/programs/Xserver/Xi/stubs.c | 8 +- nx-X11/programs/Xserver/Xi/ungrdev.c | 6 +- nx-X11/programs/Xserver/Xi/ungrdevb.c | 8 +- nx-X11/programs/Xserver/Xi/ungrdevk.c | 8 +- nx-X11/programs/Xserver/composite/compint.h | 2 +- nx-X11/programs/Xserver/damageext/damageextint.h | 4 +- nx-X11/programs/Xserver/dbe/dbe.c | 4 +- nx-X11/programs/Xserver/dbe/dbestruct.h | 2 +- nx-X11/programs/Xserver/dbe/midbe.c | 4 +- nx-X11/programs/Xserver/dix/atom.c | 4 +- nx-X11/programs/Xserver/dix/colormap.c | 4 +- nx-X11/programs/Xserver/dix/cursor.c | 4 +- nx-X11/programs/Xserver/dix/devices.c | 8 +- nx-X11/programs/Xserver/dix/dispatch.c | 6 +- nx-X11/programs/Xserver/dix/dixfonts.c | 8 +- nx-X11/programs/Xserver/dix/dixutils.c | 8 +- nx-X11/programs/Xserver/dix/events.c | 10 +- nx-X11/programs/Xserver/dix/extension.c | 6 +- nx-X11/programs/Xserver/dix/gc.c | 6 +- nx-X11/programs/Xserver/dix/globals.c | 4 +- nx-X11/programs/Xserver/dix/grabs.c | 4 +- nx-X11/programs/Xserver/dix/initatoms.c | 4 +- nx-X11/programs/Xserver/dix/main.c | 8 +- nx-X11/programs/Xserver/dix/pixmap.c | 2 +- nx-X11/programs/Xserver/dix/privates.c | 2 +- nx-X11/programs/Xserver/dix/property.c | 6 +- nx-X11/programs/Xserver/dix/resource.c | 2 +- nx-X11/programs/Xserver/dix/swaprep.c | 4 +- nx-X11/programs/Xserver/dix/swapreq.c | 6 +- nx-X11/programs/Xserver/dix/tables.c | 4 +- nx-X11/programs/Xserver/dix/window.c | 4 +- nx-X11/programs/Xserver/fb/fb.h | 2 +- nx-X11/programs/Xserver/fb/fbcmap.c | 4 +- nx-X11/programs/Xserver/fb/fbpseudocolor.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Agent.h | 4 +- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/Events.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Holder.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Icons.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 +- nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h | 6 +- .../programs/Xserver/hw/nxagent/NXcompositeext.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 11 +- nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/NXextension.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c | 8 +- nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/NXresource.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 8 +- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/TestExt.c | 6 +- .../hw/nxagent/X11/include/Xrandr_nxagent.h | 105 +++++++++ .../Xserver/hw/nxagent/X11/include/xpm_nxagent.h | 259 +++++++++++++++++++++ .../Xserver/hw/xfree86/os-support/xf86_libc.h | 2 +- nx-X11/programs/Xserver/include/Imakefile | 4 +- nx-X11/programs/Xserver/include/closestr.h | 2 +- nx-X11/programs/Xserver/include/colormap.h | 2 +- nx-X11/programs/Xserver/include/dixfontstr.h | 2 +- nx-X11/programs/Xserver/include/dixstruct.h | 2 +- nx-X11/programs/Xserver/include/gc.h | 6 +- nx-X11/programs/Xserver/include/gcstruct.h | 2 +- nx-X11/programs/Xserver/include/input.h | 4 +- nx-X11/programs/Xserver/include/misc.h | 12 +- nx-X11/programs/Xserver/include/miscstruct.h | 2 +- nx-X11/programs/Xserver/include/opaque.h | 2 +- nx-X11/programs/Xserver/include/os.h | 2 +- nx-X11/programs/Xserver/include/scrnintstr.h | 2 +- nx-X11/programs/Xserver/include/window.h | 2 +- nx-X11/programs/Xserver/include/windowstr.h | 2 +- nx-X11/programs/Xserver/mfb/maskbits.h | 4 +- nx-X11/programs/Xserver/mi/mi.h | 2 +- nx-X11/programs/Xserver/mi/miarc.c | 6 +- nx-X11/programs/Xserver/mi/mibitblt.c | 6 +- nx-X11/programs/Xserver/mi/mibstore.c | 6 +- nx-X11/programs/Xserver/mi/miclipn.c | 2 +- nx-X11/programs/Xserver/mi/micmap.c | 4 +- nx-X11/programs/Xserver/mi/miexpose.c | 8 +- nx-X11/programs/Xserver/mi/mifillarc.c | 4 +- nx-X11/programs/Xserver/mi/mifillrct.c | 4 +- nx-X11/programs/Xserver/mi/mifpolycon.c | 2 +- nx-X11/programs/Xserver/mi/miinitext.c | 18 +- nx-X11/programs/Xserver/mi/mioverlay.c | 2 +- nx-X11/programs/Xserver/mi/mipoly.c | 2 +- nx-X11/programs/Xserver/mi/mipolygen.c | 2 +- nx-X11/programs/Xserver/mi/mipolypnt.c | 4 +- nx-X11/programs/Xserver/mi/mipolyrect.c | 4 +- nx-X11/programs/Xserver/mi/mipolyseg.c | 4 +- nx-X11/programs/Xserver/mi/mipushpxl.c | 2 +- nx-X11/programs/Xserver/mi/miregion.c | 2 +- nx-X11/programs/Xserver/mi/miscrinit.c | 4 +- nx-X11/programs/Xserver/mi/miwideline.c | 2 +- nx-X11/programs/Xserver/mi/miwindow.c | 2 +- nx-X11/programs/Xserver/mi/mizerarc.c | 4 +- nx-X11/programs/Xserver/mi/mizerclip.c | 2 +- nx-X11/programs/Xserver/mi/mizerline.c | 2 +- nx-X11/programs/Xserver/os/WaitFor.c | 10 +- nx-X11/programs/Xserver/os/access.c | 14 +- nx-X11/programs/Xserver/os/auth.c | 8 +- nx-X11/programs/Xserver/os/connection.c | 14 +- nx-X11/programs/Xserver/os/io.c | 14 +- nx-X11/programs/Xserver/os/k5auth.c | 6 +- nx-X11/programs/Xserver/os/log.c | 2 +- nx-X11/programs/Xserver/os/mitauth.c | 2 +- nx-X11/programs/Xserver/os/osdep.h | 2 +- nx-X11/programs/Xserver/os/osinit.c | 4 +- nx-X11/programs/Xserver/os/rpcauth.c | 2 +- nx-X11/programs/Xserver/os/secauth.c | 4 +- nx-X11/programs/Xserver/os/utils.c | 14 +- nx-X11/programs/Xserver/os/xalloc.c | 4 +- nx-X11/programs/Xserver/os/xdmauth.c | 6 +- nx-X11/programs/Xserver/os/xdmcp.c | 12 +- nx-X11/programs/Xserver/os/xprintf.c | 2 +- nx-X11/programs/Xserver/randr/randrproto.h | 2 +- nx-X11/programs/Xserver/randr/randrstr.h | 12 +- nx-X11/programs/Xserver/randr/rrxinerama.c | 2 +- nx-X11/programs/Xserver/record/record.c | 2 +- nx-X11/programs/Xserver/render/animcur.c | 4 +- nx-X11/programs/Xserver/render/glyphstr.h | 2 +- nx-X11/programs/Xserver/render/render.c | 10 +- nx-X11/programs/Xserver/xfixes/xfixesint.h | 6 +- nx-X11/programs/Xserver/xkb/ddxBeep.c | 10 +- nx-X11/programs/Xserver/xkb/ddxConfig.c | 10 +- nx-X11/programs/Xserver/xkb/ddxCtrls.c | 10 +- nx-X11/programs/Xserver/xkb/ddxDevBtn.c | 12 +- nx-X11/programs/Xserver/xkb/ddxFakeBtn.c | 10 +- nx-X11/programs/Xserver/xkb/ddxFakeMtn.c | 10 +- nx-X11/programs/Xserver/xkb/ddxInit.c | 10 +- nx-X11/programs/Xserver/xkb/ddxKeyClick.c | 10 +- nx-X11/programs/Xserver/xkb/ddxKillSrv.c | 10 +- nx-X11/programs/Xserver/xkb/ddxLEDs.c | 10 +- nx-X11/programs/Xserver/xkb/ddxList.c | 14 +- nx-X11/programs/Xserver/xkb/ddxLoad.c | 16 +- nx-X11/programs/Xserver/xkb/ddxPrivate.c | 4 +- nx-X11/programs/Xserver/xkb/ddxVT.c | 10 +- nx-X11/programs/Xserver/xkb/xkb.c | 10 +- nx-X11/programs/Xserver/xkb/xkbAccessX.c | 8 +- nx-X11/programs/Xserver/xkb/xkbActions.c | 8 +- nx-X11/programs/Xserver/xkb/xkbEvents.c | 10 +- nx-X11/programs/Xserver/xkb/xkbInit.c | 16 +- nx-X11/programs/Xserver/xkb/xkbLEDs.c | 8 +- nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c | 8 +- nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c | 12 +- nx-X11/programs/Xserver/xkb/xkbSwap.c | 8 +- nx-X11/programs/Xserver/xkb/xkbUtils.c | 10 +- nx-X11/programs/nxauth/gethost.c | 4 +- nx-X11/programs/nxauth/parsedpy.c | 6 +- nx-X11/programs/nxauth/process.c | 6 +- nx-X11/programs/nxauth/xauth.h | 6 +- nx-libs.spec | 240 +++++++++---------- nxcompext/Jpeg.c | 6 +- nxcompext/NXlib.h | 4 +- nxcompext/Pgn.h | 6 +- nxcompshad/Input.h | 2 +- nxcompshad/Manager.cpp | 6 +- nxcompshad/Manager.h | 2 +- nxcompshad/Regions.h | 4 +- nxcompshad/Shadow.h | 2 +- nxcompshad/Updater.cpp | 6 +- nxcompshad/Updater.h | 2 +- nxcompshad/Win.cpp | 2 +- nxcompshad/Win.h | 2 +- nxcompshad/X11.cpp | 8 +- nxcompshad/X11.h | 8 +- nxcompshad/X11/include/Xdamage_nxcompshad.h | 92 ++++++++ nxcompshad/X11/include/Xrandr_nxcompshad.h | 80 +++++++ 531 files changed, 2203 insertions(+), 1666 deletions(-) create mode 100644 nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h create mode 100644 nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h create mode 100644 nxcompshad/X11/include/Xdamage_nxcompshad.h create mode 100644 nxcompshad/X11/include/Xrandr_nxcompshad.h (limited to 'nxcompshad') diff --git a/Makefile b/Makefile index 9b89669df..2b5b4946a 100644 --- a/Makefile +++ b/Makefile @@ -149,9 +149,9 @@ install-full: . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | \ while read dirname; do \ - $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"; \ + $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/")"; \ $(INSTALL_FILE) $${dirname}/*.h \ - "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"/ || true; \ + "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/")"/ || true; \ done; \ # Provide means for Xinerama support in NX/X2Go sessions. This diff --git a/debian/libnx-x11-dev.install.in b/debian/libnx-x11-dev.install.in index 331ec104f..13af54672 100644 --- a/debian/libnx-x11-dev.install.in +++ b/debian/libnx-x11-dev.install.in @@ -1,15 +1,15 @@ usr/lib/*/libNX_X11.so -usr/include/*/nx/X11/ImUtil.h -usr/include/*/nx/X11/XKBlib.h -usr/include/*/nx/X11/Xcms.h -usr/include/*/nx/X11/Xlib.h -usr/include/*/nx/X11/XlibConf.h -usr/include/*/nx/X11/Xlibint.h -usr/include/*/nx/X11/Xlocale.h -usr/include/*/nx/X11/Xregion.h -usr/include/*/nx/X11/Xresource.h -usr/include/*/nx/X11/Xutil.h -usr/include/*/nx/X11/cursorfont.h -usr/include/*/nx/X11/misc.h -usr/include/*/nx/X11/os.h -usr/include/*/nx/X11/X10.h +usr/include/*/nx-X11/ImUtil.h +usr/include/*/nx-X11/XKBlib.h +usr/include/*/nx-X11/Xcms.h +usr/include/*/nx-X11/Xlib.h +usr/include/*/nx-X11/XlibConf.h +usr/include/*/nx-X11/Xlibint.h +usr/include/*/nx-X11/Xlocale.h +usr/include/*/nx-X11/Xregion.h +usr/include/*/nx-X11/Xresource.h +usr/include/*/nx-X11/Xutil.h +usr/include/*/nx-X11/cursorfont.h +usr/include/*/nx-X11/misc.h +usr/include/*/nx-X11/os.h +usr/include/*/nx-X11/X10.h diff --git a/debian/libnx-xau-dev.install.in b/debian/libnx-xau-dev.install.in index dd17a6054..1bf954c00 100644 --- a/debian/libnx-xau-dev.install.in +++ b/debian/libnx-xau-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xau.so -usr/include/*/nx/X11/Xauth.h +usr/include/*/nx-X11/Xauth.h diff --git a/debian/libnx-xcomposite-dev.install.in b/debian/libnx-xcomposite-dev.install.in index e7e3a33db..71451dbcc 100644 --- a/debian/libnx-xcomposite-dev.install.in +++ b/debian/libnx-xcomposite-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xcomposite.so -usr/include/*/nx/X11/extensions/Xcomposite.h +usr/include/*/nx-X11/extensions/Xcomposite.h diff --git a/debian/libnx-xext-dev.install.in b/debian/libnx-xext-dev.install.in index 9f4f60551..0d1df8c08 100644 --- a/debian/libnx-xext-dev.install.in +++ b/debian/libnx-xext-dev.install.in @@ -1,34 +1,34 @@ usr/lib/*/libNX_Xext.so -usr/include/*/nx/X11/extensions/MITMisc.h -usr/include/*/nx/X11/extensions/XEVI.h -usr/include/*/nx/X11/extensions/XEVIstr.h -usr/include/*/nx/X11/extensions/Xevie.h -usr/include/*/nx/X11/extensions/Xeviestr.h -usr/include/*/nx/X11/extensions/XLbx.h -usr/include/*/nx/X11/extensions/XShm.h -usr/include/*/nx/X11/extensions/Xag.h -usr/include/*/nx/X11/extensions/Xagsrv.h -usr/include/*/nx/X11/extensions/Xagstr.h -usr/include/*/nx/X11/extensions/Xcup.h -usr/include/*/nx/X11/extensions/Xcupstr.h -usr/include/*/nx/X11/extensions/Xdbe.h -usr/include/*/nx/X11/extensions/Xdbeproto.h -usr/include/*/nx/X11/extensions/Xext.h -usr/include/*/nx/X11/extensions/dpms.h -usr/include/*/nx/X11/extensions/dpmsstr.h -usr/include/*/nx/X11/extensions/extutil.h -usr/include/*/nx/X11/extensions/lbxstr.h -usr/include/*/nx/X11/extensions/lbxbuf.h -usr/include/*/nx/X11/extensions/lbxdeltastr.h -usr/include/*/nx/X11/extensions/lbximage.h -usr/include/*/nx/X11/extensions/lbxbufstr.h -usr/include/*/nx/X11/extensions/lbxopts.h -usr/include/*/nx/X11/extensions/lbxzlib.h -usr/include/*/nx/X11/extensions/mitmiscstr.h -usr/include/*/nx/X11/extensions/multibuf.h -usr/include/*/nx/X11/extensions/multibufst.h -usr/include/*/nx/X11/extensions/security.h -usr/include/*/nx/X11/extensions/securstr.h -usr/include/*/nx/X11/extensions/shape.h -usr/include/*/nx/X11/extensions/sync.h -usr/include/*/nx/X11/extensions/xtestext1.h +usr/include/*/nx-X11/extensions/MITMisc.h +usr/include/*/nx-X11/extensions/XEVI.h +usr/include/*/nx-X11/extensions/XEVIstr.h +usr/include/*/nx-X11/extensions/Xevie.h +usr/include/*/nx-X11/extensions/Xeviestr.h +usr/include/*/nx-X11/extensions/XLbx.h +usr/include/*/nx-X11/extensions/XShm.h +usr/include/*/nx-X11/extensions/Xag.h +usr/include/*/nx-X11/extensions/Xagsrv.h +usr/include/*/nx-X11/extensions/Xagstr.h +usr/include/*/nx-X11/extensions/Xcup.h +usr/include/*/nx-X11/extensions/Xcupstr.h +usr/include/*/nx-X11/extensions/Xdbe.h +usr/include/*/nx-X11/extensions/Xdbeproto.h +usr/include/*/nx-X11/extensions/Xext.h +usr/include/*/nx-X11/extensions/dpms.h +usr/include/*/nx-X11/extensions/dpmsstr.h +usr/include/*/nx-X11/extensions/extutil.h +usr/include/*/nx-X11/extensions/lbxstr.h +usr/include/*/nx-X11/extensions/lbxbuf.h +usr/include/*/nx-X11/extensions/lbxdeltastr.h +usr/include/*/nx-X11/extensions/lbximage.h +usr/include/*/nx-X11/extensions/lbxbufstr.h +usr/include/*/nx-X11/extensions/lbxopts.h +usr/include/*/nx-X11/extensions/lbxzlib.h +usr/include/*/nx-X11/extensions/mitmiscstr.h +usr/include/*/nx-X11/extensions/multibuf.h +usr/include/*/nx-X11/extensions/multibufst.h +usr/include/*/nx-X11/extensions/security.h +usr/include/*/nx-X11/extensions/securstr.h +usr/include/*/nx-X11/extensions/shape.h +usr/include/*/nx-X11/extensions/sync.h +usr/include/*/nx-X11/extensions/xtestext1.h diff --git a/debian/libnx-xfixes-dev.install.in b/debian/libnx-xfixes-dev.install.in index 96b6cf61c..475c78d0a 100644 --- a/debian/libnx-xfixes-dev.install.in +++ b/debian/libnx-xfixes-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xfixes.so -usr/include/*/nx/X11/extensions/Xfixes.h +usr/include/*/nx-X11/extensions/Xfixes.h diff --git a/debian/libnx-xinerama-dev.install.in b/debian/libnx-xinerama-dev.install.in index 983784460..59c0456aa 100644 --- a/debian/libnx-xinerama-dev.install.in +++ b/debian/libnx-xinerama-dev.install.in @@ -1,3 +1,3 @@ usr/lib/*/libNX_Xinerama.so -usr/include/*/nx/X11/extensions/Xinerama.h -usr/include/*/nx/X11/extensions/panoramiXext.h +usr/include/*/nx-X11/extensions/Xinerama.h +usr/include/*/nx-X11/extensions/panoramiXext.h diff --git a/debian/libnx-xrender-dev.install.in b/debian/libnx-xrender-dev.install.in index 392e20025..2aede35da 100644 --- a/debian/libnx-xrender-dev.install.in +++ b/debian/libnx-xrender-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xrender.so -usr/include/*/nx/X11/extensions/Xrender.h +usr/include/*/nx-X11/extensions/Xrender.h diff --git a/debian/libnx-xtst-dev.install.in b/debian/libnx-xtst-dev.install.in index 9dd16a1db..5acca96cf 100644 --- a/debian/libnx-xtst-dev.install.in +++ b/debian/libnx-xtst-dev.install.in @@ -1,2 +1,2 @@ usr/lib/*/libNX_Xtst.so -usr/include/*/nx/X11/extensions/XTest.h +usr/include/*/nx-X11/extensions/XTest.h diff --git a/debian/nx-x11proto-composite-dev.install.in b/debian/nx-x11proto-composite-dev.install.in index 609454a5e..cf2c77e36 100644 --- a/debian/nx-x11proto-composite-dev.install.in +++ b/debian/nx-x11proto-composite-dev.install.in @@ -1,2 +1,2 @@ -usr/include/*/nx/X11/extensions/composite.h -usr/include/*/nx/X11/extensions/compositeproto.h \ No newline at end of file +usr/include/*/nx-X11/extensions/composite.h +usr/include/*/nx-X11/extensions/compositeproto.h \ No newline at end of file diff --git a/debian/nx-x11proto-core-dev.install.in b/debian/nx-x11proto-core-dev.install.in index 92c529f41..2e99909a8 100644 --- a/debian/nx-x11proto-core-dev.install.in +++ b/debian/nx-x11proto-core-dev.install.in @@ -1,23 +1,23 @@ -usr/include/*/nx/X11/DECkeysym.h -usr/include/*/nx/X11/HPkeysym.h -usr/include/*/nx/X11/Sunkeysym.h -usr/include/*/nx/X11/X.h -usr/include/*/nx/X11/XF86keysym.h -usr/include/*/nx/X11/XWDFile.h -usr/include/*/nx/X11/Xalloca.h -usr/include/*/nx/X11/Xarch.h -usr/include/*/nx/X11/Xatom.h -usr/include/*/nx/X11/Xdefs.h -usr/include/*/nx/X11/Xfuncproto.h -usr/include/*/nx/X11/Xfuncs.h -usr/include/*/nx/X11/Xmd.h -usr/include/*/nx/X11/Xos.h -usr/include/*/nx/X11/Xos_r.h -usr/include/*/nx/X11/Xosdefs.h -usr/include/*/nx/X11/Xpoll.h -usr/include/*/nx/X11/Xproto.h -usr/include/*/nx/X11/Xprotostr.h -usr/include/*/nx/X11/Xthreads.h -usr/include/*/nx/X11/ap_keysym.h -usr/include/*/nx/X11/keysym.h -usr/include/*/nx/X11/keysymdef.h +usr/include/*/nx-X11/DECkeysym.h +usr/include/*/nx-X11/HPkeysym.h +usr/include/*/nx-X11/Sunkeysym.h +usr/include/*/nx-X11/X.h +usr/include/*/nx-X11/XF86keysym.h +usr/include/*/nx-X11/XWDFile.h +usr/include/*/nx-X11/Xalloca.h +usr/include/*/nx-X11/Xarch.h +usr/include/*/nx-X11/Xatom.h +usr/include/*/nx-X11/Xdefs.h +usr/include/*/nx-X11/Xfuncproto.h +usr/include/*/nx-X11/Xfuncs.h +usr/include/*/nx-X11/Xmd.h +usr/include/*/nx-X11/Xos.h +usr/include/*/nx-X11/Xos_r.h +usr/include/*/nx-X11/Xosdefs.h +usr/include/*/nx-X11/Xpoll.h +usr/include/*/nx-X11/Xproto.h +usr/include/*/nx-X11/Xprotostr.h +usr/include/*/nx-X11/Xthreads.h +usr/include/*/nx-X11/ap_keysym.h +usr/include/*/nx-X11/keysym.h +usr/include/*/nx-X11/keysymdef.h diff --git a/debian/nx-x11proto-render-dev.install.in b/debian/nx-x11proto-render-dev.install.in index bf778716f..f2222d234 100644 --- a/debian/nx-x11proto-render-dev.install.in +++ b/debian/nx-x11proto-render-dev.install.in @@ -1,3 +1,3 @@ -usr/include/*/nx/X11/extensions/render.h -usr/include/*/nx/X11/extensions/renderproto.h +usr/include/*/nx-X11/extensions/render.h +usr/include/*/nx-X11/extensions/renderproto.h diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in index 7e0ca507f..0d1f8699b 100644 --- a/debian/nx-x11proto-xext-dev.install.in +++ b/debian/nx-x11proto-xext-dev.install.in @@ -1,4 +1,4 @@ -usr/include/*/nx/X11/extensions/xteststr.h -usr/include/*/nx/X11/extensions/shapestr.h -usr/include/*/nx/X11/extensions/shmstr.h -usr/include/*/nx/X11/extensions/syncstr.h +usr/include/*/nx-X11/extensions/xteststr.h +usr/include/*/nx-X11/extensions/shapestr.h +usr/include/*/nx-X11/extensions/shmstr.h +usr/include/*/nx-X11/extensions/syncstr.h diff --git a/debian/nx-x11proto-xfixes-dev.install.in b/debian/nx-x11proto-xfixes-dev.install.in index 4b614d6c1..91eae0306 100644 --- a/debian/nx-x11proto-xfixes-dev.install.in +++ b/debian/nx-x11proto-xfixes-dev.install.in @@ -1,3 +1,3 @@ -usr/include/*/nx/X11/extensions/xfixeswire.h -usr/include/*/nx/X11/extensions/xfixesproto.h +usr/include/*/nx-X11/extensions/xfixeswire.h +usr/include/*/nx-X11/extensions/xfixesproto.h diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in index 36717e1f5..dca06ddee 100644 --- a/debian/nx-x11proto-xinerama-dev.install.in +++ b/debian/nx-x11proto-xinerama-dev.install.in @@ -1 +1 @@ -usr/include/*/nx/X11/extensions/panoramiXproto.h \ No newline at end of file +usr/include/*/nx-X11/extensions/panoramiXproto.h \ No newline at end of file diff --git a/debian/rules b/debian/rules index b3060b36f..b78855033 100755 --- a/debian/rules +++ b/debian/rules @@ -42,28 +42,28 @@ override_dh_install: rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a # remove extras, GL, and other unneeded headers - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/GL/ - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XInput.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86misc.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dgastr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/ + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XInput.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xtrap*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/record*.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmode.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86vmstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86misc.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dgastr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86dga1str.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86mscstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/ dh_install --fail-missing diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 241bc267f..f54ff84cc 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1223,7 +1223,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules PROGRAMSRC = $(TOP)/programs LIBSRC = $(XTOP)/lib INCLUDESRC = BuildIncDir - XINCLUDESRC = $(INCLUDESRC)/X11 + XINCLUDESRC = $(INCLUDESRC)/nx-X11 SERVERSRC = $(XTOP)/programs/Xserver CONTRIBSRC = ContribDir UNSUPPORTEDSRC = UnsupportedDir diff --git a/nx-X11/include/GL/glx.h b/nx-X11/include/GL/glx.h index 910504a1d..3a9e942c7 100644 --- a/nx-X11/include/GL/glx.h +++ b/nx-X11/include/GL/glx.h @@ -36,8 +36,8 @@ ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -#include -#include +#include +#include #include #include diff --git a/nx-X11/include/GL/glxint.h b/nx-X11/include/GL/glxint.h index d9e2581bb..50f4a0eaa 100644 --- a/nx-X11/include/GL/glxint.h +++ b/nx-X11/include/GL/glxint.h @@ -23,8 +23,8 @@ ** $SGI$ */ -#include -#include +#include +#include #include "GL/gl.h" typedef struct __GLXvisualConfigRec __GLXvisualConfig; diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index 26520eab0..76a4daf6d 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -51,10 +51,10 @@ HEADERS = \ all:: -BuildIncludes($(HEADERS),X11,..) +BuildIncludes($(HEADERS),nx-X11,..) #if BuildLibraries -InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) +InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) #endif MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) diff --git a/nx-X11/include/XWDFile.h b/nx-X11/include/XWDFile.h index 0ce22e1a8..19a26ea33 100644 --- a/nx-X11/include/XWDFile.h +++ b/nx-X11/include/XWDFile.h @@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group. #ifndef XWDFILE_H #define XWDFILE_H -#include +#include #define XWD_FILE_VERSION 7 #define sz_XWDheader 100 diff --git a/nx-X11/include/Xdefs.h b/nx-X11/include/Xdefs.h index f32149db5..c06202af3 100644 --- a/nx-X11/include/Xdefs.h +++ b/nx-X11/include/Xdefs.h @@ -31,7 +31,7 @@ authorization from The XFree86 Project Inc.. #define _XDEFS_H #ifdef _XSERVER64 -#include +#include #endif #ifndef _XTYPEDEF_ATOM diff --git a/nx-X11/include/Xfuncs.h b/nx-X11/include/Xfuncs.h index a059bc710..7582198bb 100644 --- a/nx-X11/include/Xfuncs.h +++ b/nx-X11/include/Xfuncs.h @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XFUNCS_H_ #define _XFUNCS_H_ -#include +#include /* the old Xfuncs.h, for pre-R6 */ #if !(defined(XFree86LOADER) && defined(IN_MODULE)) diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index 04b14b6fc..a2abf156f 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XOS_H_ #define _XOS_H_ -#include +#include /* * Get major data types (esp. caddr_t) @@ -150,7 +150,7 @@ extern int sys_nerr; #include #endif #ifdef WIN32 -#include +#include #else #include #endif @@ -285,6 +285,6 @@ struct sockaddr_un { }; #endif -#include +#include #endif /* _XOS_H_ */ diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index e539aee2a..44b1eaacf 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -216,7 +216,7 @@ extern void XtProcessUnlock( * * #define X_INCLUDE_PWD_H * #define XOS_USE_..._LOCKING - * #include + * #include * * typedef ... _Xgetpwparams; * @@ -394,7 +394,7 @@ typedef int _Xgetpwret; * * #define X_INCLUDE_NETDB_H * #define XOS_USE_..._LOCKING - * #include + * #include * * typedef ... _Xgethostbynameparams; * typedef ... _Xgetservbynameparams; @@ -556,7 +556,7 @@ typedef int _Xgetservbynameparams; /* dummy */ * * #define X_INCLUDE_DIRENT_H * #define XOS_USE_..._LOCKING - * #include + * #include * * typedef ... _Xreaddirparams; * @@ -680,7 +680,7 @@ extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **); * * #define X_INCLUDE_UNISTD_H * #define XOS_USE_..._LOCKING - * #include + * #include * * typedef ... _Xgetloginparams; * typedef ... _Xttynameparams; @@ -822,7 +822,7 @@ typedef struct { * * #define X_INCLUDE_STRING_H * #define XOS_USE_..._LOCKING - * #include + * #include * * typedef ... _Xstrtokparams; * @@ -868,7 +868,7 @@ typedef char * _Xstrtokparams; * * #define X_INCLUDE_TIME_H * #define XOS_USE_..._LOCKING - * #include + * #include * * typedef ... _Xatimeparams; * typedef ... _Xctimeparams; @@ -1036,7 +1036,7 @@ typedef struct tm _Xltimeparams; * * #define X_INCLUDE_GRP_H * #define XOS_USE_..._LOCKING - * #include + * #include * * typedef ... _Xgetgrparams; * diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in index 3200c3711..77a0aea3d 100644 --- a/nx-X11/include/Xpoll.h.in +++ b/nx-X11/include/Xpoll.h.in @@ -75,7 +75,7 @@ from The Open Group. #ifndef USE_POLL -#include +#include /* Below is the monster branch from hell. Basically, most systems will drop to * 'the branch below is the fallthrough for halfway modern systems', and include @@ -104,7 +104,7 @@ from The Open Group. # include #endif -#include +#include #ifdef CSRG_BASED #include @@ -241,7 +241,7 @@ extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds, #ifndef FD_SETSIZE #define FD_SETSIZE XFD_SETSIZE #endif -#include +#include #define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) diff --git a/nx-X11/include/Xproto.h b/nx-X11/include/Xproto.h index 877aab442..0f7d1f557 100644 --- a/nx-X11/include/Xproto.h +++ b/nx-X11/include/Xproto.h @@ -73,8 +73,8 @@ SOFTWARE. ******************************************************************/ -#include -#include +#include +#include /* * Define constants for the sizes of the network packets. The sz_ prefix is diff --git a/nx-X11/include/Xprotostr.h b/nx-X11/include/Xprotostr.h index f343d9849..a0f849874 100644 --- a/nx-X11/include/Xprotostr.h +++ b/nx-X11/include/Xprotostr.h @@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#include +#include /* Used by PolySegment */ diff --git a/nx-X11/include/Xthreads.h b/nx-X11/include/Xthreads.h index 54b5440ad..41440a2fb 100644 --- a/nx-X11/include/Xthreads.h +++ b/nx-X11/include/Xthreads.h @@ -98,7 +98,7 @@ extern xthread_t (*_x11_thr_self)(); #define xcondition_broadcast(cv) cond_broadcast(cv) #else /* !SVR4 */ #ifdef WIN32 -#include +#include typedef DWORD xthread_t; typedef DWORD xthread_key_t; struct _xthread_waiter { diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index ec6c10b98..b7ed23120 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -101,10 +101,10 @@ HEADERS = Xext.h \ all:: -BuildIncludes($(HEADERS),X11/extensions,../..) +BuildIncludes($(HEADERS),nx-X11/extensions,../..) #if BuildLibraries -InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/extensions,$(INSTINCFLAGS)) +InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11/extensions,$(INSTINCFLAGS)) #endif InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR)/extensions) diff --git a/nx-X11/include/extensions/MITMisc.h b/nx-X11/include/extensions/MITMisc.h index 975700e01..d66b8242d 100644 --- a/nx-X11/include/extensions/MITMisc.h +++ b/nx-X11/include/extensions/MITMisc.h @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XMITMISC_H_ #define _XMITMISC_H_ -#include +#include #define X_MITSetBugMode 0 #define X_MITGetBugMode 1 diff --git a/nx-X11/include/extensions/XEVI.h b/nx-X11/include/extensions/XEVI.h index d8e37ff4f..30b2412d9 100644 --- a/nx-X11/include/extensions/XEVI.h +++ b/nx-X11/include/extensions/XEVI.h @@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XEVI_H_ #define _XEVI_H_ -#include +#include #define X_EVIQueryVersion 0 #define X_EVIGetVisualInfo 1 #define XEVI_TRANSPARENCY_NONE 0 diff --git a/nx-X11/include/extensions/XEVIstr.h b/nx-X11/include/extensions/XEVIstr.h index 388ef4bcf..4deb6c113 100644 --- a/nx-X11/include/extensions/XEVIstr.h +++ b/nx-X11/include/extensions/XEVIstr.h @@ -26,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _EVISTR_H_ #define _EVISTR_H_ -#include +#include #define VisualID CARD32 #define EVINAME "Extended-Visual-Information" diff --git a/nx-X11/include/extensions/XInput.h b/nx-X11/include/extensions/XInput.h index ee4410531..cf4b72ca0 100644 --- a/nx-X11/include/extensions/XInput.h +++ b/nx-X11/include/extensions/XInput.h @@ -52,8 +52,8 @@ SOFTWARE. #ifndef _XINPUT_H_ #define _XINPUT_H_ -#include -#include +#include +#include #define _deviceKeyPress 0 #define _deviceKeyRelease 1 diff --git a/nx-X11/include/extensions/XIproto.h b/nx-X11/include/extensions/XIproto.h index 1da0248f8..cccb11a2c 100644 --- a/nx-X11/include/extensions/XIproto.h +++ b/nx-X11/include/extensions/XIproto.h @@ -50,8 +50,8 @@ SOFTWARE. #ifndef _XIPROTO_H #define _XIPROTO_H -#include -#include +#include +#include /* make sure types have right sizes for protocol structures. */ #define Window CARD32 diff --git a/nx-X11/include/extensions/XKBgeom.h b/nx-X11/include/extensions/XKBgeom.h index 89f902fba..6ef114bfe 100644 --- a/nx-X11/include/extensions/XKBgeom.h +++ b/nx-X11/include/extensions/XKBgeom.h @@ -29,7 +29,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XKBGEOM_H_ #define _XKBGEOM_H_ -#include +#include #ifdef XKB_IN_SERVER #define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias diff --git a/nx-X11/include/extensions/XKBproto.h b/nx-X11/include/extensions/XKBproto.h index 97dd4d262..2dc3b141e 100644 --- a/nx-X11/include/extensions/XKBproto.h +++ b/nx-X11/include/extensions/XKBproto.h @@ -28,8 +28,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XKBPROTO_H_ #define _XKBPROTO_H_ -#include -#include +#include +#include #define Window CARD32 #define Atom CARD32 diff --git a/nx-X11/include/extensions/XKBsrv.h b/nx-X11/include/extensions/XKBsrv.h index 0d262e979..3d335bc88 100644 --- a/nx-X11/include/extensions/XKBsrv.h +++ b/nx-X11/include/extensions/XKBsrv.h @@ -69,8 +69,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbUpdateKeyTypeVirtualMods SrvXkbUpdateKeyTypeVirtualMods #endif -#include -#include +#include +#include #include "inputstr.h" #ifdef NXAGENT_SERVER @@ -1100,9 +1100,9 @@ extern void XkbSendNewKeyboardNotify( #ifdef XKBSRV_NEED_FILE_FUNCS -#include -#include -#include +#include +#include +#include #define _XkbListKeymaps 0 #define _XkbListKeycodes 1 diff --git a/nx-X11/include/extensions/XKBstr.h b/nx-X11/include/extensions/XKBstr.h index 6131c931c..77666f6aa 100644 --- a/nx-X11/include/extensions/XKBstr.h +++ b/nx-X11/include/extensions/XKBstr.h @@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XKBSTR_H_ #define _XKBSTR_H_ -#include +#include #define XkbCharToInt(v) ((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f)) #define XkbIntTo2Chars(i,h,l) (((h)=((i>>8)&0xff)),((l)=((i)&0xff))) diff --git a/nx-X11/include/extensions/XLbx.h b/nx-X11/include/extensions/XLbx.h index 01d44f090..6cd867944 100644 --- a/nx-X11/include/extensions/XLbx.h +++ b/nx-X11/include/extensions/XLbx.h @@ -25,7 +25,7 @@ #ifndef _XLBX_H_ #define _XLBX_H_ -#include +#include /* * NOTE: any changes or additions to the opcodes needs to be reflected @@ -128,8 +128,8 @@ #ifndef _XLBX_SERVER_ -#include -#include +#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/XShm.h b/nx-X11/include/extensions/XShm.h index 4ae14ca8b..4b0d01bef 100644 --- a/nx-X11/include/extensions/XShm.h +++ b/nx-X11/include/extensions/XShm.h @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XSHM_H_ #define _XSHM_H_ -#include +#include #define X_ShmQueryVersion 0 #define X_ShmAttach 1 diff --git a/nx-X11/include/extensions/XTest.h b/nx-X11/include/extensions/XTest.h index afb1849c3..4817ef132 100644 --- a/nx-X11/include/extensions/XTest.h +++ b/nx-X11/include/extensions/XTest.h @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XTEST_H_ #define _XTEST_H_ -#include +#include #define X_XTestGetVersion 0 #define X_XTestCompareCursor 1 @@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XTEST_SERVER_ -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/Xag.h b/nx-X11/include/extensions/Xag.h index 815f2b9f9..4c1193e3d 100644 --- a/nx-X11/include/extensions/Xag.h +++ b/nx-X11/include/extensions/Xag.h @@ -29,7 +29,7 @@ from The Open Group. #ifndef _XAG_H_ #define _XAG_H_ -#include +#include #define X_XagQueryVersion 0 #define X_XagCreate 1 diff --git a/nx-X11/include/extensions/Xagsrv.h b/nx-X11/include/extensions/Xagsrv.h index b9c50aaa9..daf1af04d 100644 --- a/nx-X11/include/extensions/Xagsrv.h +++ b/nx-X11/include/extensions/Xagsrv.h @@ -29,7 +29,7 @@ from The Open Group. #ifndef _XAGSRV_H_ #define _XAGSRV_H_ -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/Xagstr.h b/nx-X11/include/extensions/Xagstr.h index ffb5527a2..4f12027e0 100644 --- a/nx-X11/include/extensions/Xagstr.h +++ b/nx-X11/include/extensions/Xagstr.h @@ -29,7 +29,7 @@ from The Open Group. #ifndef _XAGSTR_H_ /* { */ #define _XAGSTR_H_ -#include +#include #define XAppGroup CARD32 diff --git a/nx-X11/include/extensions/Xcup.h b/nx-X11/include/extensions/Xcup.h index b1df039e6..fb5fd0887 100644 --- a/nx-X11/include/extensions/Xcup.h +++ b/nx-X11/include/extensions/Xcup.h @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XCUP_H_ #define _XCUP_H_ -#include +#include #define X_XcupQueryVersion 0 #define X_XcupGetReservedColormapEntries 1 diff --git a/nx-X11/include/extensions/Xcupstr.h b/nx-X11/include/extensions/Xcupstr.h index f521c333c..fa77b5aea 100644 --- a/nx-X11/include/extensions/Xcupstr.h +++ b/nx-X11/include/extensions/Xcupstr.h @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XCUPSTR_H_ /* { */ #define _XCUPSTR_H_ -#include +#include #define XCUPNAME "TOG-CUP" diff --git a/nx-X11/include/extensions/Xdbe.h b/nx-X11/include/extensions/Xdbe.h index f9205a228..bc43007c6 100644 --- a/nx-X11/include/extensions/Xdbe.h +++ b/nx-X11/include/extensions/Xdbe.h @@ -38,8 +38,8 @@ /* INCLUDES */ -#include -#include +#include +#include /* DEFINES */ diff --git a/nx-X11/include/extensions/Xevie.h b/nx-X11/include/extensions/Xevie.h index d6d4fab84..5dc48bbfd 100644 --- a/nx-X11/include/extensions/Xevie.h +++ b/nx-X11/include/extensions/Xevie.h @@ -35,7 +35,7 @@ of the copyright holder. #ifndef _XEVIE_H_ #define _XEVIE_H_ -#include +#include #define XEVIE_UNMODIFIED 0 #define XEVIE_MODIFIED 1 diff --git a/nx-X11/include/extensions/Xext.h b/nx-X11/include/extensions/Xext.h index 5b62c8b2d..b0ce292fc 100644 --- a/nx-X11/include/extensions/Xext.h +++ b/nx-X11/include/extensions/Xext.h @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _XEXT_H_ #define _XEXT_H_ -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/Xinerama.h b/nx-X11/include/extensions/Xinerama.h index e1c9445c3..77e7e7444 100644 --- a/nx-X11/include/extensions/Xinerama.h +++ b/nx-X11/include/extensions/Xinerama.h @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _Xinerama_h #define _Xinerama_h -#include +#include typedef struct { int screen_number; diff --git a/nx-X11/include/extensions/Xv.h b/nx-X11/include/extensions/Xv.h index 4e85fa719..f07f9d75f 100644 --- a/nx-X11/include/extensions/Xv.h +++ b/nx-X11/include/extensions/Xv.h @@ -44,7 +44,7 @@ SOFTWARE. ** */ -#include +#include #define XvName "XVideo" #define XvVersion 2 diff --git a/nx-X11/include/extensions/XvMC.h b/nx-X11/include/extensions/XvMC.h index 3e621f05a..1709692a1 100644 --- a/nx-X11/include/extensions/XvMC.h +++ b/nx-X11/include/extensions/XvMC.h @@ -3,8 +3,8 @@ #ifndef _XVMC_H_ #define _XVMC_H_ -#include -#include +#include +#include #define XvMCName "XVideo-MotionCompensation" #define XvMCNumEvents 0 diff --git a/nx-X11/include/extensions/XvMClib.h b/nx-X11/include/extensions/XvMClib.h index 1b30a669a..c1e94119e 100644 --- a/nx-X11/include/extensions/XvMClib.h +++ b/nx-X11/include/extensions/XvMClib.h @@ -4,9 +4,9 @@ #ifndef _XVMCLIB_H_ #define _XVMCLIB_H_ -#include -#include -#include +#include +#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/Xvlib.h b/nx-X11/include/extensions/Xvlib.h index 2fd26e55b..98c407e31 100644 --- a/nx-X11/include/extensions/Xvlib.h +++ b/nx-X11/include/extensions/Xvlib.h @@ -53,8 +53,8 @@ SOFTWARE. ** */ -#include -#include +#include +#include typedef struct { int numerator; diff --git a/nx-X11/include/extensions/Xvproto.h b/nx-X11/include/extensions/Xvproto.h index 9112f510e..81e1656a8 100644 --- a/nx-X11/include/extensions/Xvproto.h +++ b/nx-X11/include/extensions/Xvproto.h @@ -49,7 +49,7 @@ SOFTWARE. ** */ -#include +#include /* Symbols: These are undefined at the end of this file to restore the values they have in Xv.h */ diff --git a/nx-X11/include/extensions/composite.h b/nx-X11/include/extensions/composite.h index bfdfbee97..d1901750a 100644 --- a/nx-X11/include/extensions/composite.h +++ b/nx-X11/include/extensions/composite.h @@ -25,7 +25,7 @@ #ifndef _COMPOSITE_H_ #define _COMPOSITE_H_ -#include +#include #define COMPOSITE_NAME "Composite" #define COMPOSITE_MAJOR 0 diff --git a/nx-X11/include/extensions/compositeproto.h b/nx-X11/include/extensions/compositeproto.h index 2304e961d..a851c727e 100644 --- a/nx-X11/include/extensions/compositeproto.h +++ b/nx-X11/include/extensions/compositeproto.h @@ -25,8 +25,8 @@ #ifndef _COMPOSITEPROTO_H_ #define _COMPOSITEPROTO_H_ -#include -#include +#include +#include #define Window CARD32 #define Region CARD32 diff --git a/nx-X11/include/extensions/dpms.h b/nx-X11/include/extensions/dpms.h index 7555f4ab6..87d7c9c81 100644 --- a/nx-X11/include/extensions/dpms.h +++ b/nx-X11/include/extensions/dpms.h @@ -46,8 +46,8 @@ Equipment Corporation. #ifndef DPMS_SERVER -#include -#include +#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/extutil.h b/nx-X11/include/extensions/extutil.h index 825d81e93..de6becfd2 100644 --- a/nx-X11/include/extensions/extutil.h +++ b/nx-X11/include/extensions/extutil.h @@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ -#include +#include /* * We need to keep a list of open displays since the Xlib display list isn't diff --git a/nx-X11/include/extensions/fontcache.h b/nx-X11/include/extensions/fontcache.h index b767db19b..2a3cf619b 100644 --- a/nx-X11/include/extensions/fontcache.h +++ b/nx-X11/include/extensions/fontcache.h @@ -68,7 +68,7 @@ typedef struct { #ifndef _FONTCACHE_SERVER_ -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/fontcacheP.h b/nx-X11/include/extensions/fontcacheP.h index 75677f300..5363ef149 100644 --- a/nx-X11/include/extensions/fontcacheP.h +++ b/nx-X11/include/extensions/fontcacheP.h @@ -31,7 +31,7 @@ #ifndef _FONTCACHEP_H_ #define _FONTCACHEP_H_ -#include +#include int FontCacheChangeSettings(FontCacheSettingsPtr /* cinfo */); void FontCacheGetSettings(FontCacheSettingsPtr /* cinfo */); diff --git a/nx-X11/include/extensions/fontcachstr.h b/nx-X11/include/extensions/fontcachstr.h index eab704e23..abead0f2b 100644 --- a/nx-X11/include/extensions/fontcachstr.h +++ b/nx-X11/include/extensions/fontcachstr.h @@ -34,7 +34,7 @@ #ifndef _FONTCACHESTR_H_ #define _FONTCACHESTR_H_ -#include +#include #define FONTCACHENAME "FontCache" diff --git a/nx-X11/include/extensions/lbxbuf.h b/nx-X11/include/extensions/lbxbuf.h index 63983df16..1a5a7475a 100644 --- a/nx-X11/include/extensions/lbxbuf.h +++ b/nx-X11/include/extensions/lbxbuf.h @@ -38,7 +38,7 @@ typedef struct _zlibbuffer *ZlibBufferPtr; -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/lbxbufstr.h b/nx-X11/include/extensions/lbxbufstr.h index e1a06f633..d99730e7e 100644 --- a/nx-X11/include/extensions/lbxbufstr.h +++ b/nx-X11/include/extensions/lbxbufstr.h @@ -27,7 +27,7 @@ #ifndef _BUFFERSTR_H_ #define _BUFFERSTR_H_ -#include +#include /* * ZLIB Input/Output buffer diff --git a/nx-X11/include/extensions/lbximage.h b/nx-X11/include/extensions/lbximage.h index 10627cf29..fff181a69 100644 --- a/nx-X11/include/extensions/lbximage.h +++ b/nx-X11/include/extensions/lbximage.h @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _LBX_IMAGE_H_ #define _LBX_IMAGE_H_ -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/lbxstr.h b/nx-X11/include/extensions/lbxstr.h index a7521b1be..7bde5a766 100644 --- a/nx-X11/include/extensions/lbxstr.h +++ b/nx-X11/include/extensions/lbxstr.h @@ -25,7 +25,7 @@ #ifndef _LBXSTR_H_ #define _LBXSTR_H_ -#include +#include #define LBXNAME "LBX" diff --git a/nx-X11/include/extensions/multibuf.h b/nx-X11/include/extensions/multibuf.h index 96b4c3b14..c35399b01 100644 --- a/nx-X11/include/extensions/multibuf.h +++ b/nx-X11/include/extensions/multibuf.h @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _MULTIBUF_H_ #define _MULTIBUF_H_ -#include +#include #define MULTIBUFFER_PROTOCOL_NAME "Multi-Buffering" diff --git a/nx-X11/include/extensions/recordstr.h b/nx-X11/include/extensions/recordstr.h index 246d34f1a..88ff8b66b 100644 --- a/nx-X11/include/extensions/recordstr.h +++ b/nx-X11/include/extensions/recordstr.h @@ -29,7 +29,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ -#include +#include #define RECORD_NAME "RECORD" #define RECORD_MAJOR_VERSION 1 diff --git a/nx-X11/include/extensions/renderproto.h b/nx-X11/include/extensions/renderproto.h index bdd4c746f..25c510cd1 100644 --- a/nx-X11/include/extensions/renderproto.h +++ b/nx-X11/include/extensions/renderproto.h @@ -26,8 +26,8 @@ #ifndef _XRENDERP_H_ #define _XRENDERP_H_ -#include -#include +#include +#include #define Window CARD32 #define Drawable CARD32 diff --git a/nx-X11/include/extensions/saverproto.h b/nx-X11/include/extensions/saverproto.h index 1a671af91..17f740f4d 100644 --- a/nx-X11/include/extensions/saverproto.h +++ b/nx-X11/include/extensions/saverproto.h @@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium. #ifndef _SAVERPROTO_H_ #define _SAVERPROTO_H_ -#include +#include #define Window CARD32 #define Drawable CARD32 diff --git a/nx-X11/include/extensions/scrnsaver.h b/nx-X11/include/extensions/scrnsaver.h index 2659edd73..38e5e24df 100644 --- a/nx-X11/include/extensions/scrnsaver.h +++ b/nx-X11/include/extensions/scrnsaver.h @@ -31,9 +31,9 @@ in this Software without prior written authorization from the X Consortium. #ifndef _SCRNSAVER_H_ #define _SCRNSAVER_H_ -#include -#include -#include +#include +#include +#include typedef struct { int type; /* of event */ diff --git a/nx-X11/include/extensions/security.h b/nx-X11/include/extensions/security.h index 188ad55bc..a0aabaf8e 100644 --- a/nx-X11/include/extensions/security.h +++ b/nx-X11/include/extensions/security.h @@ -30,7 +30,7 @@ from The Open Group. #define _SECURITY_H #define _XAUTH_STRUCT_ONLY -#include +#include /* constants that server, library, and application all need */ diff --git a/nx-X11/include/extensions/securstr.h b/nx-X11/include/extensions/securstr.h index 50c764441..3e93fe10e 100644 --- a/nx-X11/include/extensions/securstr.h +++ b/nx-X11/include/extensions/securstr.h @@ -29,7 +29,7 @@ from The Open Group. #ifndef _SECURSTR_H #define _SECURSTR_H -#include +#include #define SECURITY_EXTENSION_NAME "SECURITY" #define SECURITY_MAJOR_VERSION 1 diff --git a/nx-X11/include/extensions/shape.h b/nx-X11/include/extensions/shape.h index d173efef8..5e85ffc04 100644 --- a/nx-X11/include/extensions/shape.h +++ b/nx-X11/include/extensions/shape.h @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _SHAPE_H_ #define _SHAPE_H_ -#include +#include #define X_ShapeQueryVersion 0 #define X_ShapeRectangles 1 @@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _SHAPE_SERVER_ -#include +#include typedef struct { int type; /* of event */ diff --git a/nx-X11/include/extensions/sync.h b/nx-X11/include/extensions/sync.h index 9fbe6d72f..8d2861663 100644 --- a/nx-X11/include/extensions/sync.h +++ b/nx-X11/include/extensions/sync.h @@ -53,7 +53,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifndef _SYNC_H_ #define _SYNC_H_ -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/include/extensions/vldXvMC.h b/nx-X11/include/extensions/vldXvMC.h index 91fb3b76a..355c662e6 100644 --- a/nx-X11/include/extensions/vldXvMC.h +++ b/nx-X11/include/extensions/vldXvMC.h @@ -28,9 +28,9 @@ #ifndef _VLDXVMC_H #define _VLDXVMC_H -#include -#include -#include +#include +#include +#include /* * New "Motion compensation type". diff --git a/nx-X11/include/extensions/xf86bigfont.h b/nx-X11/include/extensions/xf86bigfont.h index 654cc401b..d6be21b6f 100644 --- a/nx-X11/include/extensions/xf86bigfont.h +++ b/nx-X11/include/extensions/xf86bigfont.h @@ -11,7 +11,7 @@ #ifndef _XF86BIGFONT_H_ #define _XF86BIGFONT_H_ -#include +#include #define X_XF86BigfontQueryVersion 0 #define X_XF86BigfontQueryFont 1 diff --git a/nx-X11/include/extensions/xf86bigfstr.h b/nx-X11/include/extensions/xf86bigfstr.h index 95f107a2a..6f66e58d9 100644 --- a/nx-X11/include/extensions/xf86bigfstr.h +++ b/nx-X11/include/extensions/xf86bigfstr.h @@ -11,7 +11,7 @@ #ifndef _XF86BIGFSTR_H_ #define _XF86BIGFSTR_H_ -#include +#include #define XF86BIGFONTNAME "XFree86-Bigfont" diff --git a/nx-X11/include/extensions/xf86dga.h b/nx-X11/include/extensions/xf86dga.h index 720118842..d6e494158 100644 --- a/nx-X11/include/extensions/xf86dga.h +++ b/nx-X11/include/extensions/xf86dga.h @@ -6,8 +6,8 @@ #ifndef _XF86DGA_H_ #define _XF86DGA_H_ -#include -#include +#include +#include #define X_XDGAQueryVersion 0 diff --git a/nx-X11/include/extensions/xf86dga1.h b/nx-X11/include/extensions/xf86dga1.h index 4f45e74b3..972b18e9e 100644 --- a/nx-X11/include/extensions/xf86dga1.h +++ b/nx-X11/include/extensions/xf86dga1.h @@ -15,7 +15,7 @@ Copyright (c) 1995 XFree86 Inc #ifndef _XF86DGA1_H_ #define _XF86DGA1_H_ -#include +#include #define X_XF86DGAQueryVersion 0 #define X_XF86DGAGetVideoLL 1 diff --git a/nx-X11/include/extensions/xf86dgastr.h b/nx-X11/include/extensions/xf86dgastr.h index 66dd354c8..30e4ff722 100644 --- a/nx-X11/include/extensions/xf86dgastr.h +++ b/nx-X11/include/extensions/xf86dgastr.h @@ -9,7 +9,7 @@ Copyright (c) 1995 XFree86 Inc. #ifndef _XF86DGASTR_H_ #define _XF86DGASTR_H_ -#include +#include #define XF86DGANAME "XFree86-DGA" diff --git a/nx-X11/include/extensions/xf86misc.h b/nx-X11/include/extensions/xf86misc.h index f5d7a5664..fb01a6357 100644 --- a/nx-X11/include/extensions/xf86misc.h +++ b/nx-X11/include/extensions/xf86misc.h @@ -9,7 +9,7 @@ #ifndef _XF86MISC_H_ #define _XF86MISC_H_ -#include +#include #define X_XF86MiscQueryVersion 0 #ifdef _XF86MISC_SAVER_COMPAT_ diff --git a/nx-X11/include/extensions/xf86mscstr.h b/nx-X11/include/extensions/xf86mscstr.h index 637d3a5a0..2b8c0d07e 100644 --- a/nx-X11/include/extensions/xf86mscstr.h +++ b/nx-X11/include/extensions/xf86mscstr.h @@ -9,7 +9,7 @@ #ifndef _XF86MISCSTR_H_ #define _XF86MISCSTR_H_ -#include +#include #define XF86MISCNAME "XFree86-Misc" diff --git a/nx-X11/include/extensions/xf86vmode.h b/nx-X11/include/extensions/xf86vmode.h index 3420ae4c8..624820dea 100644 --- a/nx-X11/include/extensions/xf86vmode.h +++ b/nx-X11/include/extensions/xf86vmode.h @@ -35,8 +35,8 @@ from Kaleb S. KEITHLEY #ifndef _XF86VIDMODE_H_ #define _XF86VIDMODE_H_ -#include -#include +#include +#include #define X_XF86VidModeQueryVersion 0 #define X_XF86VidModeGetModeLine 1 diff --git a/nx-X11/include/extensions/xf86vmstr.h b/nx-X11/include/extensions/xf86vmstr.h index a80eb8eb6..43c67980f 100644 --- a/nx-X11/include/extensions/xf86vmstr.h +++ b/nx-X11/include/extensions/xf86vmstr.h @@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY #ifndef _XF86VIDMODESTR_H_ #define _XF86VIDMODESTR_H_ -#include +#include #define XF86VIDMODENAME "XFree86-VidModeExtension" diff --git a/nx-X11/include/extensions/xfixesproto.h b/nx-X11/include/extensions/xfixesproto.h index 773bc65d1..0ef6a2fd6 100644 --- a/nx-X11/include/extensions/xfixesproto.h +++ b/nx-X11/include/extensions/xfixesproto.h @@ -25,10 +25,10 @@ #ifndef _XFIXESPROTO_H_ #define _XFIXESPROTO_H_ -#include -#include +#include +#include #define _SHAPE_SERVER_ -#include +#include #undef _SHAPE_SERVER_ #define Window CARD32 diff --git a/nx-X11/include/extensions/xtrapddmi.h b/nx-X11/include/extensions/xtrapddmi.h index c187a3a0b..71df0712d 100644 --- a/nx-X11/include/extensions/xtrapddmi.h +++ b/nx-X11/include/extensions/xtrapddmi.h @@ -42,8 +42,8 @@ SOFTWARE. * contained herein should *not* be visible to clients (xtrapdi.h * is used for this). The name is historical. */ -#include -#include +#include +#include #include "dix.h" #ifndef MIN diff --git a/nx-X11/include/extensions/xtrapdi.h b/nx-X11/include/extensions/xtrapdi.h index 9db13bb20..34696113d 100644 --- a/nx-X11/include/extensions/xtrapdi.h +++ b/nx-X11/include/extensions/xtrapdi.h @@ -48,14 +48,14 @@ SOFTWARE. #ifndef IN_MODULE #include #endif -#include -#include +#include +#include #ifdef SMT #define NEED_EVENTS #define NEED_REPLIES #endif -#include -#include +#include +#include #define XTrapExtName "DEC-XTRAP" /* Current Release, Version, and Revision of the XTrap Extension */ #define XETrapRelease 3L diff --git a/nx-X11/include/extensions/xtrapemacros.h b/nx-X11/include/extensions/xtrapemacros.h index f59ea3391..f5dc2be31 100644 --- a/nx-X11/include/extensions/xtrapemacros.h +++ b/nx-X11/include/extensions/xtrapemacros.h @@ -43,7 +43,7 @@ SOFTWARE. * specified; however, use of Trap Context convenience * routines is strongly encouraged (XETrapContext.c) */ -#include +#include #include /* msleep macro to replace msleep() for portability reasons */ diff --git a/nx-X11/include/extensions/xtraplib.h b/nx-X11/include/extensions/xtraplib.h index f3f273aab..b733dac7f 100644 --- a/nx-X11/include/extensions/xtraplib.h +++ b/nx-X11/include/extensions/xtraplib.h @@ -47,10 +47,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES #endif -#include -#include -#include -#include +#include +#include +#include +#include typedef struct /* Callback structure */ { diff --git a/nx-X11/include/keysym.h b/nx-X11/include/keysym.h index 785fed32e..cd518a792 100644 --- a/nx-X11/include/keysym.h +++ b/nx-X11/include/keysym.h @@ -71,5 +71,5 @@ SOFTWARE. #define XK_CURRENCY #define XK_MATHEMATICAL -#include +#include diff --git a/nx-X11/lib/X11/ClDisplay.c b/nx-X11/lib/X11/ClDisplay.c index b7a58751e..dfbc2f518 100644 --- a/nx-X11/lib/X11/ClDisplay.c +++ b/nx-X11/lib/X11/ClDisplay.c @@ -32,7 +32,7 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include "Xlib.h" #include "Xlibint.h" #include "Xintconn.h" diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c index 30146a9f1..177ff2c59 100644 --- a/nx-X11/lib/X11/ConnDis.c +++ b/nx-X11/lib/X11/ConnDis.c @@ -54,9 +54,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include +#include +#include +#include #include #include #include @@ -68,7 +68,7 @@ in this Software without prior written authorization from The Open Group. #include #endif #else -#include +#include #endif #ifndef X_CONNECTION_RETRIES /* number retries on ECONNREFUSED */ diff --git a/nx-X11/lib/X11/ErrDes.c b/nx-X11/lib/X11/ErrDes.c index 16183e85e..64373ffd0 100644 --- a/nx-X11/lib/X11/ErrDes.c +++ b/nx-X11/lib/X11/ErrDes.c @@ -55,7 +55,7 @@ SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include "Xresource.h" #include diff --git a/nx-X11/lib/X11/FSWrap.c b/nx-X11/lib/X11/FSWrap.c index d40f3b035..77dd3b59c 100644 --- a/nx-X11/lib/X11/FSWrap.c +++ b/nx-X11/lib/X11/FSWrap.c @@ -64,7 +64,7 @@ from The Open Group. #include "Xlibint.h" #include "Xlcint.h" #include -#include +#include #define XMAXLIST 256 diff --git a/nx-X11/lib/X11/FetchName.c b/nx-X11/lib/X11/FetchName.c index 3d41472f3..216c7453d 100644 --- a/nx-X11/lib/X11/FetchName.c +++ b/nx-X11/lib/X11/FetchName.c @@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include +#include +#include +#include #include diff --git a/nx-X11/lib/X11/Font.c b/nx-X11/lib/X11/Font.c index 92a6a8f4a..8c8d1e443 100644 --- a/nx-X11/lib/X11/Font.c +++ b/nx-X11/lib/X11/Font.c @@ -47,7 +47,7 @@ authorization from the X Consortium and the XFree86 Project. #include #include -#include +#include #endif #include "Xlcint.h" diff --git a/nx-X11/lib/X11/GetDflt.c b/nx-X11/lib/X11/GetDflt.c index 8a8563379..a881f1c28 100644 --- a/nx-X11/lib/X11/GetDflt.c +++ b/nx-X11/lib/X11/GetDflt.c @@ -52,8 +52,8 @@ SOFTWARE. #include #endif #include "Xlibint.h" -#include -#include +#include +#include #ifndef X_NOT_POSIX #ifdef _POSIX_SOURCE @@ -80,12 +80,12 @@ SOFTWARE. #endif #ifdef XTHREADS -#include +#include #endif #ifndef WIN32 #define X_INCLUDE_PWD_H #define XOS_USE_XLIB_LOCKING -#include +#include #endif #include #include diff --git a/nx-X11/lib/X11/GetHints.c b/nx-X11/lib/X11/GetHints.c index 4faccb624..2c4d49d61 100644 --- a/nx-X11/lib/X11/GetHints.c +++ b/nx-X11/lib/X11/GetHints.c @@ -51,11 +51,11 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include +#include +#include +#include #include "Xatomtype.h" -#include +#include #include Status XGetSizeHints (dpy, w, hints, property) diff --git a/nx-X11/lib/X11/GetImage.c b/nx-X11/lib/X11/GetImage.c index ffe9d226f..634910d79 100644 --- a/nx-X11/lib/X11/GetImage.c +++ b/nx-X11/lib/X11/GetImage.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. #include #endif #include "Xlibint.h" -#include /* for XDestroyImage */ +#include /* for XDestroyImage */ #include "ImUtil.h" #define ROUNDUP(nbytes, pad) (((((nbytes) - 1) + (pad)) / (pad)) * (pad)) diff --git a/nx-X11/lib/X11/GetNrmHint.c b/nx-X11/lib/X11/GetNrmHint.c index 9dcb7c403..c770df43d 100644 --- a/nx-X11/lib/X11/GetNrmHint.c +++ b/nx-X11/lib/X11/GetNrmHint.c @@ -55,10 +55,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xatomtype.h" -#include +#include #include Status XGetWMSizeHints (dpy, w, hints, supplied, property) diff --git a/nx-X11/lib/X11/GetRGBCMap.c b/nx-X11/lib/X11/GetRGBCMap.c index 6657c539a..4df3ccced 100644 --- a/nx-X11/lib/X11/GetRGBCMap.c +++ b/nx-X11/lib/X11/GetRGBCMap.c @@ -31,10 +31,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xatomtype.h" -#include +#include Status XGetRGBColormaps (dpy, w, stdcmap, count, property) Display *dpy; diff --git a/nx-X11/lib/X11/GetStCmap.c b/nx-X11/lib/X11/GetStCmap.c index 5c8c37e78..ae085aa87 100644 --- a/nx-X11/lib/X11/GetStCmap.c +++ b/nx-X11/lib/X11/GetStCmap.c @@ -50,10 +50,10 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xatomtype.h" -#include +#include /* * WARNING diff --git a/nx-X11/lib/X11/GetTxtProp.c b/nx-X11/lib/X11/GetTxtProp.c index 0d4474253..dbff8abc8 100644 --- a/nx-X11/lib/X11/GetTxtProp.c +++ b/nx-X11/lib/X11/GetTxtProp.c @@ -52,10 +52,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include Status XGetTextProperty (display, window, tp, property) diff --git a/nx-X11/lib/X11/GetWMCMapW.c b/nx-X11/lib/X11/GetWMCMapW.c index 6d5c73c85..496efd208 100644 --- a/nx-X11/lib/X11/GetWMCMapW.c +++ b/nx-X11/lib/X11/GetWMCMapW.c @@ -51,7 +51,7 @@ SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include Status XGetWMColormapWindows (dpy, w, colormapWindows, countReturn) diff --git a/nx-X11/lib/X11/GetWMProto.c b/nx-X11/lib/X11/GetWMProto.c index 9b244ce6a..8584a4214 100644 --- a/nx-X11/lib/X11/GetWMProto.c +++ b/nx-X11/lib/X11/GetWMProto.c @@ -51,7 +51,7 @@ SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include Status XGetWMProtocols (dpy, w, protocols, countReturn) diff --git a/nx-X11/lib/X11/HVC.c b/nx-X11/lib/X11/HVC.c index 79241fb7a..84fac58b9 100644 --- a/nx-X11/lib/X11/HVC.c +++ b/nx-X11/lib/X11/HVC.c @@ -55,7 +55,7 @@ #endif #include "Xlibint.h" #include "Xcmsint.h" -#include +#include #include #include "Cv.h" diff --git a/nx-X11/lib/X11/Iconify.c b/nx-X11/lib/X11/Iconify.c index 62e57b84e..e68508666 100644 --- a/nx-X11/lib/X11/Iconify.c +++ b/nx-X11/lib/X11/Iconify.c @@ -54,10 +54,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include /* diff --git a/nx-X11/lib/X11/ImUtil.c b/nx-X11/lib/X11/ImUtil.c index 85f4183f4..2be839928 100644 --- a/nx-X11/lib/X11/ImUtil.c +++ b/nx-X11/lib/X11/ImUtil.c @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include #include "ImUtil.h" diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 212216f46..81a1cfd3d 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -85,7 +85,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status #define LibName NX_X11 #define SoRev SOXLIBREV #define HugeLibrary YES -#define IncSubdir X11 +#define IncSubdir nx-X11 #if BuildLoadableXlibI18n SUBDIRS = xlibi18n diff --git a/nx-X11/lib/X11/InitExt.c b/nx-X11/lib/X11/InitExt.c index 67c865787..5aab682c7 100644 --- a/nx-X11/lib/X11/InitExt.c +++ b/nx-X11/lib/X11/InitExt.c @@ -31,8 +31,8 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include /* diff --git a/nx-X11/lib/X11/KeyBind.c b/nx-X11/lib/X11/KeyBind.c index fab9eeacd..d99cfdf2f 100644 --- a/nx-X11/lib/X11/KeyBind.c +++ b/nx-X11/lib/X11/KeyBind.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #define XK_MISCELLANY #define XK_LATIN1 #define XK_LATIN2 @@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. #define XK_CAUCASUS #define XK_VIETNAMESE #define XK_XKB_KEYS -#include +#include #include #ifdef USE_OWN_COMPOSE diff --git a/nx-X11/lib/X11/KeysymStr.c b/nx-X11/lib/X11/KeysymStr.c index 59aa3f32c..b43e2735a 100644 --- a/nx-X11/lib/X11/KeysymStr.c +++ b/nx-X11/lib/X11/KeysymStr.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. #include #endif #include "Xlibint.h" -#include -#include +#include +#include #include /* sprintf */ diff --git a/nx-X11/lib/X11/LRGB.c b/nx-X11/lib/X11/LRGB.c index e4bc0b500..392c59579 100644 --- a/nx-X11/lib/X11/LRGB.c +++ b/nx-X11/lib/X11/LRGB.c @@ -41,8 +41,8 @@ #include #endif #include -#include -#include +#include +#include #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/Lab.c b/nx-X11/lib/X11/Lab.c index 596c137f8..19b3e3a1d 100644 --- a/nx-X11/lib/X11/Lab.c +++ b/nx-X11/lib/X11/Lab.c @@ -42,7 +42,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include /* sscanf */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/nx-X11/lib/X11/Luv.c b/nx-X11/lib/X11/Luv.c index ec94c9e56..206ae1017 100644 --- a/nx-X11/lib/X11/Luv.c +++ b/nx-X11/lib/X11/Luv.c @@ -43,7 +43,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/OpenDis.c b/nx-X11/lib/X11/OpenDis.c index e9d019723..67f7ccbd1 100644 --- a/nx-X11/lib/X11/OpenDis.c +++ b/nx-X11/lib/X11/OpenDis.c @@ -50,10 +50,10 @@ in this Software without prior written authorization from The Open Group. #include #endif #include "Xlibint.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include "Xintconn.h" diff --git a/nx-X11/lib/X11/ParseCmd.c b/nx-X11/lib/X11/ParseCmd.c index ddcbf7846..fe20f6eff 100644 --- a/nx-X11/lib/X11/ParseCmd.c +++ b/nx-X11/lib/X11/ParseCmd.c @@ -61,7 +61,7 @@ SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include diff --git a/nx-X11/lib/X11/PolyReg.c b/nx-X11/lib/X11/PolyReg.c index 4b17ec5c5..6e1f7ead8 100644 --- a/nx-X11/lib/X11/PolyReg.c +++ b/nx-X11/lib/X11/PolyReg.c @@ -55,7 +55,7 @@ SOFTWARE. #endif #include "Xlibint.h" #include "Xutil.h" -#include +#include #include "poly.h" /* diff --git a/nx-X11/lib/X11/Quarks.c b/nx-X11/lib/X11/Quarks.c index d47bce314..a49562aac 100644 --- a/nx-X11/lib/X11/Quarks.c +++ b/nx-X11/lib/X11/Quarks.c @@ -55,7 +55,7 @@ from The Open Group. #include #endif #include "Xlibint.h" -#include +#include #include "Xresinternal.h" /* Not cost effective, at least for vanilla MIT clients */ diff --git a/nx-X11/lib/X11/RdBitF.c b/nx-X11/lib/X11/RdBitF.c index 198e0e4a5..97afcc493 100644 --- a/nx-X11/lib/X11/RdBitF.c +++ b/nx-X11/lib/X11/RdBitF.c @@ -47,7 +47,7 @@ from The Open Group. #include #endif #include "Xlibint.h" -#include +#include #include "Xutil.h" #include #include diff --git a/nx-X11/lib/X11/Region.c b/nx-X11/lib/X11/Region.c index cdd223b25..bef46def0 100644 --- a/nx-X11/lib/X11/Region.c +++ b/nx-X11/lib/X11/Region.c @@ -77,7 +77,7 @@ SOFTWARE. #endif #include "Xlibint.h" #include "Xutil.h" -#include +#include #include "poly.h" #ifdef DEBUG diff --git a/nx-X11/lib/X11/ScrResStr.c b/nx-X11/lib/X11/ScrResStr.c index 89f771784..7feb3b388 100644 --- a/nx-X11/lib/X11/ScrResStr.c +++ b/nx-X11/lib/X11/ScrResStr.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #include #endif #include "Xlibint.h" -#include +#include char *XScreenResourceString(screen) Screen *screen; diff --git a/nx-X11/lib/X11/SetHints.c b/nx-X11/lib/X11/SetHints.c index 5ee34435d..27b1bedbc 100644 --- a/nx-X11/lib/X11/SetHints.c +++ b/nx-X11/lib/X11/SetHints.c @@ -51,11 +51,11 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xatomtype.h" -#include -#include +#include +#include #define safestrlen(s) ((s) ? strlen(s) : 0) diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c index bb4f850e3..875718dca 100644 --- a/nx-X11/lib/X11/SetLocale.c +++ b/nx-X11/lib/X11/SetLocale.c @@ -63,8 +63,8 @@ from The Open Group. #endif #include "Xlibint.h" #include "Xlcint.h" -#include -#include +#include +#include #include "XlcPubI.h" #define MAXLOCALE 64 /* buffer size of locale name */ diff --git a/nx-X11/lib/X11/SetNrmHint.c b/nx-X11/lib/X11/SetNrmHint.c index 64b0ef7f3..e8e6daf31 100644 --- a/nx-X11/lib/X11/SetNrmHint.c +++ b/nx-X11/lib/X11/SetNrmHint.c @@ -54,11 +54,11 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xatomtype.h" -#include -#include +#include +#include void XSetWMSizeHints (dpy, w, hints, prop) Display *dpy; diff --git a/nx-X11/lib/X11/SetRGBCMap.c b/nx-X11/lib/X11/SetRGBCMap.c index 4be840b75..03aa9392c 100644 --- a/nx-X11/lib/X11/SetRGBCMap.c +++ b/nx-X11/lib/X11/SetRGBCMap.c @@ -31,10 +31,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xatomtype.h" -#include +#include void XSetRGBColormaps (dpy, w, cmaps, count, property) Display *dpy; diff --git a/nx-X11/lib/X11/SetStCmap.c b/nx-X11/lib/X11/SetStCmap.c index b5a93e36e..521b9480d 100644 --- a/nx-X11/lib/X11/SetStCmap.c +++ b/nx-X11/lib/X11/SetStCmap.c @@ -50,10 +50,10 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xatomtype.h" -#include +#include /* * WARNING diff --git a/nx-X11/lib/X11/SetTxtProp.c b/nx-X11/lib/X11/SetTxtProp.c index a82d9b3e3..ae8b81e29 100644 --- a/nx-X11/lib/X11/SetTxtProp.c +++ b/nx-X11/lib/X11/SetTxtProp.c @@ -52,10 +52,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include void XSetTextProperty (dpy, w, tp, property) diff --git a/nx-X11/lib/X11/SetWMCMapW.c b/nx-X11/lib/X11/SetWMCMapW.c index dd88061da..6774d7326 100644 --- a/nx-X11/lib/X11/SetWMCMapW.c +++ b/nx-X11/lib/X11/SetWMCMapW.c @@ -51,7 +51,7 @@ SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include /* * XSetWMProtocols sets the property diff --git a/nx-X11/lib/X11/SetWMProto.c b/nx-X11/lib/X11/SetWMProto.c index 8640e5060..bc7dcf63c 100644 --- a/nx-X11/lib/X11/SetWMProto.c +++ b/nx-X11/lib/X11/SetWMProto.c @@ -51,7 +51,7 @@ SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include /* * XSetWMProtocols sets the property diff --git a/nx-X11/lib/X11/StBytes.c b/nx-X11/lib/X11/StBytes.c index b23902581..676652678 100644 --- a/nx-X11/lib/X11/StBytes.c +++ b/nx-X11/lib/X11/StBytes.c @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include /* insulate predefined atom numbers from cut routines */ static Atom n_to_atom[8] = { diff --git a/nx-X11/lib/X11/StName.c b/nx-X11/lib/X11/StName.c index ba01ffb0c..d3053346c 100644 --- a/nx-X11/lib/X11/StName.c +++ b/nx-X11/lib/X11/StName.c @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include int XStoreName ( diff --git a/nx-X11/lib/X11/StrKeysym.c b/nx-X11/lib/X11/StrKeysym.c index 74ccecbcd..fc1e7a34d 100644 --- a/nx-X11/lib/X11/StrKeysym.c +++ b/nx-X11/lib/X11/StrKeysym.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #include #endif #include "Xlibint.h" -#include -#include +#include +#include #include "Xresinternal.h" #define NEEDKTABLE diff --git a/nx-X11/lib/X11/StrToText.c b/nx-X11/lib/X11/StrToText.c index ba894e16f..5fd9c6ec6 100644 --- a/nx-X11/lib/X11/StrToText.c +++ b/nx-X11/lib/X11/StrToText.c @@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include +#include +#include +#include /* * XStringListToTextProperty - fill in TextProperty structure with diff --git a/nx-X11/lib/X11/TextToStr.c b/nx-X11/lib/X11/TextToStr.c index 0bea8096d..f4c00adcf 100644 --- a/nx-X11/lib/X11/TextToStr.c +++ b/nx-X11/lib/X11/TextToStr.c @@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include +#include +#include +#include /* diff --git a/nx-X11/lib/X11/WMProps.c b/nx-X11/lib/X11/WMProps.c index 62c6a8d12..7a390a9d7 100644 --- a/nx-X11/lib/X11/WMProps.c +++ b/nx-X11/lib/X11/WMProps.c @@ -55,11 +55,11 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* diff --git a/nx-X11/lib/X11/Withdraw.c b/nx-X11/lib/X11/Withdraw.c index 1b771c286..2037b8e46 100644 --- a/nx-X11/lib/X11/Withdraw.c +++ b/nx-X11/lib/X11/Withdraw.c @@ -54,10 +54,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include /* diff --git a/nx-X11/lib/X11/WrBitF.c b/nx-X11/lib/X11/WrBitF.c index d8c9f18fa..d48295f0b 100644 --- a/nx-X11/lib/X11/WrBitF.c +++ b/nx-X11/lib/X11/WrBitF.c @@ -32,7 +32,7 @@ from The Open Group. #include #endif #include "Xlibint.h" -#include +#include #include "Xutil.h" #include diff --git a/nx-X11/lib/X11/XDefaultOMIF.c b/nx-X11/lib/X11/XDefaultOMIF.c index 13f0d9cff..b4e63091b 100644 --- a/nx-X11/lib/X11/XDefaultOMIF.c +++ b/nx-X11/lib/X11/XDefaultOMIF.c @@ -49,8 +49,8 @@ Sun Microsystems, Inc. or its licensors is granted. #include "Xlibint.h" #include "Xlcint.h" #include "XlcPublic.h" -#include -#include +#include +#include #include #define MAXFONTS 100 diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/X11/XKB.c index ecc5ddf0a..413a51eb6 100644 --- a/nx-X11/lib/X11/XKB.c +++ b/nx-X11/lib/X11/XKB.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include +#include #include "XKBlibint.h" XkbInternAtomFunc _XkbInternAtomFunc= XInternAtom; diff --git a/nx-X11/lib/X11/XKBAlloc.c b/nx-X11/lib/X11/XKBAlloc.c index 9430ac0ed..131985444 100644 --- a/nx-X11/lib/X11/XKBAlloc.c +++ b/nx-X11/lib/X11/XKBAlloc.c @@ -39,21 +39,21 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #include "Xlibint.h" #include "XKBlibint.h" -#include -#include +#include +#include #include "XKBlibint.h" #else #include -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "misc.h" #include "inputstr.h" -#include -#include +#include +#include #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBBell.c b/nx-X11/lib/X11/XKBBell.c index 6ea30855e..51869097e 100644 --- a/nx-X11/lib/X11/XKBBell.c +++ b/nx-X11/lib/X11/XKBBell.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include +#include #include "XKBlibint.h" diff --git a/nx-X11/lib/X11/XKBBind.c b/nx-X11/lib/X11/XKBBind.c index e190d0052..6c1864d41 100644 --- a/nx-X11/lib/X11/XKBBind.c +++ b/nx-X11/lib/X11/XKBBind.c @@ -35,13 +35,13 @@ from The Open Group. #include #endif #include "XKBlib.h" -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include "XKBlibint.h" #ifdef USE_OWN_COMPOSE diff --git a/nx-X11/lib/X11/XKBCompat.c b/nx-X11/lib/X11/XKBCompat.c index 5886e4d26..b16e6b083 100644 --- a/nx-X11/lib/X11/XKBCompat.c +++ b/nx-X11/lib/X11/XKBCompat.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_MAP_READERS #include "Xlibint.h" -#include +#include #include "XKBlibint.h" Status diff --git a/nx-X11/lib/X11/XKBCtrls.c b/nx-X11/lib/X11/XKBCtrls.c index 0ea131aa0..f3a09a124 100644 --- a/nx-X11/lib/X11/XKBCtrls.c +++ b/nx-X11/lib/X11/XKBCtrls.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include +#include #include "XKBlibint.h" diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c index 1bdf81cd4..2d58ca990 100644 --- a/nx-X11/lib/X11/XKBCvt.c +++ b/nx-X11/lib/X11/XKBCvt.c @@ -35,23 +35,23 @@ from The Open Group. #include #include -#include -#include +#include +#include #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" #include "XlcPubI.h" #include "Ximint.h" -#include -#include +#include +#include #define XK_LATIN1 #define XK_PUBLISHING -#include -#include +#include +#include #include "XKBlibint.h" -#include +#include #include -#include +#include #ifdef __sgi_not_xconsortium #define XKB_EXTEND_LOOKUP_STRING diff --git a/nx-X11/lib/X11/XKBExtDev.c b/nx-X11/lib/X11/XKBExtDev.c index 34558e476..0510b7f55 100644 --- a/nx-X11/lib/X11/XKBExtDev.c +++ b/nx-X11/lib/X11/XKBExtDev.c @@ -34,9 +34,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_MAP_READERS #include "Xlibint.h" -#include +#include #include "XKBlibint.h" -#include +#include /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBGAlloc.c b/nx-X11/lib/X11/XKBGAlloc.c index fddb770b6..eb74cbfd0 100644 --- a/nx-X11/lib/X11/XKBGAlloc.c +++ b/nx-X11/lib/X11/XKBGAlloc.c @@ -40,18 +40,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "Xlibint.h" #include "XKBlibint.h" -#include -#include +#include +#include #else #include -#include -#include +#include +#include #include "misc.h" #include "inputstr.h" -#include -#include +#include +#include #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBGeom.c b/nx-X11/lib/X11/XKBGeom.c index 061175489..d225342a7 100644 --- a/nx-X11/lib/X11/XKBGeom.c +++ b/nx-X11/lib/X11/XKBGeom.c @@ -37,8 +37,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_MAP_READERS #include "Xlibint.h" -#include -#include +#include +#include #include "XKBlibint.h" #ifndef MINSHORT diff --git a/nx-X11/lib/X11/XKBGetByName.c b/nx-X11/lib/X11/XKBGetByName.c index 2c6ff0849..87f405e50 100644 --- a/nx-X11/lib/X11/XKBGetByName.c +++ b/nx-X11/lib/X11/XKBGetByName.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include "XKBlibint.h" /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBGetMap.c b/nx-X11/lib/X11/XKBGetMap.c index 2b9fb97f4..5f37f9571 100644 --- a/nx-X11/lib/X11/XKBGetMap.c +++ b/nx-X11/lib/X11/XKBGetMap.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include "XKBlibint.h" static Status diff --git a/nx-X11/lib/X11/XKBList.c b/nx-X11/lib/X11/XKBList.c index 2f4a53490..ef265fdde 100644 --- a/nx-X11/lib/X11/XKBList.c +++ b/nx-X11/lib/X11/XKBList.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include "XKBlibint.h" /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBMAlloc.c b/nx-X11/lib/X11/XKBMAlloc.c index d57d9a58d..31255091f 100644 --- a/nx-X11/lib/X11/XKBMAlloc.c +++ b/nx-X11/lib/X11/XKBMAlloc.c @@ -38,22 +38,22 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include -#include +#include +#include #include "XKBlibint.h" #else #include -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "misc.h" #include "inputstr.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS -#include +#include #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBMisc.c b/nx-X11/lib/X11/XKBMisc.c index 09f361c19..04ac0c7ea 100644 --- a/nx-X11/lib/X11/XKBMisc.c +++ b/nx-X11/lib/X11/XKBMisc.c @@ -38,22 +38,22 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include -#include +#include +#include #include "XKBlibint.h" #else #include -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "misc.h" #include "inputstr.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS -#include +#include #endif /* XKB_IN_SERVER */ diff --git a/nx-X11/lib/X11/XKBNames.c b/nx-X11/lib/X11/XKBNames.c index 8483187c3..0bcd42b3d 100644 --- a/nx-X11/lib/X11/XKBNames.c +++ b/nx-X11/lib/X11/XKBNames.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include "XKBlibint.h" diff --git a/nx-X11/lib/X11/XKBRdBuf.c b/nx-X11/lib/X11/XKBRdBuf.c index d0b7045d6..109618dd2 100644 --- a/nx-X11/lib/X11/XKBRdBuf.c +++ b/nx-X11/lib/X11/XKBRdBuf.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #include "Xlibint.h" #include "XKBlibint.h" -#include +#include /***====================================================================***/ diff --git a/nx-X11/lib/X11/XKBSetGeom.c b/nx-X11/lib/X11/XKBSetGeom.c index e27297c11..f13be8097 100644 --- a/nx-X11/lib/X11/XKBSetGeom.c +++ b/nx-X11/lib/X11/XKBSetGeom.c @@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #include "Xlibint.h" #include "XKBlibint.h" -#include -#include +#include +#include #ifndef MINSHORT #define MINSHORT -32768 diff --git a/nx-X11/lib/X11/XKBSetMap.c b/nx-X11/lib/X11/XKBSetMap.c index 4a3b15c70..784a241c2 100644 --- a/nx-X11/lib/X11/XKBSetMap.c +++ b/nx-X11/lib/X11/XKBSetMap.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include +#include #include "XKBlibint.h" static int diff --git a/nx-X11/lib/X11/XKBUse.c b/nx-X11/lib/X11/XKBUse.c index ad18bb6fc..95fba49ac 100644 --- a/nx-X11/lib/X11/XKBUse.c +++ b/nx-X11/lib/X11/XKBUse.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include "Xlibint.h" -#include +#include #include "XKBlibint.h" static Bool _XkbIgnoreExtension = False; diff --git a/nx-X11/lib/X11/XKBleds.c b/nx-X11/lib/X11/XKBleds.c index 89ab2e9ec..d026d84be 100644 --- a/nx-X11/lib/X11/XKBleds.c +++ b/nx-X11/lib/X11/XKBleds.c @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include "XKBlibint.h" Status diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h index 6a5dc8a7c..a1ad7ccea 100644 --- a/nx-X11/lib/X11/XKBlib.h +++ b/nx-X11/lib/X11/XKBlib.h @@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XKBLIB_H_ #define _XKBLIB_H_ -#include -#include +#include +#include typedef struct _XkbAnyEvent { int type; /* XkbAnyEvent */ diff --git a/nx-X11/lib/X11/XKBlibint.h b/nx-X11/lib/X11/XKBlibint.h index 0244e2ef3..9c6352769 100644 --- a/nx-X11/lib/X11/XKBlibint.h +++ b/nx-X11/lib/X11/XKBlibint.h @@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef _XKBLIBINT_H_ #define _XKBLIBINT_H_ -#include -#include +#include +#include #define XkbMapPending (1<<0) #define XkbXlibNewKeyboard (1<<1) diff --git a/nx-X11/lib/X11/XYZ.c b/nx-X11/lib/X11/XYZ.c index f5f17f356..5408c4fbc 100644 --- a/nx-X11/lib/X11/XYZ.c +++ b/nx-X11/lib/X11/XYZ.c @@ -38,7 +38,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/X11/Xcms.h index 779bc52ff..8ce81556d 100644 --- a/nx-X11/lib/X11/Xcms.h +++ b/nx-X11/lib/X11/Xcms.h @@ -31,7 +31,7 @@ #ifndef _XCMS_H_ #define _XCMS_H_ -#include +#include /* * XCMS Status Values diff --git a/nx-X11/lib/X11/Xcmsint.h b/nx-X11/lib/X11/Xcmsint.h index 1bf02ba2f..6bb44bbcf 100644 --- a/nx-X11/lib/X11/Xcmsint.h +++ b/nx-X11/lib/X11/Xcmsint.h @@ -34,7 +34,7 @@ #ifndef _XCMSINT_H_ #define _XCMSINT_H_ -#include +#include /* * DEFINES diff --git a/nx-X11/lib/X11/XimThai.h b/nx-X11/lib/X11/XimThai.h index 5b2666ebf..8d08eca6b 100644 --- a/nx-X11/lib/X11/XimThai.h +++ b/nx-X11/lib/X11/XimThai.h @@ -64,7 +64,7 @@ SOFTWARE. #ifndef _XIMTHAI_H_ #define _XIMTHAI_H_ -#include +#include /* Classification of characters in TIS620 according to WTT */ diff --git a/nx-X11/lib/X11/Ximint.h b/nx-X11/lib/X11/Ximint.h index e9bdda247..afd821c68 100644 --- a/nx-X11/lib/X11/Ximint.h +++ b/nx-X11/lib/X11/Ximint.h @@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE. #define _XIMINT_H #include -#include +#include #define Public /**/ #define Private static diff --git a/nx-X11/lib/X11/Xintatom.h b/nx-X11/lib/X11/Xintatom.h index f1e13568b..756d3445b 100644 --- a/nx-X11/lib/X11/Xintatom.h +++ b/nx-X11/lib/X11/Xintatom.h @@ -3,7 +3,7 @@ #ifndef _XINTATOM_H_ #define _XINTATOM_H_ 1 -#include +#include /* IntAtom.c */ diff --git a/nx-X11/lib/X11/Xintconn.h b/nx-X11/lib/X11/Xintconn.h index edea98302..ea272833a 100644 --- a/nx-X11/lib/X11/Xintconn.h +++ b/nx-X11/lib/X11/Xintconn.h @@ -3,7 +3,7 @@ #ifndef _XINTCONN_H_ #define _XINTCONN_H_ 1 -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/lib/X11/Xlcint.h b/nx-X11/lib/X11/Xlcint.h index fcc3a65f2..5a52cd36c 100644 --- a/nx-X11/lib/X11/Xlcint.h +++ b/nx-X11/lib/X11/Xlcint.h @@ -74,8 +74,8 @@ from The Open Group. #ifndef _XP_PRINT_SERVER_ -#include -#include +#include +#include #include typedef Bool (*XFilterEventProc)( diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h index 8ce7fb577..d4cecc7b5 100644 --- a/nx-X11/lib/X11/Xlib.h +++ b/nx-X11/lib/X11/Xlib.h @@ -57,11 +57,11 @@ in this Software without prior written authorization from The Open Group. #include #endif -#include +#include /* applications should not depend on these two headers being included! */ -#include -#include +#include +#include #ifndef X_WCHAR #ifdef X_NOT_STDC_ENV diff --git a/nx-X11/lib/X11/XlibAsync.c b/nx-X11/lib/X11/XlibAsync.c index 81403ebc9..832371782 100644 --- a/nx-X11/lib/X11/XlibAsync.c +++ b/nx-X11/lib/X11/XlibAsync.c @@ -48,8 +48,8 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include /*ARGSUSED*/ Bool diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index 0514470dd..0aa890bbb 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -60,9 +60,9 @@ from The Open Group. #include #endif #include "Xlibint.h" -#include -#include -#include +#include +#include +#include #include #ifdef WIN32 #include diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index bcd42b52b..854b64b22 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -58,9 +58,9 @@ from The Open Group. * Warning, there be dragons here.... */ -#include -#include /* to declare xEvent */ -#include /* for configured options like XTHREADS */ +#include +#include /* to declare xEvent */ +#include /* for configured options like XTHREADS */ #ifdef NX_TRANS_SOCKET @@ -233,14 +233,14 @@ typedef struct _XSQEvent #define NEED_EVENTS #define NEED_REPLIES -#include +#include #ifdef __sgi #define _SGI_MP_SOURCE /* turn this on to get MP safe errno */ #endif #include #define _XBCOPYFUNC _Xbcopy -#include -#include +#include +#include /* Utek leaves kernel macros around in include files (bleah) */ #ifdef dirty @@ -250,7 +250,7 @@ typedef struct _XSQEvent #include #include -#include +#include _XFUNCPROTOBEGIN diff --git a/nx-X11/lib/X11/Xlocale.h b/nx-X11/lib/X11/Xlocale.h index 61d2f7a84..4370d969e 100644 --- a/nx-X11/lib/X11/Xlocale.h +++ b/nx-X11/lib/X11/Xlocale.h @@ -31,8 +31,8 @@ from The Open Group. #ifndef _XLOCALE_H_ #define _XLOCALE_H_ -#include -#include +#include +#include #ifndef X_LOCALE #include diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/X11/Xresource.h index ce1213748..e46a5f467 100644 --- a/nx-X11/lib/X11/Xresource.h +++ b/nx-X11/lib/X11/Xresource.h @@ -52,7 +52,7 @@ SOFTWARE. #define _XRESOURCE_H_ #ifndef _XP_PRINT_SERVER_ -#include +#include #endif /**************************************************************** diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c index a932a5ce2..f27f9d2e8 100644 --- a/nx-X11/lib/X11/Xrm.c +++ b/nx-X11/lib/X11/Xrm.c @@ -57,13 +57,13 @@ from The Open Group. #include #include #include "Xlibint.h" -#include +#include #include "Xlcint.h" #ifdef XTHREADS #include "locking.h" #endif #include "XrmI.h" -#include +#include #include "Xresinternal.h" #include "Xresource.h" diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h index 82dab7d56..8c877e697 100644 --- a/nx-X11/lib/X11/Xutil.h +++ b/nx-X11/lib/X11/Xutil.h @@ -52,7 +52,7 @@ SOFTWARE. #define _XUTIL_H_ /* You must include before including this file */ -#include +#include /* * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding diff --git a/nx-X11/lib/X11/cmsColNm.c b/nx-X11/lib/X11/cmsColNm.c index d8c24cdff..63f166efe 100644 --- a/nx-X11/lib/X11/cmsColNm.c +++ b/nx-X11/lib/X11/cmsColNm.c @@ -39,12 +39,12 @@ #endif #include "Xlibint.h" #include "Xcmsint.h" -#include +#include #include #include #include #define XK_LATIN1 -#include +#include #include "Cv.h" /* forwards/locals */ diff --git a/nx-X11/lib/X11/cmsProp.c b/nx-X11/lib/X11/cmsProp.c index 81ea58ce9..e9158479e 100644 --- a/nx-X11/lib/X11/cmsProp.c +++ b/nx-X11/lib/X11/cmsProp.c @@ -36,7 +36,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/evtomask.c b/nx-X11/lib/X11/evtomask.c index fbbb998d3..c852c4608 100644 --- a/nx-X11/lib/X11/evtomask.c +++ b/nx-X11/lib/X11/evtomask.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include /* * This array can be used given an event type to determine the mask bits diff --git a/nx-X11/lib/X11/globals.c b/nx-X11/lib/X11/globals.c index 11965cb5f..cf270dc22 100644 --- a/nx-X11/lib/X11/globals.c +++ b/nx-X11/lib/X11/globals.c @@ -38,7 +38,7 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include /* diff --git a/nx-X11/lib/X11/imDefFlt.c b/nx-X11/lib/X11/imDefFlt.c index ccf3ba348..b5b107221 100644 --- a/nx-X11/lib/X11/imDefFlt.c +++ b/nx-X11/lib/X11/imDefFlt.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #define NEED_EVENTS #include "Xlibint.h" #include "Xutil.h" diff --git a/nx-X11/lib/X11/imDefIm.c b/nx-X11/lib/X11/imDefIm.c index 7581548e7..e963f3560 100644 --- a/nx-X11/lib/X11/imDefIm.c +++ b/nx-X11/lib/X11/imDefIm.c @@ -36,7 +36,7 @@ OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imDefLkup.c b/nx-X11/lib/X11/imDefLkup.c index aa1aaaf06..5bdcb77c3 100644 --- a/nx-X11/lib/X11/imDefLkup.c +++ b/nx-X11/lib/X11/imDefLkup.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imDispch.c b/nx-X11/lib/X11/imDispch.c index c0c4bc726..1e3287529 100644 --- a/nx-X11/lib/X11/imDispch.c +++ b/nx-X11/lib/X11/imDispch.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include "Xlibint.h" #include "Xutil.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imEvToWire.c b/nx-X11/lib/X11/imEvToWire.c index f407296df..211252a50 100644 --- a/nx-X11/lib/X11/imEvToWire.c +++ b/nx-X11/lib/X11/imEvToWire.c @@ -27,8 +27,8 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #undef NEED_EVENTS #include "Ximint.h" diff --git a/nx-X11/lib/X11/imExten.c b/nx-X11/lib/X11/imExten.c index 782d1c356..6cb663f66 100644 --- a/nx-X11/lib/X11/imExten.c +++ b/nx-X11/lib/X11/imExten.c @@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imInt.c b/nx-X11/lib/X11/imInt.c index 5a047e4aa..9658eef58 100644 --- a/nx-X11/lib/X11/imInt.c +++ b/nx-X11/lib/X11/imInt.c @@ -31,9 +31,9 @@ PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include +#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcFlt.c b/nx-X11/lib/X11/imLcFlt.c index c3c64bf46..7ff642fae 100644 --- a/nx-X11/lib/X11/imLcFlt.c +++ b/nx-X11/lib/X11/imLcFlt.c @@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif #include "Xlibint.h" -#include +#include #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcIc.c b/nx-X11/lib/X11/imLcIc.c index 760e24c5f..475bbbef8 100644 --- a/nx-X11/lib/X11/imLcIc.c +++ b/nx-X11/lib/X11/imLcIc.c @@ -32,8 +32,8 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif #include -#include -#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcIm.c b/nx-X11/lib/X11/imLcIm.c index 675b48224..0a9027e6f 100644 --- a/nx-X11/lib/X11/imLcIm.c +++ b/nx-X11/lib/X11/imLcIm.c @@ -39,11 +39,11 @@ THIS SOFTWARE. #endif #include /* -#include +#include */ -#include -#include -#include +#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "XlcPublic.h" diff --git a/nx-X11/lib/X11/imLcLkup.c b/nx-X11/lib/X11/imLcLkup.c index 59025a529..b1db9f8f7 100644 --- a/nx-X11/lib/X11/imLcLkup.c +++ b/nx-X11/lib/X11/imLcLkup.c @@ -35,11 +35,11 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcPrs.c b/nx-X11/lib/X11/imLcPrs.c index 9736e135c..616d45186 100644 --- a/nx-X11/lib/X11/imLcPrs.c +++ b/nx-X11/lib/X11/imLcPrs.c @@ -35,9 +35,9 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include +#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imLcSIc.c b/nx-X11/lib/X11/imLcSIc.c index a32211ce2..e36c52269 100644 --- a/nx-X11/lib/X11/imLcSIc.c +++ b/nx-X11/lib/X11/imLcSIc.c @@ -31,9 +31,9 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif #include -#include -#include -#include +#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imRm.c b/nx-X11/lib/X11/imRm.c index 7dbc385cb..1da1b2967 100644 --- a/nx-X11/lib/X11/imRm.c +++ b/nx-X11/lib/X11/imRm.c @@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif #include -#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imThaiFlt.c b/nx-X11/lib/X11/imThaiFlt.c index 18df0e1ff..41ab992b0 100644 --- a/nx-X11/lib/X11/imThaiFlt.c +++ b/nx-X11/lib/X11/imThaiFlt.c @@ -68,10 +68,10 @@ SOFTWARE. #include #endif #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imThaiIc.c b/nx-X11/lib/X11/imThaiIc.c index 67d7cc268..97a72ac81 100644 --- a/nx-X11/lib/X11/imThaiIc.c +++ b/nx-X11/lib/X11/imThaiIc.c @@ -38,8 +38,8 @@ THIS SOFTWARE. #include #endif #include -#include -#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/nx-X11/lib/X11/imThaiIm.c b/nx-X11/lib/X11/imThaiIm.c index e24715022..85e9df6d3 100644 --- a/nx-X11/lib/X11/imThaiIm.c +++ b/nx-X11/lib/X11/imThaiIm.c @@ -38,10 +38,10 @@ THIS SOFTWARE. #include #endif #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Xlibint.h" #include "Xlcint.h" #include "XlcPublic.h" diff --git a/nx-X11/lib/X11/imTrX.c b/nx-X11/lib/X11/imTrX.c index e2de05f28..7d00bb3f7 100644 --- a/nx-X11/lib/X11/imTrX.c +++ b/nx-X11/lib/X11/imTrX.c @@ -34,7 +34,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include -#include +#include #define NEED_EVENTS #include "Xlibint.h" #include "Xlcint.h" diff --git a/nx-X11/lib/X11/imTrans.c b/nx-X11/lib/X11/imTrans.c index a239219b7..e9715927b 100644 --- a/nx-X11/lib/X11/imTrans.c +++ b/nx-X11/lib/X11/imTrans.c @@ -34,18 +34,18 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #include -#include -#include +#include +#include #define NEED_EVENTS #include "Xlibint.h" -#include +#include #include "Xlcint.h" #include "Ximint.h" #include "XimTrans.h" #include "XimTrInt.h" #ifdef WIN32 -#include +#include #endif diff --git a/nx-X11/lib/X11/lcCT.c b/nx-X11/lib/X11/lcCT.c index 63608a3cd..41c7cf418 100644 --- a/nx-X11/lib/X11/lcCT.c +++ b/nx-X11/lib/X11/lcCT.c @@ -43,7 +43,7 @@ #endif #include "Xlibint.h" #include "XlcPubI.h" -#include +#include #include diff --git a/nx-X11/lib/X11/lcDB.c b/nx-X11/lib/X11/lcDB.c index ffa8f49ae..7a14d3d4f 100644 --- a/nx-X11/lib/X11/lcDB.c +++ b/nx-X11/lib/X11/lcDB.c @@ -37,8 +37,8 @@ #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "Xlibint.h" #include "XlcPubI.h" diff --git a/nx-X11/lib/X11/lcFile.c b/nx-X11/lib/X11/lcFile.c index 691daeb9e..2e0a49db4 100644 --- a/nx-X11/lib/X11/lcFile.c +++ b/nx-X11/lib/X11/lcFile.c @@ -33,7 +33,7 @@ #include #include "Xlibint.h" #include "XlcPubI.h" -#include +#include #if 0 #include /* in theory delivers getresuid/gid prototypes, * in practice only the Linux syscall wrapper is there. */ diff --git a/nx-X11/lib/X11/lcPrTxt.c b/nx-X11/lib/X11/lcPrTxt.c index 5a781280e..1a55d1cab 100644 --- a/nx-X11/lib/X11/lcPrTxt.c +++ b/nx-X11/lib/X11/lcPrTxt.c @@ -30,8 +30,8 @@ #endif #include "Xlibint.h" #include "XlcPubI.h" -#include -#include +#include +#include static XPointer * alloc_list( diff --git a/nx-X11/lib/X11/lcTxtPr.c b/nx-X11/lib/X11/lcTxtPr.c index 1f9765f6e..e214ac4e9 100644 --- a/nx-X11/lib/X11/lcTxtPr.c +++ b/nx-X11/lib/X11/lcTxtPr.c @@ -30,8 +30,8 @@ #endif #include "Xlibint.h" #include "XlcPubI.h" -#include -#include +#include +#include #include static int diff --git a/nx-X11/lib/X11/lcUtil.c b/nx-X11/lib/X11/lcUtil.c index ab1db0083..3e49fd08f 100644 --- a/nx-X11/lib/X11/lcUtil.c +++ b/nx-X11/lib/X11/lcUtil.c @@ -29,7 +29,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include "XlcPublic.h" /* Don't use here because it is locale dependent. */ diff --git a/nx-X11/lib/X11/lcWrap.c b/nx-X11/lib/X11/lcWrap.c index ea2623191..b694425fe 100644 --- a/nx-X11/lib/X11/lcWrap.c +++ b/nx-X11/lib/X11/lcWrap.c @@ -61,12 +61,12 @@ from The Open Group. #include #include "Xlibint.h" #include "Xlcint.h" -#include -#include +#include +#include #ifdef WIN32 #undef close #endif -#include +#include #include "XlcPubI.h" #ifdef XTHREADS diff --git a/nx-X11/lib/X11/locking.h b/nx-X11/lib/X11/locking.h index 96c99b972..4b847ded6 100644 --- a/nx-X11/lib/X11/locking.h +++ b/nx-X11/lib/X11/locking.h @@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group. #define xmalloc(s) Xmalloc(s) #define xfree(s) Xfree(s) -#include +#include struct _XCVList { xcondition_t cv; diff --git a/nx-X11/lib/X11/mbWMProps.c b/nx-X11/lib/X11/mbWMProps.c index a5f7732e4..8b16bc990 100644 --- a/nx-X11/lib/X11/mbWMProps.c +++ b/nx-X11/lib/X11/mbWMProps.c @@ -31,10 +31,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include +#include +#include +#include +#include void XmbSetWMProperties ( diff --git a/nx-X11/lib/X11/omDefault.c b/nx-X11/lib/X11/omDefault.c index 57dd975ad..eaa75ff84 100644 --- a/nx-X11/lib/X11/omDefault.c +++ b/nx-X11/lib/X11/omDefault.c @@ -35,8 +35,8 @@ #endif #include "Xlibint.h" #include "XomGeneric.h" -#include -#include +#include +#include #include #define DefineLocalBuf char local_buf[BUFSIZ] diff --git a/nx-X11/lib/X11/omGeneric.c b/nx-X11/lib/X11/omGeneric.c index e6c23f4e2..8f4942873 100644 --- a/nx-X11/lib/X11/omGeneric.c +++ b/nx-X11/lib/X11/omGeneric.c @@ -55,8 +55,8 @@ #include "Xlibint.h" #include "XomGeneric.h" #include "XlcGeneric.h" -#include -#include +#include +#include #include #include #include diff --git a/nx-X11/lib/X11/os2Stubs.c b/nx-X11/lib/X11/os2Stubs.c index 9d109025c..804d2e14e 100644 --- a/nx-X11/lib/X11/os2Stubs.c +++ b/nx-X11/lib/X11/os2Stubs.c @@ -37,7 +37,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include #include #define INCL_DOSSEMAPHORES diff --git a/nx-X11/lib/X11/utf8WMProps.c b/nx-X11/lib/X11/utf8WMProps.c index e3a329ac8..69366b6cb 100644 --- a/nx-X11/lib/X11/utf8WMProps.c +++ b/nx-X11/lib/X11/utf8WMProps.c @@ -53,10 +53,10 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include +#include +#include +#include +#include void Xutf8SetWMProperties ( diff --git a/nx-X11/lib/X11/util/makekeys.c b/nx-X11/lib/X11/util/makekeys.c index 0b0ad9e2c..d2a7b4aef 100644 --- a/nx-X11/lib/X11/util/makekeys.c +++ b/nx-X11/lib/X11/util/makekeys.c @@ -31,9 +31,9 @@ from The Open Group. /* Constructs hash tables for XStringToKeysym and XKeysymToString. */ -#include -#include -#include +#include +#include +#include #include #include #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ diff --git a/nx-X11/lib/X11/uvY.c b/nx-X11/lib/X11/uvY.c index d7c3e6ab2..c07fcfc39 100644 --- a/nx-X11/lib/X11/uvY.c +++ b/nx-X11/lib/X11/uvY.c @@ -40,7 +40,7 @@ #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/X11/xyY.c b/nx-X11/lib/X11/xyY.c index 63e80bc59..ba0b06137 100644 --- a/nx-X11/lib/X11/xyY.c +++ b/nx-X11/lib/X11/xyY.c @@ -40,7 +40,7 @@ #include #endif #include -#include +#include #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/nx-X11/lib/Xau/AuDispose.c b/nx-X11/lib/Xau/AuDispose.c index 58ffd61e7..dc2080f40 100644 --- a/nx-X11/lib/Xau/AuDispose.c +++ b/nx-X11/lib/Xau/AuDispose.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include void diff --git a/nx-X11/lib/Xau/AuFileName.c b/nx-X11/lib/Xau/AuFileName.c index a51fc3bff..6ab0138b8 100644 --- a/nx-X11/lib/Xau/AuFileName.c +++ b/nx-X11/lib/Xau/AuFileName.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include char * diff --git a/nx-X11/lib/Xau/AuGetAddr.c b/nx-X11/lib/Xau/AuGetAddr.c index ab13cb630..d68ceadc2 100644 --- a/nx-X11/lib/Xau/AuGetAddr.c +++ b/nx-X11/lib/Xau/AuGetAddr.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include static int binaryEqual (_Xconst char *a, _Xconst char *b, int len) diff --git a/nx-X11/lib/Xau/AuGetBest.c b/nx-X11/lib/Xau/AuGetBest.c index 5ff1c7cd3..eb27f24c1 100644 --- a/nx-X11/lib/Xau/AuGetBest.c +++ b/nx-X11/lib/Xau/AuGetBest.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #ifdef XTHREADS -#include +#include #endif #ifdef hpux #define X_INCLUDE_NETDB_H #define XOS_USE_NO_LOCKING -#include +#include #endif static int diff --git a/nx-X11/lib/Xau/AuLock.c b/nx-X11/lib/Xau/AuLock.c index 001235607..1813dc368 100644 --- a/nx-X11/lib/Xau/AuLock.c +++ b/nx-X11/lib/Xau/AuLock.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include #include #include @@ -42,7 +42,7 @@ in this Software without prior written authorization from The Open Group. #ifndef WIN32 extern unsigned sleep (); #else -#include +#include #define link rename #endif #endif diff --git a/nx-X11/lib/Xau/AuRead.c b/nx-X11/lib/Xau/AuRead.c index 60a0d747f..2e2509633 100644 --- a/nx-X11/lib/Xau/AuRead.c +++ b/nx-X11/lib/Xau/AuRead.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include #include diff --git a/nx-X11/lib/Xau/AuUnlock.c b/nx-X11/lib/Xau/AuUnlock.c index 460effe86..e40042104 100644 --- a/nx-X11/lib/Xau/AuUnlock.c +++ b/nx-X11/lib/Xau/AuUnlock.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include int XauUnlockAuth ( diff --git a/nx-X11/lib/Xau/AuWrite.c b/nx-X11/lib/Xau/AuWrite.c index f25abc9e6..5a9b44eb2 100644 --- a/nx-X11/lib/Xau/AuWrite.c +++ b/nx-X11/lib/Xau/AuWrite.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include static int write_short (unsigned short s, FILE *file) diff --git a/nx-X11/lib/Xau/Autest.c b/nx-X11/lib/Xau/Autest.c index 298464908..2352cf170 100644 --- a/nx-X11/lib/Xau/Autest.c +++ b/nx-X11/lib/Xau/Autest.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include main (argc, argv) char **argv; diff --git a/nx-X11/lib/Xau/Imakefile b/nx-X11/lib/Xau/Imakefile index 331d29c09..df80d28d4 100644 --- a/nx-X11/lib/Xau/Imakefile +++ b/nx-X11/lib/Xau/Imakefile @@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $ #define DoProfileLib ProfileLibXau #define LibName NX_Xau #define SoRev SOXAUTHREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #include diff --git a/nx-X11/lib/Xau/k5encode.c b/nx-X11/lib/Xau/k5encode.c index a3c6c09b1..c71222e1c 100644 --- a/nx-X11/lib/Xau/k5encode.c +++ b/nx-X11/lib/Xau/k5encode.c @@ -45,10 +45,10 @@ in this Software without prior written authorization from The Open Group. #undef BITS32 #undef xfree -#include -#include -#include -#include +#include +#include +#include +#include /* * XauKrb5Encode diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile index a8e4077fa..24820c146 100644 --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -16,7 +16,7 @@ SOXCOMPOSITEREV=1.0.0 #define LibName NX_Xcomposite #define SoRev SOXCOMPOSITEREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions #include diff --git a/nx-X11/lib/Xcomposite/Xcomposite.h b/nx-X11/lib/Xcomposite/Xcomposite.h index 3604141bb..c28cc6857 100644 --- a/nx-X11/lib/Xcomposite/Xcomposite.h +++ b/nx-X11/lib/Xcomposite/Xcomposite.h @@ -25,9 +25,9 @@ #ifndef _XCOMPOSITE_H_ #define _XCOMPOSITE_H_ -#include -#include -#include +#include +#include +#include /* * This revision number also appears in configure.ac, they have diff --git a/nx-X11/lib/Xcomposite/xcompositeint.h b/nx-X11/lib/Xcomposite/xcompositeint.h index af5f57500..7b12e8d55 100644 --- a/nx-X11/lib/Xcomposite/xcompositeint.h +++ b/nx-X11/lib/Xcomposite/xcompositeint.h @@ -28,11 +28,11 @@ #define NEED_EVENTS #define NEED_REPLIES #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include typedef struct _XCompositeExtDisplayInfo { struct _XCompositeExtDisplayInfo *next; /* keep a linked list */ diff --git a/nx-X11/lib/Xext/DPMS.c b/nx-X11/lib/Xext/DPMS.c index 35b21b4ad..a2c0dc3c5 100644 --- a/nx-X11/lib/Xext/DPMS.c +++ b/nx-X11/lib/Xext/DPMS.c @@ -36,11 +36,11 @@ Equipment Corporation. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include static XExtensionInfo _dpms_info_data; diff --git a/nx-X11/lib/Xext/MITMisc.c b/nx-X11/lib/Xext/MITMisc.c index c0fa87209..8ba35dce1 100644 --- a/nx-X11/lib/Xext/MITMisc.c +++ b/nx-X11/lib/Xext/MITMisc.c @@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static XExtensionInfo _mit_info_data; static XExtensionInfo *mit_info = &_mit_info_data; diff --git a/nx-X11/lib/Xext/XAppgroup.c b/nx-X11/lib/Xext/XAppgroup.c index 2ca3e4d21..abbf1c1b9 100644 --- a/nx-X11/lib/Xext/XAppgroup.c +++ b/nx-X11/lib/Xext/XAppgroup.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #endif #define NEED_EVENTS #define NEED_REPLIES -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/nx-X11/lib/Xext/XEVI.c b/nx-X11/lib/Xext/XEVI.c index a64b9c1ba..e5a811bdf 100644 --- a/nx-X11/lib/Xext/XEVI.c +++ b/nx-X11/lib/Xext/XEVI.c @@ -27,12 +27,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static XExtensionInfo *xevi_info;/* needs to move to globals.c */ static /* const */ char *xevi_extension_name = EVINAME; #define XeviCheckExtension(dpy,i,val) \ diff --git a/nx-X11/lib/Xext/XLbx.c b/nx-X11/lib/Xext/XLbx.c index 8c0cfad0b..450bd5bc5 100644 --- a/nx-X11/lib/Xext/XLbx.c +++ b/nx-X11/lib/Xext/XLbx.c @@ -30,11 +30,11 @@ #include #endif #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static XExtensionInfo _lbx_info_data; static XExtensionInfo *lbx_info = &_lbx_info_data; diff --git a/nx-X11/lib/Xext/XMultibuf.c b/nx-X11/lib/Xext/XMultibuf.c index 3e0049e92..570676def 100644 --- a/nx-X11/lib/Xext/XMultibuf.c +++ b/nx-X11/lib/Xext/XMultibuf.c @@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include -#include -#include -#include +#include +#include +#include static XExtensionInfo _multibuf_info_data; static XExtensionInfo *multibuf_info = &_multibuf_info_data; diff --git a/nx-X11/lib/Xext/XSecurity.c b/nx-X11/lib/Xext/XSecurity.c index 161ade3b7..a9899916f 100644 --- a/nx-X11/lib/Xext/XSecurity.c +++ b/nx-X11/lib/Xext/XSecurity.c @@ -29,11 +29,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #include -#include -#include -#include +#include +#include +#include static XExtensionInfo _Security_info_data; static XExtensionInfo *Security_info = &_Security_info_data; diff --git a/nx-X11/lib/Xext/XShape.c b/nx-X11/lib/Xext/XShape.c index 29a7f83f9..79b4b78f6 100644 --- a/nx-X11/lib/Xext/XShape.c +++ b/nx-X11/lib/Xext/XShape.c @@ -31,12 +31,12 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static XExtensionInfo _shape_info_data; static XExtensionInfo *shape_info = &_shape_info_data; diff --git a/nx-X11/lib/Xext/XShm.c b/nx-X11/lib/Xext/XShm.c index f4e29a42b..ec3720732 100644 --- a/nx-X11/lib/Xext/XShm.c +++ b/nx-X11/lib/Xext/XShm.c @@ -36,12 +36,12 @@ in this Software without prior written authorization from The Open Group. #include #endif #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static XExtensionInfo _shm_info_data; static XExtensionInfo *shm_info = &_shm_info_data; diff --git a/nx-X11/lib/Xext/XSync.c b/nx-X11/lib/Xext/XSync.c index 61f8600ce..39eb97cdd 100644 --- a/nx-X11/lib/Xext/XSync.c +++ b/nx-X11/lib/Xext/XSync.c @@ -58,10 +58,10 @@ PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS #define NEED_REPLIES -#include -#include -#include -#include +#include +#include +#include +#include static XExtensionInfo _sync_info_data; static XExtensionInfo *sync_info = &_sync_info_data; diff --git a/nx-X11/lib/Xext/XTestExt1.c b/nx-X11/lib/Xext/XTestExt1.c index ee4a0bde0..00da036bd 100644 --- a/nx-X11/lib/Xext/XTestExt1.c +++ b/nx-X11/lib/Xext/XTestExt1.c @@ -64,9 +64,9 @@ University of California. #include #endif #include -#include -#include -#include +#include +#include +#include /****************************************************************************** * variables diff --git a/nx-X11/lib/Xext/Xcup.c b/nx-X11/lib/Xext/Xcup.c index 6315d32a4..8bf2bb29e 100644 --- a/nx-X11/lib/Xext/Xcup.c +++ b/nx-X11/lib/Xext/Xcup.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include +#include #endif #define NEED_EVENTS #define NEED_REPLIES -#include -#include -#include -#include +#include +#include +#include +#include static XExtensionInfo _xcup_info_data; static XExtensionInfo *xcup_info = &_xcup_info_data; diff --git a/nx-X11/lib/Xext/Xdbe.c b/nx-X11/lib/Xext/Xdbe.c index 954c8f01d..05df171f6 100644 --- a/nx-X11/lib/Xext/Xdbe.c +++ b/nx-X11/lib/Xext/Xdbe.c @@ -38,11 +38,11 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #define NEED_DBE_PROTOCOL -#include +#include static XExtensionInfo _dbe_info_data; static XExtensionInfo *dbe_info = &_dbe_info_data; diff --git a/nx-X11/lib/Xext/extutil.c b/nx-X11/lib/Xext/extutil.c index d96b17f3f..bd79dbdb2 100644 --- a/nx-X11/lib/Xext/extutil.c +++ b/nx-X11/lib/Xext/extutil.c @@ -51,9 +51,9 @@ in this Software without prior written authorization from The Open Group. #include #endif #include -#include -#include -#include +#include +#include +#include /* diff --git a/nx-X11/lib/Xext/globals.c b/nx-X11/lib/Xext/globals.c index 0cd5d2690..53a18690d 100644 --- a/nx-X11/lib/Xext/globals.c +++ b/nx-X11/lib/Xext/globals.c @@ -34,8 +34,8 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include /* for definition of NULL */ /* diff --git a/nx-X11/lib/Xfixes/Imakefile b/nx-X11/lib/Xfixes/Imakefile index ca1fe046b..cc3e1631d 100644 --- a/nx-X11/lib/Xfixes/Imakefile +++ b/nx-X11/lib/Xfixes/Imakefile @@ -16,7 +16,7 @@ SOXFIXESREV=3.0.0 #define LibName NX_Xfixes #define SoRev SOXFIXESREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions #include diff --git a/nx-X11/lib/Xfixes/Xfixes.h b/nx-X11/lib/Xfixes/Xfixes.h index 28ca28f1a..4cba47ca4 100644 --- a/nx-X11/lib/Xfixes/Xfixes.h +++ b/nx-X11/lib/Xfixes/Xfixes.h @@ -25,9 +25,9 @@ #ifndef _XFIXES_H_ #define _XFIXES_H_ -#include +#include -#include +#include /* * This revision number also appears in configure.ac, they have diff --git a/nx-X11/lib/Xfixes/Xfixes.man b/nx-X11/lib/Xfixes/Xfixes.man index f081cc54e..563db15b5 100644 --- a/nx-X11/lib/Xfixes/Xfixes.man +++ b/nx-X11/lib/Xfixes/Xfixes.man @@ -31,7 +31,7 @@ .SH NAME XFixes \- Augmented versions of core protocol requests .SH SYNTAX -\&#include +\&#include .nf .sp Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, diff --git a/nx-X11/lib/Xfixes/Xfixesint.h b/nx-X11/lib/Xfixes/Xfixesint.h index e227571be..353dcae77 100644 --- a/nx-X11/lib/Xfixes/Xfixesint.h +++ b/nx-X11/lib/Xfixes/Xfixesint.h @@ -28,11 +28,11 @@ #define NEED_EVENTS #define NEED_REPLIES #include -#include -#include -#include +#include +#include +#include #include "Xfixes.h" -#include +#include extern char XFixesExtensionName[]; diff --git a/nx-X11/lib/Xinerama/Xinerama.c b/nx-X11/lib/Xinerama/Xinerama.c index fd717dd22..0256336be 100644 --- a/nx-X11/lib/Xinerama/Xinerama.c +++ b/nx-X11/lib/Xinerama/Xinerama.c @@ -27,13 +27,13 @@ Equipment Corporation. #define NEED_EVENTS #define NEED_REPLIES -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include static XExtensionInfo _panoramiX_ext_info_data; diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile index 35d826b22..c5a0f89fc 100644 --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile @@ -71,7 +71,7 @@ clean:: #define SoRev SOXRENDERREV #ifdef XBuildIncDir -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions RENDERINCDIR = $(BUILDINCDIR) #else diff --git a/nx-X11/lib/Xrender/Picture.c b/nx-X11/lib/Xrender/Picture.c index 0b18f5c57..260eda05e 100644 --- a/nx-X11/lib/Xrender/Picture.c +++ b/nx-X11/lib/Xrender/Picture.c @@ -26,7 +26,7 @@ #include #endif #include "Xrenderint.h" -#include +#include static void _XRenderProcessPictureAttributes (Display *dpy, diff --git a/nx-X11/lib/Xrender/Xrender.h b/nx-X11/lib/Xrender/Xrender.h index 4d125cd81..a38f4cc3d 100644 --- a/nx-X11/lib/Xrender/Xrender.h +++ b/nx-X11/lib/Xrender/Xrender.h @@ -27,12 +27,12 @@ #define NX_CLEANUP -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef NX_CLEANUP #include "renderproto.h" diff --git a/nx-X11/lib/Xrender/Xrenderint.h b/nx-X11/lib/Xrender/Xrenderint.h index a90fe65d8..9744b0da4 100644 --- a/nx-X11/lib/Xrender/Xrenderint.h +++ b/nx-X11/lib/Xrender/Xrenderint.h @@ -28,9 +28,9 @@ #include "config.h" #define NEED_EVENTS #define NEED_REPLIES -#include -#include -#include +#include +#include +#include #include "Xrender.h" typedef struct { diff --git a/nx-X11/lib/Xtst/XRecord.c b/nx-X11/lib/Xtst/XRecord.c index 05cbda889..8e1823ef9 100644 --- a/nx-X11/lib/Xtst/XRecord.c +++ b/nx-X11/lib/Xtst/XRecord.c @@ -56,10 +56,10 @@ from The Open Group. #include #define NEED_EVENTS #define NEED_REPLIES -#include -#include -#include -#include +#include +#include +#include +#include static XExtensionInfo _xrecord_info_data; static XExtensionInfo *xrecord_info = &_xrecord_info_data; diff --git a/nx-X11/lib/Xtst/XTest.c b/nx-X11/lib/Xtst/XTest.c index 2c3ae2b41..6b814aab4 100644 --- a/nx-X11/lib/Xtst/XTest.c +++ b/nx-X11/lib/Xtst/XTest.c @@ -33,13 +33,13 @@ from The Open Group. /* $XFree86: xc/lib/Xtst/XTest.c,v 1.5 2001/12/14 19:56:40 dawes Exp $ */ #define NEED_REPLIES -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include static XExtensionInfo _xtest_info_data; static XExtensionInfo *xtest_info = &_xtest_info_data; diff --git a/nx-X11/lib/oldX/Imakefile b/nx-X11/lib/oldX/Imakefile index 663d11019..e2ee75eb0 100644 --- a/nx-X11/lib/oldX/Imakefile +++ b/nx-X11/lib/oldX/Imakefile @@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $ #define DoProfileLib ProfileOldX #define LibName NX_oldX #define SoRev SOOLDXREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #ifdef SharedOldXReqs REQUIREDLIBS = SharedOldXReqs diff --git a/nx-X11/lib/xkbfile/Imakefile b/nx-X11/lib/xkbfile/Imakefile index d7693819e..6a675dc9a 100644 --- a/nx-X11/lib/xkbfile/Imakefile +++ b/nx-X11/lib/xkbfile/Imakefile @@ -13,7 +13,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $ #define HasSharedData NO #define LibName NX_xkbfile #define SoRev SOXKBFILEREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions #ifdef SharedxkbfileReqs diff --git a/nx-X11/lib/xkbfile/XKMformat.h b/nx-X11/lib/xkbfile/XKMformat.h index 154da5694..ced5ea21d 100644 --- a/nx-X11/lib/xkbfile/XKMformat.h +++ b/nx-X11/lib/xkbfile/XKMformat.h @@ -29,9 +29,9 @@ #ifndef _XKMFORMAT_H_ #define _XKMFORMAT_H_ 1 -#include -#include -#include +#include +#include +#include typedef struct _xkmFileInfo { CARD8 type; diff --git a/nx-X11/lib/xkbfile/cout.c b/nx-X11/lib/xkbfile/cout.c index 161bd0f89..96b3ba411 100644 --- a/nx-X11/lib/xkbfile/cout.c +++ b/nx-X11/lib/xkbfile/cout.c @@ -32,10 +32,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" diff --git a/nx-X11/lib/xkbfile/maprules.c b/nx-X11/lib/xkbfile/maprules.c index 53decdcad..75baf07ea 100644 --- a/nx-X11/lib/xkbfile/maprules.c +++ b/nx-X11/lib/xkbfile/maprules.c @@ -38,18 +38,18 @@ #define X_INCLUDE_STRING_H #define XOS_USE_NO_LOCKING -#include +#include #ifndef XKB_IN_SERVER -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" #include "XKBrules.h" @@ -57,18 +57,18 @@ #else #define NEED_EVENTS -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS -#include +#include #endif diff --git a/nx-X11/lib/xkbfile/srvmisc.c b/nx-X11/lib/xkbfile/srvmisc.c index 3e4c73c98..d228389d9 100644 --- a/nx-X11/lib/xkbfile/srvmisc.c +++ b/nx-X11/lib/xkbfile/srvmisc.c @@ -32,9 +32,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" diff --git a/nx-X11/lib/xkbfile/xkbatom.c b/nx-X11/lib/xkbfile/xkbatom.c index 1a5dea0f8..d023d5410 100644 --- a/nx-X11/lib/xkbfile/xkbatom.c +++ b/nx-X11/lib/xkbfile/xkbatom.c @@ -79,9 +79,9 @@ SOFTWARE. #include #include #include -#include -#include -#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" diff --git a/nx-X11/lib/xkbfile/xkbbells.c b/nx-X11/lib/xkbfile/xkbbells.c index 30b918fb4..8bf0885fe 100644 --- a/nx-X11/lib/xkbfile/xkbbells.c +++ b/nx-X11/lib/xkbfile/xkbbells.c @@ -29,8 +29,8 @@ #ifdef HAVE_CONFIG_H #include #endif -#include -#include +#include +#include #include "XKBbells.h" static char *_xkbStdBellNames[XkbBI_NumBells] = { diff --git a/nx-X11/lib/xkbfile/xkbconfig.c b/nx-X11/lib/xkbfile/xkbconfig.c index 7930979eb..8c31213a5 100644 --- a/nx-X11/lib/xkbfile/xkbconfig.c +++ b/nx-X11/lib/xkbfile/xkbconfig.c @@ -36,32 +36,32 @@ #include #include -#include +#include -#include +#include #ifndef XKB_IN_SERVER -#include -#include -#include -#include +#include +#include +#include +#include #include "XKBfileInt.h" #else -#include +#include #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "inputstr.h" #include "dix.h" #define XKBSRV_NEED_FILE_FUNCS -#include +#include #endif -#include +#include /***====================================================================***/ diff --git a/nx-X11/lib/xkbfile/xkbdraw.c b/nx-X11/lib/xkbfile/xkbdraw.c index c955f0321..865b2952e 100644 --- a/nx-X11/lib/xkbfile/xkbdraw.c +++ b/nx-X11/lib/xkbfile/xkbdraw.c @@ -33,12 +33,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" diff --git a/nx-X11/lib/xkbfile/xkbmisc.c b/nx-X11/lib/xkbfile/xkbmisc.c index cca31f778..52fca3d10 100644 --- a/nx-X11/lib/xkbfile/xkbmisc.c +++ b/nx-X11/lib/xkbfile/xkbmisc.c @@ -36,31 +36,31 @@ #include #include -#include -#include +#include +#include #ifndef XKB_IN_SERVER -#include -#include -#include -#include +#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" #else -#include +#include #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include -#include +#include +#include #include "xkb.h" #endif diff --git a/nx-X11/lib/xkbfile/xkbout.c b/nx-X11/lib/xkbfile/xkbout.c index b69fdfbb4..8baf34b78 100644 --- a/nx-X11/lib/xkbfile/xkbout.c +++ b/nx-X11/lib/xkbfile/xkbout.c @@ -35,32 +35,32 @@ #include #include #include -#include +#include #ifndef XKB_IN_SERVER -#include -#include -#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" #else -#include +#include #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include +#include -#include -#include +#include +#include #endif diff --git a/nx-X11/lib/xkbfile/xkbtext.c b/nx-X11/lib/xkbfile/xkbtext.c index 28592d242..41f2a8ff3 100644 --- a/nx-X11/lib/xkbfile/xkbtext.c +++ b/nx-X11/lib/xkbfile/xkbtext.c @@ -36,29 +36,29 @@ #include #include -#include +#include #ifndef XKB_IN_SERVER -#include -#include -#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" #else -#include +#include #define NEED_EVENTS -#include +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include -#include +#include +#include #endif diff --git a/nx-X11/lib/xkbfile/xkmout.c b/nx-X11/lib/xkbfile/xkmout.c index 403e48810..7de4081af 100644 --- a/nx-X11/lib/xkbfile/xkmout.c +++ b/nx-X11/lib/xkbfile/xkmout.c @@ -32,10 +32,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "XKMformat.h" #include "XKBfileInt.h" diff --git a/nx-X11/lib/xkbfile/xkmread.c b/nx-X11/lib/xkbfile/xkmread.c index f22941f67..92ef05b86 100644 --- a/nx-X11/lib/xkbfile/xkmread.c +++ b/nx-X11/lib/xkbfile/xkmread.c @@ -34,33 +34,33 @@ #include -#include -#include +#include +#include #ifndef XKB_IN_SERVER #include -#include -#include +#include +#include -#include +#include -#include +#include #include "XKMformat.h" #include "XKBfileInt.h" #else -#include +#include #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "inputstr.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS -#include -#include +#include +#include Atom XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) diff --git a/nx-X11/lib/xtrans/Imakefile b/nx-X11/lib/xtrans/Imakefile index e29a38591..2cc880c39 100644 --- a/nx-X11/lib/xtrans/Imakefile +++ b/nx-X11/lib/xtrans/Imakefile @@ -1,6 +1,6 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ -#define IncSubdir X11 +#define IncSubdir nx-X11 all:: diff --git a/nx-X11/programs/Xserver/GL/glx/glxserver.h b/nx-X11/programs/Xserver/GL/glx/glxserver.h index 193ebcb6f..4238de537 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxserver.h +++ b/nx-X11/programs/Xserver/GL/glx/glxserver.h @@ -41,9 +41,9 @@ ** */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c index 6441a4b4f..1889bdabd 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c +++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c @@ -39,7 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include "pixmapstr.h" #include "xf86glx_util.h" -#include +#include #include "GL/xf86glx.h" #ifdef ROUNDUP diff --git a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c index 3b9955eba..a3e1d08c6 100644 --- a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c +++ b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c @@ -8,7 +8,7 @@ #include "xf86Module.h" -#include +#include extern void DEC_XTRAPInit(INITARGS); diff --git a/nx-X11/programs/Xserver/XTrap/xtrapddmi.c b/nx-X11/programs/Xserver/XTrap/xtrapddmi.c index 2dba356b7..1b4be39cd 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapddmi.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapddmi.c @@ -44,7 +44,7 @@ SOFTWARE. #ifndef EXTMODULE #include -#include +#include #ifdef PC # include "fcntl.h" # include "io.h" @@ -56,7 +56,7 @@ SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include /* From library include environment */ +#include /* From library include environment */ #include "input.h" /* From server include env. (must be before Xlib.h!) */ #ifdef PC # include "scrintst.h" /* Screen struct */ @@ -66,9 +66,9 @@ SOFTWARE. # include "scrnintstr.h" /* Screen struct */ #endif -#include -#include -#include +#include +#include +#include extern int XETrapErrorBase; extern xXTrapGetAvailReply XETrap_avail; diff --git a/nx-X11/programs/Xserver/XTrap/xtrapdi.c b/nx-X11/programs/Xserver/XTrap/xtrapdi.c index bdddb6310..987d54e4f 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapdi.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapdi.c @@ -58,12 +58,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef EXTMODULE #include #include -#include +#include #else #include "xf86_ansic.h" #endif -#include -#include +#include +#include #include "input.h" /* Server DevicePtr definitions */ #include "misc.h" /* Server swapping macros */ #include "dixstruct.h" /* Server ClientRec definitions */ @@ -77,9 +77,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #endif #include "pixmapstr.h" /* DrawableRec */ #include "windowstr.h" /* Drawable Lookup structures */ -#include -#include -#include +#include +#include +#include #include "colormapst.h" #ifdef PANORAMIX #include "panoramiX.h" diff --git a/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c b/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c index c43f6e332..ba8249c35 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c @@ -49,12 +49,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#include +#include #define NEED_REPLIES #define NEED_EVENTS -#include -#include -#include +#include +#include +#include #include "input.h" /* Server DevicePtr definitions */ #include "misc.h" #include "dixstruct.h" @@ -64,8 +64,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # include "extnsionst.h" /* Server ExtensionEntry definitions */ #endif # include "swapreq.h" /* Server SwapColorItem definition */ -#include -#include +#include +#include /* In-coming XTrap requests needing to be swapped to native format */ diff --git a/nx-X11/programs/Xserver/XTrap/xtrapditbl.c b/nx-X11/programs/Xserver/XTrap/xtrapditbl.c index a9ceddb3d..10a070e9e 100644 --- a/nx-X11/programs/Xserver/XTrap/xtrapditbl.c +++ b/nx-X11/programs/Xserver/XTrap/xtrapditbl.c @@ -39,12 +39,12 @@ SOFTWARE. #include #endif -#include +#include #define NEED_REPLIES #define NEED_EVENTS -#include -#include -#include +#include +#include +#include #include "input.h" /* Server DevicePtr definitions */ #include "misc.h" #include "dixstruct.h" @@ -53,8 +53,8 @@ SOFTWARE. #else # include "extnsionst.h" /* Server ExtensionEntry definitions */ #endif -#include -#include +#include +#include globaldef void_function XETSwProcVector[256L] = { diff --git a/nx-X11/programs/Xserver/Xext/EVI.c b/nx-X11/programs/Xserver/Xext/EVI.c index 93ed19fa6..1eca62693 100644 --- a/nx-X11/programs/Xserver/Xext/EVI.c +++ b/nx-X11/programs/Xserver/Xext/EVI.c @@ -27,13 +27,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#include -#include +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include +#include #include "EVIstruct.h" #include "modinit.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/Xext/appgroup.c b/nx-X11/programs/Xserver/Xext/appgroup.c index e23ceca59..1dd4f1ae5 100644 --- a/nx-X11/programs/Xserver/Xext/appgroup.c +++ b/nx-X11/programs/Xserver/Xext/appgroup.c @@ -32,8 +32,8 @@ from The Open Group. #include #endif -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -42,14 +42,14 @@ from The Open Group. #include "colormapst.h" #include "servermd.h" #define _XAG_SERVER_ -#include -#include +#include +#include #define _SECURITY_SERVER -#include -#include +#include +#include #define XSERV_t -#include +#include #include "../os/osdep.h" #include diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c index 3d6d49ca7..eba552cfe 100644 --- a/nx-X11/programs/Xserver/Xext/bigreq.c +++ b/nx-X11/programs/Xserver/Xext/bigreq.c @@ -33,13 +33,13 @@ from The Open Group. #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include +#include #include "opaque.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/cup.c b/nx-X11/programs/Xserver/Xext/cup.c index 198aa801f..9b6d25c21 100644 --- a/nx-X11/programs/Xserver/Xext/cup.c +++ b/nx-X11/programs/Xserver/Xext/cup.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #include #endif -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -42,8 +42,8 @@ in this Software without prior written authorization from The Open Group. #include "servermd.h" #include "swapreq.h" #define _XCUP_SERVER_ -#include -#include +#include +#include #ifndef EXTMODULE #include "../os/osdep.h" diff --git a/nx-X11/programs/Xserver/Xext/dgaproc.h b/nx-X11/programs/Xserver/Xext/dgaproc.h index eb9791098..4d3f224e6 100644 --- a/nx-X11/programs/Xserver/Xext/dgaproc.h +++ b/nx-X11/programs/Xserver/Xext/dgaproc.h @@ -3,7 +3,7 @@ #ifndef __DGAPROC_H #define __DGAPROC_H -#include +#include #include "pixmap.h" #define DGA_CONCURRENT_ACCESS 0x00000001 diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c index 3e79602d1..fc40193e4 100644 --- a/nx-X11/programs/Xserver/Xext/dpms.c +++ b/nx-X11/programs/Xserver/Xext/dpms.c @@ -39,16 +39,16 @@ Equipment Corporation. #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" #define DPMS_SERVER -#include -#include +#include +#include #include "dpmsproc.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c index f79204281..162f76ad8 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.c @@ -33,7 +33,7 @@ #include "xf86Module.h" #include "xf86Opt.h" -#include +#include #include "modinit.h" #include "globals.h" diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 2bafdb2b0..40e1828bb 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -12,26 +12,26 @@ #ifdef SHAPE extern void ShapeExtensionInit(INITARGS); #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include +#include #endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include +#include #endif #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #define _MITMISC_SERVER_ -#include +#include #endif #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ -#include -#include +#include +#include #endif #if 1 @@ -40,49 +40,49 @@ extern void XTestExtension1Init(INITARGS); #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); -#include +#include #endif #ifdef XSYNC extern void SyncExtensionInit(INITARGS); #define _SYNC_SERVER -#include -#include +#include +#include #endif #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); -#include +#include #endif #ifdef XCMISC extern void XCMiscExtensionInit(INITARGS); -#include +#include #endif #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); #define _XF86VIDMODE_SERVER_ -#include +#include #endif #ifdef XF86MISC extern void XFree86MiscExtensionInit(INITARGS); #define _XF86MISC_SERVER_ #define _XF86MISC_SAVER_COMPAT_ -#include +#include #endif #ifdef XFreeXDGA extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGARegister(INITARGS); #define _XF86DGA_SERVER_ -#include +#include #endif #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); -#include +#include #endif #ifdef FONTCACHE @@ -95,31 +95,31 @@ extern void FontCacheExtensionInit(INITARGS); #ifdef TOGCUP extern void XcupExtensionInit(INITARGS); #define _XCUP_SERVER_ -#include +#include #endif #ifdef EVI extern void EVIExtensionInit(INITARGS); #define _XEVI_SERVER_ -#include +#include #endif #ifdef XV extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); extern void XvRegister(INITARGS); -#include -#include +#include +#include #endif #ifdef RES extern void ResExtensionInit(INITARGS); -#include +#include #endif #ifdef SHM extern void ShmExtensionInit(INITARGS); -#include +#include extern void ShmSetPixmapFormat( ScreenPtr pScreen, int format); diff --git a/nx-X11/programs/Xserver/Xext/fontcache.c b/nx-X11/programs/Xserver/Xext/fontcache.c index 9ab23a122..0956f9be9 100644 --- a/nx-X11/programs/Xserver/Xext/fontcache.c +++ b/nx-X11/programs/Xserver/Xext/fontcache.c @@ -37,8 +37,8 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -48,7 +48,7 @@ #define _FONTCACHE_SERVER_ #include "fontcacheP.h" #include "fontcachstr.h" -#include +#include #include "swaprep.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/mbuf.c b/nx-X11/programs/Xserver/Xext/mbuf.c index 37024da19..e6dec8f6f 100644 --- a/nx-X11/programs/Xserver/Xext/mbuf.c +++ b/nx-X11/programs/Xserver/Xext/mbuf.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #include #endif -#include -#include +#include +#include #include "window.h" #include "os.h" #include "windowstr.h" @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. #include "opaque.h" #include "sleepuntil.h" #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include +#include #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/Xext/mbufbf.c b/nx-X11/programs/Xserver/Xext/mbufbf.c index 84e7ee839..318fa6756 100644 --- a/nx-X11/programs/Xserver/Xext/mbufbf.c +++ b/nx-X11/programs/Xserver/Xext/mbufbf.c @@ -34,8 +34,8 @@ in this Software without prior written authorization from The Open Group. #endif #include -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -53,7 +53,7 @@ in this Software without prior written authorization from The Open Group. #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_BUFFER_ -#include +#include /* Support for doublebuffer hardare diff --git a/nx-X11/programs/Xserver/Xext/mbufpx.c b/nx-X11/programs/Xserver/Xext/mbufpx.c index 0973fc324..0e9ae1628 100644 --- a/nx-X11/programs/Xserver/Xext/mbufpx.c +++ b/nx-X11/programs/Xserver/Xext/mbufpx.c @@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group. #endif #include -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group. #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_PIXMAP_ -#include +#include static Bool NoopDDA_True() { return TRUE; } diff --git a/nx-X11/programs/Xserver/Xext/mitmisc.c b/nx-X11/programs/Xserver/Xext/mitmisc.c index f7b0ee55c..5c5183e69 100644 --- a/nx-X11/programs/Xserver/Xext/mitmisc.c +++ b/nx-X11/programs/Xserver/Xext/mitmisc.c @@ -34,14 +34,14 @@ in this Software without prior written authorization from The Open Group. #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #define _MITMISC_SERVER_ -#include +#include #include "modinit.h" extern Bool permitOldBugs; diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index 2dc011e70..000c4bf04 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -35,9 +35,9 @@ Equipment Corporation. #define NEED_REPLIES #include -#include -#include -#include +#include +#include +#include #include "misc.h" #include "cursor.h" #include "cursorstr.h" @@ -50,7 +50,7 @@ Equipment Corporation. #include "windowstr.h" #include "pixmapstr.h" #include "panoramiX.h" -#include +#include #include "panoramiXsrv.h" #include "globals.h" #include "servermd.h" diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.h b/nx-X11/programs/Xserver/Xext/panoramiX.h index 4178b985f..3f70b6473 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.h +++ b/nx-X11/programs/Xserver/Xext/panoramiX.h @@ -43,7 +43,7 @@ Equipment Corporation. #ifndef _PANORAMIX_H_ #define _PANORAMIX_H_ -#include +#include /*#include "gcstruct.h"*/ diff --git a/nx-X11/programs/Xserver/Xext/panoramiXSwap.c b/nx-X11/programs/Xserver/Xext/panoramiXSwap.c index e0548df7b..955b81ed1 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiXSwap.c +++ b/nx-X11/programs/Xserver/Xext/panoramiXSwap.c @@ -30,8 +30,8 @@ Equipment Corporation. #endif #include -#include -#include +#include +#include #include "misc.h" #include "cursor.h" #include "cursorstr.h" @@ -45,10 +45,10 @@ Equipment Corporation. #include "pixmapstr.h" #if 0 #include -#include +#include #endif #include "panoramiX.h" -#include +#include #include "panoramiXsrv.h" #include "globals.h" #include "panoramiXh.h" diff --git a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c index 79a5a3290..2f2b2c63e 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c +++ b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c @@ -33,10 +33,10 @@ Equipment Corporation. #endif #include -#include +#include #define NEED_REPLIES #define NEED_EVENTS -#include +#include #include "windowstr.h" #include "dixfontstr.h" #include "gcstruct.h" diff --git a/nx-X11/programs/Xserver/Xext/sampleEVI.c b/nx-X11/programs/Xserver/Xext/sampleEVI.c index 500a585c9..598992742 100644 --- a/nx-X11/programs/Xserver/Xext/sampleEVI.c +++ b/nx-X11/programs/Xserver/Xext/sampleEVI.c @@ -27,13 +27,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#include -#include +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include +#include #include "EVIstruct.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 4a7fc054c..ec91d080a 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -36,8 +36,8 @@ in this Software without prior written authorization from the X Consortium. #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -47,7 +47,7 @@ in this Software without prior written authorization from the X Consortium. #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#include +#include #include "gcstruct.h" #include "cursorstr.h" #include "colormapst.h" diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 4bc49f408..bcc8574cb 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -57,19 +57,19 @@ in this Software without prior written authorization from The Open Group. #include "colormapst.h" #include "propertyst.h" #define _SECURITY_SERVER -#include +#include #include #include #ifdef LBX #define _XLBX_SERVER_ -#include +#include extern unsigned char LbxReqCode; #endif #ifdef XAPPGROUP -#include +#include #endif #include /* for file reading operations */ -#include /* for XA_STRING */ +#include /* for XA_STRING */ #ifdef NXAGENT_SERVER @@ -91,7 +91,7 @@ extern unsigned char LbxReqCode; #endif #if defined(WIN32) || defined(__CYGWIN__) -#include +#include #undef index #endif diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 02182398a..78d3be319 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group. #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group. #include "resource.h" #include "opaque.h" #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include +#include #include "regionstr.h" #include "gcstruct.h" #ifdef EXTMODULE diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index d500e551c..6378a55a4 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -47,8 +47,8 @@ in this Software without prior written authorization from The Open Group. #include #define NEED_REPLIES #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -60,8 +60,8 @@ in this Software without prior written authorization from The Open Group. #include "extnsionst.h" #include "servermd.h" #define _XSHM_SERVER_ -#include -#include +#include +#include #ifdef EXTMODULE #include "xf86_ansic.h" #endif diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.c b/nx-X11/programs/Xserver/Xext/sleepuntil.c index da93806f5..62f946cf8 100644 --- a/nx-X11/programs/Xserver/Xext/sleepuntil.c +++ b/nx-X11/programs/Xserver/Xext/sleepuntil.c @@ -34,8 +34,8 @@ in this Software without prior written authorization from The Open Group. #endif #include "sleepuntil.h" -#include -#include +#include +#include #include "misc.h" #include "windowstr.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 006cefa86..c122e2860 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -58,9 +58,9 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif -#include -#include -#include +#include +#include +#include #include "misc.h" #include "os.h" #include "extnsionst.h" @@ -68,8 +68,8 @@ PERFORMANCE OF THIS SOFTWARE. #include "resource.h" #include "opaque.h" #define _SYNC_SERVER -#include -#include +#include +#include #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index 0a9a09069..1d7ad0e09 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -34,14 +34,14 @@ from The Open Group. #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include +#include #include "modinit.h" #if HAVE_STDINT_H diff --git a/nx-X11/programs/Xserver/Xext/xevie.c b/nx-X11/programs/Xserver/Xext/xevie.c index 354be121f..eb38d9223 100644 --- a/nx-X11/programs/Xserver/Xext/xevie.c +++ b/nx-X11/programs/Xserver/Xext/xevie.c @@ -38,8 +38,8 @@ of the copyright holder. #include #endif -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -47,13 +47,13 @@ of the copyright holder. #include "scrnintstr.h" #include "servermd.h" #define _XEVIE_SERVER_ -#include -#include +#include +#include #include "input.h" #include "inputstr.h" #include "windowstr.h" #include "cursorstr.h" -#include +#include #include "../os/osdep.h" diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 36af17622..c0cc7f938 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -64,8 +64,8 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -74,7 +74,7 @@ #include "extnsionst.h" #define _XF86BIGFONT_SERVER_ -#include +#include static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ diff --git a/nx-X11/programs/Xserver/Xext/xf86dga.c b/nx-X11/programs/Xserver/Xext/xf86dga.c index 9979bfb30..074118c18 100644 --- a/nx-X11/programs/Xserver/Xext/xf86dga.c +++ b/nx-X11/programs/Xserver/Xext/xf86dga.c @@ -13,8 +13,8 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #define NEED_REPLIES #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -23,8 +23,8 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include -#include +#include +#include #include "swaprep.h" #include "dgaproc.h" diff --git a/nx-X11/programs/Xserver/Xext/xf86dga2.c b/nx-X11/programs/Xserver/Xext/xf86dga2.c index 490554d9a..c2b64b048 100644 --- a/nx-X11/programs/Xserver/Xext/xf86dga2.c +++ b/nx-X11/programs/Xserver/Xext/xf86dga2.c @@ -12,8 +12,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "dixevents.h" @@ -24,8 +24,8 @@ #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include -#include +#include +#include #include "swaprep.h" #include "dgaproc.h" #include "xf86dgaext.h" diff --git a/nx-X11/programs/Xserver/Xext/xf86misc.c b/nx-X11/programs/Xserver/Xext/xf86misc.c index 6de794e1f..ccf983fae 100644 --- a/nx-X11/programs/Xserver/Xext/xf86misc.c +++ b/nx-X11/programs/Xserver/Xext/xf86misc.c @@ -12,8 +12,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -22,16 +22,16 @@ #include "servermd.h" #define _XF86MISC_SERVER_ #undef _XF86MISC_SAVER_COMPAT_ -#include +#include #include "swaprep.h" #include "xf86.h" -#include +#include #include "xf86miscproc.h" #if 0 -#include +#include #include "../os/osdep.h" -#include +#include #ifndef USL #ifndef Lynx #include diff --git a/nx-X11/programs/Xserver/Xext/xf86vmode.c b/nx-X11/programs/Xserver/Xext/xf86vmode.c index 979f55c00..0595343c9 100644 --- a/nx-X11/programs/Xserver/Xext/xf86vmode.c +++ b/nx-X11/programs/Xserver/Xext/xf86vmode.c @@ -39,15 +39,15 @@ from Kaleb S. KEITHLEY #define NEED_REPLIES #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" #include "servermd.h" #define _XF86VIDMODE_SERVER_ -#include +#include #include "swaprep.h" #include "xf86.h" #include "vidmodeproc.h" diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c index dc4018dd7..7b3555452 100644 --- a/nx-X11/programs/Xserver/Xext/xres.c +++ b/nx-X11/programs/Xserver/Xext/xres.c @@ -10,14 +10,14 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include +#include #include "pixmapstr.h" #include "modinit.h" diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c index 994b0c502..d9adc03c0 100644 --- a/nx-X11/programs/Xserver/Xext/xtest.c +++ b/nx-X11/programs/Xserver/Xext/xtest.c @@ -33,9 +33,9 @@ from The Open Group. #include #endif -#include +#include #define NEED_EVENTS -#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -46,11 +46,11 @@ from The Open Group. #include "dixevents.h" #include "sleepuntil.h" #define _XTEST_SERVER_ -#include -#include +#include +#include #ifdef XINPUT -#include -#include +#include +#include #define EXTENSION_EVENT_BASE 64 #include "extinit.h" /* LookupDeviceIntRec */ #endif /* XINPUT */ diff --git a/nx-X11/programs/Xserver/Xext/xtest1dd.c b/nx-X11/programs/Xserver/Xext/xtest1dd.c index c78cceed0..c945fd6bd 100644 --- a/nx-X11/programs/Xserver/Xext/xtest1dd.c +++ b/nx-X11/programs/Xserver/Xext/xtest1dd.c @@ -66,14 +66,14 @@ University of California. #endif #include -#include -#include -#include -#include +#include +#include +#include +#include #include "misc.h" #include "dixstruct.h" #define XTestSERVER_SIDE -#include +#include #include "xtest1dd.h" diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c index 985193a89..e7c3522ba 100644 --- a/nx-X11/programs/Xserver/Xext/xtest1di.c +++ b/nx-X11/programs/Xserver/Xext/xtest1di.c @@ -67,8 +67,8 @@ University of California. #endif #include -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "gcstruct.h" @@ -76,7 +76,7 @@ University of California. #include "dixstruct.h" #include "opaque.h" #define XTestSERVER_SIDE -#include +#include #include "modinit.h" #include "xtest1dd.h" diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index b361c0ff3..8037e6c45 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -52,8 +52,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "misc.h" #include "scrnintstr.h" #include "windowstr.h" @@ -63,12 +63,12 @@ SOFTWARE. #include "resource.h" #include "opaque.h" -#include -#include +#include +#include #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include +#include #endif #ifdef EXTMODULE diff --git a/nx-X11/programs/Xserver/Xext/xvdix.h b/nx-X11/programs/Xserver/Xext/xvdix.h index 99d918406..6e6e07302 100644 --- a/nx-X11/programs/Xserver/Xext/xvdix.h +++ b/nx-X11/programs/Xserver/Xext/xvdix.h @@ -54,7 +54,7 @@ SOFTWARE. */ #include "scrnintstr.h" -#include +#include extern int XvScreenIndex; extern unsigned long XvExtensionGeneration; diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c index bbbb34dcf..571bb9c46 100644 --- a/nx-X11/programs/Xserver/Xext/xvmain.c +++ b/nx-X11/programs/Xserver/Xext/xvmain.c @@ -79,8 +79,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "scrnintstr.h" @@ -95,8 +95,8 @@ SOFTWARE. #define GLOBAL -#include -#include +#include +#include #include "xvdix.h" #ifdef EXTMODULE diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c index 30de35a2b..b1441fa1d 100644 --- a/nx-X11/programs/Xserver/Xext/xvmc.c +++ b/nx-X11/programs/Xserver/Xext/xvmc.c @@ -6,8 +6,8 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -15,11 +15,11 @@ #include "scrnintstr.h" #include "extnsionst.h" #include "servermd.h" -#include +#include #include "xvdix.h" -#include -#include -#include +#include +#include +#include #include "xvmcext.h" #ifdef HAS_XVMCSHM diff --git a/nx-X11/programs/Xserver/Xext/xvmcext.h b/nx-X11/programs/Xserver/Xext/xvmcext.h index 7cb8af24d..b92a53225 100644 --- a/nx-X11/programs/Xserver/Xext/xvmcext.h +++ b/nx-X11/programs/Xserver/Xext/xvmcext.h @@ -2,7 +2,7 @@ #ifndef _XVMC_H #define _XVMC_H -#include +#include #include "xvdix.h" typedef struct { diff --git a/nx-X11/programs/Xserver/Xext/xvmod.c b/nx-X11/programs/Xserver/Xext/xvmod.c index 7899f3a75..258023f65 100644 --- a/nx-X11/programs/Xserver/Xext/xvmod.c +++ b/nx-X11/programs/Xserver/Xext/xvmod.c @@ -4,12 +4,12 @@ #include #endif -#include +#include #include "misc.h" #include "scrnintstr.h" #include "gc.h" -#include -#include +#include +#include #include "xvdix.h" #include "xvmodproc.h" diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c index c1df7eb73..8073649f1 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.c +++ b/nx-X11/programs/Xserver/Xi/allowev.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c index 144a51ed4..c4fa46ba7 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.c +++ b/nx-X11/programs/Xserver/Xi/chgdctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include /* control constants */ +#include +#include /* control constants */ #include "XIstubs.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c index 3ffac39b3..d78b32a17 100644 --- a/nx-X11/programs/Xserver/Xi/chgfctl.c +++ b/nx-X11/programs/Xserver/Xi/chgfctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include /* control constants */ +#include +#include /* control constants */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.c b/nx-X11/programs/Xserver/Xi/chgkbd.c index a8a6024d8..136d257c6 100644 --- a/nx-X11/programs/Xserver/Xi/chgkbd.c +++ b/nx-X11/programs/Xserver/Xi/chgkbd.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "XIstubs.h" #include "globals.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.c b/nx-X11/programs/Xserver/Xi/chgkmap.c index 3df376d9a..88afd9df7 100644 --- a/nx-X11/programs/Xserver/Xi/chgkmap.c +++ b/nx-X11/programs/Xserver/Xi/chgkmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/chgprop.c b/nx-X11/programs/Xserver/Xi/chgprop.c index 6e345d554..47db87293 100644 --- a/nx-X11/programs/Xserver/Xi/chgprop.c +++ b/nx-X11/programs/Xserver/Xi/chgprop.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c index bf2abd6b6..925d43c07 100644 --- a/nx-X11/programs/Xserver/Xi/chgptr.c +++ b/nx-X11/programs/Xserver/Xi/chgptr.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ diff --git a/nx-X11/programs/Xserver/Xi/closedev.c b/nx-X11/programs/Xserver/Xi/closedev.c index 8a57aeeee..ae46f50c6 100644 --- a/nx-X11/programs/Xserver/Xi/closedev.c +++ b/nx-X11/programs/Xserver/Xi/closedev.c @@ -59,13 +59,13 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ -#include -#include +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/devbell.c b/nx-X11/programs/Xserver/Xi/devbell.c index 190e32086..12c444137 100644 --- a/nx-X11/programs/Xserver/Xi/devbell.c +++ b/nx-X11/programs/Xserver/Xi/devbell.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c index f0c9aea3d..ce5fe9ec9 100644 --- a/nx-X11/programs/Xserver/Xi/exevents.c +++ b/nx-X11/programs/Xserver/Xi/exevents.c @@ -59,10 +59,10 @@ SOFTWARE. #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include "inputstr.h" #include "windowstr.h" #include "miscstruct.h" diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c index 0b27b5cf7..750fa46cb 100644 --- a/nx-X11/programs/Xserver/Xi/extinit.c +++ b/nx-X11/programs/Xserver/Xi/extinit.c @@ -61,13 +61,13 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "inputstr.h" #include "gcstruct.h" /* pointer for extnsionst.h*/ #include "extnsionst.h" /* extension entry */ -#include -#include +#include +#include #include "dixevents.h" #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/getbmap.c b/nx-X11/programs/Xserver/Xi/getbmap.c index a944d4cc8..ac2b69749 100644 --- a/nx-X11/programs/Xserver/Xi/getbmap.c +++ b/nx-X11/programs/Xserver/Xi/getbmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c index 527273ac4..d8c310d92 100644 --- a/nx-X11/programs/Xserver/Xi/getdctl.c +++ b/nx-X11/programs/Xserver/Xi/getdctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getfctl.c b/nx-X11/programs/Xserver/Xi/getfctl.c index 5652ad303..c6cb8457c 100644 --- a/nx-X11/programs/Xserver/Xi/getfctl.c +++ b/nx-X11/programs/Xserver/Xi/getfctl.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c index 3c1597cc9..61a98f1bf 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.c +++ b/nx-X11/programs/Xserver/Xi/getfocus.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getkmap.c b/nx-X11/programs/Xserver/Xi/getkmap.c index 4e67d9c71..fe8fd9b22 100644 --- a/nx-X11/programs/Xserver/Xi/getkmap.c +++ b/nx-X11/programs/Xserver/Xi/getkmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getmmap.c b/nx-X11/programs/Xserver/Xi/getmmap.c index 6b2e38d0b..203799103 100644 --- a/nx-X11/programs/Xserver/Xi/getmmap.c +++ b/nx-X11/programs/Xserver/Xi/getmmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include /* Request macro */ +#include +#include /* Request macro */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getprop.c b/nx-X11/programs/Xserver/Xi/getprop.c index 2b4de1f3e..ac37617ec 100644 --- a/nx-X11/programs/Xserver/Xi/getprop.c +++ b/nx-X11/programs/Xserver/Xi/getprop.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structs */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/getselev.c b/nx-X11/programs/Xserver/Xi/getselev.c index c2ec2b9d5..7cd97b5ef 100644 --- a/nx-X11/programs/Xserver/Xi/getselev.c +++ b/nx-X11/programs/Xserver/Xi/getselev.c @@ -59,10 +59,10 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include -#include +#include /* for inputstr.h */ +#include /* Request macro */ +#include +#include #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window struct */ #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c index 3a335dd31..7743e797f 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.c +++ b/nx-X11/programs/Xserver/Xi/getvers.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/grabdev.c b/nx-X11/programs/Xserver/Xi/grabdev.c index 21e920a35..865263688 100644 --- a/nx-X11/programs/Xserver/Xi/grabdev.c +++ b/nx-X11/programs/Xserver/Xi/grabdev.c @@ -60,12 +60,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.c b/nx-X11/programs/Xserver/Xi/grabdevb.c index ad43c29a0..9a20345be 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevb.c +++ b/nx-X11/programs/Xserver/Xi/grabdevb.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include -#include +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index 952c5d89a..73b8690b9 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include -#include +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.c b/nx-X11/programs/Xserver/Xi/gtmotion.c index 02b1fee32..ec26ae407 100644 --- a/nx-X11/programs/Xserver/Xi/gtmotion.c +++ b/nx-X11/programs/Xserver/Xi/gtmotion.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index 6228352f5..e99584d0e 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index 520c6832a..054dae159 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index 34b140c8e..af2b4301d 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -40,12 +40,12 @@ from The Open Group. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/selectev.c b/nx-X11/programs/Xserver/Xi/selectev.c index a9b731864..de29fcf59 100644 --- a/nx-X11/programs/Xserver/Xi/selectev.c +++ b/nx-X11/programs/Xserver/Xi/selectev.c @@ -60,12 +60,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index 0b2a701bb..9decfadab 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -60,12 +60,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* Window */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/nx-X11/programs/Xserver/Xi/setbmap.c b/nx-X11/programs/Xserver/Xi/setbmap.c index 37db5110d..74b8e3c05 100644 --- a/nx-X11/programs/Xserver/Xi/setbmap.c +++ b/nx-X11/programs/Xserver/Xi/setbmap.c @@ -62,11 +62,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c index 9b5b1e20d..04f55d4fc 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.c +++ b/nx-X11/programs/Xserver/Xi/setdval.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/setfocus.c b/nx-X11/programs/Xserver/Xi/setfocus.c index a1dd09d71..b9a495612 100644 --- a/nx-X11/programs/Xserver/Xi/setfocus.c +++ b/nx-X11/programs/Xserver/Xi/setfocus.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "dixevents.h" diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index 3fa2c7e7e..9fd8e7244 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/setmode.c b/nx-X11/programs/Xserver/Xi/setmode.c index f95ef5514..17c46515d 100644 --- a/nx-X11/programs/Xserver/Xi/setmode.c +++ b/nx-X11/programs/Xserver/Xi/setmode.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include -#include +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/nx-X11/programs/Xserver/Xi/stubs.c b/nx-X11/programs/Xserver/Xi/stubs.c index 2d9aad08b..33c55d3b7 100644 --- a/nx-X11/programs/Xserver/Xi/stubs.c +++ b/nx-X11/programs/Xserver/Xi/stubs.c @@ -62,11 +62,11 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "inputstr.h" -#include -#include +#include +#include #include "XIstubs.h" /*********************************************************************** diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.c b/nx-X11/programs/Xserver/Xi/ungrdev.c index 8de4cd225..b318fa044 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdev.c +++ b/nx-X11/programs/Xserver/Xi/ungrdev.c @@ -59,11 +59,11 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.c b/nx-X11/programs/Xserver/Xi/ungrdevb.c index 8927a5c6e..a76f9692c 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevb.c +++ b/nx-X11/programs/Xserver/Xi/ungrdevb.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.c b/nx-X11/programs/Xserver/Xi/ungrdevk.c index 38cfa1b71..928b602f1 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevk.c +++ b/nx-X11/programs/Xserver/Xi/ungrdevk.c @@ -59,12 +59,12 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include -#include +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/nx-X11/programs/Xserver/composite/compint.h b/nx-X11/programs/Xserver/composite/compint.h index 9a6a22f48..262d95108 100644 --- a/nx-X11/programs/Xserver/composite/compint.h +++ b/nx-X11/programs/Xserver/composite/compint.h @@ -50,7 +50,7 @@ #include "damage.h" #include "damageextint.h" #include "xfixes.h" -#include +#include #include /* diff --git a/nx-X11/programs/Xserver/damageext/damageextint.h b/nx-X11/programs/Xserver/damageext/damageextint.h index ab00effe3..d2f9d71ac 100644 --- a/nx-X11/programs/Xserver/damageext/damageextint.h +++ b/nx-X11/programs/Xserver/damageext/damageextint.h @@ -30,8 +30,8 @@ #define _DAMAGEEXTINT_H_ #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index ad5294a4c..064987dec 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -41,8 +41,8 @@ #include #endif -#include -#include +#include +#include #include "scrnintstr.h" #include "extnsionst.h" #include "gcstruct.h" diff --git a/nx-X11/programs/Xserver/dbe/dbestruct.h b/nx-X11/programs/Xserver/dbe/dbestruct.h index 69135a837..43c4c525b 100644 --- a/nx-X11/programs/Xserver/dbe/dbestruct.h +++ b/nx-X11/programs/Xserver/dbe/dbestruct.h @@ -39,7 +39,7 @@ /* INCLUDES */ #define NEED_DBE_PROTOCOL -#include +#include #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index 042f95953..b8383e11a 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -41,8 +41,8 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/dix/atom.c b/nx-X11/programs/Xserver/dix/atom.c index 207174280..583f2dafc 100644 --- a/nx-X11/programs/Xserver/dix/atom.c +++ b/nx-X11/programs/Xserver/dix/atom.c @@ -52,8 +52,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "misc.h" #include "resource.h" #include "dix.h" diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c index 32d9bae89..11a353f84 100644 --- a/nx-X11/programs/Xserver/dix/colormap.c +++ b/nx-X11/programs/Xserver/dix/colormap.c @@ -53,9 +53,9 @@ SOFTWARE. #include #endif -#include +#include #define NEED_EVENTS -#include +#include #include "misc.h" #include "dix.h" #include "colormapst.h" diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c index 187dd62c5..1e1dba36b 100644 --- a/nx-X11/programs/Xserver/dix/cursor.c +++ b/nx-X11/programs/Xserver/dix/cursor.c @@ -53,8 +53,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 917a3849a..91a92644c 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -54,12 +54,12 @@ SOFTWARE. #include #endif -#include +#include #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -68,11 +68,11 @@ SOFTWARE. #include "site.h" #define XKB_IN_SERVER #ifdef XKB -#include +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 71c22ae0e..b6010e627 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -109,15 +109,15 @@ int ProcInitialConnection(); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef XAPPGROUP -#include +#include #endif #ifdef XKB #define XKB_IN_SERVER #include "inputstr.h" -#include +#include #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index fac918963..6e515300d 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -56,9 +56,9 @@ Equipment Corporation. #include #endif -#include -#include -#include +#include +#include +#include #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" @@ -139,7 +139,7 @@ _NXGetFontPathError: #ifdef XF86BIGFONT #define _XF86BIGFONT_SERVER_ -#include +#include #endif #define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c index f3b3373d0..8bcfce619 100644 --- a/nx-X11/programs/Xserver/dix/dixutils.c +++ b/nx-X11/programs/Xserver/dix/dixutils.c @@ -88,18 +88,18 @@ Author: Adobe Systems Incorporated #include #endif -#include -#include +#include +#include #include "misc.h" #include "windowstr.h" #include "dixstruct.h" #include "pixmapstr.h" #include "scrnintstr.h" #define XK_LATIN1 -#include +#include #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif /* diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index ab995a772..1166bf84b 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -115,12 +115,12 @@ of the copyright holder. #include #endif -#include +#include #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -134,13 +134,13 @@ of the copyright holder. #include "globals.h" #ifdef XKB -#include +#include extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef XEVIE @@ -157,7 +157,7 @@ int xeviegrabState = 0; xEvent *xeviexE; #endif -#include +#include #include "exevents.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index 19333c151..dd6de9c63 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -51,10 +51,10 @@ SOFTWARE. #include #endif -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -63,7 +63,7 @@ SOFTWARE. #include "dispatch.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/gc.c b/nx-X11/programs/Xserver/dix/gc.c index 834919946..2c17de3d6 100644 --- a/nx-X11/programs/Xserver/dix/gc.c +++ b/nx-X11/programs/Xserver/dix/gc.c @@ -52,9 +52,9 @@ SOFTWARE. #include #endif -#include -#include -#include +#include +#include +#include #include "misc.h" #include "resource.h" #include "gcstruct.h" diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index 15eedf602..e4f43fd01 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -53,8 +53,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "misc.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/dix/grabs.c b/nx-X11/programs/Xserver/dix/grabs.c index e133c0dfc..839e930b1 100644 --- a/nx-X11/programs/Xserver/dix/grabs.c +++ b/nx-X11/programs/Xserver/dix/grabs.c @@ -52,10 +52,10 @@ SOFTWARE. #include #endif -#include +#include #include "misc.h" #define NEED_EVENTS -#include +#include #include "windowstr.h" #include "inputstr.h" #include "cursorstr.h" diff --git a/nx-X11/programs/Xserver/dix/initatoms.c b/nx-X11/programs/Xserver/dix/initatoms.c index a5972afd6..5f6244a76 100644 --- a/nx-X11/programs/Xserver/dix/initatoms.c +++ b/nx-X11/programs/Xserver/dix/initatoms.c @@ -7,8 +7,8 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "dix.h" void MakePredeclaredAtoms() diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index 954c260c2..6a5b0021d 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -84,9 +84,9 @@ Equipment Corporation. #include #endif -#include -#include /* for unistd.h */ -#include +#include +#include /* for unistd.h */ +#include #include "scrnintstr.h" #include "misc.h" #include "os.h" @@ -113,7 +113,7 @@ Equipment Corporation. #ifdef DPMSExtension #define DPMS_SERVER -#include +#include #include "dpmsproc.h" #endif diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c index 7888cf90a..463e31598 100644 --- a/nx-X11/programs/Xserver/dix/pixmap.c +++ b/nx-X11/programs/Xserver/dix/pixmap.c @@ -32,7 +32,7 @@ from The Open Group. #include #endif -#include +#include #include "scrnintstr.h" #include "misc.h" #include "os.h" diff --git a/nx-X11/programs/Xserver/dix/privates.c b/nx-X11/programs/Xserver/dix/privates.c index 36bbc65d1..d08883d1d 100644 --- a/nx-X11/programs/Xserver/dix/privates.c +++ b/nx-X11/programs/Xserver/dix/privates.c @@ -33,7 +33,7 @@ from The Open Group. #include #endif -#include +#include #include "scrnintstr.h" #include "misc.h" #include "os.h" diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index f462a3ebd..51cbc1a0d 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -51,10 +51,10 @@ SOFTWARE. #include #endif -#include +#include #define NEED_REPLIES #define NEED_EVENTS -#include +#include #include "windowstr.h" #include "propertyst.h" #include "dixstruct.h" @@ -62,7 +62,7 @@ SOFTWARE. #include "swaprep.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/dix/resource.c b/nx-X11/programs/Xserver/dix/resource.c index e0fc2b997..ed8a255f5 100644 --- a/nx-X11/programs/Xserver/dix/resource.c +++ b/nx-X11/programs/Xserver/dix/resource.c @@ -106,7 +106,7 @@ Equipment Corporation. #include #endif -#include +#include #include "misc.h" #include "os.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/dix/swaprep.c b/nx-X11/programs/Xserver/dix/swaprep.c index 9776cd437..b8f245408 100644 --- a/nx-X11/programs/Xserver/dix/swaprep.c +++ b/nx-X11/programs/Xserver/dix/swaprep.c @@ -52,10 +52,10 @@ SOFTWARE. #include #endif -#include +#include #define NEED_REPLIES #define NEED_EVENTS -#include +#include #include "misc.h" #include "dixstruct.h" #include diff --git a/nx-X11/programs/Xserver/dix/swapreq.c b/nx-X11/programs/Xserver/dix/swapreq.c index 7d57d551f..35a7e7527 100644 --- a/nx-X11/programs/Xserver/dix/swapreq.c +++ b/nx-X11/programs/Xserver/dix/swapreq.c @@ -52,10 +52,10 @@ SOFTWARE. #include #endif -#include +#include #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" /* for SendEvent */ diff --git a/nx-X11/programs/Xserver/dix/tables.c b/nx-X11/programs/Xserver/dix/tables.c index 5196f0e85..eb4f4c8d2 100644 --- a/nx-X11/programs/Xserver/dix/tables.c +++ b/nx-X11/programs/Xserver/dix/tables.c @@ -51,10 +51,10 @@ SOFTWARE. #include #endif -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "windowstr.h" #include "extnsionst.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index 340ca50cc..5854f2e95 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -105,11 +105,11 @@ Equipment Corporation. #include "globals.h" #ifdef XAPPGROUP -#include +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif /****** diff --git a/nx-X11/programs/Xserver/fb/fb.h b/nx-X11/programs/Xserver/fb/fb.h index 202638d32..b64f3a227 100644 --- a/nx-X11/programs/Xserver/fb/fb.h +++ b/nx-X11/programs/Xserver/fb/fb.h @@ -27,7 +27,7 @@ #ifndef _FB_H_ #define _FB_H_ -#include +#include #include "scrnintstr.h" #include "pixmap.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/fb/fbcmap.c b/nx-X11/programs/Xserver/fb/fbcmap.c index 762c51c9d..a7c8ca638 100644 --- a/nx-X11/programs/Xserver/fb/fbcmap.c +++ b/nx-X11/programs/Xserver/fb/fbcmap.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#include -#include +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/fb/fbpseudocolor.c b/nx-X11/programs/Xserver/fb/fbpseudocolor.c index 83d556a0e..469f3ea08 100644 --- a/nx-X11/programs/Xserver/fb/fbpseudocolor.c +++ b/nx-X11/programs/Xserver/fb/fbpseudocolor.c @@ -2,8 +2,8 @@ #include #endif -#include -#include +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "glyphstr.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h index dbed1e0d8..ec312bad2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h @@ -103,8 +103,8 @@ typedef XID KeySym64; #define NX_TRANS_SOCKET #define GC XlibGC -#include "Xlib.h" -#include "X11/extensions/shape.h" +#include +#include #undef GC #ifdef _XSERVER64_tmp diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 557798e7f..21bcc60e5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -33,7 +33,7 @@ #include "gcstruct.h" #include "xfixeswire.h" -#include +#include /* * Use asyncronous get property replies. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index 0fb9491a4..63c3b73c1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -25,7 +25,7 @@ #include "scrnintstr.h" #include "Agent.h" -#include +#include #include "opaque.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 862ce57d0..abc6a9380 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -38,8 +38,8 @@ is" without express or implied warranty. #include #include -#include -#include +#include +#include #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index c33564092..d965d574c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -66,7 +66,7 @@ #define Window XlibWindow #define Atom XlibAtom #define Time XlibXID -#include +#include #undef Window #undef Atom #undef Time @@ -90,10 +90,10 @@ #undef KeySym #undef XID -#include +#include #include "Shadow.h" -#include +#include "X11/include/Xrandr_nxagent.h" #include "NXlib.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h index c74fa151f..02b2b8cbe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h @@ -18,7 +18,7 @@ #ifndef __Events_H__ #define __Events_H__ -#include +#include #define ProcessedExpose (LASTEvent + 1) #define ProcessedNotify (LASTEvent + 2) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c index 4aca1ecdb..64ffb24a4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.c @@ -33,7 +33,7 @@ #include "../../include/gc.h" #include "../../include/window.h" -#include +#include "X11/include/xpm_nxagent.h" #include "Agent.h" #include "Pixmaps.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Icons.h b/nx-X11/programs/Xserver/hw/nxagent/Icons.h index 98e879662..b307f42e6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h @@ -19,7 +19,7 @@ #define __Icons_H__ #define Pixel XpmPixel -#include +#include "X11/include/xpm_nxagent.h" #undef Pixel #define NXAGENT_ICON_NAME "nxagent.xpm" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 835aebeb6..9ead48de1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -64,13 +64,13 @@ is" without express or implied warranty. #include "property.h" #include "Init.h" -#include +#include #define XKBSRV_NEED_FILE_FUNCS -#include -#include +#include +#include -#include "X11/extensions/XKBrules.h" +#include #include "Xatom.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h index d11561e18..a274b8a39 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h @@ -33,12 +33,12 @@ #else -#include -#include +#include +#include #endif -#include +#include /* * This revision number also appears in configure.ac, they have diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h index 8667ded16..b4433d6c1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h @@ -27,7 +27,7 @@ #ifndef NXAGENT_SERVER -#include +#include #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index af76ed4c2..704bfcc0d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -109,12 +109,13 @@ int ProcInitialConnection(); #define True 1 #endif +#include + #define GC XlibGC -#include +#include #undef GC #include "windowstr.h" -#include #include "dixfontstr.h" #include "gcstruct.h" #include "selection.h" @@ -135,15 +136,15 @@ int ProcInitialConnection(); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef XAPPGROUP -#include +#include #endif #ifdef XKB #define XKB_IN_SERVER #include "inputstr.h" -#include +#include #endif #include "Atoms.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index 4f41ee228..2f3a75147 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -73,16 +73,16 @@ Equipment Corporation. #include #endif -#include -#include -#include +#include +#include +#include +#include #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" #include "cursorstr.h" #include "misc.h" #include "opaque.h" -#include #include "dixfontstr.h" #include "closestr.h" @@ -172,7 +172,7 @@ _NXGetFontPathError: #ifdef XF86BIGFONT #define _XF86BIGFONT_SERVER_ -#include +#include #endif #define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index 5940fe7d1..11ff62947 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -132,13 +132,13 @@ of the copyright holder. #include #endif -#include +#include #include "Xlib.h" #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -152,13 +152,13 @@ of the copyright holder. #include "globals.h" #ifdef XKB -#include +#include extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef XEVIE @@ -175,7 +175,7 @@ int xeviegrabState = 0; xEvent *xeviexE; #endif -#include +#include #include "exevents.h" #include "extnsionst.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c index f964e2fd8..962367bf2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c @@ -68,10 +68,10 @@ SOFTWARE. #include #endif -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -80,7 +80,7 @@ SOFTWARE. #include "../../dix/dispatch.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h index e7bb2d841..5d7fcf640 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h @@ -50,7 +50,7 @@ #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ -#include +#include #include "../../render/picture.h" #include "screenint.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c index e1c6b6d8c..aa3c606f8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c @@ -97,10 +97,10 @@ Equipment Corporation. #include #endif -#include +#include #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "regionstr.h" @@ -112,7 +112,7 @@ Equipment Corporation. #include "dixstruct.h" #include "mi.h" -#include +#include #include "globals.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c index 8132e9dd0..a720cafbf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c @@ -67,7 +67,7 @@ SOFTWARE. #include #endif -#include +#include #include "regionstr.h" #include "region.h" #include "mi.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index a2d4a8e52..d6c5aa4dd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -68,10 +68,10 @@ SOFTWARE. #include #endif -#include +#include #define NEED_REPLIES #define NEED_EVENTS -#include +#include #include "windowstr.h" #include "propertyst.h" #include "dixstruct.h" @@ -79,7 +79,7 @@ SOFTWARE. #include "swaprep.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef LBX #include "lbxserve.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index 260355c6e..dc1d2387e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -47,8 +47,8 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -59,9 +59,9 @@ #include "colormapst.h" #include "extnsionst.h" #include "servermd.h" -#include -#include -#include +#include +#include +#include #include "cursorstr.h" #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index 833a33fd3..39a1992de 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -123,7 +123,7 @@ Equipment Corporation. #include #endif -#include +#include #include "misc.h" #include "os.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 3b40b82f7..95905fde7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -64,8 +64,8 @@ in this Software without prior written authorization from The Open Group. #include #define NEED_REPLIES #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -77,8 +77,8 @@ in this Software without prior written authorization from The Open Group. #include "extnsionst.h" #include "servermd.h" #define _XSHM_SERVER_ -#include -#include +#include +#include #ifdef EXTMODULE #include "xf86_ansic.h" #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index 4017099e9..4552ad563 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -123,11 +123,11 @@ Equipment Corporation. #include "globals.h" #ifdef XAPPGROUP -#include +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #include "Screen.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c index cfce34463..1724374a0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c @@ -71,8 +71,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "misc.h" #include "scrnintstr.h" #include "windowstr.h" @@ -82,12 +82,12 @@ SOFTWARE. #include "resource.h" #include "opaque.h" -#include -#include +#include +#include #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include +#include #endif #include "Trap.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 095aa7b08..491a92c2f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -77,13 +77,13 @@ is" without express or implied warranty. #include "Shadow.h" #include "Utils.h" -#include +#include "X11/include/Xrandr_nxagent.h" #define GC XlibGC #define Font XlibFont #define KeySym XlibKeySym #define XID XlibXID -#include +#include #undef GC #undef Font #undef KeySym diff --git a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c index 6bce2eaeb..30fe1968e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c +++ b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c @@ -29,9 +29,9 @@ is" without express or implied warranty. */ -#include -#include -#include +#include +#include +#include #undef Bool #include "screenint.h" #include "input.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h new file mode 100644 index 000000000..acfc5834e --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h @@ -0,0 +1,105 @@ +/* + * Copyright © 2000 Compaq Computer Corporation, Inc. + * Copyright © 2002 Hewlett-Packard Company, Inc. + * Copyright © 2006 Intel Corporation + * Copyright © 2008 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + * + * Author: Jim Gettys, HP Labs, Hewlett-Packard, Inc. + * Keith Packard, Intel Corporation + */ + +/* + * This file is a reduced version of the header file of + * + * + * This copy of code has been introduced to allow a clear namespace + * separation between and header files. + * + * This version of the Xrandr library header file only contains symbols + * required by nxagent and strictly avoids indirectly including + * from an X11 library that is also shipped in nx-X11/lib/. + * + * When using instead for inclusion in + * nxagent, it will attempt pulling in the + * header which in turn will include . However, the headers of + * the same name from should be used instead. + * + * FIXME: Once the nxagent Xserver starts using libXrender from X.Org, this + * hack can be removed. + * + * 2015/06/26, Mike Gabriel + */ + +#ifndef _XRANDR_H_ +#define _XRANDR_H_ + +#include +#include + +_XFUNCPROTOBEGIN + +typedef XID RRProvider; +typedef XID RRMode; + +/* + * Events. + */ + +typedef struct { + int type; /* event base */ + unsigned long serial; /* # of last request processed by server */ + Bool send_event; /* true if this came from a SendEvent request */ + Display *display; /* Display the event was read from */ + Window window; /* window which selected for this event */ + Window root; /* Root window for changed screen */ + Time timestamp; /* when the screen change occurred */ + Time config_timestamp; /* when the last configuration change */ + SizeID size_index; + SubpixelOrder subpixel_order; + Rotation rotation; + int width; + int height; + int mwidth; + int mheight; +} XRRScreenChangeNotifyEvent; + +typedef unsigned long XRRModeFlags; + +typedef struct _XRRModeInfo { + RRMode id; + unsigned int width; + unsigned int height; + unsigned long dotClock; + unsigned int hSyncStart; + unsigned int hSyncEnd; + unsigned int hTotal; + unsigned int hSkew; + unsigned int vSyncStart; + unsigned int vSyncEnd; + unsigned int vTotal; + char *name; + unsigned int nameLength; + XRRModeFlags modeFlags; +} XRRModeInfo; + +_XFUNCPROTOEND + +#endif /* _XRANDR_H_ */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h new file mode 100644 index 000000000..b02e5a913 --- /dev/null +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h @@ -0,0 +1,259 @@ +/* + * Copyright (C) 1989-95 GROUPE BULL + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of GROUPE BULL shall not be + * used in advertising or otherwise to promote the sale, use or other dealings + * in this Software without prior written authorization from GROUPE BULL. + */ + +/*****************************************************************************\ +* xpm.h: * +* * +* XPM library * +* Include file * +* * +* Developed by Arnaud Le Hors * +\*****************************************************************************/ + +/* + * This file is a reduced version of the header file of + * + * + * This copy of code has been introduced to allow a clear namespace + * separation between and header files. + * + * This version of the Xpm library header file only contains symbols + * required by nxagent and strictly avoids indirectly including + * from an X11 library that is also shipped in nx-X11/lib/. + * + * When using instead for inclusion in nxagent, it will + * attempt pulling in the header file. + * However, the headers of the same name from should be + * used instead. + * + * FIXME: Once the nxagent Xserver starts using libX11 from X.Org, this + * hack can be removed. + * + * 2015/06/26, Mike Gabriel + */ + +#ifndef XPM_h +#define XPM_h + +/* + * first some identification numbers: + * the version and revision numbers are determined with the following rule: + * SO Major number = LIB minor version number. + * SO Minor number = LIB sub-minor version number. + * e.g: Xpm version 3.2f + * we forget the 3 which is the format number, 2 gives 2, and f gives 6. + * thus we have XpmVersion = 2 and XpmRevision = 6 + * which gives SOXPMLIBREV = 2.6 + * + * Then the XpmIncludeVersion number is built from these numbers. + */ +#define XpmFormat 3 +#define XpmVersion 4 +#define XpmRevision 11 +#define XpmIncludeVersion ((XpmFormat * 100 + XpmVersion) * 100 + XpmRevision) + +#ifndef XPM_NUMBERS + +/* let's define Pixel if it is not done yet */ +#if ! defined(_XtIntrinsic_h) && ! defined(PIXEL_ALREADY_TYPEDEFED) +typedef unsigned long Pixel; /* Index into colormap */ +# define PIXEL_ALREADY_TYPEDEFED +#endif + +/* include headers from instead of */ +#include +#include + +/* Return ErrorStatus codes: + * null if full success + * positive if partial success + * negative if failure + */ + +#define XpmColorError 1 +#define XpmSuccess 0 +#define XpmOpenFailed -1 +#define XpmFileInvalid -2 +#define XpmNoMemory -3 +#define XpmColorFailed -4 + +typedef struct { + char *name; /* Symbolic color name */ + char *value; /* Color value */ + Pixel pixel; /* Color pixel */ +} XpmColorSymbol; + +typedef struct { + char *name; /* name of the extension */ + unsigned int nlines; /* number of lines in this extension */ + char **lines; /* pointer to the extension array of strings */ +} XpmExtension; + +typedef struct { + char *string; /* characters string */ + char *symbolic; /* symbolic name */ + char *m_color; /* monochrom default */ + char *g4_color; /* 4 level grayscale default */ + char *g_color; /* other level grayscale default */ + char *c_color; /* color default */ +} XpmColor; + +typedef struct { + unsigned int width; /* image width */ + unsigned int height; /* image height */ + unsigned int cpp; /* number of characters per pixel */ + unsigned int ncolors; /* number of colors */ + XpmColor *colorTable; /* list of related colors */ + unsigned int *data; /* image data */ +} XpmImage; + +typedef struct { + unsigned long valuemask; /* Specifies which attributes are defined */ + char *hints_cmt; /* Comment of the hints section */ + char *colors_cmt; /* Comment of the colors section */ + char *pixels_cmt; /* Comment of the pixels section */ + unsigned int x_hotspot; /* Returns the x hotspot's coordinate */ + unsigned int y_hotspot; /* Returns the y hotspot's coordinate */ + unsigned int nextensions; /* number of extensions */ + XpmExtension *extensions; /* pointer to array of extensions */ +} XpmInfo; + +typedef int (*XpmAllocColorFunc)( + Display* /* display */, + Colormap /* colormap */, + char* /* colorname */, + XColor* /* xcolor */, + void* /* closure */ +); + +typedef int (*XpmFreeColorsFunc)( + Display* /* display */, + Colormap /* colormap */, + Pixel* /* pixels */, + int /* npixels */, + void* /* closure */ +); + + +/* required struct for hw/nxagent/Holder.c */ +typedef struct { + unsigned long valuemask; /* Specifies which attributes are + defined */ + + Visual *visual; /* Specifies the visual to use */ + Colormap colormap; /* Specifies the colormap to use */ + unsigned int depth; /* Specifies the depth */ + unsigned int width; /* Returns the width of the created + pixmap */ + unsigned int height; /* Returns the height of the created + pixmap */ + unsigned int x_hotspot; /* Returns the x hotspot's + coordinate */ + unsigned int y_hotspot; /* Returns the y hotspot's + coordinate */ + unsigned int cpp; /* Specifies the number of char per + pixel */ + Pixel *pixels; /* List of used color pixels */ + unsigned int npixels; /* Number of used pixels */ + XpmColorSymbol *colorsymbols; /* List of color symbols to override */ + unsigned int numsymbols; /* Number of symbols */ + char *rgb_fname; /* RGB text file name */ + unsigned int nextensions; /* Number of extensions */ + XpmExtension *extensions; /* List of extensions */ + + unsigned int ncolors; /* Number of colors */ + XpmColor *colorTable; /* List of colors */ +/* 3.2 backward compatibility code */ + char *hints_cmt; /* Comment of the hints section */ + char *colors_cmt; /* Comment of the colors section */ + char *pixels_cmt; /* Comment of the pixels section */ +/* end 3.2 bc */ + unsigned int mask_pixel; /* Color table index of transparent + color */ + + /* Color Allocation Directives */ + Bool exactColors; /* Only use exact colors for visual */ + unsigned int closeness; /* Allowable RGB deviation */ + unsigned int red_closeness; /* Allowable red deviation */ + unsigned int green_closeness; /* Allowable green deviation */ + unsigned int blue_closeness; /* Allowable blue deviation */ + int color_key; /* Use colors from this color set */ + + Pixel *alloc_pixels; /* Returns the list of alloc'ed color + pixels */ + int nalloc_pixels; /* Returns the number of alloc'ed + color pixels */ + + Bool alloc_close_colors; /* Specify whether close colors should + be allocated using XAllocColor + or not */ + int bitmap_format; /* Specify the format of 1bit depth + images: ZPixmap or XYBitmap */ + + /* Color functions */ + XpmAllocColorFunc alloc_color; /* Application color allocator */ + XpmFreeColorsFunc free_colors; /* Application color de-allocator */ + void *color_closure; /* Application private data to pass to + alloc_color and free_colors */ + +} XpmAttributes; + +/* XpmAttributes value masks bits */ + +/* required masks bits for hw/nxagent/Holder.c */ +#define XpmDepth (1L<<2) +#define XpmSize (1L<<3) /* width & height */ + +/* macros for forward declarations of functions with prototypes */ +#define FUNC(f, t, p) extern t f p +#define LFUNC(f, t, p) static t f p + + +/* + * functions declarations (for building nxagent against system wide libXpm4, + * but also against libNX_X11 (as opposed to system-wide libX11). + */ + +_XFUNCPROTOBEGIN + +/* Keep for hw/nxagent/Holder.c */ +FUNC(XpmCreatePixmapFromData, int, (Display *display, + Drawable d, + char **data, + Pixmap *pixmap_return, + Pixmap *shapemask_return, + XpmAttributes *attributes)); +/* Keep for hw/nxagent/Display.c */ +FUNC(XpmReadFileToPixmap, int, (Display *display, + Drawable d, + const char *filename, + Pixmap *pixmap_return, + Pixmap *shapemask_return, + XpmAttributes *attributes)); + +_XFUNCPROTOEND + +#endif /* XPM_NUMBERS */ +#endif diff --git a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h index c51e0ee14..ca68c1b63 100644 --- a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h +++ b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h @@ -45,7 +45,7 @@ #ifndef XF86_LIBC_H #define XF86_LIBC_H 1 -#include +#include #include /* diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index d68ef940c..4c9b169a4 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -63,5 +63,5 @@ InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR)) -BuildIncludes($(HEADERS),X11,..) -InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) +BuildIncludes($(HEADERS),nx-X11,..) +InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) diff --git a/nx-X11/programs/Xserver/include/closestr.h b/nx-X11/programs/Xserver/include/closestr.h index c06010113..31b5693f5 100644 --- a/nx-X11/programs/Xserver/include/closestr.h +++ b/nx-X11/programs/Xserver/include/closestr.h @@ -33,7 +33,7 @@ from The Open Group. #define CLOSESTR_H #define NEED_REPLIES -#include +#include #include "closure.h" #include "dix.h" #include "misc.h" diff --git a/nx-X11/programs/Xserver/include/colormap.h b/nx-X11/programs/Xserver/include/colormap.h index d519bb782..67f44193d 100644 --- a/nx-X11/programs/Xserver/include/colormap.h +++ b/nx-X11/programs/Xserver/include/colormap.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef CMAP_H #define CMAP_H 1 -#include +#include #include "screenint.h" #include "window.h" diff --git a/nx-X11/programs/Xserver/include/dixfontstr.h b/nx-X11/programs/Xserver/include/dixfontstr.h index 948bf1adb..09a162451 100644 --- a/nx-X11/programs/Xserver/include/dixfontstr.h +++ b/nx-X11/programs/Xserver/include/dixfontstr.h @@ -30,7 +30,7 @@ SOFTWARE. #include #include "closure.h" #define NEED_REPLIES -#include /* for xQueryFontReply */ +#include /* for xQueryFontReply */ #define FONTCHARSET(font) (font) #define FONTMAXBOUNDS(font,field) (font)->info.maxbounds.field diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h index 53c78d2de..e4b5e9fe8 100644 --- a/nx-X11/programs/Xserver/include/dixstruct.h +++ b/nx-X11/programs/Xserver/include/dixstruct.h @@ -31,7 +31,7 @@ SOFTWARE. #include "cursor.h" #include "gc.h" #include "pixmap.h" -#include +#include /* * direct-mapped hash table, used by resource manager to store diff --git a/nx-X11/programs/Xserver/include/gc.h b/nx-X11/programs/Xserver/include/gc.h index 1c0c90d3e..1969e5cd7 100644 --- a/nx-X11/programs/Xserver/include/gc.h +++ b/nx-X11/programs/Xserver/include/gc.h @@ -50,15 +50,15 @@ SOFTWARE. #ifndef GC_H #define GC_H -#include /* for GContext, Mask */ +#include /* for GContext, Mask */ #ifndef _XTYPEDEF_POINTER /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 #endif /* _XTYPEDEF_POINTER */ -#include /* for Bool */ +#include /* for Bool */ -#include +#include #include "screenint.h" /* for ScreenPtr */ #include "pixmap.h" /* for DrawablePtr */ diff --git a/nx-X11/programs/Xserver/include/gcstruct.h b/nx-X11/programs/Xserver/include/gcstruct.h index 16779f692..71d3ace47 100644 --- a/nx-X11/programs/Xserver/include/gcstruct.h +++ b/nx-X11/programs/Xserver/include/gcstruct.h @@ -58,7 +58,7 @@ SOFTWARE. #include "region.h" #include "pixmap.h" #include "screenint.h" -#include +#include /* * functions which modify the state of the GC diff --git a/nx-X11/programs/Xserver/include/input.h b/nx-X11/programs/Xserver/include/input.h index 88cc98050..a7c8d0dfe 100644 --- a/nx-X11/programs/Xserver/include/input.h +++ b/nx-X11/programs/Xserver/include/input.h @@ -52,8 +52,8 @@ SOFTWARE. #include "misc.h" #include "screenint.h" -#include -#include +#include +#include #include "window.h" /* for WindowPtr */ #define DEVICE_INIT 0 diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h index 1576f1433..cb3051c94 100644 --- a/nx-X11/programs/Xserver/include/misc.h +++ b/nx-X11/programs/Xserver/include/misc.h @@ -77,16 +77,16 @@ OF THIS SOFTWARE. extern unsigned long globalSerialNumber; extern unsigned long serverGeneration; -#include -#include -#include -#include +#include +#include +#include +#include #ifndef _XTYPEDEF_POINTER /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 #endif /* _XTYPEDEF_POINTER */ -#include +#include #ifndef IN_MODULE #ifndef NULL @@ -121,7 +121,7 @@ typedef struct _xReq *xReqPtr; #include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ #ifndef IN_MODULE -#include /* for bcopy, bzero, and bcmp */ +#include /* for bcopy, bzero, and bcmp */ #endif #define NullBox ((BoxPtr)0) diff --git a/nx-X11/programs/Xserver/include/miscstruct.h b/nx-X11/programs/Xserver/include/miscstruct.h index 87874aae4..7df9240c9 100644 --- a/nx-X11/programs/Xserver/include/miscstruct.h +++ b/nx-X11/programs/Xserver/include/miscstruct.h @@ -51,7 +51,7 @@ SOFTWARE. #define MISCSTRUCT_H 1 #include "misc.h" -#include +#include #include "gc.h" typedef xPoint DDXPointRec; diff --git a/nx-X11/programs/Xserver/include/opaque.h b/nx-X11/programs/Xserver/include/opaque.h index ca29afdc0..749b6f5b9 100644 --- a/nx-X11/programs/Xserver/include/opaque.h +++ b/nx-X11/programs/Xserver/include/opaque.h @@ -31,7 +31,7 @@ from The Open Group. #ifndef OPAQUE_H #define OPAQUE_H -#include +#include #include "globals.h" diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index 551b35097..e150e1e0b 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -54,7 +54,7 @@ SOFTWARE. #include "misc.h" #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size)) #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((void *)(_ptr)) -#include +#include #ifndef IN_MODULE #include #else diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h index 297227493..0539ca516 100644 --- a/nx-X11/programs/Xserver/include/scrnintstr.h +++ b/nx-X11/programs/Xserver/include/scrnintstr.h @@ -56,7 +56,7 @@ SOFTWARE. #include "colormap.h" #include "cursor.h" #include "validate.h" -#include +#include #include "dix.h" typedef struct _PixmapFormat { diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h index cbfed645f..571115365 100644 --- a/nx-X11/programs/Xserver/include/window.h +++ b/nx-X11/programs/Xserver/include/window.h @@ -53,7 +53,7 @@ SOFTWARE. #include "misc.h" #include "region.h" #include "screenint.h" -#include +#include #define TOTALLY_OBSCURED 0 #define UNOBSCURED 1 diff --git a/nx-X11/programs/Xserver/include/windowstr.h b/nx-X11/programs/Xserver/include/windowstr.h index dab6fcf71..5c181bc51 100644 --- a/nx-X11/programs/Xserver/include/windowstr.h +++ b/nx-X11/programs/Xserver/include/windowstr.h @@ -58,7 +58,7 @@ SOFTWARE. #include "resource.h" /* for ROOT_WINDOW_ID_BASE */ #include "dix.h" #include "miscstruct.h" -#include +#include #include "opaque.h" #define GuaranteeNothing 0 diff --git a/nx-X11/programs/Xserver/mfb/maskbits.h b/nx-X11/programs/Xserver/mfb/maskbits.h index 7e2b74a18..94a7e8955 100644 --- a/nx-X11/programs/Xserver/mfb/maskbits.h +++ b/nx-X11/programs/Xserver/mfb/maskbits.h @@ -28,8 +28,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "servermd.h" diff --git a/nx-X11/programs/Xserver/mi/mi.h b/nx-X11/programs/Xserver/mi/mi.h index 0f3f5778f..6eea34b6c 100644 --- a/nx-X11/programs/Xserver/mi/mi.h +++ b/nx-X11/programs/Xserver/mi/mi.h @@ -49,7 +49,7 @@ SOFTWARE. #ifndef MI_H #define MI_H -#include +#include #include "region.h" #include "validate.h" #include "window.h" diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c index f06c4b51d..8db188a6e 100644 --- a/nx-X11/programs/Xserver/mi/miarc.c +++ b/nx-X11/programs/Xserver/mi/miarc.c @@ -62,8 +62,8 @@ SOFTWARE. #include #undef _XOPEN_SOURCE #endif -#include -#include +#include +#include #include "misc.h" #include "gcstruct.h" #include "scrnintstr.h" @@ -72,7 +72,7 @@ SOFTWARE. #include "mifpoly.h" #include "mi.h" #include "mifillarc.h" -#include +#include static double miDsin(double a); static double miDcos(double a); diff --git a/nx-X11/programs/Xserver/mi/mibitblt.c b/nx-X11/programs/Xserver/mi/mibitblt.c index 0caad083f..60318a046 100644 --- a/nx-X11/programs/Xserver/mi/mibitblt.c +++ b/nx-X11/programs/Xserver/mi/mibitblt.c @@ -52,8 +52,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "misc.h" #include "gcstruct.h" @@ -62,7 +62,7 @@ SOFTWARE. #include "scrnintstr.h" #include "mi.h" #include "regionstr.h" -#include +#include #include "servermd.h" #ifndef HAS_FFS diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c index f18648f66..875ec87f3 100644 --- a/nx-X11/programs/Xserver/mi/mibstore.c +++ b/nx-X11/programs/Xserver/mi/mibstore.c @@ -49,9 +49,9 @@ implied warranty. #include #endif -#include -#include -#include +#include +#include +#include #include "misc.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/mi/miclipn.c b/nx-X11/programs/Xserver/mi/miclipn.c index 14ff0d69a..913b0e47a 100644 --- a/nx-X11/programs/Xserver/mi/miclipn.c +++ b/nx-X11/programs/Xserver/mi/miclipn.c @@ -32,7 +32,7 @@ from The Open Group. #include #endif -#include +#include #include "windowstr.h" #include "scrnintstr.h" #include "mi.h" diff --git a/nx-X11/programs/Xserver/mi/micmap.c b/nx-X11/programs/Xserver/mi/micmap.c index 98f3e521d..15d3f7f46 100644 --- a/nx-X11/programs/Xserver/mi/micmap.c +++ b/nx-X11/programs/Xserver/mi/micmap.c @@ -40,8 +40,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#include -#include +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c index f3dae5768..782ddad49 100644 --- a/nx-X11/programs/Xserver/mi/miexpose.c +++ b/nx-X11/programs/Xserver/mi/miexpose.c @@ -80,10 +80,10 @@ Equipment Corporation. #include #endif -#include +#include #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "regionstr.h" @@ -95,7 +95,7 @@ Equipment Corporation. #include "dixstruct.h" #include "mi.h" -#include +#include #include "globals.h" diff --git a/nx-X11/programs/Xserver/mi/mifillarc.c b/nx-X11/programs/Xserver/mi/mifillarc.c index 0dcf25d05..533bfe996 100644 --- a/nx-X11/programs/Xserver/mi/mifillarc.c +++ b/nx-X11/programs/Xserver/mi/mifillarc.c @@ -34,8 +34,8 @@ Author: Bob Scheifler, MIT X Consortium #endif #include -#include -#include +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/mifillrct.c b/nx-X11/programs/Xserver/mi/mifillrct.c index 9f68db720..8a8f2b4f3 100644 --- a/nx-X11/programs/Xserver/mi/mifillrct.c +++ b/nx-X11/programs/Xserver/mi/mifillrct.c @@ -51,8 +51,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmap.h" diff --git a/nx-X11/programs/Xserver/mi/mifpolycon.c b/nx-X11/programs/Xserver/mi/mifpolycon.c index 40b83586f..95b81bbb6 100644 --- a/nx-X11/programs/Xserver/mi/mifpolycon.c +++ b/nx-X11/programs/Xserver/mi/mifpolycon.c @@ -51,7 +51,7 @@ SOFTWARE. #endif #include -#include +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index b70a6a67e..f4ff4c243 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -191,35 +191,35 @@ typedef void (*InitExtension)(INITARGS); #ifdef MITSHM #define _XSHM_SERVER_ -#include +#include #endif #ifdef XTEST #define _XTEST_SERVER_ -#include +#include #endif #ifdef XKB -#include +#include #endif #ifdef LBX #define _XLBX_SERVER_ -#include +#include #endif #ifdef XAPPGROUP #define _XAG_SERVER_ -#include +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef PANORAMIX -#include +#include #endif #ifdef XF86BIGFONT -#include +#include #endif #ifdef RES -#include +#include #endif /* FIXME: this whole block of externs should be from the appropriate headers */ diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c index 732e47af0..f67704e11 100644 --- a/nx-X11/programs/Xserver/mi/mioverlay.c +++ b/nx-X11/programs/Xserver/mi/mioverlay.c @@ -4,7 +4,7 @@ #include #endif -#include +#include #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/mi/mipoly.c b/nx-X11/programs/Xserver/mi/mipoly.c index 403d3da56..11214a732 100644 --- a/nx-X11/programs/Xserver/mi/mipoly.c +++ b/nx-X11/programs/Xserver/mi/mipoly.c @@ -60,7 +60,7 @@ SOFTWARE. #include #endif -#include +#include #include "windowstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/mipolygen.c b/nx-X11/programs/Xserver/mi/mipolygen.c index c3d9ef397..98fe21d50 100644 --- a/nx-X11/programs/Xserver/mi/mipolygen.c +++ b/nx-X11/programs/Xserver/mi/mipolygen.c @@ -50,7 +50,7 @@ SOFTWARE. #include #endif -#include +#include #include "gcstruct.h" #include "miscanfill.h" #include "mipoly.h" diff --git a/nx-X11/programs/Xserver/mi/mipolypnt.c b/nx-X11/programs/Xserver/mi/mipolypnt.c index 5d615c28d..dcbdf85d0 100644 --- a/nx-X11/programs/Xserver/mi/mipolypnt.c +++ b/nx-X11/programs/Xserver/mi/mipolypnt.c @@ -50,8 +50,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/nx-X11/programs/Xserver/mi/mipolyrect.c b/nx-X11/programs/Xserver/mi/mipolyrect.c index 98e467f9f..9b21bb032 100644 --- a/nx-X11/programs/Xserver/mi/mipolyrect.c +++ b/nx-X11/programs/Xserver/mi/mipolyrect.c @@ -50,8 +50,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" diff --git a/nx-X11/programs/Xserver/mi/mipolyseg.c b/nx-X11/programs/Xserver/mi/mipolyseg.c index dcf3d815a..bd3c93ed6 100644 --- a/nx-X11/programs/Xserver/mi/mipolyseg.c +++ b/nx-X11/programs/Xserver/mi/mipolyseg.c @@ -50,8 +50,8 @@ SOFTWARE. #include #endif -#include -#include +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" diff --git a/nx-X11/programs/Xserver/mi/mipushpxl.c b/nx-X11/programs/Xserver/mi/mipushpxl.c index 5fce1cae7..44834db50 100644 --- a/nx-X11/programs/Xserver/mi/mipushpxl.c +++ b/nx-X11/programs/Xserver/mi/mipushpxl.c @@ -50,7 +50,7 @@ SOFTWARE. #include #endif -#include +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/miregion.c b/nx-X11/programs/Xserver/mi/miregion.c index 5ec4ec55a..1df0dcc46 100644 --- a/nx-X11/programs/Xserver/mi/miregion.c +++ b/nx-X11/programs/Xserver/mi/miregion.c @@ -82,7 +82,7 @@ Equipment Corporation. #endif #include "regionstr.h" -#include +#include #include "gc.h" #include "mi.h" #include "mispans.h" diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index 78e2af5a4..4950eaa93 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -32,7 +32,7 @@ from The Open Group. #include #endif -#include +#include #include "servermd.h" #include "misc.h" #include "mi.h" @@ -42,7 +42,7 @@ from The Open Group. #include "miline.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include +#include #endif /* We use this structure to propogate some information from miScreenInit to diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c index 44cf18f2e..fa9ef4591 100644 --- a/nx-X11/programs/Xserver/mi/miwideline.c +++ b/nx-X11/programs/Xserver/mi/miwideline.c @@ -47,7 +47,7 @@ from The Open Group. #include #undef _XOPEN_SOURCE #endif -#include +#include #include "windowstr.h" #include "gcstruct.h" #include "regionstr.h" diff --git a/nx-X11/programs/Xserver/mi/miwindow.c b/nx-X11/programs/Xserver/mi/miwindow.c index 179c6e31e..44b7ada60 100644 --- a/nx-X11/programs/Xserver/mi/miwindow.c +++ b/nx-X11/programs/Xserver/mi/miwindow.c @@ -50,7 +50,7 @@ SOFTWARE. #include #endif -#include +#include #include "regionstr.h" #include "region.h" #include "mi.h" diff --git a/nx-X11/programs/Xserver/mi/mizerarc.c b/nx-X11/programs/Xserver/mi/mizerarc.c index 62402f41b..4b4d724a6 100644 --- a/nx-X11/programs/Xserver/mi/mizerarc.c +++ b/nx-X11/programs/Xserver/mi/mizerarc.c @@ -40,8 +40,8 @@ Author: Bob Scheifler, MIT X Consortium #endif #include -#include -#include +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/nx-X11/programs/Xserver/mi/mizerclip.c b/nx-X11/programs/Xserver/mi/mizerclip.c index e648b21d4..6acfc7fe0 100644 --- a/nx-X11/programs/Xserver/mi/mizerclip.c +++ b/nx-X11/programs/Xserver/mi/mizerclip.c @@ -49,7 +49,7 @@ SOFTWARE. #include #endif -#include +#include #include "misc.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/mi/mizerline.c b/nx-X11/programs/Xserver/mi/mizerline.c index 8e62a8c94..5a61ff5d6 100644 --- a/nx-X11/programs/Xserver/mi/mizerline.c +++ b/nx-X11/programs/Xserver/mi/mizerline.c @@ -50,7 +50,7 @@ SOFTWARE. #include #endif -#include +#include #include "misc.h" #include "scrnintstr.h" diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index d97d44ab6..0a18c28c8 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -78,19 +78,19 @@ SOFTWARE. #endif #ifdef WIN32 -#include +#include #endif -#include /* for strings, fcntl, time */ +#include /* for strings, fcntl, time */ #include #include -#include +#include #include "misc.h" #ifdef __UNIXOS2__ #define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t) #endif #include "osdep.h" -#include +#include #include "dixstruct.h" #include "opaque.h" #ifdef DPMSExtension @@ -138,7 +138,7 @@ mffs(fd_mask mask) #ifdef DPMSExtension #define DPMS_SERVER -#include +#include #endif #ifdef XTESTEXT1 diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index 07b460f40..05dfaf38a 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -62,15 +62,15 @@ SOFTWARE. #endif #ifdef WIN32 -#include +#include #endif #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "misc.h" #include "site.h" #include @@ -197,14 +197,14 @@ SOFTWARE. #endif #define X_INCLUDE_NETDB_H -#include +#include #include "dixstruct.h" #include "osdep.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifndef PATH_MAX diff --git a/nx-X11/programs/Xserver/os/auth.c b/nx-X11/programs/Xserver/os/auth.c index dfb6f8899..c14c1e874 100644 --- a/nx-X11/programs/Xserver/os/auth.c +++ b/nx-X11/programs/Xserver/os/auth.c @@ -57,8 +57,8 @@ from The Open Group. #ifdef K5AUTH # include #endif -# include -# include +# include +# include # include "misc.h" # include "osdep.h" # include "dixstruct.h" @@ -66,10 +66,10 @@ from The Open Group. # include #ifdef XCSECURITY #define _SECURITY_SERVER -# include +# include #endif #ifdef WIN32 -#include +#include #endif struct protocol { diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index 0f846d084..ef71cd540 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -68,14 +68,14 @@ SOFTWARE. #endif #ifdef WIN32 -#include +#include #endif -#include -#include +#include +#include #define XSERV_t #define TRANS_SERVER #define TRANS_REOPEN -#include +#include #include #include #include @@ -144,15 +144,15 @@ extern __const__ int _nfiles; #endif /* WIN32 */ #include "misc.h" #include "osdep.h" -#include +#include #include "opaque.h" #include "dixstruct.h" #ifdef XAPPGROUP -#include +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef LBX #include "colormapst.h" diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index b92e7c4ae..ccfc01dfe 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -63,11 +63,11 @@ SOFTWARE. #define DEBUG_COMMUNICATION #endif #ifdef WIN32 -#include +#include #endif #include -#include -#include +#include +#include #include #if !defined(__UNIXOS2__) && !defined(WIN32) #ifndef Lynx @@ -76,12 +76,12 @@ SOFTWARE. #include #endif #endif -#include +#include #define NEED_REPLIES -#include +#include #include "os.h" #include "osdep.h" -#include +#include #include "opaque.h" #include "dixstruct.h" #include "misc.h" @@ -125,7 +125,7 @@ OsCommPtr AvailableInput = (OsCommPtr)NULL; lswaps((req)->length) : (req)->length) #ifdef BIGREQS -#include +#include #define get_big_req_len(req,cli) ((cli)->swapped ? \ lswapl(((xBigReq *)(req))->length) : \ diff --git a/nx-X11/programs/Xserver/os/k5auth.c b/nx-X11/programs/Xserver/os/k5auth.c index 3c50de032..f2ed5369d 100644 --- a/nx-X11/programs/Xserver/os/k5auth.c +++ b/nx-X11/programs/Xserver/os/k5auth.c @@ -54,11 +54,11 @@ from The Open Group. #undef BITS32 #undef xfree #include -#include +#include #include "os.h" #include "osdep.h" -#include -#include +#include +#include #include "dixstruct.h" #include #include "Xauth.h" diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 9af39800f..2444cd333 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -99,7 +99,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include #endif -#include +#include #include #include #include diff --git a/nx-X11/programs/Xserver/os/mitauth.c b/nx-X11/programs/Xserver/os/mitauth.c index 2f42fd41f..abf7976af 100644 --- a/nx-X11/programs/Xserver/os/mitauth.c +++ b/nx-X11/programs/Xserver/os/mitauth.c @@ -37,7 +37,7 @@ from The Open Group. #include #endif -#include +#include #include "os.h" #include "osdep.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index e8c2d5959..e0c5de3a8 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -103,7 +103,7 @@ SOFTWARE. #endif #endif -#include +#include /* * MAXSOCKS is used only for initialising MaxClients when no other method diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c index ea99ace21..ca707d4b2 100644 --- a/nx-X11/programs/Xserver/os/osinit.c +++ b/nx-X11/programs/Xserver/os/osinit.c @@ -52,10 +52,10 @@ SOFTWARE. #endif #include -#include +#include #include "os.h" #include "osdep.h" -#include +#include #ifdef SMART_SCHEDULE #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c index 896291e59..94c26651b 100644 --- a/nx-X11/programs/Xserver/os/rpcauth.c +++ b/nx-X11/programs/Xserver/os/rpcauth.c @@ -40,7 +40,7 @@ from The Open Group. #ifdef SECURE_RPC -#include +#include #include "Xauth.h" #include "misc.h" #include "os.h" diff --git a/nx-X11/programs/Xserver/os/secauth.c b/nx-X11/programs/Xserver/os/secauth.c index 1000b4e79..eadb17b40 100644 --- a/nx-X11/programs/Xserver/os/secauth.c +++ b/nx-X11/programs/Xserver/os/secauth.c @@ -30,7 +30,7 @@ from The Open Group. #include #endif -#include +#include #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -38,7 +38,7 @@ from The Open Group. #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif static char InvalidPolicyReason[] = "invalid policy specification"; diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index b09190c4e..3ab08897a 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -79,13 +79,13 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #if defined(WIN32) && !defined(__CYGWIN__) -#include +#include #endif -#include +#include #include #include "misc.h" -#include -#include +#include +#include #include "input.h" #include "dixfont.h" #include "osdep.h" @@ -136,11 +136,11 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #ifdef XKB -#include +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include +#include #endif #ifdef RENDER @@ -258,7 +258,7 @@ Bool noXvExtension = FALSE; #endif #define X_INCLUDE_NETDB_H -#include +#include #include diff --git a/nx-X11/programs/Xserver/os/xalloc.c b/nx-X11/programs/Xserver/os/xalloc.c index a2487d4bc..4d2d3f1ee 100644 --- a/nx-X11/programs/Xserver/os/xalloc.c +++ b/nx-X11/programs/Xserver/os/xalloc.c @@ -39,9 +39,9 @@ Pascal Haible. #include /* for malloc() etc. */ -#include +#include #include "misc.h" -#include +#include #ifdef XALLOC_LOG #include diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c index e02ca349c..92fbde478 100644 --- a/nx-X11/programs/Xserver/os/xdmauth.c +++ b/nx-X11/programs/Xserver/os/xdmauth.c @@ -40,8 +40,8 @@ from The Open Group. #endif #include -#include -#include +#include +#include #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -51,7 +51,7 @@ from The Open Group. static Bool authFromXDMCP; #ifdef XDMCP -#include +#include #undef REQUEST #include diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index 675e9c456..4181e52ce 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -21,10 +21,10 @@ #endif #ifdef WIN32 -#include +#include #endif -#include +#include #if !defined(WIN32) #ifndef Lynx @@ -39,10 +39,10 @@ #include #include -#include -#include +#include +#include #include "misc.h" -#include +#include #include "osdep.h" #include "input.h" #include "dixstruct.h" @@ -76,7 +76,7 @@ #include #define X_INCLUDE_NETDB_H -#include +#include #ifdef NX_TRANS_SOCKET diff --git a/nx-X11/programs/Xserver/os/xprintf.c b/nx-X11/programs/Xserver/os/xprintf.c index 54bbeefe2..4423208ff 100644 --- a/nx-X11/programs/Xserver/os/xprintf.c +++ b/nx-X11/programs/Xserver/os/xprintf.c @@ -30,7 +30,7 @@ #include #endif -#include +#include #include "os.h" #include #include diff --git a/nx-X11/programs/Xserver/randr/randrproto.h b/nx-X11/programs/Xserver/randr/randrproto.h index 7d5c139e9..bded957fa 100644 --- a/nx-X11/programs/Xserver/randr/randrproto.h +++ b/nx-X11/programs/Xserver/randr/randrproto.h @@ -30,7 +30,7 @@ #ifndef _XRANDRP_H_ #define _XRANDRP_H_ -/*#include */ +/*#include */ #include "randr.h" #define Window CARD32 diff --git a/nx-X11/programs/Xserver/randr/randrstr.h b/nx-X11/programs/Xserver/randr/randrstr.h index 3c3db2c13..bab784b8f 100644 --- a/nx-X11/programs/Xserver/randr/randrstr.h +++ b/nx-X11/programs/Xserver/randr/randrstr.h @@ -32,8 +32,8 @@ #ifndef _RANDRSTR_H_ #define _RANDRSTR_H_ -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -44,17 +44,17 @@ #include "extnsionst.h" #include "servermd.h" #ifndef NXAGENT_SERVER -#include -#include +#include +#include #else #include "randr.h" #include "randrproto.h" #endif #ifdef RENDER -#include /* we share subpixel order information */ +#include /* we share subpixel order information */ #include "picturestr.h" #endif -#include +#include /* required for ABI compatibility for now */ #define RANDR_10_INTERFACE 1 diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c index 5441f8abc..2bc17cf21 100644 --- a/nx-X11/programs/Xserver/randr/rrxinerama.c +++ b/nx-X11/programs/Xserver/randr/rrxinerama.c @@ -88,7 +88,7 @@ #include "randrstr.h" #include "swaprep.h" #ifndef NXAGENT_SERVER -#include +#include #else #include "panoramiXproto.h" #endif diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index aa1cd7543..2c5b867b4 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -43,7 +43,7 @@ and Jim Haggerty of Metheus. #include "dixstruct.h" #include "extnsionst.h" #define _XRECORD_SERVER_ -#include +#include #include "set.h" #ifndef XFree86LOADER diff --git a/nx-X11/programs/Xserver/render/animcur.c b/nx-X11/programs/Xserver/render/animcur.c index 15293af64..27e5ab949 100644 --- a/nx-X11/programs/Xserver/render/animcur.c +++ b/nx-X11/programs/Xserver/render/animcur.c @@ -36,8 +36,8 @@ #include #endif -#include -#include +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/render/glyphstr.h b/nx-X11/programs/Xserver/render/glyphstr.h index e9bbd19b0..f27a73fbb 100644 --- a/nx-X11/programs/Xserver/render/glyphstr.h +++ b/nx-X11/programs/Xserver/render/glyphstr.h @@ -26,7 +26,7 @@ #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ -#include +#include #include "picture.h" #include "screenint.h" diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c index 8d644b35e..2dedbc9c4 100644 --- a/nx-X11/programs/Xserver/render/render.c +++ b/nx-X11/programs/Xserver/render/render.c @@ -30,8 +30,8 @@ #include #endif -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -42,11 +42,11 @@ #include "colormapst.h" #include "extnsionst.h" #include "servermd.h" -#include -#include +#include +#include #include "picturestr.h" #include "glyphstr.h" -#include +#include #include "cursorstr.h" #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/nx-X11/programs/Xserver/xfixes/xfixesint.h b/nx-X11/programs/Xserver/xfixes/xfixesint.h index 4892654be..a883acaec 100755 --- a/nx-X11/programs/Xserver/xfixes/xfixesint.h +++ b/nx-X11/programs/Xserver/xfixes/xfixesint.h @@ -30,13 +30,13 @@ #define _XFIXESINT_H_ #define NEED_EVENTS -#include -#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include +#include #include "windowstr.h" #include "selection.h" #include "xfixes.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxBeep.c b/nx-X11/programs/Xserver/xkb/ddxBeep.c index 22d62a502..e99e4c2dd 100644 --- a/nx-X11/programs/Xserver/xkb/ddxBeep.c +++ b/nx-X11/programs/Xserver/xkb/ddxBeep.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include #if (defined(__osf__) && defined(__alpha)) #include diff --git a/nx-X11/programs/Xserver/xkb/ddxConfig.c b/nx-X11/programs/Xserver/xkb/ddxConfig.c index b023531dc..8ffd344ca 100644 --- a/nx-X11/programs/Xserver/xkb/ddxConfig.c +++ b/nx-X11/programs/Xserver/xkb/ddxConfig.c @@ -32,16 +32,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" #include "os.h" #define XKBSRV_NEED_FILE_FUNCS -#include -#include +#include +#include Bool XkbDDXApplyConfig(XPointer cfg_in,XkbSrvInfoPtr info) diff --git a/nx-X11/programs/Xserver/xkb/ddxCtrls.c b/nx-X11/programs/Xserver/xkb/ddxCtrls.c index 2e4e106ce..9fee8aa30 100644 --- a/nx-X11/programs/Xserver/xkb/ddxCtrls.c +++ b/nx-X11/programs/Xserver/xkb/ddxCtrls.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include void XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl) diff --git a/nx-X11/programs/Xserver/xkb/ddxDevBtn.c b/nx-X11/programs/Xserver/xkb/ddxDevBtn.c index d0e37f263..04094e787 100644 --- a/nx-X11/programs/Xserver/xkb/ddxDevBtn.c +++ b/nx-X11/programs/Xserver/xkb/ddxDevBtn.c @@ -32,15 +32,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include -#include +#include +#include +#include extern int DeviceValuator; diff --git a/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c b/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c index 73c8a2415..b77d040ff 100644 --- a/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c +++ b/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include void XkbDDXFakePointerButton(int event,int button) diff --git a/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c b/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c index ffd6f5d79..33fa49ae7 100644 --- a/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c +++ b/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c @@ -33,14 +33,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include #ifdef PANORAMIX #include "panoramiX.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxInit.c b/nx-X11/programs/Xserver/xkb/ddxInit.c index 8b76b7cb1..00ffea14e 100644 --- a/nx-X11/programs/Xserver/xkb/ddxInit.c +++ b/nx-X11/programs/Xserver/xkb/ddxInit.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include int XkbDDXInitDevice(DeviceIntPtr dev) diff --git a/nx-X11/programs/Xserver/xkb/ddxKeyClick.c b/nx-X11/programs/Xserver/xkb/ddxKeyClick.c index c940e5321..e56377ca5 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKeyClick.c +++ b/nx-X11/programs/Xserver/xkb/ddxKeyClick.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include void XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic) diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c index b78dc420d..44fad85ca 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c +++ b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c @@ -36,14 +36,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxLEDs.c b/nx-X11/programs/Xserver/xkb/ddxLEDs.c index fb5f72bf8..92ab12ee8 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLEDs.c +++ b/nx-X11/programs/Xserver/xkb/ddxLEDs.c @@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include void XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new) diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c index 9c961e934..3dfb85644 100644 --- a/nx-X11/programs/Xserver/xkb/ddxList.c +++ b/nx-X11/programs/Xserver/xkb/ddxList.c @@ -33,17 +33,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #define NEED_EVENTS 1 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include -#include +#include +#include #ifndef PATH_MAX #ifdef MAXPATHLEN diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 7caf9b1cb..16343fc9c 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -44,17 +44,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include -#include +#include +#include #include "xkb.h" #if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) @@ -94,7 +94,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef WIN32 -#include +#include const char* Win32TempDir() { diff --git a/nx-X11/programs/Xserver/xkb/ddxPrivate.c b/nx-X11/programs/Xserver/xkb/ddxPrivate.c index 5c0bca4cd..c71216d70 100644 --- a/nx-X11/programs/Xserver/xkb/ddxPrivate.c +++ b/nx-X11/programs/Xserver/xkb/ddxPrivate.c @@ -10,10 +10,10 @@ #include #define NEED_EVENTS 1 -#include +#include #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include +#include #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/nx-X11/programs/Xserver/xkb/ddxVT.c b/nx-X11/programs/Xserver/xkb/ddxVT.c index 1b7853fa0..1806ed257 100644 --- a/nx-X11/programs/Xserver/xkb/ddxVT.c +++ b/nx-X11/programs/Xserver/xkb/ddxVT.c @@ -36,14 +36,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include -#include +#include +#include #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 441d88a5c..4a1561db3 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -31,18 +31,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #endif #include -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "misc.h" #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include +#include #include "extnsionst.h" #include "xkb.h" -#include +#include int XkbEventBase; int XkbErrorBase; @@ -3916,7 +3916,7 @@ ProcXkbSetNames(ClientPtr client) /***====================================================================***/ -#include +#include #define XkbSizeCountedString(s) ((s)?((((2+strlen(s))+3)/4)*4):4) diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c index 75e46dc32..ac5713d05 100644 --- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c +++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c @@ -36,11 +36,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #endif #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "inputstr.h" -#include +#include #if !defined(WIN32) && !defined(Lynx) #include #endif diff --git a/nx-X11/programs/Xserver/xkb/xkbActions.c b/nx-X11/programs/Xserver/xkb/xkbActions.c index b7f3e13a5..eb1c80448 100644 --- a/nx-X11/programs/Xserver/xkb/xkbActions.c +++ b/nx-X11/programs/Xserver/xkb/xkbActions.c @@ -34,12 +34,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "misc.h" #include "inputstr.h" -#include +#include #include "xkb.h" #include diff --git a/nx-X11/programs/Xserver/xkb/xkbEvents.c b/nx-X11/programs/Xserver/xkb/xkbEvents.c index ca201c6f0..6c0aa0761 100644 --- a/nx-X11/programs/Xserver/xkb/xkbEvents.c +++ b/nx-X11/programs/Xserver/xkb/xkbEvents.c @@ -32,13 +32,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define NEED_EVENTS 1 -#include -#include -#include -#include +#include +#include +#include +#include #include "inputstr.h" #include "windowstr.h" -#include +#include #include "xkb.h" /***====================================================================***/ diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index ef7e6a4f7..9afe0dacc 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -41,19 +41,19 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #define NEED_EVENTS 1 -#include -#include -#include -#include +#include +#include +#include +#include #include "misc.h" #include "inputstr.h" #include "opaque.h" #include "property.h" #define XKBSRV_NEED_FILE_FUNCS -#include -#include -#include -#include +#include +#include +#include +#include #include "xkb.h" #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) diff --git a/nx-X11/programs/Xserver/xkb/xkbLEDs.c b/nx-X11/programs/Xserver/xkb/xkbLEDs.c index e04c05f14..20203ef2c 100644 --- a/nx-X11/programs/Xserver/xkb/xkbLEDs.c +++ b/nx-X11/programs/Xserver/xkb/xkbLEDs.c @@ -34,13 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #define NEED_EVENTS 1 -#include -#include +#include +#include #include "misc.h" #include "inputstr.h" -#include -#include +#include +#include #include "xkb.h" /***====================================================================***/ diff --git a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c index 713995d16..330fd2800 100644 --- a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c +++ b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c @@ -33,12 +33,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "misc.h" #include "inputstr.h" -#include +#include #include diff --git a/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c b/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c index 82f476790..ac601c525 100644 --- a/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c +++ b/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c @@ -33,15 +33,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #define NEED_EVENTS 1 -#include -#include -#include +#include +#include +#include #include "misc.h" #include "inputstr.h" -#include +#include -#include -#include +#include +#include extern void ProcessOtherEvent( xEvent * /* xE */, diff --git a/nx-X11/programs/Xserver/xkb/xkbSwap.c b/nx-X11/programs/Xserver/xkb/xkbSwap.c index be1cd94fc..c16209153 100644 --- a/nx-X11/programs/Xserver/xkb/xkbSwap.c +++ b/nx-X11/programs/Xserver/xkb/xkbSwap.c @@ -31,14 +31,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #endif #include "stdio.h" -#include +#include #define NEED_EVENTS #define NEED_REPLIES -#include +#include #include "misc.h" #include "inputstr.h" -#include -#include +#include +#include #include "extnsionst.h" #include "xkb.h" diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index f3c3ff8ca..465644f16 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -34,16 +34,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #define NEED_EVENTS 1 -#include -#include +#include +#include #define XK_CYRILLIC -#include +#include #include "misc.h" #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include -#include +#include +#include #include "xkb.h" #ifdef MODE_SWITCH diff --git a/nx-X11/programs/nxauth/gethost.c b/nx-X11/programs/nxauth/gethost.c index cab2aea9f..fa889f29b 100644 --- a/nx-X11/programs/nxauth/gethost.c +++ b/nx-X11/programs/nxauth/gethost.c @@ -36,10 +36,10 @@ in this Software without prior written authorization from The Open Group. #endif #ifdef WIN32 -#include +#include #define EPROTOTYPE WSAEPROTOTYPE #endif -#include +#include #include #include #include diff --git a/nx-X11/programs/nxauth/parsedpy.c b/nx-X11/programs/nxauth/parsedpy.c index 8ce46815c..d0f022574 100644 --- a/nx-X11/programs/nxauth/parsedpy.c +++ b/nx-X11/programs/nxauth/parsedpy.c @@ -49,12 +49,12 @@ in this Software without prior written authorization from The Open Group. #include /* for NULL */ #include /* for isascii() and isdigit() */ -#include /* for strchr() and string routines */ -#include /* for Family contants */ +#include /* for strchr() and string routines */ +#include /* for Family contants */ #ifdef hpux #include /* for struct utsname */ #endif -#include /* for FamilyLocal */ +#include /* for FamilyLocal */ #if defined(UNIXCONN) || defined(LOCALCONN) #define UNIX_CONNECTION "unix" diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c index 76259d76a..86aba2b2a 100644 --- a/nx-X11/programs/nxauth/process.c +++ b/nx-X11/programs/nxauth/process.c @@ -55,10 +55,10 @@ from The Open Group. #include #include -/*#include */ /* for Family constants */ +/*#include */ /* for Family constants */ /* -#include -#include +#include +#include */ /*FIXME*/ diff --git a/nx-X11/programs/nxauth/xauth.h b/nx-X11/programs/nxauth/xauth.h index 33a6c4e3b..4f8490070 100644 --- a/nx-X11/programs/nxauth/xauth.h +++ b/nx-X11/programs/nxauth/xauth.h @@ -29,9 +29,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/xauth/xauth.h,v 1.6 2001/12/14 20:01:15 dawes Exp $ */ #include -#include -#include -#include +#include +#include +#include #ifndef True typedef int Bool; diff --git a/nx-libs.spec b/nx-libs.spec index 6eed3691a..a9afb7ec8 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -616,11 +616,11 @@ ln -sf ../../nx/bin/nxagent %{buildroot}%{_libdir}/x2go/bin/x2goagent chmod 755 %{buildroot}%{_libdir}/lib*.so* #Remove extras, GL, and other unneeded headers -rm -r %{buildroot}%{_includedir}/nx/GL -rm -r %{buildroot}%{_includedir}/nx/X11/extensions/XInput.h -rm -r %{buildroot}%{_includedir}/nx/X11/extensions/XK*.h -rm -r %{buildroot}%{_includedir}/nx/X11/extensions/*Xv*.h -rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans +rm -r %{buildroot}%{_includedir}/GL +rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XInput.h +rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XK*.h +rm -r %{buildroot}%{_includedir}/nx-X11/extensions/*Xv*.h +rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans # Needed for Xinerama support ln -s -f ../../../../%{_lib}/libX11.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 @@ -673,23 +673,23 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %defattr(-,root,root) %{_libdir}/libNX_X11.so %dir %{_includedir}/nx -%dir %{_includedir}/nx/X11 -%{_includedir}/nx/X11/ImUtil.h -%{_includedir}/nx/X11/XKBlib.h -%{_includedir}/nx/X11/Xcms.h -%{_includedir}/nx/X11/Xlib.h -%{_includedir}/nx/X11/XlibConf.h -%{_includedir}/nx/X11/Xlibint.h -%{_includedir}/nx/X11/Xlocale.h -%{_includedir}/nx/X11/Xregion.h -%{_includedir}/nx/X11/Xresource.h -%{_includedir}/nx/X11/Xutil.h -%{_includedir}/nx/X11/cursorfont.h +%dir %{_includedir}/nx-X11 +%{_includedir}/nx-X11/ImUtil.h +%{_includedir}/nx-X11/XKBlib.h +%{_includedir}/nx-X11/Xcms.h +%{_includedir}/nx-X11/Xlib.h +%{_includedir}/nx-X11/XlibConf.h +%{_includedir}/nx-X11/Xlibint.h +%{_includedir}/nx-X11/Xlocale.h +%{_includedir}/nx-X11/Xregion.h +%{_includedir}/nx-X11/Xresource.h +%{_includedir}/nx-X11/Xutil.h +%{_includedir}/nx-X11/cursorfont.h %files -n libNX_Xau-devel %defattr(-,root,root) %{_libdir}/libNX_Xau.so -%{_includedir}/nx/X11/Xauth.h +%{_includedir}/nx-X11/Xauth.h %files -n libNX_Xau6 %defattr(-,root,root) @@ -702,33 +702,33 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %files -n libNX_Xext-devel %defattr(-,root,root) %{_libdir}/libNX_Xext.so -%dir %{_includedir}/nx/X11/extensions -%{_includedir}/nx/X11/extensions/MITMisc.h -%{_includedir}/nx/X11/extensions/XEVI.h -%{_includedir}/nx/X11/extensions/XEVIstr.h -%{_includedir}/nx/X11/extensions/XLbx.h -%{_includedir}/nx/X11/extensions/XShm.h -%{_includedir}/nx/X11/extensions/Xag.h -%{_includedir}/nx/X11/extensions/Xagsrv.h -%{_includedir}/nx/X11/extensions/Xagstr.h -%{_includedir}/nx/X11/extensions/Xcup.h -%{_includedir}/nx/X11/extensions/Xcupstr.h -%{_includedir}/nx/X11/extensions/Xdbe.h -%{_includedir}/nx/X11/extensions/Xdbeproto.h -%{_includedir}/nx/X11/extensions/Xext.h -%{_includedir}/nx/X11/extensions/dpms.h -%{_includedir}/nx/X11/extensions/dpmsstr.h -%{_includedir}/nx/X11/extensions/extutil.h -%{_includedir}/nx/X11/extensions/lbxstr.h -%{_includedir}/nx/X11/extensions/mitmiscstr.h -%{_includedir}/nx/X11/extensions/multibuf.h -%{_includedir}/nx/X11/extensions/multibufst.h -%{_includedir}/nx/X11/extensions/security.h -%{_includedir}/nx/X11/extensions/securstr.h -%{_includedir}/nx/X11/extensions/shape.h -%{_includedir}/nx/X11/extensions/sync.h -%{_includedir}/nx/X11/extensions/xtestext1.h -%{_includedir}/nx/X11/extensions/xteststr.h +%dir %{_includedir}/nx-X11/extensions +%{_includedir}/nx-X11/extensions/MITMisc.h +%{_includedir}/nx-X11/extensions/XEVI.h +%{_includedir}/nx-X11/extensions/XEVIstr.h +%{_includedir}/nx-X11/extensions/XLbx.h +%{_includedir}/nx-X11/extensions/XShm.h +%{_includedir}/nx-X11/extensions/Xag.h +%{_includedir}/nx-X11/extensions/Xagsrv.h +%{_includedir}/nx-X11/extensions/Xagstr.h +%{_includedir}/nx-X11/extensions/Xcup.h +%{_includedir}/nx-X11/extensions/Xcupstr.h +%{_includedir}/nx-X11/extensions/Xdbe.h +%{_includedir}/nx-X11/extensions/Xdbeproto.h +%{_includedir}/nx-X11/extensions/Xext.h +%{_includedir}/nx-X11/extensions/dpms.h +%{_includedir}/nx-X11/extensions/dpmsstr.h +%{_includedir}/nx-X11/extensions/extutil.h +%{_includedir}/nx-X11/extensions/lbxstr.h +%{_includedir}/nx-X11/extensions/mitmiscstr.h +%{_includedir}/nx-X11/extensions/multibuf.h +%{_includedir}/nx-X11/extensions/multibufst.h +%{_includedir}/nx-X11/extensions/security.h +%{_includedir}/nx-X11/extensions/securstr.h +%{_includedir}/nx-X11/extensions/shape.h +%{_includedir}/nx-X11/extensions/sync.h +%{_includedir}/nx-X11/extensions/xtestext1.h +%{_includedir}/nx-X11/extensions/xteststr.h %files -n libNX_Xext6 %defattr(-,root,root) @@ -737,7 +737,7 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %files -n libNX_Xfixes-devel %defattr(-,root,root) %{_libdir}/libNX_Xfixes.so -%{_includedir}/nx/X11/extensions/Xfixes.h +%{_includedir}/nx-X11/extensions/Xfixes.h %files -n libNX_Xfixes3 %defattr(-,root,root) @@ -818,83 +818,83 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_libdir}/libNX_Xcomposite.so %{_libdir}/libNX_Xinerama.so %{_libdir}/libNX_Xtst.so -%{_includedir}/nx/X11/X10.h -%dir %{_includedir}/nx/X11/extensions -%{_includedir}/nx/X11/extensions/XTest.h -%{_includedir}/nx/X11/extensions/Xcomposite.h -%{_includedir}/nx/X11/extensions/Xevie.h -%{_includedir}/nx/X11/extensions/Xinerama.h -%{_includedir}/nx/X11/extensions/lbxbuf.h -%{_includedir}/nx/X11/extensions/lbxbufstr.h -%{_includedir}/nx/X11/extensions/lbxdeltastr.h -%{_includedir}/nx/X11/extensions/lbximage.h -%{_includedir}/nx/X11/extensions/lbxopts.h -%{_includedir}/nx/X11/extensions/lbxzlib.h -%{_includedir}/nx/X11/extensions/panoramiXext.h -%{_includedir}/nx/X11/extensions/record.h -%{_includedir}/nx/X11/extensions/xf86dga1.h -%{_includedir}/nx/X11/extensions/xf86vmode.h -%{_includedir}/nx/X11/misc.h -%{_includedir}/nx/X11/os.h +%{_includedir}/nx-X11/X10.h +%dir %{_includedir}/nx-X11/extensions +%{_includedir}/nx-X11/extensions/XTest.h +%{_includedir}/nx-X11/extensions/Xcomposite.h +%{_includedir}/nx-X11/extensions/Xevie.h +%{_includedir}/nx-X11/extensions/Xinerama.h +%{_includedir}/nx-X11/extensions/lbxbuf.h +%{_includedir}/nx-X11/extensions/lbxbufstr.h +%{_includedir}/nx-X11/extensions/lbxdeltastr.h +%{_includedir}/nx-X11/extensions/lbximage.h +%{_includedir}/nx-X11/extensions/lbxopts.h +%{_includedir}/nx-X11/extensions/lbxzlib.h +%{_includedir}/nx-X11/extensions/panoramiXext.h +%{_includedir}/nx-X11/extensions/record.h +%{_includedir}/nx-X11/extensions/xf86dga1.h +%{_includedir}/nx-X11/extensions/xf86vmode.h +%{_includedir}/nx-X11/misc.h +%{_includedir}/nx-X11/os.h %files -n nx-proto-devel %defattr(-,root,root) -%dir %{_includedir}/nx/X11 -%{_includedir}/nx/X11/DECkeysym.h -%{_includedir}/nx/X11/HPkeysym.h -%{_includedir}/nx/X11/Sunkeysym.h -%{_includedir}/nx/X11/X.h -%{_includedir}/nx/X11/XF86keysym.h -%{_includedir}/nx/X11/XWDFile.h -%{_includedir}/nx/X11/Xalloca.h -%{_includedir}/nx/X11/Xarch.h -%{_includedir}/nx/X11/Xatom.h -%{_includedir}/nx/X11/Xdefs.h -%{_includedir}/nx/X11/Xfuncproto.h -%{_includedir}/nx/X11/Xfuncs.h -%{_includedir}/nx/X11/Xmd.h -%{_includedir}/nx/X11/Xos.h -%{_includedir}/nx/X11/Xos_r.h -%{_includedir}/nx/X11/Xosdefs.h -%{_includedir}/nx/X11/Xpoll.h -%{_includedir}/nx/X11/Xproto.h -%{_includedir}/nx/X11/Xprotostr.h -%{_includedir}/nx/X11/Xthreads.h -%{_includedir}/nx/X11/ap_keysym.h -%{_includedir}/nx/X11/keysym.h -%{_includedir}/nx/X11/keysymdef.h -%{_includedir}/nx/X11/extensions/XI.h -%{_includedir}/nx/X11/extensions/XIproto.h -%{_includedir}/nx/X11/extensions/XResproto.h -%{_includedir}/nx/X11/extensions/Xeviestr.h -%{_includedir}/nx/X11/extensions/bigreqstr.h -%{_includedir}/nx/X11/extensions/composite.h -%{_includedir}/nx/X11/extensions/compositeproto.h -%{_includedir}/nx/X11/extensions/panoramiXproto.h -%{_includedir}/nx/X11/extensions/recordstr.h -%{_includedir}/nx/X11/extensions/render.h -%{_includedir}/nx/X11/extensions/renderproto.h -%{_includedir}/nx/X11/extensions/shapestr.h -%{_includedir}/nx/X11/extensions/shmstr.h -%{_includedir}/nx/X11/extensions/syncstr.h -%{_includedir}/nx/X11/extensions/xcmiscstr.h -%{_includedir}/nx/X11/extensions/xf86bigfont.h -%{_includedir}/nx/X11/extensions/xf86bigfstr.h -%{_includedir}/nx/X11/extensions/xf86dga.h -%{_includedir}/nx/X11/extensions/xf86dga1str.h -%{_includedir}/nx/X11/extensions/xf86dgastr.h -%{_includedir}/nx/X11/extensions/xf86misc.h -%{_includedir}/nx/X11/extensions/xf86mscstr.h -%{_includedir}/nx/X11/extensions/xf86vmstr.h -%{_includedir}/nx/X11/extensions/xfixesproto.h -%{_includedir}/nx/X11/extensions/xfixeswire.h -%{_includedir}/nx/X11/extensions/xtrapbits.h -%{_includedir}/nx/X11/extensions/xtrapddmi.h -%{_includedir}/nx/X11/extensions/xtrapdi.h -%{_includedir}/nx/X11/extensions/xtrapemacros.h -%{_includedir}/nx/X11/extensions/xtraplib.h -%{_includedir}/nx/X11/extensions/xtraplibp.h -%{_includedir}/nx/X11/extensions/xtrapproto.h +%dir %{_includedir}/nx-X11 +%{_includedir}/nx-X11/DECkeysym.h +%{_includedir}/nx-X11/HPkeysym.h +%{_includedir}/nx-X11/Sunkeysym.h +%{_includedir}/nx-X11/X.h +%{_includedir}/nx-X11/XF86keysym.h +%{_includedir}/nx-X11/XWDFile.h +%{_includedir}/nx-X11/Xalloca.h +%{_includedir}/nx-X11/Xarch.h +%{_includedir}/nx-X11/Xatom.h +%{_includedir}/nx-X11/Xdefs.h +%{_includedir}/nx-X11/Xfuncproto.h +%{_includedir}/nx-X11/Xfuncs.h +%{_includedir}/nx-X11/Xmd.h +%{_includedir}/nx-X11/Xos.h +%{_includedir}/nx-X11/Xos_r.h +%{_includedir}/nx-X11/Xosdefs.h +%{_includedir}/nx-X11/Xpoll.h +%{_includedir}/nx-X11/Xproto.h +%{_includedir}/nx-X11/Xprotostr.h +%{_includedir}/nx-X11/Xthreads.h +%{_includedir}/nx-X11/ap_keysym.h +%{_includedir}/nx-X11/keysym.h +%{_includedir}/nx-X11/keysymdef.h +%{_includedir}/nx-X11/extensions/XI.h +%{_includedir}/nx-X11/extensions/XIproto.h +%{_includedir}/nx-X11/extensions/XResproto.h +%{_includedir}/nx-X11/extensions/Xeviestr.h +%{_includedir}/nx-X11/extensions/bigreqstr.h +%{_includedir}/nx-X11/extensions/composite.h +%{_includedir}/nx-X11/extensions/compositeproto.h +%{_includedir}/nx-X11/extensions/panoramiXproto.h +%{_includedir}/nx-X11/extensions/recordstr.h +%{_includedir}/nx-X11/extensions/render.h +%{_includedir}/nx-X11/extensions/renderproto.h +%{_includedir}/nx-X11/extensions/shapestr.h +%{_includedir}/nx-X11/extensions/shmstr.h +%{_includedir}/nx-X11/extensions/syncstr.h +%{_includedir}/nx-X11/extensions/xcmiscstr.h +%{_includedir}/nx-X11/extensions/xf86bigfont.h +%{_includedir}/nx-X11/extensions/xf86bigfstr.h +%{_includedir}/nx-X11/extensions/xf86dga.h +%{_includedir}/nx-X11/extensions/xf86dga1str.h +%{_includedir}/nx-X11/extensions/xf86dgastr.h +%{_includedir}/nx-X11/extensions/xf86misc.h +%{_includedir}/nx-X11/extensions/xf86mscstr.h +%{_includedir}/nx-X11/extensions/xf86vmstr.h +%{_includedir}/nx-X11/extensions/xfixesproto.h +%{_includedir}/nx-X11/extensions/xfixeswire.h +%{_includedir}/nx-X11/extensions/xtrapbits.h +%{_includedir}/nx-X11/extensions/xtrapddmi.h +%{_includedir}/nx-X11/extensions/xtrapdi.h +%{_includedir}/nx-X11/extensions/xtrapemacros.h +%{_includedir}/nx-X11/extensions/xtraplib.h +%{_includedir}/nx-X11/extensions/xtraplibp.h +%{_includedir}/nx-X11/extensions/xtrapproto.h %files -n nxagent %defattr(-,root,root) diff --git a/nxcompext/Jpeg.c b/nxcompext/Jpeg.c index cb854bc6c..d6a94cc80 100644 --- a/nxcompext/Jpeg.c +++ b/nxcompext/Jpeg.c @@ -19,9 +19,9 @@ #include #include -#include "X11/X.h" -#include "X11/Xlib.h" -#include "X11/Xmd.h" +#include +#include +#include #include diff --git a/nxcompext/NXlib.h b/nxcompext/NXlib.h index d77ff6046..15661b439 100644 --- a/nxcompext/NXlib.h +++ b/nxcompext/NXlib.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include +#include #include "NX.h" #include "NXpack.h" diff --git a/nxcompext/Pgn.h b/nxcompext/Pgn.h index 999e8ea01..075d2bc1e 100644 --- a/nxcompext/Pgn.h +++ b/nxcompext/Pgn.h @@ -22,9 +22,9 @@ extern "C" { #endif -#include "X11/X.h" -#include "X11/Xlib.h" -#include "X11/Xmd.h" +#include +#include +#include #include diff --git a/nxcompshad/Input.h b/nxcompshad/Input.h index 6250e790b..88217c9b1 100644 --- a/nxcompshad/Input.h +++ b/nxcompshad/Input.h @@ -18,7 +18,7 @@ #ifndef Input_H #define Input_H -#include +#include typedef struct Event { diff --git a/nxcompshad/Manager.cpp b/nxcompshad/Manager.cpp index ba9260a13..3b5504a1f 100644 --- a/nxcompshad/Manager.cpp +++ b/nxcompshad/Manager.cpp @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ -#include -#include -#include +#include +#include +#include #include #define PANIC diff --git a/nxcompshad/Manager.h b/nxcompshad/Manager.h index 267754906..56b7e0aa5 100644 --- a/nxcompshad/Manager.h +++ b/nxcompshad/Manager.h @@ -18,7 +18,7 @@ #ifndef UpdateManager_H #define UpdateManager_H -#include +#include #include "Updater.h" #include "Regions.h" diff --git a/nxcompshad/Regions.h b/nxcompshad/Regions.h index b9303dcb7..d46d11a72 100644 --- a/nxcompshad/Regions.h +++ b/nxcompshad/Regions.h @@ -18,8 +18,8 @@ #ifndef Region_H #define Region_H -#include -#include +#include +#include typedef struct { short x1, x2, y1, y2; diff --git a/nxcompshad/Shadow.h b/nxcompshad/Shadow.h index e1eddb95c..99824b0aa 100644 --- a/nxcompshad/Shadow.h +++ b/nxcompshad/Shadow.h @@ -18,7 +18,7 @@ #ifndef Shadow_H #define Shadow_H -#include +#include #define NXShadowCorrectColor(length, buffer) \ \ diff --git a/nxcompshad/Updater.cpp b/nxcompshad/Updater.cpp index 245c6ce31..eee81bf16 100644 --- a/nxcompshad/Updater.cpp +++ b/nxcompshad/Updater.cpp @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ -#include -#include -#include +#include +#include +#include #include #define PANIC diff --git a/nxcompshad/Updater.h b/nxcompshad/Updater.h index daa26c10b..cb8b15aa6 100644 --- a/nxcompshad/Updater.h +++ b/nxcompshad/Updater.h @@ -18,7 +18,7 @@ #ifndef Updater_H #define Updater_H -#include +#include #include "Regions.h" #include "Input.h" diff --git a/nxcompshad/Win.cpp b/nxcompshad/Win.cpp index 481cbcac0..77a9694bd 100644 --- a/nxcompshad/Win.cpp +++ b/nxcompshad/Win.cpp @@ -17,7 +17,7 @@ #if defined(__CYGWIN32__) || defined(WIN32) -#include +#include #define PANIC #define WARNING diff --git a/nxcompshad/Win.h b/nxcompshad/Win.h index fe591ff02..1069fa9ee 100644 --- a/nxcompshad/Win.h +++ b/nxcompshad/Win.h @@ -20,7 +20,7 @@ #ifndef Win32Poller_H #define Win32Poller_H -//#include +//#include #include #include diff --git a/nxcompshad/X11.cpp b/nxcompshad/X11.cpp index 2d1140f11..5a18e0a69 100644 --- a/nxcompshad/X11.cpp +++ b/nxcompshad/X11.cpp @@ -22,10 +22,10 @@ #undef TEST #undef DEBUG -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/nxcompshad/X11.h b/nxcompshad/X11.h index 21275420c..d7b858100 100644 --- a/nxcompshad/X11.h +++ b/nxcompshad/X11.h @@ -18,10 +18,10 @@ #ifndef X11Poller_H #define X11Poller_H -#include -#include -#include -#include +#include +#include +#include "X11/include/Xdamage_nxcompshad.h" +#include "X11/include/Xrandr_nxcompshad.h" #include "Core.h" diff --git a/nxcompshad/X11/include/Xdamage_nxcompshad.h b/nxcompshad/X11/include/Xdamage_nxcompshad.h new file mode 100644 index 000000000..8e5e0fbbd --- /dev/null +++ b/nxcompshad/X11/include/Xdamage_nxcompshad.h @@ -0,0 +1,92 @@ +/* + * Copyright © 2003 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * This file is a reduced version of the header file of + * + * + * This copy of code has been introduced to allow a clear namespace + * separation between and header files. + * + * This version of the Xdamage library header file only contains symbols + * required by nxcompshad and strictly avoids indirectly including + * from an X11 library that is also shipped in nx-X11/lib/. + * + * When using instead for inclusion in + * nxcompshad, it will attempt pulling in the + * header which in turn will include . However, the headers of + * the same name from should be used instead. + * + * FIXME: Once the nxagent Xserver starts using libXfixes from X.Org, this + * hack can be removed. + * + * 2015/06/26, Mike Gabriel + */ + + +#ifndef _XDAMAGE_H_ +#define _XDAMAGE_H_ + +#include +#include + +/* from */ +typedef XID XserverRegion; + +#define XDAMAGE_1_1_INTERFACE + +typedef XID Damage; + +typedef struct { + int type; /* event base */ + unsigned long serial; + Bool send_event; + Display *display; + Drawable drawable; + Damage damage; + int level; + Bool more; /* more events will be delivered immediately */ + Time timestamp; + XRectangle area; + XRectangle geometry; +} XDamageNotifyEvent; + +_XFUNCPROTOBEGIN + +Bool XDamageQueryExtension (Display *dpy, + int *event_base_return, + int *error_base_return); + +Status XDamageQueryVersion (Display *dpy, + int *major_version_return, + int *minor_version_return); + +Damage +XDamageCreate (Display *dpy, Drawable drawable, int level); + +void +XDamageSubtract (Display *dpy, Damage damage, + XserverRegion repair, XserverRegion parts); + +_XFUNCPROTOEND + +#endif /* _XDAMAGE_H_ */ diff --git a/nxcompshad/X11/include/Xrandr_nxcompshad.h b/nxcompshad/X11/include/Xrandr_nxcompshad.h new file mode 100644 index 000000000..4feb01685 --- /dev/null +++ b/nxcompshad/X11/include/Xrandr_nxcompshad.h @@ -0,0 +1,80 @@ +/* + * Copyright © 2000 Compaq Computer Corporation, Inc. + * Copyright © 2002 Hewlett-Packard Company, Inc. + * Copyright © 2006 Intel Corporation + * Copyright © 2008 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + * + * Author: Jim Gettys, HP Labs, Hewlett-Packard, Inc. + * Keith Packard, Intel Corporation + */ + +/* + * This file is a reduced version of the header file of + * + * + * This copy of code has been introduced to allow a clear namespace + * separation between and header files. + * + * This version of the Xrandr library header file only contains symbols + * required by nxcompshad and strictly avoids indirectly including + * from an X11 library that is also shipped in nx-X11/lib/. + * + * When using instead for inclusion in + * nxcompshad, it will attempt pulling in the + * header which in turn will include . However, the headers of + * the same name from should be used instead. + * + * FIXME: Once the nxagent Xserver starts using libXrender from X.Org, this + * hack can be removed. + * + * 2015/06/26, Mike Gabriel + */ + +#ifndef _XRANDR_H_ +#define _XRANDR_H_ + +/* from */ +#define RRScreenChangeNotify 0 +#define RRScreenChangeNotifyMask (1L << 0) + +#include + +_XFUNCPROTOBEGIN + +/* internal representation is private to the library */ +typedef struct _XRRScreenConfiguration XRRScreenConfiguration; + +Bool XRRQueryExtension (Display *dpy, + int *event_base_return, + int *error_base_return); + +void XRRSelectInput(Display *dpy, Window window, int mask); + + +/* + * intended to take RRScreenChangeNotify, or + * ConfigureNotify (on the root window) + * returns 1 if it is an event type it understands, 0 if not + */ +int XRRUpdateConfiguration(XEvent *event); +_XFUNCPROTOEND + +#endif /* _XRANDR_H_ */ -- cgit v1.2.3 From cc43e2bf6effd1f54e0f62918342a56b8903cfbd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Dec 2015 20:47:49 +0100 Subject: nxcompshad/X11/include/Xdamage_nxcompshad.h: Update FIXME statement. Work-around needs to persist until libX11 from X.Org gets used by nxagent. --- nxcompshad/X11/include/Xdamage_nxcompshad.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nxcompshad') diff --git a/nxcompshad/X11/include/Xdamage_nxcompshad.h b/nxcompshad/X11/include/Xdamage_nxcompshad.h index 8e5e0fbbd..cae3e1c67 100644 --- a/nxcompshad/X11/include/Xdamage_nxcompshad.h +++ b/nxcompshad/X11/include/Xdamage_nxcompshad.h @@ -36,7 +36,7 @@ * header which in turn will include . However, the headers of * the same name from should be used instead. * - * FIXME: Once the nxagent Xserver starts using libXfixes from X.Org, this + * FIXME: Once the nxagent Xserver starts using libX11 from X.Org, this * hack can be removed. * * 2015/06/26, Mike Gabriel -- cgit v1.2.3 From bd592c2e7edb7cd3dd06dd6c13b559bd6c498596 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 21 Jun 2015 18:12:11 +0200 Subject: library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32). --- debian/control | 43 +- debian/libnx-xtst-dev.install.in | 2 - debian/libnx-xtst6.install.in | 1 - debian/libnx-xtst6.symbols | 30 - debian/nx-x11proto-xext-dev.install.in | 1 + nx-X11/config/cf/README | 6 - nx-X11/config/cf/X11.tmpl | 22 - nx-X11/include/extensions/Imakefile | 2 +- nx-X11/include/extensions/XTest.h | 164 ---- nx-X11/include/extensions/xtestconst.h | 46 ++ nx-X11/lib/Imakefile | 2 - nx-X11/lib/Xtst/Imakefile | 32 - nx-X11/lib/Xtst/XRecord.c | 1075 ------------------------- nx-X11/lib/Xtst/XTest.c | 498 ------------ nx-X11/lib/Xtst/Xtst-def.cpp | 32 - nx-X11/programs/Xserver/Imakefile | 6 +- nx-X11/programs/Xserver/Xext/extmod/modinit.h | 2 +- nx-X11/programs/Xserver/Xext/xtest.c | 2 +- nx-X11/programs/Xserver/mi/miinitext.c | 2 +- nx-libs.spec | 38 +- nxcompshad/Makefile.in | 2 +- nxcompshad/X11.cpp | 2 +- nxcompshad/X11/include/XTest_nxcompshad.h | 71 ++ 23 files changed, 147 insertions(+), 1934 deletions(-) delete mode 100644 debian/libnx-xtst-dev.install.in delete mode 100644 debian/libnx-xtst6.install.in delete mode 100644 debian/libnx-xtst6.symbols delete mode 100644 nx-X11/include/extensions/XTest.h create mode 100644 nx-X11/include/extensions/xtestconst.h delete mode 100644 nx-X11/lib/Xtst/Imakefile delete mode 100644 nx-X11/lib/Xtst/XRecord.c delete mode 100644 nx-X11/lib/Xtst/XTest.c delete mode 100644 nx-X11/lib/Xtst/Xtst-def.cpp create mode 100644 nxcompshad/X11/include/XTest_nxcompshad.h (limited to 'nxcompshad') diff --git a/debian/control b/debian/control index 102d1535b..946dd4b2a 100644 --- a/debian/control +++ b/debian/control @@ -21,12 +21,12 @@ Build-Depends: libxcomposite-dev, libxrandr-dev, libxfixes-dev, + libxtst-dev, autoconf, pkg-config, x11proto-core-dev, expat, Build-Conflicts: - x11proto-record-dev, x11proto-xinerama-dev, Standards-Version: 3.9.6 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary @@ -851,20 +851,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Testing -- Record extension library +Description: nx-X11 Testing -- Record extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xtst provides an X Window System client interface to the Record - extension to the X protocol. + This package removes the obsoleted libNX_Xtst.so.6 library. With + recent versions of NX, the system-wide installed libXtst gets used. . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. + This package can be safely removed. Package: libnx-xtst-dev Provides: libnx-xtst6-dev @@ -872,22 +868,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xtst6 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Testing -- Record extension library (development headers) +Description: nx-X11 Testing -- Record extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xtst provides an X Window System client interface to the Record - extension to the X protocol. - . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. + This package removes the obsoleted headers for the libNX_Xtst.so.6 + library. With recent versions of NX, the system-wide installed libXtst + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: libnx-xtst6-dbg Architecture: any @@ -895,22 +886,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xtst6 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Testing -- Record extension library (debug package) +Description: nx-X11 Testing -- Record extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xtst provides an X Window System client interface to the Record - extension to the X protocol. - . - The Record extension allows X clients to synthesise input events, which - is useful for automated testing. + This package removes the obsoleted wire protocol headers for the + libNX_Xtst.so.6 library. With recent versions of NX, the system-wide + installed libXtst gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-mesa-extras-dev Section: libdevel diff --git a/debian/libnx-xtst-dev.install.in b/debian/libnx-xtst-dev.install.in deleted file mode 100644 index 5acca96cf..000000000 --- a/debian/libnx-xtst-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xtst.so -usr/include/*/nx-X11/extensions/XTest.h diff --git a/debian/libnx-xtst6.install.in b/debian/libnx-xtst6.install.in deleted file mode 100644 index 85350d830..000000000 --- a/debian/libnx-xtst6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xtst.so.* diff --git a/debian/libnx-xtst6.symbols b/debian/libnx-xtst6.symbols deleted file mode 100644 index a3f9bcc2d..000000000 --- a/debian/libnx-xtst6.symbols +++ /dev/null @@ -1,30 +0,0 @@ -libNX_Xtst.so.6 libnx-xtst6 #MINVER# - XRecordAllocRange@Base 3.5.0.29 - XRecordCreateContext@Base 3.5.0.29 - XRecordDisableContext@Base 3.5.0.29 - XRecordEnableContext@Base 3.5.0.29 - XRecordEnableContextAsync@Base 3.5.0.29 - XRecordFreeContext@Base 3.5.0.29 - XRecordFreeData@Base 3.5.0.29 - XRecordFreeState@Base 3.5.0.29 - XRecordGetContext@Base 3.5.0.29 - XRecordIdBaseMask@Base 3.5.0.29 - XRecordProcessReplies@Base 3.5.0.29 - XRecordQueryVersion@Base 3.5.0.29 - XRecordRegisterClients@Base 3.5.0.29 - XRecordUnregisterClients@Base 3.5.0.29 - XTestCompareCurrentCursorWithWindow@Base 3.5.0.29 - XTestCompareCursorWithWindow@Base 3.5.0.29 - XTestDiscard@Base 3.5.0.29 - XTestFakeButtonEvent@Base 3.5.0.29 - XTestFakeDeviceButtonEvent@Base 3.5.0.29 - XTestFakeDeviceKeyEvent@Base 3.5.0.29 - XTestFakeDeviceMotionEvent@Base 3.5.0.29 - XTestFakeKeyEvent@Base 3.5.0.29 - XTestFakeMotionEvent@Base 3.5.0.29 - XTestFakeProximityEvent@Base 3.5.0.29 - XTestFakeRelativeMotionEvent@Base 3.5.0.29 - XTestGrabControl@Base 3.5.0.29 - XTestQueryExtension@Base 3.5.0.29 - XTestSetGContextOfGC@Base 3.5.0.29 - XTestSetVisualIDOfVisual@Base 3.5.0.29 diff --git a/debian/nx-x11proto-xext-dev.install.in b/debian/nx-x11proto-xext-dev.install.in index 0d1f8699b..61829cf29 100644 --- a/debian/nx-x11proto-xext-dev.install.in +++ b/debian/nx-x11proto-xext-dev.install.in @@ -1,4 +1,5 @@ usr/include/*/nx-X11/extensions/xteststr.h +usr/include/*/nx-X11/extensions/xtestconst.h usr/include/*/nx-X11/extensions/shapestr.h usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/syncstr.h diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 66d9639f9..3e1fe95a3 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -196,7 +196,6 @@ X11.tmpl provides defaults for the following variables: DebugLibX11 build libX11_d.a DebugLibXau build libXau_d.a DebugLibXext build libXext_d.a - DebugLibXtst build libXtst_d.a DebugOldX build liboldX_d.a DefaultCursorTheme name of default cursor theme DefaultFontPath default server font path @@ -232,14 +231,12 @@ X11.tmpl provides defaults for the following variables: NormalLibX11 build libX11.a NormalLibXau build libXau.a NormalLibXext build libXext.a - NormalLibXtst build libXtst.a NormalOldX build liboldX.a OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName PrimaryScreenResolution resolution of default server screen ProfileLibX11 build libX11_p.a ProfileLibXau build libXau_p.a ProfileLibXext build libXext_p.a - ProfileLibXtst build libXtst_p.a ProfileOldX build liboldX_p.a ProjectX version indicating this is the X Window System RemoveTargetProgramByMoving boolean for rm -f that doesn't @@ -252,7 +249,6 @@ X11.tmpl provides defaults for the following variables: SharedLibX11 boolean for making sharable libX11.so SharedLibXau boolean for making sharable libXau.so SharedLibXext boolean for making sharable libXext.so - SharedLibXtst boolean for making sharable libXtst.so SharedOldX boolean for making sharable liboldX.so ShmDefines MIT-SHM define TwmDir directory in which to install twm config files @@ -330,8 +326,6 @@ An Lib.tmpl file provides defaults for the following variables: SharedXauRev version number for libXau.so SharedXextReqs required libs for libXext.so SharedXextRev version number for libXext.so - SharedXtstReqs required libs for libXtst.so - SharedXtstRev version number for libXtst.so Vendor.cf files and/or site/host specific .def files may define the following variables: diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index f32cdadbf..af466b47f 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1463,28 +1463,6 @@ SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) #endif -#ifndef SharedLibXtst -#define SharedLibXtst HasSharedLibraries -#endif -#ifndef NormalLibXtst -#define NormalLibXtst (!SharedLibXtst | ForceNormalLib) -#endif -#ifndef DebugLibXtst -#define DebugLibXtst NO /* debugged Xtst library */ -#endif -#ifndef ProfileLibXtst -#define ProfileLibXtst NO /* profiled Xtst library */ -#endif - XTESTLIBSRC = $(LIBSRC)/Xtst -#if SharedLibXtst -#ifndef SharedXtstRev -#define SharedXtstRev 6.1 -#endif -SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev) -#else -ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir) -#endif - #if HasMotif #ifndef MotifDir diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 04c13cdb5..33e854058 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -91,7 +91,7 @@ HEADERS = Xext.h \ bigreqstr.h \ extutil.h \ XI.h XInput.h XIproto.h \ - XTest.h xtestext1.h xteststr.h \ + xtestconst.h xtestext1.h xteststr.h \ XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \ Xdbe.h Xdbeproto.h \ Xag.h Xagstr.h Xagsrv.h \ diff --git a/nx-X11/include/extensions/XTest.h b/nx-X11/include/extensions/XTest.h deleted file mode 100644 index 4817ef132..000000000 --- a/nx-X11/include/extensions/XTest.h +++ /dev/null @@ -1,164 +0,0 @@ -/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ -/* - -Copyright 1992, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ -/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */ - -#ifndef _XTEST_H_ -#define _XTEST_H_ - -#include - -#define X_XTestGetVersion 0 -#define X_XTestCompareCursor 1 -#define X_XTestFakeInput 2 -#define X_XTestGrabControl 3 - -#define XTestNumberEvents 0 - -#define XTestNumberErrors 0 - -#define XTestMajorVersion 2 -#define XTestMinorVersion 2 - -#define XTestExtensionName "XTEST" - -#ifndef _XTEST_SERVER_ - -#include - -_XFUNCPROTOBEGIN - -Bool XTestQueryExtension( - Display* /* dpy */, - int* /* event_basep */, - int* /* error_basep */, - int* /* majorp */, - int* /* minorp */ -); - -Bool XTestCompareCursorWithWindow( - Display* /* dpy */, - Window /* window */, - Cursor /* cursor */ -); - -Bool XTestCompareCurrentCursorWithWindow( - Display* /* dpy */, - Window /* window */ -); - -extern int XTestFakeKeyEvent( - Display* /* dpy */, - unsigned int /* keycode */, - Bool /* is_press */, - unsigned long /* delay */ -); - -extern int XTestFakeButtonEvent( - Display* /* dpy */, - unsigned int /* button */, - Bool /* is_press */, - unsigned long /* delay */ -); - -extern int XTestFakeMotionEvent( - Display* /* dpy */, - int /* screen */, - int /* x */, - int /* y */, - unsigned long /* delay */ -); - -extern int XTestFakeRelativeMotionEvent( - Display* /* dpy */, - int /* x */, - int /* y */, - unsigned long /* delay */ -); - -extern int XTestFakeDeviceKeyEvent( - Display* /* dpy */, - XDevice* /* dev */, - unsigned int /* keycode */, - Bool /* is_press */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestFakeDeviceButtonEvent( - Display* /* dpy */, - XDevice* /* dev */, - unsigned int /* button */, - Bool /* is_press */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestFakeProximityEvent( - Display* /* dpy */, - XDevice* /* dev */, - Bool /* in_prox */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestFakeDeviceMotionEvent( - Display* /* dpy */, - XDevice* /* dev */, - Bool /* is_relative */, - int /* first_axis */, - int* /* axes */, - int /* n_axes */, - unsigned long /* delay */ -); - -extern int XTestGrabControl( - Display* /* dpy */, - Bool /* impervious */ -); - -void XTestSetGContextOfGC( - GC /* gc */, - GContext /* gid */ -); - -void XTestSetVisualIDOfVisual( - Visual* /* visual */, - VisualID /* visualid */ -); - -Status XTestDiscard( - Display* /* dpy */ -); - -_XFUNCPROTOEND - -#endif /* _XTEST_SERVER_ */ - -#endif diff --git a/nx-X11/include/extensions/xtestconst.h b/nx-X11/include/extensions/xtestconst.h new file mode 100644 index 000000000..4f69966a4 --- /dev/null +++ b/nx-X11/include/extensions/xtestconst.h @@ -0,0 +1,46 @@ +/* + +Copyright 1992, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#ifndef _XTEST_H_ +#define _XTEST_H_ + +#include + +#define X_XTestGetVersion 0 +#define X_XTestCompareCursor 1 +#define X_XTestFakeInput 2 +#define X_XTestGrabControl 3 + +#define XTestNumberEvents 0 + +#define XTestNumberErrors 0 + +#define XTestMajorVersion 2 +#define XTestMinorVersion 2 + +#define XTestExtensionName "XTEST" + +#endif diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile index 7cfffa6d9..b97ef6b22 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -37,7 +37,6 @@ XEXTLIBDIR = Xext #if BuildLibraries OLDXLIBDIR = oldX -XTSTLIBDIR = Xtst #endif @@ -46,7 +45,6 @@ LINTSUBDIRS = \ $(X11LIBDIR) \ $(OLDXLIBDIR) \ $(XEXTLIBDIR) \ - $(XTSTLIBDIR) \ $(XKBLIBDIR) \ $(XINERAMADIR) \ $(RENDERLIBDIR) \ diff --git a/nx-X11/lib/Xtst/Imakefile b/nx-X11/lib/Xtst/Imakefile deleted file mode 100644 index f32129436..000000000 --- a/nx-X11/lib/Xtst/Imakefile +++ /dev/null @@ -1,32 +0,0 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:23 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.2 1998/12/20 11:57:12 dawes Exp $ - -#define DoNormalLib NormalLibXtst -#define DoSharedLib SharedLibXtst -#define DoExtraLib SharedLibXtst -#define DoDebugLib DebugLibXtst -#define DoProfileLib ProfileLibXtst -#define LibName NX_Xtst -#define SoRev SOXTESTREV -#define LibHeaders NO - -#include - -#ifdef SharedXtstReqs -REQUIREDLIBS = SharedXtstReqs -#endif - -INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) - -SRCS = XTest.c XRecord.c -OBJS = XTest.o XRecord.o - -LINTLIBS = $(LINTXLIB) - -#include - -DependTarget() diff --git a/nx-X11/lib/Xtst/XRecord.c b/nx-X11/lib/Xtst/XRecord.c deleted file mode 100644 index 8e1823ef9..000000000 --- a/nx-X11/lib/Xtst/XRecord.c +++ /dev/null @@ -1,1075 +0,0 @@ -/* -$Xorg: XRecord.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ - -XRecord.c - client-side library for RECORD extension - -Copyright 1995, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -*/ -/*************************************************************************** - * Copyright 1995 Network Computing Devices - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, provided - * that the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Network Computing Devices - * not be used in advertising or publicity pertaining to distribution - * of the software without specific, written prior permission. - * - * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - **************************************************************************/ -/* - * By Stephen Gildea, X Consortium, and Martha Zimet, NCD. - */ -/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.6 2002/10/16 00:37:33 dawes Exp $ */ - -#include -#include -#define NEED_EVENTS -#define NEED_REPLIES -#include -#include -#include -#include - -static XExtensionInfo _xrecord_info_data; -static XExtensionInfo *xrecord_info = &_xrecord_info_data; -static /* const */ char *xrecord_extension_name = RECORD_NAME; - -#define XRecordCheckExtension(dpy,i,val) \ - XextCheckExtension(dpy, i, xrecord_extension_name, val) - -/************************************************************************** - * * - * private utility routines * - * * - **************************************************************************/ - -static XExtDisplayInfo *find_display(); - -/* - * A reply buffer holds a reply from RecordEnableContext. - * Pieces of that buffer are passed to the XRecordEnableContext callback. - * ref_count is incremented each time we do that. - * ref_count is decremented each time XRecordFreeData is called on - * the buffer. When ref_count is 0, we can free or reuse the buffer. - */ -struct reply_buffer -{ - struct reply_buffer *next; /* next in list or NULL */ - unsigned char *buf; /* pointer to malloc'd buffer */ - int nbytes; /* size of buf */ - int ref_count; /* callback uses pending */ -}; - - -/* - * There's some extra information the implementation finds useful - * to attach to an XRecordInterceptData packet to handle memory - * management. So we really allocate one of these. - */ -struct intercept_queue -{ - /* this struct gets passed to the user as an XRecordInterceptData, - so the data field must come first so we can cast the address - back and forth */ - XRecordInterceptData data; - struct intercept_queue *next; /* next in free list or NULL */ - struct mem_cache_str *cache; /* contains head of free list */ -}; - -/* - * per-display pointers to cache of malloc'd but unused memory - */ -struct mem_cache_str -{ - struct intercept_queue *inter_data; /* free structs only */ - struct reply_buffer *reply_buffers; /* all reply buffers */ - int inter_data_count; /* total allocated, free and in use */ - Bool display_closed; /* so we know when to free ourself */ -}; - -static int close_display(dpy, codes) - Display *dpy; - XExtCodes *codes; /* not used */ -{ - XExtDisplayInfo *info = find_display (dpy); - - LockDisplay(dpy); - if (info && info->data) { - struct mem_cache_str *cache = (struct mem_cache_str *)info->data; - struct intercept_queue *iq, *iq_next; - struct reply_buffer *rbp, **rbp_next_p; - - for (iq=cache->inter_data; iq; iq=iq_next) { - iq_next = iq->next; - XFree(iq); - cache->inter_data_count--; - } - - /* this is a little trickier, because some of these - might still be in use */ - for (rbp_next_p = &cache->reply_buffers; *rbp_next_p; ) { - rbp = *rbp_next_p; - if (rbp->ref_count == 0) { - *rbp_next_p = rbp->next; - XFree(rbp->buf); - XFree(rbp); - } else { - rbp_next_p = &rbp->next; - } - } - - if (cache->reply_buffers == NULL && cache->inter_data_count == 0) { - /* every thing has been freed, can free ourselves, too */ - XFree(cache); - } else { - cache->display_closed = True; - cache->inter_data = NULL; /* neatness only; won't be used */ - } - } - UnlockDisplay(dpy); - return XextRemoveDisplay(xrecord_info, dpy); -} - -static XPointer alloc_mem_cache() -{ - struct mem_cache_str *cache; - - /* note that an error will go unnoticed */ - cache = (struct mem_cache_str *) Xmalloc(sizeof(struct mem_cache_str)); - if (cache) { - cache->display_closed = False; - cache->inter_data = NULL; - cache->inter_data_count = 0; - cache->reply_buffers = NULL; - } - return (XPointer) cache; -} - -static char *xrecord_error_list[] = { - "XRecordBadContext (Not a defined RECORD context)", -}; - -static XEXT_GENERATE_ERROR_STRING (error_string, xrecord_extension_name, - RecordNumErrors, xrecord_error_list) - -static XExtensionHooks xrecord_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - close_display, /* close_display */ - NULL, /* wire_to_event */ - NULL, /* event_to_wire */ - NULL, /* error */ - error_string /* error_string */ -}; - -static XEXT_GENERATE_FIND_DISPLAY (find_display, xrecord_info, - xrecord_extension_name, &xrecord_extension_hooks, RecordNumEvents, - alloc_mem_cache()) - -/************************************************************************** - * * - * private library routines * - * * - **************************************************************************/ - -static void -SendRange(dpy, range_item, nranges) - Display *dpy; - XRecordRange **range_item; - int nranges; -{ - int rlen = SIZEOF(xRecordRange); - while(nranges--) - { - xRecordRange xrange; - - xrange.coreRequestsFirst = (*range_item)->core_requests.first; - xrange.coreRequestsLast = (*range_item)->core_requests.last; - xrange.coreRepliesFirst = (*range_item)->core_replies.first; - xrange.coreRepliesLast = (*range_item)->core_replies.last; - xrange.extRequestsMajorFirst = (*range_item)->ext_requests.ext_major.first; - xrange.extRequestsMajorLast = (*range_item)->ext_requests.ext_major.last; - xrange.extRequestsMinorFirst = (*range_item)->ext_requests.ext_minor.first; - xrange.extRequestsMinorLast = (*range_item)->ext_requests.ext_minor.last; - xrange.extRepliesMajorFirst = (*range_item)->ext_replies.ext_major.first; - xrange.extRepliesMajorLast = (*range_item)->ext_replies.ext_major.last; - xrange.extRepliesMinorFirst = (*range_item)->ext_replies.ext_minor.first; - xrange.extRepliesMinorLast = (*range_item)->ext_replies.ext_minor.last; - xrange.deliveredEventsFirst = (*range_item)->delivered_events.first; - xrange.deliveredEventsLast = (*range_item)->delivered_events.last; - xrange.deviceEventsFirst = (*range_item)->device_events.first; - xrange.deviceEventsLast = (*range_item)->device_events.last; - xrange.errorsFirst = (*range_item)->errors.first; - xrange.errorsLast = (*range_item)->errors.last; - xrange.clientStarted = (*range_item)->client_started; - xrange.clientDied = (*range_item)->client_died; - - Data(dpy, (char *)&xrange, rlen); - range_item++; - } -} - -/************************************************************************** - * * - * public routines * - * * - **************************************************************************/ - -XID -XRecordIdBaseMask(dpy) - Display *dpy; -{ - return 0x1fffffff & ~dpy->resource_mask; -} - -Status -XRecordQueryVersion (dpy, cmajor_return, cminor_return) - Display *dpy; - int *cmajor_return, *cminor_return; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordQueryVersionReq *req; - xRecordQueryVersionReply rep; - - XRecordCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(RecordQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordQueryVersion; - req->majorVersion = RECORD_MAJOR_VERSION; - req->minorVersion = RECORD_MINOR_VERSION; - if (!_XReply(dpy,(xReply *)&rep, 0, True)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - UnlockDisplay(dpy); - SyncHandle(); - *cmajor_return = rep.majorVersion; - *cminor_return = rep.minorVersion; - return ((rep.majorVersion == RECORD_MAJOR_VERSION) && - (rep.minorVersion >= RECORD_LOWEST_MINOR_VERSION)); -} - -XRecordContext -XRecordCreateContext(dpy, datum_flags, clients, nclients, ranges, nranges) - Display *dpy; - int datum_flags; - XRecordClientSpec *clients; - int nclients; - XRecordRange **ranges; - int nranges; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordCreateContextReq *req; - int clen = 4 * nclients; - - XRecordCheckExtension (dpy, info, 0); - LockDisplay(dpy); - GetReq(RecordCreateContext, req); - - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordCreateContext; - req->context = XAllocID(dpy); - req->length += (nclients * 4 + - nranges * SIZEOF(xRecordRange)) >> 2; - req->elementHeader = datum_flags; - req->nClients = nclients; - req->nRanges = nranges; - - Data32(dpy, (long *)clients, clen); - SendRange(dpy, ranges, nranges); - - UnlockDisplay(dpy); - SyncHandle(); - return req->context; -} - -XRecordRange * -XRecordAllocRange() -{ - return (XRecordRange*)Xcalloc(1, sizeof(XRecordRange)); -} - -Status -XRecordRegisterClients(dpy, context, datum_flags, clients, nclients, ranges, nranges) - Display *dpy; - XRecordContext context; - int datum_flags; - XRecordClientSpec *clients; - int nclients; - XRecordRange **ranges; - int nranges; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordRegisterClientsReq *req; - int clen = 4 * nclients; - - XRecordCheckExtension (dpy, info, 0); - LockDisplay(dpy); - GetReq(RecordRegisterClients, req); - - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordRegisterClients; - req->context = context; - req->length += (nclients * 4 + - nranges * SIZEOF(xRecordRange)) >> 2; - req->elementHeader = datum_flags; - req->nClients = nclients; - req->nRanges = nranges; - - Data32(dpy, (long *)clients, clen); - SendRange(dpy, ranges, nranges); - - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -Status -XRecordUnregisterClients(dpy, context, clients, nclients) - Display *dpy; - XRecordContext context; - XRecordClientSpec *clients; - int nclients; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordUnregisterClientsReq *req; - int clen = 4 * nclients; - - XRecordCheckExtension (dpy, info, 0); - LockDisplay(dpy); - GetReq(RecordUnregisterClients, req); - - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordUnregisterClients; - req->context = context; - req->length += nclients; - req->nClients = nclients; - - Data32(dpy, (long *)clients, clen); - - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -static void -WireToLibRange(wire_range, lib_range) - xRecordRange *wire_range; - XRecordRange *lib_range; -{ - lib_range->core_requests.first = wire_range->coreRequestsFirst; - lib_range->core_requests.last = wire_range->coreRequestsLast; - lib_range->core_replies.first = wire_range->coreRepliesFirst; - lib_range->core_replies.last = wire_range->coreRepliesLast; - lib_range->ext_requests.ext_major.first = wire_range->extRequestsMajorFirst; - lib_range->ext_requests.ext_major.last = wire_range->extRequestsMajorLast; - lib_range->ext_requests.ext_minor.first = wire_range->extRequestsMinorFirst; - lib_range->ext_requests.ext_minor.last = wire_range->extRequestsMinorLast; - lib_range->ext_replies.ext_major.first = wire_range->extRepliesMajorFirst; - lib_range->ext_replies.ext_major.last = wire_range->extRepliesMajorLast; - lib_range->ext_replies.ext_minor.first = wire_range->extRepliesMinorFirst; - lib_range->ext_replies.ext_minor.last = wire_range->extRepliesMinorLast; - lib_range->delivered_events.first = wire_range->deliveredEventsFirst; - lib_range->delivered_events.last = wire_range->deliveredEventsLast; - lib_range->device_events.first = wire_range->deviceEventsFirst; - lib_range->device_events.last = wire_range->deviceEventsLast; - lib_range->errors.first = wire_range->errorsFirst; - lib_range->errors.last = wire_range->errorsLast; - lib_range->client_started = wire_range->clientStarted; - lib_range->client_died = wire_range->clientDied; -} - -Status -XRecordGetContext(dpy, context, state_return) - Display *dpy; - XRecordContext context; - XRecordState **state_return; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordGetContextReq *req; - xRecordGetContextReply rep; - int count, i, rn; - xRecordRange xrange; - XRecordRange *ranges; - xRecordClientInfo xclient_inf; - XRecordClientInfo **client_inf, *client_inf_str; - XRecordState *ret; - - XRecordCheckExtension (dpy, info, 0); - LockDisplay(dpy); - GetReq(RecordGetContext, req); - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordGetContext; - req->context = context; - if (!_XReply(dpy,(xReply *)&rep, 0, False)) { - UnlockDisplay(dpy); - SyncHandle(); - return 0; - } - count = rep.nClients; - - ret = (XRecordState*)Xmalloc(sizeof(XRecordState)); - if (!ret) { - /* XXX - eat data */ - UnlockDisplay(dpy); - SyncHandle(); - return 0; - } - - ret->enabled = rep.enabled; - ret->datum_flags = rep.elementHeader; - ret->nclients = count; - - if (count) - { - client_inf = (XRecordClientInfo **) Xcalloc(count, sizeof(XRecordClientInfo*)); - ret->client_info = client_inf; - client_inf_str = (XRecordClientInfo *) Xmalloc(count*sizeof(XRecordClientInfo)); - if (!client_inf || !client_inf_str) - { - for(i = 0; i < count; i++) - { - _XEatData (dpy, sizeof(xRecordClientInfo)); - _XEatData (dpy, SIZEOF(xRecordRange)); /* XXX - don't know how many */ - } - UnlockDisplay(dpy); - XRecordFreeState(ret); - SyncHandle(); - return 0; - } - for(i = 0; i < count; i++) - { - client_inf[i] = &(client_inf_str[i]); - _XRead(dpy, (char *)&xclient_inf, (long)sizeof(xRecordClientInfo)); - client_inf_str[i].client = xclient_inf.clientResource; - client_inf_str[i].nranges = xclient_inf.nRanges; - - if (xclient_inf.nRanges) - { - client_inf_str[i].ranges = (XRecordRange**) Xcalloc(xclient_inf.nRanges, sizeof(XRecordRange*)); - ranges = (XRecordRange*) Xmalloc(xclient_inf.nRanges * sizeof(XRecordRange)); - if (!client_inf_str[i].ranges || !ranges) { - /* XXX eat data */ - UnlockDisplay(dpy); - XRecordFreeState(ret); - SyncHandle(); - return 0; - } - for (rn=0; rnclient_info = NULL; - } - - *state_return = ret; - - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -void -XRecordFreeState(state) - XRecordState *state; -{ - int i; - - for(i=0; inclients; i++) { - if (state->client_info[i]->ranges) { - if (state->client_info[i]->ranges[0]) - Xfree(state->client_info[i]->ranges[0]); - Xfree(state->client_info[i]->ranges); - } - } - if (state->client_info) { - if (state->client_info[0]) - Xfree(state->client_info[0]); - Xfree(state->client_info); - } - Xfree(state); -} - -static struct reply_buffer *alloc_reply_buffer(info, nbytes) - XExtDisplayInfo *info; - int nbytes; -{ - struct mem_cache_str *cache = (struct mem_cache_str *)info->data; - struct reply_buffer *rbp; - struct reply_buffer *saved_rb = NULL; - /* - * First look for an allocated buffer that is not in use. - * If we have a big enough buffer, use that, otherwise - * realloc an existing one. - */ - for (rbp = cache->reply_buffers; rbp; rbp = rbp->next) { - if (rbp->ref_count == 0) { - if (rbp->nbytes >= nbytes) - return rbp; - else - saved_rb = rbp; - } - } - if (saved_rb) { - saved_rb->buf = (unsigned char *)Xrealloc(saved_rb->buf, nbytes); - if (!saved_rb->buf) { - saved_rb->nbytes = 0; - return NULL; - } - saved_rb->nbytes = nbytes; - return saved_rb; - } - - /* - * nothing available; malloc a new struct - */ - rbp = (struct reply_buffer *)Xmalloc(sizeof(struct reply_buffer)); - if (!rbp) - return NULL; - rbp->buf = (unsigned char *)Xmalloc(nbytes); - if (!rbp->buf) { - Xfree(rbp); - return NULL; - } - rbp->nbytes = nbytes; - rbp->ref_count = 0; - rbp->next = cache->reply_buffers; - cache->reply_buffers = rbp; - return rbp; -} - -static XRecordInterceptData *alloc_inter_data(info) - XExtDisplayInfo *info; -{ - struct mem_cache_str *cache = (struct mem_cache_str *)info->data; - struct intercept_queue *iq; - - /* if there is one on the free list, pop it */ - if (cache->inter_data) { - iq = cache->inter_data; - cache->inter_data = iq->next; - return &iq->data; - } - /* allocate a new one */ - iq = (struct intercept_queue *)Xmalloc(sizeof(struct intercept_queue)); - if (!iq) - return NULL; - iq->cache = cache; - cache->inter_data_count++; - return &iq->data; -} - -void -XRecordFreeData(data) - XRecordInterceptData *data; -{ - /* we can do this cast because that is what we really allocated */ - struct intercept_queue *iq = (struct intercept_queue *)data; - struct reply_buffer *rbp = NULL; - struct mem_cache_str *cache = iq->cache; - - /* - * figure out what reply_buffer this points at - * and decrement its ref_count. - */ - if (data->data) { - - for (rbp = cache->reply_buffers; rbp; rbp = rbp->next) { - if (data->data >= rbp->buf - && data->data < rbp->buf + rbp->nbytes) - { - assert(rbp->ref_count > 0); - rbp->ref_count--; - break; - } - } - /* it's an error if we didn't find something to free */ - assert(rbp); - } - /* - * If the display is still open, put this back on the free queue. - * - * Otherwise the display is closed and we won't reuse this, so free it. - * See if we can free the reply buffer, too. - * If we can, see if this is the last reply buffer and if so - * free the list of reply buffers. - */ - if (cache->display_closed == False) { - iq->next = cache->inter_data; - cache->inter_data = iq; - } else { - if (rbp && rbp->ref_count == 0) { - struct reply_buffer *rbp2, **rbp_next_p; - - /* Have to search the list again to find the prev element. - This is not the common case, so don't slow down the code - above by doing it then. */ - for (rbp_next_p = &cache->reply_buffers; *rbp_next_p; ) { - rbp2 = *rbp_next_p; - if (rbp == rbp2) { - *rbp_next_p = rbp2->next; - break; - } else { - rbp_next_p = &rbp2->next; - } - } - XFree(rbp->buf); - XFree(rbp); - } - - XFree(iq); - cache->inter_data_count--; - - if (cache->reply_buffers == NULL && cache->inter_data_count == 0) { - XFree(cache); /* all finished */ - } - } -} - -/* the EXTRACT macros are adapted from ICElibint.h */ - -#define EXTRACT_CARD16(swap, src, dst) \ -{ \ - (dst) = *((CARD16 *) (src)); \ - if (swap) \ - (dst) = lswaps (dst); \ -} - -#define EXTRACT_CARD32(swap, src, dst) \ -{ \ - (dst) = *((CARD32 *) (src)); \ - if (swap) \ - (dst) = lswapl (dst); \ -} - -/* byte swapping macros from xfs/include/misc.h */ - -/* byte swap a long literal */ -#define lswapl(x) ((((x) & 0xff) << 24) |\ - (((x) & 0xff00) << 8) |\ - (((x) & 0xff0000) >> 8) |\ - (((x) >> 24) & 0xff)) - -/* byte swap a short literal */ -#define lswaps(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) - -enum parser_return { Continue, End, Error }; - -static enum parser_return -parse_reply_call_callback(dpy, info, rep, reply, callback, closure) - Display *dpy; - XExtDisplayInfo *info; - xRecordEnableContextReply *rep; - struct reply_buffer *reply; - XRecordInterceptProc callback; - XPointer closure; -{ - int current_index; - int datum_bytes = 0; - XRecordInterceptData *data; - - /* call the callback for each protocol element in the reply */ - current_index = 0; - do { - data = alloc_inter_data(info); - if (!data) - return Error; - - data->id_base = rep->idBase; - data->category = rep->category; - data->client_swapped = rep->clientSwapped; - data->server_time = rep->serverTime; - data->client_seq = rep->recordedSequenceNumber; - /* - * compute the size of this protocol element. - */ - switch (rep->category) { - case XRecordFromServer: - if (rep->elementHeader&XRecordFromServerTime) { - EXTRACT_CARD32(rep->clientSwapped, - reply->buf+current_index, - data->server_time); - current_index += 4; - } - switch (reply->buf[current_index]) { - case X_Reply: /* reply */ - EXTRACT_CARD32(rep->clientSwapped, - reply->buf+current_index+4, datum_bytes); - datum_bytes = (datum_bytes+8) << 2; - break; - default: /* error or event */ - datum_bytes = 32; - } - break; - case XRecordFromClient: - if (rep->elementHeader&XRecordFromClientTime) { - EXTRACT_CARD32(rep->clientSwapped, - reply->buf+current_index, - data->server_time); - current_index += 4; - } - if (rep->elementHeader&XRecordFromClientSequence) { - EXTRACT_CARD32(rep->clientSwapped, - reply->buf+current_index, - data->client_seq); - current_index += 4; - } - if (reply->buf[current_index+2] == 0 - && reply->buf[current_index+3] == 0) /* needn't swap 0 */ - { /* BIG-REQUESTS */ - EXTRACT_CARD32(rep->clientSwapped, - reply->buf+current_index+4, datum_bytes); - } else { - EXTRACT_CARD16(rep->clientSwapped, - reply->buf+current_index+2, datum_bytes); - } - datum_bytes <<= 2; - break; - case XRecordClientStarted: - EXTRACT_CARD16(rep->clientSwapped, - reply->buf+current_index+6, datum_bytes); - datum_bytes = (datum_bytes+2) << 2; - break; - case XRecordClientDied: - if (rep->elementHeader&XRecordFromClientSequence) { - EXTRACT_CARD32(rep->clientSwapped, - reply->buf+current_index, - data->client_seq); - current_index += 4; - } - /* fall through */ - case XRecordStartOfData: - case XRecordEndOfData: - datum_bytes = 0; - } - - if (datum_bytes > 0) { - if (current_index + datum_bytes > rep->length << 2) - fprintf(stderr, - "XRecord: %lu-byte reply claims %d-byte element (seq %lu)\n", - (long)rep->length << 2, current_index + datum_bytes, - dpy->last_request_read); - /* - * This assignment (and indeed the whole buffer sharing - * scheme) assumes arbitrary 4-byte boundaries are - * addressable. - */ - data->data = reply->buf+current_index; - reply->ref_count++; - } else { - data->data = NULL; - } - data->data_len = datum_bytes >> 2; - - (*callback)(closure, data); - - current_index += datum_bytes; - } while (current_indexlength<<2); - - if (rep->category == XRecordEndOfData) - return End; - - return Continue; -} - -Status -XRecordEnableContext(dpy, context, callback, closure) - Display *dpy; - XRecordContext context; - XRecordInterceptProc callback; - XPointer closure; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordEnableContextReq *req; - xRecordEnableContextReply rep; - struct reply_buffer *reply; - enum parser_return status; - - XRecordCheckExtension (dpy, info, 0); - LockDisplay(dpy); - GetReq(RecordEnableContext, req); - - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordEnableContext; - req->context = context; - - while (1) - { - /* This code should match that in XRecordEnableContextAsync */ - if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) - { - UnlockDisplay(dpy); - SyncHandle(); - return 0; - } - - if (rep.length > 0) { - reply = alloc_reply_buffer(info, rep.length<<2); - if (!reply) { - UnlockDisplay(dpy); - SyncHandle(); - return 0; - } - _XRead (dpy, (char *)reply->buf, rep.length<<2); - } else { - reply = NULL; - } - - status = parse_reply_call_callback(dpy, info, &rep, reply, - callback, closure); - switch (status) { - case Continue: - break; - case End: - UnlockDisplay(dpy); - SyncHandle(); - return 1; - case Error: - UnlockDisplay(dpy); - SyncHandle(); - return 0; - } - } -} - - -typedef struct _record_async_state -{ - unsigned long enable_seq; - _XAsyncHandler *async; - _XAsyncErrorState *error_state; - XExtDisplayInfo *info; - XRecordInterceptProc callback; - XPointer closure; -} record_async_state; - -static Bool -record_async_handler(dpy, rep, buf, len, adata) - register Display *dpy; - register xReply *rep; - char *buf; - int len; - XPointer adata; -{ - register record_async_state *state = (record_async_state *)adata; - struct reply_buffer *reply; - enum parser_return status; - - if (dpy->last_request_read != state->enable_seq) - { - if (dpy->last_request_read > state->enable_seq) { - /* it is an error that we are still on the handler list */ - fprintf(stderr, "XRecord: handler for seq %lu never saw XRecordEndOfData. (seq now %lu)\n", - state->enable_seq, dpy->last_request_read); - DeqAsyncHandler(dpy, state->async); - Xfree(state->async); - } - return False; - } - if (rep->generic.type == X_Error) - { - DeqAsyncHandler(dpy, state->async); - Xfree(state->async); - return False; - } - - if (rep->generic.length > 0) { - reply = alloc_reply_buffer(state->info, rep->generic.length<<2); - - if (!reply) { - DeqAsyncHandler(dpy, state->async); - Xfree(state->async); - return False; - } - - _XGetAsyncData(dpy, (char *)reply->buf, buf, len, - SIZEOF(xRecordEnableContextReply), - rep->generic.length << 2, 0); - } else { - reply = NULL; - } - - status = parse_reply_call_callback(dpy, state->info, - (xRecordEnableContextReply*) rep, - reply, state->callback, state->closure); - - if (status != Continue) - { - DeqAsyncHandler(dpy, state->async); - Xfree(state->async); - if (status == Error) - return False; - } - - return True; -} - -/* - * reads the first reply, StartOfData, synchronously, - * then returns allowing the app to call XRecordProcessReplies - * to get the rest. - */ -Status -XRecordEnableContextAsync(dpy, context, callback, closure) - Display *dpy; - XRecordContext context; - XRecordInterceptProc callback; - XPointer closure; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordEnableContextReq *req; - xRecordEnableContextReply rep; - struct reply_buffer *reply; - enum parser_return status; - _XAsyncHandler *async; - record_async_state *async_state; - - XRecordCheckExtension (dpy, info, 0); - async = (_XAsyncHandler *)Xmalloc(sizeof(_XAsyncHandler) + - sizeof(record_async_state)); - if (!async) - return 0; - async_state = (record_async_state *)(async + 1); - - LockDisplay(dpy); - GetReq(RecordEnableContext, req); - - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordEnableContext; - req->context = context; - - /* Get the StartOfData reply. */ - /* This code should match that in XRecordEnableContext */ - if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) - { - UnlockDisplay(dpy); - SyncHandle(); - Xfree(async); - return 0; - } - - /* this had better be a StartOfData, which has no extra data. */ - if (rep.length != 0) { - fprintf(stderr, "XRecord: malformed StartOfData for sequence %lu\n", - dpy->last_request_read); - } - reply = NULL; - - status = parse_reply_call_callback(dpy, info, &rep, reply, - callback, closure); - if (status != Continue) - { - UnlockDisplay(dpy); - Xfree(async); - return 0; - } - - /* hook in the async handler for the rest of the replies */ - async_state->enable_seq = dpy->request; - async_state->async = async; - async_state->info = info; - async_state->callback = callback; - async_state->closure = closure; - - async->next = dpy->async_handlers; - async->handler = record_async_handler; - async->data = (XPointer)async_state; - dpy->async_handlers = async; - - UnlockDisplay(dpy); - /* Don't invoke SyncHandle here, since this is an async - function. Does this break XSetAfterFunction() ? */ - return 1; -} - -void -XRecordProcessReplies(dpy) - Display *dpy; -{ - (void) XPending(dpy); -} - -Status -XRecordDisableContext(dpy, context) - Display *dpy; - XRecordContext context; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordDisableContextReq *req; - - XRecordCheckExtension (dpy, info, 0); - LockDisplay(dpy); - GetReq(RecordDisableContext, req); - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordDisableContext; - req->context = context; - - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -Status -XRecordFreeContext(dpy, context) - Display *dpy; - XRecordContext context; -{ - XExtDisplayInfo *info = find_display (dpy); - register xRecordFreeContextReq *req; - - XRecordCheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(RecordFreeContext, req); - req->reqType = info->codes->major_opcode; - req->recordReqType = X_RecordFreeContext; - req->context = context; - - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} diff --git a/nx-X11/lib/Xtst/XTest.c b/nx-X11/lib/Xtst/XTest.c deleted file mode 100644 index 6b814aab4..000000000 --- a/nx-X11/lib/Xtst/XTest.c +++ /dev/null @@ -1,498 +0,0 @@ -/* $Xorg: XTest.c,v 1.5 2001/02/09 02:04:00 xorgcvs Exp $ */ -/* -Copyright 1990, 1991 by UniSoft Group Limited -*/ - -/* - -Copyright 1992, 1993, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -*/ -/* $XFree86: xc/lib/Xtst/XTest.c,v 1.5 2001/12/14 19:56:40 dawes Exp $ */ - -#define NEED_REPLIES -#include -#include -#include -#include -#include -#include -#include - -static XExtensionInfo _xtest_info_data; -static XExtensionInfo *xtest_info = &_xtest_info_data; -static /* const */ char *xtest_extension_name = XTestExtensionName; - -#define XTestCheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xtest_extension_name, val) - -#define XTestICheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xtest_extension_name, val); \ - if (!i->data) return val - -/***************************************************************************** - * * - * private utility routines * - * * - *****************************************************************************/ - -static int close_display(); -static /* const */ XExtensionHooks xtest_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - close_display, /* close_display */ - NULL, /* wire_to_event */ - NULL, /* event_to_wire */ - NULL, /* error */ - NULL /* error_string */ -}; - -static XPointer -get_xinput_base(dpy) - Display *dpy; -{ - int major_opcode, first_event, first_error; - first_event = 0; - - XQueryExtension(dpy, INAME, &major_opcode, &first_event, &first_error); - return (XPointer)(long)first_event; -} - -static XEXT_GENERATE_FIND_DISPLAY (find_display, xtest_info, - xtest_extension_name, - &xtest_extension_hooks, XTestNumberEvents, - get_xinput_base(dpy)) - -static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xtest_info) - -/***************************************************************************** - * * - * public routines * - * * - *****************************************************************************/ - -Bool -XTestQueryExtension (dpy, event_basep, error_basep, majorp, minorp) - Display *dpy; - int *event_basep, *error_basep; - int *majorp, *minorp; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestGetVersionReq *req; - xXTestGetVersionReply rep; - - if (XextHasExtension(info)) { - LockDisplay(dpy); - GetReq(XTestGetVersion, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestGetVersion; - req->majorVersion = XTestMajorVersion; - req->minorVersion = XTestMinorVersion; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - UnlockDisplay(dpy); - SyncHandle(); - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - *majorp = rep.majorVersion; - *minorp = rep.minorVersion; - return True; - } else { - return False; - } -} - -Bool -XTestCompareCursorWithWindow(dpy, window, cursor) - Display *dpy; - Window window; - Cursor cursor; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestCompareCursorReq *req; - xXTestCompareCursorReply rep; - - XTestCheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestCompareCursor, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestCompareCursor; - req->window = window; - req->cursor = cursor; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - UnlockDisplay(dpy); - SyncHandle(); - return rep.same; -} - -Bool -XTestCompareCurrentCursorWithWindow(dpy, window) - Display *dpy; - Window window; -{ - return XTestCompareCursorWithWindow(dpy, window, XTestCurrentCursor); -} - -int -XTestFakeKeyEvent(dpy, keycode, is_press, delay) - Display *dpy; - unsigned int keycode; - Bool is_press; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestCheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = is_press ? KeyPress : KeyRelease; - req->detail = keycode; - req->time = delay; - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -int -XTestFakeButtonEvent(dpy, button, is_press, delay) - Display *dpy; - unsigned int button; - Bool is_press; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestCheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = is_press ? ButtonPress : ButtonRelease; - req->detail = button; - req->time = delay; - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -int -XTestFakeMotionEvent(dpy, screen, x, y, delay) - Display *dpy; - int screen; - int x, y; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestCheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = MotionNotify; - req->detail = False; - if (screen == -1) - req->root = None; - else - req->root = RootWindow(dpy, screen); - req->rootX = x; - req->rootY = y; - req->time = delay; - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -int -XTestFakeRelativeMotionEvent(dpy, dx, dy, delay) - Display *dpy; - int dx, dy; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestCheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = MotionNotify; - req->detail = True; - req->root = None; - req->rootX = dx; - req->rootY = dy; - req->time = delay; - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -static void -send_axes(dpy, info, req, dev, first_axis, axes, n_axes) - Display *dpy; - XExtDisplayInfo *info; - xXTestFakeInputReq *req; - XDevice *dev; - int first_axis; - int *axes; - int n_axes; -{ - deviceValuator ev; - int n; - - req->deviceid |= MORE_EVENTS; - req->length += ((n_axes + 5) / 6) * (SIZEOF(xEvent) >> 2); - ev.type = XI_DeviceValuator + (long)info->data; - ev.deviceid = dev->device_id; - ev.num_valuators = n_axes; - ev.first_valuator = first_axis; - while (n_axes > 0) { - n = n_axes; - if (n > 6) - n = 6; - switch (n) { - case 6: - ev.valuator5 = *(axes+5); - case 5: - ev.valuator4 = *(axes+4); - case 4: - ev.valuator3 = *(axes+3); - case 3: - ev.valuator2 = *(axes+2); - case 2: - ev.valuator1 = *(axes+1); - case 1: - ev.valuator0 = *axes; - } - Data(dpy, (char *)&ev, SIZEOF(xEvent)); - axes += n; - n_axes -= n; - ev.first_valuator += n; - } -} - -int -XTestFakeDeviceKeyEvent(dpy, dev, keycode, is_press, axes, n_axes, delay) - Display *dpy; - XDevice *dev; - unsigned int keycode; - Bool is_press; - int *axes; - int n_axes; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestICheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = is_press ? XI_DeviceKeyPress : XI_DeviceKeyRelease; - req->type += (int)(long)info->data; - req->detail = keycode; - req->time = delay; - req->deviceid = dev->device_id; - if (n_axes) - send_axes(dpy, info, req, dev, 0, axes, n_axes); - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -int -XTestFakeDeviceButtonEvent(dpy, dev, button, is_press, axes, n_axes, delay) - Display *dpy; - XDevice *dev; - unsigned int button; - Bool is_press; - int *axes; - int n_axes; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestICheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = is_press ? XI_DeviceButtonPress : XI_DeviceButtonRelease; - req->type += (int)(long)info->data; - req->detail = button; - req->time = delay; - req->deviceid = dev->device_id; - if (n_axes) - send_axes(dpy, info, req, dev, 0, axes, n_axes); - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -int -XTestFakeProximityEvent(dpy, dev, in_prox, axes, n_axes, delay) - Display *dpy; - XDevice *dev; - Bool in_prox; - int *axes; - int n_axes; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestICheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = in_prox ? XI_ProximityIn : XI_ProximityOut; - req->type += (int)(long)info->data; - req->time = delay; - req->deviceid = dev->device_id; - if (n_axes) - send_axes(dpy, info, req, dev, 0, axes, n_axes); - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -int -XTestFakeDeviceMotionEvent(dpy, dev, is_relative, - first_axis, axes, n_axes, delay) - Display *dpy; - XDevice *dev; - Bool is_relative; - int first_axis; - int *axes; - int n_axes; - unsigned long delay; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestFakeInputReq *req; - - XTestICheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestFakeInput, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestFakeInput; - req->type = XI_DeviceMotionNotify + (int)(long)info->data; - req->detail = is_relative; - req->time = delay; - req->deviceid = dev->device_id; - send_axes(dpy, info, req, dev, first_axis, axes, n_axes); - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -int -XTestGrabControl(dpy, impervious) - Display *dpy; - Bool impervious; -{ - XExtDisplayInfo *info = find_display (dpy); - register xXTestGrabControlReq *req; - - XTestCheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XTestGrabControl, req); - req->reqType = info->codes->major_opcode; - req->xtReqType = X_XTestGrabControl; - req->impervious = impervious; - UnlockDisplay(dpy); - SyncHandle(); - return 1; -} - -void -XTestSetGContextOfGC(gc, gid) - GC gc; - GContext gid; -{ - gc->gid = gid; -} - -void -XTestSetVisualIDOfVisual(visual, visualid) - Visual *visual; - VisualID visualid; -{ - visual->visualid = visualid; -} - -static xReq _dummy_request = { - 0, 0, 0 -}; - -Status -XTestDiscard(dpy) - Display *dpy; -{ - Bool something; - register char *ptr; - - LockDisplay(dpy); - if ((something = (dpy->bufptr != dpy->buffer))) { - for (ptr = dpy->buffer; - ptr < dpy->bufptr; - ptr += (((xReq *)ptr)->length << 2)) - dpy->request--; - dpy->bufptr = dpy->buffer; - dpy->last_req = (char *)&_dummy_request; - } - UnlockDisplay(dpy); - SyncHandle(); - return something; -} diff --git a/nx-X11/lib/Xtst/Xtst-def.cpp b/nx-X11/lib/Xtst/Xtst-def.cpp deleted file mode 100644 index a103ad497..000000000 --- a/nx-X11/lib/Xtst/Xtst-def.cpp +++ /dev/null @@ -1,32 +0,0 @@ -LIBRARY XTST -VERSION LIBRARY_VERSION -EXPORTS - XTestCompareCurrentCursorWithWindow - XTestCompareCursorWithWindow - XTestDiscard - XTestFakeButtonEvent - XTestFakeDeviceButtonEvent - XTestFakeDeviceKeyEvent - XTestFakeDeviceMotionEvent - XTestFakeKeyEvent - XTestFakeMotionEvent - XTestFakeProximityEvent - XTestFakeRelativeMotionEvent - XTestGrabControl - XTestQueryExtension - XTestSetGContextOfGC - XTestSetVisualIDOfVisual - XRecordQueryVersion - XRecordCreateContext - XRecordAllocRange - XRecordRegisterClients - XRecordUnregisterClients - XRecordGetContext - XRecordFreeState - XRecordEnableContext - XRecordEnableContextAsync - XRecordProcessReplies - XRecordFreeData - XRecordDisableContext - XRecordFreeContext -/* $Xorg: Xtst-def.cpp,v 1.3 2000/08/17 19:46:23 cpqbld Exp $ */ diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 93a676390..309d5d98f 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -403,17 +403,17 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lXcomposite -lXdmcp \ + -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lXdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lXdmcp \ + -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ `pkg-config --libs libxml-2.0` #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lXcomposite -lNX_Xinerama -lXdmcp \ + -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lNX_Xinerama -lXdmcp \ `pkg-config --libs libxml-2.0` #endif diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 40e1828bb..672586fdd 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -30,7 +30,7 @@ extern void MITMiscExtensionInit(INITARGS); #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ -#include +#include #include #endif diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c index d9adc03c0..482ad91d4 100644 --- a/nx-X11/programs/Xserver/Xext/xtest.c +++ b/nx-X11/programs/Xserver/Xext/xtest.c @@ -46,7 +46,7 @@ from The Open Group. #include "dixevents.h" #include "sleepuntil.h" #define _XTEST_SERVER_ -#include +#include #include #ifdef XINPUT #include diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index f4ff4c243..47ff26127 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -195,7 +195,7 @@ typedef void (*InitExtension)(INITARGS); #endif #ifdef XTEST #define _XTEST_SERVER_ -#include +#include #endif #ifdef XKB #include diff --git a/nx-libs.spec b/nx-libs.spec index abe41d160..22094c2a5 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -38,6 +38,7 @@ BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xtst) %else BuildRequires: libexpat-devel BuildRequires: libpng-devel @@ -51,6 +52,7 @@ BuildRequires: xorg-x11-libXdamage-devel BuildRequires: xorg-x11-libXcomposite-devel BuildRequires: xorg-x11-libXrandr-devel BuildRequires: xorg-x11-libXfixes-devel +BuildRequires: xorg-x11-libXtst-devel %endif BuildRequires: xorg-x11-util-devel %endif @@ -64,6 +66,7 @@ BuildRequires: libXdmcp-devel BuildRequires: libXcomposite-devel BuildRequires: libXrandr-devel BuildRequires: libXfixes-devel +BuildRequires: libXtst-devel %endif # For imake @@ -291,26 +294,6 @@ The Xrender library is designed as a lightweight library interface to the Render extension. -%package -n libNX_Xtst6 -Group: System Environment/Libraries -Summary: Xlib-based client API for the XTEST and RECORD extensions on NX -Requires: %{name}%{?_isa} >= 3.5.0.29 -Obsoletes: libNX_Xtst - -%description -n libNX_Xtst6 -NX is a software suite which implements very efficient compression of -the X11 protocol. This increases performance when using X -applications over a network, especially a slow one. - -The XTEST extension is a minimal set of client and server extensions -required to completely test the X11 server with no user intervention. -This extension is not intended to support general journaling and -playback of user actions. - -The RECORD extension supports the recording and reporting of all core -X protocol and arbitrary X extension protocol. - - %package -n libXcomp-devel Group: Development/Libraries Summary: Development files for the NX differential compression library @@ -443,10 +426,6 @@ Provides: nx%{?_isa} = %{version}-%{release} Requires: xorg-x11-fonts-core %endif -# Should be a weak dependency, because this package -# works without the dependency. -Requires: xkeyboard-config - %description -n nxagent NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X @@ -589,7 +568,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %post -n libNX_Xext6 -p /sbin/ldconfig %post -n libNX_Xinerama1 -p /sbin/ldconfig %post -n libNX_Xrender1 -p /sbin/ldconfig -%post -n libNX_Xtst6 -p /sbin/ldconfig %post -n libXcomp3 -p /sbin/ldconfig %post -n libXcompext3 -p /sbin/ldconfig %post -n libXcompshad3 -p /sbin/ldconfig @@ -599,7 +577,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %postun -n libNX_Xext6 -p /sbin/ldconfig %postun -n libNX_Xinerama1 -p /sbin/ldconfig %postun -n libNX_Xrender1 -p /sbin/ldconfig -%postun -n libNX_Xtst6 -p /sbin/ldconfig %postun -n libXcomp3 -p /sbin/ldconfig %postun -n libXcompext3 -p /sbin/ldconfig %postun -n libXcompshad3 -p /sbin/ldconfig @@ -672,7 +649,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_includedir}/nx-X11/extensions/shape.h %{_includedir}/nx-X11/extensions/sync.h %{_includedir}/nx-X11/extensions/xtestext1.h -%{_includedir}/nx-X11/extensions/xteststr.h %files -n libNX_Xext6 %defattr(-,root,root) @@ -691,10 +667,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %defattr(-,root,root) %{_libdir}/libNX_Xrender.so.1* -%files -n libNX_Xtst6 -%defattr(-,root,root) -%{_libdir}/libNX_Xtst.so.6* - %files -n libXcomp-devel %defattr(-,root,root) %_libdir/libXcomp.so @@ -751,10 +723,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %files devel %defattr(-,root,root) %{_libdir}/libNX_Xinerama.so -%{_libdir}/libNX_Xtst.so %{_includedir}/nx-X11/X10.h %dir %{_includedir}/nx-X11/extensions -%{_includedir}/nx-X11/extensions/XTest.h %{_includedir}/nx-X11/extensions/Xevie.h %{_includedir}/nx-X11/extensions/Xinerama.h %{_includedir}/nx-X11/extensions/lbxbuf.h @@ -825,6 +795,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_includedir}/nx-X11/extensions/xf86vmstr.h %{_includedir}/nx-X11/extensions/xfixesproto.h %{_includedir}/nx-X11/extensions/xfixeswire.h +%{_includedir}/nx-X11/extensions/xtestconst.h +%{_includedir}/nx-X11/extensions/xteststr.h %{_includedir}/nx-X11/extensions/xtrapbits.h %{_includedir}/nx-X11/extensions/xtrapddmi.h %{_includedir}/nx-X11/extensions/xtrapdi.h diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 7614d55b9..f3b68b45a 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -151,7 +151,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lNX_Xext -lNX_Xtst -lXrandr -lXdamage +EXTRALIBS = -lNX_Xext -lXtst -lXrandr -lXdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) diff --git a/nxcompshad/X11.cpp b/nxcompshad/X11.cpp index 5a18e0a69..b5383816a 100644 --- a/nxcompshad/X11.cpp +++ b/nxcompshad/X11.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include "X11/include/XTest_nxcompshad.h" #include #include #include diff --git a/nxcompshad/X11/include/XTest_nxcompshad.h b/nxcompshad/X11/include/XTest_nxcompshad.h new file mode 100644 index 000000000..91a2ba40b --- /dev/null +++ b/nxcompshad/X11/include/XTest_nxcompshad.h @@ -0,0 +1,71 @@ +/* + +Copyright 1992, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#ifndef _XTEST_H_ +#define _XTEST_H_ + +#include + +_XFUNCPROTOBEGIN + +Bool XTestQueryExtension( + Display* /* dpy */, + int* /* event_basep */, + int* /* error_basep */, + int* /* majorp */, + int* /* minorp */ +); + +extern int XTestFakeKeyEvent( + Display* /* dpy */, + unsigned int /* keycode */, + Bool /* is_press */, + unsigned long /* delay */ +); + +extern int XTestFakeButtonEvent( + Display* /* dpy */, + unsigned int /* button */, + Bool /* is_press */, + unsigned long /* delay */ +); + +extern int XTestFakeMotionEvent( + Display* /* dpy */, + int /* screen */, + int /* x */, + int /* y */, + unsigned long /* delay */ +); + +extern int XTestGrabControl( + Display* /* dpy */, + Bool /* impervious */ +); + +_XFUNCPROTOEND + +#endif -- cgit v1.2.3 From f55249dc6e3f01d4c9970af090884cab346ad9b4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Apr 2016 14:20:24 +0200 Subject: nxcomshad/Makefile.in: Only install Shadow.h as publicly available header file. * Also adapt debian/libxcompshad-dev.install.in accordingly. * Also adapt nx-libs.spec accordingly. --- debian/libxcompshad-dev.install.in | 10 ---------- nx-libs.spec | 10 ---------- nxcompshad/Makefile.in | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) (limited to 'nxcompshad') diff --git a/debian/libxcompshad-dev.install.in b/debian/libxcompshad-dev.install.in index 31cc685d2..2010f5950 100644 --- a/debian/libxcompshad-dev.install.in +++ b/debian/libxcompshad-dev.install.in @@ -1,13 +1,3 @@ usr/lib/*/libXcompshad.so -usr/include/*/nx/Core.h -usr/include/*/nx/Input.h -usr/include/*/nx/Logger.h -usr/include/*/nx/Manager.h -usr/include/*/nx/Misc.h -usr/include/*/nx/Poller.h -usr/include/*/nx/Regions.h usr/include/*/nx/Shadow.h -usr/include/*/nx/Updater.h -usr/include/*/nx/Win.h -usr/include/*/nx/X11.h usr/lib/*/pkgconfig/nxcompshad.pc diff --git a/nx-libs.spec b/nx-libs.spec index a1074df66..5ce1d2145 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -609,17 +609,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %files -n libXcompshad-devel %defattr(-,root,root) %_libdir/libXcompshad.so -%{_includedir}/nx/Core.h -%{_includedir}/nx/Input.h -%{_includedir}/nx/Logger.h -%{_includedir}/nx/Manager.h -%{_includedir}/nx/Misc.h -%{_includedir}/nx/Poller.h -%{_includedir}/nx/Regions.h %{_includedir}/nx/Shadow.h -%{_includedir}/nx/Updater.h -%{_includedir}/nx/Win.h -%{_includedir}/nx/X11.h %{_libdir}/pkgconfig/nxcompshad.pc %files -n libXcompshad3 diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index f3b68b45a..68bb1fbad 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -210,7 +210,7 @@ install.lib: all $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir} $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir} $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir} - $(INSTALL_DATA) *.h $(DESTDIR)${includedir}/nx + $(INSTALL_DATA) Shadow.h $(DESTDIR)${includedir}/nx $(INSTALL_DATA) nxcompshad.pc $(DESTDIR)${pkgconfigdir} echo "Running ldconfig tool, this may take a while..." && ldconfig || true -- cgit v1.2.3 From f5eff9bc0a1134a16b1a6e67bfe3d0b4d7cd49e9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 6 Apr 2016 22:09:31 +0200 Subject: nx-X11/programs/Xserver: Include nxcomp{,ext,shad} headers like one would do with system-wide shared libraries. --- nx-X11/lib/X11/XlibInt.c | 6 +++--- nx-X11/lib/X11/Xlibint.h | 2 +- nx-X11/lib/xtrans/Xtranssock.c | 2 +- nx-X11/programs/Xserver/Imakefile | 21 +++++++++++++++++++++ nx-X11/programs/Xserver/hw/nxagent/Args.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Binder.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Client.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Display.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 10 +++++----- nx-X11/programs/Xserver/hw/nxagent/Font.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/GCOps.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Image.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Init.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Pointer.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Render.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Splash.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Split.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 4 ++-- nx-X11/programs/Xserver/os/log.c | 2 +- nx-X11/programs/Xserver/os/utils.c | 4 ++-- nxcomp/nxcomp.pc.in | 2 +- nxcompext/nxcompext.pc.in | 2 +- nxcompshad/nxcompshad.pc.in | 2 +- 37 files changed, 81 insertions(+), 60 deletions(-) (limited to 'nxcompshad') diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index 0aa890bbb..49535fe18 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -118,12 +118,12 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; #endif /* XTHREADS else */ -#include "NX.h" +#include #ifdef NX_TRANS_SOCKET -#include "NX.h" -#include "NXvars.h" +#include +#include static struct timeval retry; diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index 854b64b22..474b77349 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -64,7 +64,7 @@ from The Open Group. #ifdef NX_TRANS_SOCKET -#include "NXvars.h" +#include #define _XGetIOError(dpy) \ (dpy -> flags & XlibDisplayIOError) diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index b08cd9f0a..5c57fc5ba 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -344,7 +344,7 @@ static int haveIPv6 = 1; #ifdef TRANS_CLIENT -#include "NX.h" +#include typedef struct { diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 379a70004..d1f2ff335 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -318,6 +318,27 @@ NXAGENTDDXDIR = hw NXAGENTDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS) +NX_XCOMP_HEADERS = \ + ../../../nxcomp/NXalert.h \ + ../../../nxcomp/NX.h \ + ../../../nxcomp/NXpack.h \ + ../../../nxcomp/NXproto.h \ + ../../../nxcomp/NXvars.h + +NX_XCOMPEXT_HEADERS = \ + ../../../nxcompext/NXlib.h \ + ../../../nxcompext/NXlibint.h + +NX_XCOMPSHAD_HEADERS = \ + ../../../nxcompshad/Shadow.h + +NX_HEADERS = \ + $(NX_XCOMP_HEADERS) \ + $(NX_XCOMPEXT_HEADERS) \ + $(NX_XCOMPSHAD_HEADERS) + +BuildIncludes($(NX_HEADERS),nx,..) + #if defined(SunArchitecture) || \ defined(SparcArchitecture) NXAGENTOBJS = hw/nxagent/miinitext.o \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 3442c3789..59d3deb63 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -67,8 +67,8 @@ is" without express or implied warranty. * NX includes and definitions. */ -#include "NXlib.h" -#include "NXpack.h" +#include +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 578731f07..00411c65e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -26,7 +26,7 @@ #include "scrnintstr.h" #include "resource.h" -#include "NXpack.h" +#include #include "Atoms.h" #include "Args.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c index d40aaebe6..f69d23f4f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c @@ -20,7 +20,7 @@ #include #include -#include "NX.h" +#include #include "Binder.h" #include "Options.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index cba47981d..eaa216e20 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -23,7 +23,7 @@ #include #include -#include "NX.h" +#include #include "Xatom.h" #include "dixstruct.h" @@ -49,7 +49,7 @@ * definition of GC in Agent.h. */ -#include "NXlib.h" +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 82a1ed77e..f3656d2c0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -39,7 +39,7 @@ * Use asyncronous get property replies. */ -#include "NXlib.h" +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index c0015a831..62095d5b3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -57,7 +57,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "resource.h" -#include "NXlib.h" +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index 63c3b73c1..354f04120 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -33,9 +33,9 @@ #include "Display.h" #include "Dialog.h" -#include "NX.h" -#include "NXlib.h" -#include "NXalert.h" +#include +#include +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 628c4c495..31ea7c2a0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -52,7 +52,7 @@ is" without express or implied warranty. #include "unistd.h" #endif -#include "NXalert.h" +#include #include "Agent.h" #include "Display.h" @@ -77,8 +77,8 @@ is" without express or implied warranty. #include "Screen.h" #include "Handlers.h" -#include "NX.h" -#include "NXlib.h" +#include +#include #include NXAGENT_ICON_NAME #include X2GOAGENT_ICON_NAME diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 51d41db23..9dac8066a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -34,7 +34,7 @@ #include "Reconnect.h" #include "GCOps.h" -#include "NXlib.h" +#include #include "mibstorest.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 5ad81f781..ffb593750 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -58,9 +58,9 @@ #include "Utils.h" #include "Error.h" -#include "NX.h" -#include "NXvars.h" -#include "NXproto.h" +#include +#include +#include #include "xfixesproto.h" #define Window XlibWindow @@ -92,10 +92,10 @@ #include -#include "Shadow.h" +#include #include "X11/include/Xrandr_nxagent.h" -#include "NXlib.h" +#include /* * Set here the required log level. Please note diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 9123f4bbe..8f692eb85 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -50,8 +50,8 @@ is" without express or implied warranty. #include "Args.h" -#include "NXlib.h" -#include "NXalert.h" +#include +#include #include #include diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index 5f753ffe4..634bbf2ce 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -50,7 +50,7 @@ is" without express or implied warranty. #include "Args.h" #include "Screen.h" -#include "NXlib.h" +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index aee983253..cadb8e58a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -32,8 +32,8 @@ #include "Screen.h" #include "Millis.h" -#include "NXlib.h" -#include "Shadow.h" +#include +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index c84d3b7ed..6a7d46c35 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -37,8 +37,8 @@ #include "Pixels.h" #include "Utils.h" -#include "NXlib.h" -#include "NXpack.h" +#include +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index b0aff4b07..e9cef5ae3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -133,7 +133,7 @@ OBJS = NXwindow.o \ VFBINCLUDES = -I../../fb -I../../mfb -I../../render -INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ +INCLUDES = -I. \ -I../../../../extras/Mesa/include \ -I$(XBUILDINCDIR) \ -I../../mi -I../../include -I../../os \ @@ -144,7 +144,7 @@ INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../ `pkg-config --cflags-only-I libxml-2.0` \ `pkg-config --cflags-only-I pixman-1` #ifdef SunArchitecture -INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ +INCLUDES = -I. \ -I../../../../extras/Mesa/include \ -I$(XBUILDINCDIR) \ -I/usr/sfw/include \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 0b25aa57d..3ec9fa14a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -61,8 +61,8 @@ is" without express or implied warranty. #include "Millis.h" #include "Error.h" -#include "NX.h" -#include "NXlib.h" +#include +#include #include "Reconnect.h" /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 8d1fbd4c1..852771492 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -54,9 +54,9 @@ is" without express or implied warranty. #include "Options.h" #include "Error.h" -#include "NXlib.h" +#include -#include "Shadow.h" +#include #ifdef XKB diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 6a1f2ac6a..adeaff870 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -154,7 +154,7 @@ int ProcInitialConnection(); #include "Reconnect.h" #include "Millis.h" #include "Font.h" -#include "Shadow.h" +#include #include "Handlers.h" #include "Keyboard.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index f871cad13..89c5c0b19 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -183,7 +183,7 @@ xEvent *xeviexE; #include "dixgrabs.h" #include "../../dix/dispatch.h" -#include "NXlib.h" +#include #include "Events.h" #include "Windows.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 67c514714..c9f62b1fe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -42,8 +42,8 @@ #include "Holder.h" #include "Args.h" -#include "NXlib.h" -#include "NXpack.h" +#include +#include RESTYPE RT_NX_PIXMAP; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c index a751974af..ce2b37a90 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c @@ -46,7 +46,7 @@ is" without express or implied warranty. #include "Events.h" #include "Options.h" -#include "NXlib.h" +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 660d30863..00d434bf4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -49,9 +49,9 @@ #include "XKBsrv.h" #endif -#include "NX.h" -#include "NXlib.h" -#include "NXalert.h" +#include +#include +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index de1ad1207..d5f64d05b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -54,7 +54,7 @@ #include "Pixels.h" #include "Handlers.h" -#include "NXproto.h" +#include #define MAX_FORMATS 255 diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 4cf4afcad..a725e20e7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -30,7 +30,7 @@ #include "Atoms.h" #include "Trap.h" -#include "NXlib.h" +#include /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 83bcc01fd..20ec3672a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -74,7 +74,7 @@ is" without express or implied warranty. #include "Pointer.h" #include "Reconnect.h" #include "Composite.h" -#include "Shadow.h" +#include #include "Utils.h" #include "X11/include/Xrandr_nxagent.h" @@ -96,7 +96,7 @@ is" without express or implied warranty. #include "Xatom.h" #include "Xproto.h" -#include "NXlib.h" +#include #include "mibstorest.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h index 39becaa3d..7a987d17e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h @@ -20,7 +20,7 @@ #include "Windows.h" #include "X11/Xdmcp.h" -#include "NXalert.h" +#include #define XDM_TIMEOUT 20000 diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index 1840328e4..3b7961c9c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -26,7 +26,7 @@ #include "Events.h" #include "GCs.h" -#include "NXlib.h" +#include /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index fb26b8242..b553627dd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -56,8 +56,8 @@ #include "Composite.h" #include "Events.h" -#include "NX.h" -#include "NXlib.h" +#include +#include #include "Xatom.h" diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 2444cd333..84381dbf2 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -117,7 +117,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifdef NX_TRANS_SOCKET -#include "NX.h" +#include #endif diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 3f58b6fc5..13889ed9a 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -229,8 +229,8 @@ Bool noXvExtension = FALSE; #ifdef NX_TRANS_SOCKET -#include "NX.h" -#include "NXvars.h" +#include +#include #endif diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in index f4d3a7efb..f0963aa17 100644 --- a/nxcomp/nxcomp.pc.in +++ b/nxcomp/nxcomp.pc.in @@ -10,6 +10,6 @@ Version: @VERSION@ #Requires: libjpeg zlib Requires: libpng Requires.private: x11 -Cflags: -I${includedir} -I${includedir}/nx +Cflags: -I${includedir} Libs: -L${libdir} -lXcomp diff --git a/nxcompext/nxcompext.pc.in b/nxcompext/nxcompext.pc.in index 669397af6..6bd0773b1 100644 --- a/nxcompext/nxcompext.pc.in +++ b/nxcompext/nxcompext.pc.in @@ -8,6 +8,6 @@ Description: Extension for NX Compression Library Version: @VERSION@ Requires: nxcomp Requires.private: x11 -Cflags: -I${includedir} -I${includedir}/nx +Cflags: -I${includedir} Libs: -L${libdir} -lXcompext diff --git a/nxcompshad/nxcompshad.pc.in b/nxcompshad/nxcompshad.pc.in index 4d4265c76..80b75e3f5 100644 --- a/nxcompshad/nxcompshad.pc.in +++ b/nxcompshad/nxcompshad.pc.in @@ -8,6 +8,6 @@ Description: Shadow Session Support for NX Compression Library Version: @VERSION@ Requires: nxcomp Requires.private: x11 -Cflags: -I${includedir} -I${includedir}/nx +Cflags: -I${includedir} Libs: -L${libdir} -lXcompshad -- cgit v1.2.3 From 2f3d394e87c61369ed1308c6b3bc53cf0295146c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Jun 2016 12:41:50 +0200 Subject: nx-X11/config/{imake,makedepend}: Use system-wide available imake and makedepend tools. --- debian/control | 1 + nx-X11/Imakefile | 12 - nx-X11/Makefile | 71 +- nx-X11/config/Imakefile | 7 +- nx-X11/config/cf/Imake.rules | 16 +- nx-X11/config/cf/Imake.tmpl | 22 - nx-X11/config/cf/Imakefile | 3 - nx-X11/config/imake/Imakefile | 84 -- nx-X11/config/imake/Makefile.ini | 85 -- nx-X11/config/imake/ccimake.c | 62 - nx-X11/config/imake/imake.c | 2190 --------------------------------- nx-X11/config/imake/imake.man | 262 ---- nx-X11/config/imake/imakemdep.h | 1514 ----------------------- nx-X11/config/imake/imakesvc.cmd | 302 ----- nx-X11/config/makedepend/Imakefile | 101 -- nx-X11/config/makedepend/cpp.ed | 75 -- nx-X11/config/makedepend/cppsetup.c | 233 ---- nx-X11/config/makedepend/def.h | 188 --- nx-X11/config/makedepend/ifparser.c | 553 --------- nx-X11/config/makedepend/ifparser.h | 83 -- nx-X11/config/makedepend/include.c | 318 ----- nx-X11/config/makedepend/main.c | 865 ------------- nx-X11/config/makedepend/mkdepend.man | 382 ------ nx-X11/config/makedepend/parse.c | 686 ----------- nx-X11/config/makedepend/pr.c | 124 -- nxcomp/configure.in | 10 - nxcompext/configure.in | 10 - nxcompshad/configure.in | 10 - 28 files changed, 12 insertions(+), 8257 deletions(-) delete mode 100644 nx-X11/config/imake/Imakefile delete mode 100644 nx-X11/config/imake/Makefile.ini delete mode 100644 nx-X11/config/imake/ccimake.c delete mode 100644 nx-X11/config/imake/imake.c delete mode 100644 nx-X11/config/imake/imake.man delete mode 100644 nx-X11/config/imake/imakemdep.h delete mode 100644 nx-X11/config/imake/imakesvc.cmd delete mode 100644 nx-X11/config/makedepend/Imakefile delete mode 100644 nx-X11/config/makedepend/cpp.ed delete mode 100644 nx-X11/config/makedepend/cppsetup.c delete mode 100644 nx-X11/config/makedepend/def.h delete mode 100644 nx-X11/config/makedepend/ifparser.c delete mode 100644 nx-X11/config/makedepend/ifparser.h delete mode 100644 nx-X11/config/makedepend/include.c delete mode 100644 nx-X11/config/makedepend/main.c delete mode 100644 nx-X11/config/makedepend/mkdepend.man delete mode 100644 nx-X11/config/makedepend/parse.c delete mode 100644 nx-X11/config/makedepend/pr.c (limited to 'nxcompshad') diff --git a/debian/control b/debian/control index 2344dd37f..e9e7f7d18 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Build-Depends: x11proto-core-dev, expat, libpixman-1-dev (>= 0.13.2), + xutils-dev, Standards-Version: 3.9.6 Homepage: https://github.com/ArcticaProject/nx-libs/ Vcs-Git: https://github.com/ArcticaProject/nx-libs/ diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile index 46ca9e70c..45948d2af 100644 --- a/nx-X11/Imakefile +++ b/nx-X11/Imakefile @@ -105,11 +105,6 @@ Everything:: @echo "" @date @echo "" - cd $(IMAKESRC) && if [ -f Makefile ]; then \ - $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ - else \ - $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ - fi -$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak $(MAKE) $(MFLAGS) xmakefile $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles @@ -149,9 +144,6 @@ Everything:: @echo Rebuilding $(RELEASE) of the X Window System. @echo : @echo : - cd $(IMAKESRC) - $(MAKE) $(MFLAGS) -f Makefile.ini imake.exe - cd ..\.. RMoveToBakFile(xmakefile) $(MAKE) $(MFLAGS) xmakefile $(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles @@ -186,7 +178,3 @@ xmakefile-exists:: #ifndef MakeHtmlManIndex #define MakeHtmlManIndex YES /* install.man generates HTML man page index */ #endif - -#undef BootstrapCleanSubdirs -#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" -BOOTSTRAPSUBDIRS = imake makedepend diff --git a/nx-X11/Makefile b/nx-X11/Makefile index e6b2f77ab..7a3ece799 100644 --- a/nx-X11/Makefile +++ b/nx-X11/Makefile @@ -8,7 +8,7 @@ # Luna users will need to either run make as "make MAKE=make" # or add "MAKE = make" to this file. -RELEASE = "Release 6.9" +RELEASE = "Release $(shell cat ../VERSION)" SHELL = /bin/sh RM = rm -f MV = mv @@ -17,16 +17,11 @@ WIN32WORLDOPTS = -i TOP = . CURRENT_DIR = . CONFIGSRC = $(TOP)/config -IMAKESRC = $(CONFIGSRC)/imake -DEPENDSRC = $(CONFIGSRC)/makedepend -DEPENDTOP = ../.. -IMAKETOP = ../.. IRULESRC = $(CONFIGSRC)/cf -IMAKE = $(IMAKESRC)/imake +IMAKE = imake IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES) MAKE_OPTS = -f xmakefile MAKE_CMD = $(MAKE) $(MAKE_OPTS) -FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)" all: @${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial @@ -34,8 +29,7 @@ all: all-initial: @echo Please use make World, or on NT use nmake World.Win32. - @echo Check the configuration parameters in the $(IRULESRC) directory, - @echo and pass BOOTSTRAPCFLAGS if necessary. + @echo @echo Read the release notes carefully before proceeding. @echo Do not name your log file make.log or it will be deleted. @@ -43,11 +37,6 @@ World: @echo "" @echo Building $(RELEASE). @echo "" - @case "x$(BOOTSTRAPCFLAGS)" in x) \ - echo I hope you checked the configuration parameters in $(IRULESRC) ; \ - echo to see if you need to pass BOOTSTRAPCFLAGS. ; \ - echo "" ; \ - ;; esac; @date @echo "" @if [ -f xmakefile ]; then \ @@ -55,31 +44,9 @@ World: ${MAKE} ${MAKE_OPTS} -k clean || \ $(RM) xmakefile; \ fi - @if [ ! -f $(IRULESRC)/host.def ]; then \ - if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \ - echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \ - else \ - if [ ! -f $(TOP)/fonts/Imakefile ]; then \ - echo "#define BuildFonts NO" > $(IRULESRC)/host.def; \ - else \ - echo "" > $(IRULESRC)/host.def; \ - fi; \ - fi; \ - fi -# @rm -f $(IRULESRC)/version.def; echo "" > $(IRULESRC)/version.def; @rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def; -# @if [ ! -f $(IRULESRC)/version.def ]; then \ -# rm -f $(IRULESRC)/version.def; \ -# echo "" > $(IRULESRC)/version.def; \ -# fi -# @if [ ! -f $(IRULESRC)/date.def ]; then \ -# rm -f $(IRULESRC)/date.def; \ -# echo "" > $(IRULESRC)/date.def; \ -# fi - cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean - $(MAKE) $(MFLAGS) Makefile.boot + ${MAKE} $(MFLAGS) xmakefile ${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def - $(MAKE) $(MFLAGS) Makefile.boot ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles ${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean @@ -98,37 +65,13 @@ World: # The steps are listed as separate targets so clearmake can wink in # the Makefile.proto files. -Makefile.boot: imake.bootstrap - $(RM) $(IMAKESRC)/Makefile.proto - -imake.proto: - cd $(IMAKESRC) && $(MAKE) $(FLAGS) - $(RM) $(DEPENDSRC)/Makefile.proto - -$(DEPENDSRC)/Makefile.proto: imake.proto - $(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC) - -depend.bootstrap: $(DEPENDSRC)/Makefile.proto - cd $(DEPENDSRC) && $(RM) -r Makefile Makefile.dep makedepend *.o bootstrap - cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap - -$(IMAKESRC)/Makefile.proto: depend.bootstrap - $(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) -DBootStrap - -imake.bootstrap: $(IMAKESRC)/Makefile.proto - cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend - cd $(IMAKESRC) && $(MAKE) $(FLAGS) bootstrap - cd $(IMAKESRC) && $(MAKE) -f Makefile.proto imakeonly - -@if [ -f xmakefile ]; then set -x; \ - $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \ - else exit 0; fi - $(MAKE) $(MFLAGS) xmakefile - Makefile:: $(MAKE) $(MFLAGS) xmakefile xmakefile: Imakefile - $(RM) xmakefile + @if [ -f xmakefile ]; then set -x; \ + $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \ + else exit 0; fi @rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def; $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile index 03b9f5b94..7d1217a46 100644 --- a/nx-X11/config/Imakefile +++ b/nx-X11/config/Imakefile @@ -8,12 +8,7 @@ XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $ NULL = -BOOTSTRAPSUBDIRS = \ - imake \ - makedepend \ - $(NULL) - -SUBDIRS = cf $(BOOTSTRAPSUBDIRS) +SUBDIRS = cf #if defined(XorgVersionString) \ && defined(ProjectRoot) && \ diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index e023b6d26..f782f964b 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -1930,9 +1930,7 @@ DependDependencyStatement() @@\ NoCmpScript(ProgramTargetName($(DEPEND))) @@\ @@\ ProgramTargetName($(DEPEND)): @@\ - @echo "checking $@ over in $(DEPENDSRC) first..."; \ @@\ - cd $(DEPENDSRC) && $(MAKE) makedependonly; \ @@\ - echo "okay, continuing in $(CURRENT_DIR)" + echo "using system-wide depend, continuing in $(CURRENT_DIR)" #endif /* UseInstalled */ #endif /* DependDependency */ @@ -2025,11 +2023,7 @@ target:: ProgramTargetName($(IMAKE)) @@\ NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf) @@\ @@\ ProgramTargetName($(IMAKE)) $(IMAKE).Osuf: @@\ - -@(cd $(IMAKESRC) && if [ -f Makefile ]; then \ @@\ - echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) imakeonly; else \ @@\ - echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \ @@\ - $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \ @@\ - echo "okay, continuing in $(CURRENT_DIR)") + echo "using system-wide imake, continuing in $(CURRENT_DIR)" #endif /* UseInstalled */ #endif /* ImakeDependency */ @@ -3226,12 +3220,8 @@ target:: @@\ fi; \ @@\ done -#ifdef UseInstalled -#define ImakeSubCmdHelper $(IMAKE_CMD) -#else -#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ +#define ImakeSubCmdHelper $(IMAKE_CMD) -I$(IMAKEPREFIX)$(IRULESRC) \ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#endif #endif /* MakeMakeSubdirs */ diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 30a0dc73b..f40864ced 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -1386,35 +1386,13 @@ TCLIBDIR = TclLibDir #define LoaderLibPrefix /**/ #endif #ifndef ImakeCmd -#ifdef UseInstalled /* assume BINDIR in path */ #define ImakeCmd imake -#else -#define ImakeCmd $(IMAKESRC)/imake -#endif #endif #ifndef ImakeWarningFlags #define ImakeWarningFlags /* Nothing */ #endif #ifndef DependCmd -#if UseGccMakeDepend -#ifdef UseInstalled /* assume BINDIR in path */ -#define DependCmd gccmakedep -#else -#define DependCmd $(DEPENDSRC)/gccmakedep -#endif -#elif UseCCMakeDepend -#ifdef UseInstalled /* assume BINDIR in path */ -#define DependCmd ccmakedep -#else -#define DependCmd $(DEPENDSRC)/ccmakedep -#endif -#else -#ifdef UseInstalled /* assume BINDIR in path */ #define DependCmd makedepend -#else -#define DependCmd $(DEPENDSRC)/makedepend -#endif -#endif #endif #ifndef DependDefines # if UseCCMakeDepend || UseGccMakeDepend diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile index b7626590d..22eb09216 100644 --- a/nx-X11/config/cf/Imakefile +++ b/nx-X11/config/cf/Imakefile @@ -30,14 +30,12 @@ xorgversion.def \ nxversion.def RULEFILES = \ -Imake.rules \ X11.rules \ lnxLib.rules \ noop.rules \ xf86.rules TMPLFILES = \ -Imake.tmpl \ Library.tmpl \ Server.tmpl \ ServerLib.tmpl \ @@ -47,7 +45,6 @@ lnxLib.tmpl \ xorg.tmpl CFFILES = \ -Imake.cf \ linux.cf \ xorg.cf diff --git a/nx-X11/config/imake/Imakefile b/nx-X11/config/imake/Imakefile deleted file mode 100644 index 13645443b..000000000 --- a/nx-X11/config/imake/Imakefile +++ /dev/null @@ -1,84 +0,0 @@ -XCOMM $XdotOrg: xc/config/imake/Imakefile,v 1.3 2005/10/10 23:49:09 kem Exp $ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ -XCOMM -XCOMM -XCOMM -XCOMM -XCOMM $XFree86: xc/config/imake/Imakefile,v 3.18 2003/10/21 17:41:44 tsi Exp $ - -XCOMM Some compilers generate fatal errors if an -L directory does -XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. - LDPRELIB = - LDPRELIBS = - -DEPLIBS = - -INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11 -CPP_PROGRAM = CppCmd -CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\"" -GCC_COMMAND = $(CC) -fmerge-constants -xc /dev/null -S -o /dev/null 2> /dev/null 1> /dev/null -GCC_DEFINES = -DHAS_MERGE_CONSTANTS=`if $(GCC_COMMAND); then echo 1; else echo 0; fi` - -EXTRA_DEFINES=-DMONOLITH - -#ifdef CrossCompileDir -CROSSCOMPILEDIR = CrossCompileDir -CROSSCOMPILEDEFINES=-DCROSSCOMPILE -DCROSSCOMPILEDIR=\"$(CROSSCOMPILEDIR)\" -#else -CROSSCOMPILEDIR = -CROSSCOMPILEDEFINES= -BOOTSTRAPDEFINES = -#endif - -DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) $(GCC_DEFINES) \ - $(CROSSCOMPILEDEFINES) - -EXTRAMANDEFS = -D__cpp__="\"$(CPP_PROGRAM)\"" - -#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture) -XBSDLIB = /**/ -#endif - -#ifdef CrossCompileDir -# ifdef TargetPreProcessCmd -CPP = TargetPreProcessCmd -# else -CPP = CrossCompileDir/cc -E - -# endif -IMAKEMDEFS_CPPDEFINES = $(DEFINES) -DCROSSCOMPILE_CPP -CppFileTarget(imakemdep_cpp.h,imakemdep.h,$(IMAKEMDEFS_CPPDEFINES),\ - NullParameter) -#endif - -#undef ImakeDependency -#define ImakeDependency(dummy) @@\ -imake.o: imakemdep_cpp.h @@\ -Makefile:: ProgramTargetName(imake) - -#if CrossCompiling -SimpleHostProgramTarget(imake) -#else -SimpleProgramTarget(imake) -#endif - -imakeonly:: $(PROGRAM) - -InstallDriverSDKNamedProg(imake,imake,$(DRIVERSDKDIR)/config/imake) - -#if HasClearmake -bootstrapdepend: depend -#else -bootstrapdepend: -#endif - -clean:: - RemoveFile(ProgramTargetName(ccimake)) - RemoveFile(Makefile.proto) - RemoveFile(imakemdep_cpp.h) - $(RM) -r bootstrap - -#ifdef OS2Architecture -clean:: - RemoveFiles(imake ccimake) - -#endif diff --git a/nx-X11/config/imake/Makefile.ini b/nx-X11/config/imake/Makefile.ini deleted file mode 100644 index 93dca8584..000000000 --- a/nx-X11/config/imake/Makefile.ini +++ /dev/null @@ -1,85 +0,0 @@ -# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ -# -# WARNING WARNING WARNING WARNING WARNING WARNING WARNING -# -# This is NOT an automatically generated Makefile! It is hand-crafted as a -# bootstrap, may need editing for your system. The BOOTSTRAPCFLAGS variable -# may be given at the top of the build tree for systems that do not define -# any machine-specific preprocessor symbols. -# -# $XFree86: xc/config/imake/Makefile.ini,v 3.9 2000/10/26 17:57:45 dawes Exp $ - -CROSSCOMPILEDIR = -CROSSCOMPILEFLAGS = -DCROSSCOMPILEDIR=\"$(CROSSCOMPILEDIR)\" -BOOTSTRAPCFLAGS = -CC = cc -PREPROCESS_CMD = cc -E -CDEBUGFLAGS = -O -INCLUDES = -I../../include -I../../imports/x11/include/X11 -CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) -DMONOLITH -IMAKEMDEP_CROSSCOMPILE = -DCROSSCOMPILE_CPP -SHELL = /bin/sh -RM = rm -f -MV = mv -RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ - tags TAGS make.log -NPROC = 1 - -imake:: - @echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS) and CROSSCOMPILEFLAGS=$(CROSSCOMPILEFLAGS) in config/imake" - -imake:: imake.o - $(CC) -o imake $(CFLAGS) imake.o - -imake.o: ccimake imake.c imakemdep_cpp.h - $(CC) -c $(CFLAGS) `./ccimake` imake.c - -ccimake: ccimake.c - $(CC) -o ccimake $(CROSSCOMPILEFLAGS) $(CFLAGS) ccimake.c - -imakemdep_cpp.h: ccimake imakemdep.h - if [ -n "$(CROSSCOMPILEDIR)" ] ; then \ - $(CROSSCOMPILEDIR)/$(PREPROCESS_CMD) `./ccimake` \ - $(IMAKEMDEP_CROSSCOMPILE) imakemdep.h > imakemdep_cpp.h; \ - else touch imakemdep_cpp.h; fi - -# a derived object erroneously would get shared across platforms by clearmake -.NO_CONFIG_REC: ccimake - -bootstrap: - -@if [ -d bootstrap ]; then exit 0; else set -x; mkdir bootstrap; fi - $(MV) *.o bootstrap - @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; \ - elif [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0; fi - -relink: - $(RM) imake - $(MAKE) $(MFLAGS) imake - -clean: - $(RM) ccimake imake.o imake - $(RM_CMD) \#* - $(RM) -r Makefile.proto Makefile Makefile.dep bootstrap - $(RM) imakemdep_cpp.h - -depend: - -imake.exe:: - @echo making imake with BOOTSTRAPCFLAGS=-DWIN32 - -imake.exe:: imake.obj - cl -nologo imake.obj libc.lib kernel32.lib - -imake.obj: imake.c - cl -nologo -W2 -D__STDC__ -c -DWIN32 $(CFLAGS) imake.c - -clean.Win32: - if exist imake.exe del imake.exe - if exist imake.obj del imake.obj - -clean.os2: - imakesvc 4 imake imake.exe imake.o /imake.exe - -imake.os2: imake.c - $(CC) -DBSD43 $(CFLAGS) -o imake.exe imake.c - copy imake.exe \\ diff --git a/nx-X11/config/imake/ccimake.c b/nx-X11/config/imake/ccimake.c deleted file mode 100644 index 30524d55f..000000000 --- a/nx-X11/config/imake/ccimake.c +++ /dev/null @@ -1,62 +0,0 @@ -/* $Xorg: ccimake.c,v 1.4 2001/02/09 02:03:15 xorgcvs Exp $ */ -/* - -Copyright (c) 1993, 1994, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group . - -*/ -/* $XFree86: xc/config/imake/ccimake.c,v 1.2 2001/04/01 13:59:56 tsi Exp $ */ - -/* - * Warning: This file must be kept as simple as possible so that it can - * compile without any special flags on all systems. Do not touch it unless - * you *really* know what you're doing. Make changes in imakemdep.h, not here. - */ - -#define CCIMAKE /* only get imake_ccflags definitions */ -#include "imakemdep.h" /* things to set when porting imake */ - -#ifndef imake_ccflags -# define imake_ccflags "-O" -#endif - -#ifndef CROSSCOMPILEDIR -# define CROSSCOMPILEDIR "" -#endif - -#define crosscompile_ccflags " -DCROSSCOMPILE " -#define crosscompiledir_str "-DCROSSCOMPILEDIR=" - -int -main() -{ - if (CROSSCOMPILEDIR[0] != '\0') { - write(1, crosscompiledir_str, sizeof(crosscompiledir_str) - 1); - write(1,"\"",1); - write(1, CROSSCOMPILEDIR, sizeof(CROSSCOMPILEDIR) - 1); - write(1,"\"",1); - write(1, crosscompile_ccflags, sizeof(crosscompile_ccflags) - 1); - } - write(1, imake_ccflags, sizeof(imake_ccflags) - 1); - return 0; -} - diff --git a/nx-X11/config/imake/imake.c b/nx-X11/config/imake/imake.c deleted file mode 100644 index 86b9ad6c1..000000000 --- a/nx-X11/config/imake/imake.c +++ /dev/null @@ -1,2190 +0,0 @@ - -/*************************************************************************** - * * - * Porting Note * - * * - * Add the value of BOOTSTRAPCFLAGS to the cpp_argv table so that it will * - * be passed to the template file. * - * * - ***************************************************************************/ -/* - * -Copyright (c) 1985, 1986, 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - * - * Original Author: - * Todd Brunhoff - * Tektronix, inc. - * While a guest engineer at Project Athena, MIT - * - * imake: the include-make program. - * - * Usage: imake [-Idir] [-Ddefine] [-T template] [-f imakefile ] [-C Imakefile.c ] [-s] [-e] [-v] [make flags] - * - * Imake takes a template file (Imake.tmpl) and a prototype (Imakefile) - * and runs cpp on them producing a Makefile. It then optionally runs make - * on the Makefile. - * Options: - * -D define. Same as cpp -D argument. - * -U undefine. Same as cpp -U argument. - * -W warning. Same as cpp -W argument. - * -I Include directory. Same as cpp -I argument. - * -T template. Designate a template other - * than Imake.tmpl - * -f specify the Imakefile file - * -C specify the name to use instead of Imakefile.c - * -s[F] show. Show the produced makefile on the standard - * output. Make is not run is this case. If a file - * argument is provided, the output is placed there. - * -e[F] execute instead of show; optionally name Makefile F - * -v verbose. Show the make command line executed. - * - * Environment variables: - * - * IMAKEINCLUDE Include directory to use in addition to "." - * IMAKECPP Cpp to use instead of /lib/cpp - * IMAKEMAKE make program to use other than what is - * found by searching the $PATH variable. - * Other features: - * imake reads the entire cpp output into memory and then scans it - * for occurences of "@@". If it encounters them, it replaces it with - * a newline. It also trims any trailing white space on output lines - * (because make gets upset at them). This helps when cpp expands - * multi-line macros but you want them to appear on multiple lines. - * It also changes occurences of "XCOMM" to "#", to avoid problems - * with treating commands as invalid preprocessor commands. - * - * The macros MAKEFILE and MAKE are provided as macros - * to make. MAKEFILE is set to imake's makefile (not the constructed, - * preprocessed one) and MAKE is set to argv[0], i.e. the name of - * the imake program. - * - * Theory of operation: - * 1. Determine the name of the imakefile from the command line (-f) - * or from the content of the current directory (Imakefile or imakefile). - * Call this . This gets added to the arguments for - * make as MAKEFILE=. - * 2. Determine the name of the template from the command line (-T) - * or the default, Imake.tmpl. Call this