diff --git a/proto/xorgproto/COPYING-panoramixproto b/proto/xorgproto/COPYING-panoramixproto deleted file mode 100644 index 7f33cbfd2..000000000 --- a/proto/xorgproto/COPYING-panoramixproto +++ /dev/null @@ -1,12 +0,0 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. - -Please submit updated COPYING files to the Xorg bugzilla: - -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -All licensing questions regarding this software should be directed at the -Xorg mailing list: - -http://lists.freedesktop.org/mailman/listinfo/xorg diff --git a/proto/xorgproto/Makefile.am b/proto/xorgproto/Makefile.am index 74038d5d6..2de9faa39 100644 --- a/proto/xorgproto/Makefile.am +++ b/proto/xorgproto/Makefile.am @@ -24,8 +24,6 @@ XCalibrateinclude_HEADERS = \ calibrateprotopkgconfigdir = $(datadir)/pkgconfig calibrateprotopkgconfig_DATA = xcalibrateproto.pc - -calibrateproto_EXTRA_DIST = autogen.sh xcalibrateproto.pc.in endif compositedir = $(includedir)/X11/extensions @@ -75,8 +73,6 @@ evie_HEADERS = \ evieprotopkgconfigdir = $(datadir)/pkgconfig evieprotopkgconfig_DATA = evieproto.pc - -evieproto_EXTRA_DIST = evieproto.pc.in endif fixesdir = $(includedir)/X11/extensions @@ -96,8 +92,6 @@ fontcache_HEADERS = \ fontcacheprotopkgconfigdir = $(datadir)/pkgconfig fontcacheprotopkgconfig_DATA = fontcacheproto.pc - -fontcacheproto_EXTRA_DIST = fontcacheproto.pc.in endif fontsdir = $(includedir)/X11/fonts @@ -126,8 +120,6 @@ glinternal_HEADERS = \ glprotopkgconfigdir = $(datadir)/pkgconfig glprotopkgconfig_DATA = glproto.pc -glproto_EXTRA_DIST = meson.build - inputdir = $(includedir)/X11/extensions input_HEADERS = \ include/X11/extensions/XI.h \ @@ -140,11 +132,13 @@ inputprotopkgconfig_DATA = inputproto.pc kbdir = $(includedir)/X11/extensions kb_HEADERS = \ - include/X11/extensions/XKBgeom.h \ include/X11/extensions/XKB.h \ include/X11/extensions/XKBproto.h \ include/X11/extensions/XKBsrv.h \ include/X11/extensions/XKBstr.h +if LEGACY +kb_HEADERS += include/X11/extensions/XKBgeom.h +endif kbprotopkgconfigdir = $(datadir)/pkgconfig kbprotopkgconfig_DATA = kbproto.pc @@ -157,8 +151,6 @@ lg3d_HEADERS = \ lg3dprotopkgconfigdir = $(datadir)/pkgconfig lg3dprotopkgconfig_DATA = lg3dproto.pc -lg3dproto_EXTRA_DIST = autogen.sh lg3dproto.pc.in - xproxymngdir = $(includedir)/X11/PM xproxymng_HEADERS = \ include/X11/PM/PM.h \ @@ -166,8 +158,6 @@ xproxymng_HEADERS = \ pmprotopkgconfigdir = $(datadir)/pkgconfig pmprotopkgconfig_DATA = xproxymngproto.pc - -pmproto_EXTRA_DIST = xproxymngproto.pc.in endif presentdir = $(includedir)/X11/extensions @@ -190,16 +180,6 @@ printprotopkgconfig_DATA = printproto.pc miscmandir = $(MISC_MAN_DIR) miscman_DATA = man/Xprint.$(MISC_MAN_SUFFIX) CLEANFILES = $(miscman_DATA) - -printproto_EXTRA_DIST = printproto.pc.in \ - man/Xprint.man \ - man/Xprint.sgml \ - specs/xp_proto.book \ - specs/xp_proto.mif \ - specs/xp_proto.ps \ - specs/xp_protoIX.doc \ - specs/xp_protoTOC.doc \ - specs/xp_proto_cov.mif endif SED = sed @@ -211,7 +191,7 @@ MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__datadir__|$(datadir)|g' \ - -e 's|__datadir__|$(libdir)|g' \ + -e 's|__libdir__|$(libdir)|g' \ -e 's|__sysconfdir__|$(sysconfdir)|g' \ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ @@ -276,22 +256,22 @@ trap_HEADERS = \ trapprotopkgconfigdir = $(datadir)/pkgconfig trapprotopkgconfig_DATA = trapproto.pc - -trapproto_EXTRA_DIST = trapproto.pc.in endif videodir = $(includedir)/X11/extensions video_HEADERS = \ - include/X11/extensions/vldXvMC.h \ include/X11/extensions/Xv.h \ include/X11/extensions/XvMC.h \ include/X11/extensions/XvMCproto.h \ include/X11/extensions/Xvproto.h +if LEGACY +video_HEADERS += include/X11/extensions/vldXvMC.h +endif videoprotopkgconfigdir = $(datadir)/pkgconfig videoprotopkgconfig_DATA = videoproto.pc -if WINDOWSWM +if LEGACY windowswmdir = $(includedir)/X11/extensions windowswm_HEADERS = \ include/X11/extensions/windowswm.h \ @@ -427,8 +407,6 @@ xf86misc_HEADERS = \ xf86miscprotopkgconfigdir = $(datadir)/pkgconfig xf86miscprotopkgconfig_DATA = xf86miscproto.pc -xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in - xf86rushdir = $(includedir)/X11/extensions xf86rush_HEADERS = \ include/X11/extensions/xf86rush.h \ @@ -436,8 +414,6 @@ xf86rush_HEADERS = \ xf86rushprotopkgconfigdir = $(datadir)/pkgconfig xf86rushprotopkgconfig_DATA = xf86rushproto.pc - -xf86rushproto_EXTRA_DIST = xf86rushproto.pc.in endif xf86vidmodedir = $(includedir)/X11/extensions @@ -487,7 +463,6 @@ EXTRA_DIST = \ COPYING-inputproto \ COPYING-kbproto \ COPYING-lg3dproto \ - COPYING-panoramixproto \ COPYING-pmproto \ COPYING-presentproto \ COPYING-printproto \ @@ -509,6 +484,8 @@ EXTRA_DIST = \ COPYING-xf86rushproto \ COPYING-xf86vidmodeproto \ COPYING-xineramaproto \ + README.md \ + autogen.sh \ include/GL/internal/meson.build \ include/GL/meson.build \ include/meson.build \ @@ -518,4 +495,8 @@ EXTRA_DIST = \ include/X11/meson.build \ include/X11/PM/meson.build \ meson.build \ - meson_options.txt + meson_options.txt \ + man/Xprint.man \ + man/Xprint.sgml + +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-legacy diff --git a/proto/xorgproto/Makefile.bsd-wrapper b/proto/xorgproto/Makefile.bsd-wrapper index 225446fa8..e6947ee83 100644 --- a/proto/xorgproto/Makefile.bsd-wrapper +++ b/proto/xorgproto/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2019/01/20 17:28:24 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2020/01/04 17:53:16 matthieu Exp $ CONFIGURE_ARGS= --datarootdir=${X11BASE}/lib \ --docdir=${X11BASE}/share/doc/xorgproto @@ -23,9 +23,9 @@ EXTSPECS= appendix.xml appgrp.xml dbe.xml dpms.xml evi.xml geproto.xml \ afterinstall: - ${INSTALL_DATA} ${.CURDIR}/specs/bigreq.xml \ + ${INSTALL_DATA} ${.CURDIR}/specs/bigreqsproto/bigreq.xml \ ${DESTDIR}${X11BASE}/share/doc/xorgproto - ${INSTALL_DATA} ${.CURDIR}/specs/fsproto.xml \ + ${INSTALL_DATA} ${.CURDIR}/specs/fontsproto/fsproto.xml \ ${DESTDIR}${X11BASE}/share/doc/xorgproto @for i in ${XISPECS}; do \ echo installing $$i in ${X11BASE}/share/doc/xorgproto/inputproto;\ @@ -34,16 +34,16 @@ afterinstall: done @for i in ${XKBSPECS}; do \ echo installing $$i in ${X11BASE}/share/doc/xorgproto/kbproto;\ - ${INSTALL_DATA} ${.CURDIR}/specs/$$i \ + ${INSTALL_DATA} ${.CURDIR}/specs/kbproto/$$i \ ${DESTDIR}${X11BASE}/share/doc/xorgproto/kbproto;\ done - ${INSTALL_DATA} ${.CURDIR}/specs/record.xml \ + ${INSTALL_DATA} ${.CURDIR}/specs/recordproto/record.xml \ ${DESTDIR}${X11BASE}/share/doc/xorgproto - ${INSTALL_DATA} ${.CURDIR}/specs/saver.xml \ + ${INSTALL_DATA} ${.CURDIR}/specs/scrnsaverproto/saver.xml \ ${DESTDIR}${X11BASE}/share/doc/xorgproto @for i in ${XSPECS}; do \ echo installing $$i in ${X11BASE}/share/doc/xorgproto/x11proto; \ - ${INSTALL_DATA} ${.CURDIR}/specs/$$i \ + ${INSTALL_DATA} ${.CURDIR}/specs/xproto/$$i \ ${DESTDIR}${X11BASE}/share/doc/xorgproto/x11proto;\ done @for i in ${SIADDRESSES}; do \ @@ -51,11 +51,11 @@ afterinstall: ${INSTALL_DATA} ${.CURDIR}/specs/SIAddresses/$$i \ ${DESTDIR}${X11BASE}/share/doc/xorgproto/SIAddresses;\ done - ${INSTALL_DATA} ${.CURDIR}/specs/xc-misc.xml \ + ${INSTALL_DATA} ${.CURDIR}/specs/xcmiscproto/xc-misc.xml \ ${DESTDIR}${X11BASE}/share/doc/xorgproto @for i in ${EXTSPECS}; do \ echo installing $$i in ${X11BASE}/share/doc/xorgproto/xextproto;\ - ${INSTALL_DATA} ${.CURDIR}/specs/$$i \ + ${INSTALL_DATA} ${.CURDIR}/specs/xextproto/$$i \ ${DESTDIR}${X11BASE}/share/doc/xorgproto/xextproto;\ done diff --git a/proto/xorgproto/Makefile.in b/proto/xorgproto/Makefile.in index ac2ece174..8f7a1a75a 100644 --- a/proto/xorgproto/Makefile.in +++ b/proto/xorgproto/Makefile.in @@ -51,45 +51,48 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h +@LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h subdir = . -DIST_COMMON = README $(am__XCalibrateinclude_HEADERS_DIST) \ +DIST_COMMON = $(am__XCalibrateinclude_HEADERS_DIST) \ $(am__applewm_HEADERS_DIST) $(am__compat_HEADERS_DIST) \ $(am__configure_deps) $(am__evie_HEADERS_DIST) \ - $(am__fontcache_HEADERS_DIST) $(am__lg3d_HEADERS_DIST) \ - $(am__print_HEADERS_DIST) $(am__trap_HEADERS_DIST) \ + $(am__fontcache_HEADERS_DIST) $(am__kb_HEADERS_DIST) \ + $(am__lg3d_HEADERS_DIST) $(am__print_HEADERS_DIST) \ + $(am__trap_HEADERS_DIST) $(am__video_HEADERS_DIST) \ $(am__windowswm_HEADERS_DIST) $(am__xf86misc_HEADERS_DIST) \ $(am__xf86rush_HEADERS_DIST) $(am__xproxymng_HEADERS_DIST) \ $(bigreqs_HEADERS) $(composite_HEADERS) $(damage_HEADERS) \ $(dist_doc_DATA) $(dmx_HEADERS) $(dri2_HEADERS) \ $(dri3_HEADERS) $(fixes_HEADERS) $(fonts_HEADERS) \ $(gl_HEADERS) $(glinternal_HEADERS) $(input_HEADERS) \ - $(kb_HEADERS) $(present_HEADERS) $(randr_HEADERS) \ - $(record_HEADERS) $(render_HEADERS) $(resource_HEADERS) \ - $(scrnsaver_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/applewmproto.pc.in \ - $(srcdir)/bigreqsproto.pc.in $(srcdir)/compositeproto.pc.in \ - $(srcdir)/damageproto.pc.in $(srcdir)/dmxproto.pc.in \ - $(srcdir)/dri2proto.pc.in $(srcdir)/dri3proto.pc.in \ - $(srcdir)/evieproto.pc.in $(srcdir)/fixesproto.pc.in \ - $(srcdir)/fontcacheproto.pc.in $(srcdir)/fontsproto.pc.in \ - $(srcdir)/glproto.pc.in $(srcdir)/inputproto.pc.in \ - $(srcdir)/kbproto.pc.in $(srcdir)/lg3dproto.pc.in \ - $(srcdir)/presentproto.pc.in $(srcdir)/printproto.pc.in \ - $(srcdir)/randrproto.pc.in $(srcdir)/recordproto.pc.in \ - $(srcdir)/renderproto.pc.in $(srcdir)/resourceproto.pc.in \ - $(srcdir)/scrnsaverproto.pc.in $(srcdir)/trapproto.pc.in \ - $(srcdir)/videoproto.pc.in $(srcdir)/windowswmproto.pc.in \ - $(srcdir)/xcalibrateproto.pc.in $(srcdir)/xcmiscproto.pc.in \ - $(srcdir)/xextproto.pc.in $(srcdir)/xf86bigfontproto.pc.in \ - $(srcdir)/xf86dgaproto.pc.in $(srcdir)/xf86driproto.pc.in \ - $(srcdir)/xf86miscproto.pc.in $(srcdir)/xf86rushproto.pc.in \ - $(srcdir)/xf86vidmodeproto.pc.in $(srcdir)/xineramaproto.pc.in \ - $(srcdir)/xproto.pc.in $(srcdir)/xproxymngproto.pc.in \ - $(top_srcdir)/configure $(top_srcdir)/include/X11/Xpoll.h.in \ - $(video_HEADERS) $(xcmisc_HEADERS) $(xext_HEADERS) \ - $(xf86bigfont_HEADERS) $(xf86dga_HEADERS) $(xf86dri_HEADERS) \ - $(xf86vidmode_HEADERS) $(xinerama_HEADERS) $(xproto_HEADERS) \ - AUTHORS INSTALL config.guess config.sub install-sh missing + $(present_HEADERS) $(randr_HEADERS) $(record_HEADERS) \ + $(render_HEADERS) $(resource_HEADERS) $(scrnsaver_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/applewmproto.pc.in $(srcdir)/bigreqsproto.pc.in \ + $(srcdir)/compositeproto.pc.in $(srcdir)/damageproto.pc.in \ + $(srcdir)/dmxproto.pc.in $(srcdir)/dri2proto.pc.in \ + $(srcdir)/dri3proto.pc.in $(srcdir)/evieproto.pc.in \ + $(srcdir)/fixesproto.pc.in $(srcdir)/fontcacheproto.pc.in \ + $(srcdir)/fontsproto.pc.in $(srcdir)/glproto.pc.in \ + $(srcdir)/inputproto.pc.in $(srcdir)/kbproto.pc.in \ + $(srcdir)/lg3dproto.pc.in $(srcdir)/presentproto.pc.in \ + $(srcdir)/printproto.pc.in $(srcdir)/randrproto.pc.in \ + $(srcdir)/recordproto.pc.in $(srcdir)/renderproto.pc.in \ + $(srcdir)/resourceproto.pc.in $(srcdir)/scrnsaverproto.pc.in \ + $(srcdir)/trapproto.pc.in $(srcdir)/videoproto.pc.in \ + $(srcdir)/windowswmproto.pc.in $(srcdir)/xcalibrateproto.pc.in \ + $(srcdir)/xcmiscproto.pc.in $(srcdir)/xextproto.pc.in \ + $(srcdir)/xf86bigfontproto.pc.in $(srcdir)/xf86dgaproto.pc.in \ + $(srcdir)/xf86driproto.pc.in $(srcdir)/xf86miscproto.pc.in \ + $(srcdir)/xf86rushproto.pc.in $(srcdir)/xf86vidmodeproto.pc.in \ + $(srcdir)/xineramaproto.pc.in $(srcdir)/xproto.pc.in \ + $(srcdir)/xproxymngproto.pc.in $(top_srcdir)/configure \ + $(top_srcdir)/include/X11/Xpoll.h.in $(xcmisc_HEADERS) \ + $(xext_HEADERS) $(xf86bigfont_HEADERS) $(xf86dga_HEADERS) \ + $(xf86dri_HEADERS) $(xf86vidmode_HEADERS) $(xinerama_HEADERS) \ + $(xproto_HEADERS) AUTHORS INSTALL compile config.guess \ + config.sub install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -246,6 +249,11 @@ am__evie_HEADERS_DIST = include/X11/extensions/evieproto.h \ am__fontcache_HEADERS_DIST = include/X11/extensions/fontcache.h \ include/X11/extensions/fontcacheP.h \ include/X11/extensions/fontcachstr.h +am__kb_HEADERS_DIST = include/X11/extensions/XKB.h \ + include/X11/extensions/XKBproto.h \ + include/X11/extensions/XKBsrv.h \ + include/X11/extensions/XKBstr.h \ + include/X11/extensions/XKBgeom.h am__lg3d_HEADERS_DIST = include/X11/extensions/lgewire.h am__print_HEADERS_DIST = include/X11/extensions/Print.h \ include/X11/extensions/Printstr.h @@ -256,6 +264,11 @@ am__trap_HEADERS_DIST = include/X11/extensions/xtrapbits.h \ include/X11/extensions/xtraplib.h \ include/X11/extensions/xtraplibp.h \ include/X11/extensions/xtrapproto.h +am__video_HEADERS_DIST = include/X11/extensions/Xv.h \ + include/X11/extensions/XvMC.h \ + include/X11/extensions/XvMCproto.h \ + include/X11/extensions/Xvproto.h \ + include/X11/extensions/vldXvMC.h am__windowswm_HEADERS_DIST = include/X11/extensions/windowswm.h \ include/X11/extensions/windowswmstr.h am__xf86misc_HEADERS_DIST = include/X11/extensions/xf86misc.h \ @@ -350,7 +363,7 @@ MAN_SUBSTS = \ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -e 's|__datadir__|$(datadir)|g' \ - -e 's|__datadir__|$(libdir)|g' \ + -e 's|__libdir__|$(libdir)|g' \ -e 's|__sysconfdir__|$(sysconfdir)|g' \ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ @@ -455,7 +468,6 @@ bigreqsprotopkgconfig_DATA = bigreqsproto.pc @LEGACY_TRUE@calibrateprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@calibrateprotopkgconfig_DATA = xcalibrateproto.pc -@LEGACY_TRUE@calibrateproto_EXTRA_DIST = autogen.sh xcalibrateproto.pc.in compositedir = $(includedir)/X11/extensions composite_HEADERS = \ include/X11/extensions/composite.h \ @@ -497,7 +509,6 @@ dri3protopkgconfig_DATA = dri3proto.pc @LEGACY_TRUE@evieprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@evieprotopkgconfig_DATA = evieproto.pc -@LEGACY_TRUE@evieproto_EXTRA_DIST = evieproto.pc.in fixesdir = $(includedir)/X11/extensions fixes_HEADERS = \ include/X11/extensions/xfixesproto.h \ @@ -513,7 +524,6 @@ fixesprotopkgconfig_DATA = fixesproto.pc @LEGACY_TRUE@fontcacheprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@fontcacheprotopkgconfig_DATA = fontcacheproto.pc -@LEGACY_TRUE@fontcacheproto_EXTRA_DIST = fontcacheproto.pc.in fontsdir = $(includedir)/X11/fonts fonts_HEADERS = \ include/X11/fonts/font.h \ @@ -538,7 +548,6 @@ glinternal_HEADERS = \ glprotopkgconfigdir = $(datadir)/pkgconfig glprotopkgconfig_DATA = glproto.pc -glproto_EXTRA_DIST = meson.build inputdir = $(includedir)/X11/extensions input_HEADERS = \ include/X11/extensions/XI.h \ @@ -549,13 +558,10 @@ input_HEADERS = \ inputprotopkgconfigdir = $(datadir)/pkgconfig inputprotopkgconfig_DATA = inputproto.pc kbdir = $(includedir)/X11/extensions -kb_HEADERS = \ - include/X11/extensions/XKBgeom.h \ - include/X11/extensions/XKB.h \ +kb_HEADERS = include/X11/extensions/XKB.h \ include/X11/extensions/XKBproto.h \ include/X11/extensions/XKBsrv.h \ - include/X11/extensions/XKBstr.h - + include/X11/extensions/XKBstr.h $(am__append_1) kbprotopkgconfigdir = $(datadir)/pkgconfig kbprotopkgconfig_DATA = kbproto.pc @LEGACY_TRUE@lg3ddir = $(includedir)/X11/extensions @@ -564,7 +570,6 @@ kbprotopkgconfig_DATA = kbproto.pc @LEGACY_TRUE@lg3dprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@lg3dprotopkgconfig_DATA = lg3dproto.pc -@LEGACY_TRUE@lg3dproto_EXTRA_DIST = autogen.sh lg3dproto.pc.in @LEGACY_TRUE@xproxymngdir = $(includedir)/X11/PM @LEGACY_TRUE@xproxymng_HEADERS = \ @LEGACY_TRUE@ include/X11/PM/PM.h \ @@ -572,7 +577,6 @@ kbprotopkgconfig_DATA = kbproto.pc @LEGACY_TRUE@pmprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@pmprotopkgconfig_DATA = xproxymngproto.pc -@LEGACY_TRUE@pmproto_EXTRA_DIST = xproxymngproto.pc.in presentdir = $(includedir)/X11/extensions present_HEADERS = \ include/X11/extensions/presentproto.h \ @@ -590,16 +594,6 @@ presentprotopkgconfig_DATA = presentproto.pc @LEGACY_TRUE@miscmandir = $(MISC_MAN_DIR) @LEGACY_TRUE@miscman_DATA = man/Xprint.$(MISC_MAN_SUFFIX) @LEGACY_TRUE@CLEANFILES = $(miscman_DATA) -@LEGACY_TRUE@printproto_EXTRA_DIST = printproto.pc.in \ -@LEGACY_TRUE@ man/Xprint.man \ -@LEGACY_TRUE@ man/Xprint.sgml \ -@LEGACY_TRUE@ specs/xp_proto.book \ -@LEGACY_TRUE@ specs/xp_proto.mif \ -@LEGACY_TRUE@ specs/xp_proto.ps \ -@LEGACY_TRUE@ specs/xp_protoIX.doc \ -@LEGACY_TRUE@ specs/xp_protoTOC.doc \ -@LEGACY_TRUE@ specs/xp_proto_cov.mif - XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 SUFFIXES = .$(MISC_MAN_SUFFIX) .man @@ -650,24 +644,20 @@ scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc @LEGACY_TRUE@trapprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@trapprotopkgconfig_DATA = trapproto.pc -@LEGACY_TRUE@trapproto_EXTRA_DIST = trapproto.pc.in videodir = $(includedir)/X11/extensions -video_HEADERS = \ - include/X11/extensions/vldXvMC.h \ - include/X11/extensions/Xv.h \ +video_HEADERS = include/X11/extensions/Xv.h \ include/X11/extensions/XvMC.h \ include/X11/extensions/XvMCproto.h \ - include/X11/extensions/Xvproto.h - + include/X11/extensions/Xvproto.h $(am__append_2) videoprotopkgconfigdir = $(datadir)/pkgconfig videoprotopkgconfig_DATA = videoproto.pc -@WINDOWSWM_TRUE@windowswmdir = $(includedir)/X11/extensions -@WINDOWSWM_TRUE@windowswm_HEADERS = \ -@WINDOWSWM_TRUE@ include/X11/extensions/windowswm.h \ -@WINDOWSWM_TRUE@ include/X11/extensions/windowswmstr.h +@LEGACY_TRUE@windowswmdir = $(includedir)/X11/extensions +@LEGACY_TRUE@windowswm_HEADERS = \ +@LEGACY_TRUE@ include/X11/extensions/windowswm.h \ +@LEGACY_TRUE@ include/X11/extensions/windowswmstr.h -@WINDOWSWM_TRUE@windowswmprotopkgconfigdir = $(datadir)/pkgconfig -@WINDOWSWM_TRUE@windowswmprotopkgconfig_DATA = windowswmproto.pc +@LEGACY_TRUE@windowswmprotopkgconfigdir = $(datadir)/pkgconfig +@LEGACY_TRUE@windowswmprotopkgconfig_DATA = windowswmproto.pc xprotodir = $(includedir)/X11 xproto_HEADERS = \ include/X11/ap_keysym.h \ @@ -784,7 +774,6 @@ xf86driprotopkgconfig_DATA = xf86driproto.pc @LEGACY_TRUE@xf86miscprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@xf86miscprotopkgconfig_DATA = xf86miscproto.pc -@LEGACY_TRUE@xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in @LEGACY_TRUE@xf86rushdir = $(includedir)/X11/extensions @LEGACY_TRUE@xf86rush_HEADERS = \ @LEGACY_TRUE@ include/X11/extensions/xf86rush.h \ @@ -792,7 +781,6 @@ xf86driprotopkgconfig_DATA = xf86driproto.pc @LEGACY_TRUE@xf86rushprotopkgconfigdir = $(datadir)/pkgconfig @LEGACY_TRUE@xf86rushprotopkgconfig_DATA = xf86rushproto.pc -@LEGACY_TRUE@xf86rushproto_EXTRA_DIST = xf86rushproto.pc.in xf86vidmodedir = $(includedir)/X11/extensions xf86vidmode_HEADERS = \ include/X11/extensions/xf86vm.h \ @@ -838,7 +826,6 @@ EXTRA_DIST = \ COPYING-inputproto \ COPYING-kbproto \ COPYING-lg3dproto \ - COPYING-panoramixproto \ COPYING-pmproto \ COPYING-presentproto \ COPYING-printproto \ @@ -860,6 +847,8 @@ EXTRA_DIST = \ COPYING-xf86rushproto \ COPYING-xf86vidmodeproto \ COPYING-xineramaproto \ + README.md \ + autogen.sh \ include/GL/internal/meson.build \ include/GL/meson.build \ include/meson.build \ @@ -869,8 +858,11 @@ EXTRA_DIST = \ include/X11/meson.build \ include/X11/PM/meson.build \ meson.build \ - meson_options.txt + meson_options.txt \ + man/Xprint.man \ + man/Xprint.sgml +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-legacy all: all-am .SUFFIXES: diff --git a/proto/xorgproto/README b/proto/xorgproto/README.md similarity index 61% rename from proto/xorgproto/README rename to proto/xorgproto/README.md index b0eb5be4b..4237f7fcd 100644 --- a/proto/xorgproto/README +++ b/proto/xorgproto/README.md @@ -1,4 +1,5 @@ - X Window System Unified Protocol +X Window System Unified Protocol +-------------------------------- This package provides the headers and specification documents defining the core protocol and (many) extensions for the X Window System. The @@ -13,29 +14,21 @@ versions of the X11 suite. If you are looking for a machine-readable protocol description suitable for code generation or use in new projects, please refer to the XCB project: - https://xcb.freedesktop.org/ - https://cgit.freedesktop.org/xcb/proto + https://xcb.freedesktop.org/ + https://cgit.freedesktop.org/xcb/proto All questions regarding this software should be directed at the Xorg mailing list: - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + https://lists.x.org/mailman/listinfo/xorg The master development code repository can be found at: - git://anongit.freedesktop.org/git/xorg/proto/xorgproto + https://gitlab.freedesktop.org/xorg/proto/xorgproto - http://cgit.freedesktop.org/xorg/proto/xorgproto +Please submit bug reports and requests to merge patches there. For patch submission instructions, see: - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage + https://www.x.org/wiki/Development/Documentation/SubmittingPatches diff --git a/proto/xorgproto/aclocal.m4 b/proto/xorgproto/aclocal.m4 index af700e10f..2a518c4b6 100644 --- a/proto/xorgproto/aclocal.m4 +++ b/proto/xorgproto/aclocal.m4 @@ -19,32 +19,63 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.1]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -66,18 +97,19 @@ if test -n "$PKG_CONFIG"; then PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -87,8 +119,10 @@ m4_ifvaln([$3], [else $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -100,10 +134,11 @@ m4_define([_PKG_CONFIG], else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -111,19 +146,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -177,16 +210,40 @@ else AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -197,16 +254,18 @@ AC_ARG_WITH([pkgconfigdir], AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -217,7 +276,7 @@ AC_ARG_WITH([noarch-pkgconfigdir], AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, diff --git a/proto/xorgproto/applewmproto.pc.in b/proto/xorgproto/applewmproto.pc.in index 17841ac11..3227b212e 100644 --- a/proto/xorgproto/applewmproto.pc.in +++ b/proto/xorgproto/applewmproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: AppleWMProto diff --git a/proto/xorgproto/autogen.sh b/proto/xorgproto/autogen.sh new file mode 100755 index 000000000..fc2bb6fb0 --- /dev/null +++ b/proto/xorgproto/autogen.sh @@ -0,0 +1,34 @@ +#! /bin/sh + +srcdir=`dirname "$0"` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd "$srcdir" + +autoreconf -v --install || exit 1 +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xorgproto" + +if test -z "$NOCONFIGURE"; then + exec "$srcdir"/configure "$@" +fi +#! /bin/sh + +srcdir=`dirname "$0"` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd "$srcdir" + +autoreconf -v --install || exit 1 +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xorgproto" + +if test -z "$NOCONFIGURE"; then + exec "$srcdir"/configure "$@" +fi diff --git a/proto/xorgproto/bigreqsproto.pc.in b/proto/xorgproto/bigreqsproto.pc.in index 94577edaa..e21bb59fd 100644 --- a/proto/xorgproto/bigreqsproto.pc.in +++ b/proto/xorgproto/bigreqsproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: BigReqsProto diff --git a/proto/xorgproto/compile b/proto/xorgproto/compile index de0005d4f..99e50524b 100755 --- a/proto/xorgproto/compile +++ b/proto/xorgproto/compile @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/proto/xorgproto/compositeproto.pc.in b/proto/xorgproto/compositeproto.pc.in index da429c7a2..b0dada112 100644 --- a/proto/xorgproto/compositeproto.pc.in +++ b/proto/xorgproto/compositeproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: CompositeExt diff --git a/proto/xorgproto/compositeproto.txt b/proto/xorgproto/compositeproto.txt index 3b85facf9..c1a78780f 100644 --- a/proto/xorgproto/compositeproto.txt +++ b/proto/xorgproto/compositeproto.txt @@ -214,22 +214,28 @@ operations other than QueryVersion. UnredirectWindow: window: Window + update: UPDATETYPE errors: Window, Value Redirection of the specified window will be terminated. If the specified window was not selected for redirection by the - current client, a 'Value' error results. + current client, or if the update type does not match the + current client's previously requested update type, a 'Value' + error results. - UnredirectWindows: + UnredirectSubwindows: window: Window + update: UPDATETYPE errors: Window, Value Redirection of all children of window will be terminated. If the specified window was not selected for sub-redirection by the - current client, a 'Value' error results. + current client, or if the update type does not match the + current client's previously requested update type, a 'Value' + error results. 9. Clip lists diff --git a/proto/xorgproto/configure b/proto/xorgproto/configure index 5ce4b35de..031e31411 100755 --- a/proto/xorgproto/configure +++ b/proto/xorgproto/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorgproto 2018.4. +# Generated by GNU Autoconf 2.69 for xorgproto 2019.2. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,7 +267,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -641,9 +641,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xorgproto' PACKAGE_TARNAME='xorgproto' -PACKAGE_VERSION='2018.4' -PACKAGE_STRING='xorgproto 2018.4' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='2019.2' +PACKAGE_STRING='xorgproto 2019.2' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues' PACKAGE_URL='' # Factoring default headers for most tests. @@ -687,8 +687,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS USE_FDS_BITS -WINDOWSWM_FALSE -WINDOWSWM_TRUE APPLEWM_FALSE APPLEWM_TRUE LEGACY_FALSE @@ -844,7 +842,6 @@ with_fop with_xsltproc enable_legacy enable_applewm -enable_windowswm ' ac_precious_vars='build_alias host_alias @@ -1401,7 +1398,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorgproto 2018.4 to adapt to many kinds of systems. +\`configure' configures xorgproto 2019.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1471,7 +1468,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorgproto 2018.4:";; + short | recursive ) echo "Configuration of xorgproto 2019.2:";; esac cat <<\_ACEOF @@ -1497,7 +1494,6 @@ Optional Features: --enable-specs Enable building the specs (default: yes) --enable-legacy Install legacy protocol headers (default: false) --enable-applewm Install apple wm protocol headers (default: false) - --enable-windowswm Install windows wm protocol headers (default: false) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1529,7 +1525,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1592,7 +1588,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorgproto configure 2018.4 +xorgproto configure 2019.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1916,9 +1912,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ##" +( $as_echo "## ------------------------------------------------------------------------- ## +## Report this to https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues ## +## ------------------------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1997,7 +1993,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorgproto $as_me 2018.4, which was +It was created by xorgproto $as_me 2019.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2821,7 +2817,7 @@ fi # Define the identity of the package. PACKAGE='xorgproto' - VERSION='2018.4' + VERSION='2019.2' cat >>confdefs.h <<_ACEOF @@ -11182,22 +11178,6 @@ else fi -# Check whether --enable-windowswm was given. -if test "${enable_windowswm+set}" = set; then : - enableval=$enable_windowswm; WINDOWSWM=$enableval -else - WINDOWSWM=no -fi - - if test "x$WINDOWSWM" = "xyes"; then - WINDOWSWM_TRUE= - WINDOWSWM_FALSE='#' -else - WINDOWSWM_TRUE='#' - WINDOWSWM_FALSE= -fi - - for ac_header in sys/select.h sys/param.h sys/types.h sys/time.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11276,7 +11256,7 @@ fi -ac_config_files="$ac_config_files applewmproto.pc bigreqsproto.pc compositeproto.pc damageproto.pc dmxproto.pc dri2proto.pc dri3proto.pc evieproto.pc fixesproto.pc fontcacheproto.pc fontsproto.pc glproto.pc include/X11/Xpoll.h inputproto.pc kbproto.pc lg3dproto.pc Makefile presentproto.pc printproto.pc randrproto.pc recordproto.pc renderproto.pc resourceproto.pc scrnsaverproto.pc trapproto.pc videoproto.pc windowswmproto.pc xcalibrateproto.pc xcmiscproto.pc xextproto.pc xf86bigfontproto.pc xf86dgaproto.pc xf86driproto.pc xf86miscproto.pc xf86rushproto.pc xf86vidmodeproto.pc xineramaproto.pc xproto.pc xproxymngproto.pc" +ac_config_files="$ac_config_files applewmproto.pc bigreqsproto.pc compositeproto.pc damageproto.pc dmxproto.pc dri2proto.pc dri3proto.pc evieproto.pc fixesproto.pc fontcacheproto.pc fontsproto.pc glproto.pc include/X11/Xpoll.h inputproto.pc kbproto.pc lg3dproto.pc Makefile presentproto.pc printproto.pc randrproto.pc recordproto.pc renderproto.pc resourceproto.pc scrnsaverproto.pc specs/Makefile specs/bigreqsproto/Makefile specs/fontsproto/Makefile specs/kbproto/Makefile specs/recordproto/Makefile specs/scrnsaverproto/Makefile specs/xcmiscproto/Makefile specs/xextproto/Makefile specs/xproto/Makefile trapproto.pc videoproto.pc windowswmproto.pc xcalibrateproto.pc xcmiscproto.pc xextproto.pc xf86bigfontproto.pc xf86dgaproto.pc xf86driproto.pc xf86miscproto.pc xf86rushproto.pc xf86vidmodeproto.pc xineramaproto.pc xproto.pc xproxymngproto.pc" cat >confcache <<\_ACEOF @@ -11484,10 +11464,6 @@ if test -z "${APPLEWM_TRUE}" && test -z "${APPLEWM_FALSE}"; then as_fn_error $? "conditional \"APPLEWM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WINDOWSWM_TRUE}" && test -z "${WINDOWSWM_FALSE}"; then - as_fn_error $? "conditional \"WINDOWSWM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -11885,7 +11861,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorgproto $as_me 2018.4, which was +This file was extended by xorgproto $as_me 2019.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11936,13 +11912,13 @@ $config_files Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorgproto config.status 2018.4 +xorgproto config.status 2019.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -12085,6 +12061,15 @@ do "renderproto.pc") CONFIG_FILES="$CONFIG_FILES renderproto.pc" ;; "resourceproto.pc") CONFIG_FILES="$CONFIG_FILES resourceproto.pc" ;; "scrnsaverproto.pc") CONFIG_FILES="$CONFIG_FILES scrnsaverproto.pc" ;; + "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;; + "specs/bigreqsproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/bigreqsproto/Makefile" ;; + "specs/fontsproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/fontsproto/Makefile" ;; + "specs/kbproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/kbproto/Makefile" ;; + "specs/recordproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/recordproto/Makefile" ;; + "specs/scrnsaverproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/scrnsaverproto/Makefile" ;; + "specs/xcmiscproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/xcmiscproto/Makefile" ;; + "specs/xextproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/xextproto/Makefile" ;; + "specs/xproto/Makefile") CONFIG_FILES="$CONFIG_FILES specs/xproto/Makefile" ;; "trapproto.pc") CONFIG_FILES="$CONFIG_FILES trapproto.pc" ;; "videoproto.pc") CONFIG_FILES="$CONFIG_FILES videoproto.pc" ;; "windowswmproto.pc") CONFIG_FILES="$CONFIG_FILES windowswmproto.pc" ;; diff --git a/proto/xorgproto/configure.ac b/proto/xorgproto/configure.ac index c8f713462..b09372e30 100644 --- a/proto/xorgproto/configure.ac +++ b/proto/xorgproto/configure.ac @@ -22,8 +22,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([xorgproto], [2018.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([xorgproto], [2019.2], + [https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_DEFAULT_OPTIONS @@ -51,12 +51,6 @@ AC_ARG_ENABLE(applewm, [APPLEWM=$enableval], [APPLEWM=no]) AM_CONDITIONAL(APPLEWM, [test "x$APPLEWM" = "xyes"]) -AC_ARG_ENABLE(windowswm, - AS_HELP_STRING([--enable-windowswm], - [Install windows wm protocol headers (default: false)]), - [WINDOWSWM=$enableval], [WINDOWSWM=no]) -AM_CONDITIONAL(WINDOWSWM, [test "x$WINDOWSWM" = "xyes"]) - AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h]) # Handle Xpoll.h.in @@ -141,6 +135,15 @@ AC_CONFIG_FILES([applewmproto.pc renderproto.pc resourceproto.pc scrnsaverproto.pc + specs/Makefile + specs/bigreqsproto/Makefile + specs/fontsproto/Makefile + specs/kbproto/Makefile + specs/recordproto/Makefile + specs/scrnsaverproto/Makefile + specs/xcmiscproto/Makefile + specs/xextproto/Makefile + specs/xproto/Makefile trapproto.pc videoproto.pc windowswmproto.pc diff --git a/proto/xorgproto/damageproto.pc.in b/proto/xorgproto/damageproto.pc.in index 6fd9ef102..bfd524452 100644 --- a/proto/xorgproto/damageproto.pc.in +++ b/proto/xorgproto/damageproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: DamageProto diff --git a/proto/xorgproto/dmxproto.pc.in b/proto/xorgproto/dmxproto.pc.in index e82ee7dc9..d140e1c8c 100644 --- a/proto/xorgproto/dmxproto.pc.in +++ b/proto/xorgproto/dmxproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: DMXProto diff --git a/proto/xorgproto/docbook.am b/proto/xorgproto/docbook.am new file mode 100644 index 000000000..bba4d5453 --- /dev/null +++ b/proto/xorgproto/docbook.am @@ -0,0 +1,105 @@ +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +# DocBook/XML generated output formats to be installed +shelf_DATA = + +# DocBook/XML file with chapters, appendix and images it includes +dist_shelf_DATA = $(docbook) $(chapters) + +if HAVE_XMLTO +if HAVE_STYLESHEETS + +XMLTO_SEARCHPATH_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --searchpath "$(abs_top_builddir)" +XMLTO_HTML_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XMLTO_HTML_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_HTML_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.html) +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< + +if HAVE_XMLTO_TEXT + +shelf_DATA += $(docbook:.xml=.txt) +%.txt: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +endif HAVE_XMLTO_TEXT + +if HAVE_FOP +XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +XMLTO_PDF_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +XMLTO_FO_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_FO_STYLESHEET_FLAGS) \ + $(XMLTO_FO_IMAGEPATH_FLAGS) \ + $(XMLTO_PDF_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.pdf) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< + +shelf_DATA += $(docbook:.xml=.ps) +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP + +# Generate documents cross-reference target databases +if HAVE_XSLTPROC + +XSLT_SEARCHPATH_FLAGS = \ + --path "$(XORG_SGML_PATH)/X11" \ + --path "$(abs_top_builddir)" +XSLT_OLINK_FLAGS = \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --stringparam olink.base.uri "$(@:.db=)" + +XSLT_HTML_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XSLT_PDF_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +shelf_DATA += $(docbook:.xml=.html.db) +%.html.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< + +shelf_DATA += $(docbook:.xml=.pdf.db) +%.pdf.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +endif HAVE_XSLTPROC +endif HAVE_STYLESHEETS +endif HAVE_XMLTO + +CLEANFILES = $(shelf_DATA) diff --git a/proto/xorgproto/dri2proto.pc.in b/proto/xorgproto/dri2proto.pc.in index cb5b171ac..fa9d24d6d 100644 --- a/proto/xorgproto/dri2proto.pc.in +++ b/proto/xorgproto/dri2proto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: DRI2Proto diff --git a/proto/xorgproto/dri3proto.pc.in b/proto/xorgproto/dri3proto.pc.in index e42d60e8f..20da358f9 100644 --- a/proto/xorgproto/dri3proto.pc.in +++ b/proto/xorgproto/dri3proto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: DRI3Proto diff --git a/proto/xorgproto/evieproto.pc.in b/proto/xorgproto/evieproto.pc.in index 64e0ec4e3..fd5442bae 100644 --- a/proto/xorgproto/evieproto.pc.in +++ b/proto/xorgproto/evieproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: EvIEExt diff --git a/proto/xorgproto/fixesproto.pc.in b/proto/xorgproto/fixesproto.pc.in index f8258e2e5..c7fcb81e8 100644 --- a/proto/xorgproto/fixesproto.pc.in +++ b/proto/xorgproto/fixesproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: FixesProto diff --git a/proto/xorgproto/fontcacheproto.pc.in b/proto/xorgproto/fontcacheproto.pc.in index eb4238b26..8ffffe9ea 100644 --- a/proto/xorgproto/fontcacheproto.pc.in +++ b/proto/xorgproto/fontcacheproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: FontcacheProto diff --git a/proto/xorgproto/fontsproto.pc.in b/proto/xorgproto/fontsproto.pc.in index 9d22354fc..ebb61a4f3 100644 --- a/proto/xorgproto/fontsproto.pc.in +++ b/proto/xorgproto/fontsproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: FontsProto diff --git a/proto/xorgproto/glproto.pc.in b/proto/xorgproto/glproto.pc.in index b951db59b..e97bfc941 100644 --- a/proto/xorgproto/glproto.pc.in +++ b/proto/xorgproto/glproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: GLProto diff --git a/proto/xorgproto/include/GL/glxint.h b/proto/xorgproto/include/GL/glxint.h index 9da4910d5..44c9e9e33 100644 --- a/proto/xorgproto/include/GL/glxint.h +++ b/proto/xorgproto/include/GL/glxint.h @@ -73,7 +73,7 @@ struct __GLXvisualConfigRec { ** we require 2 words across the wire. In order to maintain backwards ** compatibility, we need to send the total number of words that the ** VisualConfigs are sent back in so old libraries can simply "ignore" -** the new properties. +** the new properties. */ #define __GLX_TOTAL_CONFIG (__GLX_MIN_CONFIG_PROPS + \ 2 * __GLX_EXT_CONFIG_PROPS) @@ -98,7 +98,7 @@ struct __GLXFBConfigRec { int visualSelectGroup; /* visuals grouped by select priority */ - unsigned int id; + unsigned int id; GLboolean rgbMode; GLboolean colorIndexMode; diff --git a/proto/xorgproto/include/GL/glxmd.h b/proto/xorgproto/include/GL/glxmd.h index 96c07dbd0..8ff9c1bcd 100644 --- a/proto/xorgproto/include/GL/glxmd.h +++ b/proto/xorgproto/include/GL/glxmd.h @@ -45,7 +45,7 @@ typedef double FLOAT64; /* ** Like B32, but this is used to store floats in a request. ** -** NOTE: Machines that have a native 32-bit IEEE float can define this as +** NOTE: Machines that have a native 32-bit IEEE float can define this as ** nothing. Machines that don't might mimic the float with an integer, ** and then define this to :32. */ diff --git a/proto/xorgproto/include/GL/glxproto.h b/proto/xorgproto/include/GL/glxproto.h index 066db4518..e4dfc1087 100644 --- a/proto/xorgproto/include/GL/glxproto.h +++ b/proto/xorgproto/include/GL/glxproto.h @@ -36,7 +36,7 @@ /*****************************************************************************/ /* -** Errrors. +** Errors. */ #define GLXBadContext 0 #define GLXBadContextState 1 @@ -127,8 +127,8 @@ typedef CARD32 GLXContextTag; typedef struct GLXRender { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag contextTag B32; + CARD16 length; + GLXContextTag contextTag; } xGLXRenderReq; #define sz_xGLXRenderReq 8 @@ -147,11 +147,11 @@ typedef struct GLXRender { typedef struct GLXRenderLarge { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag contextTag B32; - CARD16 requestNumber B16; - CARD16 requestTotal B16; - CARD32 dataBytes B32; + CARD16 length; + GLXContextTag contextTag; + CARD16 requestNumber; + CARD16 requestTotal; + CARD32 dataBytes; } xGLXRenderLargeReq; #define sz_xGLXRenderLargeReq 16 @@ -163,8 +163,8 @@ typedef struct GLXRenderLarge { typedef struct GLXSingle { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag contextTag B32; + CARD16 length; + GLXContextTag contextTag; } xGLXSingleReq; #define sz_xGLXSingleReq 8 @@ -174,9 +174,9 @@ typedef struct GLXSingle { typedef struct GLXQueryVersion { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xGLXQueryVersionReq; #define sz_xGLXQueryVersionReq 12 @@ -186,8 +186,8 @@ typedef struct GLXQueryVersion { typedef struct GLXIsDirect { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextID context B32; + CARD16 length; + GLXContextID context; } xGLXIsDirectReq; #define sz_xGLXIsDirectReq 8 @@ -197,14 +197,14 @@ typedef struct GLXIsDirect { typedef struct GLXCreateContext { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextID context B32; - CARD32 visual B32; - CARD32 screen B32; - GLXContextID shareList B32; + CARD16 length; + GLXContextID context; + CARD32 visual; + CARD32 screen; + GLXContextID shareList; BOOL isDirect; CARD8 reserved1; - CARD16 reserved2 B16; + CARD16 reserved2; } xGLXCreateContextReq; #define sz_xGLXCreateContextReq 24 @@ -214,8 +214,8 @@ typedef struct GLXCreateContext { typedef struct GLXDestroyContext { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextID context B32; + CARD16 length; + GLXContextID context; } xGLXDestroyContextReq; #define sz_xGLXDestroyContextReq 8 @@ -225,10 +225,10 @@ typedef struct GLXDestroyContext { typedef struct GLXMakeCurrent { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXDrawable drawable B32; - GLXContextID context B32; - GLXContextTag oldContextTag B32; + CARD16 length; + GLXDrawable drawable; + GLXContextID context; + GLXContextTag oldContextTag; } xGLXMakeCurrentReq; #define sz_xGLXMakeCurrentReq 16 @@ -238,8 +238,8 @@ typedef struct GLXMakeCurrent { typedef struct GLXWaitGL { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag contextTag B32; + CARD16 length; + GLXContextTag contextTag; } xGLXWaitGLReq; #define sz_xGLXWaitGLReq 8 @@ -249,8 +249,8 @@ typedef struct GLXWaitGL { typedef struct GLXWaitX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag contextTag B32; + CARD16 length; + GLXContextTag contextTag; } xGLXWaitXReq; #define sz_xGLXWaitXReq 8 @@ -260,11 +260,11 @@ typedef struct GLXWaitX { typedef struct GLXCopyContext { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextID source B32; - GLXContextID dest B32; - CARD32 mask B32; - GLXContextTag contextTag B32; + CARD16 length; + GLXContextID source; + GLXContextID dest; + CARD32 mask; + GLXContextTag contextTag; } xGLXCopyContextReq; #define sz_xGLXCopyContextReq 20 @@ -274,9 +274,9 @@ typedef struct GLXCopyContext { typedef struct GLXSwapBuffers { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag contextTag B32; - GLXDrawable drawable B32; + CARD16 length; + GLXContextTag contextTag; + GLXDrawable drawable; } xGLXSwapBuffersReq; #define sz_xGLXSwapBuffersReq 12 @@ -286,12 +286,12 @@ typedef struct GLXSwapBuffers { typedef struct GLXUseXFont { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag contextTag B32; - CARD32 font B32; - CARD32 first B32; - CARD32 count B32; - CARD32 listBase B32; + CARD16 length; + GLXContextTag contextTag; + CARD32 font; + CARD32 first; + CARD32 count; + CARD32 listBase; } xGLXUseXFontReq; #define sz_xGLXUseXFontReq 24 @@ -301,11 +301,11 @@ typedef struct GLXUseXFont { typedef struct GLXCreateGLXPixmap { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; - CARD32 visual B32; - CARD32 pixmap B32; - GLXPixmap glxpixmap B32; + CARD16 length; + CARD32 screen; + CARD32 visual; + CARD32 pixmap; + GLXPixmap glxpixmap; } xGLXCreateGLXPixmapReq; #define sz_xGLXCreateGLXPixmapReq 20 @@ -315,8 +315,8 @@ typedef struct GLXCreateGLXPixmap { typedef struct GLXDestroyGLXPixmap { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXPixmap glxpixmap B32; + CARD16 length; + GLXPixmap glxpixmap; } xGLXDestroyGLXPixmapReq; #define sz_xGLXDestroyGLXPixmapReq 8 @@ -326,8 +326,8 @@ typedef struct GLXDestroyGLXPixmap { typedef struct GLXGetVisualConfigs { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xGLXGetVisualConfigsReq; #define sz_xGLXGetVisualConfigsReq 8 @@ -337,9 +337,9 @@ typedef struct GLXGetVisualConfigs { typedef struct GLXVendorPrivate { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - GLXContextTag contextTag B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + GLXContextTag contextTag; /* ** More data may follow; this is just the header. */ @@ -352,9 +352,9 @@ typedef struct GLXVendorPrivate { typedef struct GLXVendorPrivateWithReply { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - GLXContextTag contextTag B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + GLXContextTag contextTag; /* ** More data may follow; this is just the header. */ @@ -367,8 +367,8 @@ typedef struct GLXVendorPrivateWithReply { typedef struct GLXQueryExtensionsString { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xGLXQueryExtensionsStringReq; #define sz_xGLXQueryExtensionsStringReq 8 @@ -378,9 +378,9 @@ typedef struct GLXQueryExtensionsString { typedef struct GLXQueryServerString { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; - CARD32 name B32; + CARD16 length; + CARD32 screen; + CARD32 name; } xGLXQueryServerStringReq; #define sz_xGLXQueryServerStringReq 12 @@ -390,10 +390,10 @@ typedef struct GLXQueryServerString { typedef struct GLXClientInfo { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 major B32; - CARD32 minor B32; - CARD32 numbytes B32; + CARD16 length; + CARD32 major; + CARD32 minor; + CARD32 numbytes; } xGLXClientInfoReq; #define sz_xGLXClientInfoReq 16 @@ -405,8 +405,8 @@ typedef struct GLXClientInfo { typedef struct GLXGetFBConfigs { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xGLXGetFBConfigsReq; #define sz_xGLXGetFBConfigsReq 8 @@ -416,12 +416,12 @@ typedef struct GLXGetFBConfigs { typedef struct GLXCreatePixmap { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; - GLXFBConfigID fbconfig B32; - CARD32 pixmap B32; - GLXPixmap glxpixmap B32; - CARD32 numAttribs B32; + CARD16 length; + CARD32 screen; + GLXFBConfigID fbconfig; + CARD32 pixmap; + GLXPixmap glxpixmap; + CARD32 numAttribs; /* followed by attribute list */ } xGLXCreatePixmapReq; #define sz_xGLXCreatePixmapReq 24 @@ -432,8 +432,8 @@ typedef struct GLXCreatePixmap { typedef struct GLXDestroyPixmap { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXPixmap glxpixmap B32; + CARD16 length; + GLXPixmap glxpixmap; } xGLXDestroyPixmapReq; #define sz_xGLXDestroyPixmapReq 8 @@ -443,15 +443,15 @@ typedef struct GLXDestroyPixmap { typedef struct GLXCreateNewContext { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextID context B32; - GLXFBConfigID fbconfig B32; - CARD32 screen B32; + CARD16 length; + GLXContextID context; + GLXFBConfigID fbconfig; + CARD32 screen; CARD32 renderType; - GLXContextID shareList B32; + GLXContextID shareList; BOOL isDirect; CARD8 reserved1; - CARD16 reserved2 B16; + CARD16 reserved2; } xGLXCreateNewContextReq; #define sz_xGLXCreateNewContextReq 28 @@ -461,8 +461,8 @@ typedef struct GLXCreateNewContext { typedef struct GLXQueryContext { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextID context B32; + CARD16 length; + GLXContextID context; } xGLXQueryContextReq; #define sz_xGLXQueryContextReq 8 @@ -472,11 +472,11 @@ typedef struct GLXQueryContext { typedef struct GLXMakeContextCurrent { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextTag oldContextTag B32; - GLXDrawable drawable B32; - GLXDrawable readdrawable B32; - GLXContextID context B32; + CARD16 length; + GLXContextTag oldContextTag; + GLXDrawable drawable; + GLXDrawable readdrawable; + GLXContextID context; } xGLXMakeContextCurrentReq; #define sz_xGLXMakeContextCurrentReq 20 @@ -486,11 +486,11 @@ typedef struct GLXMakeContextCurrent { typedef struct GLXCreatePbuffer { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; - GLXFBConfigID fbconfig B32; - GLXPbuffer pbuffer B32; - CARD32 numAttribs B32; + CARD16 length; + CARD32 screen; + GLXFBConfigID fbconfig; + GLXPbuffer pbuffer; + CARD32 numAttribs; /* followed by attribute list */ } xGLXCreatePbufferReq; #define sz_xGLXCreatePbufferReq 20 @@ -501,8 +501,8 @@ typedef struct GLXCreatePbuffer { typedef struct GLXDestroyPbuffer { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXPbuffer pbuffer B32; + CARD16 length; + GLXPbuffer pbuffer; } xGLXDestroyPbufferReq; #define sz_xGLXDestroyPbufferReq 8 @@ -512,8 +512,8 @@ typedef struct GLXDestroyPbuffer { typedef struct GLXGetDrawableAttributes { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXDrawable drawable B32; + CARD16 length; + GLXDrawable drawable; } xGLXGetDrawableAttributesReq; #define sz_xGLXGetDrawableAttributesReq 8 @@ -523,9 +523,9 @@ typedef struct GLXGetDrawableAttributes { typedef struct GLXChangeDrawableAttributes { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXDrawable drawable B32; - CARD32 numAttribs B32; + CARD16 length; + GLXDrawable drawable; + CARD32 numAttribs; /* followed by attribute list */ } xGLXChangeDrawableAttributesReq; #define sz_xGLXChangeDrawableAttributesReq 12 @@ -536,12 +536,12 @@ typedef struct GLXChangeDrawableAttributes { typedef struct GLXCreateWindow { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 screen B32; - GLXFBConfigID fbconfig B32; - CARD32 window B32; - GLXWindow glxwindow B32; - CARD32 numAttribs B32; + CARD16 length; + CARD32 screen; + GLXFBConfigID fbconfig; + CARD32 window; + GLXWindow glxwindow; + CARD32 numAttribs; /* followed by attribute list */ } xGLXCreateWindowReq; #define sz_xGLXCreateWindowReq 24 @@ -552,8 +552,8 @@ typedef struct GLXCreateWindow { typedef struct GLXDestroyWindow { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXWindow glxwindow B32; + CARD16 length; + GLXWindow glxwindow; } xGLXDestroyWindowReq; #define sz_xGLXDestroyWindowReq 8 @@ -562,170 +562,170 @@ typedef struct GLXDestroyWindow { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 error B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 error; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetErrorReply; #define sz_xGLXGetErrorReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - GLXContextTag contextTag B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + GLXContextTag contextTag; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXMakeCurrentReply; #define sz_xGLXMakeCurrentReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXReadPixelsReply; #define sz_xGLXReadPixelsReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 width B32; - CARD32 height B32; - CARD32 depth B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 width; + CARD32 height; + CARD32 depth; + CARD32 pad6; } xGLXGetTexImageReply; #define sz_xGLXGetTexImageReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 width B32; - CARD32 height B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 width; + CARD32 height; + CARD32 pad5; + CARD32 pad6; } xGLXGetSeparableFilterReply; #define sz_xGLXGetSeparableFilterReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 width B32; - CARD32 height B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 width; + CARD32 height; + CARD32 pad5; + CARD32 pad6; } xGLXGetConvolutionFilterReply; #define sz_xGLXGetConvolutionFilterReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 width B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 width; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetHistogramReply; #define sz_xGLXGetHistogramReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetMinmaxReply; #define sz_xGLXGetMinmaxReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 retval B32; - CARD32 size B32; - CARD32 newMode B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 retval; + CARD32 size; + CARD32 newMode; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXRenderModeReply; #define sz_xGLXRenderModeReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 majorVersion B32; - CARD32 minorVersion B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXQueryVersionReply; #define sz_xGLXQueryVersionReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numVisuals B32; - CARD32 numProps B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numVisuals; + CARD32 numProps; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetVisualConfigsReply; #define sz_xGLXGetVisualConfigsReply 32 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL isDirect; CARD8 pad1; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xGLXIsDirectReply; #define sz_xGLXIsDirectReply 32 @@ -737,14 +737,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 retval B32; - CARD32 size B32; - CARD32 pad3 B32; /* NOTE: may hold a single value */ - CARD32 pad4 B32; /* NOTE: may hold half a double */ - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 retval; + CARD32 size; + CARD32 pad3; /* NOTE: may hold a single value */ + CARD32 pad4; /* NOTE: may hold half a double */ + CARD32 pad5; + CARD32 pad6; } xGLXSingleReply; #define sz_xGLXSingleReply 32 @@ -757,14 +757,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 retval B32; - CARD32 size B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 retval; + CARD32 size; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXVendorPrivReply; #define sz_xGLXVendorPrivReply 32 @@ -775,14 +775,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 n B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 n; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXQueryExtensionsStringReply; #define sz_xGLXQueryExtensionsStringReply 32 @@ -793,14 +793,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 n B32; - CARD32 pad3 B32; /* NOTE: may hold a single value */ - CARD32 pad4 B32; /* NOTE: may hold half a double */ - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 n; + CARD32 pad3; /* NOTE: may hold a single value */ + CARD32 pad4; /* NOTE: may hold half a double */ + CARD32 pad5; + CARD32 pad6; } xGLXQueryServerStringReply; #define sz_xGLXQueryServerStringReply 32 @@ -812,14 +812,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numFBConfigs B32; - CARD32 numAttribs B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numFBConfigs; + CARD32 numAttribs; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetFBConfigsReply; #define sz_xGLXGetFBConfigsReply 32 @@ -829,14 +829,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 n B32; /* number of attribute/value pairs */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 n; /* number of attribute/value pairs */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXQueryContextReply; #define sz_xGLXQueryContextReply 32 @@ -846,14 +846,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - GLXContextTag contextTag B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + GLXContextTag contextTag; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXMakeContextCurrentReply; #define sz_xGLXMakeContextCurrentReply 32 @@ -865,14 +865,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 success; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXCreateGLXPbufferReply; #define sz_xGLXCreateGLXPbufferReply 32 @@ -882,14 +882,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numAttribs B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numAttribs; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetDrawableAttributesReply; #define sz_xGLXGetDrawableAttributesReply 32 @@ -899,14 +899,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 width B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 width; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetColorTableReply; #define sz_xGLXGetColorTableReply 32 @@ -920,10 +920,10 @@ typedef struct { typedef struct GLXQueryContextInfoEXT { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - GLXContextID context B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + GLXContextID context; } xGLXQueryContextInfoEXTReq; #define sz_xGLXQueryContextInfoEXTReq 16 @@ -933,14 +933,14 @@ typedef struct GLXQueryContextInfoEXT { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 n B32; /* number of attribute/value pairs */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 n; /* number of attribute/value pairs */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXQueryContextInfoEXTReply; #define sz_xGLXQueryContextInfoEXTReply 32 @@ -950,26 +950,26 @@ typedef struct { typedef struct GLXMakeCurrentReadSGI { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - GLXContextTag oldContextTag B32; - GLXDrawable drawable B32; - GLXDrawable readable B32; - GLXContextID context B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + GLXContextTag oldContextTag; + GLXDrawable drawable; + GLXDrawable readable; + GLXContextID context; } xGLXMakeCurrentReadSGIReq; #define sz_xGLXMakeCurrentReadSGIReq 24 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - GLXContextTag contextTag B32; - CARD32 writeVid B32; - CARD32 writeType B32; - CARD32 readVid B32; - CARD32 readType B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + GLXContextTag contextTag; + CARD32 writeVid; + CARD32 writeType; + CARD32 readVid; + CARD32 readType; + CARD32 pad6; } xGLXMakeCurrentReadSGIReply; #define sz_xGLXMakeCurrentReadSGIReply 32 @@ -979,10 +979,10 @@ typedef struct { typedef struct GLXGetFBConfigsSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - CARD32 screen B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + CARD32 screen; } xGLXGetFBConfigsSGIXReq; #define sz_xGLXGetFBConfigsSGIXReq 16 @@ -993,17 +993,17 @@ typedef struct GLXGetFBConfigsSGIX { typedef struct GLXCreateContextWithConfigSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - GLXContextID context B32; - GLXFBConfigID fbconfig B32; - CARD32 screen B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + GLXContextID context; + GLXFBConfigID fbconfig; + CARD32 screen; CARD32 renderType; - GLXContextID shareList B32; + GLXContextID shareList; BOOL isDirect; CARD8 reserved1; - CARD16 reserved2 B16; + CARD16 reserved2; } xGLXCreateContextWithConfigSGIXReq; #define sz_xGLXCreateContextWithConfigSGIXReq 36 @@ -1014,13 +1014,13 @@ typedef struct GLXCreateContextWithConfigSGIX { typedef struct GLXCreateGLXPixmapWithConfigSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - CARD32 screen B32; - GLXFBConfigID fbconfig B32; - CARD32 pixmap B32; - GLXPixmap glxpixmap B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + CARD32 screen; + GLXFBConfigID fbconfig; + CARD32 pixmap; + GLXPixmap glxpixmap; } xGLXCreateGLXPixmapWithConfigSGIXReq; #define sz_xGLXCreateGLXPixmapWithConfigSGIXReq 28 @@ -1030,14 +1030,14 @@ typedef struct GLXCreateGLXPixmapWithConfigSGIX { typedef struct GLXCreateGLXPbufferSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - CARD32 screen B32; - GLXFBConfigID fbconfig B32; - GLXPbuffer pbuffer B32; - CARD32 width B32; - CARD32 height B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + CARD32 screen; + GLXFBConfigID fbconfig; + GLXPbuffer pbuffer; + CARD32 width; + CARD32 height; /* followed by attribute list */ } xGLXCreateGLXPbufferSGIXReq; #define sz_xGLXCreateGLXPbufferSGIXReq 32 @@ -1048,10 +1048,10 @@ typedef struct GLXCreateGLXPbufferSGIX { typedef struct GLXDestroyGLXPbuffer { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - GLXPbuffer pbuffer B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + GLXPbuffer pbuffer; } xGLXDestroyGLXPbufferSGIXReq; #define sz_xGLXDestroyGLXPbufferSGIXReq 16 @@ -1061,11 +1061,11 @@ typedef struct GLXDestroyGLXPbuffer { typedef struct GLXChangeDrawableAttributesSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - GLXDrawable drawable B32; - CARD32 numAttribs B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + GLXDrawable drawable; + CARD32 numAttribs; /* followed by attribute list */ } xGLXChangeDrawableAttributesSGIXReq; #define sz_xGLXChangeDrawableAttributesSGIXReq 20 @@ -1076,10 +1076,10 @@ typedef struct GLXChangeDrawableAttributesSGIX { typedef struct GLXGetDrawableAttributesSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - GLXDrawable drawable B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + GLXDrawable drawable; } xGLXGetDrawableAttributesSGIXReq; #define sz_xGLXGetDrawableAttributesSGIXReq 16 @@ -1089,14 +1089,14 @@ typedef struct GLXGetDrawableAttributesSGIX { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numAttribs B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numAttribs; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXGetDrawableAttributesSGIXReply; #define sz_xGLXGetDrawableAttributesSGIXReply 32 @@ -1106,11 +1106,11 @@ typedef struct { typedef struct GLXJoinSwapGroupSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 unused B32; /* corresponds to contextTag in hdr */ - GLXDrawable drawable B32; - GLXDrawable member B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 unused; /* corresponds to contextTag in hdr */ + GLXDrawable drawable; + GLXDrawable member; } xGLXJoinSwapGroupSGIXReq; #define sz_xGLXJoinSwapGroupSGIXReq 20 @@ -1120,11 +1120,11 @@ typedef struct GLXJoinSwapGroupSGIX { typedef struct GLXBindSwapBarrierSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 unused B32; /* corresponds to contextTag in hdr */ - GLXDrawable drawable B32; - CARD32 barrier B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 unused; /* corresponds to contextTag in hdr */ + GLXDrawable drawable; + CARD32 barrier; } xGLXBindSwapBarrierSGIXReq; #define sz_xGLXBindSwapBarrierSGIXReq 20 @@ -1134,24 +1134,24 @@ typedef struct GLXBindSwapBarrierSGIX { typedef struct GLXQueryMaxSwapBarriersSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 unused B32; /* corresponds to contextTag in hdr */ - CARD32 screen B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 unused; /* corresponds to contextTag in hdr */ + CARD32 screen; } xGLXQueryMaxSwapBarriersSGIXReq; #define sz_xGLXQueryMaxSwapBarriersSGIXReq 16 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 max B32; - CARD32 size B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 max; + CARD32 size; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXQueryMaxSwapBarriersSGIXReply; #define sz_xGLXQueryMaxSwapBarriersSGIXReply 32 @@ -1161,10 +1161,10 @@ typedef struct { typedef struct GLXQueryHyperpipeNetworkSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - CARD32 screen B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + CARD32 screen; } xGLXQueryHyperpipeNetworkSGIXReq; #define sz_xGLXQueryHyperpipeNetworkSGIXReq 16 @@ -1174,14 +1174,14 @@ typedef struct GLXQueryHyperpipeNetworkSGIX { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 n B32; - CARD32 npipes B32; /* NOTE: may hold a single value */ - CARD32 pad4 B32; /* NOTE: may hold half a double */ - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 n; + CARD32 npipes; /* NOTE: may hold a single value */ + CARD32 pad4; /* NOTE: may hold half a double */ + CARD32 pad5; + CARD32 pad6; } xGLXQueryHyperpipeNetworkSGIXReply; #define sz_xGLXQueryHyperpipeNetworkSGIXReply 32 @@ -1191,14 +1191,14 @@ typedef struct { typedef struct GLXDestroyHyperpipeConfigSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - CARD32 screen B32; - CARD32 hpId B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + CARD32 screen; + CARD32 hpId; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xGLXDestroyHyperpipeConfigSGIXReq; #define sz_xGLXDestroyHyperpipeConfigSGIXReq 32 @@ -1208,14 +1208,14 @@ typedef struct GLXDestroyHyperpipeConfigSGIX { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 n B32; - CARD32 success B32; /* NOTE: may hold a single value */ - CARD32 pad4 B32; /* NOTE: may hold half a double */ - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 n; + CARD32 success; /* NOTE: may hold a single value */ + CARD32 pad4; /* NOTE: may hold half a double */ + CARD32 pad5; + CARD32 pad6; } xGLXDestroyHyperpipeConfigSGIXReply; #define sz_xGLXDestroyHyperpipeConfigSGIXReply 32 @@ -1225,14 +1225,14 @@ typedef struct { typedef struct GLXQueryHyperpipeConfigSGIX { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - CARD32 screen B32; - CARD32 hpId B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + CARD32 screen; + CARD32 hpId; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xGLXQueryHyperpipeConfigSGIXReq; #define sz_xGLXQueryHyperpipeConfigSGIXReq 32 @@ -1242,14 +1242,14 @@ typedef struct GLXQueryHyperpipeConfigSGIX { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 n B32; - CARD32 npipes B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 n; + CARD32 npipes; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGLXQueryHyperpipeConfigSGIXReply; #define sz_xGLXQueryHyperpipeConfigSGIXReply 32 @@ -1259,14 +1259,14 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 vendorCode B32; /* vendor-specific opcode */ - CARD32 pad1 B32; /* unused; corresponds to contextTag in header */ - CARD32 screen B32; - CARD32 npipes B32; - CARD32 networkId B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 length; + CARD32 vendorCode; /* vendor-specific opcode */ + CARD32 pad1; /* unused; corresponds to contextTag in header */ + CARD32 screen; + CARD32 npipes; + CARD32 networkId; + CARD32 pad2; + CARD32 pad3; /* followed by attribute list */ } xGLXHyperpipeConfigSGIXReq; #define sz_xGLXHyperpipeConfigSGIXReq 32 @@ -1277,14 +1277,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 n B32; - CARD32 npipes B32; - CARD32 hpId B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 n; + CARD32 npipes; + CARD32 hpId; + CARD32 pad5; + CARD32 pad6; } xGLXHyperpipeConfigSGIXReply; #define sz_xGLXHyperpipeConfigSGIXReply 32 @@ -1296,14 +1296,14 @@ typedef struct { /** * Protocol header for glXSetClientInfoARB * - * This structure is follwed by \c numVersions * 2 \c CARD32 values listing + * This structure is followed by \c numVersions * 2 \c CARD32 values listing * the OpenGL versions supported by the client. The pairs of values are an * OpenGL major version followed by a minor version. For example, * * CARD32 versions[4] = { 2, 1, 3, 0 }; * * says that the client supports OpenGL 2.1 and OpenGL 3.0. - * + * * These are followed by \c numGLExtensionBytes bytes of \c STRING8 containing * the OpenGL extension string supported by the client and up to 3 bytes of * padding. @@ -1319,12 +1319,12 @@ typedef struct { typedef struct GLXSetClientInfoARB { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 major B32; - CARD32 minor B32; - CARD32 numVersions B32; - CARD32 numGLExtensionBytes B32; - CARD32 numGLXExtensionBytes B32; + CARD16 length; + CARD32 major; + CARD32 minor; + CARD32 numVersions; + CARD32 numGLExtensionBytes; + CARD32 numGLXExtensionBytes; /* ** More data may follow; this is just the header. */ @@ -1340,15 +1340,15 @@ typedef struct GLXSetClientInfoARB { typedef struct GLXCreateContextAttribsARB { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - GLXContextID context B32; - GLXFBConfigID fbconfig B32; + CARD16 length; + GLXContextID context; + GLXFBConfigID fbconfig; CARD32 screen; - GLXContextID shareList B32; + GLXContextID shareList; BOOL isDirect; CARD8 reserved1; - CARD16 reserved2 B16; - CARD32 numAttribs B32; + CARD16 reserved2; + CARD32 numAttribs; /* followed by attribute list */ } xGLXCreateContextAttribsARBReq; #define sz_xGLXCreateContextAttribsARBReq 28 @@ -1367,12 +1367,12 @@ typedef struct GLXCreateContextAttribsARB { typedef struct GLXSetClientInfo2ARB { CARD8 reqType; CARD8 glxCode; - CARD16 length B16; - CARD32 major B32; - CARD32 minor B32; - CARD32 numVersions B32; - CARD32 numGLExtensionBytes B32; - CARD32 numGLXExtensionBytes B32; + CARD16 length; + CARD32 major; + CARD32 minor; + CARD32 numVersions; + CARD32 numGLExtensionBytes; + CARD32 numGLXExtensionBytes; /* ** More data may follow; this is just the header. */ @@ -1389,46 +1389,46 @@ typedef struct GLXSetClientInfo2ARB { typedef struct { BYTE type; BYTE pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; /*** was clobber_class */ - CARD16 draw_type B16; - CARD32 drawable B32; - CARD32 buffer_mask B32; /*** was mask */ - CARD16 aux_buffer B16; - CARD16 x B16; - CARD16 y B16; - CARD16 width B16; - CARD16 height B16; - CARD16 count B16; - CARD32 unused2 B32; + CARD16 sequenceNumber; + CARD16 event_type; /*** was clobber_class */ + CARD16 draw_type; + CARD32 drawable; + CARD32 buffer_mask; /*** was mask */ + CARD16 aux_buffer; + CARD16 x; + CARD16 y; + CARD16 width; + CARD16 height; + CARD16 count; + CARD32 unused2; } xGLXPbufferClobberEvent; typedef struct { BYTE type; BYTE pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; + CARD16 sequenceNumber; + CARD16 event_type; CARD32 drawable; - CARD32 ust_hi B32; - CARD32 ust_lo B32; - CARD32 msc_hi B32; - CARD32 msc_lo B32; - CARD32 sbc_hi B32; - CARD32 sbc_lo B32; + CARD32 ust_hi; + CARD32 ust_lo; + CARD32 msc_hi; + CARD32 msc_lo; + CARD32 sbc_hi; + CARD32 sbc_lo; } xGLXBufferSwapComplete; typedef struct { BYTE type; BYTE pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; + CARD16 sequenceNumber; + CARD16 event_type; CARD16 pad2; CARD32 drawable; - CARD32 ust_hi B32; - CARD32 ust_lo B32; - CARD32 msc_hi B32; - CARD32 msc_lo B32; - CARD32 sbc B32; + CARD32 ust_hi; + CARD32 ust_lo; + CARD32 msc_hi; + CARD32 msc_lo; + CARD32 sbc; } xGLXBufferSwapComplete2; /************************************************************************/ @@ -1440,8 +1440,8 @@ typedef struct { #define __GLX_VENDPRIV_HDR_SIZE sz_xGLXVendorPrivateReq #define __GLX_RENDER_HDR \ - CARD16 length B16; \ - CARD16 opcode B16 + CARD16 length; \ + CARD16 opcode #define __GLX_RENDER_HDR_SIZE 4 @@ -1450,8 +1450,8 @@ typedef struct { } __GLXrenderHeader; #define __GLX_RENDER_LARGE_HDR \ - CARD32 length B32; \ - CARD32 opcode B32 + CARD32 length; \ + CARD32 opcode #define __GLX_RENDER_LARGE_HDR_SIZE 8 @@ -1470,10 +1470,10 @@ typedef struct { BOOL lsbFirst; \ CARD8 reserved0; \ CARD8 reserved1; \ - CARD32 rowLength B32; \ - CARD32 skipRows B32; \ - CARD32 skipPixels B32; \ - CARD32 alignment B32 + CARD32 rowLength; \ + CARD32 skipRows; \ + CARD32 skipPixels; \ + CARD32 alignment #define __GLX_PIXEL_HDR_SIZE 20 @@ -1491,14 +1491,14 @@ typedef struct { BOOL lsbFirst; \ CARD8 reserved0; \ CARD8 reserved1; \ - CARD32 rowLength B32; \ - CARD32 imageHeight B32; \ - CARD32 imageDepth B32; \ - CARD32 skipRows B32; \ - CARD32 skipImages B32; \ - CARD32 skipVolumes B32; \ - CARD32 skipPixels B32; \ - CARD32 alignment B32 + CARD32 rowLength; \ + CARD32 imageHeight; \ + CARD32 imageDepth; \ + CARD32 skipRows; \ + CARD32 skipImages; \ + CARD32 skipVolumes; \ + CARD32 skipPixels; \ + CARD32 alignment #define __GLX_PIXEL_3D_HDR_SIZE 36 @@ -1510,8 +1510,8 @@ typedef struct { ** Bitmap header */ #define __GLX_BITMAP_HDR \ - CARD32 width B32; \ - CARD32 height B32; \ + CARD32 width; \ + CARD32 height; \ FLOAT32 xorig F32; \ FLOAT32 yorig F32; \ FLOAT32 xmove F32; \ @@ -1559,14 +1559,14 @@ typedef struct { ** When a glTexImage1D call the height field is unexamined by the server. */ #define __GLX_TEXIMAGE_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 components B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 border B32; \ - CARD32 format B32; \ - CARD32 type B32 + CARD32 target; \ + CARD32 level; \ + CARD32 components; \ + CARD32 width; \ + CARD32 height; \ + CARD32 border; \ + CARD32 format; \ + CARD32 type #define __GLX_TEXIMAGE_HDR_SIZE 32 @@ -1605,17 +1605,17 @@ typedef struct { ** future. */ #define __GLX_TEXIMAGE_3D_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 internalformat B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 depth B32; \ - CARD32 size4d B32; \ - CARD32 border B32; \ - CARD32 format B32; \ - CARD32 type B32; \ - CARD32 nullimage B32 + CARD32 target; \ + CARD32 level; \ + CARD32 internalformat; \ + CARD32 width; \ + CARD32 height; \ + CARD32 depth; \ + CARD32 size4d; \ + CARD32 border; \ + CARD32 format; \ + CARD32 type; \ + CARD32 nullimage #define __GLX_TEXIMAGE_3D_HDR_SIZE 44 @@ -1653,14 +1653,14 @@ typedef struct { ** are unexamined by the server and are considered to be padding. */ #define __GLX_TEXSUBIMAGE_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 xoffset B32; \ - CARD32 yoffset B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 format B32; \ - CARD32 type B32; \ + CARD32 target; \ + CARD32 level; \ + CARD32 xoffset; \ + CARD32 yoffset; \ + CARD32 width; \ + CARD32 height; \ + CARD32 format; \ + CARD32 type; \ CARD32 nullImage \ #define __GLX_TEXSUBIMAGE_HDR_SIZE 36 @@ -1698,19 +1698,19 @@ typedef struct { ** are unexamined by the server and are considered to be padding. */ #define __GLX_TEXSUBIMAGE_3D_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 xoffset B32; \ - CARD32 yoffset B32; \ - CARD32 zoffset B32; \ - CARD32 woffset B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 depth B32; \ - CARD32 size4d B32; \ - CARD32 format B32; \ - CARD32 type B32; \ - CARD32 nullImage \ + CARD32 target; \ + CARD32 level; \ + CARD32 xoffset; \ + CARD32 yoffset; \ + CARD32 zoffset; \ + CARD32 woffset; \ + CARD32 width; \ + CARD32 height; \ + CARD32 depth; \ + CARD32 size4d; \ + CARD32 format; \ + CARD32 type; \ + CARD32 nullImage \ #define __GLX_TEXSUBIMAGE_3D_HDR_SIZE 52 @@ -1744,19 +1744,19 @@ typedef struct { * order: * - Render or RenderLarge header * - CompressedTexImage header - * + * * When a \c glCompressedTexImage1D call is made, the \c height field is * not examined by the server and is considered padding. */ #define __GLX_COMPRESSED_TEXIMAGE_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 internalFormat B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 border B32; \ - CARD32 imageSize B32 + CARD32 target; \ + CARD32 level; \ + CARD32 internalFormat; \ + CARD32 width; \ + CARD32 height; \ + CARD32 border; \ + CARD32 imageSize #define __GLX_COMPRESSED_TEXIMAGE_HDR_SIZE 28 @@ -1786,20 +1786,20 @@ typedef struct { * order: * - Render or RenderLarge header * - CompressedTexSubImage header - * + * * When a \c glCompressedTexSubImage1D call is made, the \c yoffset and * \c height fields are not examined by the server and are considered padding. */ #define __GLX_COMPRESSED_TEXSUBIMAGE_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 xoffset B32; \ - CARD32 yoffset B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 format B32; \ - CARD32 imageSize B32 + CARD32 target; \ + CARD32 level; \ + CARD32 xoffset; \ + CARD32 yoffset; \ + CARD32 width; \ + CARD32 height; \ + CARD32 format; \ + CARD32 imageSize #define __GLX_COMPRESSED_TEXSUBIMAGE_HDR_SIZE 32 @@ -1831,14 +1831,14 @@ typedef struct { */ #define __GLX_COMPRESSED_TEXIMAGE_3D_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 internalFormat B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 depth B32; \ - CARD32 border B32; \ - CARD32 imageSize B32 + CARD32 target; \ + CARD32 level; \ + CARD32 internalFormat; \ + CARD32 width; \ + CARD32 height; \ + CARD32 depth; \ + CARD32 border; \ + CARD32 imageSize #define __GLX_COMPRESSED_TEXIMAGE_3D_HDR_SIZE 32 @@ -1870,16 +1870,16 @@ typedef struct { */ #define __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR \ - CARD32 target B32; \ - CARD32 level B32; \ - CARD32 xoffset B32; \ - CARD32 yoffset B32; \ - CARD32 zoffset B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 depth B32; \ - CARD32 format B32; \ - CARD32 imageSize B32 + CARD32 target; \ + CARD32 level; \ + CARD32 xoffset; \ + CARD32 yoffset; \ + CARD32 zoffset; \ + CARD32 width; \ + CARD32 height; \ + CARD32 depth; \ + CARD32 format; \ + CARD32 imageSize #define __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR_SIZE 32 @@ -1911,10 +1911,10 @@ typedef struct { ** DrawPixels header */ #define __GLX_DRAWPIXELS_HDR \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 format B32; \ - CARD32 type B32 + CARD32 width; \ + CARD32 height; \ + CARD32 format; \ + CARD32 type #define __GLX_DRAWPIXELS_HDR_SIZE 16 @@ -1950,12 +1950,12 @@ typedef struct { ** When a glConvolutionFilter1D call the height field is unexamined by the server. */ #define __GLX_CONV_FILT_HDR \ - CARD32 target B32; \ - CARD32 internalformat B32; \ - CARD32 width B32; \ - CARD32 height B32; \ - CARD32 format B32; \ - CARD32 type B32 + CARD32 target; \ + CARD32 internalformat; \ + CARD32 width; \ + CARD32 height; \ + CARD32 format; \ + CARD32 type #define __GLX_CONV_FILT_HDR_SIZE 24 @@ -1991,9 +1991,9 @@ typedef struct { */ #define __GLX_DRAWARRAYS_HDR \ - CARD32 numVertexes B32; \ - CARD32 numComponents B32; \ - CARD32 primType B32 + CARD32 numVertexes; \ + CARD32 numComponents; \ + CARD32 primType #define __GLX_DRAWARRAYS_HDR_SIZE 12 @@ -2015,9 +2015,9 @@ typedef struct { } __GLXdispatchDrawArraysHeader; #define __GLX_COMPONENT_HDR \ - CARD32 datatype B32; \ - INT32 numVals B32; \ - CARD32 component B32 + CARD32 datatype; \ + INT32 numVals; \ + CARD32 component typedef struct { __GLX_COMPONENT_HDR; @@ -2034,11 +2034,11 @@ typedef struct { */ #define __GLX_COLOR_TABLE_HDR \ - CARD32 target B32; \ - CARD32 internalformat B32; \ - CARD32 width B32; \ - CARD32 format B32; \ - CARD32 type B32 + CARD32 target; \ + CARD32 internalformat; \ + CARD32 width; \ + CARD32 format; \ + CARD32 type #define __GLX_COLOR_TABLE_HDR_SIZE 20 @@ -2071,11 +2071,11 @@ typedef struct { */ #define __GLX_COLOR_SUBTABLE_HDR \ - CARD32 target B32; \ - CARD32 start B32; \ - CARD32 count B32; \ - CARD32 format B32; \ - CARD32 type B32 + CARD32 target; \ + CARD32 start; \ + CARD32 count; \ + CARD32 format; \ + CARD32 type #define __GLX_COLOR_SUBTABLE_HDR_SIZE 20 @@ -2105,7 +2105,7 @@ typedef struct { #define GLX_VIDEO_SOURCE_TYPE 3 #define GLX_PBUFFER_TYPE 4 /* 5 is for DM_PBUFFER */ -#define GLX_GLXWINDOW_TYPE 6 +#define GLX_GLXWINDOW_TYPE 6 /*****************************************************************************/ diff --git a/proto/xorgproto/include/GL/glxtokens.h b/proto/xorgproto/include/GL/glxtokens.h index a95082e47..ff3bd450f 100644 --- a/proto/xorgproto/include/GL/glxtokens.h +++ b/proto/xorgproto/include/GL/glxtokens.h @@ -264,14 +264,14 @@ extern "C" { #define GLX_FRONT_EXT GLX_FRONT_LEFT_EXT #define GLX_BACK_EXT GLX_BACK_LEFT_EXT #define GLX_AUX0_EXT 0x20E2 -#define GLX_AUX1_EXT 0x20E3 -#define GLX_AUX2_EXT 0x20E4 -#define GLX_AUX3_EXT 0x20E5 -#define GLX_AUX4_EXT 0x20E6 -#define GLX_AUX5_EXT 0x20E7 +#define GLX_AUX1_EXT 0x20E3 +#define GLX_AUX2_EXT 0x20E4 +#define GLX_AUX3_EXT 0x20E5 +#define GLX_AUX4_EXT 0x20E6 +#define GLX_AUX5_EXT 0x20E7 #define GLX_AUX6_EXT 0x20E8 -#define GLX_AUX7_EXT 0x20E9 -#define GLX_AUX8_EXT 0x20EA +#define GLX_AUX7_EXT 0x20E9 +#define GLX_AUX8_EXT 0x20EA #define GLX_AUX9_EXT 0x20EB /* diff --git a/proto/xorgproto/include/GL/internal/glcore.h b/proto/xorgproto/include/GL/internal/glcore.h index 547b11137..387972732 100644 --- a/proto/xorgproto/include/GL/internal/glcore.h +++ b/proto/xorgproto/include/GL/internal/glcore.h @@ -58,11 +58,11 @@ typedef struct __GLcontextRec __GLcontext; * kept around in the context so that values can be used during * command execution, and for returning information about the * context to the application. - * + * * Instances of this structure are shared by the driver and the loader. To * maintain binary compatability, new fields \b must be added only to the * end of the structure. - * + * * \sa _gl_context_modes_create */ typedef struct __GLcontextModesRec { @@ -95,7 +95,7 @@ typedef struct __GLcontextModesRec { /* GLX */ GLint visualID; - GLint visualType; /**< One of the GLX X visual types. (i.e., + GLint visualType; /**< One of the GLX X visual types. (i.e., * \c GLX_TRUE_COLOR, etc.) */ diff --git a/proto/xorgproto/include/X11/DECkeysym.h b/proto/xorgproto/include/X11/DECkeysym.h index 07307169d..d9e23c4be 100644 --- a/proto/xorgproto/include/X11/DECkeysym.h +++ b/proto/xorgproto/include/X11/DECkeysym.h @@ -27,13 +27,13 @@ Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/proto/xorgproto/include/X11/PM/PMproto.h b/proto/xorgproto/include/X11/PM/PMproto.h index 754e460c5..139590548 100644 --- a/proto/xorgproto/include/X11/PM/PMproto.h +++ b/proto/xorgproto/include/X11/PM/PMproto.h @@ -34,8 +34,8 @@ from The Open Group. typedef struct { CARD8 majorOpcode; CARD8 minorOpcode; /* == 1 */ - CARD16 authLen B16; - CARD32 length B32; + CARD16 authLen; + CARD32 length; /* STRING proxy-service */ /* STRING server-address */ /* STRING host-address */ @@ -52,7 +52,7 @@ typedef struct { CARD8 minorOpcode; /* == 2 */ CARD8 status; CARD8 unused; - CARD32 length B32; + CARD32 length; /* STRING proxy-address */ /* STRING failure-reason */ } pmGetProxyAddrReplyMsg; @@ -63,8 +63,8 @@ typedef struct { typedef struct { CARD8 majorOpcode; CARD8 minorOpcode; /* == 3 */ - CARD16 unused B16; - CARD32 length B32; + CARD16 unused; + CARD32 length; /* STRING proxy-service */ } pmStartProxyMsg; diff --git a/proto/xorgproto/include/X11/X.h b/proto/xorgproto/include/X11/X.h index 5cf695d7b..4df7d22e9 100644 --- a/proto/xorgproto/include/X11/X.h +++ b/proto/xorgproto/include/X11/X.h @@ -32,13 +32,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -140,39 +140,39 @@ typedef unsigned char KeyCode; #define NoSymbol 0L /* special KeySym */ -/***************************************************************** - * EVENT DEFINITIONS +/***************************************************************** + * EVENT DEFINITIONS *****************************************************************/ /* Input Event Masks. Used as event-mask window attribute and as arguments to Grab requests. Not to be confused with event names. */ #define NoEventMask 0L -#define KeyPressMask (1L<<0) -#define KeyReleaseMask (1L<<1) -#define ButtonPressMask (1L<<2) -#define ButtonReleaseMask (1L<<3) -#define EnterWindowMask (1L<<4) -#define LeaveWindowMask (1L<<5) -#define PointerMotionMask (1L<<6) -#define PointerMotionHintMask (1L<<7) -#define Button1MotionMask (1L<<8) -#define Button2MotionMask (1L<<9) -#define Button3MotionMask (1L<<10) -#define Button4MotionMask (1L<<11) -#define Button5MotionMask (1L<<12) -#define ButtonMotionMask (1L<<13) +#define KeyPressMask (1L<<0) +#define KeyReleaseMask (1L<<1) +#define ButtonPressMask (1L<<2) +#define ButtonReleaseMask (1L<<3) +#define EnterWindowMask (1L<<4) +#define LeaveWindowMask (1L<<5) +#define PointerMotionMask (1L<<6) +#define PointerMotionHintMask (1L<<7) +#define Button1MotionMask (1L<<8) +#define Button2MotionMask (1L<<9) +#define Button3MotionMask (1L<<10) +#define Button4MotionMask (1L<<11) +#define Button5MotionMask (1L<<12) +#define ButtonMotionMask (1L<<13) #define KeymapStateMask (1L<<14) -#define ExposureMask (1L<<15) -#define VisibilityChangeMask (1L<<16) -#define StructureNotifyMask (1L<<17) -#define ResizeRedirectMask (1L<<18) -#define SubstructureNotifyMask (1L<<19) -#define SubstructureRedirectMask (1L<<20) -#define FocusChangeMask (1L<<21) -#define PropertyChangeMask (1L<<22) -#define ColormapChangeMask (1L<<23) -#define OwnerGrabButtonMask (1L<<24) +#define ExposureMask (1L<<15) +#define VisibilityChangeMask (1L<<16) +#define StructureNotifyMask (1L<<17) +#define ResizeRedirectMask (1L<<18) +#define SubstructureNotifyMask (1L<<19) +#define SubstructureRedirectMask (1L<<20) +#define FocusChangeMask (1L<<21) +#define PropertyChangeMask (1L<<22) +#define ColormapChangeMask (1L<<23) +#define OwnerGrabButtonMask (1L<<24) /* Event names. Used in "type" field in XEvent structures. Not to be confused with event masks above. They start from 2 because 0 and 1 @@ -270,7 +270,7 @@ are reserved in the protocol for errors and replies. */ #define NotifyWhileGrabbed 3 #define NotifyHint 1 /* for MotionNotify events */ - + /* Notify detail */ #define NotifyAncestor 0 @@ -344,7 +344,7 @@ are reserved in the protocol for errors and replies. */ #define RevertToParent 2 /***************************************************************** - * ERROR CODES + * ERROR CODES *****************************************************************/ #define Success 0 /* everything's okay */ @@ -359,9 +359,9 @@ are reserved in the protocol for errors and replies. */ #define BadDrawable 9 /* parameter not a Pixmap or Window */ #define BadAccess 10 /* depending on context: - key/button already grabbed - - attempt to free an illegal - cmap entry - - attempt to store into a read-only + - attempt to free an illegal + cmap entry + - attempt to store into a read-only color map entry. - attempt to modify the access control list from other than the local host. @@ -378,7 +378,7 @@ are reserved in the protocol for errors and replies. */ #define LastExtensionError 255 /***************************************************************** - * WINDOW DEFINITIONS + * WINDOW DEFINITIONS *****************************************************************/ /* Window classes used by CreateWindow */ @@ -570,7 +570,7 @@ are reserved in the protocol for errors and replies. */ #define GCCapStyle (1L<<6) #define GCJoinStyle (1L<<7) #define GCFillStyle (1L<<8) -#define GCFillRule (1L<<9) +#define GCFillRule (1L<<9) #define GCTile (1L<<10) #define GCStipple (1L<<11) #define GCTileStipXOrigin (1L<<12) @@ -587,7 +587,7 @@ are reserved in the protocol for errors and replies. */ #define GCLastBit 22 /***************************************************************** - * FONTS + * FONTS *****************************************************************/ /* used in QueryFont -- draw direction */ @@ -598,7 +598,7 @@ are reserved in the protocol for errors and replies. */ #define FontChange 255 /***************************************************************** - * IMAGING + * IMAGING *****************************************************************/ /* ImageFormat -- PutImage, GetImage */ @@ -608,7 +608,7 @@ are reserved in the protocol for errors and replies. */ #define ZPixmap 2 /* depth == drawable depth */ /***************************************************************** - * COLOR MAP STUFF + * COLOR MAP STUFF *****************************************************************/ /* For CreateColormap */ @@ -633,7 +633,7 @@ are reserved in the protocol for errors and replies. */ #define TileShape 1 /* size tiled fastest */ #define StippleShape 2 /* size stippled fastest */ -/***************************************************************** +/***************************************************************** * KEYBOARD/POINTER STUFF *****************************************************************/ @@ -664,7 +664,7 @@ are reserved in the protocol for errors and replies. */ #define MappingPointer 2 /***************************************************************** - * SCREEN SAVER STUFF + * SCREEN SAVER STUFF *****************************************************************/ #define DontPreferBlanking 0 @@ -694,10 +694,10 @@ are reserved in the protocol for errors and replies. */ /* for ChangeAccessControl */ -#define EnableAccess 1 +#define EnableAccess 1 #define DisableAccess 0 -/* Display classes used in opening the connection +/* Display classes used in opening the connection * Note that the statically allocated ones are even numbered and the * dynamically changeable ones are odd numbered */ diff --git a/proto/xorgproto/include/X11/XF86keysym.h b/proto/xorgproto/include/X11/XF86keysym.h index c0d12c135..dd287e249 100644 --- a/proto/xorgproto/include/X11/XF86keysym.h +++ b/proto/xorgproto/include/X11/XF86keysym.h @@ -23,11 +23,12 @@ #define XF86XK_ModeLock 0x1008FF01 /* Mode Switch Lock */ /* Backlight controls. */ -#define XF86XK_MonBrightnessUp 0x1008FF02 /* Monitor/panel brightness */ -#define XF86XK_MonBrightnessDown 0x1008FF03 /* Monitor/panel brightness */ -#define XF86XK_KbdLightOnOff 0x1008FF04 /* Keyboards may be lit */ -#define XF86XK_KbdBrightnessUp 0x1008FF05 /* Keyboards may be lit */ -#define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */ +#define XF86XK_MonBrightnessUp 0x1008FF02 /* Monitor/panel brightness */ +#define XF86XK_MonBrightnessDown 0x1008FF03 /* Monitor/panel brightness */ +#define XF86XK_KbdLightOnOff 0x1008FF04 /* Keyboards may be lit */ +#define XF86XK_KbdBrightnessUp 0x1008FF05 /* Keyboards may be lit */ +#define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */ +#define XF86XK_MonBrightnessCycle 0x1008FF07 /* Monitor/panel brightness */ /* * Keys found on some "Internet" keyboards. @@ -117,12 +118,12 @@ #define XF86XK_Explorer 0x1008FF5D /* Launch file explorer */ #define XF86XK_Game 0x1008FF5E /* Launch game */ #define XF86XK_Go 0x1008FF5F /* Go to URL */ -#define XF86XK_iTouch 0x1008FF60 /* Logitch iTouch- don't use */ +#define XF86XK_iTouch 0x1008FF60 /* Logitech iTouch- don't use */ #define XF86XK_LogOff 0x1008FF61 /* Log off system */ #define XF86XK_Market 0x1008FF62 /* ?? */ #define XF86XK_Meeting 0x1008FF63 /* enter meeting in calendar */ -#define XF86XK_MenuKB 0x1008FF65 /* distingush keyboard from PB */ -#define XF86XK_MenuPB 0x1008FF66 /* distinuish PB from keyboard */ +#define XF86XK_MenuKB 0x1008FF65 /* distinguish keyboard from PB */ +#define XF86XK_MenuPB 0x1008FF66 /* distinguish PB from keyboard */ #define XF86XK_MySites 0x1008FF67 /* Favourites */ #define XF86XK_New 0x1008FF68 /* New (folder, document... */ #define XF86XK_News 0x1008FF69 /* News */ @@ -204,6 +205,8 @@ #define XF86XK_AudioPreset 0x1008FFB6 /* Select equalizer preset, e.g. theatre-mode */ +#define XF86XK_RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */ + /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ #define XF86XK_Switch_VT_1 0x1008FE01 diff --git a/proto/xorgproto/include/X11/XWDFile.h b/proto/xorgproto/include/X11/XWDFile.h index 50e17df3d..3d0ab893d 100644 --- a/proto/xorgproto/include/X11/XWDFile.h +++ b/proto/xorgproto/include/X11/XWDFile.h @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Tony Della Fera, DEC * 27-Jun-85 - * + * * Modifier: William F. Wyatt, SAO * 18-Nov-86 - version 6 for saving/restoring color maps */ @@ -51,44 +51,44 @@ typedef CARD32 xwdval; /* for old broken programs */ typedef struct _xwd_file_header { /* header_size = SIZEOF(XWDheader) + length of null-terminated * window name. */ - CARD32 header_size B32; + CARD32 header_size; - CARD32 file_version B32; /* = XWD_FILE_VERSION above */ - CARD32 pixmap_format B32; /* ZPixmap or XYPixmap */ - CARD32 pixmap_depth B32; /* Pixmap depth */ - CARD32 pixmap_width B32; /* Pixmap width */ - CARD32 pixmap_height B32; /* Pixmap height */ - CARD32 xoffset B32; /* Bitmap x offset, normally 0 */ - CARD32 byte_order B32; /* of image data: MSBFirst, LSBFirst */ + CARD32 file_version; /* = XWD_FILE_VERSION above */ + CARD32 pixmap_format; /* ZPixmap or XYPixmap */ + CARD32 pixmap_depth; /* Pixmap depth */ + CARD32 pixmap_width; /* Pixmap width */ + CARD32 pixmap_height; /* Pixmap height */ + CARD32 xoffset; /* Bitmap x offset, normally 0 */ + CARD32 byte_order; /* of image data: MSBFirst, LSBFirst */ /* bitmap_unit applies to bitmaps (depth 1 format XY) only. * It is the number of bits that each scanline is padded to. */ - CARD32 bitmap_unit B32; + CARD32 bitmap_unit; - CARD32 bitmap_bit_order B32; /* bitmaps only: MSBFirst, LSBFirst */ + CARD32 bitmap_bit_order; /* bitmaps only: MSBFirst, LSBFirst */ /* bitmap_pad applies to pixmaps (non-bitmaps) only. * It is the number of bits that each scanline is padded to. */ - CARD32 bitmap_pad B32; + CARD32 bitmap_pad; - CARD32 bits_per_pixel B32; /* Bits per pixel */ + CARD32 bits_per_pixel; /* Bits per pixel */ /* bytes_per_line is pixmap_width padded to bitmap_unit (bitmaps) * or bitmap_pad (pixmaps). It is the delta (in bytes) to get * to the same x position on an adjacent row. */ - CARD32 bytes_per_line B32; - CARD32 visual_class B32; /* Class of colormap */ - CARD32 red_mask B32; /* Z red mask */ - CARD32 green_mask B32; /* Z green mask */ - CARD32 blue_mask B32; /* Z blue mask */ - CARD32 bits_per_rgb B32; /* Log2 of distinct color values */ - CARD32 colormap_entries B32; /* Number of entries in colormap; not used? */ - CARD32 ncolors B32; /* Number of XWDColor structures */ - CARD32 window_width B32; /* Window width */ - CARD32 window_height B32; /* Window height */ - CARD32 window_x B32; /* Window upper left X coordinate */ - CARD32 window_y B32; /* Window upper left Y coordinate */ - CARD32 window_bdrwidth B32; /* Window border width */ + CARD32 bytes_per_line; + CARD32 visual_class; /* Class of colormap */ + CARD32 red_mask; /* Z red mask */ + CARD32 green_mask; /* Z green mask */ + CARD32 blue_mask; /* Z blue mask */ + CARD32 bits_per_rgb; /* Log2 of distinct color values */ + CARD32 colormap_entries; /* Number of entries in colormap; not used? */ + CARD32 ncolors; /* Number of XWDColor structures */ + CARD32 window_width; /* Window width */ + CARD32 window_height; /* Window height */ + CARD32 window_x; /* Window upper left X coordinate */ + CARD32 window_y; /* Window upper left Y coordinate */ + CARD32 window_bdrwidth; /* Window border width */ } XWDFileHeader; /* Null-terminated window name follows the above structure. */ @@ -99,10 +99,10 @@ typedef struct _xwd_file_header { */ typedef struct { - CARD32 pixel B32; - CARD16 red B16; - CARD16 green B16; - CARD16 blue B16; + CARD32 pixel; + CARD16 red; + CARD16 green; + CARD16 blue; CARD8 flags; CARD8 pad; } XWDColor; diff --git a/proto/xorgproto/include/X11/Xalloca.h b/proto/xorgproto/include/X11/Xalloca.h index 1919884bb..687f5a4b2 100644 --- a/proto/xorgproto/include/X11/Xalloca.h +++ b/proto/xorgproto/include/X11/Xalloca.h @@ -31,7 +31,7 @@ from The Open Group. * These macros are used to make fast, function-local memory allocations. * Their characteristics are as follows: * - * void *ALLOCATE_LOCAL(int size) + * void *ALLOCATE_LOCAL(size_t size) * Returns a pointer to size bytes of memory, or NULL if the allocation * failed. The memory must be freed with DEALLOCATE_LOCAL before the * function that made the allocation returns. You should not ask for @@ -80,7 +80,7 @@ from The Open Group. # ifndef alloca # define alloca __builtin_alloca # endif /* !alloca */ -# define ALLOCATE_LOCAL(size) alloca((int)(size)) +# define ALLOCATE_LOCAL(size) alloca((size_t)(size)) # else /* ! __GNUC__ */ /* @@ -98,7 +98,7 @@ from The Open Group. # define __Xnullarg /* as nothing */ extern void *alloca(__Xnullarg); # endif -# define ALLOCATE_LOCAL(size) alloca((int)(size)) +# define ALLOCATE_LOCAL(size) alloca((size_t)(size)) # endif /* who does alloca */ # endif /* __GNUC__ */ diff --git a/proto/xorgproto/include/X11/Xdefs.h b/proto/xorgproto/include/X11/Xdefs.h index e25a20821..f58946dfb 100644 --- a/proto/xorgproto/include/X11/Xdefs.h +++ b/proto/xorgproto/include/X11/Xdefs.h @@ -22,7 +22,7 @@ authorization from The XFree86 Project Inc.. */ /** - ** Types definitions shared between server and clients + ** Types definitions shared between server and clients **/ #ifndef _XDEFS_H @@ -30,7 +30,7 @@ authorization from The XFree86 Project Inc.. #ifdef _XSERVER64 #include -#endif +#endif #ifndef _XTYPEDEF_ATOM # define _XTYPEDEF_ATOM @@ -96,7 +96,7 @@ typedef CARD32 FSID; typedef FSID AccContext; -/* OS independent time value +/* OS independent time value XXX Should probably go in Xos.h */ typedef struct timeval **OSTimePtr; diff --git a/proto/xorgproto/include/X11/Xfuncs.h b/proto/xorgproto/include/X11/Xfuncs.h index b7c40294c..b23c28310 100644 --- a/proto/xorgproto/include/X11/Xfuncs.h +++ b/proto/xorgproto/include/X11/Xfuncs.h @@ -1,5 +1,5 @@ /* - * + * Copyright 1990, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its diff --git a/proto/xorgproto/include/X11/Xproto.h b/proto/xorgproto/include/X11/Xproto.h index 6cdea89cd..74193e2ca 100644 --- a/proto/xorgproto/include/X11/Xproto.h +++ b/proto/xorgproto/include/X11/Xproto.h @@ -51,13 +51,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -258,7 +258,7 @@ restoring the definitions in X.h. */ typedef CARD16 KeyButMask; -/***************** +/***************** Connection setup structures. See Chapter 8: Connection Setup of the X Window System Protocol specification for details. *****************/ @@ -269,10 +269,10 @@ typedef CARD16 KeyButMask; typedef struct { CARD8 byteOrder; BYTE pad; - CARD16 majorVersion B16, minorVersion B16; - CARD16 nbytesAuthProto B16; /* Authorization protocol */ - CARD16 nbytesAuthString B16; /* Authorization string */ - CARD16 pad2 B16; + CARD16 majorVersion, minorVersion; + CARD16 nbytesAuthProto; /* Authorization protocol */ + CARD16 nbytesAuthString; /* Authorization string */ + CARD16 pad2; } xConnClientPrefix; /* Server response to xConnClientPrefix. @@ -288,19 +288,19 @@ typedef struct { typedef struct { CARD8 success; BYTE lengthReason; /*num bytes in string following if failure */ - CARD16 majorVersion B16, - minorVersion B16; - CARD16 length B16; /* 1/4 additional bytes in setup info */ + CARD16 majorVersion, + minorVersion; + CARD16 length; /* 1/4 additional bytes in setup info */ } xConnSetupPrefix; typedef struct { - CARD32 release B32; - CARD32 ridBase B32, - ridMask B32; - CARD32 motionBufferSize B32; - CARD16 nbytesVendor B16; /* number of bytes in vendor string */ - CARD16 maxRequestSize B16; + CARD32 release; + CARD32 ridBase, + ridMask; + CARD32 motionBufferSize; + CARD16 nbytesVendor; /* number of bytes in vendor string */ + CARD16 maxRequestSize; CARD8 numRoots; /* number of roots structs to follow */ CARD8 numFormats; /* number of pixmap formats */ CARD8 imageByteOrder; /* LSBFirst, MSBFirst */ @@ -308,7 +308,7 @@ typedef struct { CARD8 bitmapScanlineUnit, /* 8, 16, 32 */ bitmapScanlinePad; /* 8, 16, 32 */ KeyCode minKeyCode, maxKeyCode; - CARD32 pad2 B32; + CARD32 pad2; } xConnSetup; typedef struct { @@ -316,7 +316,7 @@ typedef struct { CARD8 bitsPerPixel; CARD8 scanLinePad; CARD8 pad1; - CARD32 pad2 B32; + CARD32 pad2; } xPixmapFormat; /* window root */ @@ -324,32 +324,32 @@ typedef struct { typedef struct { CARD8 depth; CARD8 pad1; - CARD16 nVisuals B16; /* number of xVisualType structures following */ - CARD32 pad2 B32; + CARD16 nVisuals; /* number of xVisualType structures following */ + CARD32 pad2; } xDepth; typedef struct { - VisualID visualID B32; + VisualID visualID; #if defined(__cplusplus) || defined(c_plusplus) CARD8 c_class; #else CARD8 class; #endif CARD8 bitsPerRGB; - CARD16 colormapEntries B16; - CARD32 redMask B32, greenMask B32, blueMask B32; - CARD32 pad B32; + CARD16 colormapEntries; + CARD32 redMask, greenMask, blueMask; + CARD32 pad; } xVisualType; typedef struct { - Window windowId B32; - Colormap defaultColormap B32; - CARD32 whitePixel B32, blackPixel B32; - CARD32 currentInputMask B32; - CARD16 pixWidth B16, pixHeight B16; - CARD16 mmWidth B16, mmHeight B16; - CARD16 minInstalledMaps B16, maxInstalledMaps B16; - VisualID rootVisualID B32; + Window windowId; + Colormap defaultColormap; + CARD32 whitePixel, blackPixel; + CARD32 currentInputMask; + CARD16 pixWidth, pixHeight; + CARD16 mmWidth, mmHeight; + CARD16 minInstalledMaps, maxInstalledMaps; + VisualID rootVisualID; CARD8 backingStore; BOOL saveUnders; CARD8 rootDepth; @@ -359,34 +359,34 @@ typedef struct { /***************************************************************** * Structure Defns - * Structures needed for replies + * Structures needed for replies *****************************************************************/ /* Used in GetMotionEvents */ typedef struct { - CARD32 time B32; - INT16 x B16, y B16; + CARD32 time; + INT16 x, y; } xTimecoord; typedef struct { CARD8 family; BYTE pad; - CARD16 length B16; + CARD16 length; } xHostEntry; typedef struct { - INT16 leftSideBearing B16, - rightSideBearing B16, - characterWidth B16, - ascent B16, - descent B16; - CARD16 attributes B16; + INT16 leftSideBearing, + rightSideBearing, + characterWidth, + ascent, + descent; + CARD16 attributes; } xCharInfo; typedef struct { - Atom name B32; - CARD32 value B32; + Atom name; + CARD32 value; } xFontProp; /* @@ -399,16 +399,16 @@ typedef struct { /* followed by string */ } xTextElt; -typedef struct { - CARD32 pixel B32; - CARD16 red B16, green B16, blue B16; +typedef struct { + CARD32 pixel; + CARD16 red, green, blue; CARD8 flags; /* DoRed, DoGreen, DoBlue booleans */ CARD8 pad; } xColorItem; typedef struct { - CARD16 red B16, green B16, blue B16, pad B16; + CARD16 red, green, blue, pad; } xrgb; typedef CARD8 KEYCODE; @@ -416,23 +416,23 @@ typedef CARD8 KEYCODE; /***************** * XRep: - * meant to be 32 byte quantity + * meant to be 32 byte quantity *****************/ /* GenericReply is the common format of all replies. The "data" items are specific to each individual reply type. */ -typedef struct { +typedef struct { BYTE type; /* X_Reply */ BYTE data1; /* depends on reply type */ - CARD16 sequenceNumber B16; /* of last request received by server */ - CARD32 length B32; /* 4 byte quantities beyond size of GenericReply */ - CARD32 data00 B32; - CARD32 data01 B32; - CARD32 data02 B32; - CARD32 data03 B32; - CARD32 data04 B32; - CARD32 data05 B32; + CARD16 sequenceNumber; /* of last request received by server */ + CARD32 length; /* 4 byte quantities beyond size of GenericReply */ + CARD32 data00; + CARD32 data01; + CARD32 data02; + CARD32 data03; + CARD32 data04; + CARD32 data05; } xGenericReply; /* Individual reply formats. */ @@ -440,134 +440,134 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 backingStore; - CARD16 sequenceNumber B16; - CARD32 length B32; /* NOT 0; this is an extra-large reply */ - VisualID visualID B32; + CARD16 sequenceNumber; + CARD32 length; /* NOT 0; this is an extra-large reply */ + VisualID visualID; #if defined(__cplusplus) || defined(c_plusplus) - CARD16 c_class B16; + CARD16 c_class; #else - CARD16 class B16; + CARD16 class; #endif CARD8 bitGravity; CARD8 winGravity; - CARD32 backingBitPlanes B32; - CARD32 backingPixel B32; + CARD32 backingBitPlanes; + CARD32 backingPixel; BOOL saveUnder; BOOL mapInstalled; CARD8 mapState; BOOL override; - Colormap colormap B32; - CARD32 allEventMasks B32; - CARD32 yourEventMask B32; - CARD16 doNotPropagateMask B16; - CARD16 pad B16; + Colormap colormap; + CARD32 allEventMasks; + CARD32 yourEventMask; + CARD16 doNotPropagateMask; + CARD16 pad; } xGetWindowAttributesReply; typedef struct { BYTE type; /* X_Reply */ CARD8 depth; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - Window root B32; - INT16 x B16, y B16; - CARD16 width B16, height B16; - CARD16 borderWidth B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + Window root; + INT16 x, y; + CARD16 width, height; + CARD16 borderWidth; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; } xGetGeometryReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - Window root B32, parent B32; - CARD16 nChildren B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + Window root, parent; + CARD16 nChildren; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xQueryTreeReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - Atom atom B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + Atom atom; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xInternAtomReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* of additional bytes */ - CARD16 nameLength B16; /* # of characters in name */ - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; /* of additional bytes */ + CARD16 nameLength; /* # of characters in name */ + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xGetAtomNameReply; typedef struct { BYTE type; /* X_Reply */ CARD8 format; - CARD16 sequenceNumber B16; - CARD32 length B32; /* of additional bytes */ - Atom propertyType B32; - CARD32 bytesAfter B32; - CARD32 nItems B32; /* # of 8, 16, or 32-bit entities in reply */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; /* of additional bytes */ + Atom propertyType; + CARD32 bytesAfter; + CARD32 nItems; /* # of 8, 16, or 32-bit entities in reply */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xGetPropertyReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nProperties B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nProperties; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xListPropertiesReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - Window owner B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + Window owner; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGetSelectionOwnerReply; typedef struct { BYTE type; /* X_Reply */ BYTE status; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGrabPointerReply; typedef xGrabPointerReply xGrabKeyboardReply; @@ -575,59 +575,59 @@ typedef xGrabPointerReply xGrabKeyboardReply; typedef struct { BYTE type; /* X_Reply */ BOOL sameScreen; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - Window root B32, child B32; - INT16 rootX B16, rootY B16, winX B16, winY B16; - CARD16 mask B16; - CARD16 pad1 B16; - CARD32 pad B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + Window root, child; + INT16 rootX, rootY, winX, winY; + CARD16 mask; + CARD16 pad1; + CARD32 pad; } xQueryPointerReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 nEvents B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 nEvents; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGetMotionEventsReply; typedef struct { BYTE type; /* X_Reply */ BOOL sameScreen; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - Window child B32; - INT16 dstX B16, dstY B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + Window child; + INT16 dstX, dstY; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xTranslateCoordsReply; typedef struct { BYTE type; /* X_Reply */ CARD8 revertTo; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - Window focus B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + Window focus; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xGetInputFocusReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 2, NOT 0; this is an extra-large reply */ + CARD16 sequenceNumber; + CARD32 length; /* 2, NOT 0; this is an extra-large reply */ BYTE map[32]; } xQueryKeymapReply; @@ -635,238 +635,238 @@ typedef struct { typedef struct _xQueryFontReply { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* definitely > 0, even if "nCharInfos" is 0 */ - xCharInfo minBounds; - CARD32 walign1 B32; - xCharInfo maxBounds; - CARD32 walign2 B32; - CARD16 minCharOrByte2 B16, maxCharOrByte2 B16; - CARD16 defaultChar B16; - CARD16 nFontProps B16; /* followed by this many xFontProp structures */ + CARD16 sequenceNumber; + CARD32 length; /* definitely > 0, even if "nCharInfos" is 0 */ + xCharInfo minBounds; + CARD32 walign1; + xCharInfo maxBounds; + CARD32 walign2; + CARD16 minCharOrByte2, maxCharOrByte2; + CARD16 defaultChar; + CARD16 nFontProps; /* followed by this many xFontProp structures */ CARD8 drawDirection; CARD8 minByte1, maxByte1; BOOL allCharsExist; - INT16 fontAscent B16, fontDescent B16; - CARD32 nCharInfos B32; /* followed by this many xCharInfo structures */ + INT16 fontAscent, fontDescent; + CARD32 nCharInfos; /* followed by this many xCharInfo structures */ } xQueryFontReply; typedef struct { BYTE type; /* X_Reply */ CARD8 drawDirection; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - INT16 fontAscent B16, fontDescent B16; - INT16 overallAscent B16, overallDescent B16; - INT32 overallWidth B32, overallLeft B32, overallRight B32; - CARD32 pad B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + INT16 fontAscent, fontDescent; + INT16 overallAscent, overallDescent; + INT32 overallWidth, overallLeft, overallRight; + CARD32 pad; } xQueryTextExtentsReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nFonts B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nFonts; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xListFontsReply; /* Warning: this MUST match (up to component renaming) xQueryFontReply */ typedef struct { BYTE type; /* X_Reply */ CARD8 nameLength; /* 0 indicates end-of-reply-sequence */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* definitely > 0, even if "nameLength" is 0 */ - xCharInfo minBounds; - CARD32 walign1 B32; - xCharInfo maxBounds; - CARD32 walign2 B32; - CARD16 minCharOrByte2 B16, maxCharOrByte2 B16; - CARD16 defaultChar B16; - CARD16 nFontProps B16; /* followed by this many xFontProp structures */ + CARD16 sequenceNumber; + CARD32 length; /* definitely > 0, even if "nameLength" is 0 */ + xCharInfo minBounds; + CARD32 walign1; + xCharInfo maxBounds; + CARD32 walign2; + CARD16 minCharOrByte2, maxCharOrByte2; + CARD16 defaultChar; + CARD16 nFontProps; /* followed by this many xFontProp structures */ CARD8 drawDirection; CARD8 minByte1, maxByte1; BOOL allCharsExist; - INT16 fontAscent B16, fontDescent B16; - CARD32 nReplies B32; /* hint as to how many more replies might be coming */ + INT16 fontAscent, fontDescent; + CARD32 nReplies; /* hint as to how many more replies might be coming */ } xListFontsWithInfoReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nPaths B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nPaths; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xGetFontPathReply; typedef struct { BYTE type; /* X_Reply */ CARD8 depth; - CARD16 sequenceNumber B16; - CARD32 length B32; - VisualID visual B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + VisualID visual; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xGetImageReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nColormaps B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nColormaps; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xListInstalledColormapsReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD16 red B16, green B16, blue B16; - CARD16 pad2 B16; - CARD32 pixel B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD16 red, green, blue; + CARD16 pad2; + CARD32 pixel; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xAllocColorReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD32 pixel B32; - CARD16 exactRed B16, exactGreen B16, exactBlue B16; - CARD16 screenRed B16, screenGreen B16, screenBlue B16; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD32 pixel; + CARD16 exactRed, exactGreen, exactBlue; + CARD16 screenRed, screenGreen, screenBlue; + CARD32 pad2; + CARD32 pad3; } xAllocNamedColorReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nPixels B16, nMasks B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nPixels, nMasks; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xAllocColorCellsReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nPixels B16; - CARD16 pad2 B16; - CARD32 redMask B32, greenMask B32, blueMask B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nPixels; + CARD16 pad2; + CARD32 redMask, greenMask, blueMask; + CARD32 pad3; + CARD32 pad4; } xAllocColorPlanesReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nColors B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nColors; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xQueryColorsReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD16 exactRed B16, exactGreen B16, exactBlue B16; - CARD16 screenRed B16, screenGreen B16, screenBlue B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD16 exactRed, exactGreen, exactBlue; + CARD16 screenRed, screenGreen, screenBlue; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xLookupColorReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD16 width B16, height B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD16 width, height; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xQueryBestSizeReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ + CARD16 sequenceNumber; + CARD32 length; /* 0 */ BOOL present; CARD8 major_opcode; CARD8 first_event; CARD8 first_error; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xQueryExtensionReply; typedef struct { BYTE type; /* X_Reply */ CARD8 nExtensions; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xListExtensionsReply; typedef struct { BYTE type; /* X_Reply */ CARD8 success; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xSetMappingReply; typedef xSetMappingReply xSetPointerMappingReply; typedef xSetMappingReply xSetModifierMappingReply; @@ -874,95 +874,95 @@ typedef xSetMappingReply xSetModifierMappingReply; typedef struct { BYTE type; /* X_Reply */ CARD8 nElts; /* how many elements does the map have */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xGetPointerMappingReply; typedef struct { BYTE type; CARD8 keySymsPerKeyCode; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; -} xGetKeyboardMappingReply; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; +} xGetKeyboardMappingReply; typedef struct { BYTE type; CARD8 numKeyPerModifier; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGetModifierMappingReply; typedef struct { BYTE type; /* X_Reply */ BOOL globalAutoRepeat; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 5 */ - CARD32 ledMask B32; + CARD16 sequenceNumber; + CARD32 length; /* 5 */ + CARD32 ledMask; CARD8 keyClickPercent, bellPercent; - CARD16 bellPitch B16, bellDuration B16; - CARD16 pad B16; + CARD16 bellPitch, bellDuration; + CARD16 pad; BYTE map[32]; /* bit masks start here */ } xGetKeyboardControlReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD16 accelNumerator B16, accelDenominator B16; - CARD16 threshold B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD16 accelNumerator, accelDenominator; + CARD16 threshold; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGetPointerControlReply; typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD16 timeout B16, interval B16; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD16 timeout, interval; BOOL preferBlanking; BOOL allowExposures; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGetScreenSaverReply; typedef struct { BYTE type; /* X_Reply */ BOOL enabled; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nHosts B16; - CARD16 pad1 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nHosts; + CARD16 pad1; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xListHostsReply; @@ -970,22 +970,22 @@ typedef struct { /***************************************************************** * Xerror - * All errors are 32 bytes + * All errors are 32 bytes *****************************************************************/ typedef struct { BYTE type; /* X_Error */ BYTE errorCode; - CARD16 sequenceNumber B16; /* the nth request from this client */ - CARD32 resourceID B32; - CARD16 minorCode B16; + CARD16 sequenceNumber; /* the nth request from this client */ + CARD32 resourceID; + CARD16 minorCode; CARD8 majorCode; BYTE pad1; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xError; /***************************************************************** @@ -998,68 +998,68 @@ typedef struct _xEvent { struct { BYTE type; BYTE detail; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; } u; struct { - CARD32 pad00 B32; - Time time B32; - Window root B32, event B32, child B32; - INT16 rootX B16, rootY B16, eventX B16, eventY B16; - KeyButMask state B16; - BOOL sameScreen; + CARD32 pad00; + Time time; + Window root, event, child; + INT16 rootX, rootY, eventX, eventY; + KeyButMask state; + BOOL sameScreen; BYTE pad1; } keyButtonPointer; struct { - CARD32 pad00 B32; - Time time B32; - Window root B32, event B32, child B32; - INT16 rootX B16, rootY B16, eventX B16, eventY B16; - KeyButMask state B16; + CARD32 pad00; + Time time; + Window root, event, child; + INT16 rootX, rootY, eventX, eventY; + KeyButMask state; BYTE mode; /* really XMode */ BYTE flags; /* sameScreen and focus booleans, packed together */ #define ELFlagFocus (1<<0) #define ELFlagSameScreen (1<<1) } enterLeave; struct { - CARD32 pad00 B32; - Window window B32; + CARD32 pad00; + Window window; BYTE mode; /* really XMode */ BYTE pad1, pad2, pad3; } focus; struct { - CARD32 pad00 B32; - Window window B32; - CARD16 x B16, y B16, width B16, height B16; - CARD16 count B16; - CARD16 pad2 B16; + CARD32 pad00; + Window window; + CARD16 x, y, width, height; + CARD16 count; + CARD16 pad2; } expose; struct { - CARD32 pad00 B32; - Drawable drawable B32; - CARD16 x B16, y B16, width B16, height B16; - CARD16 minorEvent B16; - CARD16 count B16; + CARD32 pad00; + Drawable drawable; + CARD16 x, y, width, height; + CARD16 minorEvent; + CARD16 count; BYTE majorEvent; BYTE pad1, pad2, pad3; } graphicsExposure; struct { - CARD32 pad00 B32; - Drawable drawable B32; - CARD16 minorEvent B16; + CARD32 pad00; + Drawable drawable; + CARD16 minorEvent; BYTE majorEvent; BYTE bpad; } noExposure; struct { - CARD32 pad00 B32; - Window window B32; + CARD32 pad00; + Window window; CARD8 state; BYTE pad1, pad2, pad3; } visibility; struct { - CARD32 pad00 B32; - Window parent B32, window B32; - INT16 x B16, y B16; - CARD16 width B16, height B16, borderWidth B16; + CARD32 pad00; + Window parent, window; + INT16 x, y; + CARD16 width, height, borderWidth; BOOL override; BYTE bpad; } createNotify; @@ -1072,98 +1072,98 @@ typedef struct _xEvent { * the same offset for the event window. */ struct { - CARD32 pad00 B32; - Window event B32, window B32; + CARD32 pad00; + Window event, window; } destroyNotify; struct { - CARD32 pad00 B32; - Window event B32, window B32; + CARD32 pad00; + Window event, window; BOOL fromConfigure; BYTE pad1, pad2, pad3; } unmapNotify; struct { - CARD32 pad00 B32; - Window event B32, window B32; + CARD32 pad00; + Window event, window; BOOL override; BYTE pad1, pad2, pad3; } mapNotify; struct { - CARD32 pad00 B32; - Window parent B32, window B32; + CARD32 pad00; + Window parent, window; } mapRequest; struct { - CARD32 pad00 B32; - Window event B32, window B32, parent B32; - INT16 x B16, y B16; + CARD32 pad00; + Window event, window, parent; + INT16 x, y; BOOL override; BYTE pad1, pad2, pad3; } reparent; struct { - CARD32 pad00 B32; - Window event B32, window B32, aboveSibling B32; - INT16 x B16, y B16; - CARD16 width B16, height B16, borderWidth B16; - BOOL override; + CARD32 pad00; + Window event, window, aboveSibling; + INT16 x, y; + CARD16 width, height, borderWidth; + BOOL override; BYTE bpad; } configureNotify; struct { - CARD32 pad00 B32; - Window parent B32, window B32, sibling B32; - INT16 x B16, y B16; - CARD16 width B16, height B16, borderWidth B16; - CARD16 valueMask B16; - CARD32 pad1 B32; + CARD32 pad00; + Window parent, window, sibling; + INT16 x, y; + CARD16 width, height, borderWidth; + CARD16 valueMask; + CARD32 pad1; } configureRequest; struct { - CARD32 pad00 B32; - Window event B32, window B32; - INT16 x B16, y B16; - CARD32 pad1 B32, pad2 B32, pad3 B32, pad4 B32; + CARD32 pad00; + Window event, window; + INT16 x, y; + CARD32 pad1, pad2, pad3, pad4; } gravity; struct { - CARD32 pad00 B32; - Window window B32; - CARD16 width B16, height B16; + CARD32 pad00; + Window window; + CARD16 width, height; } resizeRequest; struct { /* The event field in the circulate record is really the parent when this is used as a CirculateRequest instead of a CirculateNotify */ - CARD32 pad00 B32; - Window event B32, window B32, parent B32; + CARD32 pad00; + Window event, window, parent; BYTE place; /* Top or Bottom */ BYTE pad1, pad2, pad3; } circulate; struct { - CARD32 pad00 B32; - Window window B32; - Atom atom B32; - Time time B32; + CARD32 pad00; + Window window; + Atom atom; + Time time; BYTE state; /* NewValue or Deleted */ BYTE pad1; - CARD16 pad2 B16; + CARD16 pad2; } property; struct { - CARD32 pad00 B32; - Time time B32; - Window window B32; - Atom atom B32; + CARD32 pad00; + Time time; + Window window; + Atom atom; } selectionClear; struct { - CARD32 pad00 B32; - Time time B32; - Window owner B32, requestor B32; - Atom selection B32, target B32, property B32; + CARD32 pad00; + Time time; + Window owner, requestor; + Atom selection, target, property; } selectionRequest; struct { - CARD32 pad00 B32; - Time time B32; - Window requestor B32; - Atom selection B32, target B32, property B32; + CARD32 pad00; + Time time; + Window requestor; + Atom selection, target, property; } selectionNotify; struct { - CARD32 pad00 B32; - Window window B32; - Colormap colormap B32; + CARD32 pad00; + Window window; + Colormap colormap; #if defined(__cplusplus) || defined(c_plusplus) BOOL c_new; #else @@ -1173,42 +1173,42 @@ typedef struct _xEvent { BYTE pad1, pad2; } colormap; struct { - CARD32 pad00 B32; + CARD32 pad00; CARD8 request; KeyCode firstKeyCode; CARD8 count; BYTE pad1; } mappingNotify; struct { - CARD32 pad00 B32; - Window window B32; + CARD32 pad00; + Window window; union { struct { - Atom type B32; - INT32 longs0 B32; - INT32 longs1 B32; - INT32 longs2 B32; - INT32 longs3 B32; - INT32 longs4 B32; + Atom type; + INT32 longs0; + INT32 longs1; + INT32 longs2; + INT32 longs3; + INT32 longs4; } l; struct { - Atom type B32; - INT16 shorts0 B16; - INT16 shorts1 B16; - INT16 shorts2 B16; - INT16 shorts3 B16; - INT16 shorts4 B16; - INT16 shorts5 B16; - INT16 shorts6 B16; - INT16 shorts7 B16; - INT16 shorts8 B16; - INT16 shorts9 B16; + Atom type; + INT16 shorts0; + INT16 shorts1; + INT16 shorts2; + INT16 shorts3; + INT16 shorts4; + INT16 shorts5; + INT16 shorts6; + INT16 shorts7; + INT16 shorts8; + INT16 shorts9; } s; struct { - Atom type B32; + Atom type; INT8 bytes[20]; } b; - } u; + } u; } clientMessage; } u; } xEvent; @@ -1216,31 +1216,31 @@ typedef struct _xEvent { /********************************************************* * * Generic event - * + * * Those events are not part of the core protocol spec and can be used by * various extensions. * type is always GenericEvent * extension is the minor opcode of the extension the event belongs to. - * evtype is the actual event type, unique __per extension__. + * evtype is the actual event type, unique __per extension__. * * GenericEvents can be longer than 32 bytes, with the length field - * specifying the number of 4 byte blocks after the first 32 bytes. + * specifying the number of 4 byte blocks after the first 32 bytes. * * */ -typedef struct +typedef struct { BYTE type; CARD8 extension; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 evtype B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 evtype; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xGenericEvent; @@ -1258,7 +1258,7 @@ typedef struct { /* XReply is the union of all the replies above whose "fixed part" fits in 32 bytes. It does NOT include GetWindowAttributesReply, -QueryFontReply, QueryKeymapReply, or GetKeyboardControlReply +QueryFontReply, QueryKeymapReply, or GetKeyboardControlReply ListFontsWithInfoReply */ typedef union { @@ -1314,104 +1314,104 @@ typedef union { typedef struct _xReq { CARD8 reqType; CARD8 data; /* meaning depends on request type */ - CARD16 length B16; /* length in 4 bytes quantities + CARD16 length; /* length in 4 bytes quantities of whole request, including this header */ } xReq; /***************************************************************** - * structures that follow request. + * structures that follow request. *****************************************************************/ -/* ResourceReq is used for any request which has a resource ID +/* ResourceReq is used for any request which has a resource ID (or Atom or Time) as its one and only argument. */ typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - CARD32 id B32; /* a Window, Drawable, Font, GContext, Pixmap, etc. */ + CARD16 length; + CARD32 id; /* a Window, Drawable, Font, GContext, Pixmap, etc. */ } xResourceReq; typedef struct { CARD8 reqType; CARD8 depth; - CARD16 length B16; - Window wid B32, parent B32; - INT16 x B16, y B16; - CARD16 width B16, height B16, borderWidth B16; + CARD16 length; + Window wid, parent; + INT16 x, y; + CARD16 width, height, borderWidth; #if defined(__cplusplus) || defined(c_plusplus) - CARD16 c_class B16; + CARD16 c_class; #else - CARD16 class B16; + CARD16 class; #endif - VisualID visual B32; - CARD32 mask B32; + VisualID visual; + CARD32 mask; } xCreateWindowReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window window B32; - CARD32 valueMask B32; + CARD16 length; + Window window; + CARD32 valueMask; } xChangeWindowAttributesReq; typedef struct { CARD8 reqType; BYTE mode; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xChangeSaveSetReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window window B32, parent B32; - INT16 x B16, y B16; + CARD16 length; + Window window, parent; + INT16 x, y; } xReparentWindowReq; typedef struct { CARD8 reqType; CARD8 pad; - CARD16 length B16; - Window window B32; - CARD16 mask B16; - CARD16 pad2 B16; + CARD16 length; + Window window; + CARD16 mask; + CARD16 pad2; } xConfigureWindowReq; typedef struct { CARD8 reqType; CARD8 direction; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xCirculateWindowReq; typedef struct { /* followed by padded string */ CARD8 reqType; BOOL onlyIfExists; - CARD16 length B16; - CARD16 nbytes B16; /* number of bytes in string */ - CARD16 pad B16; + CARD16 length; + CARD16 nbytes; /* number of bytes in string */ + CARD16 pad; } xInternAtomReq; typedef struct { CARD8 reqType; CARD8 mode; - CARD16 length B16; - Window window B32; - Atom property B32, type B32; + CARD16 length; + Window window; + Atom property, type; CARD8 format; BYTE pad[3]; - CARD32 nUnits B32; /* length of stuff following, depends on format */ + CARD32 nUnits; /* length of stuff following, depends on format */ } xChangePropertyReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window window B32; - Atom property B32; + CARD16 length; + Window window; + Atom property; } xDeletePropertyReq; typedef struct { @@ -1421,178 +1421,178 @@ typedef struct { #else BOOL delete; #endif - CARD16 length B16; - Window window B32; - Atom property B32, type B32; - CARD32 longOffset B32; - CARD32 longLength B32; + CARD16 length; + Window window; + Atom property, type; + CARD32 longOffset; + CARD32 longLength; } xGetPropertyReq; - + typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window window B32; - Atom selection B32; - Time time B32; + CARD16 length; + Window window; + Atom selection; + Time time; } xSetSelectionOwnerReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window requestor B32; - Atom selection B32, target B32, property B32; - Time time B32; + CARD16 length; + Window requestor; + Atom selection, target, property; + Time time; } xConvertSelectionReq; typedef struct { CARD8 reqType; BOOL propagate; - CARD16 length B16; - Window destination B32; - CARD32 eventMask B32; + CARD16 length; + Window destination; + CARD32 eventMask; xEvent event; } xSendEventReq; typedef struct { CARD8 reqType; BOOL ownerEvents; - CARD16 length B16; - Window grabWindow B32; - CARD16 eventMask B16; + CARD16 length; + Window grabWindow; + CARD16 eventMask; BYTE pointerMode, keyboardMode; - Window confineTo B32; - Cursor cursor B32; - Time time B32; + Window confineTo; + Cursor cursor; + Time time; } xGrabPointerReq; typedef struct { CARD8 reqType; BOOL ownerEvents; - CARD16 length B16; - Window grabWindow B32; - CARD16 eventMask B16; + CARD16 length; + Window grabWindow; + CARD16 eventMask; BYTE pointerMode, keyboardMode; - Window confineTo B32; - Cursor cursor B32; + Window confineTo; + Cursor cursor; CARD8 button; BYTE pad; - CARD16 modifiers B16; + CARD16 modifiers; } xGrabButtonReq; typedef struct { CARD8 reqType; CARD8 button; - CARD16 length B16; - Window grabWindow B32; - CARD16 modifiers B16; - CARD16 pad B16; + CARD16 length; + Window grabWindow; + CARD16 modifiers; + CARD16 pad; } xUngrabButtonReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Cursor cursor B32; - Time time B32; - CARD16 eventMask B16; - CARD16 pad2 B16; + CARD16 length; + Cursor cursor; + Time time; + CARD16 eventMask; + CARD16 pad2; } xChangeActivePointerGrabReq; typedef struct { CARD8 reqType; BOOL ownerEvents; - CARD16 length B16; - Window grabWindow B32; - Time time B32; - BYTE pointerMode, keyboardMode; - CARD16 pad B16; + CARD16 length; + Window grabWindow; + Time time; + BYTE pointerMode, keyboardMode; + CARD16 pad; } xGrabKeyboardReq; typedef struct { CARD8 reqType; BOOL ownerEvents; - CARD16 length B16; - Window grabWindow B32; - CARD16 modifiers B16; + CARD16 length; + Window grabWindow; + CARD16 modifiers; CARD8 key; - BYTE pointerMode, keyboardMode; + BYTE pointerMode, keyboardMode; BYTE pad1, pad2, pad3; } xGrabKeyReq; typedef struct { CARD8 reqType; CARD8 key; - CARD16 length B16; - Window grabWindow B32; - CARD16 modifiers B16; - CARD16 pad B16; + CARD16 length; + Window grabWindow; + CARD16 modifiers; + CARD16 pad; } xUngrabKeyReq; typedef struct { CARD8 reqType; CARD8 mode; - CARD16 length B16; - Time time B32; + CARD16 length; + Time time; } xAllowEventsReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window window B32; - Time start B32, stop B32; + CARD16 length; + Window window; + Time start, stop; } xGetMotionEventsReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window srcWid B32, dstWid B32; - INT16 srcX B16, srcY B16; + CARD16 length; + Window srcWid, dstWid; + INT16 srcX, srcY; } xTranslateCoordsReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Window srcWid B32, dstWid B32; - INT16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; - INT16 dstX B16, dstY B16; + CARD16 length; + Window srcWid, dstWid; + INT16 srcX, srcY; + CARD16 srcWidth, srcHeight; + INT16 dstX, dstY; } xWarpPointerReq; typedef struct { CARD8 reqType; CARD8 revertTo; - CARD16 length B16; - Window focus B32; - Time time B32; + CARD16 length; + Window focus; + Time time; } xSetInputFocusReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Font fid B32; - CARD16 nbytes B16; + CARD16 length; + Font fid; + CARD16 nbytes; BYTE pad1, pad2; /* string follows on word boundary */ } xOpenFontReq; typedef struct { CARD8 reqType; BOOL oddLength; - CARD16 length B16; - Font fid B32; + CARD16 length; + Font fid; } xQueryTextExtentsReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - CARD16 maxNames B16; - CARD16 nbytes B16; /* followed immediately by string bytes */ + CARD16 length; + CARD16 maxNames; + CARD16 nbytes; /* followed immediately by string bytes */ } xListFontsReq; typedef xListFontsReq xListFontsWithInfoReq; @@ -1600,99 +1600,99 @@ typedef xListFontsReq xListFontsWithInfoReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - CARD16 nFonts B16; + CARD16 length; + CARD16 nFonts; BYTE pad1, pad2; /* LISTofSTRING8 follows on word boundary */ } xSetFontPathReq; typedef struct { CARD8 reqType; CARD8 depth; - CARD16 length B16; - Pixmap pid B32; - Drawable drawable B32; - CARD16 width B16, height B16; + CARD16 length; + Pixmap pid; + Drawable drawable; + CARD16 width, height; } xCreatePixmapReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - GContext gc B32; - Drawable drawable B32; - CARD32 mask B32; + CARD16 length; + GContext gc; + Drawable drawable; + CARD32 mask; } xCreateGCReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - GContext gc B32; - CARD32 mask B32; -} xChangeGCReq; + CARD16 length; + GContext gc; + CARD32 mask; +} xChangeGCReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - GContext srcGC B32, dstGC B32; - CARD32 mask B32; -} xCopyGCReq; + CARD16 length; + GContext srcGC, dstGC; + CARD32 mask; +} xCopyGCReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - GContext gc B32; - CARD16 dashOffset B16; - CARD16 nDashes B16; /* length LISTofCARD8 of values following */ -} xSetDashesReq; + CARD16 length; + GContext gc; + CARD16 dashOffset; + CARD16 nDashes; /* length LISTofCARD8 of values following */ +} xSetDashesReq; typedef struct { CARD8 reqType; BYTE ordering; - CARD16 length B16; - GContext gc B32; - INT16 xOrigin B16, yOrigin B16; -} xSetClipRectanglesReq; + CARD16 length; + GContext gc; + INT16 xOrigin, yOrigin; +} xSetClipRectanglesReq; typedef struct { CARD8 reqType; BOOL exposures; - CARD16 length B16; - Window window B32; - INT16 x B16, y B16; - CARD16 width B16, height B16; + CARD16 length; + Window window; + INT16 x, y; + CARD16 width, height; } xClearAreaReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Drawable srcDrawable B32, dstDrawable B32; - GContext gc B32; - INT16 srcX B16, srcY B16, dstX B16, dstY B16; - CARD16 width B16, height B16; -} xCopyAreaReq; + CARD16 length; + Drawable srcDrawable, dstDrawable; + GContext gc; + INT16 srcX, srcY, dstX, dstY; + CARD16 width, height; +} xCopyAreaReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Drawable srcDrawable B32, dstDrawable B32; - GContext gc B32; - INT16 srcX B16, srcY B16, dstX B16, dstY B16; - CARD16 width B16, height B16; - CARD32 bitPlane B32; -} xCopyPlaneReq; + CARD16 length; + Drawable srcDrawable, dstDrawable; + GContext gc; + INT16 srcX, srcY, dstX, dstY; + CARD16 width, height; + CARD32 bitPlane; +} xCopyPlaneReq; typedef struct { CARD8 reqType; BYTE coordMode; - CARD16 length B16; - Drawable drawable B32; - GContext gc B32; -} xPolyPointReq; + CARD16 length; + Drawable drawable; + GContext gc; +} xPolyPointReq; typedef xPolyPointReq xPolyLineReq; /* same request structure */ @@ -1701,10 +1701,10 @@ typedef xPolyPointReq xPolyLineReq; /* same request structure */ typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Drawable drawable B32; - GContext gc B32; -} xPolySegmentReq; + CARD16 length; + Drawable drawable; + GContext gc; +} xPolySegmentReq; typedef xPolySegmentReq xPolyArcReq; typedef xPolySegmentReq xPolyRectangleReq; @@ -1714,48 +1714,48 @@ typedef xPolySegmentReq xPolyFillArcReq; typedef struct _FillPolyReq { CARD8 reqType; BYTE pad; - CARD16 length B16; - Drawable drawable B32; - GContext gc B32; + CARD16 length; + Drawable drawable; + GContext gc; BYTE shape; BYTE coordMode; - CARD16 pad1 B16; -} xFillPolyReq; + CARD16 pad1; +} xFillPolyReq; typedef struct _PutImageReq { CARD8 reqType; CARD8 format; - CARD16 length B16; - Drawable drawable B32; - GContext gc B32; - CARD16 width B16, height B16; - INT16 dstX B16, dstY B16; + CARD16 length; + Drawable drawable; + GContext gc; + CARD16 width, height; + INT16 dstX, dstY; CARD8 leftPad; CARD8 depth; - CARD16 pad B16; -} xPutImageReq; + CARD16 pad; +} xPutImageReq; typedef struct { CARD8 reqType; CARD8 format; - CARD16 length B16; - Drawable drawable B32; - INT16 x B16, y B16; - CARD16 width B16, height B16; - CARD32 planeMask B32; -} xGetImageReq; + CARD16 length; + Drawable drawable; + INT16 x, y; + CARD16 width, height; + CARD32 planeMask; +} xGetImageReq; /* the following used by PolyText8 and PolyText16 */ typedef struct { CARD8 reqType; CARD8 pad; - CARD16 length B16; - Drawable drawable B32; - GContext gc B32; - INT16 x B16, y B16; /* items (xTextElt) start after struct */ -} xPolyTextReq; + CARD16 length; + Drawable drawable; + GContext gc; + INT16 x, y; /* items (xTextElt) start after struct */ +} xPolyTextReq; typedef xPolyTextReq xPolyText8Req; typedef xPolyTextReq xPolyText16Req; @@ -1763,11 +1763,11 @@ typedef xPolyTextReq xPolyText16Req; typedef struct { CARD8 reqType; BYTE nChars; - CARD16 length B16; - Drawable drawable B32; - GContext gc B32; - INT16 x B16, y B16; -} xImageTextReq; + CARD16 length; + Drawable drawable; + GContext gc; + INT16 x, y; +} xImageTextReq; typedef xImageTextReq xImageText8Req; typedef xImageTextReq xImageText16Req; @@ -1775,125 +1775,125 @@ typedef xImageTextReq xImageText16Req; typedef struct { CARD8 reqType; BYTE alloc; - CARD16 length B16; - Colormap mid B32; - Window window B32; - VisualID visual B32; -} xCreateColormapReq; + CARD16 length; + Colormap mid; + Window window; + VisualID visual; +} xCreateColormapReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Colormap mid B32; - Colormap srcCmap B32; -} xCopyColormapAndFreeReq; + CARD16 length; + Colormap mid; + Colormap srcCmap; +} xCopyColormapAndFreeReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Colormap cmap B32; - CARD16 red B16, green B16, blue B16; - CARD16 pad2 B16; -} xAllocColorReq; + CARD16 length; + Colormap cmap; + CARD16 red, green, blue; + CARD16 pad2; +} xAllocColorReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Colormap cmap B32; - CARD16 nbytes B16; /* followed by structure */ + CARD16 length; + Colormap cmap; + CARD16 nbytes; /* followed by structure */ BYTE pad1, pad2; -} xAllocNamedColorReq; +} xAllocNamedColorReq; typedef struct { CARD8 reqType; BOOL contiguous; - CARD16 length B16; - Colormap cmap B32; - CARD16 colors B16, planes B16; -} xAllocColorCellsReq; + CARD16 length; + Colormap cmap; + CARD16 colors, planes; +} xAllocColorCellsReq; typedef struct { CARD8 reqType; BOOL contiguous; - CARD16 length B16; - Colormap cmap B32; - CARD16 colors B16, red B16, green B16, blue B16; -} xAllocColorPlanesReq; + CARD16 length; + Colormap cmap; + CARD16 colors, red, green, blue; +} xAllocColorPlanesReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Colormap cmap B32; - CARD32 planeMask B32; -} xFreeColorsReq; + CARD16 length; + Colormap cmap; + CARD32 planeMask; +} xFreeColorsReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Colormap cmap B32; -} xStoreColorsReq; + CARD16 length; + Colormap cmap; +} xStoreColorsReq; typedef struct { CARD8 reqType; CARD8 flags; /* DoRed, DoGreen, DoBlue, as in xColorItem */ - CARD16 length B16; - Colormap cmap B32; - CARD32 pixel B32; - CARD16 nbytes B16; /* number of name string bytes following structure */ + CARD16 length; + Colormap cmap; + CARD32 pixel; + CARD16 nbytes; /* number of name string bytes following structure */ BYTE pad1, pad2; } xStoreNamedColorReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Colormap cmap B32; -} xQueryColorsReq; + CARD16 length; + Colormap cmap; +} xQueryColorsReq; typedef struct { /* followed by string of length len */ CARD8 reqType; BYTE pad; - CARD16 length B16; - Colormap cmap B32; - CARD16 nbytes B16; /* number of string bytes following structure*/ + CARD16 length; + Colormap cmap; + CARD16 nbytes; /* number of string bytes following structure*/ BYTE pad1, pad2; -} xLookupColorReq; +} xLookupColorReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Cursor cid B32; - Pixmap source B32, mask B32; - CARD16 foreRed B16, foreGreen B16, foreBlue B16; - CARD16 backRed B16, backGreen B16, backBlue B16; - CARD16 x B16, y B16; -} xCreateCursorReq; + CARD16 length; + Cursor cid; + Pixmap source, mask; + CARD16 foreRed, foreGreen, foreBlue; + CARD16 backRed, backGreen, backBlue; + CARD16 x, y; +} xCreateCursorReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Cursor cid B32; - Font source B32, mask B32; - CARD16 sourceChar B16, maskChar B16; - CARD16 foreRed B16, foreGreen B16, foreBlue B16; - CARD16 backRed B16, backGreen B16, backBlue B16; -} xCreateGlyphCursorReq; + CARD16 length; + Cursor cid; + Font source, mask; + CARD16 sourceChar, maskChar; + CARD16 foreRed, foreGreen, foreBlue; + CARD16 backRed, backGreen, backBlue; +} xCreateGlyphCursorReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Cursor cursor B32; - CARD16 foreRed B16, foreGreen B16, foreBlue B16; - CARD16 backRed B16, backGreen B16, backBlue B16; -} xRecolorCursorReq; + CARD16 length; + Cursor cursor; + CARD16 foreRed, foreGreen, foreBlue; + CARD16 backRed, backGreen, backBlue; +} xRecolorCursorReq; typedef struct { CARD8 reqType; @@ -1902,99 +1902,99 @@ typedef struct { #else CARD8 class; #endif - CARD16 length B16; - Drawable drawable B32; - CARD16 width B16, height B16; -} xQueryBestSizeReq; + CARD16 length; + Drawable drawable; + CARD16 width, height; +} xQueryBestSizeReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - CARD16 nbytes B16; /* number of string bytes following structure */ + CARD16 length; + CARD16 nbytes; /* number of string bytes following structure */ BYTE pad1, pad2; } xQueryExtensionReq; typedef struct { CARD8 reqType; CARD8 numKeyPerModifier; - CARD16 length B16; + CARD16 length; } xSetModifierMappingReq; typedef struct { CARD8 reqType; - CARD8 nElts; /* how many elements in the map */ - CARD16 length B16; + CARD8 nElts; /* how many elements in the map */ + CARD16 length; } xSetPointerMappingReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; + CARD16 length; KeyCode firstKeyCode; CARD8 count; - CARD16 pad1 B16; -} xGetKeyboardMappingReq; + CARD16 pad1; +} xGetKeyboardMappingReq; typedef struct { CARD8 reqType; CARD8 keyCodes; - CARD16 length B16; + CARD16 length; KeyCode firstKeyCode; CARD8 keySymsPerKeyCode; - CARD16 pad1 B16; + CARD16 pad1; } xChangeKeyboardMappingReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - CARD32 mask B32; -} xChangeKeyboardControlReq; + CARD16 length; + CARD32 mask; +} xChangeKeyboardControlReq; typedef struct { CARD8 reqType; INT8 percent; /* -100 to 100 */ - CARD16 length B16; -} xBellReq; + CARD16 length; +} xBellReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - INT16 accelNum B16, accelDenum B16; - INT16 threshold B16; + CARD16 length; + INT16 accelNum, accelDenum; + INT16 threshold; BOOL doAccel, doThresh; -} xChangePointerControlReq; +} xChangePointerControlReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - INT16 timeout B16, interval B16; - BYTE preferBlank, allowExpose; - CARD16 pad2 B16; -} xSetScreenSaverReq; + CARD16 length; + INT16 timeout, interval; + BYTE preferBlank, allowExpose; + CARD16 pad2; +} xSetScreenSaverReq; typedef struct { CARD8 reqType; BYTE mode; - CARD16 length B16; + CARD16 length; CARD8 hostFamily; BYTE pad; - CARD16 hostLength B16; -} xChangeHostsReq; + CARD16 hostLength; +} xChangeHostsReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; + CARD16 length; } xListHostsReq; typedef struct { CARD8 reqType; BYTE mode; - CARD16 length B16; + CARD16 length; } xChangeModeReq; typedef xChangeModeReq xSetAccessControlReq; @@ -2004,12 +2004,12 @@ typedef xChangeModeReq xForceScreenSaverReq; typedef struct { /* followed by LIST of ATOM */ CARD8 reqType; BYTE pad; - CARD16 length B16; - Window window B32; - CARD16 nAtoms B16; - INT16 nPositions B16; + CARD16 length; + Window window; + CARD16 nAtoms; + INT16 nPositions; } xRotatePropertiesReq; - + /* Reply codes */ @@ -2019,119 +2019,119 @@ typedef struct { /* followed by LIST of ATOM */ /* Request codes */ -#define X_CreateWindow 1 -#define X_ChangeWindowAttributes 2 -#define X_GetWindowAttributes 3 +#define X_CreateWindow 1 +#define X_ChangeWindowAttributes 2 +#define X_GetWindowAttributes 3 #define X_DestroyWindow 4 -#define X_DestroySubwindows 5 +#define X_DestroySubwindows 5 #define X_ChangeSaveSet 6 #define X_ReparentWindow 7 #define X_MapWindow 8 #define X_MapSubwindows 9 #define X_UnmapWindow 10 -#define X_UnmapSubwindows 11 -#define X_ConfigureWindow 12 -#define X_CirculateWindow 13 +#define X_UnmapSubwindows 11 +#define X_ConfigureWindow 12 +#define X_CirculateWindow 13 #define X_GetGeometry 14 #define X_QueryTree 15 #define X_InternAtom 16 #define X_GetAtomName 17 -#define X_ChangeProperty 18 -#define X_DeleteProperty 19 +#define X_ChangeProperty 18 +#define X_DeleteProperty 19 #define X_GetProperty 20 -#define X_ListProperties 21 -#define X_SetSelectionOwner 22 -#define X_GetSelectionOwner 23 -#define X_ConvertSelection 24 +#define X_ListProperties 21 +#define X_SetSelectionOwner 22 +#define X_GetSelectionOwner 23 +#define X_ConvertSelection 24 #define X_SendEvent 25 #define X_GrabPointer 26 #define X_UngrabPointer 27 #define X_GrabButton 28 #define X_UngrabButton 29 -#define X_ChangeActivePointerGrab 30 +#define X_ChangeActivePointerGrab 30 #define X_GrabKeyboard 31 -#define X_UngrabKeyboard 32 +#define X_UngrabKeyboard 32 #define X_GrabKey 33 #define X_UngrabKey 34 -#define X_AllowEvents 35 -#define X_GrabServer 36 -#define X_UngrabServer 37 -#define X_QueryPointer 38 -#define X_GetMotionEvents 39 -#define X_TranslateCoords 40 -#define X_WarpPointer 41 -#define X_SetInputFocus 42 -#define X_GetInputFocus 43 -#define X_QueryKeymap 44 -#define X_OpenFont 45 -#define X_CloseFont 46 +#define X_AllowEvents 35 +#define X_GrabServer 36 +#define X_UngrabServer 37 +#define X_QueryPointer 38 +#define X_GetMotionEvents 39 +#define X_TranslateCoords 40 +#define X_WarpPointer 41 +#define X_SetInputFocus 42 +#define X_GetInputFocus 43 +#define X_QueryKeymap 44 +#define X_OpenFont 45 +#define X_CloseFont 46 #define X_QueryFont 47 -#define X_QueryTextExtents 48 -#define X_ListFonts 49 -#define X_ListFontsWithInfo 50 -#define X_SetFontPath 51 -#define X_GetFontPath 52 -#define X_CreatePixmap 53 -#define X_FreePixmap 54 -#define X_CreateGC 55 -#define X_ChangeGC 56 -#define X_CopyGC 57 -#define X_SetDashes 58 -#define X_SetClipRectangles 59 -#define X_FreeGC 60 -#define X_ClearArea 61 -#define X_CopyArea 62 -#define X_CopyPlane 63 -#define X_PolyPoint 64 -#define X_PolyLine 65 -#define X_PolySegment 66 -#define X_PolyRectangle 67 -#define X_PolyArc 68 -#define X_FillPoly 69 -#define X_PolyFillRectangle 70 -#define X_PolyFillArc 71 -#define X_PutImage 72 -#define X_GetImage 73 -#define X_PolyText8 74 -#define X_PolyText16 75 -#define X_ImageText8 76 -#define X_ImageText16 77 -#define X_CreateColormap 78 -#define X_FreeColormap 79 -#define X_CopyColormapAndFree 80 -#define X_InstallColormap 81 -#define X_UninstallColormap 82 -#define X_ListInstalledColormaps 83 -#define X_AllocColor 84 -#define X_AllocNamedColor 85 -#define X_AllocColorCells 86 -#define X_AllocColorPlanes 87 -#define X_FreeColors 88 -#define X_StoreColors 89 -#define X_StoreNamedColor 90 -#define X_QueryColors 91 -#define X_LookupColor 92 -#define X_CreateCursor 93 -#define X_CreateGlyphCursor 94 -#define X_FreeCursor 95 -#define X_RecolorCursor 96 -#define X_QueryBestSize 97 -#define X_QueryExtension 98 -#define X_ListExtensions 99 +#define X_QueryTextExtents 48 +#define X_ListFonts 49 +#define X_ListFontsWithInfo 50 +#define X_SetFontPath 51 +#define X_GetFontPath 52 +#define X_CreatePixmap 53 +#define X_FreePixmap 54 +#define X_CreateGC 55 +#define X_ChangeGC 56 +#define X_CopyGC 57 +#define X_SetDashes 58 +#define X_SetClipRectangles 59 +#define X_FreeGC 60 +#define X_ClearArea 61 +#define X_CopyArea 62 +#define X_CopyPlane 63 +#define X_PolyPoint 64 +#define X_PolyLine 65 +#define X_PolySegment 66 +#define X_PolyRectangle 67 +#define X_PolyArc 68 +#define X_FillPoly 69 +#define X_PolyFillRectangle 70 +#define X_PolyFillArc 71 +#define X_PutImage 72 +#define X_GetImage 73 +#define X_PolyText8 74 +#define X_PolyText16 75 +#define X_ImageText8 76 +#define X_ImageText16 77 +#define X_CreateColormap 78 +#define X_FreeColormap 79 +#define X_CopyColormapAndFree 80 +#define X_InstallColormap 81 +#define X_UninstallColormap 82 +#define X_ListInstalledColormaps 83 +#define X_AllocColor 84 +#define X_AllocNamedColor 85 +#define X_AllocColorCells 86 +#define X_AllocColorPlanes 87 +#define X_FreeColors 88 +#define X_StoreColors 89 +#define X_StoreNamedColor 90 +#define X_QueryColors 91 +#define X_LookupColor 92 +#define X_CreateCursor 93 +#define X_CreateGlyphCursor 94 +#define X_FreeCursor 95 +#define X_RecolorCursor 96 +#define X_QueryBestSize 97 +#define X_QueryExtension 98 +#define X_ListExtensions 99 #define X_ChangeKeyboardMapping 100 #define X_GetKeyboardMapping 101 -#define X_ChangeKeyboardControl 102 -#define X_GetKeyboardControl 103 +#define X_ChangeKeyboardControl 102 +#define X_GetKeyboardControl 103 #define X_Bell 104 #define X_ChangePointerControl 105 #define X_GetPointerControl 106 -#define X_SetScreenSaver 107 -#define X_GetScreenSaver 108 -#define X_ChangeHosts 109 -#define X_ListHosts 110 -#define X_SetAccessControl 111 +#define X_SetScreenSaver 107 +#define X_GetScreenSaver 108 +#define X_ChangeHosts 109 +#define X_ListHosts 110 +#define X_SetAccessControl 111 #define X_SetCloseDownMode 112 -#define X_KillClient 113 +#define X_KillClient 113 #define X_RotateProperties 114 #define X_ForceScreenSaver 115 #define X_SetPointerMapping 116 diff --git a/proto/xorgproto/include/X11/Xprotostr.h b/proto/xorgproto/include/X11/Xprotostr.h index a9e854d37..07d017de9 100644 --- a/proto/xorgproto/include/X11/Xprotostr.h +++ b/proto/xorgproto/include/X11/Xprotostr.h @@ -30,13 +30,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -52,26 +52,26 @@ SOFTWARE. /* Used by PolySegment */ typedef struct _xSegment { - INT16 x1 B16, y1 B16, x2 B16, y2 B16; + INT16 x1, y1, x2, y2; } xSegment; /* POINT */ typedef struct _xPoint { - INT16 x B16, y B16; + INT16 x, y; } xPoint; typedef struct _xRectangle { - INT16 x B16, y B16; - CARD16 width B16, height B16; + INT16 x, y; + CARD16 width, height; } xRectangle; /* ARC */ typedef struct _xArc { - INT16 x B16, y B16; - CARD16 width B16, height B16; - INT16 angle1 B16, angle2 B16; + INT16 x, y; + CARD16 width, height; + INT16 angle1, angle2; } xArc; #endif /* XPROTOSTRUCTS_H */ diff --git a/proto/xorgproto/include/X11/Xw32defs.h b/proto/xorgproto/include/X11/Xw32defs.h index b2e4b33ae..683b588dc 100644 --- a/proto/xorgproto/include/X11/Xw32defs.h +++ b/proto/xorgproto/include/X11/Xw32defs.h @@ -2,7 +2,7 @@ # define _XW32DEFS_H # ifdef __GNUC__ /* mingw is more close to unix than msvc */ -# if !defined(__daddr_t_defined) +# if !defined(__daddr_t_defined) typedef char *caddr_t; # endif # define lstat stat diff --git a/proto/xorgproto/include/X11/Xwinsock.h b/proto/xorgproto/include/X11/Xwinsock.h index a81dd7a25..624047dee 100644 --- a/proto/xorgproto/include/X11/Xwinsock.h +++ b/proto/xorgproto/include/X11/Xwinsock.h @@ -34,7 +34,7 @@ The Open Group. */ #undef _XFree86Server -#ifdef XFree86Server +#ifdef XFree86Server # define _XFree86Server # undef XFree86Server #endif diff --git a/proto/xorgproto/include/X11/ap_keysym.h b/proto/xorgproto/include/X11/ap_keysym.h index 9a1197117..76cbde2d0 100644 --- a/proto/xorgproto/include/X11/ap_keysym.h +++ b/proto/xorgproto/include/X11/ap_keysym.h @@ -13,11 +13,11 @@ Consortium not be used in advertising or publicity pertaining to distribution of the software without written prior permission. HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD -TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. Hewlett-Packard shall not be liable for errors -contained herein or direct, indirect, special, incidental or -consequential damages in connection with the furnishing, +TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. Hewlett-Packard shall not be liable for errors +contained herein or direct, indirect, special, incidental or +consequential damages in connection with the furnishing, performance, or use of this material. This software is not subject to any license of the American diff --git a/proto/xorgproto/include/X11/dri/xf86driproto.h b/proto/xorgproto/include/X11/dri/xf86driproto.h index 4b7146969..1202e9bfe 100644 --- a/proto/xorgproto/include/X11/dri/xf86driproto.h +++ b/proto/xorgproto/include/X11/dri/xf86driproto.h @@ -42,7 +42,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XF86DRINAME "XFree86-DRI" /* The DRI version number. This was originally set to be the same of the - * XFree86 version number. However, this version is really indepedent of + * XFree86 version number. However, this version is really independent of * the XFree86 version. * * Version History: @@ -57,214 +57,214 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. typedef struct _XF86DRIQueryVersion { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIQueryVersion */ - CARD16 length B16; + CARD16 length; } xXF86DRIQueryVersionReq; #define sz_xXF86DRIQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of DRI protocol */ - CARD16 minorVersion B16; /* minor version of DRI protocol */ - CARD32 patchVersion B32; /* patch version of DRI protocol */ - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of DRI protocol */ + CARD16 minorVersion; /* minor version of DRI protocol */ + CARD32 patchVersion; /* patch version of DRI protocol */ + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86DRIQueryVersionReply; #define sz_xXF86DRIQueryVersionReply 32 typedef struct _XF86DRIQueryDirectRenderingCapable { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* X_DRIQueryDirectRenderingCapable */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXF86DRIQueryDirectRenderingCapableReq; #define sz_xXF86DRIQueryDirectRenderingCapableReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL isCapable; BOOL pad2; BOOL pad3; BOOL pad4; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; - CARD32 pad8 B32; - CARD32 pad9 B32; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; + CARD32 pad8; + CARD32 pad9; } xXF86DRIQueryDirectRenderingCapableReply; #define sz_xXF86DRIQueryDirectRenderingCapableReply 32 typedef struct _XF86DRIOpenConnection { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIOpenConnection */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXF86DRIOpenConnectionReq; #define sz_xXF86DRIOpenConnectionReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hSAREALow B32; - CARD32 hSAREAHigh B32; - CARD32 busIdStringLength B32; - CARD32 pad6 B32; - CARD32 pad7 B32; - CARD32 pad8 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 hSAREALow; + CARD32 hSAREAHigh; + CARD32 busIdStringLength; + CARD32 pad6; + CARD32 pad7; + CARD32 pad8; } xXF86DRIOpenConnectionReply; #define sz_xXF86DRIOpenConnectionReply 32 typedef struct _XF86DRIAuthConnection { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRICloseConnection */ - CARD16 length B16; - CARD32 screen B32; - CARD32 magic B32; + CARD16 length; + CARD32 screen; + CARD32 magic; } xXF86DRIAuthConnectionReq; #define sz_xXF86DRIAuthConnectionReq 12 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 authenticated B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 authenticated; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86DRIAuthConnectionReply; #define zx_xXF86DRIAuthConnectionReply 32 typedef struct _XF86DRICloseConnection { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRICloseConnection */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXF86DRICloseConnectionReq; #define sz_xXF86DRICloseConnectionReq 8 typedef struct _XF86DRIGetClientDriverName { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIGetClientDriverName */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXF86DRIGetClientDriverNameReq; #define sz_xXF86DRIGetClientDriverNameReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 ddxDriverMajorVersion B32; - CARD32 ddxDriverMinorVersion B32; - CARD32 ddxDriverPatchVersion B32; - CARD32 clientDriverNameLength B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 ddxDriverMajorVersion; + CARD32 ddxDriverMinorVersion; + CARD32 ddxDriverPatchVersion; + CARD32 clientDriverNameLength; + CARD32 pad5; + CARD32 pad6; } xXF86DRIGetClientDriverNameReply; #define sz_xXF86DRIGetClientDriverNameReply 32 typedef struct _XF86DRICreateContext { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRICreateContext */ - CARD16 length B16; - CARD32 screen B32; - CARD32 visual B32; - CARD32 context B32; + CARD16 length; + CARD32 screen; + CARD32 visual; + CARD32 context; } xXF86DRICreateContextReq; #define sz_xXF86DRICreateContextReq 16 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hHWContext B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 hHWContext; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86DRICreateContextReply; #define sz_xXF86DRICreateContextReply 32 typedef struct _XF86DRIDestroyContext { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIDestroyContext */ - CARD16 length B16; - CARD32 screen B32; - CARD32 context B32; + CARD16 length; + CARD32 screen; + CARD32 context; } xXF86DRIDestroyContextReq; #define sz_xXF86DRIDestroyContextReq 12 typedef struct _XF86DRICreateDrawable { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRICreateDrawable */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; } xXF86DRICreateDrawableReq; #define sz_xXF86DRICreateDrawableReq 12 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hHWDrawable B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 hHWDrawable; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86DRICreateDrawableReply; #define sz_xXF86DRICreateDrawableReply 32 typedef struct _XF86DRIDestroyDrawable { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIDestroyDrawable */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; } xXF86DRIDestroyDrawableReq; #define sz_xXF86DRIDestroyDrawableReq 12 typedef struct _XF86DRIGetDrawableInfo { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIGetDrawableInfo */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; } xXF86DRIGetDrawableInfoReq; #define sz_xXF86DRIGetDrawableInfoReq 12 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 drawableTableIndex B32; - CARD32 drawableTableStamp B32; - INT16 drawableX B16; - INT16 drawableY B16; - INT16 drawableWidth B16; - INT16 drawableHeight B16; - CARD32 numClipRects B32; - INT16 backX B16; - INT16 backY B16; - CARD32 numBackClipRects B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 drawableTableIndex; + CARD32 drawableTableStamp; + INT16 drawableX; + INT16 drawableY; + INT16 drawableWidth; + INT16 drawableHeight; + CARD32 numClipRects; + INT16 backX; + INT16 backY; + CARD32 numBackClipRects; } xXF86DRIGetDrawableInfoReply; #define sz_xXF86DRIGetDrawableInfoReply 36 @@ -273,68 +273,68 @@ typedef struct { typedef struct _XF86DRIGetDeviceInfo { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIGetDeviceInfo */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXF86DRIGetDeviceInfoReq; #define sz_xXF86DRIGetDeviceInfoReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hFrameBufferLow B32; - CARD32 hFrameBufferHigh B32; - CARD32 framebufferOrigin B32; - CARD32 framebufferSize B32; - CARD32 framebufferStride B32; - CARD32 devPrivateSize B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 hFrameBufferLow; + CARD32 hFrameBufferHigh; + CARD32 framebufferOrigin; + CARD32 framebufferSize; + CARD32 framebufferStride; + CARD32 devPrivateSize; } xXF86DRIGetDeviceInfoReply; #define sz_xXF86DRIGetDeviceInfoReply 32 typedef struct _XF86DRIOpenFullScreen { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIOpenFullScreen */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; } xXF86DRIOpenFullScreenReq; #define sz_xXF86DRIOpenFullScreenReq 12 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 isFullScreen B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 isFullScreen; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86DRIOpenFullScreenReply; #define sz_xXF86DRIOpenFullScreenReply 32 typedef struct _XF86DRICloseFullScreen { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRICloseFullScreen */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; } xXF86DRICloseFullScreenReq; #define sz_xXF86DRICloseFullScreenReq 12 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXF86DRICloseFullScreenReply; #define sz_xXF86DRICloseFullScreenReply 32 diff --git a/proto/xorgproto/include/X11/extensions/EVIproto.h b/proto/xorgproto/include/X11/extensions/EVIproto.h index afa282a53..2218ef289 100644 --- a/proto/xorgproto/include/X11/extensions/EVIproto.h +++ b/proto/xorgproto/include/X11/extensions/EVIproto.h @@ -35,59 +35,59 @@ typedef CARD32 VisualID32; #define sz_VisualID32 4 typedef struct _xExtendedVisualInfo { - VisualID core_visual_id B32; + VisualID core_visual_id; INT8 screen; INT8 level; CARD8 transparency_type; CARD8 pad0; - CARD32 transparency_value B32; + CARD32 transparency_value; CARD8 min_hw_colormaps; CARD8 max_hw_colormaps; - CARD16 num_colormap_conflicts B16; + CARD16 num_colormap_conflicts; } xExtendedVisualInfo; #define sz_xExtendedVisualInfo 16 typedef struct _XEVIQueryVersion { CARD8 reqType; /* always XEVIReqCode */ CARD8 xeviReqType; /* always X_EVIQueryVersion */ - CARD16 length B16; + CARD16 length; } xEVIQueryVersionReq; #define sz_xEVIQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of EVI protocol */ - CARD16 minorVersion B16; /* minor version of EVI protocol */ - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of EVI protocol */ + CARD16 minorVersion; /* minor version of EVI protocol */ + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xEVIQueryVersionReply; #define sz_xEVIQueryVersionReply 32 typedef struct _XEVIGetVisualInfoReq { CARD8 reqType; /* always XEVIReqCode */ CARD8 xeviReqType; /* always X_EVIGetVisualInfo */ - CARD16 length B16; - CARD32 n_visual B32; + CARD16 length; + CARD32 n_visual; } xEVIGetVisualInfoReq; #define sz_xEVIGetVisualInfoReq 8 typedef struct _XEVIGetVisualInfoReply { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 n_info B32; - CARD32 n_conflicts B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 n_info; + CARD32 n_conflicts; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xEVIGetVisualInfoReply; #define sz_xEVIGetVisualInfoReply 32 diff --git a/proto/xorgproto/include/X11/extensions/Print.h b/proto/xorgproto/include/X11/extensions/Print.h index 266069a42..5516cffea 100644 --- a/proto/xorgproto/include/X11/extensions/Print.h +++ b/proto/xorgproto/include/X11/extensions/Print.h @@ -15,7 +15,7 @@ ** o Extension version structure ** ** Library and client subportion has: - ** o Convience Marcos + ** o Convenience Macros ** o Client side data structures ** o Client side event structures (non wire) ** o Library function prototypes @@ -269,7 +269,7 @@ typedef char * (*XPHinterProc)(void); * * Extension version structures. * - **** this structure is now defined localy in the one file that uses it + **** this structure is now defined locally in the one file that uses it **** in order to avoid clashes with its definition in XI.h */ typedef struct { diff --git a/proto/xorgproto/include/X11/extensions/Printstr.h b/proto/xorgproto/include/X11/extensions/Printstr.h index 1d763c6b7..7c3e8adb0 100644 --- a/proto/xorgproto/include/X11/extensions/Printstr.h +++ b/proto/xorgproto/include/X11/extensions/Printstr.h @@ -138,16 +138,16 @@ typedef struct _xPrintPrintEvent { BYTE detail; /* XPStartJobNotify, XPEndJobNotify, XPStartDocNotify, XPEndDocNotify, XPStartPageNotify, XPEndPageNotify */ - CARD16 sequenceNumber B16; - PCONTEXT printContext B32; /* print context */ + CARD16 sequenceNumber; + PCONTEXT printContext; /* print context */ BOOL cancel; /* canceled flag */ CARD8 pad1; /* rest is unused */ - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xPrintPrintEvent; #define sz_xPrintPrintEvent 32; @@ -156,14 +156,14 @@ typedef struct _xPrintAttributeEvent { BYTE detail; /* XPJobAttr, XPDocAttr, XPPageAttr, XPPrinterAttr, XPSpoolerAttr, XPMediumAttr, XPServerAttr */ - CARD16 sequenceNumber B16; - PCONTEXT printContext B32; /* print context */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + PCONTEXT printContext; /* print context */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xPrintAttributeEvent; #define sz_xPrintAttributeEvent 32; @@ -175,22 +175,22 @@ typedef struct _xPrintAttributeEvent { typedef struct _PrintQueryVersion { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintQueryVersion */ - CARD16 length B16; + CARD16 length; } xPrintQueryVersionReq; #define sz_xPrintQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of Xp protocol */ - CARD16 minorVersion B16; /* minor version of Xp protocol */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of Xp protocol */ + CARD16 minorVersion; /* minor version of Xp protocol */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xPrintQueryVersionReply; #define sz_xPrintQueryVersionReply 32 @@ -198,9 +198,9 @@ typedef struct { typedef struct _PrintGetPrinterList { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetPrinterList */ - CARD16 length B16; - CARD32 printerNameLen B32; /* length of printer name */ - CARD32 localeLen B32; /* length of locale string */ + CARD16 length; + CARD32 printerNameLen; /* length of printer name */ + CARD32 localeLen; /* length of locale string */ /* variable portion ***************************************** STRING8 printerName; * printer name * @@ -214,21 +214,21 @@ typedef struct _PrintGetPrinterList { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 listCount B32; /* of PRINTER recs below */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 listCount; /* of PRINTER recs below */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; /* variable portion ***************************************** - CARD32 nameLen B32; * length of name in bytes * + CARD32 nameLen; * length of name in bytes * STRING8 name; * name * BYTE pad(nameLen) * unused * - CARD32 descLen B32; * length of desc in bytes * + CARD32 descLen; * length of desc in bytes * STRING8 desc; * localized description * BYTE pad(descLen) * unused * ************************************************************/ @@ -239,7 +239,7 @@ typedef struct { typedef struct _PrintRehashPrinterList { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintRehashPrinterList */ - CARD16 length B16; + CARD16 length; } xPrintRehashPrinterListReq; #define sz_xPrintRehashPrinterListReq 4 @@ -247,10 +247,10 @@ typedef struct _PrintRehashPrinterList { typedef struct _PrintCreateContext { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintInitSetContext */ - CARD16 length B16; - CARD32 contextID B32; /* ID for context */ - CARD32 printerNameLen B32; /* length of printerName in bytes */ - CARD32 localeLen B32; /* length of locale in bytes */ + CARD16 length; + CARD32 contextID; /* ID for context */ + CARD32 printerNameLen; /* length of printerName in bytes */ + CARD32 localeLen; /* length of locale in bytes */ /* variable portion ***************************************** STRING8 printerName * printer name * @@ -265,8 +265,8 @@ typedef struct _PrintCreateContext { typedef struct _PrintSetContext { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintSetContext */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ } xPrintSetContextReq; #define sz_xPrintSetContextReq 8 @@ -274,21 +274,21 @@ typedef struct _PrintSetContext { typedef struct _PrintGetContext { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetContext */ - CARD16 length B16; + CARD16 length; } xPrintGetContextReq; #define sz_xPrintGetContextReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - PCONTEXT printContext B32; /* print context */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + PCONTEXT printContext; /* print context */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xPrintGetContextReply; #define sz_xPrintGetContextReply 32 @@ -296,8 +296,8 @@ typedef struct { typedef struct _PrintDestroyContext { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintDestroyContext */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ } xPrintDestroyContextReq; #define sz_xPrintDestroyContextReq 8 @@ -305,22 +305,22 @@ typedef struct _PrintDestroyContext { typedef struct _PrintGetContextScreen { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetContextScreen */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ } xPrintGetContextScreenReq; #define sz_xPrintGetContextScreenReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; WINDOW rootWindow; /* screenPtr represented as rootWin */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xPrintGetContextScreenReply; #define sz_xPrintGetContextScreenReply 32 @@ -328,20 +328,20 @@ typedef struct { typedef struct _PrintStartJob { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintStartJob */ - CARD16 length B16; + CARD16 length; CARD8 saveData; /* save data boolean */ CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xPrintStartJobReq; #define sz_xPrintStartJobReq 8 typedef struct _PrintEndJob { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintEndJob */ - CARD16 length B16; + CARD16 length; BOOL cancel; /* cancel boolean */ CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xPrintEndJobReq; #define sz_xPrintEndJobReq 8 @@ -349,20 +349,20 @@ typedef struct _PrintEndJob { typedef struct _PrintStartDoc { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintStartDoc */ - CARD16 length B16; + CARD16 length; CARD8 type; /* type for document */ CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xPrintStartDocReq; #define sz_xPrintStartDocReq 8 typedef struct _PrintEndDoc { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintEndDoc */ - CARD16 length B16; + CARD16 length; BOOL cancel; /* cancel boolean */ CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xPrintEndDocReq; #define sz_xPrintEndDocReq 8 @@ -370,9 +370,9 @@ typedef struct _PrintEndDoc { typedef struct _PrintPutDocumentData { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintPutDocumentData */ - CARD16 length B16; - DRAWABLE drawable B32; /* target drawable */ - CARD32 len_data B32; /* big len in bytes */ + CARD16 length; + DRAWABLE drawable; /* target drawable */ + CARD32 len_data; /* big len in bytes */ CARD16 len_fmt; /* len in bytes */ CARD16 len_options; /* len in bytes */ @@ -391,23 +391,23 @@ typedef struct _PrintPutDocumentData { typedef struct _PrintGetDocumentData { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetDocumentData */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ - CARD32 maxBufferSize B32; /* maximum buffer size requested */ + CARD16 length; + PCONTEXT printContext; /* print context */ + CARD32 maxBufferSize; /* maximum buffer size requested */ } xPrintGetDocumentDataReq; #define sz_xPrintGetDocumentDataReq 12 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 statusCode B32; /* status code for reply */ - CARD32 finishedFlag B32; /* is this the last reply */ - CARD32 dataLen B32; /* data length */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 statusCode; /* status code for reply */ + CARD32 finishedFlag; /* is this the last reply */ + CARD32 dataLen; /* data length */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; /* variable portion ***************************************** LISTofBYTE data; * data * @@ -420,18 +420,18 @@ typedef struct { typedef struct _PrintStartPage { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintStartPage */ - CARD16 length B16; - WINDOW window B32; /* window */ + CARD16 length; + WINDOW window; /* window */ } xPrintStartPageReq; #define sz_xPrintStartPageReq 8 typedef struct _PrintEndPage { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintEndPage */ - CARD16 length B16; + CARD16 length; BOOL cancel; /* cancel boolean */ CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xPrintEndPageReq; #define sz_xPrintEndPageReq 8 @@ -439,9 +439,9 @@ typedef struct _PrintEndPage { typedef struct _PrintSelectInput { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintSelectInput */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ - BITMASK eventMask B32; + CARD16 length; + PCONTEXT printContext; /* print context */ + BITMASK eventMask; } xPrintSelectInputReq; #define sz_xPrintSelectInputReq 12 @@ -449,47 +449,47 @@ typedef struct _PrintSelectInput { typedef struct _PrintInputSelected { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintInputSelected */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ } xPrintInputSelectedReq; #define sz_xPrintInputSelectedReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - BITMASK eventMask B32; /* your event mask */ - BITMASK allEventsMask B32; /* all event mask */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + BITMASK eventMask; /* your event mask */ + BITMASK allEventsMask; /* all event mask */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xPrintInputSelectedReply; #define sz_xPrintInputSelectedReply 32 typedef struct _PrintGetAttributes { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetAttributes */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ CARD8 type; /* type */ CARD8 pad1; /* unused */ - CARD16 pad2 B16; /* unused */ + CARD16 pad2; /* unused */ } xPrintGetAttributesReq; #define sz_xPrintGetAttributesReq 12 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 stringLen B32; /* length of xrm db string */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 stringLen; /* length of xrm db string */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; /* variable portion ***************************************** STRING8 string; * xrm db as a string * @@ -502,12 +502,12 @@ typedef struct { typedef struct _PrintSetAttributes { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintSetAttributes */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ - CARD32 stringLen B32; /* length of xrm db string */ + CARD16 length; + PCONTEXT printContext; /* print context */ + CARD32 stringLen; /* length of xrm db string */ CARD8 type; /* type */ CARD8 rule; /* replacement rule */ - CARD16 pad1 B16; /* unused */ + CARD16 pad1; /* unused */ /* variable portion ***************************************** STRING8 string; * xrm db as a string * @@ -520,12 +520,12 @@ typedef struct _PrintSetAttributes { typedef struct _PrintGetOneAttribute { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetOneAttribute */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ CARD32 nameLen; /* length of name string */ CARD8 type; /* type */ CARD8 pad1; /* unused */ - CARD16 pad2 B16; /* unused */ + CARD16 pad2; /* unused */ /* variable portion ***************************************** STRING8 name; * name as a string * @@ -537,14 +537,14 @@ typedef struct _PrintGetOneAttribute { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 valueLen B32; /* length of value string */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 valueLen; /* length of value string */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; /* variable portion ***************************************** STRING8 value; * value as a string * @@ -557,25 +557,25 @@ typedef struct { typedef struct _PrintGetPageDimensions { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetPageDimensions */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ } xPrintGetPageDimensionsReq; #define sz_xPrintGetPageDimensionsReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD16 width; /* total pixel width */ CARD16 height; /* total pixel height */ CARD16 rx; /* reproducable x pixel offset */ CARD16 ry; /* reproducable y pixel offset */ CARD16 rwidth; /* reproducable x pixel width */ CARD16 rheight; /* reproducable y pixel width */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xPrintGetPageDimensionsReply; #define sz_xPrintGetPageDimensionsReply 32 @@ -583,21 +583,21 @@ typedef struct { typedef struct _PrintQueryScreens { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintQueryScreens */ - CARD16 length B16; + CARD16 length; } xPrintQueryScreensReq; #define sz_xPrintQueryScreensReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD32 listCount; /* number of screens following */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; /* variable portion ***************************************** WINDOW rootWindow; * root window of screen * @@ -608,48 +608,48 @@ typedef struct { typedef struct _PrintSetImageResolution { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintSetImageResolution */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ - CARD16 imageRes B16; /* image resolution */ - CARD16 pad1 B16; + CARD16 length; + PCONTEXT printContext; /* print context */ + CARD16 imageRes; /* image resolution */ + CARD16 pad1; } xPrintSetImageResolutionReq; #define sz_xPrintSetImageResolutionReq 12 typedef struct { BYTE type; /* X_Reply */ BOOL status; /* accepted or not */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 prevRes B16; /* previous resolution */ - CARD16 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 prevRes; /* previous resolution */ + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xPrintSetImageResolutionReply; #define sz_xPrintSetImageResolutionReply 32 typedef struct _PrintGetImageResolution { CARD8 reqType; /* always PrintReqCode */ CARD8 printReqType; /* always X_PrintGetImageResolution */ - CARD16 length B16; - PCONTEXT printContext B32; /* print context */ + CARD16 length; + PCONTEXT printContext; /* print context */ } xPrintGetImageResolutionReq; #define sz_xPrintGetImageResolutionReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 imageRes B16; /* image resolution */ - CARD16 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 imageRes; /* image resolution */ + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xPrintGetImageResolutionReply; #define sz_xPrintGetImageResolutionReply 32 diff --git a/proto/xorgproto/include/X11/extensions/XI2proto.h b/proto/xorgproto/include/X11/extensions/XI2proto.h index 4cdaa0dfb..a1133b5d5 100644 --- a/proto/xorgproto/include/X11/extensions/XI2proto.h +++ b/proto/xorgproto/include/X11/extensions/XI2proto.h @@ -44,7 +44,7 @@ * appended to the common structs section before the definition of the * first request. * members of structs vertically aligned on column 16 if datatypes permit. - * otherwise alingned on next available 8n column. + * otherwise aligned on next available 8n column. */ /** @@ -149,8 +149,9 @@ typedef struct { /** * Denotes button capability on a device. - * Struct is followed by num_buttons * Atom that names the buttons in the - * device-native setup (i.e. ignoring button mappings). + * Struct is followed by a button bit-mask (padded to four byte chunks) and + * then num_buttons * Atom that names the buttons in the device-native setup + * (i.e. ignoring button mappings). */ typedef struct { uint16_t type; /**< Always ButtonClass */ diff --git a/proto/xorgproto/include/X11/extensions/XIproto.h b/proto/xorgproto/include/X11/extensions/XIproto.h index 82323d899..ac1f096f9 100644 --- a/proto/xorgproto/include/X11/extensions/XIproto.h +++ b/proto/xorgproto/include/X11/extensions/XIproto.h @@ -177,24 +177,24 @@ struct tmask typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GetExtensionVersion */ - CARD16 length B16; - CARD16 nbytes B16; + CARD16 length; + CARD16 nbytes; CARD8 pad1, pad2; } xGetExtensionVersionReq; typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetExtensionVersion */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 major_version B16; - CARD16 minor_version B16; + CARD16 sequenceNumber; + CARD32 length; + CARD16 major_version; + CARD16 minor_version; BOOL present; CARD8 pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; } xGetExtensionVersionReply; /********************************************************* @@ -206,21 +206,21 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_ListInputDevices */ - CARD16 length B16; + CARD16 length; } xListInputDevicesReq; typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_ListInputDevices */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 ndevices; CARD8 pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xListInputDevicesReply; typedef struct _xDeviceInfo *xDeviceInfoPtr; @@ -237,7 +237,7 @@ typedef struct _xAnyClassinfo { } xAnyClassInfo; typedef struct _xDeviceInfo { - CARD32 type B32; + CARD32 type; CARD8 id; CARD8 num_classes; CARD8 use; /* IsXPointer | IsXKeyboard | IsXExtension... */ @@ -255,7 +255,7 @@ typedef struct _xKeyInfo { CARD8 length; KeyCode min_keycode; KeyCode max_keycode; - CARD16 num_keys B16; + CARD16 num_keys; CARD8 pad1,pad2; } xKeyInfo; @@ -268,7 +268,7 @@ typedef struct _xButtonInfo { CARD8 class; #endif CARD8 length; - CARD16 num_buttons B16; + CARD16 num_buttons; } xButtonInfo; typedef struct _xValuatorInfo *xValuatorInfoPtr; @@ -282,15 +282,15 @@ typedef struct _xValuatorInfo { CARD8 length; CARD8 num_axes; CARD8 mode; - CARD32 motion_buffer_size B32; + CARD32 motion_buffer_size; } xValuatorInfo; typedef struct _xAxisInfo *xAxisInfoPtr; typedef struct _xAxisInfo { - CARD32 resolution B32; - CARD32 min_value B32; - CARD32 max_value B32; + CARD32 resolution; + CARD32 min_value; + CARD32 max_value; } xAxisInfo; /********************************************************* @@ -302,7 +302,7 @@ typedef struct _xAxisInfo { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_OpenDevice */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xOpenDeviceReq; @@ -310,15 +310,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_OpenDevice */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 num_classes; BYTE pad1, pad2, pad3; - CARD32 pad00 B32; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; + CARD32 pad00; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; } xOpenDeviceReply; typedef struct { @@ -339,7 +339,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_CloseDevice */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xCloseDeviceReq; @@ -353,7 +353,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_SetDeviceMode */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; CARD8 mode; BYTE pad1, pad2; @@ -362,15 +362,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_SetDeviceMode */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 status; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xSetDeviceModeReply; /********************************************************* @@ -382,10 +382,10 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_SelectExtensionEvent */ - CARD16 length B16; - Window window B32; - CARD16 count B16; - CARD16 pad00 B16; + CARD16 length; + Window window; + CARD16 count; + CARD16 pad00; } xSelectExtensionEventReq; /********************************************************* @@ -397,22 +397,22 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_GetSelectedExtensionEvents */ - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xGetSelectedExtensionEventsReq; typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* GetSelectedExtensionEvents */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 this_client_count B16; - CARD16 all_clients_count B16; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 this_client_count; + CARD16 all_clients_count; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xGetSelectedExtensionEventsReply; /********************************************************* @@ -424,9 +424,9 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_ChangeDeviceDontPropagateList */ - CARD16 length B16; - Window window B32; - CARD16 count B16; + CARD16 length; + Window window; + CARD16 count; CARD8 mode; BYTE pad; } xChangeDeviceDontPropagateListReq; @@ -440,22 +440,22 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_GetDeviceDontPropagateList */ - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xGetDeviceDontPropagateListReq; typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* GetDeviceDontPropagateList */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 count B16; - CARD16 pad00 B16; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 count; + CARD16 pad00; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xGetDeviceDontPropagateListReply; /********************************************************* @@ -467,9 +467,9 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GetDeviceMotionEvents*/ - CARD16 length B16; - Time start B32; - Time stop B32; + CARD16 length; + Time start; + Time stop; CARD8 deviceid; BYTE pad1, pad2, pad3; } xGetDeviceMotionEventsReq; @@ -477,16 +477,16 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetDeviceMotionEvents */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 nEvents B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 nEvents; CARD8 axes; CARD8 mode; BYTE pad1, pad2; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; } xGetDeviceMotionEventsReply; /********************************************************* @@ -498,7 +498,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_ChangeKeyboardDevice */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xChangeKeyboardDeviceReq; @@ -506,15 +506,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_ChangeKeyboardDevice*/ - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ + CARD16 sequenceNumber; + CARD32 length; /* 0 */ CARD8 status; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xChangeKeyboardDeviceReply; /********************************************************* @@ -526,7 +526,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_ChangePointerDevice */ - CARD16 length B16; + CARD16 length; CARD8 xaxis; CARD8 yaxis; CARD8 deviceid; @@ -536,15 +536,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_ChangePointerDevice */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ + CARD16 sequenceNumber; + CARD32 length; /* 0 */ CARD8 status; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xChangePointerDeviceReply; /********************************************************* @@ -556,29 +556,29 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GrabDevice */ - CARD16 length B16; - Window grabWindow B32; - Time time B32; - CARD16 event_count B16; + CARD16 length; + Window grabWindow; + Time time; + CARD16 event_count; CARD8 this_device_mode; CARD8 other_devices_mode; BOOL ownerEvents; CARD8 deviceid; - CARD16 pad01 B16; + CARD16 pad01; } xGrabDeviceReq; typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GrabDevice */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ + CARD16 sequenceNumber; + CARD32 length; /* 0 */ CARD8 status; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xGrabDeviceReply; /********************************************************* @@ -590,8 +590,8 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_UnGrabDevice */ - CARD16 length B16; - Time time B32; + CARD16 length; + Time time; CARD8 deviceid; BYTE pad1, pad2, pad3; } xUngrabDeviceReq; @@ -605,10 +605,10 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GrabDeviceKey */ - CARD16 length B16; - Window grabWindow B32; - CARD16 event_count B16; - CARD16 modifiers B16; + CARD16 length; + Window grabWindow; + CARD16 event_count; + CARD16 modifiers; CARD8 modifier_device; CARD8 grabbed_device; CARD8 key; @@ -627,9 +627,9 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_UngrabDeviceKey */ - CARD16 length B16; - Window grabWindow B32; - CARD16 modifiers B16; + CARD16 length; + Window grabWindow; + CARD16 modifiers; CARD8 modifier_device; CARD8 key; CARD8 grabbed_device; @@ -645,12 +645,12 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GrabDeviceButton */ - CARD16 length B16; - Window grabWindow B32; + CARD16 length; + Window grabWindow; CARD8 grabbed_device; CARD8 modifier_device; - CARD16 event_count B16; - CARD16 modifiers B16; + CARD16 event_count; + CARD16 modifiers; BYTE this_device_mode; BYTE other_devices_mode; CARD8 button; @@ -667,9 +667,9 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_UngrabDeviceButton */ - CARD16 length B16; - Window grabWindow B32; - CARD16 modifiers B16; + CARD16 length; + Window grabWindow; + CARD16 modifiers; CARD8 modifier_device; CARD8 button; CARD8 grabbed_device; @@ -685,8 +685,8 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_AllowDeviceEvents */ - CARD16 length B16; - Time time B32; + CARD16 length; + Time time; CARD8 mode; CARD8 deviceid; BYTE pad1, pad2; @@ -701,7 +701,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GetDeviceFocus */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xGetDeviceFocusReq; @@ -709,15 +709,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetDeviceFocus */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 focus B32; - Time time B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 focus; + Time time; CARD8 revertTo; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; } xGetDeviceFocusReply; /********************************************************* @@ -729,12 +729,12 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_SetDeviceFocus */ - CARD16 length B16; - Window focus B32; - Time time B32; + CARD16 length; + Window focus; + Time time; CARD8 revertTo; CARD8 device; - CARD16 pad01 B16; + CARD16 pad01; } xSetDeviceFocusReq; /********************************************************* @@ -746,7 +746,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_GetFeedbackControl */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xGetFeedbackControlReq; @@ -754,15 +754,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetFeedbackControl */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 num_feedbacks B16; - CARD16 pad01 B16; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; - CARD32 pad06 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 num_feedbacks; + CARD16 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; + CARD32 pad06; } xGetFeedbackControlReply; typedef struct { @@ -772,7 +772,7 @@ typedef struct { CARD8 class; /* feedback class */ #endif CARD8 id; /* feedback id */ - CARD16 length B16; /* feedback length */ + CARD16 length; /* feedback length */ } xFeedbackState; typedef struct { @@ -782,11 +782,11 @@ typedef struct { CARD8 class; #endif CARD8 id; - CARD16 length B16; - CARD16 pitch B16; - CARD16 duration B16; - CARD32 led_mask B32; - CARD32 led_values B32; + CARD16 length; + CARD16 pitch; + CARD16 duration; + CARD32 led_mask; + CARD32 led_values; BOOL global_auto_repeat; CARD8 click; CARD8 percent; @@ -801,11 +801,11 @@ typedef struct { CARD8 class; #endif CARD8 id; - CARD16 length B16; + CARD16 length; CARD8 pad1,pad2; - CARD16 accelNum B16; - CARD16 accelDenom B16; - CARD16 threshold B16; + CARD16 accelNum; + CARD16 accelDenom; + CARD16 threshold; } xPtrFeedbackState; typedef struct { @@ -815,10 +815,10 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; - CARD16 length B16; /* feedback length */ - CARD32 resolution B32; - INT32 min_value B32; - INT32 max_value B32; + CARD16 length; /* feedback length */ + CARD32 resolution; + INT32 min_value; + INT32 max_value; } xIntegerFeedbackState; typedef struct { @@ -828,9 +828,9 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; - CARD16 length B16; /* feedback length */ - CARD16 max_symbols B16; - CARD16 num_syms_supported B16; + CARD16 length; /* feedback length */ + CARD16 max_symbols; + CARD16 num_syms_supported; } xStringFeedbackState; typedef struct { @@ -840,11 +840,11 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; - CARD16 length B16; /* feedback length */ + CARD16 length; /* feedback length */ CARD8 percent; BYTE pad1, pad2, pad3; - CARD16 pitch B16; - CARD16 duration B16; + CARD16 pitch; + CARD16 duration; } xBellFeedbackState; typedef struct { @@ -854,9 +854,9 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; - CARD16 length B16; /* feedback length */ - CARD32 led_mask B32; - CARD32 led_values B32; + CARD16 length; /* feedback length */ + CARD32 led_mask; + CARD32 led_values; } xLedFeedbackState; /********************************************************* @@ -868,8 +868,8 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_ChangeFeedbackControl */ - CARD16 length B16; - CARD32 mask B32; + CARD16 length; + CARD32 mask; CARD8 deviceid; CARD8 feedbackid; BYTE pad1, pad2; @@ -882,7 +882,7 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; /* feedback id */ - CARD16 length B16; /* feedback length */ + CARD16 length; /* feedback length */ } xFeedbackCtl; typedef struct { @@ -892,15 +892,15 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; /* feedback length */ - CARD16 length B16; /* feedback length */ + CARD16 length; /* feedback length */ KeyCode key; CARD8 auto_repeat_mode; INT8 click; INT8 percent; - INT16 pitch B16; - INT16 duration B16; - CARD32 led_mask B32; - CARD32 led_values B32; + INT16 pitch; + INT16 duration; + CARD32 led_mask; + CARD32 led_values; } xKbdFeedbackCtl; typedef struct { @@ -910,11 +910,11 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; /* feedback id */ - CARD16 length B16; /* feedback length */ + CARD16 length; /* feedback length */ CARD8 pad1,pad2; - INT16 num B16; - INT16 denom B16; - INT16 thresh B16; + INT16 num; + INT16 denom; + INT16 thresh; } xPtrFeedbackCtl; typedef struct { @@ -924,8 +924,8 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; /* feedback id */ - CARD16 length B16; /* feedback length */ - INT32 int_to_display B32; + CARD16 length; /* feedback length */ + INT32 int_to_display; } xIntegerFeedbackCtl; typedef struct { @@ -935,9 +935,9 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; /* feedback id */ - CARD16 length B16; /* feedback length */ + CARD16 length; /* feedback length */ CARD8 pad1,pad2; - CARD16 num_keysyms B16; + CARD16 num_keysyms; } xStringFeedbackCtl; typedef struct { @@ -947,11 +947,11 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; /* feedback id */ - CARD16 length B16; /* feedback length */ + CARD16 length; /* feedback length */ INT8 percent; BYTE pad1, pad2, pad3; - INT16 pitch B16; - INT16 duration B16; + INT16 pitch; + INT16 duration; } xBellFeedbackCtl; typedef struct { @@ -961,9 +961,9 @@ typedef struct { CARD8 class; /* feedback class id */ #endif CARD8 id; /* feedback id */ - CARD16 length B16; /* feedback length */ - CARD32 led_mask B32; - CARD32 led_values B32; + CARD16 length; /* feedback length */ + CARD32 led_mask; + CARD32 led_values; } xLedFeedbackCtl; /********************************************************* @@ -975,7 +975,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GetDeviceKeyMapping */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; KeyCode firstKeyCode; CARD8 count; @@ -985,16 +985,16 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetDeviceKeyMapping */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 keySymsPerKeyCode; CARD8 pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGetDeviceKeyMappingReply; /********************************************************* @@ -1006,7 +1006,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_ChangeDeviceKeyMapping */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; KeyCode firstKeyCode; CARD8 keySymsPerKeyCode; @@ -1022,7 +1022,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GetDeviceModifierMapping */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xGetDeviceModifierMappingReq; @@ -1030,16 +1030,16 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetDeviceModifierMapping */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 numKeyPerModifier; CARD8 pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xGetDeviceModifierMappingReply; /********************************************************* @@ -1051,25 +1051,25 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_SetDeviceModifierMapping */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; CARD8 numKeyPerModifier; - CARD16 pad1 B16; + CARD16 pad1; } xSetDeviceModifierMappingReq; typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_SetDeviceModifierMapping */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 success; CARD8 pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xSetDeviceModifierMappingReply; /********************************************************* @@ -1081,7 +1081,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_GetDeviceButtonMapping */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xGetDeviceButtonMappingReq; @@ -1089,15 +1089,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetDeviceButtonMapping */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 nElts; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xGetDeviceButtonMappingReply; /********************************************************* @@ -1109,7 +1109,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* X_SetDeviceButtonMapping */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; CARD8 map_length; BYTE pad1, pad2; @@ -1118,16 +1118,16 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_SetDeviceButtonMapping */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 status; BYTE pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xSetDeviceButtonMappingReply; /********************************************************* @@ -1139,7 +1139,7 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 ReqType; /* always X_QueryDeviceState */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; BYTE pad1, pad2, pad3; } xQueryDeviceStateReq; @@ -1147,16 +1147,16 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_QueryDeviceState */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 num_classes; BYTE pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xQueryDeviceStateReply; typedef struct { @@ -1205,11 +1205,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 ReqType; /* always X_SendExtensionEvent */ - CARD16 length B16; - Window destination B32; + CARD16 length; + Window destination; CARD8 deviceid; BOOL propagate; - CARD16 count B16; + CARD16 count; CARD8 num_events; BYTE pad1,pad2,pad3; } xSendExtensionEventReq; @@ -1223,7 +1223,7 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 ReqType; /* always X_DeviceBell */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; CARD8 feedbackid; CARD8 feedbackclass; @@ -1239,7 +1239,7 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_SetDeviceValuators */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; CARD8 first_valuator; CARD8 num_valuators; @@ -1249,15 +1249,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_SetDeviceValuators */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 status; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xSetDeviceValuatorsReply; /********************************************************* @@ -1269,8 +1269,8 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GetDeviceControl */ - CARD16 length B16; - CARD16 control B16; + CARD16 length; + CARD16 control; CARD8 deviceid; BYTE pad2; } xGetDeviceControlReq; @@ -1278,66 +1278,66 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetDeviceControl */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 status; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xGetDeviceControlReply; typedef struct { - CARD16 control B16; /* control type */ - CARD16 length B16; /* control length */ + CARD16 control; /* control type */ + CARD16 length; /* control length */ } xDeviceState; typedef struct { - CARD16 control B16; /* control type */ - CARD16 length B16; /* control length */ - CARD32 num_valuators B32; /* number of valuators */ + CARD16 control; /* control type */ + CARD16 length; /* control length */ + CARD32 num_valuators; /* number of valuators */ } xDeviceResolutionState; typedef struct { - CARD16 control B16; - CARD16 length B16; - INT32 min_x B32; - INT32 max_x B32; - INT32 min_y B32; - INT32 max_y B32; - CARD32 flip_x B32; - CARD32 flip_y B32; - CARD32 rotation B32; - CARD32 button_threshold B32; + CARD16 control; + CARD16 length; + INT32 min_x; + INT32 max_x; + INT32 min_y; + INT32 max_y; + CARD32 flip_x; + CARD32 flip_y; + CARD32 rotation; + CARD32 button_threshold; } xDeviceAbsCalibState; typedef struct { - CARD16 control B16; - CARD16 length B16; - CARD32 offset_x B32; - CARD32 offset_y B32; - CARD32 width B32; - CARD32 height B32; - CARD32 screen B32; - CARD32 following B32; + CARD16 control; + CARD16 length; + CARD32 offset_x; + CARD32 offset_y; + CARD32 width; + CARD32 height; + CARD32 screen; + CARD32 following; } xDeviceAbsAreaState; typedef struct { - CARD16 control B16; /* control type */ - CARD16 length B16; /* control length */ + CARD16 control; /* control type */ + CARD16 length; /* control length */ CARD8 status; CARD8 iscore; - CARD16 pad1 B16; + CARD16 pad1; } xDeviceCoreState; typedef struct { - CARD16 control B16; /* control type */ - CARD16 length B16; /* control length */ + CARD16 control; /* control type */ + CARD16 length; /* control length */ CARD8 enable; CARD8 pad0; - CARD16 pad1 B16; + CARD16 pad1; } xDeviceEnableState; /********************************************************* @@ -1349,8 +1349,8 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_ChangeDeviceControl */ - CARD16 length B16; - CARD16 control B16; + CARD16 length; + CARD16 control; CARD8 deviceid; BYTE pad0; } xChangeDeviceControlReq; @@ -1358,33 +1358,33 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_ChangeDeviceControl */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 status; BYTE pad1, pad2, pad3; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; } xChangeDeviceControlReply; typedef struct { - CARD16 control B16; /* control type */ - CARD16 length B16; /* control length */ + CARD16 control; /* control type */ + CARD16 length; /* control length */ } xDeviceCtl; typedef struct { - CARD16 control B16; /* control type */ - CARD16 length B16; /* control length */ + CARD16 control; /* control type */ + CARD16 length; /* control length */ CARD8 first_valuator; /* first valuator to change */ CARD8 num_valuators; /* number of valuators to change*/ CARD8 pad1,pad2; } xDeviceResolutionCtl; typedef struct { - CARD16 control B16; - CARD16 length B16; + CARD16 control; + CARD16 length; INT32 min_x; INT32 max_x; INT32 min_y; @@ -1396,8 +1396,8 @@ typedef struct { } xDeviceAbsCalibCtl; typedef struct { - CARD16 control B16; - CARD16 length B16; + CARD16 control; + CARD16 length; CARD32 offset_x; CARD32 offset_y; INT32 width; @@ -1407,19 +1407,19 @@ typedef struct { } xDeviceAbsAreaCtl; typedef struct { - CARD16 control B16; - CARD16 length B16; + CARD16 control; + CARD16 length; CARD8 status; CARD8 pad0; - CARD16 pad1 B16; + CARD16 pad1; } xDeviceCoreCtl; typedef struct { - CARD16 control B16; - CARD16 length B16; + CARD16 control; + CARD16 length; CARD8 enable; CARD8 pad0; - CARD16 pad1 B16; + CARD16 pad1; } xDeviceEnableCtl; /* XI 1.5 */ @@ -1433,24 +1433,24 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major opcode */ CARD8 ReqType; /* always X_ListDeviceProperties */ - CARD16 length B16; + CARD16 length; CARD8 deviceid; CARD8 pad0; - CARD16 pad1 B16; + CARD16 pad1; } xListDevicePropertiesReq; typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_ListDeviceProperties */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nAtoms B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nAtoms; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xListDevicePropertiesReply; /********************************************************* @@ -1462,14 +1462,14 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major opcode */ CARD8 ReqType; /* always X_ChangeDeviceProperty */ - CARD16 length B16; - Atom property B32; - Atom type B32; + CARD16 length; + Atom property; + Atom type; CARD8 deviceid; CARD8 format; CARD8 mode; CARD8 pad; - CARD32 nUnits B32; + CARD32 nUnits; } xChangeDevicePropertyReq; /********************************************************* @@ -1481,11 +1481,11 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major opcode */ CARD8 ReqType; /* always X_DeleteDeviceProperty */ - CARD16 length B16; - Atom property B32; + CARD16 length; + Atom property; CARD8 deviceid; CARD8 pad0; - CARD16 pad1 B16; + CARD16 pad1; } xDeleteDevicePropertyReq; /********************************************************* @@ -1497,11 +1497,11 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major opcode */ CARD8 ReqType; /* always X_GetDeviceProperty */ - CARD16 length B16; - Atom property B32; - Atom type B32; - CARD32 longOffset B32; - CARD32 longLength B32; + CARD16 length; + Atom property; + Atom type; + CARD32 longOffset; + CARD32 longLength; CARD8 deviceid; #if defined(__cplusplus) || defined(c_plusplus) BOOL c_delete; @@ -1514,16 +1514,16 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GetDeviceProperty */ - CARD16 sequenceNumber B16; - CARD32 length B32; - Atom propertyType B32; - CARD32 bytesAfter B32; - CARD32 nItems B32; + CARD16 sequenceNumber; + CARD32 length; + Atom propertyType; + CARD32 bytesAfter; + CARD32 nItems; CARD8 format; CARD8 deviceid; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; } xGetDevicePropertyReply; @@ -1539,16 +1539,16 @@ typedef struct { BYTE type; CARD8 deviceid; - CARD16 sequenceNumber B16; - KeyButMask device_state B16; + CARD16 sequenceNumber; + KeyButMask device_state; CARD8 num_valuators; CARD8 first_valuator; - INT32 valuator0 B32; - INT32 valuator1 B32; - INT32 valuator2 B32; - INT32 valuator3 B32; - INT32 valuator4 B32; - INT32 valuator5 B32; + INT32 valuator0; + INT32 valuator1; + INT32 valuator2; + INT32 valuator3; + INT32 valuator4; + INT32 valuator5; } deviceValuator; /********************************************************** @@ -1566,16 +1566,16 @@ typedef struct { BYTE type; BYTE detail; - CARD16 sequenceNumber B16; - Time time B32; - Window root B32; - Window event B32; - Window child B32; - INT16 root_x B16; - INT16 root_y B16; - INT16 event_x B16; - INT16 event_y B16; - KeyButMask state B16; + CARD16 sequenceNumber; + Time time; + Window root; + Window event; + Window child; + INT16 root_x; + INT16 root_y; + INT16 event_x; + INT16 event_y; + KeyButMask state; BOOL same_screen; CARD8 deviceid; } deviceKeyButtonPointer; @@ -1590,16 +1590,16 @@ typedef struct { BYTE type; BYTE detail; - CARD16 sequenceNumber B16; - Time time B32; - Window window B32; + CARD16 sequenceNumber; + Time time; + Window window; BYTE mode; CARD8 deviceid; BYTE pad1, pad2; - CARD32 pad00 B32; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; + CARD32 pad00; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; } deviceFocus; /********************************************************** @@ -1616,17 +1616,17 @@ typedef struct { BYTE type; BYTE deviceid; - CARD16 sequenceNumber B16; - Time time B32; + CARD16 sequenceNumber; + Time time; CARD8 num_keys; CARD8 num_buttons; CARD8 num_valuators; CARD8 classes_reported; CARD8 buttons[4]; CARD8 keys[4]; - INT32 valuator0 B32; - INT32 valuator1 B32; - INT32 valuator2 B32; + INT32 valuator0; + INT32 valuator1; + INT32 valuator2; } deviceStateNotify; /********************************************************** @@ -1639,7 +1639,7 @@ typedef struct { BYTE type; BYTE deviceid; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD8 keys[28]; } deviceKeyStateNotify; @@ -1653,7 +1653,7 @@ typedef struct { BYTE type; BYTE deviceid; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD8 buttons[28]; } deviceButtonStateNotify; @@ -1668,17 +1668,17 @@ typedef struct { BYTE type; BYTE deviceid; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD8 request; KeyCode firstKeyCode; CARD8 count; BYTE pad1; - Time time B32; - CARD32 pad00 B32; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; + Time time; + CARD32 pad00; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; } deviceMappingNotify; /********************************************************** @@ -1691,15 +1691,15 @@ typedef struct { BYTE type; BYTE deviceid; - CARD16 sequenceNumber B16; - Time time B32; + CARD16 sequenceNumber; + Time time; CARD8 request; BYTE pad1, pad2, pad3; - CARD32 pad00 B32; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; + CARD32 pad00; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; } changeDeviceNotify; /********************************************************** @@ -1712,16 +1712,16 @@ typedef struct { BYTE type; BYTE pad00; - CARD16 sequenceNumber B16; - Time time B32; + CARD16 sequenceNumber; + Time time; BYTE devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */ BYTE deviceid; - CARD16 control B16; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; - CARD32 pad06 B32; + CARD16 control; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; + CARD32 pad06; } devicePresenceNotify; @@ -1736,14 +1736,14 @@ typedef struct { BYTE type; BYTE state; /* NewValue or Deleted */ - CARD16 sequenceNumber B16; - CARD32 time B32; - Atom atom B32; /* affected property */ - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD16 pad5 B16; + CARD16 sequenceNumber; + CARD32 time; + Atom atom; /* affected property */ + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD16 pad5; CARD8 pad4; CARD8 deviceid; /* id of device */ } devicePropertyNotify; diff --git a/proto/xorgproto/include/X11/extensions/XKB.h b/proto/xorgproto/include/X11/extensions/XKB.h index ee4f74076..7e702eb07 100644 --- a/proto/xorgproto/include/X11/extensions/XKB.h +++ b/proto/xorgproto/include/X11/extensions/XKB.h @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, 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 Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS 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 +GRAPHICS 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. @@ -67,10 +67,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbNumberEvents (XkbEventCode+1) /* - * XKB has a minor event code so it can use one X event code for - * multiple purposes. + * XKB has a minor event code so it can use one X event code for + * multiple purposes. * - reported in the xkbType field of all XKB events. - * - XkbSelectEventDetails: Indicates the event for which event details + * - XkbSelectEventDetails: Indicates the event for which event details * are being changed */ #define XkbNewKeyboardNotify 0 @@ -158,7 +158,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * A further reason for the error is encoded into to most significant * byte of the resourceID for the error: * XkbErr_BadDevice - the device in question was not found - * XkbErr_BadClass - the device was found but it doesn't belong to + * XkbErr_BadClass - the device was found but it doesn't belong to * the appropriate class. * XkbErr_BadId - the device was found and belongs to the right * class, but not feedback with a matching id was @@ -212,11 +212,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* * Controls detail masks: * The controls specified in XkbAllControlsMask: - * - The 'changed' field of ControlsNotify events reports which of + * - The 'changed' field of ControlsNotify events reports which of * the keyboard controls have changed. * - The 'changeControls' field of the SetControls request specifies * the controls for which values are to be changed. - * - Used as an event detail mask to limit the conditions under + * - Used as an event detail mask to limit the conditions under * which ControlsNotify events are reported. * * The controls specified in the XkbAllBooleanCtrlsMask: @@ -229,7 +229,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * - The 'accessXTimeoutMask' and 'accessXTimeoutValues' fields of * an XkbControlsRec specify the controls to be changed if the keyboard * times out and the values to which they should be changed. - * - The 'autoCtrls' and 'autoCtrlsValues' fields of the PerClientFlags + * - The 'autoCtrls' and 'autoCtrlsValues' fields of the PerClientFlags * request specifies the specify the controls to be reset when the * client exits and the values to which they should be reset. * - The 'ctrls' field of an indicator map specifies the controls @@ -267,8 +267,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * - The 'accessXOptions' field of an XkbControlsRec specifies the * AccessX options that are currently in effect. * - The 'accessXTimeoutOptionsMask' and 'accessXTimeoutOptionsValues' - * fields of an XkbControlsRec specify the Access X options to be - * changed if the keyboard times out and the values to which they + * fields of an XkbControlsRec specify the Access X options to be + * changed if the keyboard times out and the values to which they * should be changed. */ #define XkbAX_SKPressFBMask (1L << 0) @@ -293,7 +293,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * XkbUseCorePtr is used to specify the core pointer without having * to look up its X input extension identifier. * XkbDfltXIClass is used to specify "don't care" any place that the - * XKB protocol is looking for an X Input Extension + * XKB protocol is looking for an X Input Extension * device class. * XkbDfltXIId is used to specify "don't care" any place that the * XKB protocol is looking for an X Input Extension @@ -309,9 +309,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * XkbExplicitXIDevice(d) True if 'd' explicitly specifies a device * XkbExplicitXIClass(c) True if 'c' explicitly specifies a device class * XkbExplicitXIId(c) True if 'i' explicitly specifies a device id - * XkbSingleXIClass(c) True if 'c' specifies exactly one device class, + * XkbSingleXIClass(c) True if 'c' specifies exactly one device class, * including the default. - * XkbSingleXIId(i) True if 'i' specifies exactly one device + * XkbSingleXIId(i) True if 'i' specifies exactly one device * identifier, including the default. */ #define XkbUseCoreKbd 0x0100 @@ -456,9 +456,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbSA_SwitchAbsolute (1L << 2) /* - * The following values apply to the SA_DeviceValuator - * action only. Valuator operations specify the action - * to be taken. Values specified in the action are + * The following values apply to the SA_DeviceValuator + * action only. Valuator operations specify the action + * to be taken. Values specified in the action are * multiplied by 2^scale before they are applied. */ #define XkbSA_IgnoreVal (0x00) @@ -510,7 +510,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. (1<ctrls))) #define XkbIM_InUse(i) (((i)->flags)||((i)->which_groups)||\ ((i)->which_mods)||((i)->ctrls)) - + typedef struct _XkbIndicatorRec { unsigned long phys_indicators; @@ -410,7 +410,7 @@ typedef struct _XkbKeyAliasRec { } XkbKeyAliasRec,*XkbKeyAliasPtr; /* - * Names for everything + * Names for everything */ typedef struct _XkbNamesRec { Atom keycodes; @@ -548,7 +548,7 @@ typedef struct _XkbChanges { } XkbChangesRec, *XkbChangesPtr; /* - * These data structures are used to construct a keymap from + * These data structures are used to construct a keymap from * a set of components or to list components in the server * database. */ @@ -582,8 +582,8 @@ typedef struct _XkbComponentList { } XkbComponentListRec, *XkbComponentListPtr; /* - * The following data structures describe and track changes to a - * non-keyboard extension device + * The following data structures describe and track changes to a + * non-keyboard extension device */ typedef struct _XkbDeviceLedInfo { unsigned short led_class; diff --git a/proto/xorgproto/include/X11/extensions/XResproto.h b/proto/xorgproto/include/X11/extensions/XResproto.h index d7e20b1a1..74cc87672 100644 --- a/proto/xorgproto/include/X11/extensions/XResproto.h +++ b/proto/xorgproto/include/X11/extensions/XResproto.h @@ -40,26 +40,26 @@ typedef struct { typedef struct _XResQueryVersion { CARD8 reqType; - CARD8 XResReqType; - CARD16 length B16; + CARD8 XResReqType; + CARD16 length; CARD8 client_major; CARD8 client_minor; - CARD16 unused B16; + CARD16 unused; } xXResQueryVersionReq; #define sz_xXResQueryVersionReq 8 typedef struct { CARD8 type; CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 server_major B16; - CARD16 server_minor B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 server_major; + CARD16 server_minor; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXResQueryVersionReply; #define sz_xXResQueryVersionReply 32 @@ -67,22 +67,22 @@ typedef struct { typedef struct _XResQueryClients { CARD8 reqType; - CARD8 XResReqType; - CARD16 length B16; + CARD8 XResReqType; + CARD16 length; } xXResQueryClientsReq; #define sz_xXResQueryClientsReq 4 typedef struct { CARD8 type; - CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num_clients B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD8 pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num_clients; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXResQueryClientsReply; #define sz_xXResQueryClientsReply 32 @@ -91,22 +91,22 @@ typedef struct { typedef struct _XResQueryClientResources { CARD8 reqType; CARD8 XResReqType; - CARD16 length B16; - CARD32 xid B32; + CARD16 length; + CARD32 xid; } xXResQueryClientResourcesReq; #define sz_xXResQueryClientResourcesReq 8 typedef struct { CARD8 type; - CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num_types B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD8 pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num_types; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXResQueryClientResourcesReply; #define sz_xXResQueryClientResourcesReply 32 @@ -115,22 +115,22 @@ typedef struct { typedef struct _XResQueryClientPixmapBytes { CARD8 reqType; CARD8 XResReqType; - CARD16 length B16; - CARD32 xid B32; + CARD16 length; + CARD32 xid; } xXResQueryClientPixmapBytesReq; #define sz_xXResQueryClientPixmapBytesReq 8 typedef struct { CARD8 type; CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 bytes B32; - CARD32 bytes_overflow B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 bytes; + CARD32 bytes_overflow; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXResQueryClientPixmapBytesReply; #define sz_xXResQueryClientPixmapBytesReply 32 @@ -140,14 +140,14 @@ typedef struct { #define X_XResLocalClientPIDMask 0x02 typedef struct _XResClientIdSpec { - CARD32 client B32; - CARD32 mask B32; + CARD32 client; + CARD32 mask; } xXResClientIdSpec; #define sz_xXResClientIdSpec 8 typedef struct _XResClientIdValue { xXResClientIdSpec spec; - CARD32 length B32; + CARD32 length; // followed by length CARD32s } xXResClientIdValue; #define sz_xResClientIdValue (sz_xXResClientIdSpec + 4) @@ -155,8 +155,8 @@ typedef struct _XResClientIdValue { typedef struct _XResQueryClientIds { CARD8 reqType; CARD8 XResReqType; - CARD16 length B16; - CARD32 numSpecs B32; + CARD16 length; + CARD32 numSpecs; // followed by numSpecs times XResClientIdSpec } xXResQueryClientIdsReq; #define sz_xXResQueryClientIdsReq 8 @@ -164,14 +164,14 @@ typedef struct _XResQueryClientIds { typedef struct { CARD8 type; CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numIds B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numIds; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; // followed by numIds times XResClientIdValue } xXResQueryClientIdsReply; #define sz_xXResQueryClientIdsReply 32 @@ -187,24 +187,24 @@ typedef struct _XResResourceIdSpec { typedef struct _XResQueryResourceBytes { CARD8 reqType; CARD8 XResReqType; - CARD16 length B16; - CARD32 client B32; - CARD32 numSpecs B32; + CARD16 length; + CARD32 client; + CARD32 numSpecs; // followed by numSpecs times XResResourceIdSpec } xXResQueryResourceBytesReq; #define sz_xXResQueryResourceBytesReq 12 typedef struct _XResResourceSizeSpec { xXResResourceIdSpec spec; - CARD32 bytes B32; - CARD32 refCount B32; - CARD32 useCount B32; + CARD32 bytes; + CARD32 refCount; + CARD32 useCount; } xXResResourceSizeSpec; #define sz_xXResResourceSizeSpec (sz_xXResResourceIdSpec + 12) typedef struct _XResResourceSizeValue { xXResResourceSizeSpec size; - CARD32 numCrossReferences B32; + CARD32 numCrossReferences; // followed by numCrossReferences times XResResourceSizeSpec } xXResResourceSizeValue; #define sz_xXResResourceSizeValue (sz_xXResResourceSizeSpec + 4) @@ -212,14 +212,14 @@ typedef struct _XResResourceSizeValue { typedef struct { CARD8 type; CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numSizes B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numSizes; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; // followed by numSizes times XResResourceSizeValue } xXResQueryResourceBytesReply; #define sz_xXResQueryResourceBytesReply 32 diff --git a/proto/xorgproto/include/X11/extensions/XvMCproto.h b/proto/xorgproto/include/X11/extensions/XvMCproto.h index 43ec688b9..2fa27b244 100644 --- a/proto/xorgproto/include/X11/extensions/XvMCproto.h +++ b/proto/xorgproto/include/X11/extensions/XvMCproto.h @@ -17,125 +17,125 @@ typedef struct { - CARD32 surface_type_id B32; - CARD16 chroma_format B16; - CARD16 pad0 B16; - CARD16 max_width B16; - CARD16 max_height B16; - CARD16 subpicture_max_width B16; - CARD16 subpicture_max_height B16; - CARD32 mc_type B32; - CARD32 flags B32; + CARD32 surface_type_id; + CARD16 chroma_format; + CARD16 pad0; + CARD16 max_width; + CARD16 max_height; + CARD16 subpicture_max_width; + CARD16 subpicture_max_height; + CARD32 mc_type; + CARD32 flags; } xvmcSurfaceInfo; #define sz_xvmcSurfaceInfo 24; typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; + CARD16 length; } xvmcQueryVersionReq; #define sz_xvmcQueryVersionReq 4; typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 major B32; - CARD32 minor B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 major; + CARD32 minor; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; } xvmcQueryVersionReply; #define sz_xvmcQueryVersionReply 32 typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 port B32; + CARD16 length; + CARD32 port; } xvmcListSurfaceTypesReq; #define sz_xvmcListSurfaceTypesReq 8; typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num B32; - CARD32 padl3 B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num; + CARD32 padl3; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; } xvmcListSurfaceTypesReply; #define sz_xvmcListSurfaceTypesReply 32 typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 context_id B32; - CARD32 port B32; - CARD32 surface_type_id B32; - CARD16 width B16; - CARD16 height B16; - CARD32 flags B32; + CARD16 length; + CARD32 context_id; + CARD32 port; + CARD32 surface_type_id; + CARD16 width; + CARD16 height; + CARD32 flags; } xvmcCreateContextReq; #define sz_xvmcCreateContextReq 24; typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 width_actual B16; - CARD16 height_actual B16; - CARD32 flags_return B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 width_actual; + CARD16 height_actual; + CARD32 flags_return; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; } xvmcCreateContextReply; #define sz_xvmcCreateContextReply 32 typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 context_id B32; + CARD16 length; + CARD32 context_id; } xvmcDestroyContextReq; #define sz_xvmcDestroyContextReq 8; typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 surface_id B32; - CARD32 context_id B32; + CARD16 length; + CARD32 surface_id; + CARD32 context_id; } xvmcCreateSurfaceReq; #define sz_xvmcCreateSurfaceReq 12; typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 padl2 B32; - CARD32 padl3 B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 padl2; + CARD32 padl3; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; } xvmcCreateSurfaceReply; #define sz_xvmcCreateSurfaceReply 32 typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 surface_id B32; + CARD16 length; + CARD32 surface_id; } xvmcDestroySurfaceReq; #define sz_xvmcDestroySurfaceReq 8; @@ -143,83 +143,83 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 subpicture_id B32; - CARD32 context_id B32; - CARD32 xvimage_id B32; - CARD16 width B16; - CARD16 height B16; + CARD16 length; + CARD32 subpicture_id; + CARD32 context_id; + CARD32 xvimage_id; + CARD16 width; + CARD16 height; } xvmcCreateSubpictureReq; #define sz_xvmcCreateSubpictureReq 20; typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 width_actual B16; - CARD16 height_actual B16; - CARD16 num_palette_entries B16; - CARD16 entry_bytes B16; + CARD16 sequenceNumber; + CARD32 length; + CARD16 width_actual; + CARD16 height_actual; + CARD16 num_palette_entries; + CARD16 entry_bytes; CARD8 component_order[4]; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; } xvmcCreateSubpictureReply; #define sz_xvmcCreateSubpictureReply 32 typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 subpicture_id B32; + CARD16 length; + CARD32 subpicture_id; } xvmcDestroySubpictureReq; #define sz_xvmcDestroySubpictureReq 8; typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 port B32; - CARD32 surface_type_id B32; + CARD16 length; + CARD32 port; + CARD32 surface_type_id; } xvmcListSubpictureTypesReq; #define sz_xvmcListSubpictureTypesReq 12; typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num B32; - CARD32 padl2 B32; - CARD32 padl3 B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num; + CARD32 padl2; + CARD32 padl3; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; } xvmcListSubpictureTypesReply; #define sz_xvmcListSubpictureTypesReply 32 typedef struct { CARD8 reqType; CARD8 xvmcReqType; - CARD16 length B16; - CARD32 port B32; - CARD32 shmKey B32; - CARD32 magic B32; + CARD16 length; + CARD32 port; + CARD32 shmKey; + CARD32 magic; } xvmcGetDRInfoReq; #define sz_xvmcGetDRInfoReq 16; typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 major B32; - CARD32 minor B32; - CARD32 patchLevel B32; - CARD32 nameLen B32; - CARD32 busIDLen B32; - CARD32 isLocal B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 major; + CARD32 minor; + CARD32 patchLevel; + CARD32 nameLen; + CARD32 busIDLen; + CARD32 isLocal; } xvmcGetDRInfoReply; #define sz_xvmcGetDRInfoReply 32 diff --git a/proto/xorgproto/include/X11/extensions/Xvproto.h b/proto/xorgproto/include/X11/extensions/Xvproto.h index 94bd9cc66..6e7ea08fe 100644 --- a/proto/xorgproto/include/X11/extensions/Xvproto.h +++ b/proto/xorgproto/include/X11/extensions/Xvproto.h @@ -65,79 +65,79 @@ SOFTWARE. /* Structures */ typedef struct { - INT32 numerator B32; - INT32 denominator B32; + INT32 numerator; + INT32 denominator; } xvRational; #define sz_xvRational 8 typedef struct { - XvPortID base_id B32; - CARD16 name_size B16; - CARD16 num_ports B16; - CARD16 num_formats B16; + XvPortID base_id; + CARD16 name_size; + CARD16 num_ports; + CARD16 num_formats; CARD8 type; CARD8 pad; } xvAdaptorInfo; #define sz_xvAdaptorInfo 12 typedef struct { - XvEncodingID encoding B32; - CARD16 name_size B16; - CARD16 width B16, height B16; - CARD16 pad B16; + XvEncodingID encoding; + CARD16 name_size; + CARD16 width, height; + CARD16 pad; xvRational rate; } xvEncodingInfo; #define sz_xvEncodingInfo (12 + sz_xvRational) typedef struct { - VisualID visual B32; + VisualID visual; CARD8 depth; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xvFormat; #define sz_xvFormat 8 typedef struct { - CARD32 flags B32; - INT32 min B32; - INT32 max B32; - CARD32 size B32; + CARD32 flags; + INT32 min; + INT32 max; + CARD32 size; } xvAttributeInfo; #define sz_xvAttributeInfo 16 typedef struct { - CARD32 id B32; + CARD32 id; CARD8 type; CARD8 byte_order; - CARD16 pad1 B16; + CARD16 pad1; CARD8 guid[16]; CARD8 bpp; CARD8 num_planes; - CARD16 pad2 B16; + CARD16 pad2; CARD8 depth; CARD8 pad3; - CARD16 pad4 B16; - CARD32 red_mask B32; - CARD32 green_mask B32; - CARD32 blue_mask B32; + CARD16 pad4; + CARD32 red_mask; + CARD32 green_mask; + CARD32 blue_mask; CARD8 format; CARD8 pad5; - CARD16 pad6 B16; - CARD32 y_sample_bits B32; - CARD32 u_sample_bits B32; - CARD32 v_sample_bits B32; - CARD32 horz_y_period B32; - CARD32 horz_u_period B32; - CARD32 horz_v_period B32; - CARD32 vert_y_period B32; - CARD32 vert_u_period B32; - CARD32 vert_v_period B32; + CARD16 pad6; + CARD32 y_sample_bits; + CARD32 u_sample_bits; + CARD32 v_sample_bits; + CARD32 horz_y_period; + CARD32 horz_u_period; + CARD32 horz_v_period; + CARD32 vert_y_period; + CARD32 vert_u_period; + CARD32 vert_v_period; CARD8 comp_order[32]; CARD8 scanline_order; CARD8 pad7; - CARD16 pad8 B16; - CARD32 pad9 B32; - CARD32 pad10 B32; + CARD16 pad8; + CARD32 pad9; + CARD32 pad10; } xvImageFormatInfo; #define sz_xvImageFormatInfo 128 @@ -171,121 +171,121 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; + CARD16 length; } xvQueryExtensionReq; #define sz_xvQueryExtensionReq 4 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - CARD32 window B32; + CARD16 length; + CARD32 window; } xvQueryAdaptorsReq; #define sz_xvQueryAdaptorsReq 8 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - CARD32 port B32; + CARD16 length; + CARD32 port; } xvQueryEncodingsReq; #define sz_xvQueryEncodingsReq 8 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - INT16 vid_x B16; - INT16 vid_y B16; - CARD16 vid_w B16; - CARD16 vid_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; + CARD16 length; + XvPortID port; + Drawable drawable; + GContext gc; + INT16 vid_x; + INT16 vid_y; + CARD16 vid_w; + CARD16 vid_h; + INT16 drw_x; + INT16 drw_y; + CARD16 drw_w; + CARD16 drw_h; } xvPutVideoReq; #define sz_xvPutVideoReq 32 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - INT16 vid_x B16; - INT16 vid_y B16; - CARD16 vid_w B16; - CARD16 vid_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; + CARD16 length; + XvPortID port; + Drawable drawable; + GContext gc; + INT16 vid_x; + INT16 vid_y; + CARD16 vid_w; + CARD16 vid_h; + INT16 drw_x; + INT16 drw_y; + CARD16 drw_w; + CARD16 drw_h; } xvPutStillReq; #define sz_xvPutStillReq 32 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - INT16 vid_x B16; - INT16 vid_y B16; - CARD16 vid_w B16; - CARD16 vid_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; + CARD16 length; + XvPortID port; + Drawable drawable; + GContext gc; + INT16 vid_x; + INT16 vid_y; + CARD16 vid_w; + CARD16 vid_h; + INT16 drw_x; + INT16 drw_y; + CARD16 drw_w; + CARD16 drw_h; } xvGetVideoReq; #define sz_xvGetVideoReq 32 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - INT16 vid_x B16; - INT16 vid_y B16; - CARD16 vid_w B16; - CARD16 vid_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; + CARD16 length; + XvPortID port; + Drawable drawable; + GContext gc; + INT16 vid_x; + INT16 vid_y; + CARD16 vid_w; + CARD16 vid_h; + INT16 drw_x; + INT16 drw_y; + CARD16 drw_w; + CARD16 drw_h; } xvGetStillReq; #define sz_xvGetStillReq 32 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Time time B32; + CARD16 length; + XvPortID port; + Time time; } xvGrabPortReq; #define sz_xvGrabPortReq 12 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Time time B32; + CARD16 length; + XvPortID port; + Time time; } xvUngrabPortReq; #define sz_xvUngrabPortReq 12 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - Drawable drawable B32; + CARD16 length; + Drawable drawable; BOOL onoff; CARD8 pad1; CARD16 pad2; @@ -295,8 +295,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; + CARD16 length; + XvPortID port; BOOL onoff; CARD8 pad1; CARD16 pad2; @@ -306,117 +306,117 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; + CARD16 length; + XvPortID port; + Drawable drawable; } xvStopVideoReq; #define sz_xvStopVideoReq 12 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Atom attribute B32; - INT32 value B32; + CARD16 length; + XvPortID port; + Atom attribute; + INT32 value; } xvSetPortAttributeReq; #define sz_xvSetPortAttributeReq 16 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Atom attribute B32; + CARD16 length; + XvPortID port; + Atom attribute; } xvGetPortAttributeReq; #define sz_xvGetPortAttributeReq 12 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - CARD16 vid_w B16; - CARD16 vid_h B16; - CARD16 drw_w B16; - CARD16 drw_h B16; + CARD16 length; + XvPortID port; + CARD16 vid_w; + CARD16 vid_h; + CARD16 drw_w; + CARD16 drw_h; CARD8 motion; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xvQueryBestSizeReq; #define sz_xvQueryBestSizeReq 20 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; + CARD16 length; + XvPortID port; } xvQueryPortAttributesReq; #define sz_xvQueryPortAttributesReq 8 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - CARD32 id B32; - INT16 src_x B16; - INT16 src_y B16; - CARD16 src_w B16; - CARD16 src_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; - CARD16 width B16; - CARD16 height B16; + CARD16 length; + XvPortID port; + Drawable drawable; + GContext gc; + CARD32 id; + INT16 src_x; + INT16 src_y; + CARD16 src_w; + CARD16 src_h; + INT16 drw_x; + INT16 drw_y; + CARD16 drw_w; + CARD16 drw_h; + CARD16 width; + CARD16 height; } xvPutImageReq; #define sz_xvPutImageReq 40 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - ShmSeg shmseg B32; - CARD32 id B32; - CARD32 offset B32; - INT16 src_x B16; - INT16 src_y B16; - CARD16 src_w B16; - CARD16 src_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; - CARD16 width B16; - CARD16 height B16; + CARD16 length; + XvPortID port; + Drawable drawable; + GContext gc; + ShmSeg shmseg; + CARD32 id; + CARD32 offset; + INT16 src_x; + INT16 src_y; + CARD16 src_w; + CARD16 src_h; + INT16 drw_x; + INT16 drw_y; + CARD16 drw_w; + CARD16 drw_h; + CARD16 width; + CARD16 height; CARD8 send_event; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xvShmPutImageReq; #define sz_xvShmPutImageReq 52 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - XvPortID port B32; + CARD16 length; + XvPortID port; } xvListImageFormatsReq; #define sz_xvListImageFormatsReq 8 typedef struct { CARD8 reqType; CARD8 xvReqType; - CARD16 length B16; - CARD32 port B32; - CARD32 id B32; - CARD16 width B16; - CARD16 height B16; + CARD16 length; + CARD32 port; + CARD32 id; + CARD16 width; + CARD16 height; } xvQueryImageAttributesReq; #define sz_xvQueryImageAttributesReq 16 @@ -426,131 +426,131 @@ typedef struct { typedef struct _QueryExtensionReply { BYTE type; /* X_Reply */ CARD8 padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 version B16; - CARD16 revision B16; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 version; + CARD16 revision; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvQueryExtensionReply; #define sz_xvQueryExtensionReply 32 typedef struct _QueryAdaptorsReply { BYTE type; /* X_Reply */ CARD8 padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 num_adaptors B16; - CARD16 pads3 B16; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 num_adaptors; + CARD16 pads3; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvQueryAdaptorsReply; #define sz_xvQueryAdaptorsReply 32 typedef struct _QueryEncodingsReply { BYTE type; /* X_Reply */ CARD8 padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 num_encodings B16; - CARD16 padl3 B16; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 num_encodings; + CARD16 padl3; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvQueryEncodingsReply; #define sz_xvQueryEncodingsReply 32 typedef struct { BYTE type; /* X_Reply */ BYTE result; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD32 padl3 B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD32 padl3; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvGrabPortReply; #define sz_xvGrabPortReply 32 typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - INT32 value B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + INT32 value; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvGetPortAttributeReply; #define sz_xvGetPortAttributeReply 32 typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD16 actual_width B16; - CARD16 actual_height B16; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD16 actual_width; + CARD16 actual_height; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvQueryBestSizeReply; #define sz_xvQueryBestSizeReply 32 typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD32 num_attributes B32; - CARD32 text_size B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD32 num_attributes; + CARD32 text_size; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvQueryPortAttributesReply; #define sz_xvQueryPortAttributesReply 32 typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num_formats B32; - CARD32 padl4 B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num_formats; + CARD32 padl4; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvListImageFormatsReply; #define sz_xvListImageFormatsReply 32 typedef struct { BYTE type; /* X_Reply */ BYTE padb1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num_planes B32; - CARD32 data_size B32; - CARD16 width B16; - CARD16 height B16; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num_planes; + CARD32 data_size; + CARD16 width; + CARD16 height; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } xvQueryImageAttributesReply; #define sz_xvQueryImageAttributesReply 32 @@ -561,31 +561,31 @@ typedef struct { struct { BYTE type; BYTE detail; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; } u; struct { BYTE type; BYTE reason; - CARD16 sequenceNumber B16; - Time time B32; - Drawable drawable B32; - XvPortID port B32; - CARD32 padl5 B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + Time time; + Drawable drawable; + XvPortID port; + CARD32 padl5; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } videoNotify; struct { BYTE type; BYTE padb1; - CARD16 sequenceNumber B16; - Time time B32; - XvPortID port B32; - Atom attribute B32; - INT32 value B32; - CARD32 padl6 B32; - CARD32 padl7 B32; - CARD32 padl8 B32; + CARD16 sequenceNumber; + Time time; + XvPortID port; + Atom attribute; + INT32 value; + CARD32 padl6; + CARD32 padl7; + CARD32 padl8; } portNotify; } u; } xvEvent; diff --git a/proto/xorgproto/include/X11/extensions/agproto.h b/proto/xorgproto/include/X11/extensions/agproto.h index 108666126..803099d74 100644 --- a/proto/xorgproto/include/X11/extensions/agproto.h +++ b/proto/xorgproto/include/X11/extensions/agproto.h @@ -53,24 +53,24 @@ from The Open Group. typedef struct _XagQueryVersion { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagQueryVersion */ - CARD16 length B16; - CARD16 client_major_version B16; - CARD16 client_minor_version B16; + CARD16 length; + CARD16 client_major_version; + CARD16 client_minor_version; } xXagQueryVersionReq; #define sz_xXagQueryVersionReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD16 server_major_version B16; - CARD16 server_minor_version B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequence_number; + CARD32 length; + CARD16 server_major_version; + CARD16 server_minor_version; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXagQueryVersionReply; #define sz_xXagQueryVersionReply 32 @@ -86,81 +86,81 @@ typedef struct { typedef struct _XagCreate { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagCreate */ - CARD16 length B16; - XAppGroup app_group B32; - CARD32 attrib_mask B32; /* LISTofVALUE follows */ + CARD16 length; + XAppGroup app_group; + CARD32 attrib_mask; /* LISTofVALUE follows */ } xXagCreateReq; #define sz_xXagCreateReq 12 typedef struct _XagDestroy { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagDestroy */ - CARD16 length B16; - XAppGroup app_group B32; + CARD16 length; + XAppGroup app_group; } xXagDestroyReq; #define sz_xXagDestroyReq 8 typedef struct _XagGetAttr { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagGetAttr */ - CARD16 length B16; - XAppGroup app_group B32; + CARD16 length; + XAppGroup app_group; } xXagGetAttrReq; #define sz_xXagGetAttrReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - Window default_root B32; - VisualID root_visual B32; - Colormap default_colormap B32; - CARD32 black_pixel B32; - CARD32 white_pixel B32; + CARD16 sequence_number; + CARD32 length; + Window default_root; + VisualID root_visual; + Colormap default_colormap; + CARD32 black_pixel; + CARD32 white_pixel; BOOL single_screen; BOOL app_group_leader; - CARD16 pad2 B16; + CARD16 pad2; } xXagGetAttrReply; #define sz_xXagGetAttrReply 32 typedef struct _XagQuery { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagQuery */ - CARD16 length B16; - CARD32 resource B32; + CARD16 length; + CARD32 resource; } xXagQueryReq; #define sz_xXagQueryReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - XAppGroup app_group B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequence_number; + CARD32 length; + XAppGroup app_group; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXagQueryReply; #define sz_xXagQueryReply 32 typedef struct _XagCreateAssoc { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagCreateAssoc */ - CARD16 length B16; - Window window B32; - CARD16 window_type B16; - CARD16 system_window_len B16; /* LISTofCARD8 follows */ + CARD16 length; + Window window; + CARD16 window_type; + CARD16 system_window_len; /* LISTofCARD8 follows */ } xXagCreateAssocReq; #define sz_xXagCreateAssocReq 12 typedef struct _XagDestroyAssoc { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagDestroyAssoc */ - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xXagDestroyAssocReq; #define sz_xXagDestroyAssocReq 8 diff --git a/proto/xorgproto/include/X11/extensions/applewmproto.h b/proto/xorgproto/include/X11/extensions/applewmproto.h index d8be4e640..91417361e 100644 --- a/proto/xorgproto/include/X11/extensions/applewmproto.h +++ b/proto/xorgproto/include/X11/extensions/applewmproto.h @@ -74,76 +74,76 @@ restoring the definitions in X.h. */ typedef struct _AppleWMQueryVersion { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMQueryVersion */ - CARD16 length B16; + CARD16 length; } xAppleWMQueryVersionReq; #define sz_xAppleWMQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of WM protocol */ - CARD16 minorVersion B16; /* minor version of WM protocol */ - CARD32 patchVersion B32; /* patch version of WM protocol */ - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of WM protocol */ + CARD16 minorVersion; /* minor version of WM protocol */ + CARD32 patchVersion; /* patch version of WM protocol */ + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleWMQueryVersionReply; #define sz_xAppleWMQueryVersionReply 32 typedef struct _AppleWMDisableUpdate { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMDisableUpdate */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xAppleWMDisableUpdateReq; #define sz_xAppleWMDisableUpdateReq 8 typedef struct _AppleWMReenableUpdate { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMReenableUpdate */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xAppleWMReenableUpdateReq; #define sz_xAppleWMReenableUpdateReq 8 typedef struct _AppleWMSelectInput { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMSelectInput */ - CARD16 length B16; - CARD32 mask B32; + CARD16 length; + CARD32 mask; } xAppleWMSelectInputReq; #define sz_xAppleWMSelectInputReq 8 typedef struct _AppleWMNotify { BYTE type; /* always eventBase + event type */ BYTE kind; - CARD16 sequenceNumber B16; - Time time B32; /* time of change */ - CARD16 pad1 B16; - CARD32 arg B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + Time time; /* time of change */ + CARD16 pad1; + CARD32 arg; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleWMNotifyEvent; #define sz_xAppleWMNotifyEvent 32 typedef struct _AppleWMSetWindowMenu { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMSetWindowMenu */ - CARD16 length B16; - CARD16 nitems B16; - CARD16 pad1 B16; + CARD16 length; + CARD16 nitems; + CARD16 pad1; } xAppleWMSetWindowMenuReq; #define sz_xAppleWMSetWindowMenuReq 8 typedef struct _AppleWMSetWindowMenuCheck { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMSetWindowMenuCheck */ - CARD16 length B16; + CARD16 length; CARD32 index; } xAppleWMSetWindowMenuCheckReq; #define sz_xAppleWMSetWindowMenuCheckReq 8 @@ -151,14 +151,14 @@ typedef struct _AppleWMSetWindowMenuCheck { typedef struct _AppleWMSetFrontProcess { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMSetFrontProcess */ - CARD16 length B16; + CARD16 length; } xAppleWMSetFrontProcessReq; #define sz_xAppleWMSetFrontProcessReq 4 typedef struct _AppleWMSetWindowLevel { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMSetWindowLevel */ - CARD16 length B16; + CARD16 length; CARD32 window; CARD32 level; } xAppleWMSetWindowLevelReq; @@ -167,7 +167,7 @@ typedef struct _AppleWMSetWindowLevel { typedef struct _AppleWMSendPSN { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMSendPSN */ - CARD16 length B16; + CARD16 length; CARD32 psn_hi; CARD32 psn_lo; } xAppleWMSendPSNReq; @@ -176,7 +176,7 @@ typedef struct _AppleWMSendPSN { typedef struct _AppleWMAttachTransient { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMAttachTransient */ - CARD16 length B16; + CARD16 length; CARD32 child; CARD32 parent; } xAppleWMAttachTransientReq; @@ -185,7 +185,7 @@ typedef struct _AppleWMAttachTransient { typedef struct _AppleWMSetCanQuit { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMSetCanQuit */ - CARD16 length B16; + CARD16 length; CARD32 state; } xAppleWMSetCanQuitReq; #define sz_xAppleWMSetCanQuitReq 8 @@ -193,86 +193,86 @@ typedef struct _AppleWMSetCanQuit { typedef struct _AppleWMFrameGetRect { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMFrameGetRect */ - CARD16 length B16; - CARD16 frame_class B16; - CARD16 frame_rect B16; - CARD16 ix B16; - CARD16 iy B16; - CARD16 iw B16; - CARD16 ih B16; - CARD16 ox B16; - CARD16 oy B16; - CARD16 ow B16; - CARD16 oh B16; + CARD16 length; + CARD16 frame_class; + CARD16 frame_rect; + CARD16 ix; + CARD16 iy; + CARD16 iw; + CARD16 ih; + CARD16 ox; + CARD16 oy; + CARD16 ow; + CARD16 oh; } xAppleWMFrameGetRectReq; #define sz_xAppleWMFrameGetRectReq 24 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 x B16; - CARD16 y B16; - CARD16 w B16; - CARD16 h B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 x; + CARD16 y; + CARD16 w; + CARD16 h; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleWMFrameGetRectReply; #define sz_xAppleWMFrameGetRectReply 32 typedef struct _AppleWMFrameHitTest { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMFrameHitTest */ - CARD16 length B16; - CARD16 frame_class B16; - CARD16 pad1 B16; - CARD16 px B16; - CARD16 py B16; - CARD16 ix B16; - CARD16 iy B16; - CARD16 iw B16; - CARD16 ih B16; - CARD16 ox B16; - CARD16 oy B16; - CARD16 ow B16; - CARD16 oh B16; + CARD16 length; + CARD16 frame_class; + CARD16 pad1; + CARD16 px; + CARD16 py; + CARD16 ix; + CARD16 iy; + CARD16 iw; + CARD16 ih; + CARD16 ox; + CARD16 oy; + CARD16 ow; + CARD16 oh; } xAppleWMFrameHitTestReq; #define sz_xAppleWMFrameHitTestReq 28 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 ret B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 ret; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleWMFrameHitTestReply; #define sz_xAppleWMFrameHitTestReply 32 typedef struct _AppleWMFrameDraw { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_AppleWMFrameDraw */ - CARD16 length B16; - CARD32 screen B32; - CARD32 window B32; - CARD16 frame_class B16; - CARD16 frame_attr B16; - CARD16 ix B16; - CARD16 iy B16; - CARD16 iw B16; - CARD16 ih B16; - CARD16 ox B16; - CARD16 oy B16; - CARD16 ow B16; - CARD16 oh B16; - CARD32 title_length B32; + CARD16 length; + CARD32 screen; + CARD32 window; + CARD16 frame_class; + CARD16 frame_attr; + CARD16 ix; + CARD16 iy; + CARD16 iw; + CARD16 ih; + CARD16 ox; + CARD16 oy; + CARD16 ow; + CARD16 oh; + CARD32 title_length; } xAppleWMFrameDrawReq; #define sz_xAppleWMFrameDrawReq 36 diff --git a/proto/xorgproto/include/X11/extensions/bigreqsproto.h b/proto/xorgproto/include/X11/extensions/bigreqsproto.h index bd0f8e568..df96a766f 100644 --- a/proto/xorgproto/include/X11/extensions/bigreqsproto.h +++ b/proto/xorgproto/include/X11/extensions/bigreqsproto.h @@ -38,21 +38,21 @@ in this Software without prior written authorization from The Open Group. typedef struct { CARD8 reqType; /* always XBigReqCode */ CARD8 brReqType; /* always X_BigReqEnable */ - CARD16 length B16; + CARD16 length; } xBigReqEnableReq; #define sz_xBigReqEnableReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 max_request_size B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 max_request_size; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xBigReqEnableReply; #define sz_xBigReqEnableReply 32 @@ -60,8 +60,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 data; - CARD16 zero B16; - CARD32 length B32; + CARD16 zero; + CARD32 length; } xBigReq; #endif /* _BIGREQSPROTO_H_ */ diff --git a/proto/xorgproto/include/X11/extensions/compositeproto.h b/proto/xorgproto/include/X11/extensions/compositeproto.h index 0417f2ce3..b63f9cc95 100644 --- a/proto/xorgproto/include/X11/extensions/compositeproto.h +++ b/proto/xorgproto/include/X11/extensions/compositeproto.h @@ -52,15 +52,15 @@ #define Region CARD32 #define Pixmap CARD32 -/* +/* * requests and replies */ typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xCompositeQueryVersionReq; #define sz_xCompositeQueryVersionReq 12 @@ -68,14 +68,14 @@ typedef struct { 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xCompositeQueryVersionReply; #define sz_xCompositeQueryVersionReply 32 @@ -83,11 +83,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; CARD8 update; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xCompositeRedirectWindowReq; #define sz_xCompositeRedirectWindowReq 12 @@ -95,11 +95,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; CARD8 update; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xCompositeRedirectSubwindowsReq; #define sz_xCompositeRedirectSubwindowsReq 12 @@ -107,11 +107,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; CARD8 update; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xCompositeUnredirectWindowReq; #define sz_xCompositeUnredirectWindowReq 12 @@ -119,11 +119,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; CARD8 update; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xCompositeUnredirectSubwindowsReq; #define sz_xCompositeUnredirectSubwindowsReq 12 @@ -131,9 +131,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - Region region B32; - Window window B32; + CARD16 length; + Region region; + Window window; } xCompositeCreateRegionFromBorderClipReq; #define sz_xCompositeCreateRegionFromBorderClipReq 12 @@ -144,8 +144,8 @@ typedef struct { CARD8 reqType; CARD8 compositeReqType; CARD16 length; - Window window B32; - Pixmap pixmap B32; + Window window; + Pixmap pixmap; } xCompositeNameWindowPixmapReq; #define sz_xCompositeNameWindowPixmapReq 12 @@ -155,8 +155,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xCompositeGetOverlayWindowReq; #define sz_xCompositeGetOverlayWindowReq sizeof(xCompositeGetOverlayWindowReq) @@ -164,14 +164,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - Window overlayWin B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + Window overlayWin; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xCompositeGetOverlayWindowReply; #define sz_xCompositeGetOverlayWindowReply sizeof(xCompositeGetOverlayWindowReply) @@ -179,8 +179,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 compositeReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xCompositeReleaseOverlayWindowReq; #define sz_xCompositeReleaseOverlayWindowReq sizeof(xCompositeReleaseOverlayWindowReq) diff --git a/proto/xorgproto/include/X11/extensions/cupproto.h b/proto/xorgproto/include/X11/extensions/cupproto.h index f61c9f0a7..a0c3d16e8 100644 --- a/proto/xorgproto/include/X11/extensions/cupproto.h +++ b/proto/xorgproto/include/X11/extensions/cupproto.h @@ -36,68 +36,68 @@ in this Software without prior written authorization from The Open Group. typedef struct _XcupQueryVersion { CARD8 reqType; /* always XcupReqCode */ CARD8 xcupReqType; /* always X_XcupQueryVersion */ - CARD16 length B16; - CARD16 client_major_version B16; - CARD16 client_minor_version B16; + CARD16 length; + CARD16 client_major_version; + CARD16 client_minor_version; } xXcupQueryVersionReq; #define sz_xXcupQueryVersionReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD16 server_major_version B16; - CARD16 server_minor_version B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequence_number; + CARD32 length; + CARD16 server_major_version; + CARD16 server_minor_version; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXcupQueryVersionReply; #define sz_xXcupQueryVersionReply 32 typedef struct _XcupGetReservedColormapEntries { CARD8 reqType; /* always XcupReqCode */ CARD8 xcupReqType; /* always X_XcupGetReservedColormapEntries */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXcupGetReservedColormapEntriesReq; #define sz_xXcupGetReservedColormapEntriesReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequence_number; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXcupGetReservedColormapEntriesReply; #define sz_xXcupGetReservedColormapEntriesReply 32 typedef struct _XcupStoreColors { CARD8 reqType; /* always XcupReqCode */ CARD8 xcupReqType; /* always X_XcupStoreColors */ - CARD16 length B16; - CARD32 cmap B32; + CARD16 length; + CARD32 cmap; } xXcupStoreColorsReq; #define sz_xXcupStoreColorsReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequence_number; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXcupStoreColorsReply; #define sz_xXcupStoreColorsReply 32 diff --git a/proto/xorgproto/include/X11/extensions/damageproto.h b/proto/xorgproto/include/X11/extensions/damageproto.h index 107e19271..bff6c180e 100644 --- a/proto/xorgproto/include/X11/extensions/damageproto.h +++ b/proto/xorgproto/include/X11/extensions/damageproto.h @@ -49,19 +49,19 @@ typedef struct { CARD8 reqType; CARD8 damageReqType; - CARD16 length B16; + CARD16 length; } xDamageReq; -/* +/* * requests and replies */ typedef struct { CARD8 reqType; CARD8 damageReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xDamageQueryVersionReq; #define sz_xDamageQueryVersionReq 12 @@ -69,14 +69,14 @@ typedef struct { 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDamageQueryVersionReply; #define sz_xDamageQueryVersionReply 32 @@ -84,12 +84,12 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; - Drawable drawable B32; + CARD16 length; + Damage damage; + Drawable drawable; CARD8 level; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xDamageCreateReq; #define sz_xDamageCreateReq 16 @@ -97,8 +97,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; + CARD16 length; + Damage damage; } xDamageDestroyReq; #define sz_xDamageDestroyReq 8 @@ -106,10 +106,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; - Region repair B32; - Region parts B32; + CARD16 length; + Damage damage; + Region repair; + Region parts; } xDamageSubtractReq; #define sz_xDamageSubtractReq 16 @@ -117,9 +117,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 damageReqType; - CARD16 length B16; - Drawable drawable B32; - Region region B32; + CARD16 length; + Drawable drawable; + Region region; } xDamageAddReq; #define sz_xDamageAddReq 12 @@ -131,10 +131,10 @@ typedef struct { typedef struct { CARD8 type; CARD8 level; - CARD16 sequenceNumber B16; - Drawable drawable B32; - Damage damage B32; - Time timestamp B32; + CARD16 sequenceNumber; + Drawable drawable; + Damage damage; + Time timestamp; xRectangle area; xRectangle geometry; } xDamageNotifyEvent; diff --git a/proto/xorgproto/include/X11/extensions/dbeproto.h b/proto/xorgproto/include/X11/extensions/dbeproto.h index 784926e33..d6f712388 100644 --- a/proto/xorgproto/include/X11/extensions/dbeproto.h +++ b/proto/xorgproto/include/X11/extensions/dbeproto.h @@ -54,32 +54,32 @@ typedef CARD32 xDbeBackBuffer; typedef struct { - CARD32 window B32; /* window */ + CARD32 window; /* window */ xDbeSwapAction swapAction; /* swap action */ CARD8 pad1; /* unused */ - CARD16 pad2 B16; + CARD16 pad2; } xDbeSwapInfo; typedef struct { - CARD32 visualID B32; /* associated visual */ + CARD32 visualID; /* associated visual */ CARD8 depth; /* depth of visual */ CARD8 perfLevel; /* performance level hint */ - CARD16 pad1 B16; + CARD16 pad1; } xDbeVisInfo; #define sz_xDbeVisInfo 8 typedef struct { - CARD32 n B32; /* number of visual info items in list */ + CARD32 n; /* number of visual info items in list */ } xDbeScreenVisInfo; /* followed by n xDbeVisInfo items */ typedef struct { - CARD32 window B32; /* window */ + CARD32 window; /* window */ } xDbeBufferAttributes; @@ -90,10 +90,10 @@ typedef struct { CARD8 reqType; /* major-opcode: always codes->major_opcode */ CARD8 dbeReqType; /* minor-opcode: always X_DbeGetVersion (0) */ - CARD16 length B16; /* request length: (2) */ + CARD16 length; /* request length: (2) */ CARD8 majorVersion; /* client-major-version */ CARD8 minorVersion; /* client-minor-version */ - CARD16 unused B16; /* unused */ + CARD16 unused; /* unused */ } xDbeGetVersionReq; #define sz_xDbeGetVersionReq 8 @@ -102,16 +102,16 @@ typedef struct { BYTE type; /* Reply: X_Reply (1) */ CARD8 unused; /* unused */ - CARD16 sequenceNumber B16; /* sequence number */ - CARD32 length B32; /* reply length: (0) */ + CARD16 sequenceNumber; /* sequence number */ + CARD32 length; /* reply length: (0) */ CARD8 majorVersion; /* server-major-version */ CARD8 minorVersion; /* server-minor-version */ - CARD16 pad1 B16; /* unused */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; /* unused */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xDbeGetVersionReply; #define sz_xDbeGetVersionReply 32 @@ -120,12 +120,12 @@ typedef struct { CARD8 reqType; /* major-opcode: codes->major_opcode */ CARD8 dbeReqType; /* X_DbeAllocateBackBufferName (1) */ - CARD16 length B16; /* request length: (4) */ - CARD32 window B32; /* window */ - xDbeBackBuffer buffer B32; /* back buffer name */ + CARD16 length; /* request length: (4) */ + CARD32 window; /* window */ + xDbeBackBuffer buffer; /* back buffer name */ xDbeSwapAction swapAction; /* swap action hint */ CARD8 pad1; /* unused */ - CARD16 pad2 B16; + CARD16 pad2; } xDbeAllocateBackBufferNameReq; #define sz_xDbeAllocateBackBufferNameReq 16 @@ -134,8 +134,8 @@ typedef struct { CARD8 reqType; /* major-opcode: codes->major_opcode */ CARD8 dbeReqType; /* X_DbeDeallocateBackBufferName (2) */ - CARD16 length B16; /* request length: (2) */ - xDbeBackBuffer buffer B32; /* back buffer name */ + CARD16 length; /* request length: (2) */ + xDbeBackBuffer buffer; /* back buffer name */ } xDbeDeallocateBackBufferNameReq; #define sz_xDbeDeallocateBackBufferNameReq 8 @@ -144,8 +144,8 @@ typedef struct { CARD8 reqType; /* major-opcode: always codes->major_opcode */ CARD8 dbeReqType; /* minor-opcode: always X_DbeSwapBuffers (3) */ - CARD16 length B16; /* request length: (2+2n) */ - CARD32 n B32; /* n, number of window/swap action pairs */ + CARD16 length; /* request length: (2+2n) */ + CARD32 n; /* n, number of window/swap action pairs */ } xDbeSwapBuffersReq; /* followed by n window/swap action pairs */ #define sz_xDbeSwapBuffersReq 8 @@ -154,7 +154,7 @@ typedef struct { CARD8 reqType; /* major-opcode: always codes->major_opcode */ CARD8 dbeReqType; /* minor-opcode: always X_DbeBeginIdom (4) */ - CARD16 length B16; /* request length: (1) */ + CARD16 length; /* request length: (1) */ } xDbeBeginIdiomReq; #define sz_xDbeBeginIdiomReq 4 @@ -163,7 +163,7 @@ typedef struct { CARD8 reqType; /* major-opcode: always codes->major_opcode */ CARD8 dbeReqType; /* minor-opcode: always X_DbeEndIdom (5) */ - CARD16 length B16; /* request length: (1) */ + CARD16 length; /* request length: (1) */ } xDbeEndIdiomReq; #define sz_xDbeEndIdiomReq 4 @@ -172,8 +172,8 @@ typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 dbeReqType; /* always X_DbeGetVisualInfo (6) */ - CARD16 length B16; /* request length: (2+n) */ - CARD32 n B32; /* n, number of drawables in list */ + CARD16 length; /* request length: (2+n) */ + CARD32 n; /* n, number of drawables in list */ } xDbeGetVisualInfoReq; /* followed by n drawables */ #define sz_xDbeGetVisualInfoReq 8 @@ -182,14 +182,14 @@ typedef struct { BYTE type; /* Reply: X_Reply (1) */ CARD8 unused; /* unused */ - CARD16 sequenceNumber B16; /* sequence number */ - CARD32 length B32; /* reply length */ + CARD16 sequenceNumber; /* sequence number */ + CARD32 length; /* reply length */ CARD32 m; /* m, number of visual infos in list */ - CARD32 pad1 B32; /* unused */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD32 pad1; /* unused */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDbeGetVisualInfoReply; /* followed by m visual infos */ #define sz_xDbeGetVisualInfoReply 32 @@ -198,8 +198,8 @@ typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 dbeReqType; /* X_DbeGetBackBufferAttributes (7) */ - CARD16 length B16; /* request length: (2) */ - xDbeBackBuffer buffer B32; /* back buffer name */ + CARD16 length; /* request length: (2) */ + xDbeBackBuffer buffer; /* back buffer name */ } xDbeGetBackBufferAttributesReq; #define sz_xDbeGetBackBufferAttributesReq 8 @@ -208,14 +208,14 @@ typedef struct { BYTE type; /* Reply: X_Reply (1) */ CARD8 unused; /* unused */ - CARD16 sequenceNumber B16; /* sequence number */ - CARD32 length B32; /* reply length: (0) */ + CARD16 sequenceNumber; /* sequence number */ + CARD32 length; /* reply length: (0) */ CARD32 attributes; /* attributes */ - CARD32 pad1 B32; /* unused */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD32 pad1; /* unused */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDbeGetBackBufferAttributesReply; #define sz_xDbeGetBackBufferAttributesReply 32 diff --git a/proto/xorgproto/include/X11/extensions/dmxproto.h b/proto/xorgproto/include/X11/extensions/dmxproto.h index 4bb160e1d..c8bc86286 100644 --- a/proto/xorgproto/include/X11/extensions/dmxproto.h +++ b/proto/xorgproto/include/X11/extensions/dmxproto.h @@ -74,7 +74,7 @@ typedef struct { CARD8 reqType; /* dmxcode */ CARD8 dmxReqType; /* X_DMXQueryVersion */ - CARD16 length B16; + CARD16 length; } xDMXQueryVersionReq; #define sz_xDMXQueryVersionReq 4 @@ -82,14 +82,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 ununsed; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 majorVersion B32; - CARD32 minorVersion B32; - CARD32 patchVersion B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 patchVersion; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; } xDMXQueryVersionReply; #define sz_xDMXQueryVersionReply 32 @@ -97,7 +97,7 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXSync */ - CARD16 length B16; + CARD16 length; } xDMXSyncReq; #define sz_xDMXSyncReq 4 @@ -105,14 +105,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXSyncReply; #define sz_xDMXSyncReply 32 @@ -120,8 +120,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXForceWindowCreation */ - CARD16 length B16; - CARD32 window B32; + CARD16 length; + CARD32 window; } xDMXForceWindowCreationReq; #define sz_xDMXForceWindowCreationReq 8 @@ -129,14 +129,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXForceWindowCreationReply; #define sz_xDMXForceWindowCreationReply 32 @@ -144,7 +144,7 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXGetScreenCount */ - CARD16 length B16; + CARD16 length; } xDMXGetScreenCountReq; #define sz_xDMXGetScreenCountReq 4 @@ -152,14 +152,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 screenCount B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 screenCount; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXGetScreenCountReply; #define sz_xDMXGetScreenCountReply 32 @@ -167,8 +167,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXGetScreenAttributes */ - CARD16 length B16; - CARD32 physicalScreen B32; + CARD16 length; + CARD32 physicalScreen; } xDMXGetScreenAttributesReq; #define sz_xDMXGetScreenAttributesReq 8 @@ -176,22 +176,22 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 displayNameLength B32; - CARD32 logicalScreen B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 displayNameLength; + CARD32 logicalScreen; - CARD16 screenWindowWidth B16; - CARD16 screenWindowHeight B16; - INT16 screenWindowXoffset B16; - INT16 screenWindowYoffset B16; + CARD16 screenWindowWidth; + CARD16 screenWindowHeight; + INT16 screenWindowXoffset; + INT16 screenWindowYoffset; - CARD16 rootWindowWidth B16; - CARD16 rootWindowHeight B16; - INT16 rootWindowXoffset B16; - INT16 rootWindowYoffset B16; - INT16 rootWindowXorigin B16; - INT16 rootWindowYorigin B16; + CARD16 rootWindowWidth; + CARD16 rootWindowHeight; + INT16 rootWindowXoffset; + INT16 rootWindowYoffset; + INT16 rootWindowXorigin; + INT16 rootWindowYorigin; } xDMXGetScreenAttributesReply; #define sz_xDMXGetScreenAttributesReply 36 @@ -199,9 +199,9 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXChangeScreensAttributes */ - CARD16 length B16; - CARD32 screenCount B32; - CARD32 maskCount B32; + CARD16 length; + CARD32 screenCount; + CARD32 maskCount; } xDMXChangeScreensAttributesReq; #define sz_xDMXChangeScreensAttributesReq 12 @@ -209,14 +209,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 errorScreen B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 errorScreen; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xDMXChangeScreensAttributesReply; #define sz_xDMXChangeScreensAttributesReply 32 @@ -224,10 +224,10 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXAddScreen */ - CARD16 length B16; - CARD32 displayNameLength B32; - CARD32 physicalScreen B32; - CARD32 valueMask B32; + CARD16 length; + CARD32 displayNameLength; + CARD32 physicalScreen; + CARD32 valueMask; } xDMXAddScreenReq; #define sz_xDMXAddScreenReq 16 @@ -235,14 +235,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 physicalScreen B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 physicalScreen; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xDMXAddScreenReply; #define sz_xDMXAddScreenReply 32 @@ -250,8 +250,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXRemoveScreen */ - CARD16 length B16; - CARD32 physicalScreen B32; + CARD16 length; + CARD32 physicalScreen; } xDMXRemoveScreenReq; #define sz_xDMXRemoveScreenReq 8 @@ -259,14 +259,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXRemoveScreenReply; #define sz_xDMXRemoveScreenReply 32 @@ -274,8 +274,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXGetWindowAttributes */ - CARD16 length B16; - CARD32 window B32; + CARD16 length; + CARD32 window; } xDMXGetWindowAttributesReq; #define sz_xDMXGetWindowAttributesReq 8 @@ -283,14 +283,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 screenCount B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 screenCount; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXGetWindowAttributesReply; #define sz_xDMXGetWindowAttributesReply 32 @@ -298,7 +298,7 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXGetDesktopAttributes */ - CARD16 length B16; + CARD16 length; } xDMXGetDesktopAttributesReq; #define sz_xDMXGetDesktopAttributesReq 4 @@ -306,16 +306,16 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; INT16 width; INT16 height; INT16 shiftX; INT16 shiftY; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xDMXGetDesktopAttributesReply; #define sz_xDMXGetDesktopAttributesReply 32 @@ -323,8 +323,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXChangeDesktopAttributes */ - CARD16 length B16; - CARD32 valueMask B32; + CARD16 length; + CARD32 valueMask; } xDMXChangeDesktopAttributesReq; #define sz_xDMXChangeDesktopAttributesReq 8 @@ -332,14 +332,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXChangeDesktopAttributesReply; #define sz_xDMXChangeDesktopAttributesReply 32 @@ -347,7 +347,7 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXGetInputCount */ - CARD16 length B16; + CARD16 length; } xDMXGetInputCountReq; #define sz_xDMXGetInputCountReq 4 @@ -355,14 +355,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 inputCount B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 inputCount; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXGetInputCountReply; #define sz_xDMXGetInputCountReply 32 @@ -370,8 +370,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXGetInputAttributes */ - CARD16 length B16; - CARD32 deviceId B32; + CARD16 length; + CARD32 deviceId; } xDMXGetInputAttributesReq; #define sz_xDMXGetInputAttributesReq 8 @@ -379,17 +379,17 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 inputType B32; - CARD32 physicalScreen B32; - CARD32 physicalId B32; - CARD32 nameLength B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 inputType; + CARD32 physicalScreen; + CARD32 physicalId; + CARD32 nameLength; BOOL isCore; BOOL sendsCore; BOOL detached; CARD8 pad0; - CARD32 pad1 B32; + CARD32 pad1; } xDMXGetInputAttributesReply; #define sz_xDMXGetInputAttributesReply 32 @@ -397,8 +397,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXAddInput */ - CARD16 length B16; - CARD32 displayNameLength B32; + CARD16 length; + CARD32 displayNameLength; CARD32 valueMask; } xDMXAddInputReq; #define sz_xDMXAddInputReq 12 @@ -407,14 +407,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 physicalId B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 physicalId; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xDMXAddInputReply; #define sz_xDMXAddInputReply 32 @@ -422,8 +422,8 @@ typedef struct { typedef struct { CARD8 reqType; /* DMXCode */ CARD8 dmxReqType; /* X_DMXRemoveInput */ - CARD16 length B16; - CARD32 physicalId B32; + CARD16 length; + CARD32 physicalId; } xDMXRemoveInputReq; #define sz_xDMXRemoveInputReq 8 @@ -431,14 +431,14 @@ typedef struct { typedef struct { BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDMXRemoveInputReply; #define sz_xDMXRemoveInputReply 32 diff --git a/proto/xorgproto/include/X11/extensions/dpmsproto.h b/proto/xorgproto/include/X11/extensions/dpmsproto.h index 63fd3fc0e..c8470165a 100644 --- a/proto/xorgproto/include/X11/extensions/dpmsproto.h +++ b/proto/xorgproto/include/X11/extensions/dpmsproto.h @@ -48,127 +48,127 @@ Equipment Corporation. typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSGetVersion */ - CARD16 length B16; - CARD16 majorVersion B16; - CARD16 minorVersion B16; + CARD16 length; + CARD16 majorVersion; + CARD16 minorVersion; } xDPMSGetVersionReq; #define sz_xDPMSGetVersionReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; - CARD16 minorVersion B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; + CARD16 minorVersion; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDPMSGetVersionReply; #define sz_xDPMSGetVersionReply 32 typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSCapable */ - CARD16 length B16; + CARD16 length; } xDPMSCapableReq; #define sz_xDPMSCapableReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL capable; CARD8 pad1; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xDPMSCapableReply; #define sz_xDPMSCapableReply 32 typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSGetTimeouts */ - CARD16 length B16; + CARD16 length; } xDPMSGetTimeoutsReq; #define sz_xDPMSGetTimeoutsReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 standby B16; - CARD16 suspend B16; - CARD16 off B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 standby; + CARD16 suspend; + CARD16 off; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDPMSGetTimeoutsReply; #define sz_xDPMSGetTimeoutsReply 32 typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSSetTimeouts */ - CARD16 length B16; - CARD16 standby B16; - CARD16 suspend B16; - CARD16 off B16; - CARD16 pad0 B16; + CARD16 length; + CARD16 standby; + CARD16 suspend; + CARD16 off; + CARD16 pad0; } xDPMSSetTimeoutsReq; #define sz_xDPMSSetTimeoutsReq 12 typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSEnable */ - CARD16 length B16; + CARD16 length; } xDPMSEnableReq; #define sz_xDPMSEnableReq 4 typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSDisable */ - CARD16 length B16; + CARD16 length; } xDPMSDisableReq; #define sz_xDPMSDisableReq 4 typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSForceLevel */ - CARD16 length B16; - CARD16 level B16; /* power level requested */ - CARD16 pad0 B16; + CARD16 length; + CARD16 level; /* power level requested */ + CARD16 pad0; } xDPMSForceLevelReq; #define sz_xDPMSForceLevelReq 8 typedef struct { CARD8 reqType; /* always DPMSCode */ CARD8 dpmsReqType; /* always X_DPMSInfo */ - CARD16 length B16; + CARD16 length; } xDPMSInfoReq; #define sz_xDPMSInfoReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 power_level B16; + CARD16 sequenceNumber; + CARD32 length; + CARD16 power_level; BOOL state; CARD8 pad1; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xDPMSInfoReply; #define sz_xDPMSInfoReply 32 diff --git a/proto/xorgproto/include/X11/extensions/dri2proto.h b/proto/xorgproto/include/X11/extensions/dri2proto.h index 128b807b1..c1775fddf 100644 --- a/proto/xorgproto/include/X11/extensions/dri2proto.h +++ b/proto/xorgproto/include/X11/extensions/dri2proto.h @@ -63,294 +63,294 @@ #define DRI2_InvalidateBuffers 1 typedef struct { - CARD32 attachment B32; - CARD32 name B32; - CARD32 pitch B32; - CARD32 cpp B32; - CARD32 flags B32; + CARD32 attachment; + CARD32 name; + CARD32 pitch; + CARD32 cpp; + CARD32 flags; } xDRI2Buffer; typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xDRI2QueryVersionReq; #define sz_xDRI2QueryVersionReq 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDRI2QueryVersionReply; #define sz_xDRI2QueryVersionReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 window B32; - CARD32 driverType B32; + CARD16 length; + CARD32 window; + CARD32 driverType; } xDRI2ConnectReq; #define sz_xDRI2ConnectReq 12 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 driverNameLength B32; - CARD32 deviceNameLength B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 driverNameLength; + CARD32 deviceNameLength; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDRI2ConnectReply; #define sz_xDRI2ConnectReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 window B32; - CARD32 magic B32; + CARD16 length; + CARD32 window; + CARD32 magic; } xDRI2AuthenticateReq; #define sz_xDRI2AuthenticateReq 12 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 authenticated B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 authenticated; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xDRI2AuthenticateReply; #define sz_xDRI2AuthenticateReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; + CARD16 length; + CARD32 drawable; } xDRI2CreateDrawableReq; #define sz_xDRI2CreateDrawableReq 8 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; + CARD16 length; + CARD32 drawable; } xDRI2DestroyDrawableReq; #define sz_xDRI2DestroyDrawableReq 8 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 count B32; + CARD16 length; + CARD32 drawable; + CARD32 count; } xDRI2GetBuffersReq; #define sz_xDRI2GetBuffersReq 12 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 width B32; - CARD32 height B32; - CARD32 count B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 width; + CARD32 height; + CARD32 count; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDRI2GetBuffersReply; #define sz_xDRI2GetBuffersReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 region B32; - CARD32 dest B32; - CARD32 src B32; + CARD16 length; + CARD32 drawable; + CARD32 region; + CARD32 dest; + CARD32 src; } xDRI2CopyRegionReq; #define sz_xDRI2CopyRegionReq 20 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xDRI2CopyRegionReply; #define sz_xDRI2CopyRegionReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 target_msc_hi B32; - CARD32 target_msc_lo B32; - CARD32 divisor_hi B32; - CARD32 divisor_lo B32; - CARD32 remainder_hi B32; - CARD32 remainder_lo B32; + CARD16 length; + CARD32 drawable; + CARD32 target_msc_hi; + CARD32 target_msc_lo; + CARD32 divisor_hi; + CARD32 divisor_lo; + CARD32 remainder_hi; + CARD32 remainder_lo; } xDRI2SwapBuffersReq; #define sz_xDRI2SwapBuffersReq 32 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 swap_hi B32; - CARD32 swap_lo B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 swap_hi; + CARD32 swap_lo; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDRI2SwapBuffersReply; #define sz_xDRI2SwapBuffersReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; + CARD16 length; + CARD32 drawable; } xDRI2GetMSCReq; #define sz_xDRI2GetMSCReq 8 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 target_msc_hi B32; - CARD32 target_msc_lo B32; - CARD32 divisor_hi B32; - CARD32 divisor_lo B32; - CARD32 remainder_hi B32; - CARD32 remainder_lo B32; + CARD16 length; + CARD32 drawable; + CARD32 target_msc_hi; + CARD32 target_msc_lo; + CARD32 divisor_hi; + CARD32 divisor_lo; + CARD32 remainder_hi; + CARD32 remainder_lo; } xDRI2WaitMSCReq; #define sz_xDRI2WaitMSCReq 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 target_sbc_hi B32; - CARD32 target_sbc_lo B32; + CARD16 length; + CARD32 drawable; + CARD32 target_sbc_hi; + CARD32 target_sbc_lo; } xDRI2WaitSBCReq; #define sz_xDRI2WaitSBCReq 16 typedef struct { CARD8 type; CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 ust_hi B32; - CARD32 ust_lo B32; - CARD32 msc_hi B32; - CARD32 msc_lo B32; - CARD32 sbc_hi B32; - CARD32 sbc_lo B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 ust_hi; + CARD32 ust_lo; + CARD32 msc_hi; + CARD32 msc_lo; + CARD32 sbc_hi; + CARD32 sbc_lo; } xDRI2MSCReply; #define sz_xDRI2MSCReply 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 interval B32; + CARD16 length; + CARD32 drawable; + CARD32 interval; } xDRI2SwapIntervalReq; #define sz_xDRI2SwapIntervalReq 12 typedef struct { CARD8 type; CARD8 pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; + CARD16 sequenceNumber; + CARD16 event_type; CARD16 pad2; - CARD32 drawable B32; - CARD32 ust_hi B32; - CARD32 ust_lo B32; - CARD32 msc_hi B32; - CARD32 msc_lo B32; - CARD32 sbc_hi B32; - CARD32 sbc_lo B32; + CARD32 drawable; + CARD32 ust_hi; + CARD32 ust_lo; + CARD32 msc_hi; + CARD32 msc_lo; + CARD32 sbc_hi; + CARD32 sbc_lo; } xDRI2BufferSwapComplete; #define sz_xDRI2BufferSwapComplete 32 typedef struct { CARD8 type; CARD8 pad; - CARD16 sequenceNumber B16; - CARD16 event_type B16; + CARD16 sequenceNumber; + CARD16 event_type; CARD16 pad2; - CARD32 drawable B32; - CARD32 ust_hi B32; - CARD32 ust_lo B32; - CARD32 msc_hi B32; - CARD32 msc_lo B32; - CARD32 sbc B32; + CARD32 drawable; + CARD32 ust_hi; + CARD32 ust_lo; + CARD32 msc_hi; + CARD32 msc_lo; + CARD32 sbc; } xDRI2BufferSwapComplete2; #define sz_xDRI2BufferSwapComplete2 32 typedef struct { CARD8 type; CARD8 pad; - CARD16 sequenceNumber B16; - CARD32 drawable B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 drawable; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xDRI2InvalidateBuffers; #define sz_xDRI2InvalidateBuffers 32 typedef struct { CARD8 reqType; CARD8 dri2ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 param B32; + CARD16 length; + CARD32 drawable; + CARD32 param; } xDRI2GetParamReq; #define sz_xDRI2GetParamReq 12 typedef struct { BYTE type; /*X_Reply*/ BOOL is_param_recognized; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 value_hi B32; - CARD32 value_lo B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 value_hi; + CARD32 value_lo; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xDRI2GetParamReply; #define sz_xDRI2GetParamReply 32 diff --git a/proto/xorgproto/include/X11/extensions/dri3proto.h b/proto/xorgproto/include/X11/extensions/dri3proto.h index 51b825de1..d1f909bc0 100644 --- a/proto/xorgproto/include/X11/extensions/dri3proto.h +++ b/proto/xorgproto/include/X11/extensions/dri3proto.h @@ -47,59 +47,59 @@ typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xDRI3QueryVersionReq; #define sz_xDRI3QueryVersionReq 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xDRI3QueryVersionReply; #define sz_xDRI3QueryVersionReply 32 typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 provider B32; + CARD16 length; + CARD32 drawable; + CARD32 provider; } xDRI3OpenReq; #define sz_xDRI3OpenReq 12 typedef struct { BYTE type; /* X_Reply */ CARD8 nfd; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xDRI3OpenReply; #define sz_xDRI3OpenReply 32 typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 pixmap B32; - CARD32 drawable B32; - CARD32 size B32; - CARD16 width B16; - CARD16 height B16; - CARD16 stride B16; + CARD16 length; + CARD32 pixmap; + CARD32 drawable; + CARD32 size; + CARD16 width; + CARD16 height; + CARD16 stride; CARD8 depth; CARD8 bpp; } xDRI3PixmapFromBufferReq; @@ -109,37 +109,37 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 pixmap B32; + CARD16 length; + CARD32 pixmap; } xDRI3BufferFromPixmapReq; #define sz_xDRI3BufferFromPixmapReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 nfd; /* Number of file descriptors returned (1) */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 size B32; - CARD16 width B16; - CARD16 height B16; - CARD16 stride B16; + CARD16 sequenceNumber; + CARD32 length; + CARD32 size; + CARD16 width; + CARD16 height; + CARD16 stride; CARD8 depth; CARD8 bpp; - CARD32 pad20 B32; - CARD32 pad24 B32; - CARD32 pad28 B32; + CARD32 pad20; + CARD32 pad24; + CARD32 pad28; } xDRI3BufferFromPixmapReply; #define sz_xDRI3BufferFromPixmapReply 32 typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 fence B32; + CARD16 length; + CARD32 drawable; + CARD32 fence; BOOL initially_triggered; CARD8 pad13; - CARD16 pad14 B16; + CARD16 pad14; } xDRI3FenceFromFDReq; #define sz_xDRI3FenceFromFDReq 16 @@ -147,9 +147,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 drawable B32; - CARD32 fence B32; + CARD16 length; + CARD32 drawable; + CARD32 fence; } xDRI3FDFromFenceReq; #define sz_xDRI3FDFromFenceReq 12 @@ -157,14 +157,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 nfd; /* Number of file descriptors returned (1) */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad08 B32; - CARD32 pad12 B32; - CARD32 pad16 B32; - CARD32 pad20 B32; - CARD32 pad24 B32; - CARD32 pad28 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad08; + CARD32 pad12; + CARD32 pad16; + CARD32 pad20; + CARD32 pad24; + CARD32 pad28; } xDRI3FDFromFenceReply; #define sz_xDRI3FDFromFenceReply 32 @@ -174,50 +174,50 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 window B32; + CARD16 length; + CARD32 window; CARD8 depth; CARD8 bpp; - CARD16 pad10 B16; + CARD16 pad10; } xDRI3GetSupportedModifiersReq; #define sz_xDRI3GetSupportedModifiersReq 12 typedef struct { BYTE type; /* X_Reply */ CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numWindowModifiers B32; - CARD32 numScreenModifiers B32; - CARD32 pad16 B32; - CARD32 pad20 B32; - CARD32 pad24 B32; - CARD32 pad28 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numWindowModifiers; + CARD32 numScreenModifiers; + CARD32 pad16; + CARD32 pad20; + CARD32 pad24; + CARD32 pad28; } xDRI3GetSupportedModifiersReply; #define sz_xDRI3GetSupportedModifiersReply 32 typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 pixmap B32; - CARD32 window B32; + CARD16 length; + CARD32 pixmap; + CARD32 window; CARD8 num_buffers; /* Number of file descriptors passed */ CARD8 pad13; - CARD16 pad14 B16; - CARD16 width B16; - CARD16 height B16; - CARD32 stride0 B32; - CARD32 offset0 B32; - CARD32 stride1 B32; - CARD32 offset1 B32; - CARD32 stride2 B32; - CARD32 offset2 B32; - CARD32 stride3 B32; - CARD32 offset3 B32; + CARD16 pad14; + CARD16 width; + CARD16 height; + CARD32 stride0; + CARD32 offset0; + CARD32 stride1; + CARD32 offset1; + CARD32 stride2; + CARD32 offset2; + CARD32 stride3; + CARD32 offset3; CARD8 depth; CARD8 bpp; - CARD16 pad54 B16; + CARD16 pad54; CARD64 modifier; } xDRI3PixmapFromBuffersReq; #define sz_xDRI3PixmapFromBuffersReq 64 @@ -225,24 +225,24 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 dri3ReqType; - CARD16 length B16; - CARD32 pixmap B32; + CARD16 length; + CARD32 pixmap; } xDRI3BuffersFromPixmapReq; #define sz_xDRI3BuffersFromPixmapReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 nfd; /* Number of file descriptors returned */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 width B16; - CARD16 height B16; - CARD32 pad12 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 width; + CARD16 height; + CARD32 pad12; CARD64 modifier; CARD8 depth; CARD8 bpp; - CARD16 pad26 B16; - CARD32 pad28 B32; + CARD16 pad26; + CARD32 pad28; } xDRI3BuffersFromPixmapReply; #define sz_xDRI3BuffersFromPixmapReply 32 diff --git a/proto/xorgproto/include/X11/extensions/evieproto.h b/proto/xorgproto/include/X11/extensions/evieproto.h index 649c91adb..73822d5f8 100644 --- a/proto/xorgproto/include/X11/extensions/evieproto.h +++ b/proto/xorgproto/include/X11/extensions/evieproto.h @@ -42,113 +42,113 @@ DEALINGS IN THE SOFTWARE. typedef struct _XevieQueryVersion { CARD8 reqType; CARD8 xevieReqType; - CARD16 length B16; - CARD16 client_major_version B16; - CARD16 client_minor_version B16; + CARD16 length; + CARD16 client_major_version; + CARD16 client_minor_version; } xXevieQueryVersionReq; #define sz_xXevieQueryVersionReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD16 server_major_version B16; - CARD16 server_minor_version B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequence_number; + CARD32 length; + CARD16 server_major_version; + CARD16 server_minor_version; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXevieQueryVersionReply; #define sz_xXevieQueryVersionReply 32 typedef struct _XevieStart { CARD8 reqType; CARD8 xevieReqType; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXevieStartReq; #define sz_xXevieStartReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequence_number; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXevieStartReply; #define sz_xXevieStartReply 32 typedef struct _XevieEnd { CARD8 reqType; CARD8 xevieReqType; - CARD16 length B16; - CARD32 cmap B32; + CARD16 length; + CARD32 cmap; } xXevieEndReq; #define sz_xXevieEndReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequence_number; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXevieEndReply; #define sz_xXevieEndReply 32 typedef struct _XevieSend { CARD8 reqType; CARD8 xevieReqType; - CARD16 length B16; + CARD16 length; xEvent event; - CARD32 dataType B32; + CARD32 dataType; } xXevieSendReq; #define sz_xXevieSendReq 104 typedef struct { BYTE type; BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequence_number; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXevieSendReply; #define sz_xXevieSendReply 32 typedef struct _XevieSelectInput { CARD8 reqType; CARD8 xevieReqType; - CARD16 length B16; - CARD32 event_mask B32; + CARD16 length; + CARD32 event_mask; } xXevieSelectInputReq; #define sz_xXevieSelectInputReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequence_number B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequence_number; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXevieSelectInputReply; #define sz_xXevieSelectInputReply 32 diff --git a/proto/xorgproto/include/X11/extensions/fontcachstr.h b/proto/xorgproto/include/X11/extensions/fontcachstr.h index eab704e23..50f05d03a 100644 --- a/proto/xorgproto/include/X11/extensions/fontcachstr.h +++ b/proto/xorgproto/include/X11/extensions/fontcachstr.h @@ -44,86 +44,86 @@ typedef struct _FontCacheQueryVersion { CARD8 reqType; /* always FontCacheReqCode */ CARD8 fontcacheReqType; /* always X_FontCacheQueryVersion */ - CARD16 length B16; + CARD16 length; } xFontCacheQueryVersionReq; #define sz_xFontCacheQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of Font-Cache */ - CARD16 minorVersion B16; /* minor version of Font-Cache */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of Font-Cache */ + CARD16 minorVersion; /* minor version of Font-Cache */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xFontCacheQueryVersionReply; #define sz_xFontCacheQueryVersionReply 32 typedef struct _FontCacheGetCacheSettings { CARD8 reqType; /* always FontCacheReqCode */ CARD8 fontcacheReqType; /* always X_FontCacheGetCacheSettings */ - CARD16 length B16; + CARD16 length; } xFontCacheGetCacheSettingsReq; #define sz_xFontCacheGetCacheSettingsReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 himark B32; - CARD32 lowmark B32; - CARD32 balance B32; - CARD32 reserve0 B32; - CARD32 reserve1 B32; - CARD32 reserve2 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 himark; + CARD32 lowmark; + CARD32 balance; + CARD32 reserve0; + CARD32 reserve1; + CARD32 reserve2; } xFontCacheGetCacheSettingsReply; #define sz_xFontCacheGetCacheSettingsReply 32 typedef struct _FontCacheChangeCacheSettings { CARD8 reqType; /* always FontCacheReqCode */ CARD8 fontcacheReqType; /* always X_FontCacheChangeCacheSettings */ - CARD16 length B16; - CARD32 himark B32; - CARD32 lowmark B32; - CARD32 balance B32; - CARD32 reserve0 B32; - CARD32 reserve1 B32; - CARD32 reserve2 B32; - CARD32 reserve3 B32; + CARD16 length; + CARD32 himark; + CARD32 lowmark; + CARD32 balance; + CARD32 reserve0; + CARD32 reserve1; + CARD32 reserve2; + CARD32 reserve3; } xFontCacheChangeCacheSettingsReq; #define sz_xFontCacheChangeCacheSettingsReq 32 typedef struct _FontCacheGetCacheStatistics { CARD8 reqType; /* always FontCacheReqCode */ CARD8 fontcacheReqType; /* always X_FontCacheGetCacheStatistics */ - CARD16 length B16; + CARD16 length; } xFontCacheGetCacheStatisticsReq; #define sz_xFontCacheGetCacheStatisticsReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 purge_runs B32; - CARD32 purge_stat B32; - CARD32 balance B32; - CARD32 reserve0 B32; - CARD32 f_hits B32; - CARD32 f_misshits B32; - CARD32 f_purged B32; - CARD32 f_usage B32; - CARD32 f_reserve0 B32; - CARD32 v_hits B32; - CARD32 v_misshits B32; - CARD32 v_purged B32; - CARD32 v_usage B32; - CARD32 v_reserve0 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 purge_runs; + CARD32 purge_stat; + CARD32 balance; + CARD32 reserve0; + CARD32 f_hits; + CARD32 f_misshits; + CARD32 f_purged; + CARD32 f_usage; + CARD32 f_reserve0; + CARD32 v_hits; + CARD32 v_misshits; + CARD32 v_purged; + CARD32 v_usage; + CARD32 v_reserve0; } xFontCacheGetCacheStatisticsReply; #define sz_xFontCacheGetCacheStatisticsReply 64 diff --git a/proto/xorgproto/include/X11/extensions/geproto.h b/proto/xorgproto/include/X11/extensions/geproto.h index c8860dd87..7b34be21d 100644 --- a/proto/xorgproto/include/X11/extensions/geproto.h +++ b/proto/xorgproto/include/X11/extensions/geproto.h @@ -50,7 +50,7 @@ typedef struct { CARD8 reqType; CARD8 ReqType; - CARD16 length B16; + CARD16 length; } xGEReq; @@ -58,9 +58,9 @@ typedef struct { typedef struct { CARD8 reqType; /* input extension major code */ CARD8 ReqType; /* always X_GEQueryVersion */ - CARD16 length B16; - CARD16 majorVersion B16; - CARD16 minorVersion B16; + CARD16 length; + CARD16 majorVersion; + CARD16 minorVersion; } xGEQueryVersionReq; #define sz_xGEQueryVersionReq 8 @@ -68,15 +68,15 @@ typedef struct { typedef struct { CARD8 repType; /* X_Reply */ CARD8 RepType; /* always X_GEQueryVersion */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; - CARD16 minorVersion B16; - CARD32 pad00 B32; - CARD32 pad01 B32; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; + CARD16 minorVersion; + CARD32 pad00; + CARD32 pad01; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; } xGEQueryVersionReply; #define sz_xGEQueryVersionReply 32 diff --git a/proto/xorgproto/include/X11/extensions/lbxproto.h b/proto/xorgproto/include/X11/extensions/lbxproto.h index a1ae62ba4..8e858aa7c 100644 --- a/proto/xorgproto/include/X11/extensions/lbxproto.h +++ b/proto/xorgproto/include/X11/extensions/lbxproto.h @@ -95,93 +95,93 @@ typedef struct { BOOL success; /* TRUE */ BOOL changeType; - CARD16 majorVersion B16, - minorVersion B16; - CARD16 length B16; /* 1/4 additional bytes in setup info */ - CARD32 tag B32; + CARD16 majorVersion, + minorVersion; + CARD16 length; /* 1/4 additional bytes in setup info */ + CARD32 tag; } xLbxConnSetupPrefix; typedef struct _LbxQueryVersion { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxQueryVersion */ - CARD16 length B16; + CARD16 length; } xLbxQueryVersionReq; #define sz_xLbxQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of LBX protocol */ - CARD16 minorVersion B16; /* minor version of LBX protocol */ - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of LBX protocol */ + CARD16 minorVersion; /* minor version of LBX protocol */ + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xLbxQueryVersionReply; #define sz_xLbxQueryVersionReply 32 typedef struct _LbxStartProxy { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxStartProxy */ - CARD16 length B16; + CARD16 length; } xLbxStartProxyReq; #define sz_xLbxStartProxyReq 4 typedef struct _LbxStopProxy { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxStopProxy */ - CARD16 length B16; + CARD16 length; } xLbxStopProxyReq; #define sz_xLbxStopProxyReq 4 typedef struct _LbxSwitch { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxSwitch */ - CARD16 length B16; - CARD32 client B32; /* new client */ + CARD16 length; + CARD32 client; /* new client */ } xLbxSwitchReq; #define sz_xLbxSwitchReq 8 typedef struct _LbxNewClient { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxNewClient */ - CARD16 length B16; - CARD32 client B32; /* new client */ + CARD16 length; + CARD32 client; /* new client */ } xLbxNewClientReq; #define sz_xLbxNewClientReq 8 typedef struct _LbxCloseClient { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxCloseClient */ - CARD16 length B16; - CARD32 client B32; /* new client */ + CARD16 length; + CARD32 client; /* new client */ } xLbxCloseClientReq; #define sz_xLbxCloseClientReq 8 typedef struct _LbxModifySequence { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxModifySequence */ - CARD16 length B16; - CARD32 adjust B32; + CARD16 length; + CARD32 adjust; } xLbxModifySequenceReq; #define sz_xLbxModifySequenceReq 8 typedef struct _LbxAllowMotion { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxAllowMotion */ - CARD16 length B16; - CARD32 num B32; + CARD16 length; + CARD32 num; } xLbxAllowMotionReq; #define sz_xLbxAllowMotionReq 8 typedef struct { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxGrabCmap */ - CARD16 length B16; - Colormap cmap B32; + CARD16 length; + Colormap cmap; } xLbxGrabCmapReq; #define sz_xLbxGrabCmapReq 8 @@ -201,14 +201,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 flags; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad0 B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B16; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xLbxGrabCmapReply; #define sz_xLbxGrabCmapReply 32 #define sz_xLbxGrabCmapReplyHdr 8 @@ -217,35 +217,35 @@ typedef struct { typedef struct { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxReleaseCmap */ - CARD16 length B16; - Colormap cmap B32; + CARD16 length; + Colormap cmap; } xLbxReleaseCmapReq; #define sz_xLbxReleaseCmapReq 8 typedef struct { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxAllocColor */ - CARD16 length B16; - Colormap cmap B32; - CARD32 pixel B32; - CARD16 red B16, green B16, blue B16; - CARD16 pad B16; + CARD16 length; + Colormap cmap; + CARD32 pixel; + CARD16 red, green, blue; + CARD16 pad; } xLbxAllocColorReq; #define sz_xLbxAllocColorReq 20 typedef struct _LbxIncrementPixel { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxIncrementPixel */ - CARD16 length B16; - CARD32 cmap B32; - CARD32 pixel B32; + CARD16 length; + CARD32 cmap; + CARD32 pixel; } xLbxIncrementPixelReq; #define sz_xLbxIncrementPixelReq 12 typedef struct _LbxDelta { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxDelta */ - CARD16 length B16; + CARD16 length; CARD8 diffs; /* number of diffs */ CARD8 cindex; /* cache index */ /* list of diffs follows */ @@ -255,75 +255,75 @@ typedef struct _LbxDelta { typedef struct _LbxGetModifierMapping { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxGetModifierMapping */ - CARD16 length B16; + CARD16 length; } xLbxGetModifierMappingReq; #define sz_xLbxGetModifierMappingReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 keyspermod; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 tag B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 tag; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xLbxGetModifierMappingReply; #define sz_xLbxGetModifierMappingReply 32 typedef struct _LbxGetKeyboardMapping { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxGetKeyboardMapping */ - CARD16 length B16; + CARD16 length; KeyCode firstKeyCode; CARD8 count; - CARD16 pad1 B16; + CARD16 pad1; } xLbxGetKeyboardMappingReq; #define sz_xLbxGetKeyboardMappingReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 keysperkeycode; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 tag B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 tag; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xLbxGetKeyboardMappingReply; #define sz_xLbxGetKeyboardMappingReply 32 typedef struct _LbxQueryFont { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxQueryFont */ - CARD16 length B16; - CARD32 fid B32; + CARD16 length; + CARD32 fid; } xLbxQueryFontReq; #define sz_xLbxQueryFontReq 8 typedef struct _LbxInternAtoms { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxInternAtoms */ - CARD16 length B16; - CARD16 num B16; + CARD16 length; + CARD16 num; } xLbxInternAtomsReq; #define sz_xLbxInternAtomsReq 6 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 atomsStart B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 atomsStart; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xLbxInternAtomsReply; #define sz_xLbxInternAtomsReply 32 #define sz_xLbxInternAtomsReplyHdr 8 @@ -332,39 +332,39 @@ typedef struct { typedef struct _LbxGetWinAttrAndGeom { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxGetWinAttrAndGeom */ - CARD16 length B16; - CARD32 id B32; /* window id */ + CARD16 length; + CARD32 id; /* window id */ } xLbxGetWinAttrAndGeomReq; #define sz_xLbxGetWinAttrAndGeomReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 backingStore; - CARD16 sequenceNumber B16; - CARD32 length B32; /* NOT 0; this is an extra-large reply */ - VisualID visualID B32; + CARD16 sequenceNumber; + CARD32 length; /* NOT 0; this is an extra-large reply */ + VisualID visualID; #if defined(__cplusplus) || defined(c_plusplus) - CARD16 c_class B16; + CARD16 c_class; #else - CARD16 class B16; + CARD16 class; #endif CARD8 bitGravity; CARD8 winGravity; - CARD32 backingBitPlanes B32; - CARD32 backingPixel B32; + CARD32 backingBitPlanes; + CARD32 backingPixel; BOOL saveUnder; BOOL mapInstalled; CARD8 mapState; BOOL override; - Colormap colormap B32; - CARD32 allEventMasks B32; - CARD32 yourEventMask B32; - CARD16 doNotPropagateMask B16; - CARD16 pad1 B16; - Window root B32; - INT16 x B16, y B16; - CARD16 width B16, height B16; - CARD16 borderWidth B16; + Colormap colormap; + CARD32 allEventMasks; + CARD32 yourEventMask; + CARD16 doNotPropagateMask; + CARD16 pad1; + Window root; + INT16 x, y; + CARD16 width, height; + CARD16 borderWidth; CARD8 depth; CARD8 pad2; } xLbxGetWinAttrAndGeomReply; @@ -374,21 +374,21 @@ typedef struct { typedef struct { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxSync */ - CARD16 length B16; + CARD16 length; } xLbxSyncReq; #define sz_xLbxSyncReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xLbxSyncReply; #define sz_xLbxSyncReply 32 @@ -415,7 +415,7 @@ typedef struct { #define LBX_MASK_BITS(val, n) ((unsigned int) ((val) & ((1 << (n)) - 1))) typedef struct { - CARD32 metrics B32; + CARD32 metrics; } xLbxCharInfo; /* note that this is identical to xQueryFontReply except for missing @@ -425,33 +425,33 @@ typedef struct { xCharInfo minBounds; /* XXX do we need to leave this gunk? */ #ifndef WORD64 - CARD32 walign1 B32; + CARD32 walign1; #endif xCharInfo maxBounds; #ifndef WORD64 - CARD32 walign2 B32; + CARD32 walign2; #endif - CARD16 minCharOrByte2 B16, maxCharOrByte2 B16; - CARD16 defaultChar B16; - CARD16 nFontProps B16; /* followed by this many xFontProp structures */ + CARD16 minCharOrByte2, maxCharOrByte2; + CARD16 defaultChar; + CARD16 nFontProps; /* followed by this many xFontProp structures */ CARD8 drawDirection; CARD8 minByte1, maxByte1; BOOL allCharsExist; - INT16 fontAscent B16, fontDescent B16; - CARD32 nCharInfos B32; /* followed by this many xLbxCharInfo structures */ + INT16 fontAscent, fontDescent; + CARD32 nCharInfos; /* followed by this many xLbxCharInfo structures */ } xLbxFontInfo; typedef struct { BYTE type; /* X_Reply */ CARD8 compression; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 tag B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 tag; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; /* X_QueryFont sticks much of the data in the base reply packet, * but we hope that it won't be needed, (and it won't fit in 32 bytes * with the tag anyways) @@ -464,65 +464,65 @@ typedef struct { typedef struct _LbxChangeProperty { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxChangeProperty */ - CARD16 length B16; - Window window B32; - Atom property B32; - Atom type B32; + CARD16 length; + Window window; + Atom property; + Atom type; CARD8 format; CARD8 mode; BYTE pad[2]; - CARD32 nUnits B32; + CARD32 nUnits; } xLbxChangePropertyReq; #define sz_xLbxChangePropertyReq 24 typedef struct { BYTE type; /* X_Reply */ CARD8 pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 tag B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 tag; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xLbxChangePropertyReply; #define sz_xLbxChangePropertyReply 32 typedef struct _LbxGetProperty { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxGetProperty */ - CARD16 length B16; - Window window B32; - Atom property B32; - Atom type B32; + CARD16 length; + Window window; + Atom property; + Atom type; CARD8 delete; BYTE pad[3]; - CARD32 longOffset B32; - CARD32 longLength B32; + CARD32 longOffset; + CARD32 longLength; } xLbxGetPropertyReq; #define sz_xLbxGetPropertyReq 28 typedef struct { BYTE type; /* X_Reply */ CARD8 format; - CARD16 sequenceNumber B16; - CARD32 length B32; - Atom propertyType B32; - CARD32 bytesAfter B32; - CARD32 nItems B32; - CARD32 tag B32; - CARD32 pad1 B32; - CARD32 pad2 B32; + CARD16 sequenceNumber; + CARD32 length; + Atom propertyType; + CARD32 bytesAfter; + CARD32 nItems; + CARD32 tag; + CARD32 pad1; + CARD32 pad2; } xLbxGetPropertyReply; #define sz_xLbxGetPropertyReply 32 typedef struct _LbxTagData { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxTagData */ - CARD16 length B16; - XID tag B32; - CARD32 real_length B32; + CARD16 length; + XID tag; + CARD32 real_length; /* data */ } xLbxTagDataReq; #define sz_xLbxTagDataReq 12 @@ -530,15 +530,15 @@ typedef struct _LbxTagData { typedef struct _LbxInvalidateTag { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxInvalidateTag */ - CARD16 length B16; - CARD32 tag B32; + CARD16 length; + CARD32 tag; } xLbxInvalidateTagReq; #define sz_xLbxInvalidateTagReq 8 typedef struct _LbxPutImage { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxPutImage */ - CARD16 length B16; + CARD16 length; CARD8 compressionMethod; CARD8 cacheEnts; CARD8 bitPacked; @@ -549,14 +549,14 @@ typedef struct _LbxPutImage { typedef struct { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxGetImage */ - CARD16 length B16; - Drawable drawable B32; - INT16 x B16, y B16; - CARD16 width B16, height B16; - CARD32 planeMask B32; + CARD16 length; + Drawable drawable; + INT16 x, y; + CARD16 width, height; + CARD32 planeMask; CARD8 format; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xLbxGetImageReq; #define sz_xLbxGetImageReq 24 @@ -564,16 +564,16 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 depth; - CARD16 sequenceNumber B16; - CARD32 lbxLength B32; - CARD32 xLength B32; - VisualID visual B32; + CARD16 sequenceNumber; + CARD32 lbxLength; + CARD32 xLength; + VisualID visual; CARD8 compressionMethod; CARD8 pad1; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xLbxGetImageReply; #define sz_xLbxGetImageReply 32 @@ -592,7 +592,7 @@ typedef struct { typedef struct _LbxPolyPoint { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; - CARD16 length B16; + CARD16 length; CARD8 cacheEnts; CARD8 padBytes; } xLbxPolyPointReq; @@ -616,7 +616,7 @@ typedef xLbxPolyPointReq xLbxPolyFillArcReq; typedef struct _LbxFillPoly { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; - CARD16 length B16; + CARD16 length; CARD8 cacheEnts; BYTE shape; CARD8 padBytes; @@ -626,7 +626,7 @@ typedef struct _LbxFillPoly { typedef struct _LbxCopyArea { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; - CARD16 length B16; + CARD16 length; CARD8 srcCache; /* source drawable */ CARD8 cacheEnts; /* dest drawable and gc */ /* followed by encoded src x, src y, dst x, dst y, width, height */ @@ -637,8 +637,8 @@ typedef struct _LbxCopyArea { typedef struct _LbxCopyPlane { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; - CARD16 length B16; - CARD32 bitPlane B32; + CARD16 length; + CARD32 bitPlane; CARD8 srcCache; /* source drawable */ CARD8 cacheEnts; /* dest drawable and gc */ /* followed by encoded src x, src y, dst x, dst y, width, height */ @@ -649,7 +649,7 @@ typedef struct _LbxCopyPlane { typedef struct _LbxPolyText { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; - CARD16 length B16; + CARD16 length; CARD8 cacheEnts; /* followed by encoded src x, src y coordinates and text elts */ } xLbxPolyTextReq; @@ -666,7 +666,7 @@ typedef xLbxPolyTextReq xLbxPolyText16Req; typedef struct _LbxImageText { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; - CARD16 length B16; + CARD16 length; CARD8 cacheEnts; CARD8 nChars; /* followed by encoded src x, src y coordinates and string */ @@ -688,14 +688,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 nOpts; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 optDataStart B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 optDataStart; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xLbxStartReply; #define sz_xLbxStartReply 32 #define sz_xLbxStartReplyHdr 8 @@ -703,25 +703,25 @@ typedef struct { typedef struct _LbxQueryExtension { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxQueryExtension */ - CARD16 length B16; - CARD32 nbytes B32; + CARD16 length; + CARD32 nbytes; } xLbxQueryExtensionReq; #define sz_xLbxQueryExtensionReq 8 typedef struct _LbxQueryExtensionReply { BYTE type; /* X_Reply */ CARD8 numReqs; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL present; CARD8 major_opcode; CARD8 first_event; CARD8 first_error; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; /* reply & event generating requests */ } xLbxQueryExtensionReply; @@ -731,15 +731,15 @@ typedef struct _LbxQueryExtensionReply { typedef struct _LbxBeginLargeRequest { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxBeginLargeRequest */ - CARD16 length B16; - CARD32 largeReqLength B32; + CARD16 length; + CARD32 largeReqLength; } xLbxBeginLargeRequestReq; #define sz_BeginLargeRequestReq 8 typedef struct _LbxLargeRequestData { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxLargeRequestData */ - CARD16 length B16; + CARD16 length; /* followed by LISTofCARD8 data */ } xLbxLargeRequestDataReq; #define sz_LargeRequestDataReq 4 @@ -747,7 +747,7 @@ typedef struct _LbxLargeRequestData { typedef struct _LbxEndLargeRequest { CARD8 reqType; /* always LbxReqCode */ CARD8 lbxReqType; /* always X_LbxEndLargeRequest */ - CARD16 length B16; + CARD16 length; } xLbxEndLargeRequestReq; #define sz_EndLargeRequestReq 4 @@ -756,92 +756,92 @@ typedef struct _LbxEndLargeRequest { typedef struct _LbxSwitchEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxSwitchEvent */ - CARD16 pad B16; - CARD32 client B32; + CARD16 pad; + CARD32 client; } xLbxSwitchEvent; #define sz_xLbxSwitchEvent 8 typedef struct _LbxCloseEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxCloseEvent */ - CARD16 sequenceNumber B16; - CARD32 client B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 client; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xLbxCloseEvent; #define sz_xLbxCloseEvent 32 typedef struct _LbxInvalidateTagEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxInvalidateTagEvent */ - CARD16 sequenceNumber B16; - CARD32 tag B32; - CARD32 tagType B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 tag; + CARD32 tagType; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xLbxInvalidateTagEvent; #define sz_xLbxInvalidateTagEvent 32 typedef struct _LbxSendTagDataEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxSendTagDataEvent */ - CARD16 sequenceNumber B16; - CARD32 tag B32; - CARD32 tagType B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 tag; + CARD32 tagType; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xLbxSendTagDataEvent; #define sz_xLbxSendTagDataEvent 32 typedef struct _LbxListenToOneEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxListenToOneEvent */ - CARD16 sequenceNumber B16; - CARD32 client B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 client; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xLbxListenToOneEvent; #define sz_xLbxListenToOneEvent 32 typedef struct _LbxListenToAllEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxListenToAllEvent */ - CARD16 sequenceNumber B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xLbxListenToAllEvent; #define sz_xLbxListenToOneEvent 32 typedef struct _LbxReleaseCmapEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxReleaseCmapEvent */ - CARD16 sequenceNumber B16; - Colormap colormap B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + Colormap colormap; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xLbxReleaseCmapEvent; #define sz_xLbxReleaseCmapEvent 32 @@ -849,14 +849,14 @@ typedef struct _LbxReleaseCmapEvent { typedef struct _LbxFreeCellsEvent { BYTE type; /* always eventBase + LbxEvent */ BYTE lbxType; /* LbxFreeCellsEvent */ - CARD16 sequenceNumber B16; - Colormap colormap B32; - CARD32 pixelStart B32; - CARD32 pixelEnd B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + Colormap colormap; + CARD32 pixelStart; + CARD32 pixelEnd; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xLbxFreeCellsEvent; #define sz_xLbxFreeCellsEvent 32 diff --git a/proto/xorgproto/include/X11/extensions/lgewire.h b/proto/xorgproto/include/X11/extensions/lgewire.h index 75ec0a4e1..ba40bd63c 100644 --- a/proto/xorgproto/include/X11/extensions/lgewire.h +++ b/proto/xorgproto/include/X11/extensions/lgewire.h @@ -1,6 +1,6 @@ /************************************************************ -Copyright (c) 2004, Sun Microsystems, Inc. +Copyright (c) 2004, Sun Microsystems, Inc. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. /* * lge.h - Looking Glass Extension Definitions */ - + #ifndef _LGEWIRE_H #define _LGEWIRE_H @@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group. #define LGE_NAME "LGE" /* Current interface version numbers */ -#define LGE_MAJOR_VERSION 5 +#define LGE_MAJOR_VERSION 5 #define LGE_MINOR_VERSION 0 /* Display Server is alive */ @@ -52,25 +52,25 @@ in this Software without prior written authorization from The Open Group. #define LGE_CLIENT_EVENT_DELIVERER 2 typedef struct { - CARD8 reqType; + CARD8 reqType; CARD8 lgeReqType; - CARD16 length B16; + CARD16 length; } xLgeQueryVersionReq; #define sz_xLgeQueryVersionReq sizeof(xLgeQueryVersionReq) typedef struct { /* Always X_Reply */ - BYTE type; + BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 majorVersion B32; - CARD32 minorVersion B32; - CARD32 implementation B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 implementation; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xLgeQueryVersionReply; #define sz_xLgeQueryVersionReply sizeof(xLgeQueryVersionReply) @@ -78,10 +78,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 lgeReqType; - CARD16 length B16; + CARD16 length; CARD8 clientType; BOOL sendEventDirect; - CARD16 pad2 B16; + CARD16 pad2; } xLgeRegisterClientReq; #define sz_xLgeRegisterClientReq sizeof(xLgeRegisterClientReq) @@ -89,30 +89,30 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 lgeReqType; - CARD16 length B16; + CARD16 length; /* The pseudo-root window of the screen */ - Window prw; + Window prw; } xLgeRegisterScreenReq; #define sz_xLgeRegisterScreenReq sizeof(xLgeRegisterScreenReq) -typedef struct { - CARD8 reqType; - CARD8 lgeReqType; - CARD16 length B16; +typedef struct { + CARD8 reqType; + CARD8 lgeReqType; + CARD16 length; BOOL enable; CARD8 pad1; - CARD16 pad2 B16; -} xLgeControlLgModeReq; + CARD16 pad2; +} xLgeControlLgModeReq; #define sz_xLgeControlLgModeReq sizeof(xLgeControlLgModeReq) -typedef struct { - CARD8 reqType; - CARD8 lgeReqType; - CARD16 length B16; - xEvent event; -} xLgeSendEventReq; +typedef struct { + CARD8 reqType; + CARD8 lgeReqType; + CARD16 length; + xEvent event; +} xLgeSendEventReq; #define sz_xLgeSendEventReq sizeof(xLgeSendEventReq) diff --git a/proto/xorgproto/include/X11/extensions/meson.build b/proto/xorgproto/include/X11/extensions/meson.build index e7e7de2b9..1d85cf834 100644 --- a/proto/xorgproto/include/X11/extensions/meson.build +++ b/proto/xorgproto/include/X11/extensions/meson.build @@ -53,9 +53,6 @@ install_headers( 'syncconst.h', 'syncproto.h', 'syncstr.h', - 'vldXvMC.h', - 'windowswm.h', - 'windowswmstr.h', 'xcmiscproto.h', 'xcmiscstr.h', 'xf86bigfont.h', @@ -79,7 +76,6 @@ install_headers( 'XI2proto.h', 'XI.h', 'XIproto.h', - 'XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', @@ -112,11 +108,15 @@ if get_option('legacy') == true 'lgewire.h', 'Print.h', 'Printstr.h', + 'vldXvMC.h', + 'windowswm.h', + 'windowswmstr.h', 'xcalibrateproto.h', 'xcalibratewire.h', 'Xeviestr.h', 'xf86rush.h', 'xf86rushstr.h', + 'XKBgeom.h', subdir : 'X11/extensions' ) endif diff --git a/proto/xorgproto/include/X11/extensions/mitmiscproto.h b/proto/xorgproto/include/X11/extensions/mitmiscproto.h index 18c202a84..d42e4fce3 100644 --- a/proto/xorgproto/include/X11/extensions/mitmiscproto.h +++ b/proto/xorgproto/include/X11/extensions/mitmiscproto.h @@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group. typedef struct _SetBugMode { CARD8 reqType; /* always MITReqCode */ CARD8 mitReqType; /* always X_MITSetBugMode */ - CARD16 length B16; + CARD16 length; BOOL onOff; BYTE pad0; CARD16 pad1; @@ -47,21 +47,21 @@ typedef struct _SetBugMode { typedef struct _GetBugMode { CARD8 reqType; /* always MITReqCode */ CARD8 mitReqType; /* always X_MITGetBugMode */ - CARD16 length B16; + CARD16 length; } xMITGetBugModeReq; #define sz_xMITGetBugModeReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL onOff; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xMITGetBugModeReply; #define sz_xMITGetBugModeReply 32 diff --git a/proto/xorgproto/include/X11/extensions/multibufproto.h b/proto/xorgproto/include/X11/extensions/multibufproto.h index e2184d3a8..19a640102 100644 --- a/proto/xorgproto/include/X11/extensions/multibufproto.h +++ b/proto/xorgproto/include/X11/extensions/multibufproto.h @@ -50,8 +50,8 @@ in this Software without prior written authorization from The Open Group. typedef struct xMbufBufferInfo { - CARD32 visualID B32; /* associated visual */ - CARD16 maxBuffers B16; /* maximum supported buffers */ + CARD32 visualID; /* associated visual */ + CARD16 maxBuffers; /* maximum supported buffers */ CARD8 depth; /* depth of visual (redundant) */ CARD8 unused; } xMbufBufferInfo; @@ -60,60 +60,60 @@ typedef struct xMbufBufferInfo { typedef struct { BYTE type; BYTE unused; - CARD16 sequenceNumber B16; - CARD32 buffer B32; /* affected buffer */ + CARD16 sequenceNumber; + CARD32 buffer; /* affected buffer */ BYTE state; /* current status */ CARD8 unused1; - CARD16 unused2 B16; - CARD32 unused3 B32; - CARD32 unused4 B32; - CARD32 unused5 B32; - CARD32 unused6 B32; - CARD32 unused7 B32; + CARD16 unused2; + CARD32 unused3; + CARD32 unused4; + CARD32 unused5; + CARD32 unused6; + CARD32 unused7; } xMbufClobberNotifyEvent; typedef struct { BYTE type; BYTE unused; - CARD16 sequenceNumber B16; - CARD32 buffer B32; /* affected buffer */ - CARD32 timeStamp B32; /* update time */ - CARD32 unused1 B32; - CARD32 unused2 B32; - CARD32 unused3 B32; - CARD32 unused4 B32; - CARD32 unused5 B32; - CARD32 unused6 B32; + CARD16 sequenceNumber; + CARD32 buffer; /* affected buffer */ + CARD32 timeStamp; /* update time */ + CARD32 unused1; + CARD32 unused2; + CARD32 unused3; + CARD32 unused4; + CARD32 unused5; + CARD32 unused6; } xMbufUpdateNotifyEvent; typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufGetBufferVersion */ - CARD16 length B16; + CARD16 length; } xMbufGetBufferVersionReq; #define sz_xMbufGetBufferVersionReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 majorVersion; /* major version of Multi-Buffering protocol */ CARD8 minorVersion; /* minor version of Multi-Buffering protocol */ - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xMbufGetBufferVersionReply; #define sz_xMbufGetBufferVersionReply 32 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufCreateImageBuffers */ - CARD16 length B16; - CARD32 window B32; /* associated window */ + CARD16 length; + CARD32 window; /* associated window */ CARD8 updateAction; /* action at update */ CARD8 updateHint; /* hint as to frequency of updates */ CARD16 unused; @@ -123,123 +123,123 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 numberBuffer B16; /* number successfully allocated */ - CARD16 unused1 B16; - CARD32 unused2 B32; - CARD32 unused3 B32; - CARD32 unused4 B32; - CARD32 unused5 B32; - CARD32 unused6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 numberBuffer; /* number successfully allocated */ + CARD16 unused1; + CARD32 unused2; + CARD32 unused3; + CARD32 unused4; + CARD32 unused5; + CARD32 unused6; } xMbufCreateImageBuffersReply; #define sz_xMbufCreateImageBuffersReply 32 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufDestroyImageBuffers */ - CARD16 length B16; - CARD32 window B32; /* associated window */ + CARD16 length; + CARD32 window; /* associated window */ } xMbufDestroyImageBuffersReq; #define sz_xMbufDestroyImageBuffersReq 8 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufDisplayImageBuffers */ - CARD16 length B16; - CARD16 minDelay B16; /* minimum time between last update and now */ - CARD16 maxDelay B16; /* maximum time between last update and now */ + CARD16 length; + CARD16 minDelay; /* minimum time between last update and now */ + CARD16 maxDelay; /* maximum time between last update and now */ } xMbufDisplayImageBuffersReq; /* followed by list of buffers */ #define sz_xMbufDisplayImageBuffersReq 8 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufSetMBufferAttributes */ - CARD16 length B16; - CARD32 window B32; /* associated window */ - CARD32 valueMask B32; /* modified entries */ + CARD16 length; + CARD32 window; /* associated window */ + CARD32 valueMask; /* modified entries */ } xMbufSetMBufferAttributesReq; /* followed by values */ #define sz_xMbufSetMBufferAttributesReq 12 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufGetMBufferAttributes */ - CARD16 length B16; - CARD32 window B32; /* associated window */ + CARD16 length; + CARD32 window; /* associated window */ } xMbufGetMBufferAttributesReq; #define sz_xMbufGetMBufferAttributesReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 displayedBuffer B16; /* currently visible buffer */ + CARD16 sequenceNumber; + CARD32 length; + CARD16 displayedBuffer; /* currently visible buffer */ CARD8 updateAction; CARD8 updateHint; CARD8 windowMode; CARD8 unused0; - CARD16 unused1 B16; - CARD32 unused2 B32; - CARD32 unused3 B32; - CARD32 unused4 B32; - CARD32 unused5 B32; + CARD16 unused1; + CARD32 unused2; + CARD32 unused3; + CARD32 unused4; + CARD32 unused5; } xMbufGetMBufferAttributesReply; #define sz_xMbufGetMBufferAttributesReply 32 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufSetBufferAttributes */ - CARD16 length B16; - CARD32 buffer B32; - CARD32 valueMask B32; + CARD16 length; + CARD32 buffer; + CARD32 valueMask; } xMbufSetBufferAttributesReq; /* followed by values */ #define sz_xMbufSetBufferAttributesReq 12 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufGetBufferAttributes */ - CARD16 length B16; - CARD32 buffer B32; + CARD16 length; + CARD32 buffer; } xMbufGetBufferAttributesReq; #define sz_xMbufGetBufferAttributesReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 window B32; - CARD32 eventMask B32; - CARD16 bufferIndex B16; + CARD16 sequenceNumber; + CARD32 length; + CARD32 window; + CARD32 eventMask; + CARD16 bufferIndex; CARD8 side; CARD8 unused0; - CARD32 unused1 B32; - CARD32 unused2 B32; - CARD32 unused3 B32; + CARD32 unused1; + CARD32 unused2; + CARD32 unused3; } xMbufGetBufferAttributesReply; #define sz_xMbufGetBufferAttributesReply 32 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufGetBufferInfo */ - CARD16 length B16; - Drawable drawable B32; + CARD16 length; + Drawable drawable; } xMbufGetBufferInfoReq; #define sz_xMbufGetBufferInfoReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 normalInfo B16; - CARD16 stereoInfo B16; - CARD32 unused1 B32; - CARD32 unused2 B32; - CARD32 unused3 B32; - CARD32 unused4 B32; - CARD32 unused5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 normalInfo; + CARD16 stereoInfo; + CARD32 unused1; + CARD32 unused2; + CARD32 unused3; + CARD32 unused4; + CARD32 unused5; } xMbufGetBufferInfoReply; /* followed by buffer infos */ #define sz_xMbufGetBufferInfoReply 32 @@ -247,39 +247,39 @@ typedef struct { typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufCreateStereoWindow */ - CARD16 length B16; + CARD16 length; CARD8 unused0; CARD8 unused1; CARD8 unused2; CARD8 depth; - Window wid B32; - Window parent B32; - Multibuffer left B32; /* associated buffers */ - Multibuffer right B32; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; - CARD16 borderWidth B16; + Window wid; + Window parent; + Multibuffer left; /* associated buffers */ + Multibuffer right; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; + CARD16 borderWidth; #if defined(__cplusplus) || defined(c_plusplus) - CARD16 c_class B16; + CARD16 c_class; #else - CARD16 class B16; + CARD16 class; #endif - VisualID visual B32; - CARD32 mask B32; + VisualID visual; + CARD32 mask; } xMbufCreateStereoWindowReq; /* followed by value list */ #define sz_xMbufCreateStereoWindowReq 44 typedef struct { CARD8 reqType; /* always codes->major_opcode */ CARD8 mbufReqType; /* always X_MbufClearImageBufferArea */ - CARD16 length B16; - Multibuffer buffer B32; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; + CARD16 length; + Multibuffer buffer; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; CARD8 unused0; CARD8 unused1; CARD8 unused2; diff --git a/proto/xorgproto/include/X11/extensions/panoramiXproto.h b/proto/xorgproto/include/X11/extensions/panoramiXproto.h index 6fd1a0266..5de1cf053 100644 --- a/proto/xorgproto/include/X11/extensions/panoramiXproto.h +++ b/proto/xorgproto/include/X11/extensions/panoramiXproto.h @@ -44,10 +44,10 @@ Equipment Corporation. typedef struct _PanoramiXQueryVersion { CARD8 reqType; /* always PanoramiXReqCode */ CARD8 panoramiXReqType; /* always X_PanoramiXQueryVersion */ - CARD16 length B16; + CARD16 length; CARD8 clientMajor; CARD8 clientMinor; - CARD16 unused B16; + CARD16 unused; } xPanoramiXQueryVersionReq; #define sz_xPanoramiXQueryVersionReq 8 @@ -55,15 +55,15 @@ typedef struct _PanoramiXQueryVersion { typedef struct { CARD8 type; /* must be X_Reply */ CARD8 pad1; /* unused */ - CARD16 sequenceNumber B16; /* last sequence number */ - CARD32 length B32; /* 0 */ - CARD16 majorVersion B16; - CARD16 minorVersion B16; - CARD32 pad2 B32; /* unused */ - CARD32 pad3 B32; /* unused */ - CARD32 pad4 B32; /* unused */ - CARD32 pad5 B32; /* unused */ - CARD32 pad6 B32; /* unused */ + CARD16 sequenceNumber; /* last sequence number */ + CARD32 length; /* 0 */ + CARD16 majorVersion; + CARD16 minorVersion; + CARD32 pad2; /* unused */ + CARD32 pad3; /* unused */ + CARD32 pad4; /* unused */ + CARD32 pad5; /* unused */ + CARD32 pad6; /* unused */ } xPanoramiXQueryVersionReply; #define sz_xPanoramiXQueryVersionReply 32 @@ -72,22 +72,22 @@ typedef struct { typedef struct _PanoramiXGetState { CARD8 reqType; /* always PanoramiXReqCode */ CARD8 panoramiXReqType; /* always X_PanoramiXGetState */ - CARD16 length B16; - CARD32 window B32; + CARD16 length; + CARD32 window; } xPanoramiXGetStateReq; -#define sz_xPanoramiXGetStateReq 8 +#define sz_xPanoramiXGetStateReq 8 typedef struct { BYTE type; BYTE state; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 window B32; - CARD32 pad1 B32; /* unused */ - CARD32 pad2 B32; /* unused */ - CARD32 pad3 B32; /* unused */ - CARD32 pad4 B32; /* unused */ - CARD32 pad5 B32; /* unused */ + CARD16 sequenceNumber; + CARD32 length; + CARD32 window; + CARD32 pad1; /* unused */ + CARD32 pad2; /* unused */ + CARD32 pad3; /* unused */ + CARD32 pad4; /* unused */ + CARD32 pad5; /* unused */ } xPanoramiXGetStateReply; #define sz_panoramiXGetStateReply 32 @@ -95,99 +95,99 @@ typedef struct { typedef struct _PanoramiXGetScreenCount { CARD8 reqType; /* always PanoramiXReqCode */ CARD8 panoramiXReqType; /* always X_PanoramiXGetScreenCount */ - CARD16 length B16; - CARD32 window B32; + CARD16 length; + CARD32 window; } xPanoramiXGetScreenCountReq; #define sz_xPanoramiXGetScreenCountReq 8 typedef struct { BYTE type; BYTE ScreenCount; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 window B32; - CARD32 pad1 B32; /* unused */ - CARD32 pad2 B32; /* unused */ - CARD32 pad3 B32; /* unused */ - CARD32 pad4 B32; /* unused */ - CARD32 pad5 B32; /* unused */ + CARD16 sequenceNumber; + CARD32 length; + CARD32 window; + CARD32 pad1; /* unused */ + CARD32 pad2; /* unused */ + CARD32 pad3; /* unused */ + CARD32 pad4; /* unused */ + CARD32 pad5; /* unused */ } xPanoramiXGetScreenCountReply; #define sz_panoramiXGetScreenCountReply 32 typedef struct _PanoramiXGetScreenSize { CARD8 reqType; /* always PanoramiXReqCode */ CARD8 panoramiXReqType; /* always X_PanoramiXGetState */ - CARD16 length B16; - CARD32 window B32; - CARD32 screen B32; + CARD16 length; + CARD32 window; + CARD32 screen; } xPanoramiXGetScreenSizeReq; -#define sz_xPanoramiXGetScreenSizeReq 12 +#define sz_xPanoramiXGetScreenSizeReq 12 typedef struct { BYTE type; - CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 width B32; - CARD32 height B32; - CARD32 window B32; - CARD32 screen B32; - CARD32 pad2 B32; /* unused */ - CARD32 pad3 B32; /* unused */ + CARD8 pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 width; + CARD32 height; + CARD32 window; + CARD32 screen; + CARD32 pad2; /* unused */ + CARD32 pad3; /* unused */ } xPanoramiXGetScreenSizeReply; -#define sz_panoramiXGetScreenSizeReply 32 +#define sz_panoramiXGetScreenSizeReply 32 /************ Alternate protocol ******************/ typedef struct { CARD8 reqType; CARD8 panoramiXReqType; - CARD16 length B16; + CARD16 length; } xXineramaIsActiveReq; #define sz_xXineramaIsActiveReq 4 typedef struct { BYTE type; - CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 state B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD8 pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 state; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXineramaIsActiveReply; -#define sz_XineramaIsActiveReply 32 +#define sz_XineramaIsActiveReply 32 typedef struct { CARD8 reqType; CARD8 panoramiXReqType; - CARD16 length B16; + CARD16 length; } xXineramaQueryScreensReq; #define sz_xXineramaQueryScreensReq 4 typedef struct { BYTE type; - CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 number B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD8 pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 number; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXineramaQueryScreensReply; -#define sz_XineramaQueryScreensReply 32 +#define sz_XineramaQueryScreensReply 32 typedef struct { - INT16 x_org B16; - INT16 y_org B16; - CARD16 width B16; - CARD16 height B16; + INT16 x_org; + INT16 y_org; + CARD16 width; + CARD16 height; } xXineramaScreenInfo; #define sz_XineramaScreenInfo 8 -#endif +#endif diff --git a/proto/xorgproto/include/X11/extensions/presentproto.h b/proto/xorgproto/include/X11/extensions/presentproto.h index 08ddc05eb..d8dc6d271 100644 --- a/proto/xorgproto/include/X11/extensions/presentproto.h +++ b/proto/xorgproto/include/X11/extensions/presentproto.h @@ -32,55 +32,55 @@ #define EventID CARD32 typedef struct { - Window window B32; - CARD32 serial B32; + Window window; + CARD32 serial; } xPresentNotify; #define sz_xPresentNotify 8 typedef struct { CARD8 reqType; CARD8 presentReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xPresentQueryVersionReq; #define sz_xPresentQueryVersionReq 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xPresentQueryVersionReply; #define sz_xPresentQueryVersionReply 32 typedef struct { CARD8 reqType; CARD8 presentReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; - Pixmap pixmap B32; - CARD32 serial B32; + Pixmap pixmap; + CARD32 serial; - Region valid B32; - Region update B32; + Region valid; + Region update; - INT16 x_off B16; - INT16 y_off B16; - CARD32 target_crtc B32; + INT16 x_off; + INT16 y_off; + CARD32 target_crtc; - XSyncFence wait_fence B32; - XSyncFence idle_fence B32; + XSyncFence wait_fence; + XSyncFence idle_fence; - CARD32 options B32; - CARD32 pad1 B32; + CARD32 options; + CARD32 pad1; CARD64 target_msc; CARD64 divisor; @@ -92,11 +92,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 presentReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; - CARD32 serial B32; - CARD32 pad0 B32; + CARD32 serial; + CARD32 pad0; CARD64 target_msc; CARD64 divisor; @@ -107,32 +107,32 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 presentReqType; - CARD16 length B16; - CARD32 eid B32; - CARD32 window B32; - CARD32 eventMask B32; + CARD16 length; + CARD32 eid; + CARD32 window; + CARD32 eventMask; } xPresentSelectInputReq; #define sz_xPresentSelectInputReq 16 typedef struct { CARD8 reqType; CARD8 presentReqType; - CARD16 length B16; - CARD32 target B32; + CARD16 length; + CARD32 target; } xPresentQueryCapabilitiesReq; #define sz_xPresentQueryCapabilitiesReq 8 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 capabilities B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 capabilities; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xPresentQueryCapabilitiesReply; #define sz_xPresentQueryCapabilitiesReply 32 @@ -145,36 +145,36 @@ typedef struct { typedef struct { CARD8 type; CARD8 extension; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD32 length; - CARD16 evtype B16; + CARD16 evtype; CARD16 pad2; - CARD32 eid B32; - CARD32 window B32; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; - INT16 off_x B16; - INT16 off_y B16; + CARD32 eid; + CARD32 window; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; + INT16 off_x; + INT16 off_y; - CARD16 pixmap_width B16; - CARD16 pixmap_height B16; - CARD32 pixmap_flags B32; + CARD16 pixmap_width; + CARD16 pixmap_height; + CARD32 pixmap_flags; } xPresentConfigureNotify; #define sz_xPresentConfigureNotify 40 typedef struct { CARD8 type; CARD8 extension; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD32 length; - CARD16 evtype B16; + CARD16 evtype; CARD8 kind; CARD8 mode; - CARD32 eid B32; - Window window B32; - CARD32 serial B32; + CARD32 eid; + Window window; + CARD32 serial; CARD64 ust; CARD64 msc; @@ -184,15 +184,15 @@ typedef struct { typedef struct { CARD8 type; CARD8 extension; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD32 length; - CARD16 evtype B16; - CARD16 pad2 B16; - CARD32 eid B32; - Window window B32; - CARD32 serial B32; - Pixmap pixmap B32; - CARD32 idle_fence B32; + CARD16 evtype; + CARD16 pad2; + CARD32 eid; + Window window; + CARD32 serial; + Pixmap pixmap; + CARD32 idle_fence; } xPresentIdleNotify; #define sz_xPresentIdleNotify 32 @@ -200,35 +200,35 @@ typedef struct { typedef struct { CARD8 type; CARD8 extension; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD32 length; - CARD16 evtype B16; + CARD16 evtype; CARD8 update_window; CARD8 pad1; - CARD32 eid B32; - Window event_window B32; - Window window B32; - Pixmap pixmap B32; - CARD32 serial B32; - + CARD32 eid; + Window event_window; + Window window; + Pixmap pixmap; + CARD32 serial; + /* 32-byte boundary */ - Region valid_region B32; - Region update_region B32; + Region valid_region; + Region update_region; xRectangle valid_rect; xRectangle update_rect; - INT16 x_off B16; - INT16 y_off B16; - CARD32 target_crtc B32; + INT16 x_off; + INT16 y_off; + CARD32 target_crtc; - XSyncFence wait_fence B32; - XSyncFence idle_fence B32; + XSyncFence wait_fence; + XSyncFence idle_fence; - CARD32 options B32; - CARD32 pad2 B32; + CARD32 options; + CARD32 pad2; CARD64 target_msc; CARD64 divisor; diff --git a/proto/xorgproto/include/X11/extensions/randrproto.h b/proto/xorgproto/include/X11/extensions/randrproto.h index b0fd7f0c0..624c2544c 100644 --- a/proto/xorgproto/include/X11/extensions/randrproto.h +++ b/proto/xorgproto/include/X11/extensions/randrproto.h @@ -61,49 +61,49 @@ */ typedef struct { - CARD16 widthInPixels B16; - CARD16 heightInPixels B16; - CARD16 widthInMillimeters B16; - CARD16 heightInMillimeters B16; + CARD16 widthInPixels; + CARD16 heightInPixels; + CARD16 widthInMillimeters; + CARD16 heightInMillimeters; } xScreenSizes; #define sz_xScreenSizes 8 -/* +/* * requests and replies */ typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRRQueryVersionReply; #define sz_xRRQueryVersionReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xRRGetScreenInfoReq; #define sz_xRRGetScreenInfoReq 8 -/* +/* * the xRRScreenInfoReply structure is followed by: * * the size information @@ -113,68 +113,68 @@ typedef struct { 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; + CARD16 sequenceNumber; + CARD32 length; + Window root; + Time timestamp; + Time configTimestamp; + CARD16 nSizes; + SizeID sizeID; + Rotation rotation; + CARD16 rate; + CARD16 nrateEnts; + CARD16 pad; } 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; + CARD16 length; + Drawable drawable; + Time timestamp; + Time configTimestamp; + SizeID sizeID; + Rotation rotation; } 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; + CARD16 length; + Drawable drawable; + Time timestamp; + Time configTimestamp; + SizeID sizeID; + Rotation rotation; + CARD16 rate; + CARD16 pad; } 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; + CARD16 sequenceNumber; + CARD32 length; + Time newTimestamp; + Time newConfigTimestamp; Window root; - CARD16 subpixelOrder B16; - CARD16 pad4 B16; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 subpixelOrder; + CARD16 pad4; + CARD32 pad5; + CARD32 pad6; } xRRSetScreenConfigReply; #define sz_xRRSetScreenConfigReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; - CARD16 enable B16; - CARD16 pad2 B16; + CARD16 length; + Window window; + CARD16 enable; + CARD16 pad2; } xRRSelectInputReq; #define sz_xRRSelectInputReq 12 @@ -183,385 +183,385 @@ typedef struct { */ typedef struct _xRRModeInfo { - RRMode id B32; - CARD16 width B16; - CARD16 height B16; - CARD32 dotClock B32; - CARD16 hSyncStart B16; - CARD16 hSyncEnd B16; - CARD16 hTotal B16; - CARD16 hSkew B16; - CARD16 vSyncStart B16; - CARD16 vSyncEnd B16; - CARD16 vTotal B16; - CARD16 nameLength B16; - RRModeFlags modeFlags B32; + RRMode id; + CARD16 width; + CARD16 height; + CARD32 dotClock; + CARD16 hSyncStart; + CARD16 hSyncEnd; + CARD16 hTotal; + CARD16 hSkew; + CARD16 vSyncStart; + CARD16 vSyncEnd; + CARD16 vTotal; + CARD16 nameLength; + RRModeFlags modeFlags; } xRRModeInfo; #define sz_xRRModeInfo 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xRRGetScreenSizeRangeReq; #define sz_xRRGetScreenSizeRangeReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 minWidth B16; - CARD16 minHeight B16; - CARD16 maxWidth B16; - CARD16 maxHeight B16; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 minWidth; + CARD16 minHeight; + CARD16 maxWidth; + CARD16 maxHeight; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xRRGetScreenSizeRangeReply; #define sz_xRRGetScreenSizeRangeReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; - CARD16 width B16; - CARD16 height B16; - CARD32 widthInMillimeters B32; - CARD32 heightInMillimeters B32; + CARD16 length; + Window window; + CARD16 width; + CARD16 height; + CARD32 widthInMillimeters; + CARD32 heightInMillimeters; } xRRSetScreenSizeReq; #define sz_xRRSetScreenSizeReq 20 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xRRGetScreenResourcesReq; #define sz_xRRGetScreenResourcesReq 8 typedef struct { BYTE type; CARD8 pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time timestamp B32; - Time configTimestamp B32; - CARD16 nCrtcs B16; - CARD16 nOutputs B16; - CARD16 nModes B16; - CARD16 nbytesNames B16; - CARD32 pad1 B32; - CARD32 pad2 B32; + CARD16 sequenceNumber; + CARD32 length; + Time timestamp; + Time configTimestamp; + CARD16 nCrtcs; + CARD16 nOutputs; + CARD16 nModes; + CARD16 nbytesNames; + CARD32 pad1; + CARD32 pad2; } xRRGetScreenResourcesReply; #define sz_xRRGetScreenResourcesReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - Time configTimestamp B32; + CARD16 length; + RROutput output; + Time configTimestamp; } xRRGetOutputInfoReq; #define sz_xRRGetOutputInfoReq 12 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time timestamp B32; - RRCrtc crtc B32; - CARD32 mmWidth B32; - CARD32 mmHeight B32; + CARD16 sequenceNumber; + CARD32 length; + Time timestamp; + RRCrtc crtc; + CARD32 mmWidth; + CARD32 mmHeight; CARD8 connection; CARD8 subpixelOrder; - CARD16 nCrtcs B16; - CARD16 nModes B16; - CARD16 nPreferred B16; - CARD16 nClones B16; - CARD16 nameLength B16; + CARD16 nCrtcs; + CARD16 nModes; + CARD16 nPreferred; + CARD16 nClones; + CARD16 nameLength; } xRRGetOutputInfoReply; #define sz_xRRGetOutputInfoReply 36 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; -} xRRListOutputPropertiesReq; + CARD16 length; + RROutput output; +} xRRListOutputPropertiesReq; #define sz_xRRListOutputPropertiesReq 8 typedef struct { BYTE type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nAtoms B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nAtoms; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xRRListOutputPropertiesReply; #define sz_xRRListOutputPropertiesReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - Atom property B32; -} xRRQueryOutputPropertyReq; + CARD16 length; + RROutput output; + Atom property; +} xRRQueryOutputPropertyReq; #define sz_xRRQueryOutputPropertyReq 12 typedef struct { BYTE type; BYTE pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL pending; BOOL range; BOOL immutable; BYTE pad1; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xRRQueryOutputPropertyReply; #define sz_xRRQueryOutputPropertyReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - Atom property B32; + CARD16 length; + RROutput output; + Atom property; BOOL pending; BOOL range; - CARD16 pad B16; -} xRRConfigureOutputPropertyReq; + CARD16 pad; +} xRRConfigureOutputPropertyReq; #define sz_xRRConfigureOutputPropertyReq 16 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - Atom property B32; - Atom type B32; + CARD16 length; + RROutput output; + Atom property; + Atom type; CARD8 format; CARD8 mode; CARD16 pad; - CARD32 nUnits B32; + CARD32 nUnits; } xRRChangeOutputPropertyReq; #define sz_xRRChangeOutputPropertyReq 24 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - Atom property B32; + CARD16 length; + RROutput output; + Atom property; } xRRDeleteOutputPropertyReq; #define sz_xRRDeleteOutputPropertyReq 12 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - Atom property B32; - Atom type B32; - CARD32 longOffset B32; - CARD32 longLength B32; + CARD16 length; + RROutput output; + Atom property; + Atom type; + CARD32 longOffset; + CARD32 longLength; #ifdef __cplusplus BOOL _delete; #else BOOL delete; #endif BOOL pending; - CARD16 pad1 B16; + CARD16 pad1; } xRRGetOutputPropertyReq; #define sz_xRRGetOutputPropertyReq 28 typedef struct { BYTE type; CARD8 format; - CARD16 sequenceNumber B16; - CARD32 length B32; - Atom propertyType B32; - CARD32 bytesAfter B32; - CARD32 nItems B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + Atom propertyType; + CARD32 bytesAfter; + CARD32 nItems; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xRRGetOutputPropertyReply; #define sz_xRRGetOutputPropertyReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; xRRModeInfo modeInfo; -} xRRCreateModeReq; +} xRRCreateModeReq; #define sz_xRRCreateModeReq 40 typedef struct { BYTE type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - RRMode mode B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + RRMode mode; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRRCreateModeReply; #define sz_xRRCreateModeReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRMode mode B32; + CARD16 length; + RRMode mode; } xRRDestroyModeReq; #define sz_xRRDestroyModeReq 8 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - RRMode mode B32; + CARD16 length; + RROutput output; + RRMode mode; } xRRAddOutputModeReq; #define sz_xRRAddOutputModeReq 12 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RROutput output B32; - RRMode mode B32; + CARD16 length; + RROutput output; + RRMode mode; } xRRDeleteOutputModeReq; #define sz_xRRDeleteOutputModeReq 12 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; - Time configTimestamp B32; -} xRRGetCrtcInfoReq; + CARD16 length; + RRCrtc crtc; + Time configTimestamp; +} xRRGetCrtcInfoReq; #define sz_xRRGetCrtcInfoReq 12 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time timestamp B32; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; - RRMode mode B32; - Rotation rotation B16; - Rotation rotations B16; - CARD16 nOutput B16; - CARD16 nPossibleOutput B16; + CARD16 sequenceNumber; + CARD32 length; + Time timestamp; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; + RRMode mode; + Rotation rotation; + Rotation rotations; + CARD16 nOutput; + CARD16 nPossibleOutput; } xRRGetCrtcInfoReply; #define sz_xRRGetCrtcInfoReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; - Time timestamp B32; - Time configTimestamp B32; - INT16 x B16; - INT16 y B16; - RRMode mode B32; - Rotation rotation B16; - CARD16 pad B16; -} xRRSetCrtcConfigReq; + CARD16 length; + RRCrtc crtc; + Time timestamp; + Time configTimestamp; + INT16 x; + INT16 y; + RRMode mode; + Rotation rotation; + CARD16 pad; +} xRRSetCrtcConfigReq; #define sz_xRRSetCrtcConfigReq 28 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time newTimestamp B32; - CARD32 pad1 B32; - CARD32 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + Time newTimestamp; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRRSetCrtcConfigReply; #define sz_xRRSetCrtcConfigReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; -} xRRGetCrtcGammaSizeReq; + CARD16 length; + RRCrtc crtc; +} xRRGetCrtcGammaSizeReq; #define sz_xRRGetCrtcGammaSizeReq 8 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 size B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 size; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xRRGetCrtcGammaSizeReply; #define sz_xRRGetCrtcGammaSizeReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; -} xRRGetCrtcGammaReq; + CARD16 length; + RRCrtc crtc; +} xRRGetCrtcGammaReq; #define sz_xRRGetCrtcGammaReq 8 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 size B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 size; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xRRGetCrtcGammaReply; #define sz_xRRGetCrtcGammaReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; - CARD16 size B16; - CARD16 pad1 B16; + CARD16 length; + RRCrtc crtc; + CARD16 size; + CARD16 pad1; } xRRSetCrtcGammaReq; #define sz_xRRSetCrtcGammaReq 12 @@ -579,11 +579,11 @@ typedef xRRGetScreenResourcesReply xRRGetScreenResourcesCurrentReply; typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; + CARD16 length; + RRCrtc crtc; xRenderTransform transform; CARD16 nbytesFilter; /* number of bytes in filter name */ - CARD16 pad B16; + CARD16 pad; } xRRSetCrtcTransformReq; #define sz_xRRSetCrtcTransformReq 48 @@ -591,8 +591,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; + CARD16 length; + RRCrtc crtc; } xRRGetCrtcTransformReq; #define sz_xRRGetCrtcTransformReq 8 @@ -600,18 +600,18 @@ typedef struct { typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; xRenderTransform pendingTransform; BYTE hasTransforms; CARD8 pad0; - CARD16 pad1 B16; + CARD16 pad1; xRenderTransform currentTransform; - CARD32 pad2 B32; - CARD16 pendingNbytesFilter B16; /* number of bytes in filter name */ - CARD16 pendingNparamsFilter B16; /* number of filter params */ - CARD16 currentNbytesFilter B16; /* number of bytes in filter name */ - CARD16 currentNparamsFilter B16; /* number of filter params */ + CARD32 pad2; + CARD16 pendingNbytesFilter; /* number of bytes in filter name */ + CARD16 pendingNparamsFilter; /* number of filter params */ + CARD16 currentNbytesFilter; /* number of bytes in filter name */ + CARD16 currentNparamsFilter; /* number of filter params */ } xRRGetCrtcTransformReply; #define sz_xRRGetCrtcTransformReply 96 @@ -619,31 +619,31 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; - RROutput output B32; + CARD16 length; + Window window; + RROutput output; } xRRSetOutputPrimaryReq; #define sz_xRRSetOutputPrimaryReq 12 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xRRGetOutputPrimaryReq; #define sz_xRRGetOutputPrimaryReq 8 typedef struct { BYTE type; CARD8 pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - RROutput output B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + RROutput output; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRRGetOutputPrimaryReply; #define sz_xRRGetOutputPrimaryReply 32 @@ -654,185 +654,185 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xRRGetProvidersReq; #define sz_xRRGetProvidersReq 8 typedef struct { BYTE type; CARD8 pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time timestamp B32; + CARD16 sequenceNumber; + CARD32 length; + Time timestamp; CARD16 nProviders; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRRGetProvidersReply; #define sz_xRRGetProvidersReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - Time configTimestamp B32; + CARD16 length; + RRProvider provider; + Time configTimestamp; } xRRGetProviderInfoReq; #define sz_xRRGetProviderInfoReq 12 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time timestamp B32; - CARD32 capabilities B32; - CARD16 nCrtcs B16; - CARD16 nOutputs B16; - CARD16 nAssociatedProviders B16; - CARD16 nameLength B16; - CARD32 pad1 B32; - CARD32 pad2 B32; + CARD16 sequenceNumber; + CARD32 length; + Time timestamp; + CARD32 capabilities; + CARD16 nCrtcs; + CARD16 nOutputs; + CARD16 nAssociatedProviders; + CARD16 nameLength; + CARD32 pad1; + CARD32 pad2; } xRRGetProviderInfoReply; #define sz_xRRGetProviderInfoReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - RRProvider source_provider B32; - Time configTimestamp B32; + CARD16 length; + RRProvider provider; + RRProvider source_provider; + Time configTimestamp; } xRRSetProviderOutputSourceReq; #define sz_xRRSetProviderOutputSourceReq 16 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - RRProvider sink_provider B32; - Time configTimestamp B32; + CARD16 length; + RRProvider provider; + RRProvider sink_provider; + Time configTimestamp; } xRRSetProviderOffloadSinkReq; #define sz_xRRSetProviderOffloadSinkReq 16 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; -} xRRListProviderPropertiesReq; + CARD16 length; + RRProvider provider; +} xRRListProviderPropertiesReq; #define sz_xRRListProviderPropertiesReq 8 typedef struct { BYTE type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 nAtoms B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 nAtoms; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xRRListProviderPropertiesReply; #define sz_xRRListProviderPropertiesReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - Atom property B32; -} xRRQueryProviderPropertyReq; + CARD16 length; + RRProvider provider; + Atom property; +} xRRQueryProviderPropertyReq; #define sz_xRRQueryProviderPropertyReq 12 typedef struct { BYTE type; BYTE pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL pending; BOOL range; BOOL immutable; BYTE pad1; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xRRQueryProviderPropertyReply; #define sz_xRRQueryProviderPropertyReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - Atom property B32; + CARD16 length; + RRProvider provider; + Atom property; BOOL pending; BOOL range; - CARD16 pad B16; -} xRRConfigureProviderPropertyReq; + CARD16 pad; +} xRRConfigureProviderPropertyReq; #define sz_xRRConfigureProviderPropertyReq 16 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - Atom property B32; - Atom type B32; + CARD16 length; + RRProvider provider; + Atom property; + Atom type; CARD8 format; CARD8 mode; CARD16 pad; - CARD32 nUnits B32; + CARD32 nUnits; } xRRChangeProviderPropertyReq; #define sz_xRRChangeProviderPropertyReq 24 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - Atom property B32; + CARD16 length; + RRProvider provider; + Atom property; } xRRDeleteProviderPropertyReq; #define sz_xRRDeleteProviderPropertyReq 12 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRProvider provider B32; - Atom property B32; - Atom type B32; - CARD32 longOffset B32; - CARD32 longLength B32; + CARD16 length; + RRProvider provider; + Atom property; + Atom type; + CARD32 longOffset; + CARD32 longLength; #ifdef __cplusplus BOOL _delete; #else BOOL delete; #endif BOOL pending; - CARD16 pad1 B16; + CARD16 pad1; } xRRGetProviderPropertyReq; #define sz_xRRGetProviderPropertyReq 28 typedef struct { BYTE type; CARD8 format; - CARD16 sequenceNumber B16; - CARD32 length B32; - Atom propertyType B32; - CARD32 bytesAfter B32; - CARD32 nItems B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + Atom propertyType; + CARD32 bytesAfter; + CARD32 nItems; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xRRGetProviderPropertyReply; #define sz_xRRGetProviderPropertyReply 32 @@ -843,36 +843,36 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; - RRLease lid B32; - CARD16 nCrtcs B16; - CARD16 nOutputs B16; + CARD16 length; + Window window; + RRLease lid; + CARD16 nCrtcs; + CARD16 nOutputs; } xRRCreateLeaseReq; #define sz_xRRCreateLeaseReq 16 typedef struct { BYTE type; CARD8 nfd; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xRRCreateLeaseReply; #define sz_xRRCreateLeaseReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRLease lid B32; + CARD16 length; + RRLease lid; BYTE terminate; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xRRFreeLeaseReq; #define sz_xRRFreeLeaseReq 12 @@ -882,48 +882,48 @@ typedef struct { 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; + CARD16 sequenceNumber; + Time timestamp; /* time screen was changed */ + Time configTimestamp; /* time config data was changed */ + Window root; /* root window */ + Window window; /* window requesting notification */ + SizeID sizeID; /* new size ID */ + CARD16 subpixelOrder; /* subpixel order */ + CARD16 widthInPixels; /* new size */ + CARD16 heightInPixels; + CARD16 widthInMillimeters; + CARD16 heightInMillimeters; } xRRScreenChangeNotifyEvent; #define sz_xRRScreenChangeNotifyEvent 32 typedef struct { CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_CrtcChange */ - CARD16 sequenceNumber B16; - Time timestamp B32; /* time crtc was changed */ - Window window B32; /* window requesting notification */ - RRCrtc crtc B32; /* affected CRTC */ - RRMode mode B32; /* current mode */ - CARD16 rotation B16; /* rotation and reflection */ - CARD16 pad1 B16; /* unused */ - INT16 x B16; /* new location */ - INT16 y B16; - CARD16 width B16; /* new size */ - CARD16 height B16; + CARD16 sequenceNumber; + Time timestamp; /* time crtc was changed */ + Window window; /* window requesting notification */ + RRCrtc crtc; /* affected CRTC */ + RRMode mode; /* current mode */ + CARD16 rotation; /* rotation and reflection */ + CARD16 pad1; /* unused */ + INT16 x; /* new location */ + INT16 y; + CARD16 width; /* new size */ + CARD16 height; } xRRCrtcChangeNotifyEvent; #define sz_xRRCrtcChangeNotifyEvent 32 typedef struct { CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_OutputChange */ - CARD16 sequenceNumber B16; - Time timestamp B32; /* time output was changed */ - Time configTimestamp B32; /* time config was changed */ - Window window B32; /* window requesting notification */ - RROutput output B32; /* affected output */ - RRCrtc crtc B32; /* current crtc */ - RRMode mode B32; /* current mode */ - CARD16 rotation B16; /* rotation and reflection */ + CARD16 sequenceNumber; + Time timestamp; /* time output was changed */ + Time configTimestamp; /* time config was changed */ + Window window; /* window requesting notification */ + RROutput output; /* affected output */ + RRCrtc crtc; /* current crtc */ + RRMode mode; /* current mode */ + CARD16 rotation; /* rotation and reflection */ CARD8 connection; /* connection status */ CARD8 subpixelOrder; /* subpixel order */ } xRROutputChangeNotifyEvent; @@ -932,162 +932,162 @@ typedef struct { typedef struct { CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_OutputProperty */ - CARD16 sequenceNumber B16; - Window window B32; /* window requesting notification */ - RROutput output B32; /* affected output */ - Atom atom B32; /* property name */ - Time timestamp B32; /* time crtc was changed */ + CARD16 sequenceNumber; + Window window; /* window requesting notification */ + RROutput output; /* affected output */ + Atom atom; /* property name */ + Time timestamp; /* time crtc was changed */ CARD8 state; /* NewValue or Deleted */ CARD8 pad1; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; } xRROutputPropertyNotifyEvent; #define sz_xRROutputPropertyNotifyEvent 32 typedef struct { CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_ProviderChange */ - CARD16 sequenceNumber B16; - Time timestamp B32; /* time provider was changed */ - Window window B32; /* window requesting notification */ - RRProvider provider B32; /* affected provider */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + Time timestamp; /* time provider was changed */ + Window window; /* window requesting notification */ + RRProvider provider; /* affected provider */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xRRProviderChangeNotifyEvent; #define sz_xRRProviderChangeNotifyEvent 32 typedef struct { CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_ProviderProperty */ - CARD16 sequenceNumber B16; - Window window B32; /* window requesting notification */ - RRProvider provider B32; /* affected provider */ - Atom atom B32; /* property name */ - Time timestamp B32; /* time provider was changed */ + CARD16 sequenceNumber; + Window window; /* window requesting notification */ + RRProvider provider; /* affected provider */ + Atom atom; /* property name */ + Time timestamp; /* time provider was changed */ CARD8 state; /* NewValue or Deleted */ CARD8 pad1; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; } xRRProviderPropertyNotifyEvent; #define sz_xRRProviderPropertyNotifyEvent 32 typedef struct { CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_ResourceChange */ - CARD16 sequenceNumber B16; - Time timestamp B32; /* time resource was changed */ - Window window B32; /* window requesting notification */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + Time timestamp; /* time resource was changed */ + Window window; /* window requesting notification */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRRResourceChangeNotifyEvent; #define sz_xRRResourceChangeNotifyEvent 32 typedef struct { CARD8 type; /* always evBase + RRNotify */ CARD8 subCode; /* RRNotify_Lease */ - CARD16 sequenceNumber B16; - Time timestamp B32; /* time resource was changed */ - Window window B32; /* window requesting notification */ - RRLease lease B32; + CARD16 sequenceNumber; + Time timestamp; /* time resource was changed */ + Window window; /* window requesting notification */ + RRLease lease; CARD8 created; /* created/deleted */ CARD8 pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xRRLeaseNotifyEvent; #define sz_xRRLeaseNotifyEvent 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; -} xRRGetPanningReq; + CARD16 length; + RRCrtc crtc; +} xRRGetPanningReq; #define sz_xRRGetPanningReq 8 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time timestamp B32; - CARD16 left B16; - CARD16 top B16; - CARD16 width B16; - CARD16 height B16; - CARD16 track_left B16; - CARD16 track_top B16; - CARD16 track_width B16; - CARD16 track_height B16; - INT16 border_left B16; - INT16 border_top B16; - INT16 border_right B16; - INT16 border_bottom B16; + CARD16 sequenceNumber; + CARD32 length; + Time timestamp; + CARD16 left; + CARD16 top; + CARD16 width; + CARD16 height; + CARD16 track_left; + CARD16 track_top; + CARD16 track_width; + CARD16 track_height; + INT16 border_left; + INT16 border_top; + INT16 border_right; + INT16 border_bottom; } xRRGetPanningReply; #define sz_xRRGetPanningReply 36 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - RRCrtc crtc B32; - Time timestamp B32; - CARD16 left B16; - CARD16 top B16; - CARD16 width B16; - CARD16 height B16; - CARD16 track_left B16; - CARD16 track_top B16; - CARD16 track_width B16; - CARD16 track_height B16; - INT16 border_left B16; - INT16 border_top B16; - INT16 border_right B16; - INT16 border_bottom B16; -} xRRSetPanningReq; + CARD16 length; + RRCrtc crtc; + Time timestamp; + CARD16 left; + CARD16 top; + CARD16 width; + CARD16 height; + CARD16 track_left; + CARD16 track_top; + CARD16 track_width; + CARD16 track_height; + INT16 border_left; + INT16 border_top; + INT16 border_right; + INT16 border_bottom; +} xRRSetPanningReq; #define sz_xRRSetPanningReq 36 typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time newTimestamp B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + Time newTimestamp; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRRSetPanningReply; #define sz_xRRSetPanningReply 32 typedef struct { - Atom name B32; + Atom name; BOOL primary; BOOL automatic; - CARD16 noutput B16; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; - CARD32 widthInMillimeters B32; - CARD32 heightInMillimeters B32; + CARD16 noutput; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; + CARD32 widthInMillimeters; + CARD32 heightInMillimeters; } xRRMonitorInfo; #define sz_xRRMonitorInfo 24 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; BOOL get_active; CARD8 pad; CARD16 pad2; @@ -1097,22 +1097,22 @@ typedef struct { typedef struct { BYTE type; CARD8 status; - CARD16 sequenceNumber B16; - CARD32 length B32; - Time timestamp B32; - CARD32 nmonitors B32; - CARD32 noutputs B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + Time timestamp; + CARD32 nmonitors; + CARD32 noutputs; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xRRGetMonitorsReply; #define sz_xRRGetMonitorsReply 32 typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; xRRMonitorInfo monitor; } xRRSetMonitorReq; #define sz_xRRSetMonitorReq 32 @@ -1120,9 +1120,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 randrReqType; - CARD16 length B16; - Window window B32; - Atom name B32; + CARD16 length; + Window window; + Atom name; } xRRDeleteMonitorReq; #define sz_xRRDeleteMonitorReq 12 diff --git a/proto/xorgproto/include/X11/extensions/recordconst.h b/proto/xorgproto/include/X11/extensions/recordconst.h index 4819de77e..ecdd81be5 100644 --- a/proto/xorgproto/include/X11/extensions/recordconst.h +++ b/proto/xorgproto/include/X11/extensions/recordconst.h @@ -5,16 +5,16 @@ * 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 + * 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 + * 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. **************************************************************************/ diff --git a/proto/xorgproto/include/X11/extensions/recordproto.h b/proto/xorgproto/include/X11/extensions/recordproto.h index 01bc9529f..d2016eb08 100644 --- a/proto/xorgproto/include/X11/extensions/recordproto.h +++ b/proto/xorgproto/include/X11/extensions/recordproto.h @@ -72,8 +72,8 @@ typedef struct typedef struct { - CARD16 first B16; - CARD16 last B16; + CARD16 first; + CARD16 last; } RECORD_RANGE16; typedef struct @@ -108,12 +108,12 @@ typedef struct CARD8 coreRepliesLast; CARD8 extRequestsMajorFirst; CARD8 extRequestsMajorLast; - CARD16 extRequestsMinorFirst B16; - CARD16 extRequestsMinorLast B16; + CARD16 extRequestsMinorFirst; + CARD16 extRequestsMinorLast; CARD8 extRepliesMajorFirst; CARD8 extRepliesMajorLast; - CARD16 extRepliesMinorFirst B16; - CARD16 extRepliesMinorLast B16; + CARD16 extRepliesMinorFirst; + CARD16 extRepliesMinorLast; CARD8 deliveredEventsFirst; CARD8 deliveredEventsLast; CARD8 deviceEventsFirst; @@ -127,8 +127,8 @@ typedef struct typedef struct { - RECORD_CLIENTSPEC clientResource B32; - CARD32 nRanges B32; + RECORD_CLIENTSPEC clientResource; + CARD32 nRanges; /* LISTofRECORDRANGE */ } RECORD_CLIENT_INFO; @@ -140,9 +140,9 @@ typedef RECORD_CLIENT_INFO xRecordClientInfo; typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - CARD16 majorVersion B16; - CARD16 minorVersion B16; + CARD16 length; + CARD16 majorVersion; + CARD16 minorVersion; } xRecordQueryVersionReq; #define sz_xRecordQueryVersionReq 8 @@ -150,15 +150,15 @@ typedef struct { CARD8 type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; - CARD16 minorVersion B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; + CARD16 minorVersion; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRecordQueryVersionReply; #define sz_xRecordQueryVersionReply 32 @@ -169,13 +169,13 @@ typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - RECORD_RC context B32; + CARD16 length; + RECORD_RC context; RECORD_ELEMENT_HEADER elementHeader; CARD8 pad; - CARD16 pad0 B16; - CARD32 nClients B32; - CARD32 nRanges B32; + CARD16 pad0; + CARD32 nClients; + CARD32 nRanges; /* LISTofRECORD_CLIENTSPEC */ /* LISTofRECORDRANGE */ } xRecordCreateContextReq; @@ -188,13 +188,13 @@ typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - RECORD_RC context B32; + CARD16 length; + RECORD_RC context; RECORD_ELEMENT_HEADER elementHeader; CARD8 pad; - CARD16 pad0 B16; - CARD32 nClients B32; - CARD32 nRanges B32; + CARD16 pad0; + CARD32 nClients; + CARD32 nRanges; /* LISTofRECORD_CLIENTSPEC */ /* LISTofRECORDRANGE */ } xRecordRegisterClientsReq; @@ -207,9 +207,9 @@ typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - RECORD_RC context B32; - CARD32 nClients B32; + CARD16 length; + RECORD_RC context; + CARD32 nClients; /* LISTofRECORD_CLIENTSPEC */ } xRecordUnregisterClientsReq; #define sz_xRecordUnregisterClientsReq 12 @@ -221,8 +221,8 @@ typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - RECORD_RC context B32; + CARD16 length; + RECORD_RC context; } xRecordGetContextReq; #define sz_xRecordGetContextReq 8 @@ -230,16 +230,16 @@ typedef struct { CARD8 type; BOOL enabled; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; RECORD_ELEMENT_HEADER elementHeader; CARD8 pad; - CARD16 pad0 B16; - CARD32 nClients B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 pad0; + CARD32 nClients; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; /* LISTofCLIENT_INFO */ /* intercepted-clients */ } xRecordGetContextReply; #define sz_xRecordGetContextReply 32 @@ -251,8 +251,8 @@ typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - RECORD_RC context B32; + CARD16 length; + RECORD_RC context; } xRecordEnableContextReq; #define sz_xRecordEnableContextReq 8 @@ -260,16 +260,16 @@ typedef struct { CARD8 type; CARD8 category; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; RECORD_ELEMENT_HEADER elementHeader; BOOL clientSwapped; - CARD16 pad1 B16; - RECORD_XIDBASE idBase B32; - CARD32 serverTime B32; - CARD32 recordedSequenceNumber B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 pad1; + RECORD_XIDBASE idBase; + CARD32 serverTime; + CARD32 recordedSequenceNumber; + CARD32 pad3; + CARD32 pad4; /* BYTE data; */ } xRecordEnableContextReply; #define sz_xRecordEnableContextReply 32 @@ -281,8 +281,8 @@ typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - RECORD_RC context B32; + CARD16 length; + RECORD_RC context; } xRecordDisableContextReq; #define sz_xRecordDisableContextReq 8 @@ -293,8 +293,8 @@ typedef struct { CARD8 reqType; CARD8 recordReqType; - CARD16 length B16; - RECORD_RC context B32; + CARD16 length; + RECORD_RC context; } xRecordFreeContextReq; #define sz_xRecordFreeContextReq 8 diff --git a/proto/xorgproto/include/X11/extensions/renderproto.h b/proto/xorgproto/include/X11/extensions/renderproto.h index b7b72c103..2cd06af5d 100644 --- a/proto/xorgproto/include/X11/extensions/renderproto.h +++ b/proto/xorgproto/include/X11/extensions/renderproto.h @@ -50,23 +50,23 @@ */ typedef struct { - CARD16 red B16; - CARD16 redMask B16; - CARD16 green B16; - CARD16 greenMask B16; - CARD16 blue B16; - CARD16 blueMask B16; - CARD16 alpha B16; - CARD16 alphaMask B16; + CARD16 red; + CARD16 redMask; + CARD16 green; + CARD16 greenMask; + CARD16 blue; + CARD16 blueMask; + CARD16 alpha; + CARD16 alphaMask; } xDirectFormat; #define sz_xDirectFormat 16 typedef struct { - PictFormat id B32; + PictFormat id; CARD8 type; CARD8 depth; - CARD16 pad1 B16; + CARD16 pad1; xDirectFormat direct; Colormap colormap; } xPictFormInfo; @@ -83,41 +83,41 @@ typedef struct { typedef struct { CARD8 depth; CARD8 pad1; - CARD16 nPictVisuals B16; - CARD32 pad2 B32; + CARD16 nPictVisuals; + CARD32 pad2; } xPictDepth; #define sz_xPictDepth 8 typedef struct { - CARD32 nDepth B32; - PictFormat fallback B32; + CARD32 nDepth; + PictFormat fallback; } xPictScreen; #define sz_xPictScreen 8 typedef struct { - CARD32 pixel B32; - CARD16 red B16; - CARD16 green B16; - CARD16 blue B16; - CARD16 alpha B16; + CARD32 pixel; + CARD16 red; + CARD16 green; + CARD16 blue; + CARD16 alpha; } xIndexValue; #define sz_xIndexValue 12 typedef struct { - CARD16 red B16; - CARD16 green B16; - CARD16 blue B16; - CARD16 alpha B16; + CARD16 red; + CARD16 green; + CARD16 blue; + CARD16 alpha; } xRenderColor; #define sz_xRenderColor 8 typedef struct { - Fixed x B32; - Fixed y B32; + Fixed x; + Fixed y; } xPointFixed; #define sz_xPointFixed 8 @@ -136,8 +136,8 @@ typedef struct { #define sz_xTriangle 24 typedef struct { - Fixed top B32; - Fixed bottom B32; + Fixed top; + Fixed bottom; xLineFixed left; xLineFixed right; } xTrapezoid; @@ -145,12 +145,12 @@ typedef struct { #define sz_xTrapezoid 40 typedef struct { - CARD16 width B16; - CARD16 height B16; - INT16 x B16; - INT16 y B16; - INT16 xOff B16; - INT16 yOff B16; + CARD16 width; + CARD16 height; + INT16 x; + INT16 y; + INT16 xOff; + INT16 yOff; } xGlyphInfo; #define sz_xGlyphInfo 12 @@ -183,9 +183,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xRenderQueryVersionReq; #define sz_xRenderQueryVersionReq 12 @@ -193,14 +193,14 @@ typedef struct { 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRenderQueryVersionReply; #define sz_xRenderQueryVersionReply 32 @@ -208,7 +208,7 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; } xRenderQueryPictFormatsReq; #define sz_xRenderQueryPictFormatsReq 4 @@ -216,14 +216,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numFormats B32; - CARD32 numScreens B32; - CARD32 numDepths B32; - CARD32 numVisuals B32; - CARD32 numSubpixel B32; /* Version 0.6 */ - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numFormats; + CARD32 numScreens; + CARD32 numDepths; + CARD32 numVisuals; + CARD32 numSubpixel; /* Version 0.6 */ + CARD32 pad5; } xRenderQueryPictFormatsReply; #define sz_xRenderQueryPictFormatsReply 32 @@ -231,8 +231,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - PictFormat format B32; + CARD16 length; + PictFormat format; } xRenderQueryPictIndexValuesReq; #define sz_xRenderQueryPictIndexValuesReq 8 @@ -240,14 +240,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD32 numIndexValues; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xRenderQueryPictIndexValuesReply; #define sz_xRenderQueryPictIndexValuesReply 32 @@ -255,11 +255,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture pid B32; - Drawable drawable B32; - PictFormat format B32; - CARD32 mask B32; + CARD16 length; + Picture pid; + Drawable drawable; + PictFormat format; + CARD32 mask; } xRenderCreatePictureReq; #define sz_xRenderCreatePictureReq 20 @@ -267,9 +267,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture picture B32; - CARD32 mask B32; + CARD16 length; + Picture picture; + CARD32 mask; } xRenderChangePictureReq; #define sz_xRenderChangePictureReq 12 @@ -277,10 +277,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture picture B32; - INT16 xOrigin B16; - INT16 yOrigin B16; + CARD16 length; + Picture picture; + INT16 xOrigin; + INT16 yOrigin; } xRenderSetPictureClipRectanglesReq; #define sz_xRenderSetPictureClipRectanglesReq 12 @@ -288,8 +288,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture picture B32; + CARD16 length; + Picture picture; } xRenderFreePictureReq; #define sz_xRenderFreePictureReq 8 @@ -297,21 +297,21 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; CARD8 op; CARD8 pad1; - CARD16 pad2 B16; - Picture src B32; - Picture mask B32; - Picture dst B32; - INT16 xSrc B16; - INT16 ySrc B16; - INT16 xMask B16; - INT16 yMask B16; - INT16 xDst B16; - INT16 yDst B16; - CARD16 width B16; - CARD16 height B16; + CARD16 pad2; + Picture src; + Picture mask; + Picture dst; + INT16 xSrc; + INT16 ySrc; + INT16 xMask; + INT16 yMask; + INT16 xDst; + INT16 yDst; + CARD16 width; + CARD16 height; } xRenderCompositeReq; #define sz_xRenderCompositeReq 36 @@ -319,17 +319,17 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture src B32; - Picture dst B32; - CARD32 colorScale B32; - CARD32 alphaScale B32; - INT16 xSrc B16; - INT16 ySrc B16; - INT16 xDst B16; - INT16 yDst B16; - CARD16 width B16; - CARD16 height B16; + CARD16 length; + Picture src; + Picture dst; + CARD32 colorScale; + CARD32 alphaScale; + INT16 xSrc; + INT16 ySrc; + INT16 xDst; + INT16 yDst; + CARD16 width; + CARD16 height; } xRenderScaleReq; #define sz_xRenderScaleReq 32 @@ -337,15 +337,15 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; CARD8 op; CARD8 pad1; - CARD16 pad2 B16; - Picture src B32; - Picture dst B32; - PictFormat maskFormat B32; - INT16 xSrc B16; - INT16 ySrc B16; + CARD16 pad2; + Picture src; + Picture dst; + PictFormat maskFormat; + INT16 xSrc; + INT16 ySrc; } xRenderTrapezoidsReq; #define sz_xRenderTrapezoidsReq 24 @@ -353,15 +353,15 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; CARD8 op; CARD8 pad1; - CARD16 pad2 B16; - Picture src B32; - Picture dst B32; - PictFormat maskFormat B32; - INT16 xSrc B16; - INT16 ySrc B16; + CARD16 pad2; + Picture src; + Picture dst; + PictFormat maskFormat; + INT16 xSrc; + INT16 ySrc; } xRenderTrianglesReq; #define sz_xRenderTrianglesReq 24 @@ -369,15 +369,15 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; CARD8 op; CARD8 pad1; - CARD16 pad2 B16; - Picture src B32; - Picture dst B32; - PictFormat maskFormat B32; - INT16 xSrc B16; - INT16 ySrc B16; + CARD16 pad2; + Picture src; + Picture dst; + PictFormat maskFormat; + INT16 xSrc; + INT16 ySrc; } xRenderTriStripReq; #define sz_xRenderTriStripReq 24 @@ -385,15 +385,15 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; CARD8 op; CARD8 pad1; - CARD16 pad2 B16; - Picture src B32; - Picture dst B32; - PictFormat maskFormat B32; - INT16 xSrc B16; - INT16 ySrc B16; + CARD16 pad2; + Picture src; + Picture dst; + PictFormat maskFormat; + INT16 xSrc; + INT16 ySrc; } xRenderTriFanReq; #define sz_xRenderTriFanReq 24 @@ -401,9 +401,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Glyphset gsid B32; - PictFormat format B32; + CARD16 length; + Glyphset gsid; + PictFormat format; } xRenderCreateGlyphSetReq; #define sz_xRenderCreateGlyphSetReq 12 @@ -411,9 +411,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Glyphset gsid B32; - Glyphset existing B32; + CARD16 length; + Glyphset gsid; + Glyphset existing; } xRenderReferenceGlyphSetReq; #define sz_xRenderReferenceGlyphSetReq 24 @@ -421,8 +421,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Glyphset glyphset B32; + CARD16 length; + Glyphset glyphset; } xRenderFreeGlyphSetReq; #define sz_xRenderFreeGlyphSetReq 8 @@ -430,8 +430,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Glyphset glyphset B32; + CARD16 length; + Glyphset glyphset; CARD32 nglyphs; } xRenderAddGlyphsReq; @@ -440,8 +440,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Glyphset glyphset B32; + CARD16 length; + Glyphset glyphset; } xRenderFreeGlyphsReq; #define sz_xRenderFreeGlyphsReq 8 @@ -449,16 +449,16 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; CARD8 op; CARD8 pad1; - CARD16 pad2 B16; - Picture src B32; - Picture dst B32; - PictFormat maskFormat B32; - Glyphset glyphset B32; - INT16 xSrc B16; - INT16 ySrc B16; + CARD16 pad2; + Picture src; + Picture dst; + PictFormat maskFormat; + Glyphset glyphset; + INT16 xSrc; + INT16 ySrc; } xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req, xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req; @@ -471,11 +471,11 @@ xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req; typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; CARD8 op; CARD8 pad1; - CARD16 pad2 B16; - Picture dst B32; + CARD16 pad2; + Picture dst; xRenderColor color; } xRenderFillRectanglesReq; @@ -486,11 +486,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Cursor cid B32; - Picture src B32; - CARD16 x B16; - CARD16 y B16; + CARD16 length; + Cursor cid; + Picture src; + CARD16 x; + CARD16 y; } xRenderCreateCursorReq; #define sz_xRenderCreateCursorReq 16 @@ -501,15 +501,15 @@ typedef struct { * This can't use an array because 32-bit values may be in bitfields */ typedef struct { - Fixed matrix11 B32; - Fixed matrix12 B32; - Fixed matrix13 B32; - Fixed matrix21 B32; - Fixed matrix22 B32; - Fixed matrix23 B32; - Fixed matrix31 B32; - Fixed matrix32 B32; - Fixed matrix33 B32; + Fixed matrix11; + Fixed matrix12; + Fixed matrix13; + Fixed matrix21; + Fixed matrix22; + Fixed matrix23; + Fixed matrix31; + Fixed matrix32; + Fixed matrix33; } xRenderTransform; #define sz_xRenderTransform 36 @@ -517,8 +517,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture picture B32; + CARD16 length; + Picture picture; xRenderTransform transform; } xRenderSetPictureTransformReq; @@ -527,8 +527,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Drawable drawable B32; + CARD16 length; + Drawable drawable; } xRenderQueryFiltersReq; #define sz_xRenderQueryFiltersReq 8 @@ -536,14 +536,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 numAliases B32; /* LISTofCARD16 */ - CARD32 numFilters B32; /* LISTofSTRING8 */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 numAliases; /* LISTofCARD16 */ + CARD32 numFilters; /* LISTofSTRING8 */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xRenderQueryFiltersReply; #define sz_xRenderQueryFiltersReply 32 @@ -551,10 +551,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture picture B32; - CARD16 nbytes B16; /* number of bytes in name */ - CARD16 pad B16; + CARD16 length; + Picture picture; + CARD16 nbytes; /* number of bytes in name */ + CARD16 pad; } xRenderSetPictureFilterReq; #define sz_xRenderSetPictureFilterReq 12 @@ -562,8 +562,8 @@ typedef struct { /* 0.8 and higher */ typedef struct { - Cursor cursor B32; - CARD32 delay B32; + Cursor cursor; + CARD32 delay; } xAnimCursorElt; #define sz_xAnimCursorElt 8 @@ -571,8 +571,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Cursor cid B32; + CARD16 length; + Cursor cid; } xRenderCreateAnimCursorReq; #define sz_xRenderCreateAnimCursorReq 8 @@ -582,10 +582,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; + CARD16 length; Picture picture; - INT16 xOff B16; - INT16 yOff B16; + INT16 xOff; + INT16 yOff; } xRenderAddTrapsReq; #define sz_xRenderAddTrapsReq 12 @@ -595,8 +595,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture pid B32; + CARD16 length; + Picture pid; xRenderColor color; } xRenderCreateSolidFillReq; @@ -605,8 +605,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture pid B32; + CARD16 length; + Picture pid; xPointFixed p1; xPointFixed p2; CARD32 nStops; @@ -617,8 +617,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture pid B32; + CARD16 length; + Picture pid; xPointFixed inner; xPointFixed outer; Fixed inner_radius; @@ -631,8 +631,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 renderReqType; - CARD16 length B16; - Picture pid B32; + CARD16 length; + Picture pid; xPointFixed center; Fixed angle; /* in degrees */ CARD32 nStops; diff --git a/proto/xorgproto/include/X11/extensions/saverproto.h b/proto/xorgproto/include/X11/extensions/saverproto.h index 7197084cc..0b8e34eed 100644 --- a/proto/xorgproto/include/X11/extensions/saverproto.h +++ b/proto/xorgproto/include/X11/extensions/saverproto.h @@ -48,25 +48,25 @@ in this Software without prior written authorization from the X Consortium. typedef struct _ScreenSaverQueryVersion { CARD8 reqType; /* always ScreenSaverReqCode */ CARD8 saverReqType; /* always X_ScreenSaverQueryVersion */ - CARD16 length B16; + CARD16 length; CARD8 clientMajor; CARD8 clientMinor; - CARD16 unused B16; + CARD16 unused; } xScreenSaverQueryVersionReq; #define sz_xScreenSaverQueryVersionReq 8 typedef struct { CARD8 type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of protocol */ - CARD16 minorVersion B16; /* minor version of protocol */ - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of protocol */ + CARD16 minorVersion; /* minor version of protocol */ + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xScreenSaverQueryVersionReply; #define sz_xScreenSaverQueryVersionReply 32 @@ -75,24 +75,24 @@ typedef struct { typedef struct _ScreenSaverQueryInfo { CARD8 reqType; /* always ScreenSaverReqCode */ CARD8 saverReqType; /* always X_ScreenSaverQueryInfo */ - CARD16 length B16; - Drawable drawable B32; + CARD16 length; + Drawable drawable; } xScreenSaverQueryInfoReq; #define sz_xScreenSaverQueryInfoReq 8 typedef struct { CARD8 type; /* X_Reply */ BYTE state; /* Off, On */ - CARD16 sequenceNumber B16; - CARD32 length B32; - Window window B32; - CARD32 tilOrSince B32; - CARD32 idle B32; - CARD32 eventMask B32; + CARD16 sequenceNumber; + CARD32 length; + Window window; + CARD32 tilOrSince; + CARD32 idle; + CARD32 eventMask; BYTE kind; /* Blanked, Internal, External */ CARD8 pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; + CARD16 pad1; + CARD32 pad2; } xScreenSaverQueryInfoReply; #define sz_xScreenSaverQueryInfoReply 32 @@ -101,9 +101,9 @@ typedef struct { typedef struct _ScreenSaverSelectInput { CARD8 reqType; /* always ScreenSaverReqCode */ CARD8 saverReqType; /* always X_ScreenSaverSelectInput */ - CARD16 length B16; - Drawable drawable B32; - CARD32 eventMask B32; + CARD16 length; + Drawable drawable; + CARD32 eventMask; } xScreenSaverSelectInputReq; #define sz_xScreenSaverSelectInputReq 12 @@ -112,14 +112,14 @@ typedef struct _ScreenSaverSelectInput { typedef struct _ScreenSaverSetAttributes { CARD8 reqType; /* always ScreenSaverReqCode */ CARD8 saverReqType; /* always X_ScreenSaverSetAttributes */ - CARD16 length B16; - Drawable drawable B32; - INT16 x B16, y B16; - CARD16 width B16, height B16, borderWidth B16; + CARD16 length; + Drawable drawable; + INT16 x, y; + CARD16 width, height, borderWidth; BYTE c_class; CARD8 depth; - VisualID visualID B32; - CARD32 mask B32; + VisualID visualID; + CARD32 mask; } xScreenSaverSetAttributesReq; #define sz_xScreenSaverSetAttributesReq 28 @@ -128,8 +128,8 @@ typedef struct _ScreenSaverSetAttributes { typedef struct _ScreenSaverUnsetAttributes { CARD8 reqType; /* always ScreenSaverReqCode */ CARD8 saverReqType; /* always X_ScreenSaverUnsetAttributes */ - CARD16 length B16; - Drawable drawable B32; + CARD16 length; + Drawable drawable; } xScreenSaverUnsetAttributesReq; #define sz_xScreenSaverUnsetAttributesReq 8 @@ -138,24 +138,24 @@ typedef struct _ScreenSaverUnsetAttributes { typedef struct _ScreenSaverSuspend { CARD8 reqType; CARD8 saverReqType; - CARD16 length B16; - Bool suspend B32; + CARD16 length; + CARD32 suspend; /* a boolean, but using the wrong encoding */ } xScreenSaverSuspendReq; #define sz_xScreenSaverSuspendReq 8 typedef struct _ScreenSaverNotify { CARD8 type; /* always eventBase + ScreenSaverNotify */ BYTE state; /* off, on, cycle */ - CARD16 sequenceNumber B16; - Time timestamp B32; - Window root B32; - Window window B32; /* screen saver window */ + CARD16 sequenceNumber; + Time timestamp; + Window root; + Window window; /* screen saver window */ BYTE kind; /* blanked, internal, external */ BYTE forced; - CARD16 pad0 B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xScreenSaverNotifyEvent; #define sz_xScreenSaverNotifyEvent 32 diff --git a/proto/xorgproto/include/X11/extensions/securproto.h b/proto/xorgproto/include/X11/extensions/securproto.h index 409a4c5d0..d9e120c90 100644 --- a/proto/xorgproto/include/X11/extensions/securproto.h +++ b/proto/xorgproto/include/X11/extensions/securproto.h @@ -36,34 +36,34 @@ from The Open Group. typedef struct { CARD8 reqType; CARD8 securityReqType; - CARD16 length B16; - CARD16 majorVersion B16; - CARD16 minorVersion B16; + CARD16 length; + CARD16 majorVersion; + CARD16 minorVersion; } xSecurityQueryVersionReq; #define sz_xSecurityQueryVersionReq 8 typedef struct { CARD8 type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; - CARD16 minorVersion B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; + CARD16 minorVersion; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xSecurityQueryVersionReply; #define sz_xSecurityQueryVersionReply 32 typedef struct { CARD8 reqType; CARD8 securityReqType; - CARD16 length B16; - CARD16 nbytesAuthProto B16; - CARD16 nbytesAuthData B16; - CARD32 valueMask B32; + CARD16 length; + CARD16 nbytesAuthProto; + CARD16 nbytesAuthData; + CARD32 valueMask; /* auth protocol name padded to 4 bytes */ /* auth protocol data padded to 4 bytes */ /* list of CARD32 values, if any */ @@ -73,37 +73,37 @@ typedef struct { typedef struct { CARD8 type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 authId B32; - CARD16 dataLength B16; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 authId; + CARD16 dataLength; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xSecurityGenerateAuthorizationReply; #define sz_xSecurityGenerateAuthorizationReply 32 typedef struct { CARD8 reqType; CARD8 securityReqType; - CARD16 length B16; - CARD32 authId B32; + CARD16 length; + CARD32 authId; } xSecurityRevokeAuthorizationReq; #define sz_xSecurityRevokeAuthorizationReq 8 typedef struct _xSecurityAuthorizationRevokedEvent { BYTE type; BYTE detail; - CARD16 sequenceNumber B16; - CARD32 authId B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 authId; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xSecurityAuthorizationRevokedEvent; #define sz_xSecurityAuthorizationRevokedEvent 32 diff --git a/proto/xorgproto/include/X11/extensions/shapeproto.h b/proto/xorgproto/include/X11/extensions/shapeproto.h index 49bd1a1a4..e5c1838a8 100644 --- a/proto/xorgproto/include/X11/extensions/shapeproto.h +++ b/proto/xorgproto/include/X11/extensions/shapeproto.h @@ -50,184 +50,184 @@ in this Software without prior written authorization from The Open Group. typedef struct _ShapeQueryVersion { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeQueryVersion */ - CARD16 length B16; + CARD16 length; } xShapeQueryVersionReq; #define sz_xShapeQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of SHAPE protocol */ - CARD16 minorVersion B16; /* minor version of SHAPE protocol */ - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of SHAPE protocol */ + CARD16 minorVersion; /* minor version of SHAPE protocol */ + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xShapeQueryVersionReply; #define sz_xShapeQueryVersionReply 32 typedef struct _ShapeRectangles { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeRectangles */ - CARD16 length B16; + CARD16 length; CARD8 op; /* Set, ... */ CARD8 destKind; /* ShapeBounding or ShapeClip */ CARD8 ordering; /* UnSorted, YSorted, YXSorted, YXBanded */ CARD8 pad0; /* not used */ - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; + Window dest; + INT16 xOff; + INT16 yOff; } xShapeRectanglesReq; /* followed by xRects */ #define sz_xShapeRectanglesReq 16 typedef struct _ShapeMask { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeMask */ - CARD16 length B16; + CARD16 length; CARD8 op; /* Set, ... */ CARD8 destKind; /* ShapeBounding or ShapeClip */ - CARD16 junk B16; /* not used */ + CARD16 junk; /* not used */ - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; - CARD32 src B32; /* 1 bit pixmap */ + Window dest; + INT16 xOff; + INT16 yOff; + CARD32 src; /* 1 bit pixmap */ } xShapeMaskReq; #define sz_xShapeMaskReq 20 typedef struct _ShapeCombine { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeCombine */ - CARD16 length B16; + CARD16 length; CARD8 op; /* Set, ... */ CARD8 destKind; /* ShapeBounding or ShapeClip */ CARD8 srcKind; /* ShapeBounding or ShapeClip */ CARD8 junk; /* not used */ - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; - Window src B32; + Window dest; + INT16 xOff; + INT16 yOff; + Window src; } xShapeCombineReq; #define sz_xShapeCombineReq 20 typedef struct _ShapeOffset { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeOffset */ - CARD16 length B16; + CARD16 length; CARD8 destKind; /* ShapeBounding or ShapeClip */ CARD8 junk1; /* not used */ - CARD16 junk2 B16; /* not used */ - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; + CARD16 junk2; /* not used */ + Window dest; + INT16 xOff; + INT16 yOff; } xShapeOffsetReq; #define sz_xShapeOffsetReq 16 typedef struct _ShapeQueryExtents { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeQueryExtents */ - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xShapeQueryExtentsReq; #define sz_xShapeQueryExtentsReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ + CARD16 sequenceNumber; + CARD32 length; /* 0 */ CARD8 boundingShaped; /* window has bounding shape */ CARD8 clipShaped; /* window has clip shape */ - CARD16 unused1 B16; - INT16 xBoundingShape B16; /* extents of bounding shape */ - INT16 yBoundingShape B16; - CARD16 widthBoundingShape B16; - CARD16 heightBoundingShape B16; - INT16 xClipShape B16; /* extents of clip shape */ - INT16 yClipShape B16; - CARD16 widthClipShape B16; - CARD16 heightClipShape B16; - CARD32 pad1 B32; + CARD16 unused1; + INT16 xBoundingShape; /* extents of bounding shape */ + INT16 yBoundingShape; + CARD16 widthBoundingShape; + CARD16 heightBoundingShape; + INT16 xClipShape; /* extents of clip shape */ + INT16 yClipShape; + CARD16 widthClipShape; + CARD16 heightClipShape; + CARD32 pad1; } xShapeQueryExtentsReply; #define sz_xShapeQueryExtentsReply 32 typedef struct _ShapeSelectInput { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeSelectInput */ - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; BYTE enable; /* xTrue -> send events */ BYTE pad1; - CARD16 pad2 B16; + CARD16 pad2; } xShapeSelectInputReq; #define sz_xShapeSelectInputReq 12 typedef struct _ShapeNotify { BYTE type; /* always eventBase + ShapeNotify */ BYTE kind; /* either ShapeBounding or ShapeClip */ - CARD16 sequenceNumber B16; - Window window B32; - INT16 x B16; - INT16 y B16; /* extents of new shape */ - CARD16 width B16; - CARD16 height B16; - Time time B32; /* time of change */ + CARD16 sequenceNumber; + Window window; + INT16 x; + INT16 y; /* extents of new shape */ + CARD16 width; + CARD16 height; + Time time; /* time of change */ BYTE shaped; /* set when a shape actual exists */ BYTE pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; } xShapeNotifyEvent; #define sz_xShapeNotifyEvent 32 typedef struct _ShapeInputSelected { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeInputSelected */ - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xShapeInputSelectedReq; #define sz_xShapeInputSelectedReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 enabled; /* current status */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD32 pad1 B32; /* unused */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; /* 0 */ + CARD32 pad1; /* unused */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xShapeInputSelectedReply; #define sz_xShapeInputSelectedReply 32 typedef struct _ShapeGetRectangles { CARD8 reqType; /* always ShapeReqCode */ CARD8 shapeReqType; /* always X_ShapeGetRectangles */ - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; CARD8 kind; /* ShapeBounding or ShapeClip */ CARD8 junk1; - CARD16 junk2 B16; + CARD16 junk2; } xShapeGetRectanglesReq; #define sz_xShapeGetRectanglesReq 12 typedef struct { BYTE type; /* X_Reply */ CARD8 ordering; /* UnSorted, YSorted, YXSorted, YXBanded */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* not zero */ - CARD32 nrects B32; /* number of rectangles */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; /* not zero */ + CARD32 nrects; /* number of rectangles */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xShapeGetRectanglesReply; /* followed by xRectangles */ #define sz_xShapeGetRectanglesReply 32 diff --git a/proto/xorgproto/include/X11/extensions/shmproto.h b/proto/xorgproto/include/X11/extensions/shmproto.h index 8136aa9f7..6e3260615 100644 --- a/proto/xorgproto/include/X11/extensions/shmproto.h +++ b/proto/xorgproto/include/X11/extensions/shmproto.h @@ -49,134 +49,134 @@ in this Software without prior written authorization from The Open Group. typedef struct _ShmQueryVersion { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmQueryVersion */ - CARD16 length B16; + CARD16 length; } xShmQueryVersionReq; #define sz_xShmQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL sharedPixmaps; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of SHM protocol */ - CARD16 minorVersion B16; /* minor version of SHM protocol */ - CARD16 uid B16; - CARD16 gid B16; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of SHM protocol */ + CARD16 minorVersion; /* minor version of SHM protocol */ + CARD16 uid; + CARD16 gid; CARD8 pixmapFormat; CARD8 pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xShmQueryVersionReply; #define sz_xShmQueryVersionReply 32 typedef struct _ShmAttach { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmAttach */ - CARD16 length B16; - ShmSeg shmseg B32; - CARD32 shmid B32; + CARD16 length; + ShmSeg shmseg; + CARD32 shmid; BOOL readOnly; BYTE pad0; - CARD16 pad1 B16; + CARD16 pad1; } xShmAttachReq; #define sz_xShmAttachReq 16 typedef struct _ShmDetach { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmDetach */ - CARD16 length B16; - ShmSeg shmseg B32; + CARD16 length; + ShmSeg shmseg; } xShmDetachReq; #define sz_xShmDetachReq 8 typedef struct _ShmPutImage { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmPutImage */ - CARD16 length B16; - Drawable drawable B32; - GContext gc B32; - CARD16 totalWidth B16; - CARD16 totalHeight B16; - CARD16 srcX B16; - CARD16 srcY B16; - CARD16 srcWidth B16; - CARD16 srcHeight B16; - INT16 dstX B16; - INT16 dstY B16; + CARD16 length; + Drawable drawable; + GContext gc; + CARD16 totalWidth; + CARD16 totalHeight; + CARD16 srcX; + CARD16 srcY; + CARD16 srcWidth; + CARD16 srcHeight; + INT16 dstX; + INT16 dstY; CARD8 depth; CARD8 format; CARD8 sendEvent; CARD8 bpad; - ShmSeg shmseg B32; - CARD32 offset B32; + ShmSeg shmseg; + CARD32 offset; } xShmPutImageReq; #define sz_xShmPutImageReq 40 typedef struct _ShmGetImage { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmGetImage */ - CARD16 length B16; - Drawable drawable B32; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; - CARD32 planeMask B32; + CARD16 length; + Drawable drawable; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; + CARD32 planeMask; CARD8 format; CARD8 pad0; CARD8 pad1; CARD8 pad2; - ShmSeg shmseg B32; - CARD32 offset B32; + ShmSeg shmseg; + CARD32 offset; } xShmGetImageReq; #define sz_xShmGetImageReq 32 typedef struct _ShmGetImageReply { BYTE type; /* X_Reply */ CARD8 depth; - CARD16 sequenceNumber B16; - CARD32 length B32; - VisualID visual B32; - CARD32 size B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + VisualID visual; + CARD32 size; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xShmGetImageReply; #define sz_xShmGetImageReply 32 typedef struct _ShmCreatePixmap { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmCreatePixmap */ - CARD16 length B16; - Pixmap pid B32; - Drawable drawable B32; - CARD16 width B16; - CARD16 height B16; + CARD16 length; + Pixmap pid; + Drawable drawable; + CARD16 width; + CARD16 height; CARD8 depth; CARD8 pad0; CARD8 pad1; CARD8 pad2; - ShmSeg shmseg B32; - CARD32 offset B32; + ShmSeg shmseg; + CARD32 offset; } xShmCreatePixmapReq; #define sz_xShmCreatePixmapReq 28 typedef struct _ShmCompletion { BYTE type; /* always eventBase + ShmCompletion */ BYTE bpad0; - CARD16 sequenceNumber B16; - Drawable drawable B32; - CARD16 minorEvent B16; + CARD16 sequenceNumber; + Drawable drawable; + CARD16 minorEvent; BYTE majorEvent; BYTE bpad1; - ShmSeg shmseg B32; - CARD32 offset B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; + ShmSeg shmseg; + CARD32 offset; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; } xShmCompletionEvent; #define sz_xShmCompletionEvent 32 @@ -184,11 +184,11 @@ typedef struct _ShmCompletion { typedef struct _ShmAttachFd { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmAttachFd */ - CARD16 length B16; - ShmSeg shmseg B32; + CARD16 length; + ShmSeg shmseg; BOOL readOnly; BYTE pad0; - CARD16 pad1 B16; + CARD16 pad1; } xShmAttachFdReq; /* File descriptor is passed with this request */ #define sz_xShmAttachFdReq 12 @@ -196,26 +196,26 @@ typedef struct _ShmAttachFd { typedef struct _ShmCreateSegment { CARD8 reqType; /* always ShmReqCode */ CARD8 shmReqType; /* always X_ShmAttachFd */ - CARD16 length B16; - ShmSeg shmseg B32; - CARD32 size B32; + CARD16 length; + ShmSeg shmseg; + CARD32 size; BOOL readOnly; BYTE pad0; - CARD16 pad1 B16; + CARD16 pad1; } xShmCreateSegmentReq; #define sz_xShmCreateSegmentReq 16 typedef struct { CARD8 type; /* must be X_Reply */ CARD8 nfd; /* must be 1 */ - CARD16 sequenceNumber B16; /* last sequence number */ - CARD32 length B32; /* 0 */ - CARD32 pad2 B32; /* unused */ - CARD32 pad3 B32; /* unused */ - CARD32 pad4 B32; /* unused */ - CARD32 pad5 B32; /* unused */ - CARD32 pad6 B32; /* unused */ - CARD32 pad7 B32; /* unused */ + CARD16 sequenceNumber; /* last sequence number */ + CARD32 length; /* 0 */ + CARD32 pad2; /* unused */ + CARD32 pad3; /* unused */ + CARD32 pad4; /* unused */ + CARD32 pad5; /* unused */ + CARD32 pad6; /* unused */ + CARD32 pad7; /* unused */ } xShmCreateSegmentReply; /* File descriptor is passed with this reply */ #define sz_xShmCreateSegmentReply 32 diff --git a/proto/xorgproto/include/X11/extensions/syncproto.h b/proto/xorgproto/include/X11/extensions/syncproto.h index 1453e4401..0fa1db74a 100644 --- a/proto/xorgproto/include/X11/extensions/syncproto.h +++ b/proto/xorgproto/include/X11/extensions/syncproto.h @@ -89,26 +89,26 @@ PERFORMANCE OF THIS SOFTWARE. typedef struct _xSyncInitialize { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; + CARD16 length; CARD8 majorVersion; CARD8 minorVersion; - CARD16 pad B16; + CARD16 pad; } xSyncInitializeReq; #define sz_xSyncInitializeReq 8 typedef struct { BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 majorVersion; CARD8 minorVersion; - CARD16 pad B16; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 pad; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xSyncInitializeReply; #define sz_xSyncInitializeReply 32 @@ -119,29 +119,29 @@ typedef struct _xSyncListSystemCounters { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; + CARD16 length; } xSyncListSystemCountersReq; #define sz_xSyncListSystemCountersReq 4 typedef struct { BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - INT32 nCounters B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + INT32 nCounters; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xSyncListSystemCountersReply; #define sz_xSyncListSystemCountersReply 32 typedef struct { - XSyncCounter counter B32; - INT32 resolution_hi B32; - CARD32 resolution_lo B32; - CARD16 name_length B16; + XSyncCounter counter; + INT32 resolution_hi; + CARD32 resolution_lo; + CARD16 name_length; } xSyncSystemCounter; #define sz_xSyncSystemCounter 14 @@ -151,10 +151,10 @@ typedef struct { typedef struct _xSyncCreateCounterReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncCounter cid B32; - INT32 initial_value_hi B32; - CARD32 initial_value_lo B32; + CARD16 length; + XSyncCounter cid; + INT32 initial_value_hi; + CARD32 initial_value_lo; } xSyncCreateCounterReq; #define sz_xSyncCreateCounterReq 16 @@ -164,10 +164,10 @@ typedef struct _xSyncCreateCounterReq { typedef struct _xSyncChangeCounterReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncCounter cid B32; - INT32 value_hi B32; - CARD32 value_lo B32; + CARD16 length; + XSyncCounter cid; + INT32 value_hi; + CARD32 value_lo; } xSyncChangeCounterReq; #define sz_xSyncChangeCounterReq 16 @@ -177,10 +177,10 @@ typedef struct _xSyncChangeCounterReq { typedef struct _xSyncSetCounterReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncCounter cid B32; - INT32 value_hi B32; - CARD32 value_lo B32; + CARD16 length; + XSyncCounter cid; + INT32 value_hi; + CARD32 value_lo; } xSyncSetCounterReq; #define sz_xSyncSetCounterReq 16 @@ -190,8 +190,8 @@ typedef struct _xSyncSetCounterReq { typedef struct _xSyncDestroyCounterReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncCounter counter B32; + CARD16 length; + XSyncCounter counter; } xSyncDestroyCounterReq; #define sz_xSyncDestroyCounterReq 8 @@ -201,8 +201,8 @@ typedef struct _xSyncDestroyCounterReq { typedef struct _xSyncQueryCounterReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncCounter counter B32; + CARD16 length; + XSyncCounter counter; } xSyncQueryCounterReq; #define sz_xSyncQueryCounterReq 8 @@ -210,14 +210,14 @@ typedef struct _xSyncQueryCounterReq { typedef struct { BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - INT32 value_hi B32; - CARD32 value_lo B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + INT32 value_hi; + CARD32 value_lo; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xSyncQueryCounterReply; #define sz_xSyncQueryCounterReply 32 @@ -227,18 +227,18 @@ typedef struct { typedef struct _xSyncAwaitReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; + CARD16 length; } xSyncAwaitReq; #define sz_xSyncAwaitReq 4 typedef struct _xSyncWaitCondition { - XSyncCounter counter B32; - CARD32 value_type B32; - INT32 wait_value_hi B32; - CARD32 wait_value_lo B32; - CARD32 test_type B32; - INT32 event_threshold_hi B32; - CARD32 event_threshold_lo B32; + XSyncCounter counter; + CARD32 value_type; + INT32 wait_value_hi; + CARD32 wait_value_lo; + CARD32 test_type; + INT32 event_threshold_hi; + CARD32 event_threshold_lo; } xSyncWaitCondition; #define sz_xSyncWaitCondition 28 @@ -248,9 +248,9 @@ typedef struct _xSyncWaitCondition { typedef struct _xSyncCreateAlarmReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncAlarm id B32; - CARD32 valueMask B32; + CARD16 length; + XSyncAlarm id; + CARD32 valueMask; } xSyncCreateAlarmReq; #define sz_xSyncCreateAlarmReq 12 @@ -260,8 +260,8 @@ typedef struct _xSyncCreateAlarmReq { typedef struct _xSyncDestroyAlarmReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncAlarm alarm B32; + CARD16 length; + XSyncAlarm alarm; } xSyncDestroyAlarmReq; #define sz_xSyncDestroyAlarmReq 8 @@ -271,23 +271,23 @@ typedef struct _xSyncDestroyAlarmReq { typedef struct _xSyncQueryAlarmReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncAlarm alarm B32; + CARD16 length; + XSyncAlarm alarm; } xSyncQueryAlarmReq; #define sz_xSyncQueryAlarmReq 8 typedef struct { BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - XSyncCounter counter B32; - CARD32 value_type B32; - INT32 wait_value_hi B32; - CARD32 wait_value_lo B32; - CARD32 test_type B32; - INT32 delta_hi B32; - CARD32 delta_lo B32; + CARD16 sequenceNumber; + CARD32 length; + XSyncCounter counter; + CARD32 value_type; + INT32 wait_value_hi; + CARD32 wait_value_lo; + CARD32 test_type; + INT32 delta_hi; + CARD32 delta_lo; BOOL events; BYTE state; BYTE pad0; @@ -301,9 +301,9 @@ typedef struct { typedef struct _xSyncChangeAlarmReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncAlarm alarm B32; - CARD32 valueMask B32; + CARD16 length; + XSyncAlarm alarm; + CARD32 valueMask; } xSyncChangeAlarmReq; #define sz_xSyncChangeAlarmReq 12 @@ -313,9 +313,9 @@ typedef struct _xSyncChangeAlarmReq { typedef struct _xSyncSetPriority{ CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - CARD32 id B32; - INT32 priority B32; + CARD16 length; + CARD32 id; + INT32 priority; } xSyncSetPriorityReq; #define sz_xSyncSetPriorityReq 12 @@ -325,22 +325,22 @@ typedef struct _xSyncSetPriority{ typedef struct _xSyncGetPriority{ CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - CARD32 id B32; /*XXX XID? */ + CARD16 length; + CARD32 id; /*XXX XID? */ } xSyncGetPriorityReq; #define sz_xSyncGetPriorityReq 8 typedef struct { BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; - INT32 priority B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + INT32 priority; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xSyncGetPriorityReply; #define sz_xSyncGetPriorityReply 32 @@ -350,9 +350,9 @@ typedef struct { typedef struct _xSyncCreateFenceReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - Drawable d B32; - XSyncFence fid B32; + CARD16 length; + Drawable d; + XSyncFence fid; BOOL initially_triggered; CARD8 pad0; CARD16 pad1; @@ -365,8 +365,8 @@ typedef struct _xSyncCreateFenceReq { typedef struct _xSyncTriggerFenceReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncFence fid B32; + CARD16 length; + XSyncFence fid; } xSyncTriggerFenceReq; #define sz_xSyncTriggerFenceReq 8 @@ -376,8 +376,8 @@ typedef struct _xSyncTriggerFenceReq { typedef struct _xSyncResetFenceReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncFence fid B32; + CARD16 length; + XSyncFence fid; } xSyncResetFenceReq; #define sz_xSyncResetFenceReq 8 @@ -387,8 +387,8 @@ typedef struct _xSyncResetFenceReq { typedef struct _xSyncDestroyFenceReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncFence fid B32; + CARD16 length; + XSyncFence fid; } xSyncDestroyFenceReq; #define sz_xSyncDestroyFenceReq 8 @@ -398,8 +398,8 @@ typedef struct _xSyncDestroyFenceReq { typedef struct _xSyncQueryFenceReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; - XSyncFence fid B32; + CARD16 length; + XSyncFence fid; } xSyncQueryFenceReq; #define sz_xSyncQueryFenceReq 8 @@ -410,23 +410,23 @@ typedef struct _xSyncQueryFenceReq { typedef struct _xSyncAwaitFenceReq { CARD8 reqType; CARD8 syncReqType; - CARD16 length B16; + CARD16 length; } xSyncAwaitFenceReq; #define sz_xSyncAwaitFenceReq 4 typedef struct { BYTE type; CARD8 unused; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL triggered; BYTE pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xSyncQueryFenceReply; #define sz_xSyncQueryFenceReply 32 @@ -437,14 +437,14 @@ typedef struct { typedef struct _xSyncCounterNotifyEvent { BYTE type; BYTE kind; - CARD16 sequenceNumber B16; - XSyncCounter counter B32; - INT32 wait_value_hi B32; - CARD32 wait_value_lo B32; - INT32 counter_value_hi B32; - CARD32 counter_value_lo B32; - CARD32 time B32; - CARD16 count B16; + CARD16 sequenceNumber; + XSyncCounter counter; + INT32 wait_value_hi; + CARD32 wait_value_lo; + INT32 counter_value_hi; + CARD32 counter_value_lo; + CARD32 time; + CARD16 count; BOOL destroyed; BYTE pad0; } xSyncCounterNotifyEvent; @@ -452,13 +452,13 @@ typedef struct _xSyncCounterNotifyEvent { typedef struct _xSyncAlarmNotifyEvent { BYTE type; BYTE kind; - CARD16 sequenceNumber B16; - XSyncAlarm alarm B32; - INT32 counter_value_hi B32; - CARD32 counter_value_lo B32; - INT32 alarm_value_hi B32; - CARD32 alarm_value_lo B32; - CARD32 time B32; + CARD16 sequenceNumber; + XSyncAlarm alarm; + INT32 counter_value_hi; + CARD32 counter_value_lo; + INT32 alarm_value_hi; + CARD32 alarm_value_lo; + CARD32 time; CARD8 state; BYTE pad0; BYTE pad1; diff --git a/proto/xorgproto/include/X11/extensions/syncstr.h b/proto/xorgproto/include/X11/extensions/syncstr.h index 25a48277e..4e8db1b6c 100644 --- a/proto/xorgproto/include/X11/extensions/syncstr.h +++ b/proto/xorgproto/include/X11/extensions/syncstr.h @@ -30,13 +30,13 @@ and Olivetti Research Limited, Cambridge, England. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or Olivetti not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND @@ -155,14 +155,14 @@ typedef union { extern pointer SyncCreateSystemCounter( char * /* name */, - CARD64 /* inital_value */, + CARD64 /* initial_value */, CARD64 /* resolution */, SyncCounterType /* change characterization */, void (* /*QueryValue*/ ) ( pointer /* pCounter */, CARD64 * /* pValue_return */), /* XXX prototype */ void (* /*BracketValues*/) ( - pointer /* pCounter */, + pointer /* pCounter */, CARD64 * /* pbracket_less */, CARD64 * /* pbracket_greater */) ); diff --git a/proto/xorgproto/include/X11/extensions/windowswmstr.h b/proto/xorgproto/include/X11/extensions/windowswmstr.h index 37ceb535a..b4e75aa91 100644 --- a/proto/xorgproto/include/X11/extensions/windowswmstr.h +++ b/proto/xorgproto/include/X11/extensions/windowswmstr.h @@ -45,124 +45,124 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. typedef struct _WindowsWMQueryVersion { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMQueryVersion */ - CARD16 length B16; + CARD16 length; } xWindowsWMQueryVersionReq; #define sz_xWindowsWMQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of WM protocol */ - CARD16 minorVersion B16; /* minor version of WM protocol */ - CARD32 patchVersion B32; /* patch version of WM protocol */ - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of WM protocol */ + CARD16 minorVersion; /* minor version of WM protocol */ + CARD32 patchVersion; /* patch version of WM protocol */ + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xWindowsWMQueryVersionReply; #define sz_xWindowsWMQueryVersionReply 32 typedef struct _WindowsWMDisableUpdate { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMDisableUpdate */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xWindowsWMDisableUpdateReq; #define sz_xWindowsWMDisableUpdateReq 8 typedef struct _WindowsWMReenableUpdate { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMReenableUpdate */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xWindowsWMReenableUpdateReq; #define sz_xWindowsWMReenableUpdateReq 8 typedef struct _WindowsWMSelectInput { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMSelectInput */ - CARD16 length B16; - CARD32 mask B32; + CARD16 length; + CARD32 mask; } xWindowsWMSelectInputReq; #define sz_xWindowsWMSelectInputReq 8 typedef struct _WindowsWMNotify { BYTE type; /* always eventBase + event type */ BYTE kind; - CARD16 sequenceNumber B16; - Window window B32; - Time time B32; /* time of change */ - CARD16 pad1 B16; - CARD32 arg B32; - INT16 x B16; - INT16 y B16; - CARD16 w B16; - CARD16 h B16; + CARD16 sequenceNumber; + Window window; + Time time; /* time of change */ + CARD16 pad1; + CARD32 arg; + INT16 x; + INT16 y; + CARD16 w; + CARD16 h; } xWindowsWMNotifyEvent; #define sz_xWindowsWMNotifyEvent 28 typedef struct _WindowsWMSetFrontProcess { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMSetFrontProcess */ - CARD16 length B16; + CARD16 length; } xWindowsWMSetFrontProcessReq; #define sz_xWindowsWMSetFrontProcessReq 4 typedef struct _WindowsWMFrameGetRect { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMFrameGetRect */ - CARD16 length B16; - CARD32 frame_style B32; - CARD32 frame_style_ex B32; - CARD16 frame_rect B16; - INT16 ix B16; - INT16 iy B16; - CARD16 iw B16; - CARD16 ih B16; - CARD16 pad1 B16; + CARD16 length; + CARD32 frame_style; + CARD32 frame_style_ex; + CARD16 frame_rect; + INT16 ix; + INT16 iy; + CARD16 iw; + CARD16 ih; + CARD16 pad1; } xWindowsWMFrameGetRectReq; #define sz_xWindowsWMFrameGetRectReq 24 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - INT16 x B16; - INT16 y B16; - CARD16 w B16; - CARD16 h B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + INT16 x; + INT16 y; + CARD16 w; + CARD16 h; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xWindowsWMFrameGetRectReply; #define sz_xWindowsWMFrameGetRectReply 32 typedef struct _WindowsWMFrameDraw { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMFrameDraw */ - CARD16 length B16; - CARD32 screen B32; - CARD32 window B32; - CARD32 frame_style B32; - CARD32 frame_style_ex B32; - INT16 ix B16; - INT16 iy B16; - CARD16 iw B16; - CARD16 ih B16; + CARD16 length; + CARD32 screen; + CARD32 window; + CARD32 frame_style; + CARD32 frame_style_ex; + INT16 ix; + INT16 iy; + CARD16 iw; + CARD16 ih; } xWindowsWMFrameDrawReq; #define sz_xWindowsWMFrameDrawReq 28 typedef struct _WindowsWMFrameSetTitle { CARD8 reqType; /* always WMReqCode */ CARD8 wmReqType; /* always X_WMFrameSetTitle */ - CARD16 length B16; - CARD32 screen B32; - CARD32 window B32; - CARD32 title_length B32; + CARD16 length; + CARD32 screen; + CARD32 window; + CARD32 title_length; } xWindowsWMFrameSetTitleReq; #define sz_xWindowsWMFrameSetTitleReq 16 diff --git a/proto/xorgproto/include/X11/extensions/xcalibrateproto.h b/proto/xorgproto/include/X11/extensions/xcalibrateproto.h index f1127c74e..f9b942573 100644 --- a/proto/xorgproto/include/X11/extensions/xcalibrateproto.h +++ b/proto/xorgproto/include/X11/extensions/xcalibrateproto.h @@ -23,15 +23,15 @@ #ifndef XCALIBRATEPROTO_H #define XCALIBRATEPROTO_H -/* +/* * requests and replies */ typedef struct { CARD8 reqType; CARD8 xCalibrateReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xXCalibrateQueryVersionReq; #define sz_xXCalibrateQueryVersionReq 12 @@ -39,14 +39,14 @@ typedef struct { 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXCalibrateQueryVersionReply; #define sz_xXCalibrateQueryVersionReply 32 @@ -54,9 +54,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xCalibrateReqType; - CARD16 length B16; - CARD16 on B16; - CARD16 pad B16; + CARD16 length; + CARD16 on; + CARD16 pad; } xXCalibrateRawModeReq; #define sz_xXCalibrateRawModeReq 8 @@ -64,14 +64,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD32 status; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXCalibrateRawModeReply; #define sz_xXCalibrateRawModeReply 32 @@ -79,9 +79,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xCalibrateReqType; - CARD16 length B16; - CARD32 x B32; - CARD32 y B32; + CARD16 length; + CARD32 x; + CARD32 y; } xXCalibrateScreenToCoordReq; #define sz_xXCalibrateScreenToCoordReq 12 @@ -89,14 +89,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD32 x; CARD32 y; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXCalibrateScreenToCoordReply; #define sz_xXCalibrateScreenToCoordReply 32 @@ -106,7 +106,7 @@ typedef struct { typedef struct { CARD8 type; CARD8 pad1; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD16 x; CARD16 y; CARD16 pressure; diff --git a/proto/xorgproto/include/X11/extensions/xcmiscproto.h b/proto/xorgproto/include/X11/extensions/xcmiscproto.h index 482c2dc42..616cec370 100644 --- a/proto/xorgproto/include/X11/extensions/xcmiscproto.h +++ b/proto/xorgproto/include/X11/extensions/xcmiscproto.h @@ -43,67 +43,67 @@ in this Software without prior written authorization from The Open Group. typedef struct { CARD8 reqType; /* always XCMiscCode */ CARD8 miscReqType; /* always X_XCMiscGetVersion */ - CARD16 length B16; - CARD16 majorVersion B16; - CARD16 minorVersion B16; + CARD16 length; + CARD16 majorVersion; + CARD16 minorVersion; } xXCMiscGetVersionReq; #define sz_xXCMiscGetVersionReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; - CARD16 minorVersion B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; + CARD16 minorVersion; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXCMiscGetVersionReply; #define sz_xXCMiscGetVersionReply 32 typedef struct { CARD8 reqType; /* always XCMiscCode */ CARD8 miscReqType; /* always X_XCMiscGetXIDRange */ - CARD16 length B16; + CARD16 length; } xXCMiscGetXIDRangeReq; #define sz_xXCMiscGetXIDRangeReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 start_id B32; - CARD32 count B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 start_id; + CARD32 count; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xXCMiscGetXIDRangeReply; #define sz_xXCMiscGetXIDRangeReply 32 typedef struct { CARD8 reqType; /* always XCMiscCode */ CARD8 miscReqType; /* always X_XCMiscGetXIDList */ - CARD16 length B16; - CARD32 count B32; /* number of IDs requested */ + CARD16 length; + CARD32 count; /* number of IDs requested */ } xXCMiscGetXIDListReq; #define sz_xXCMiscGetXIDListReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 count B32; /* number of IDs requested */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 count; /* number of IDs requested */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXCMiscGetXIDListReply; #define sz_xXCMiscGetXIDListReply 32 diff --git a/proto/xorgproto/include/X11/extensions/xf86bigfproto.h b/proto/xorgproto/include/X11/extensions/xf86bigfproto.h index c041c9aaf..a0710dd3e 100644 --- a/proto/xorgproto/include/X11/extensions/xf86bigfproto.h +++ b/proto/xorgproto/include/X11/extensions/xf86bigfproto.h @@ -20,22 +20,22 @@ typedef struct _XF86BigfontQueryVersion { CARD8 reqType; /* always XF86BigfontReqCode */ CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryVersion */ - CARD16 length B16; + CARD16 length; } xXF86BigfontQueryVersionReq; #define sz_xXF86BigfontQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ CARD8 capabilities; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of XFree86-Bigfont */ - CARD16 minorVersion B16; /* minor version of XFree86-Bigfont */ - CARD32 uid B32; - CARD32 gid B32; - CARD32 signature B32; - CARD32 pad1 B32; - CARD32 pad2 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of XFree86-Bigfont */ + CARD16 minorVersion; /* minor version of XFree86-Bigfont */ + CARD32 uid; + CARD32 gid; + CARD32 signature; + CARD32 pad1; + CARD32 pad2; } xXF86BigfontQueryVersionReply; #define sz_xXF86BigfontQueryVersionReply 32 @@ -45,39 +45,39 @@ typedef struct { typedef struct _XF86BigfontQueryFont { CARD8 reqType; /* always XF86BigfontReqCode */ CARD8 xf86bigfontReqType; /* always X_XF86BigfontQueryFont */ - CARD16 length B16; - CARD32 id B32; - CARD32 flags B32; + CARD16 length; + CARD32 id; + CARD32 flags; } xXF86BigfontQueryFontReq; #define sz_xXF86BigfontQueryFontReq 12 typedef struct { BYTE type; /* X_Reply */ CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; xCharInfo minBounds; #ifndef WORD64 - CARD32 walign1 B32; + CARD32 walign1; #endif xCharInfo maxBounds; #ifndef WORD64 - CARD32 walign2 B32; + CARD32 walign2; #endif - CARD16 minCharOrByte2 B16; - CARD16 maxCharOrByte2 B16; - CARD16 defaultChar B16; - CARD16 nFontProps B16; + CARD16 minCharOrByte2; + CARD16 maxCharOrByte2; + CARD16 defaultChar; + CARD16 nFontProps; CARD8 drawDirection; CARD8 minByte1; CARD8 maxByte1; BOOL allCharsExist; - INT16 fontAscent B16; - INT16 fontDescent B16; - CARD32 nCharInfos B32; - CARD32 nUniqCharInfos B32; - CARD32 shmid B32; - CARD32 shmsegoffset B32; + INT16 fontAscent; + INT16 fontDescent; + CARD32 nCharInfos; + CARD32 nUniqCharInfos; + CARD32 shmid; + CARD32 shmsegoffset; /* followed by nFontProps xFontProp structures */ /* and if nCharInfos > 0 && shmid == -1, followed by nUniqCharInfos xCharInfo structures diff --git a/proto/xorgproto/include/X11/extensions/xf86dga1proto.h b/proto/xorgproto/include/X11/extensions/xf86dga1proto.h index 5c53cb218..61d95b314 100644 --- a/proto/xorgproto/include/X11/extensions/xf86dga1proto.h +++ b/proto/xorgproto/include/X11/extensions/xf86dga1proto.h @@ -13,41 +13,41 @@ Copyright (c) 1995 XFree86 Inc. typedef struct _XF86DGAQueryVersion { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_DGAQueryVersion */ - CARD16 length B16; + CARD16 length; } xXF86DGAQueryVersionReq; #define sz_xXF86DGAQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of DGA protocol */ - CARD16 minorVersion B16; /* minor version of DGA protocol */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of DGA protocol */ + CARD16 minorVersion; /* minor version of DGA protocol */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86DGAQueryVersionReply; #define sz_xXF86DGAQueryVersionReply 32 typedef struct _XF86DGAGetVideoLL { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_XF86DGAGetVideoLL */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86DGAGetVideoLLReq; #define sz_xXF86DGAGetVideoLLReq 8 typedef struct _XF86DGAInstallColormap{ CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD16 screen B16; - CARD16 pad2; - CARD32 id B32; /* colormap. */ + CARD16 length; + CARD16 screen; + CARD16 pad2; + CARD32 id; /* colormap. */ } xXF86DGAInstallColormapReq; #define sz_xXF86DGAInstallColormapReq 12 @@ -55,23 +55,23 @@ typedef struct _XF86DGAInstallColormap{ typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 offset B32; - CARD32 width B32; - CARD32 bank_size B32; - CARD32 ram_size B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 offset; + CARD32 width; + CARD32 bank_size; + CARD32 ram_size; + CARD32 pad4; + CARD32 pad5; } xXF86DGAGetVideoLLReply; #define sz_xXF86DGAGetVideoLLReply 32 typedef struct _XF86DGADirectVideo { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_XF86DGADirectVideo */ - CARD16 length B16; - CARD16 screen B16; - CARD16 enable B16; + CARD16 length; + CARD16 screen; + CARD16 enable; } xXF86DGADirectVideoReq; #define sz_xXF86DGADirectVideoReq 8 @@ -79,57 +79,57 @@ typedef struct _XF86DGADirectVideo { typedef struct _XF86DGAGetViewPortSize { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_XF86DGAGetViewPort */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86DGAGetViewPortSizeReq; #define sz_xXF86DGAGetViewPortSizeReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 width B32; - CARD32 height B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 width; + CARD32 height; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86DGAGetViewPortSizeReply; #define sz_xXF86DGAGetViewPortSizeReply 32 typedef struct _XF86DGASetViewPort { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_XF86DGASetViewPort */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 x B32; - CARD32 y B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 x; + CARD32 y; } xXF86DGASetViewPortReq; #define sz_xXF86DGASetViewPortReq 16 typedef struct _XF86DGAGetVidPage { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_XF86DGAGetVidPage */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86DGAGetVidPageReq; #define sz_xXF86DGAGetVidPageReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 vpage B32; - CARD32 pad B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 vpage; + CARD32 pad; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86DGAGetVidPageReply; #define sz_xXF86DGAGetVidPageReply 32 @@ -137,9 +137,9 @@ typedef struct { typedef struct _XF86DGASetVidPage { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_XF86DGASetVidPage */ - CARD16 length B16; - CARD16 screen B16; - CARD16 vpage B16; + CARD16 length; + CARD16 screen; + CARD16 vpage; } xXF86DGASetVidPageReq; #define sz_xXF86DGASetVidPageReq 8 @@ -147,23 +147,23 @@ typedef struct _XF86DGASetVidPage { typedef struct _XF86DGAQueryDirectVideo { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_DGAQueryVersion */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86DGAQueryDirectVideoReq; #define sz_xXF86DGAQueryDirectVideoReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 flags B32; - CARD32 pad B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 flags; + CARD32 pad; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86DGAQueryDirectVideoReply; #define sz_xXF86DGAQueryDirectVideoReply 32 @@ -171,23 +171,23 @@ typedef struct { typedef struct _XF86DGAViewPortChanged { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_DGAQueryVersion */ - CARD16 length B16; - CARD16 screen B16; - CARD16 n B16; + CARD16 length; + CARD16 screen; + CARD16 n; } xXF86DGAViewPortChangedReq; #define sz_xXF86DGAViewPortChangedReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 result B32; - CARD32 pad B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 result; + CARD32 pad; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86DGAViewPortChangedReply; #define sz_xXF86DGAViewPortChangedReply 32 diff --git a/proto/xorgproto/include/X11/extensions/xf86dgaconst.h b/proto/xorgproto/include/X11/extensions/xf86dgaconst.h index 63829bc42..b21e84fd8 100644 --- a/proto/xorgproto/include/X11/extensions/xf86dgaconst.h +++ b/proto/xorgproto/include/X11/extensions/xf86dgaconst.h @@ -66,9 +66,9 @@ typedef struct { int imageHeight; int pixmapWidth; /* Xlib accessible portion (pixels) */ int pixmapHeight; /* both fields ignored if no concurrent access */ - int bytesPerScanline; + int bytesPerScanline; int byteOrder; /* MSBFirst, LSBFirst */ - int depth; + int depth; int bitsPerPixel; unsigned long redMask; unsigned long greenMask; diff --git a/proto/xorgproto/include/X11/extensions/xf86dgaproto.h b/proto/xorgproto/include/X11/extensions/xf86dgaproto.h index 8b7f13d28..2e8a712e8 100644 --- a/proto/xorgproto/include/X11/extensions/xf86dgaproto.h +++ b/proto/xorgproto/include/X11/extensions/xf86dgaproto.h @@ -20,44 +20,44 @@ Copyright (c) 1995 XFree86 Inc. typedef struct _XDGAQueryVersion { CARD8 reqType; /* always DGAReqCode */ CARD8 dgaReqType; /* always X_DGAQueryVersion */ - CARD16 length B16; + CARD16 length; } xXDGAQueryVersionReq; #define sz_xXDGAQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of DGA protocol */ - CARD16 minorVersion B16; /* minor version of DGA protocol */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of DGA protocol */ + CARD16 minorVersion; /* minor version of DGA protocol */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXDGAQueryVersionReply; #define sz_xXDGAQueryVersionReply 32 typedef struct _XDGAQueryModes { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXDGAQueryModesReq; #define sz_xXDGAQueryModesReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 number B32; /* number of modes available */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 number; /* number of modes available */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXDGAQueryModesReply; #define sz_xXDGAQueryModesReply 32 @@ -65,77 +65,77 @@ typedef struct { typedef struct _XDGASetMode { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD32 mode B32; /* mode number to init */ - CARD32 pid B32; /* Pixmap descriptor */ + CARD16 length; + CARD32 screen; + CARD32 mode; /* mode number to init */ + CARD32 pid; /* Pixmap descriptor */ } xXDGASetModeReq; #define sz_xXDGASetModeReq 16 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 offset B32; /* offset into framebuffer map */ - CARD32 flags B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 offset; /* offset into framebuffer map */ + CARD32 flags; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXDGASetModeReply; #define sz_xXDGASetModeReply 32 typedef struct { CARD8 byte_order; CARD8 depth; - CARD16 num B16; - CARD16 bpp B16; - CARD16 name_size B16; - CARD32 vsync_num B32; - CARD32 vsync_den B32; - CARD32 flags B32; - CARD16 image_width B16; - CARD16 image_height B16; - CARD16 pixmap_width B16; - CARD16 pixmap_height B16; - CARD32 bytes_per_scanline B32; - CARD32 red_mask B32; - CARD32 green_mask B32; - CARD32 blue_mask B32; - CARD16 visual_class B16; - CARD16 pad1 B16; - CARD16 viewport_width B16; - CARD16 viewport_height B16; - CARD16 viewport_xstep B16; - CARD16 viewport_ystep B16; - CARD16 viewport_xmax B16; - CARD16 viewport_ymax B16; - CARD32 viewport_flags B32; - CARD32 reserved1 B32; - CARD32 reserved2 B32; + CARD16 num; + CARD16 bpp; + CARD16 name_size; + CARD32 vsync_num; + CARD32 vsync_den; + CARD32 flags; + CARD16 image_width; + CARD16 image_height; + CARD16 pixmap_width; + CARD16 pixmap_height; + CARD32 bytes_per_scanline; + CARD32 red_mask; + CARD32 green_mask; + CARD32 blue_mask; + CARD16 visual_class; + CARD16 pad1; + CARD16 viewport_width; + CARD16 viewport_height; + CARD16 viewport_xstep; + CARD16 viewport_ystep; + CARD16 viewport_xmax; + CARD16 viewport_ymax; + CARD32 viewport_flags; + CARD32 reserved1; + CARD32 reserved2; } xXDGAModeInfo; #define sz_xXDGAModeInfo 72 typedef struct _XDGAOpenFramebuffer { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXDGAOpenFramebufferReq; #define sz_xXDGAOpenFramebufferReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* device name size if there is one */ - CARD32 mem1 B32; /* physical memory */ - CARD32 mem2 B32; /* spillover for _alpha_ */ - CARD32 size B32; /* size of map in bytes */ - CARD32 offset B32; /* optional offset into device */ - CARD32 extra B32; /* extra info associated with the map */ - CARD32 pad2 B32; + CARD16 sequenceNumber; + CARD32 length; /* device name size if there is one */ + CARD32 mem1; /* physical memory */ + CARD32 mem2; /* spillover for _alpha_ */ + CARD32 size; /* size of map in bytes */ + CARD32 offset; /* optional offset into device */ + CARD32 extra; /* extra info associated with the map */ + CARD32 pad2; } xXDGAOpenFramebufferReply; #define sz_xXDGAOpenFramebufferReply 32 @@ -143,8 +143,8 @@ typedef struct { typedef struct _XDGACloseFramebuffer { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXDGACloseFramebufferReq; #define sz_xXDGACloseFramebufferReq 8 @@ -152,11 +152,11 @@ typedef struct _XDGACloseFramebuffer { typedef struct _XDGASetViewport { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD16 x B16; - CARD16 y B16; - CARD32 flags B32; + CARD16 length; + CARD32 screen; + CARD16 x; + CARD16 y; + CARD32 flags; } xXDGASetViewportReq; #define sz_xXDGASetViewportReq 16 @@ -164,31 +164,31 @@ typedef struct _XDGASetViewport { typedef struct _XDGAInstallColormap { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD32 cmap B32; + CARD16 length; + CARD32 screen; + CARD32 cmap; } xXDGAInstallColormapReq; #define sz_xXDGAInstallColormapReq 12 typedef struct _XDGASelectInput { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD32 mask B32; + CARD16 length; + CARD32 screen; + CARD32 mask; } xXDGASelectInputReq; #define sz_xXDGASelectInputReq 12 typedef struct _XDGAFillRectangle { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD16 x B16; - CARD16 y B16; - CARD16 width B16; - CARD16 height B16; - CARD32 color B32; + CARD16 length; + CARD32 screen; + CARD16 x; + CARD16 y; + CARD16 width; + CARD16 height; + CARD32 color; } xXDGAFillRectangleReq; #define sz_xXDGAFillRectangleReq 20 @@ -196,29 +196,29 @@ typedef struct _XDGAFillRectangle { typedef struct _XDGACopyArea { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD16 srcx B16; - CARD16 srcy B16; - CARD16 width B16; - CARD16 height B16; - CARD16 dstx B16; - CARD16 dsty B16; + CARD16 length; + CARD32 screen; + CARD16 srcx; + CARD16 srcy; + CARD16 width; + CARD16 height; + CARD16 dstx; + CARD16 dsty; } xXDGACopyAreaReq; #define sz_xXDGACopyAreaReq 20 typedef struct _XDGACopyTransparentArea { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD16 srcx B16; - CARD16 srcy B16; - CARD16 width B16; - CARD16 height B16; - CARD16 dstx B16; - CARD16 dsty B16; - CARD32 key B32; + CARD16 length; + CARD32 screen; + CARD16 srcx; + CARD16 srcy; + CARD16 width; + CARD16 height; + CARD16 dstx; + CARD16 dsty; + CARD32 key; } xXDGACopyTransparentAreaReq; #define sz_xXDGACopyTransparentAreaReq 24 @@ -226,53 +226,53 @@ typedef struct _XDGACopyTransparentArea { typedef struct _XDGAGetViewportStatus { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXDGAGetViewportStatusReq; #define sz_xXDGAGetViewportStatusReq 8 typedef struct { - BYTE type; - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + BYTE type; + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXDGAGetViewportStatusReply; #define sz_xXDGAGetViewportStatusReply 32 typedef struct _XDGASync { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xXDGASyncReq; #define sz_xXDGASyncReq 8 typedef struct { - BYTE type; - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + BYTE type; + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXDGASyncReply; #define sz_xXDGASyncReply 32 typedef struct _XDGASetClientVersion { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD16 major B16; - CARD16 minor B16; + CARD16 length; + CARD16 major; + CARD16 minor; } xXDGASetClientVersionReq; #define sz_xXDGASetClientVersionReq 8 @@ -280,36 +280,36 @@ typedef struct _XDGASetClientVersion { typedef struct { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD16 x B16; - CARD16 y B16; - CARD32 flags B32; + CARD16 length; + CARD32 screen; + CARD16 x; + CARD16 y; + CARD32 flags; } xXDGAChangePixmapModeReq; #define sz_xXDGAChangePixmapModeReq 16 typedef struct { - BYTE type; - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 x B16; - CARD16 y B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; + BYTE type; + BOOL pad1; + CARD16 sequenceNumber; + CARD32 length; + CARD16 x; + CARD16 y; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; } xXDGAChangePixmapModeReply; #define sz_xXDGAChangePixmapModeReply 32 typedef struct _XDGACreateColormap { CARD8 reqType; CARD8 dgaReqType; - CARD16 length B16; - CARD32 screen B32; - CARD32 id B32; - CARD32 mode B32; + CARD16 length; + CARD32 screen; + CARD32 id; + CARD32 mode; CARD8 alloc; CARD8 pad1; CARD16 pad2; @@ -322,19 +322,19 @@ typedef struct { struct { BYTE type; BYTE detail; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; } u; struct { - CARD32 pad0 B32; - CARD32 time B32; - INT16 dx B16; - INT16 dy B16; - INT16 screen B16; - CARD16 state B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD32 pad0; + CARD32 time; + INT16 dx; + INT16 dy; + INT16 screen; + CARD16 state; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } event; } u; } dgaEvent; diff --git a/proto/xorgproto/include/X11/extensions/xf86misc.h b/proto/xorgproto/include/X11/extensions/xf86misc.h index f5d7a5664..611871d3f 100644 --- a/proto/xorgproto/include/X11/extensions/xf86misc.h +++ b/proto/xorgproto/include/X11/extensions/xf86misc.h @@ -81,7 +81,7 @@ #define MiscExtGrabStateLocked 1 /* A client already requested that * grabs cannot be removed/killed */ #define MiscExtGrabStateAlready 2 /* Request for enabling/disabling - * grab removeal/kill already done */ + * grab removal/kill already done */ _XFUNCPROTOBEGIN diff --git a/proto/xorgproto/include/X11/extensions/xf86mscstr.h b/proto/xorgproto/include/X11/extensions/xf86mscstr.h index 637d3a5a0..cc0f0cf6c 100644 --- a/proto/xorgproto/include/X11/extensions/xf86mscstr.h +++ b/proto/xorgproto/include/X11/extensions/xf86mscstr.h @@ -19,22 +19,22 @@ typedef struct _XF86MiscQueryVersion { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscQueryVersion */ - CARD16 length B16; + CARD16 length; } xXF86MiscQueryVersionReq; #define sz_xXF86MiscQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of XFree86-Misc */ - CARD16 minorVersion B16; /* minor version of XFree86-Misc */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of XFree86-Misc */ + CARD16 minorVersion; /* minor version of XFree86-Misc */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86MiscQueryVersionReply; #define sz_xXF86MiscQueryVersionReply 32 @@ -42,34 +42,34 @@ typedef struct { typedef struct _XF86MiscGetSaver { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscGetSaver */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86MiscGetSaverReq; #define sz_xXF86MiscGetSaverReq 8 typedef struct _XF86MiscSetSaver { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscSetSaver */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 suspendTime B32; - CARD32 offTime B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 suspendTime; + CARD32 offTime; } xXF86MiscSetSaverReq; #define sz_xXF86MiscSetSaverReq 16 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 suspendTime B32; - CARD32 offTime B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 suspendTime; + CARD32 offTime; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86MiscGetSaverReply; #define sz_xXF86MiscGetSaverReply 32 #endif @@ -77,161 +77,161 @@ typedef struct { typedef struct _XF86MiscGetMouseSettings { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscGetMouseSettings */ - CARD16 length B16; + CARD16 length; } xXF86MiscGetMouseSettingsReq; #define sz_xXF86MiscGetMouseSettingsReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 mousetype B32; - CARD32 baudrate B32; - CARD32 samplerate B32; - CARD32 resolution B32; - CARD32 buttons B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 mousetype; + CARD32 baudrate; + CARD32 samplerate; + CARD32 resolution; + CARD32 buttons; BOOL emulate3buttons; BOOL chordmiddle; - CARD16 pad2 B16; - CARD32 emulate3timeout B32; - CARD32 flags B32; - CARD32 devnamelen B32; /* strlen(device)+1 */ + CARD16 pad2; + CARD32 emulate3timeout; + CARD32 flags; + CARD32 devnamelen; /* strlen(device)+1 */ } xXF86MiscGetMouseSettingsReply; #define sz_xXF86MiscGetMouseSettingsReply 44 typedef struct _XF86MiscGetKbdSettings { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscGetKbdSettings */ - CARD16 length B16; + CARD16 length; } xXF86MiscGetKbdSettingsReq; #define sz_xXF86MiscGetKbdSettingsReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 kbdtype B32; - CARD32 rate B32; - CARD32 delay B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 kbdtype; + CARD32 rate; + CARD32 delay; BOOL servnumlock; BOOL pad2; - CARD16 pad3 B16; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86MiscGetKbdSettingsReply; #define sz_xXF86MiscGetKbdSettingsReply 32 typedef struct _XF86MiscSetMouseSettings { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscSetMouseSettings */ - CARD16 length B16; - CARD32 mousetype B32; - CARD32 baudrate B32; - CARD32 samplerate B32; - CARD32 resolution B32; - CARD32 buttons B32; + CARD16 length; + CARD32 mousetype; + CARD32 baudrate; + CARD32 samplerate; + CARD32 resolution; + CARD32 buttons; BOOL emulate3buttons; BOOL chordmiddle; - CARD16 devnamelen B16; - CARD32 emulate3timeout B32; - CARD32 flags B32; + CARD16 devnamelen; + CARD32 emulate3timeout; + CARD32 flags; } xXF86MiscSetMouseSettingsReq; #define sz_xXF86MiscSetMouseSettingsReq 36 typedef struct _XF86MiscSetKbdSettings { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */ - CARD16 length B16; - CARD32 kbdtype B32; - CARD32 rate B32; - CARD32 delay B32; + CARD16 length; + CARD32 kbdtype; + CARD32 rate; + CARD32 delay; BOOL servnumlock; BOOL pad1; - CARD16 pad2 B16; + CARD16 pad2; } xXF86MiscSetKbdSettingsReq; #define sz_xXF86MiscSetKbdSettingsReq 20 typedef struct _XF86MiscSetGrabKeysState { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */ - CARD16 length B16; + CARD16 length; BOOL enable; BOOL pad1; - CARD16 pad2 B16; + CARD16 pad2; } xXF86MiscSetGrabKeysStateReq; #define sz_xXF86MiscSetGrabKeysStateReq 8 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86MiscSetGrabKeysStateReply; #define sz_xXF86MiscSetGrabKeysStateReply 32 typedef struct _XF86MiscSetClientVersion { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; - CARD16 length B16; - CARD16 major B16; - CARD16 minor B16; + CARD16 length; + CARD16 major; + CARD16 minor; } xXF86MiscSetClientVersionReq; #define sz_xXF86MiscSetClientVersionReq 8 typedef struct _XF86MiscGetFilePaths { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscGetFilePaths */ - CARD16 length B16; + CARD16 length; } xXF86MiscGetFilePathsReq; #define sz_xXF86MiscGetFilePathsReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 configlen B16; - CARD16 modulelen B16; - CARD16 loglen B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 configlen; + CARD16 modulelen; + CARD16 loglen; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86MiscGetFilePathsReply; #define sz_xXF86MiscGetFilePathsReply 32 typedef struct _XF86MiscPassMessage { CARD8 reqType; /* always XF86MiscReqCode */ CARD8 xf86miscReqType; /* always X_XF86MiscPassMessage */ - CARD16 length B16; - CARD16 typelen B16; - CARD16 vallen B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 typelen; + CARD16 vallen; + CARD16 screen; + CARD16 pad; } xXF86MiscPassMessageReq; #define sz_xXF86MiscPassMessageReq 12 typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 mesglen B16; - CARD16 pad2 B16; - CARD32 status B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 mesglen; + CARD16 pad2; + CARD32 status; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86MiscPassMessageReply; #define sz_xXF86MiscPassMessageReply 32 diff --git a/proto/xorgproto/include/X11/extensions/xf86rush.h b/proto/xorgproto/include/X11/extensions/xf86rush.h index 1db7d13ec..5cf0c16dc 100644 --- a/proto/xorgproto/include/X11/extensions/xf86rush.h +++ b/proto/xorgproto/include/X11/extensions/xf86rush.h @@ -56,7 +56,7 @@ Bool XF86RushUnlockPixmap( Display * /* dpy */, int /* screen */, Pixmap /* Pixmap */ -); +); Bool XF86RushUnlockAllPixmaps( Display * /* dpy */ diff --git a/proto/xorgproto/include/X11/extensions/xf86rushstr.h b/proto/xorgproto/include/X11/extensions/xf86rushstr.h index 8dca46a76..7c31a8a55 100644 --- a/proto/xorgproto/include/X11/extensions/xf86rushstr.h +++ b/proto/xorgproto/include/X11/extensions/xf86rushstr.h @@ -18,73 +18,73 @@ Copyright (c) 1998 Daryll Strauss typedef struct _XF86RushQueryVersion { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushQueryVersion */ - CARD16 length B16; + CARD16 length; } xXF86RushQueryVersionReq; #define sz_xXF86RushQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of Rush protocol */ - CARD16 minorVersion B16; /* minor version of Rush protocol */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of Rush protocol */ + CARD16 minorVersion; /* minor version of Rush protocol */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86RushQueryVersionReply; #define sz_xXF86RushQueryVersionReply 32 typedef struct _XF86RushLockPixmap { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushLockPixmap */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 pixmap B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 pixmap; } xXF86RushLockPixmapReq; #define sz_xXF86RushLockPixmapReq 12 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 addr B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 addr; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86RushLockPixmapReply; #define sz_xXF86RushLockPixmapReply 32 typedef struct _XF86RushUnlockPixmap { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushUnlockPixmap */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 pixmap B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 pixmap; } xXF86RushUnlockPixmapReq; #define sz_xXF86RushUnlockPixmapReq 12 typedef struct _XF86RushUnlockAllPixmaps { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushUnlockAllPixmaps */ - CARD16 length B16; + CARD16 length; } xXF86RushUnlockAllPixmapsReq; #define sz_xXF86RushUnlockAllPixmapsReq 4 typedef struct _XF86RushSetCopyMode { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushSetCopyMode */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 CopyMode B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 CopyMode; } xXF86RushSetCopyModeReq; #define sz_xXF86RushSetCopyModeReq 12 @@ -92,71 +92,71 @@ typedef struct _XF86RushSetCopyMode { typedef struct _XF86RushSetPixelStride { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushSetCopyMode */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 PixelStride B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 PixelStride; } xXF86RushSetPixelStrideReq; #define sz_xXF86RushSetPixelStrideReq 12 typedef struct { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushOverlayPixmap */ - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - Pixmap pixmap B32; - CARD32 id B32; - INT16 src_x B16; - INT16 src_y B16; - CARD16 src_w B16; - CARD16 src_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; + CARD16 length; + XvPortID port; + Drawable drawable; + GContext gc; + Pixmap pixmap; + CARD32 id; + INT16 src_x; + INT16 src_y; + CARD16 src_w; + CARD16 src_h; + INT16 drw_x; + INT16 drw_y; + CARD16 drw_w; + CARD16 drw_h; } xXF86RushOverlayPixmapReq; #define sz_xXF86RushOverlayPixmapReq 40 typedef struct _XF86RushStatusRegOffset { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushStatusRegOffset */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86RushStatusRegOffsetReq; #define sz_xXF86RushStatusRegOffsetReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 offset B32; /* Offset of Rush status reg in mem */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 offset; /* Offset of Rush status reg in mem */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86RushStatusRegOffsetReply; #define sz_xXF86RushStatusRegOffsetReply 32 typedef struct _XF86RushAT3DEnableRegs { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushAT3DEnableRegs */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86RushAT3DEnableRegsReq; #define sz_xXF86RushAT3DEnableRegsReq 8 typedef struct _XF86RushAT3DDisableRegs { CARD8 reqType; /* always RushReqCode */ CARD8 rushReqType; /* always X_RushAT3DDisableRegs */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86RushAT3DDisableRegsReq; #define sz_xXF86RushAT3DDisableRegsReq 8 diff --git a/proto/xorgproto/include/X11/extensions/xf86vm.h b/proto/xorgproto/include/X11/extensions/xf86vm.h index ddf4dacbb..a874ab507 100644 --- a/proto/xorgproto/include/X11/extensions/xf86vm.h +++ b/proto/xorgproto/include/X11/extensions/xf86vm.h @@ -16,13 +16,13 @@ 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 Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES +IN NO EVENT SHALL Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY -shall not be used in advertising or otherwise to promote the sale, use +Except as contained in this notice, the name of Kaleb S. KEITHLEY +shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY diff --git a/proto/xorgproto/include/X11/extensions/xf86vmproto.h b/proto/xorgproto/include/X11/extensions/xf86vmproto.h index 0d3955c41..730728424 100644 --- a/proto/xorgproto/include/X11/extensions/xf86vmproto.h +++ b/proto/xorgproto/include/X11/extensions/xf86vmproto.h @@ -16,13 +16,13 @@ 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 Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES +IN NO EVENT SHALL Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY -shall not be used in advertising or otherwise to promote the sale, use +Except as contained in this notice, the name of Kaleb S. KEITHLEY +shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY @@ -72,31 +72,31 @@ from Kaleb S. KEITHLEY typedef struct _XF86VidModeQueryVersion { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86VidModeQueryVersion */ - CARD16 length B16; + CARD16 length; } xXF86VidModeQueryVersionReq; #define sz_xXF86VidModeQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of XF86VidMode */ - CARD16 minorVersion B16; /* minor version of XF86VidMode */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of XF86VidMode */ + CARD16 minorVersion; /* minor version of XF86VidMode */ + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86VidModeQueryVersionReply; #define sz_xXF86VidModeQueryVersionReply 32 typedef struct _XF86VidModeGetModeLine { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86VidModeGetModeLineReq, xXF86VidModeGetAllModeLinesReq, xXF86VidModeGetMonitorReq, @@ -113,24 +113,24 @@ typedef struct _XF86VidModeGetModeLine { typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 hskew B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD16 pad2 B16; - CARD32 flags B32; - CARD32 reserved1 B32; - CARD32 reserved2 B32; - CARD32 reserved3 B32; - CARD32 privsize B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 hskew; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD16 pad2; + CARD32 flags; + CARD32 reserved1; + CARD32 reserved2; + CARD32 reserved3; + CARD32 privsize; } xXF86VidModeGetModeLineReply; #define sz_xXF86VidModeGetModeLineReply 52 @@ -138,106 +138,106 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD32 flags B32; - CARD32 privsize B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD32 flags; + CARD32 privsize; } xXF86OldVidModeGetModeLineReply; #define sz_xXF86OldVidModeGetModeLineReply 36 typedef struct { - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD32 hskew B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD16 pad1 B16; - CARD32 flags B32; - CARD32 reserved1 B32; - CARD32 reserved2 B32; - CARD32 reserved3 B32; - CARD32 privsize B32; + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD32 hskew; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD16 pad1; + CARD32 flags; + CARD32 reserved1; + CARD32 reserved2; + CARD32 reserved3; + CARD32 privsize; } xXF86VidModeModeInfo; /* 0.x version */ typedef struct { - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD32 flags B32; - CARD32 privsize B32; + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD32 flags; + CARD32 privsize; } xXF86OldVidModeModeInfo; typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 modecount B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 modecount; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86VidModeGetAllModeLinesReply; #define sz_xXF86VidModeGetAllModeLinesReply 32 typedef struct _XF86VidModeAddModeLine { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86VidModeAddMode */ - CARD16 length B16; - CARD32 screen B32; /* could be CARD16 but need the pad */ - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 hskew B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD16 pad1 B16; - CARD32 flags B32; - CARD32 reserved1 B32; - CARD32 reserved2 B32; - CARD32 reserved3 B32; - CARD32 privsize B32; - CARD32 after_dotclock B32; - CARD16 after_hdisplay B16; - CARD16 after_hsyncstart B16; - CARD16 after_hsyncend B16; - CARD16 after_htotal B16; - CARD16 after_hskew B16; - CARD16 after_vdisplay B16; - CARD16 after_vsyncstart B16; - CARD16 after_vsyncend B16; - CARD16 after_vtotal B16; - CARD16 pad2 B16; - CARD32 after_flags B32; - CARD32 reserved4 B32; - CARD32 reserved5 B32; - CARD32 reserved6 B32; + CARD16 length; + CARD32 screen; /* could be CARD16 but need the pad */ + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 hskew; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD16 pad1; + CARD32 flags; + CARD32 reserved1; + CARD32 reserved2; + CARD32 reserved3; + CARD32 privsize; + CARD32 after_dotclock; + CARD16 after_hdisplay; + CARD16 after_hsyncstart; + CARD16 after_hsyncend; + CARD16 after_htotal; + CARD16 after_hskew; + CARD16 after_vdisplay; + CARD16 after_vsyncstart; + CARD16 after_vsyncend; + CARD16 after_vtotal; + CARD16 pad2; + CARD32 after_flags; + CARD32 reserved4; + CARD32 reserved5; + CARD32 reserved6; } xXF86VidModeAddModeLineReq; #define sz_xXF86VidModeAddModeLineReq 92 @@ -245,52 +245,52 @@ typedef struct _XF86VidModeAddModeLine { typedef struct _XF86OldVidModeAddModeLine { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86VidModeAddMode */ - CARD16 length B16; - CARD32 screen B32; /* could be CARD16 but need the pad */ - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD32 flags B32; - CARD32 privsize B32; - CARD32 after_dotclock B32; - CARD16 after_hdisplay B16; - CARD16 after_hsyncstart B16; - CARD16 after_hsyncend B16; - CARD16 after_htotal B16; - CARD16 after_vdisplay B16; - CARD16 after_vsyncstart B16; - CARD16 after_vsyncend B16; - CARD16 after_vtotal B16; - CARD32 after_flags B32; + CARD16 length; + CARD32 screen; /* could be CARD16 but need the pad */ + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD32 flags; + CARD32 privsize; + CARD32 after_dotclock; + CARD16 after_hdisplay; + CARD16 after_hsyncstart; + CARD16 after_hsyncend; + CARD16 after_htotal; + CARD16 after_vdisplay; + CARD16 after_vsyncstart; + CARD16 after_vsyncend; + CARD16 after_vtotal; + CARD32 after_flags; } xXF86OldVidModeAddModeLineReq; #define sz_xXF86OldVidModeAddModeLineReq 60 typedef struct _XF86VidModeModModeLine { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86VidModeModModeLine */ - CARD16 length B16; - CARD32 screen B32; /* could be CARD16 but need the pad */ - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 hskew B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD16 pad1 B16; - CARD32 flags B32; - CARD32 reserved1 B32; - CARD32 reserved2 B32; - CARD32 reserved3 B32; - CARD32 privsize B32; + CARD16 length; + CARD32 screen; /* could be CARD16 but need the pad */ + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 hskew; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD16 pad1; + CARD32 flags; + CARD32 reserved1; + CARD32 reserved2; + CARD32 reserved3; + CARD32 privsize; } xXF86VidModeModModeLineReq; #define sz_xXF86VidModeModModeLineReq 48 @@ -298,42 +298,42 @@ typedef struct _XF86VidModeModModeLine { typedef struct _XF86OldVidModeModModeLine { CARD8 reqType; /* always XF86OldVidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86OldVidModeModModeLine */ - CARD16 length B16; - CARD32 screen B32; /* could be CARD16 but need the pad */ - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD32 flags B32; - CARD32 privsize B32; + CARD16 length; + CARD32 screen; /* could be CARD16 but need the pad */ + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD32 flags; + CARD32 privsize; } xXF86OldVidModeModModeLineReq; #define sz_xXF86OldVidModeModModeLineReq 32 typedef struct _XF86VidModeValidateModeLine { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD32 screen B32; /* could be CARD16 but need the pad */ - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 hskew B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD16 pad1 B16; - CARD32 flags B32; - CARD32 reserved1 B32; - CARD32 reserved2 B32; - CARD32 reserved3 B32; - CARD32 privsize B32; + CARD16 length; + CARD32 screen; /* could be CARD16 but need the pad */ + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 hskew; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD16 pad1; + CARD32 flags; + CARD32 reserved1; + CARD32 reserved2; + CARD32 reserved3; + CARD32 privsize; } xXF86VidModeDeleteModeLineReq, xXF86VidModeValidateModeLineReq, xXF86VidModeSwitchToModeReq; @@ -345,19 +345,19 @@ typedef struct _XF86VidModeValidateModeLine { typedef struct _XF86OldVidModeValidateModeLine { CARD8 reqType; /* always XF86OldVidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD32 screen B32; /* could be CARD16 but need the pad */ - CARD32 dotclock B32; - CARD16 hdisplay B16; - CARD16 hsyncstart B16; - CARD16 hsyncend B16; - CARD16 htotal B16; - CARD16 vdisplay B16; - CARD16 vsyncstart B16; - CARD16 vsyncend B16; - CARD16 vtotal B16; - CARD32 flags B32; - CARD32 privsize B32; + CARD16 length; + CARD32 screen; /* could be CARD16 but need the pad */ + CARD32 dotclock; + CARD16 hdisplay; + CARD16 hsyncstart; + CARD16 hsyncend; + CARD16 htotal; + CARD16 vdisplay; + CARD16 vsyncstart; + CARD16 vsyncend; + CARD16 vtotal; + CARD32 flags; + CARD32 privsize; } xXF86OldVidModeDeleteModeLineReq, xXF86OldVidModeValidateModeLineReq, xXF86OldVidModeSwitchToModeReq; @@ -368,141 +368,141 @@ typedef struct _XF86OldVidModeValidateModeLine { typedef struct _XF86VidModeSwitchMode { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86VidModeSwitchMode */ - CARD16 length B16; - CARD16 screen B16; - CARD16 zoom B16; + CARD16 length; + CARD16 screen; + CARD16 zoom; } xXF86VidModeSwitchModeReq; #define sz_xXF86VidModeSwitchModeReq 8 typedef struct _XF86VidModeLockModeSwitch { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86VidModeLockModeSwitch */ - CARD16 length B16; - CARD16 screen B16; - CARD16 lock B16; + CARD16 length; + CARD16 screen; + CARD16 lock; } xXF86VidModeLockModeSwitchReq; #define sz_xXF86VidModeLockModeSwitchReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 status B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 status; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86VidModeValidateModeLineReply; #define sz_xXF86VidModeValidateModeLineReply 32 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; CARD8 vendorLength; CARD8 modelLength; CARD8 nhsync; CARD8 nvsync; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86VidModeGetMonitorReply; #define sz_xXF86VidModeGetMonitorReply 32 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 x B32; - CARD32 y B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 x; + CARD32 y; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86VidModeGetViewPortReply; #define sz_xXF86VidModeGetViewPortReply 32 typedef struct _XF86VidModeSetViewPort { CARD8 reqType; /* always VidModeReqCode */ CARD8 xf86vidmodeReqType; /* always X_XF86VidModeSetViewPort */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 x B32; - CARD32 y B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 x; + CARD32 y; } xXF86VidModeSetViewPortReq; #define sz_xXF86VidModeSetViewPortReq 16 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 flags B32; - CARD32 clocks B32; - CARD32 maxclocks B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 flags; + CARD32 clocks; + CARD32 maxclocks; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xXF86VidModeGetDotClocksReply; #define sz_xXF86VidModeGetDotClocksReply 32 typedef struct _XF86VidModeSetClientVersion { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD16 major B16; - CARD16 minor B16; + CARD16 length; + CARD16 major; + CARD16 minor; } xXF86VidModeSetClientVersionReq; #define sz_xXF86VidModeSetClientVersionReq 8 typedef struct _XF86VidModeGetGamma { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXF86VidModeGetGammaReq; #define sz_xXF86VidModeGetGammaReq 32 typedef struct { BYTE type; BOOL pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 red B32; - CARD32 green B32; - CARD32 blue B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 red; + CARD32 green; + CARD32 blue; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xXF86VidModeGetGammaReply; #define sz_xXF86VidModeGetGammaReply 32 typedef struct _XF86VidModeSetGamma { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 red B32; - CARD32 green B32; - CARD32 blue B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 length; + CARD16 screen; + CARD16 pad; + CARD32 red; + CARD32 green; + CARD32 blue; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xXF86VidModeSetGammaReq; #define sz_xXF86VidModeSetGammaReq 32 @@ -510,71 +510,71 @@ typedef struct _XF86VidModeSetGamma { typedef struct _XF86VidModeSetGammaRamp { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD16 screen B16; - CARD16 size B16; + CARD16 length; + CARD16 screen; + CARD16 size; } xXF86VidModeSetGammaRampReq; -#define sz_xXF86VidModeSetGammaRampReq 8 +#define sz_xXF86VidModeSetGammaRampReq 8 typedef struct _XF86VidModeGetGammaRamp { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD16 screen B16; - CARD16 size B16; + CARD16 length; + CARD16 screen; + CARD16 size; } xXF86VidModeGetGammaRampReq; #define sz_xXF86VidModeGetGammaRampReq 8 typedef struct { BYTE type; BOOL pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 size B16; - CARD16 pad0 B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 size; + CARD16 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86VidModeGetGammaRampReply; #define sz_xXF86VidModeGetGammaRampReply 32 typedef struct _XF86VidModeGetGammaRampSize { CARD8 reqType; /* always XF86VidModeReqCode */ CARD8 xf86vidmodeReqType; - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; + CARD16 length; + CARD16 screen; + CARD16 pad; } xXF86VidModeGetGammaRampSizeReq; #define sz_xXF86VidModeGetGammaRampSizeReq 8 typedef struct { BYTE type; BOOL pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 size B16; - CARD16 pad0 B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 size; + CARD16 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86VidModeGetGammaRampSizeReply; #define sz_xXF86VidModeGetGammaRampSizeReply 32 typedef struct { BYTE type; BOOL pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 permissions B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 permissions; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXF86VidModeGetPermissionsReply; #define sz_xXF86VidModeGetPermissionsReply 32 diff --git a/proto/xorgproto/include/X11/extensions/xfixesproto.h b/proto/xorgproto/include/X11/extensions/xfixesproto.h index fcf409a6e..b18b30609 100644 --- a/proto/xorgproto/include/X11/extensions/xfixesproto.h +++ b/proto/xorgproto/include/X11/extensions/xfixesproto.h @@ -69,18 +69,18 @@ typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; + CARD16 length; } xXFixesReq; -/* +/* * requests and replies */ typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; + CARD16 length; + CARD32 majorVersion; + CARD32 minorVersion; } xXFixesQueryVersionReq; #define sz_xXFixesQueryVersionReq 12 @@ -88,14 +88,14 @@ typedef struct { 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; + CARD16 sequenceNumber; + CARD32 length; + CARD32 majorVersion; + CARD32 minorVersion; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXFixesQueryVersionReply; #define sz_xXFixesQueryVersionReply 32 @@ -103,7 +103,7 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; + CARD16 length; BYTE mode; /* SetModeInsert/SetModeDelete*/ BYTE target; /* SaveSetNearest/SaveSetRoot*/ BYTE map; /* SaveSetMap/SaveSetUnmap */ @@ -116,10 +116,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Window window B32; - Atom selection B32; - CARD32 eventMask B32; + CARD16 length; + Window window; + Atom selection; + CARD32 eventMask; } xXFixesSelectSelectionInputReq; #define sz_xXFixesSelectSelectionInputReq 16 @@ -127,22 +127,22 @@ typedef struct { typedef struct { CARD8 type; CARD8 subtype; - CARD16 sequenceNumber B16; - Window window B32; - Window owner B32; - Atom selection B32; - Time timestamp B32; - Time selectionTimestamp B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + Window window; + Window owner; + Atom selection; + Time timestamp; + Time selectionTimestamp; + CARD32 pad2; + CARD32 pad3; } xXFixesSelectionNotifyEvent; typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Window window B32; - CARD32 eventMask B32; + CARD16 length; + Window window; + CARD32 eventMask; } xXFixesSelectCursorInputReq; #define sz_xXFixesSelectCursorInputReq 12 @@ -150,20 +150,20 @@ typedef struct { typedef struct { CARD8 type; CARD8 subtype; - CARD16 sequenceNumber B16; - Window window B32; - CARD32 cursorSerial B32; + CARD16 sequenceNumber; + Window window; + CARD32 cursorSerial; Time timestamp; - Atom name B32; /* Version 2 */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + Atom name; /* Version 2 */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xXFixesCursorNotifyEvent; typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; + CARD16 length; } xXFixesGetCursorImageReq; #define sz_xXFixesGetCursorImageReq 4 @@ -171,17 +171,17 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; - CARD16 xhot B16; - CARD16 yhot B16; - CARD32 cursorSerial B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; + CARD16 xhot; + CARD16 yhot; + CARD32 cursorSerial; + CARD32 pad2; + CARD32 pad3; } xXFixesGetCursorImageReply; #define sz_xXFixesGetCursorImageReply 32 @@ -193,8 +193,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; + CARD16 length; + Region region; /* LISTofRECTANGLE */ } xXFixesCreateRegionReq; @@ -203,9 +203,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; - Pixmap bitmap B32; + CARD16 length; + Region region; + Pixmap bitmap; } xXFixesCreateRegionFromBitmapReq; #define sz_xXFixesCreateRegionFromBitmapReq 12 @@ -213,12 +213,12 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; - Window window B32; + CARD16 length; + Region region; + Window window; CARD8 kind; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } xXFixesCreateRegionFromWindowReq; #define sz_xXFixesCreateRegionFromWindowReq 16 @@ -226,9 +226,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; - GContext gc B32; + CARD16 length; + Region region; + GContext gc; } xXFixesCreateRegionFromGCReq; #define sz_xXFixesCreateRegionFromGCReq 12 @@ -236,9 +236,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; - Picture picture B32; + CARD16 length; + Region region; + Picture picture; } xXFixesCreateRegionFromPictureReq; #define sz_xXFixesCreateRegionFromPictureReq 12 @@ -246,8 +246,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; + CARD16 length; + Region region; } xXFixesDestroyRegionReq; #define sz_xXFixesDestroyRegionReq 8 @@ -255,8 +255,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; + CARD16 length; + Region region; /* LISTofRECTANGLE */ } xXFixesSetRegionReq; @@ -265,9 +265,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region source B32; - Region destination B32; + CARD16 length; + Region source; + Region destination; } xXFixesCopyRegionReq; #define sz_xXFixesCopyRegionReq 12 @@ -275,10 +275,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region source1 B32; - Region source2 B32; - Region destination B32; + CARD16 length; + Region source1; + Region source2; + Region destination; } xXFixesCombineRegionReq, xXFixesUnionRegionReq, xXFixesIntersectRegionReq, @@ -292,11 +292,11 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region source B32; - INT16 x B16, y B16; - CARD16 width B16, height B16; - Region destination B32; + CARD16 length; + Region source; + INT16 x, y; + CARD16 width, height; + Region destination; } xXFixesInvertRegionReq; #define sz_xXFixesInvertRegionReq 20 @@ -304,19 +304,19 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; - INT16 dx B16, dy B16; + CARD16 length; + Region region; + INT16 dx, dy; } xXFixesTranslateRegionReq; #define sz_xXFixesTranslateRegionReq 12 - + typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region source B32; - Region destination B32; + CARD16 length; + Region source; + Region destination; } xXFixesRegionExtentsReq; #define sz_xXFixesRegionExtentsReq 12 @@ -324,8 +324,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region region B32; + CARD16 length; + Region region; } xXFixesFetchRegionReq; #define sz_xXFixesFetchRegionReq 8 @@ -333,14 +333,14 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - INT16 x B16, y B16; - CARD16 width B16, height B16; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + INT16 x, y; + CARD16 width, height; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXFixesFetchRegionReply; #define sz_xXFixesFetchRegionReply 32 @@ -348,10 +348,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - GContext gc B32; - Region region B32; - INT16 xOrigin B16, yOrigin B16; + CARD16 length; + GContext gc; + Region region; + INT16 xOrigin, yOrigin; } xXFixesSetGCClipRegionReq; #define sz_xXFixesSetGCClipRegionReq 16 @@ -359,12 +359,12 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; + CARD16 length; Window dest; BYTE destKind; CARD8 pad1; - CARD16 pad2 B16; - INT16 xOff B16, yOff B16; + CARD16 pad2; + INT16 xOff, yOff; Region region; } xXFixesSetWindowShapeRegionReq; @@ -373,10 +373,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Picture picture B32; - Region region B32; - INT16 xOrigin B16, yOrigin B16; + CARD16 length; + Picture picture; + Region region; + INT16 xOrigin, yOrigin; } xXFixesSetPictureClipRegionReq; #define sz_xXFixesSetPictureClipRegionReq 16 @@ -384,10 +384,10 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Cursor cursor B32; - CARD16 nbytes B16; - CARD16 pad B16; + CARD16 length; + Cursor cursor; + CARD16 nbytes; + CARD16 pad; } xXFixesSetCursorNameReq; #define sz_xXFixesSetCursorNameReq 12 @@ -395,8 +395,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Cursor cursor B32; + CARD16 length; + Cursor cursor; } xXFixesGetCursorNameReq; #define sz_xXFixesGetCursorNameReq 8 @@ -404,15 +404,15 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - Atom atom B32; - CARD16 nbytes B16; - CARD16 pad2 B16; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + Atom atom; + CARD16 nbytes; + CARD16 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xXFixesGetCursorNameReply; #define sz_xXFixesGetCursorNameReply 32 @@ -420,7 +420,7 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; + CARD16 length; } xXFixesGetCursorImageAndNameReq; #define sz_xXFixesGetCursorImageAndNameReq 4 @@ -428,18 +428,18 @@ typedef struct { typedef struct { BYTE type; /* X_Reply */ BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - INT16 x B16; - INT16 y B16; - CARD16 width B16; - CARD16 height B16; - CARD16 xhot B16; - CARD16 yhot B16; - CARD32 cursorSerial B32; - Atom cursorName B32; - CARD16 nbytes B16; - CARD16 pad B16; + CARD16 sequenceNumber; + CARD32 length; + INT16 x; + INT16 y; + CARD16 width; + CARD16 height; + CARD16 xhot; + CARD16 yhot; + CARD32 cursorSerial; + Atom cursorName; + CARD16 nbytes; + CARD16 pad; } xXFixesGetCursorImageAndNameReply; #define sz_xXFixesGetCursorImageAndNameReply 32 @@ -447,9 +447,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Cursor source B32; - Cursor destination B32; + CARD16 length; + Cursor source; + Cursor destination; } xXFixesChangeCursorReq; #define sz_xXFixesChangeCursorReq 12 @@ -457,8 +457,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Cursor source B32; + CARD16 length; + Cursor source; CARD16 nbytes; CARD16 pad; } xXFixesChangeCursorByNameReq; @@ -470,13 +470,13 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Region source B32; - Region destination B32; - CARD16 left B16; - CARD16 right B16; - CARD16 top B16; - CARD16 bottom B16; + CARD16 length; + Region source; + Region destination; + CARD16 left; + CARD16 right; + CARD16 top; + CARD16 bottom; } xXFixesExpandRegionReq; #define sz_xXFixesExpandRegionReq 20 @@ -486,8 +486,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xXFixesHideCursorReq; #define sz_xXFixesHideCursorReq sizeof(xXFixesHideCursorReq) @@ -495,8 +495,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Window window B32; + CARD16 length; + Window window; } xXFixesShowCursorReq; #define sz_xXFixesShowCursorReq sizeof(xXFixesShowCursorReq) @@ -508,16 +508,16 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Barrier barrier B32; - Window window B32; - INT16 x1 B16; - INT16 y1 B16; - INT16 x2 B16; - INT16 y2 B16; + CARD16 length; + Barrier barrier; + Window window; + INT16 x1; + INT16 y1; + INT16 x2; + INT16 y2; CARD32 directions; - CARD16 pad B16; - CARD16 num_devices B16; + CARD16 pad; + CARD16 num_devices; /* array of CARD16 devices */ } xXFixesCreatePointerBarrierReq; @@ -526,8 +526,8 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 xfixesReqType; - CARD16 length B16; - Barrier barrier B32; + CARD16 length; + Barrier barrier; } xXFixesDestroyPointerBarrierReq; #define sz_xXFixesDestroyPointerBarrierReq 8 diff --git a/proto/xorgproto/include/X11/extensions/xtestext1proto.h b/proto/xorgproto/include/X11/extensions/xtestext1proto.h index e9bdee09f..d14ace12b 100644 --- a/proto/xorgproto/include/X11/extensions/xtestext1proto.h +++ b/proto/xorgproto/include/X11/extensions/xtestext1proto.h @@ -79,8 +79,8 @@ University of California. typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 XTestReqType; /* always X_TestFakeInput */ - CARD16 length B16; /* 2 + XTestMAX_ACTION_LIST_SIZE/4 */ - CARD32 ack B32; + CARD16 length; /* 2 + XTestMAX_ACTION_LIST_SIZE/4 */ + CARD32 ack; CARD8 action_list[XTestMAX_ACTION_LIST_SIZE]; } xTestFakeInputReq; #define sz_xTestFakeInputReq (XTestMAX_ACTION_LIST_SIZE + 8) @@ -88,29 +88,29 @@ typedef struct { typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 XTestReqType; /* always X_TestGetInput */ - CARD16 length B16; /* 2 */ - CARD32 mode B32; + CARD16 length; /* 2 */ + CARD32 mode; } xTestGetInputReq; #define sz_xTestGetInputReq 8 typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 XTestReqType; /* always X_TestStopInput */ - CARD16 length B32; /* 1 */ + CARD16 length; /* 1 */ } xTestStopInputReq; #define sz_xTestStopInputReq 4 typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 XTestReqType; /* always X_TestReset */ - CARD16 length B16; /* 1 */ + CARD16 length; /* 1 */ } xTestResetReq; #define sz_xTestResetReq 4 typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 XTestReqType; /* always X_TestQueryInputSize */ - CARD16 length B16; /* 1 */ + CARD16 length; /* 1 */ } xTestQueryInputSizeReq; #define sz_xTestQueryInputSizeReq 4 @@ -122,14 +122,14 @@ typedef struct { typedef struct { CARD8 type; /* always X_Reply */ CARD8 pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; /* always 0 */ - CARD32 size_return B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; /* always 0 */ + CARD32 size_return; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xTestQueryInputSizeReply; /* @@ -141,7 +141,7 @@ typedef struct { typedef struct { CARD8 type; /* always XTestInputActionType */ CARD8 pad00; - CARD16 sequenceNumber B16; + CARD16 sequenceNumber; CARD8 actions[XTestACTIONS_SIZE]; } xTestInputActionEvent; @@ -154,14 +154,14 @@ typedef struct { typedef struct { CARD8 type; /* always XTestFakeAckType */ CARD8 pad00; - CARD16 sequenceNumber B16; - CARD32 pad02 B32; - CARD32 pad03 B32; - CARD32 pad04 B32; - CARD32 pad05 B32; - CARD32 pad06 B32; - CARD32 pad07 B32; - CARD32 pad08 B32; + CARD16 sequenceNumber; + CARD32 pad02; + CARD32 pad03; + CARD32 pad04; + CARD32 pad05; + CARD32 pad06; + CARD32 pad07; + CARD32 pad08; } xTestFakeAckEvent; /* @@ -170,7 +170,7 @@ typedef struct { typedef struct { CARD8 header; /* which device, key up/down */ CARD8 keycode; /* which key/button to move */ - CARD16 delay_time B16; /* how long to delay (in ms) */ + CARD16 delay_time; /* how long to delay (in ms) */ } XTestKeyInfo; /* @@ -179,9 +179,9 @@ typedef struct { typedef struct { CARD8 header; /* which pointer */ CARD8 pad1; /* unused padding byte */ - CARD16 jumpx B16; /* x coord to jump to */ - CARD16 jumpy B16; /* y coord to jump to */ - CARD16 delay_time B16; /* how long to delay (in ms) */ + CARD16 jumpx; /* x coord to jump to */ + CARD16 jumpy; /* y coord to jump to */ + CARD16 delay_time; /* how long to delay (in ms) */ } XTestJumpInfo; /* @@ -197,7 +197,7 @@ typedef struct { typedef struct { CARD8 header; /* which pointer */ CARD8 motion_data; /* x,y relative motion */ - CARD16 delay_time B16; /* how long to delay (in ms) */ + CARD16 delay_time; /* how long to delay (in ms) */ } XTestMotionInfo; /* @@ -214,8 +214,8 @@ typedef struct { typedef struct { CARD8 header; /* always XTestDELAY_DEVICE_ID */ CARD8 pad1; /* unused padding byte */ - CARD16 pad2 B16; /* unused padding word */ - CARD32 delay_time B32; /* how long to delay (in ms) */ + CARD16 pad2; /* unused padding word */ + CARD32 delay_time; /* how long to delay (in ms) */ } XTestDelayInfo; #endif /* _XTESTEXT1PROTO_H */ diff --git a/proto/xorgproto/include/X11/extensions/xtestproto.h b/proto/xorgproto/include/X11/extensions/xtestproto.h index 4f8db2652..9595ac1ff 100644 --- a/proto/xorgproto/include/X11/extensions/xtestproto.h +++ b/proto/xorgproto/include/X11/extensions/xtestproto.h @@ -41,48 +41,48 @@ in this Software without prior written authorization from The Open Group. typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 xtReqType; /* always X_XTestGetVersion */ - CARD16 length B16; + CARD16 length; CARD8 majorVersion; CARD8 pad; - CARD16 minorVersion B16; + CARD16 minorVersion; } xXTestGetVersionReq; #define sz_xXTestGetVersionReq 8 typedef struct { BYTE type; /* X_Reply */ CARD8 majorVersion; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 minorVersion B16; - CARD16 pad0 B16; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 minorVersion; + CARD16 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXTestGetVersionReply; #define sz_xXTestGetVersionReply 32 typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 xtReqType; /* always X_XTestCompareCursor */ - CARD16 length B16; - Window window B32; - Cursor cursor B32; + CARD16 length; + Window window; + Cursor cursor; } xXTestCompareCursorReq; #define sz_xXTestCompareCursorReq 12 typedef struct { BYTE type; /* X_Reply */ BOOL same; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; } xXTestCompareCursorReply; #define sz_xXTestCompareCursorReply 32 @@ -90,17 +90,17 @@ typedef struct { typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 xtReqType; /* always X_XTestFakeInput */ - CARD16 length B16; + CARD16 length; BYTE type; BYTE detail; - CARD16 pad0 B16; - Time time B32; - Window root B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - INT16 rootX B16, rootY B16; - CARD32 pad3 B32; - CARD16 pad4 B16; + CARD16 pad0; + Time time; + Window root; + CARD32 pad1; + CARD32 pad2; + INT16 rootX, rootY; + CARD32 pad3; + CARD16 pad4; CARD8 pad5; CARD8 deviceid; } xXTestFakeInputReq; @@ -109,7 +109,7 @@ typedef struct { typedef struct { CARD8 reqType; /* always XTestReqCode */ CARD8 xtReqType; /* always X_XTestGrabControl */ - CARD16 length B16; + CARD16 length; BOOL impervious; CARD8 pad0; CARD8 pad1; diff --git a/proto/xorgproto/include/X11/extensions/xtrapbits.h b/proto/xorgproto/include/X11/extensions/xtrapbits.h index 1189dc7d3..794cc9e32 100644 --- a/proto/xorgproto/include/X11/extensions/xtrapbits.h +++ b/proto/xorgproto/include/X11/extensions/xtrapbits.h @@ -7,16 +7,16 @@ #define __XTRAPBITS__ "@(#)xtrapbits.h 1.6 - 90/09/18 " /***************************************************************************** -Copyright 1987, 1988, 1989, 1990, 1994 by Digital Equipment Corporation, +Copyright 1987, 1988, 1989, 1990, 1994 by Digital Equipment Corporation, Maynard, MA -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/proto/xorgproto/include/X11/extensions/xtrapddmi.h b/proto/xorgproto/include/X11/extensions/xtrapddmi.h index c187a3a0b..4515ca6a9 100644 --- a/proto/xorgproto/include/X11/extensions/xtrapddmi.h +++ b/proto/xorgproto/include/X11/extensions/xtrapddmi.h @@ -6,13 +6,13 @@ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -67,8 +67,8 @@ typedef struct ClientPtr client; /* Multi-client support and error handling */ xXTrapGetCurReply cur; /* Struct of Miscellaneous state info */ xXTrapGetStatsReply *stats; /* Pointer to stat's, malloc'd if requested */ - CARD32 last_input_time B32; /* last timestamp from input event */ - CARD16 protocol B16; /* current communication protocol */ + CARD32 last_input_time; /* last timestamp from input event */ + CARD16 protocol; /* current communication protocol */ } XETrapEnv; #define XETrapSetHeaderEvent(phdr) ((phdr)->type = 0x1L) @@ -78,7 +78,7 @@ typedef struct #define XETrapSetHeaderReply(phdr) ((phdr)->type = 0x5L) #ifndef vaxc -#define globaldef +#define globaldef #define globalref extern #endif diff --git a/proto/xorgproto/include/X11/extensions/xtrapdi.h b/proto/xorgproto/include/X11/extensions/xtrapdi.h index 34aa94cd8..e26cb9c89 100644 --- a/proto/xorgproto/include/X11/extensions/xtrapdi.h +++ b/proto/xorgproto/include/X11/extensions/xtrapdi.h @@ -3,16 +3,16 @@ #define __XTRAPDI__ /***************************************************************************** -Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp., +Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp., Maynard, MA -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -89,7 +89,7 @@ typedef CARD8 ReqFlags[XETrapMaxRequest]; /* This is used as flags to indicate desired event traps * Until events become *fully vectored*, we'll have to fake it - * by defining an array of 5 events (KeyPress, KeyRelease, + * by defining an array of 5 events (KeyPress, KeyRelease, * ButtonPress, ButtonRelease, and MotionNotify. The extra 2 * are required as the event types start with "2" (errors and * replies are 0 & 1). The event type is the index into the @@ -108,11 +108,11 @@ typedef CARD8 EventFlags[XETrapMaxEvent]; /* This structure is used in a request to specify the types of * configuration information that should be changed or updated. */ -typedef struct +typedef struct { CARD8 valid[4L]; /* Bits TRUE indicates data field is used */ CARD8 data[4L]; /* Bits looked at if corresponding valid bit set */ - ReqFlags req; /* Bits coorespond to core requests */ + ReqFlags req; /* Bits correspond to core requests */ EventFlags event; /* Bits correspond to core events */ } XETrapFlags; @@ -136,10 +136,10 @@ typedef struct typedef struct /* used by XEConfigRequest */ { XETrapFlags flags; /* Flags to specify what should be chg'd */ - CARD16 max_pkt_size B16; /* Maximum number of bytes in a packet */ + CARD16 max_pkt_size; /* Maximum number of bytes in a packet */ CARD8 cmd_key; /* Keyboard command_key (KeyCode) */ -/* - * cmd_key is intentionally *not* defined KeyCode since it's definition is +/* + * cmd_key is intentionally *not* defined KeyCode since it's definition is * ambiguous (int in Intrinsic.h and unsigned char in X.h. */ CARD8 pad[1L]; /* pad out to a quadword */ @@ -156,8 +156,8 @@ typedef struct /* used by XESimulateXEventRequest for synthesizing core evts */ CARD8 detail; /* Detail keycode/button as in XEvent */ CARD8 screen; /* screen number (0 to n) */ CARD8 pad; /* pad to longword */ - INT16 x B16; /* X & Y coord as in XEvent */ - INT16 y B16; + INT16 x; /* X & Y coord as in XEvent */ + INT16 y; } XETrapInputReq; #endif @@ -180,34 +180,34 @@ typedef struct /* used by XESimulateXEventRequest for synthesizing core evts */ /* The following are formats of a request to the XTRAP * extension. The data-less XTrap requests all use xXTrapReq */ -typedef struct +typedef struct { CARD8 reqType; CARD8 minor_opcode; - CARD16 length B16; - CARD32 pad B32; /* Maintain quadword alignment */ + CARD16 length; + CARD32 pad; /* Maintain quadword alignment */ } xXTrapReq; /* the following works because all fields are defined as bit (Bnn) fields */ #define sz_xXTrapReq (sizeof(xXTrapReq)) /* For retrieving version/available info (passes lib-side protocol number) */ -typedef struct +typedef struct { CARD8 reqType; CARD8 minor_opcode; - CARD16 length B16; - CARD16 protocol B16; /* The xtrap extension protocol number */ - CARD16 pad B16; /* Maintain quadword alignment */ + CARD16 length; + CARD16 protocol; /* The xtrap extension protocol number */ + CARD16 pad; /* Maintain quadword alignment */ } xXTrapGetReq; /* the following works because all fields are defined as bit (Bnn) fields */ #define sz_xXTrapGetReq (sizeof(xXTrapGetReq)) -typedef struct +typedef struct { CARD8 reqType; CARD8 minor_opcode; - CARD16 length B16; + CARD16 length; /* - * The follwing is done so that structure padding wont be + * The following is done so that structure padding wont be * a problem. The request structure contains a shadow for * the XETrapCfg structure. Since the XETrapCfg also has a * substructure (XETrapFlags) this structure is also shadowed. @@ -220,26 +220,26 @@ typedef struct ReqFlags config_flags_req; EventFlags config_flags_event; /* End Shadow (XETrapFlags)*/ - CARD16 config_max_pkt_size B16; /* Max number of bytes in a packet */ + CARD16 config_max_pkt_size; /* Max number of bytes in a packet */ CARD8 config_cmd_key; /* Keyboard command_key (KeyCode) */ -/* - * cmd_key is intentionally *not* defined KeyCode since it's definition is +/* + * cmd_key is intentionally *not* defined KeyCode since it's definition is * ambiguous (int in Intrinsic.h and unsigned char in X.h. */ CARD8 config_pad[1L]; /* pad out to a quadword */ /* End Shadow (XETrapCfg) */ - CARD32 pad B32; /* Maintain quadword alignment */ + CARD32 pad; /* Maintain quadword alignment */ } xXTrapConfigReq; /* the following works because all fields are defined as bit (Bnn) fields */ #define sz_xXTrapConfigReq (sizeof(xXTrapConfigReq)) #ifndef _XINPUT -typedef struct +typedef struct { CARD8 reqType; CARD8 minor_opcode; - CARD16 length B16; - CARD32 pad B32; /* Maintain quadword alignment */ + CARD16 length; + CARD32 pad; /* Maintain quadword alignment */ XETrapInputReq input; } xXTrapInputReq; /* the following works because all fields are defined as bit (Bnn) fields */ @@ -256,48 +256,48 @@ typedef struct { CARD8 type; CARD8 detail; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; } XETrapRepHdr; /* Structure of Get Available Functionality reply */ typedef struct { - CARD32 pf_ident B32; /* Contains constant identifying the platform */ - CARD16 xtrap_release B16; /* The xtrap extension release number */ - CARD16 xtrap_version B16; /* The xtrap extension version number */ - CARD16 xtrap_revision B16; /* The xtrap extension revision number */ - CARD16 max_pkt_size B16; /* Maximum number of bytes in a packet */ + CARD32 pf_ident; /* Contains constant identifying the platform */ + CARD16 xtrap_release; /* The xtrap extension release number */ + CARD16 xtrap_version; /* The xtrap extension version number */ + CARD16 xtrap_revision; /* The xtrap extension revision number */ + CARD16 max_pkt_size; /* Maximum number of bytes in a packet */ CARD8 valid[4]; /* What specific configuration flags are valid */ - CARD32 major_opcode B32; /* The major opcode identifying xtrap */ - CARD32 event_base B32; /* The event value we start at */ - CARD32 pad0 B32; /* obsolete field */ - CARD16 pad1 B16, pad2 B16, pad3 B16; /* obsolete field */ - CARD16 xtrap_protocol B16; /* The xtrap extension protocol number */ - INT16 cur_x B16; /* Current X & Y coord for relative motion */ - INT16 cur_y B16; + CARD32 major_opcode; /* The major opcode identifying xtrap */ + CARD32 event_base; /* The event value we start at */ + CARD32 pad0; /* obsolete field */ + CARD16 pad1, pad2, pad3; /* obsolete field */ + CARD16 xtrap_protocol; /* The xtrap extension protocol number */ + INT16 cur_x; /* Current X & Y coord for relative motion */ + INT16 cur_y; } XETrapGetAvailRep; typedef struct { - CARD16 xtrap_release B16; /* The xtrap extension release number */ - CARD16 xtrap_version B16; /* The xtrap extension version number */ - CARD16 xtrap_revision B16; /* The xtrap extension revision number */ - CARD16 xtrap_protocol B16; /* The xtrap extension protocol number */ + CARD16 xtrap_release; /* The xtrap extension release number */ + CARD16 xtrap_version; /* The xtrap extension version number */ + CARD16 xtrap_revision; /* The xtrap extension revision number */ + CARD16 xtrap_protocol; /* The xtrap extension protocol number */ } XETrapGetVersRep; typedef struct { - CARD32 last_time B32; /* Timestamp of last input time */ + CARD32 last_time; /* Timestamp of last input time */ } XETrapGetLastInpTimeRep; /* Structure of Get Current Configuration Information reply */ typedef struct { - CARD8 state_flags[2]; /* Miscelaneous flags, see below #define's */ - CARD16 pad0 B16; /* Assure quadword alignment */ + CARD8 state_flags[2]; /* Miscellaneous flags, see below #define's */ + CARD16 pad0; /* Assure quadword alignment */ XETrapCfg config; /* Current Config information */ - CARD32 pad1 B32; + CARD32 pad1; } XETrapGetCurRep; /* Mask definitions for the above flags. */ @@ -309,7 +309,7 @@ typedef struct CARD32 requests[256L]; /* Array containing request counts if trapped */ CARD32 events[XETrapCoreEvents]; /* Array containing event stats */ #ifndef VECTORED_EVENTS - CARD32 pad B32; /* Pad out to a quadword */ + CARD32 pad; /* Pad out to a quadword */ #endif } XETrapGetStatsRep; @@ -339,7 +339,7 @@ typedef struct #define PF_SunSparc 112L /* server on Sun Sparc system */ /* reply sent back by XETrapGetAvailable request */ -typedef struct +typedef struct { XETrapRepHdr hdr; XETrapGetAvailRep data; @@ -348,14 +348,14 @@ typedef struct #define sz_xXTrapGetAvailReply sizeof(xXTrapGetAvailReply) /* reply sent back by XETrapGetVersion request */ -typedef struct +typedef struct { XETrapRepHdr hdr; XETrapGetVersRep data; - CARD32 pad0 B32; /* pad out to 32 bytes */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD32 pad0; /* pad out to 32 bytes */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xXTrapGetVersReply; /* the following works because all fields are defined as bit (Bnn) fields */ #define sz_xXTrapGetVersReply sizeof(xXTrapGetVersReply) @@ -368,18 +368,18 @@ typedef struct * The following is a shadow of the XETrapGetLastInpTimeRep * structure. This is done to avoid structure padding. */ - CARD32 data_last_time B32; /* Timestamp of last input time */ - CARD32 pad0 B32; /* pad out to 32 bytes */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; + CARD32 data_last_time; /* Timestamp of last input time */ + CARD32 pad0; /* pad out to 32 bytes */ + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; } xXTrapGetLITimReply; /* the following works because all fields are defined as bit (Bnn) fields */ #define sz_xXTrapGetLITimReply sizeof(xXTrapGetLITimReply) /* reply sent back by XETrapGetCurrent request */ -typedef struct +typedef struct { XETrapRepHdr hdr; /* @@ -388,21 +388,21 @@ typedef struct * Since the XETrapGetCurRep structure contains a sub-structure * (XETrapCfg) there is a shadow for that as well.*/ CARD8 data_state_flags[2]; /* Misc flags, see below #define's */ - CARD16 data_pad0 B16; /* Assure quadword alignment */ + CARD16 data_pad0; /* Assure quadword alignment */ /* XETrapCfg Shadow Starts */ CARD8 data_config_flags_valid[4L]; CARD8 data_config_flags_data[4L]; ReqFlags data_config_flags_req; EventFlags data_config_flags_event; - CARD16 data_config_max_pkt_size B16; /* Max num of bytes in a pkt */ + CARD16 data_config_max_pkt_size; /* Max num of bytes in a pkt */ CARD8 data_config_cmd_key; /* Keyboard cmd_key (KeyCode) */ -/* - * cmd_key is intentionally *not* defined KeyCode since it's definition is +/* + * cmd_key is intentionally *not* defined KeyCode since it's definition is * ambiguous (int in Intrinsic.h and unsigned char in X.h. */ CARD8 data_config_pad[1L]; /* pad out to a quadword */ /* End Shadow (XETrapCfg) */ - CARD32 pad1 B32; + CARD32 pad1; } xXTrapGetCurReply; /* the following works because all fields are defined as bit (Bnn) fields */ #define sz_xXTrapGetCurReply sizeof(xXTrapGetCurReply) @@ -414,31 +414,31 @@ typedef struct * reading arrays of CARD32s without using the _Read32 macro (see XERqsts.c). * This requires that none of the data be in the _Reply area. */ -typedef struct +typedef struct { CARD8 type; CARD8 detail; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 pad0; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; XETrapGetStatsRep data; } xXTrapGetStatsReply; #define sz_xXTrapGetStatsReply 1088 typedef struct /* the XTrap Output header (for output from ext to client) */ { /* this must be quadword aligned for portability */ - CARD32 count B32; /* Length including this header */ - CARD32 timestamp B32; /* timestamp if desired */ + CARD32 count; /* Length including this header */ + CARD32 timestamp; /* timestamp if desired */ CARD8 type; /* event id, request id, special id */ CARD8 screen; /* screen number (0 to n) */ - INT16 win_x B16; /* X coord of drawable, if any */ - INT16 win_y B16; /* X coord of drawable, if any */ - CARD16 client B16; /* to distinguish requests */ + INT16 win_x; /* X coord of drawable, if any */ + INT16 win_y; /* X coord of drawable, if any */ + CARD16 client; /* to distinguish requests */ } XETrapHeader; /* the following works because all fields are defined as bit (Bnn) fields */ #define sz_XETrapHeader sizeof(XETrapHeader) @@ -480,8 +480,8 @@ typedef struct typedef struct { CARD8 type; CARD8 detail; - CARD16 sequenceNumber B16; - CARD32 idx B32; + CARD16 sequenceNumber; + CARD32 idx; CARD8 data[sz_EventData]; } xETrapDataEvent; diff --git a/proto/xorgproto/include/X11/extensions/xtrapemacros.h b/proto/xorgproto/include/X11/extensions/xtrapemacros.h index f59ea3391..89c8f63a0 100644 --- a/proto/xorgproto/include/X11/extensions/xtrapemacros.h +++ b/proto/xorgproto/include/X11/extensions/xtrapemacros.h @@ -3,16 +3,16 @@ #define __XTRAPEMACROS__ "@(#)xtrapemacros.h 1.9 - 90/09/18 " /***************************************************************************** -Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., +Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., Maynard, MA -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -37,7 +37,7 @@ SOFTWARE. * Ken Miller * * DESCRIPTION: - * This include file is designed to provide the *visible* + * This include file is designed to provide the *visible* * interface to XTrap data structures. Fields can be set * using these macros by client programs unless otherwise * specified; however, use of Trap Context convenience diff --git a/proto/xorgproto/include/X11/extensions/xtraplib.h b/proto/xorgproto/include/X11/extensions/xtraplib.h index db0289f7d..2694ae2f5 100644 --- a/proto/xorgproto/include/X11/extensions/xtraplib.h +++ b/proto/xorgproto/include/X11/extensions/xtraplib.h @@ -1,19 +1,19 @@ /* $XFree86$ */ #ifndef __XTRAPLIB__ -#define __XTRAPLIB__ +#define __XTRAPLIB__ /***************************************************************************** -Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., +Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., Maynard, MA -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -70,7 +70,7 @@ typedef struct XETrapCfg v; /* XTrap configuration values */ XETrapCB *req_cb; /* Pointer to Request Callbacks */ XETrapCB *evt_cb; /* Pointer to Event Callbacks (starting at 2) */ - CARD32 last_time B32; /* Last (delta) timestamp */ + CARD32 last_time; /* Last (delta) timestamp */ } XETCValues; /* bits 0 thru 6 are formerly "families" (now obsolete) */ @@ -105,7 +105,7 @@ typedef struct { } XETrapDataEvent; /* Trap Context structure for maintaining XTrap State for client */ -struct _XETC +struct _XETC { struct _XETC *next; /* Ptr to next linked-listed TC */ Display *dpy; /* Display ptr of current TC */ @@ -115,7 +115,7 @@ struct _XETC BYTE *xbuff; /* Pointer to buffer for XLib Communications */ CARD16 xmax_size /*B16*/; /* Max Size of a request */ XExtData *ext_data; /* hook for extension to hang data */ - /* + /* * The following are initialized with the client-side version number * However, when either a GetAvailable or GetVersion reply is received, * these values are updated with the *oldest* version numbers. diff --git a/proto/xorgproto/include/X11/extensions/xtraplibp.h b/proto/xorgproto/include/X11/extensions/xtraplibp.h index 0c6ced2fc..aeb6b311f 100644 --- a/proto/xorgproto/include/X11/extensions/xtraplibp.h +++ b/proto/xorgproto/include/X11/extensions/xtraplibp.h @@ -4,16 +4,16 @@ /***************************************************************************** -Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., +Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., Maynard, MA -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -53,7 +53,7 @@ XETC *XECreateTC (Display *dpy , CARD32 valuemask , XETCValues *value ); int XEChangeTC (XETC *tc , CARD32 mask , XETCValues *values ); void XEFreeTC (XETC *tc ); int XETrapSetMaxPacket (XETC *tc , Bool set_flag , CARD16 size ); -int XETrapSetCommandKey (XETC *tc , Bool set_flag , KeySym cmd_key , +int XETrapSetCommandKey (XETC *tc , Bool set_flag , KeySym cmd_key , Bool mod_flag ); int XETrapSetTimestamps (XETC *tc , Bool set_flag , Bool delta_flag ); int XETrapSetWinXY (XETC *tc , Bool set_flag ); @@ -64,7 +64,7 @@ int XETrapSetGrabServer (XETC *tc , Bool set_flag ); int XETrapSetStatistics (XETC *tc , Bool set_flag ); int XETrapSetRequests (XETC *tc , Bool set_flag , ReqFlags requests ); int XETrapSetEvents (XETC *tc , Bool set_flag , EventFlags events ); -Bool XESetCmdGateState (XETC *tc , CARD8 type, Bool *gate_closed , +Bool XESetCmdGateState (XETC *tc , CARD8 type, Bool *gate_closed , CARD8 *next_key , Bool *key_ignore ); /* XERqsts.c */ @@ -75,17 +75,17 @@ int XEGetLastInpTimeRequest (XETC *tc , XETrapGetLastInpTimeRep *ret ); int XEGetAvailableRequest (XETC *tc , XETrapGetAvailRep *ret ); int XEStartTrapRequest (XETC *tc ); int XEStopTrapRequest (XETC *tc ); -int XESimulateXEventRequest (XETC *tc , CARD8 type , CARD8 detail , +int XESimulateXEventRequest (XETC *tc , CARD8 type , CARD8 detail , CARD16 x , CARD16 y , CARD8 screen ); int XEGetCurrentRequest (XETC *tc , XETrapGetCurRep *ret ); int XEGetStatisticsRequest (XETC *tc , XETrapGetStatsRep *ret ); /* XECallBcks.c */ int XEAddRequestCB (XETC *tc , CARD8 req , void_function func , BYTE *data ); -int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func , +int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func , BYTE *data ); int XEAddEventCB (XETC *tc , CARD8 evt , void_function func , BYTE *data ); -int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func , +int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func , BYTE *data ); /* The following seem to never be used. Perhaps they should be removed */ diff --git a/proto/xorgproto/include/X11/extensions/xtrapproto.h b/proto/xorgproto/include/X11/extensions/xtrapproto.h index b3e29cfaa..49614fd1b 100644 --- a/proto/xorgproto/include/X11/extensions/xtrapproto.h +++ b/proto/xorgproto/include/X11/extensions/xtrapproto.h @@ -6,13 +6,13 @@ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/proto/xorgproto/include/X11/fonts/FS.h b/proto/xorgproto/include/X11/fonts/FS.h index 605b5a831..2ea6cd701 100644 --- a/proto/xorgproto/include/X11/fonts/FS.h +++ b/proto/xorgproto/include/X11/fonts/FS.h @@ -1,6 +1,6 @@ /* * Copyright 1990, 1991 Network Computing Devices; - * Portions Copyright 1987 by Digital Equipment Corporation + * Portions Copyright 1987 by Digital Equipment Corporation * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided @@ -9,8 +9,8 @@ * documentation, and that the names of Network Computing Devices or Digital * not be used in advertising or publicity pertaining to distribution * of the software without specific, written prior permission. - * Network Computing Devices and Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Network Computing Devices and Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH diff --git a/proto/xorgproto/include/X11/fonts/FSproto.h b/proto/xorgproto/include/X11/fonts/FSproto.h index 028156fba..3cdb83488 100644 --- a/proto/xorgproto/include/X11/fonts/FSproto.h +++ b/proto/xorgproto/include/X11/fonts/FSproto.h @@ -1,5 +1,5 @@ /* - + Copyright 1990, 1991, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +23,7 @@ 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 1990, 1991 Network Computing Devices; - * Portions Copyright 1987 by Digital Equipment Corporation + * Portions Copyright 1987 by Digital Equipment Corporation * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided @@ -131,16 +131,16 @@ typedef CARD32 fsTimestamp; typedef CARD32 fsBitmapFormat; typedef CARD32 fsBitmapFormatMask; #endif - + #define sz_fsBitmapFormat 4 typedef struct { - INT16 left B16, - right B16; - INT16 width B16; - INT16 ascent B16, - descent B16; - CARD16 attributes B16; + INT16 left, + right; + INT16 width; + INT16 ascent, + descent; + CARD16 attributes; } fsXCharInfo; typedef struct { @@ -161,8 +161,8 @@ typedef struct { } fsRange; typedef struct { - CARD32 position B32; - CARD32 length B32; + CARD32 position; + CARD32 length; } fsOffset32; typedef struct { @@ -170,25 +170,25 @@ typedef struct { fsOffset32 value; CARD8 type; BYTE pad0; - CARD16 pad1 B16; + CARD16 pad1; } fsPropOffset; typedef struct { - CARD32 num_offsets B32; - CARD32 data_len B32; + CARD32 num_offsets; + CARD32 data_len; /* offsets */ /* data */ } fsPropInfo; typedef struct { - CARD16 x_resolution B16; - CARD16 y_resolution B16; - CARD16 point_size B16; + CARD16 x_resolution; + CARD16 y_resolution; + CARD16 point_size; } fsResolution; - + typedef struct { - CARD32 flags B32; + CARD32 flags; CARD8 char_range_min_char_high; CARD8 char_range_min_char_low; CARD8 char_range_max_char_high; @@ -198,23 +198,23 @@ typedef struct { CARD8 pad; CARD8 default_char_high; CARD8 default_char_low; - INT16 min_bounds_left B16; - INT16 min_bounds_right B16; + INT16 min_bounds_left; + INT16 min_bounds_right; - INT16 min_bounds_width B16; - INT16 min_bounds_ascent B16; - INT16 min_bounds_descent B16; - CARD16 min_bounds_attributes B16; + INT16 min_bounds_width; + INT16 min_bounds_ascent; + INT16 min_bounds_descent; + CARD16 min_bounds_attributes; - INT16 max_bounds_left B16; - INT16 max_bounds_right B16; - INT16 max_bounds_width B16; - INT16 max_bounds_ascent B16; + INT16 max_bounds_left; + INT16 max_bounds_right; + INT16 max_bounds_width; + INT16 max_bounds_ascent; - INT16 max_bounds_descent B16; - CARD16 max_bounds_attributes B16; - INT16 font_ascent B16; - INT16 font_descent B16; + INT16 max_bounds_descent; + CARD16 max_bounds_attributes; + INT16 font_ascent; + INT16 font_descent; /* propinfo */ } fsXFontInfoHeader; @@ -224,43 +224,43 @@ typedef struct { typedef struct { BYTE byteOrder; CARD8 num_auths; - CARD16 major_version B16; - CARD16 minor_version B16; - CARD16 auth_len B16; + CARD16 major_version; + CARD16 minor_version; + CARD16 auth_len; /* auth data */ } fsConnClientPrefix; typedef struct { - CARD16 status B16; - CARD16 major_version B16; - CARD16 minor_version B16; + CARD16 status; + CARD16 major_version; + CARD16 minor_version; CARD8 num_alternates; CARD8 auth_index; - CARD16 alternate_len B16; - CARD16 auth_len B16; + CARD16 alternate_len; + CARD16 auth_len; /* alternates */ /* auth data */ } fsConnSetup; typedef struct { - CARD32 length B32; - CARD16 status B16; - CARD16 pad B16; + CARD32 length; + CARD16 status; + CARD16 pad; /* more auth data */ } fsConnSetupExtra; typedef struct { - CARD32 length B32; - CARD16 max_request_len B16; - CARD16 vendor_len B16; - CARD32 release_number B32; + CARD32 length; + CARD16 max_request_len; + CARD16 vendor_len; + CARD32 release_number; /* vendor string */ } fsConnSetupAccept; typedef struct { CARD8 reqType; CARD8 data; - CARD16 length B16; + CARD16 length; } fsReq; /* @@ -273,15 +273,15 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 data; - CARD16 length B16; - CARD32 pad B32; /* to fill out to multiple of 64 bits */ + CARD16 length; + CARD32 pad; /* to fill out to multiple of 64 bits */ } fsFakeReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Font id B32; + CARD16 length; + Font id; } fsResourceReq; typedef fsReq fsNoopReq; @@ -290,24 +290,24 @@ typedef fsReq fsListExtensionsReq; typedef struct { CARD8 reqType; BYTE nbytes; - CARD16 length B16; + CARD16 length; /* name */ } fsQueryExtensionReq; typedef struct { CARD8 reqType; CARD8 data; - CARD16 length B16; - CARD32 maxNames B32; - CARD16 nbytes B16; - CARD16 pad2 B16; + CARD16 length; + CARD32 maxNames; + CARD16 nbytes; + CARD16 pad2; /* pattern */ } fsListCataloguesReq; typedef struct { CARD8 reqType; BYTE num_catalogues; - CARD16 length B16; + CARD16 length; /* catalogues */ } fsSetCataloguesReq; @@ -316,21 +316,21 @@ typedef fsReq fsGetCataloguesReq; typedef struct { CARD8 reqType; CARD8 ext_opcode; - CARD16 length B16; + CARD16 length; Mask event_mask; } fsSetEventMaskReq; typedef struct { CARD8 reqType; CARD8 ext_opcode; - CARD16 length B16; + CARD16 length; } fsGetEventMaskReq; typedef struct { CARD8 reqType; BYTE num_auths; - CARD16 length B16; - AccContext acid B32; + CARD16 length; + AccContext acid; /* auth protocols */ } fsCreateACReq; @@ -340,7 +340,7 @@ typedef fsResourceReq fsSetAuthorizationReq; typedef struct { CARD8 reqType; BYTE num_resolutions; - CARD16 length B16; + CARD16 length; /* resolutions */ } fsSetResolutionReq; @@ -349,10 +349,10 @@ typedef fsReq fsGetResolutionReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - CARD32 maxNames B32; - CARD16 nbytes B16; - CARD16 pad2 B16; + CARD16 length; + CARD32 maxNames; + CARD16 nbytes; + CARD16 pad2; /* pattern */ } fsListFontsReq; @@ -361,10 +361,10 @@ typedef fsListFontsReq fsListFontsWithXInfoReq; typedef struct { CARD8 reqType; BYTE pad; - CARD16 length B16; - Font fid B32; - fsBitmapFormatMask format_mask B32; - fsBitmapFormat format_hint B32; + CARD16 length; + Font fid; + fsBitmapFormatMask format_mask; + fsBitmapFormat format_hint; /* pattern */ } fsOpenBitmapFontReq; @@ -373,9 +373,9 @@ typedef fsResourceReq fsQueryXInfoReq; typedef struct { CARD8 reqType; BOOL range; - CARD16 length B16; - Font fid B32; - CARD32 num_ranges B32; + CARD16 length; + Font fid; + CARD32 num_ranges; /* list of chars */ } fsQueryXExtents8Req; @@ -384,10 +384,10 @@ typedef fsQueryXExtents8Req fsQueryXExtents16Req; typedef struct { CARD8 reqType; BOOL range; - CARD16 length B16; - Font fid B32; - fsBitmapFormat format B32; - CARD32 num_ranges B32; + CARD16 length; + Font fid; + fsBitmapFormat format; + CARD32 num_ranges; /* list of chars */ } fsQueryXBitmaps8Req; @@ -400,92 +400,92 @@ typedef fsResourceReq fsCloseReq; typedef struct { BYTE type; BYTE data1; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; } fsGenericReply; typedef struct { BYTE type; CARD8 nExtensions; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; /* extension names */ } fsListExtensionsReply; typedef struct { BYTE type; CARD8 present; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 major_version B16; - CARD16 minor_version B16; + CARD16 sequenceNumber; + CARD32 length; + CARD16 major_version; + CARD16 minor_version; CARD8 major_opcode; CARD8 first_event; CARD8 num_events; CARD8 first_error; CARD8 num_errors; CARD8 pad1; - CARD16 pad2 B16; + CARD16 pad2; } fsQueryExtensionReply; typedef struct { BYTE type; BYTE pad; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num_replies B32; - CARD32 num_catalogues B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num_replies; + CARD32 num_catalogues; /* catalog names */ } fsListCataloguesReply; typedef struct { BYTE type; CARD8 num_catalogues; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; /* catalogue names */ } fsGetCataloguesReply; typedef struct { BYTE type; BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 event_mask B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 event_mask; } fsGetEventMaskReply; typedef struct { BYTE type; CARD8 auth_index; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 status B16; - CARD16 pad B16; + CARD16 sequenceNumber; + CARD32 length; + CARD16 status; + CARD16 pad; /* auth data */ } fsCreateACReply; typedef struct { - CARD32 length B32; - CARD16 status B16; - CARD16 pad B16; + CARD32 length; + CARD16 status; + CARD16 pad; /* auth data */ } fsCreateACExtraReply; typedef struct { BYTE type; CARD8 num_resolutions; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; /* resolutions */ } fsGetResolutionReply; typedef struct { BYTE type; BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 following B32; - CARD32 nFonts B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 following; + CARD32 nFonts; /* font names */ } fsListFontsReply; @@ -499,10 +499,10 @@ typedef struct { typedef struct { BYTE type; CARD8 nameLength; /* 0 is end-of-reply */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 nReplies B32; - CARD32 font_header_flags B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 nReplies; + CARD32 font_header_flags; CARD8 font_hdr_char_range_min_char_high; CARD8 font_hdr_char_range_min_char_low; CARD8 font_hdr_char_range_max_char_high; @@ -511,41 +511,41 @@ typedef struct { CARD8 font_header_pad; CARD8 font_header_default_char_high; CARD8 font_header_default_char_low; - INT16 font_header_min_bounds_left B16; - INT16 font_header_min_bounds_right B16; - INT16 font_header_min_bounds_width B16; - INT16 font_header_min_bounds_ascent B16; - INT16 font_header_min_bounds_descent B16; - CARD16 font_header_min_bounds_attributes B16; - INT16 font_header_max_bounds_left B16; - INT16 font_header_max_bounds_right B16; - INT16 font_header_max_bounds_width B16; - INT16 font_header_max_bounds_ascent B16; - INT16 font_header_max_bounds_descent B16; - CARD16 font_header_max_bounds_attributes B16; - INT16 font_header_font_ascent B16; - INT16 font_header_font_descent B16; + INT16 font_header_min_bounds_left; + INT16 font_header_min_bounds_right; + INT16 font_header_min_bounds_width; + INT16 font_header_min_bounds_ascent; + INT16 font_header_min_bounds_descent; + CARD16 font_header_min_bounds_attributes; + INT16 font_header_max_bounds_left; + INT16 font_header_max_bounds_right; + INT16 font_header_max_bounds_width; + INT16 font_header_max_bounds_ascent; + INT16 font_header_max_bounds_descent; + CARD16 font_header_max_bounds_attributes; + INT16 font_header_font_ascent; + INT16 font_header_font_descent; /* propinfo */ /* name */ } fsListFontsWithXInfoReply; - + typedef struct { BYTE type; CARD8 otherid_valid; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 otherid B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 otherid; BYTE cachable; BYTE pad1; - CARD16 pad2 B16; + CARD16 pad2; } fsOpenBitmapFontReply; typedef struct { BYTE type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 font_header_flags B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 font_header_flags; CARD8 font_hdr_char_range_min_char_high; CARD8 font_hdr_char_range_min_char_low; CARD8 font_hdr_char_range_max_char_high; @@ -554,29 +554,29 @@ typedef struct { CARD8 font_header_pad; CARD8 font_header_default_char_high; CARD8 font_header_default_char_low; - INT16 font_header_min_bounds_left B16; - INT16 font_header_min_bounds_right B16; - INT16 font_header_min_bounds_width B16; - INT16 font_header_min_bounds_ascent B16; - INT16 font_header_min_bounds_descent B16; - CARD16 font_header_min_bounds_attributes B16; - INT16 font_header_max_bounds_left B16; - INT16 font_header_max_bounds_right B16; - INT16 font_header_max_bounds_width B16; - INT16 font_header_max_bounds_ascent B16; - INT16 font_header_max_bounds_descent B16; - CARD16 font_header_max_bounds_attributes B16; - INT16 font_header_font_ascent B16; - INT16 font_header_font_descent B16; + INT16 font_header_min_bounds_left; + INT16 font_header_min_bounds_right; + INT16 font_header_min_bounds_width; + INT16 font_header_min_bounds_ascent; + INT16 font_header_min_bounds_descent; + CARD16 font_header_min_bounds_attributes; + INT16 font_header_max_bounds_left; + INT16 font_header_max_bounds_right; + INT16 font_header_max_bounds_width; + INT16 font_header_max_bounds_ascent; + INT16 font_header_max_bounds_descent; + CARD16 font_header_max_bounds_attributes; + INT16 font_header_font_ascent; + INT16 font_header_font_descent; /* propinfo */ } fsQueryXInfoReply; typedef struct { BYTE type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 num_extents B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 num_extents; /* extents */ } fsQueryXExtents8Reply; @@ -585,11 +585,11 @@ typedef fsQueryXExtents8Reply fsQueryXExtents16Reply; typedef struct { BYTE type; CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 replies_hint B32; - CARD32 num_chars B32; - CARD32 nbytes B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 replies_hint; + CARD32 num_chars; + CARD32 nbytes; /* offsets */ /* glyphs */ } fsQueryXBitmaps8Reply; @@ -606,113 +606,113 @@ typedef union { typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; } fsError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; } fsRequestError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; - fsBitmapFormat format B32; + CARD16 pad; + fsBitmapFormat format; } fsFormatError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; Font fontid; } fsFontError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; fsRange range; } fsRangeError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; Mask event_mask; } fsEventMaskError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; AccContext acid; } fsAccessContextError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; Font fontid; } fsIDChoiceError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; } fsNameError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; @@ -722,55 +722,55 @@ typedef struct { typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; } fsAllocError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; - CARD32 bad_length B32; + CARD16 pad; + CARD32 bad_length; } fsLengthError; typedef struct { BYTE type; BYTE request; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; CARD8 major_opcode; CARD8 minor_opcode; - CARD16 pad B16; + CARD16 pad; } fsImplementationError; /* events */ typedef struct { BYTE type; BYTE event_code; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; } fsKeepAliveEvent; typedef struct { BYTE type; BYTE event_code; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; fsTimestamp timestamp; BOOL added; BOOL deleted; - CARD16 pad B16; + CARD16 pad; } fsCatalogueChangeNotifyEvent; typedef fsCatalogueChangeNotifyEvent fsFontChangeNotifyEvent; diff --git a/proto/xorgproto/include/X11/fonts/fontproto.h b/proto/xorgproto/include/X11/fonts/fontproto.h index ca341dae4..23b8df602 100644 --- a/proto/xorgproto/include/X11/fonts/fontproto.h +++ b/proto/xorgproto/include/X11/fonts/fontproto.h @@ -29,19 +29,19 @@ authorization from The XFree86 Project Inc.. extern _X_EXPORT int RegisterFPEFunctions ( NameCheckFunc name_func, - InitFpeFunc init_func, - FreeFpeFunc free_func, - ResetFpeFunc reset_func, - OpenFontFunc open_func, - CloseFontFunc close_func, - ListFontsFunc list_func, - StartLfwiFunc start_lfwi_func, - NextLfwiFunc next_lfwi_func, - WakeupFpeFunc wakeup_func, - ClientDiedFunc client_died, - LoadGlyphsFunc load_glyphs, - StartLaFunc start_list_alias_func, - NextLaFunc next_list_alias_func, + InitFpeFunc init_func, + FreeFpeFunc free_func, + ResetFpeFunc reset_func, + OpenFontFunc open_func, + CloseFontFunc close_func, + ListFontsFunc list_func, + StartLfwiFunc start_lfwi_func, + NextLfwiFunc next_lfwi_func, + WakeupFpeFunc wakeup_func, + ClientDiedFunc client_died, + LoadGlyphsFunc load_glyphs, + StartLaFunc start_list_alias_func, + NextLaFunc next_list_alias_func, SetPathFunc set_path_func); extern _X_EXPORT int GetDefaultPointSize ( void ); diff --git a/proto/xorgproto/include/X11/fonts/fontstruct.h b/proto/xorgproto/include/X11/fonts/fontstruct.h index 55c89daea..a327ef9dd 100644 --- a/proto/xorgproto/include/X11/fonts/fontstruct.h +++ b/proto/xorgproto/include/X11/fonts/fontstruct.h @@ -30,7 +30,7 @@ SOFTWARE. #include /* - * This version of the server font data strucutre is only for describing + * This version of the server font data structure is only for describing * the in memory data structure. The file structure is not necessarily a * copy of this. That is up to the compiler and the OS layer font loading * machinery. diff --git a/proto/xorgproto/include/X11/fonts/fsmasks.h b/proto/xorgproto/include/X11/fonts/fsmasks.h index c86be830e..861790235 100644 --- a/proto/xorgproto/include/X11/fonts/fsmasks.h +++ b/proto/xorgproto/include/X11/fonts/fsmasks.h @@ -1,6 +1,6 @@ /* * Copyright 1990, 1991 Network Computing Devices; - * Portions Copyright 1987 by Digital Equipment Corporation + * Portions Copyright 1987 by Digital Equipment Corporation * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided @@ -9,8 +9,8 @@ * documentation, and that the names of Network Computing Devices or Digital * not be used in advertising or publicity pertaining to distribution * of the software without specific, written prior permission. - * Network Computing Devices and Digital make no representations - * about the suitability of this software for any purpose. It is provided + * Network Computing Devices and Digital make no representations + * about the suitability of this software for any purpose. It is provided * "as is" without express or implied warranty. * * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH diff --git a/proto/xorgproto/include/X11/keysym.h b/proto/xorgproto/include/X11/keysym.h index 4f584886c..0ffdde4a5 100644 --- a/proto/xorgproto/include/X11/keysym.h +++ b/proto/xorgproto/include/X11/keysym.h @@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/proto/xorgproto/include/X11/keysymdef.h b/proto/xorgproto/include/X11/keysymdef.h index 147ecf552..6267a2598 100644 --- a/proto/xorgproto/include/X11/keysymdef.h +++ b/proto/xorgproto/include/X11/keysymdef.h @@ -73,7 +73,7 @@ SOFTWARE. * Unicode number plus 0x01000000. The keysym values in the range * 0x01000100 to 0x0110ffff are reserved to represent Unicode * characters in the range U+0100 to U+10FFFF. - * + * * While most newer Unicode-based X11 clients do already accept * Unicode-mapped keysyms in the range 0x01000100 to 0x0110ffff, it * will remain necessary for clients -- in the interest of @@ -104,11 +104,11 @@ SOFTWARE. * When adding new keysyms to this file, do not forget to also update the * following as needed: * - * - the mappings in src/KeyBind.c in the repo - * git://anongit.freedesktop.org/xorg/lib/libX11.git + * - the mappings in src/KeyBind.c in the libX11 repo + * https://gitlab.freedesktop.org/xorg/lib/libx11 * - * - the protocol specification in specs/keysyms.xml - * in the repo git://anongit.freedesktop.org/xorg/proto/x11proto.git + * - the protocol specification in specs/keysyms.xml in this repo + * https://gitlab.freedesktop.org/xorg/proto/xorgproto * */ @@ -1969,7 +1969,7 @@ SOFTWARE. #define XK_Ibreve 0x100012c /* U+012C LATIN CAPITAL LETTER I WITH BREVE */ #define XK_Zstroke 0x10001b5 /* U+01B5 LATIN CAPITAL LETTER Z WITH STROKE */ #define XK_Gcaron 0x10001e6 /* U+01E6 LATIN CAPITAL LETTER G WITH CARON */ -#define XK_Ocaron 0x10001d1 /* U+01D2 LATIN CAPITAL LETTER O WITH CARON */ +#define XK_Ocaron 0x10001d1 /* U+01D1 LATIN CAPITAL LETTER O WITH CARON */ #define XK_Obarred 0x100019f /* U+019F LATIN CAPITAL LETTER O WITH MIDDLE TILDE */ #define XK_xabovedot 0x1001e8b /* U+1E8B LATIN SMALL LETTER X WITH DOT ABOVE */ #define XK_ibreve 0x100012d /* U+012D LATIN SMALL LETTER I WITH BREVE */ @@ -1990,7 +1990,7 @@ SOFTWARE. /* * Vietnamese */ - + #ifdef XK_VIETNAMESE #define XK_Abelowdot 0x1001ea0 /* U+1EA0 LATIN CAPITAL LETTER A WITH DOT BELOW */ #define XK_abelowdot 0x1001ea1 /* U+1EA1 LATIN SMALL LETTER A WITH DOT BELOW */ @@ -2136,7 +2136,7 @@ SOFTWARE. #define XK_approxeq 0x1002248 /* U+2245 ALMOST EQUAL TO */ #define XK_notapproxeq 0x1002247 /* U+2247 NOT ALMOST EQUAL TO */ #define XK_notidentical 0x1002262 /* U+2262 NOT IDENTICAL TO */ -#define XK_stricteq 0x1002263 /* U+2263 STRICTLY EQUIVALENT TO */ +#define XK_stricteq 0x1002263 /* U+2263 STRICTLY EQUIVALENT TO */ #endif /* XK_MATHEMATICAL */ #ifdef XK_BRAILLE diff --git a/proto/xorgproto/inputproto.pc.in b/proto/xorgproto/inputproto.pc.in index 1eb66191f..270b95c0c 100644 --- a/proto/xorgproto/inputproto.pc.in +++ b/proto/xorgproto/inputproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: InputProto diff --git a/proto/xorgproto/kbproto.pc.in b/proto/xorgproto/kbproto.pc.in index bdd39f1ab..32a172d72 100644 --- a/proto/xorgproto/kbproto.pc.in +++ b/proto/xorgproto/kbproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: KBProto diff --git a/proto/xorgproto/lg3dproto.pc.in b/proto/xorgproto/lg3dproto.pc.in index 3930ad736..43fba2948 100644 --- a/proto/xorgproto/lg3dproto.pc.in +++ b/proto/xorgproto/lg3dproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: Lg3dProto diff --git a/proto/xorgproto/man/Xprint.man b/proto/xorgproto/man/Xprint.man new file mode 100644 index 000000000..9e55298b7 --- /dev/null +++ b/proto/xorgproto/man/Xprint.man @@ -0,0 +1,842 @@ +.\" -*- coding: us-ascii -*- +.TH Xprint __miscmansuffix__ "8 October 2004" +.SH NAME +Xprint \- The "X print service" - a portable, network-transparent printing system based on the X11 protocol +.SH SYNOPSIS +Xprint is a very flexible, extensible, scaleable, client/server +print system based on ISO 10175 (and some other specs) and the X11 +rendering protocol. +Using Xprint an application can search, query and use devices like +printers, FAX machines or create documents in formats like PDF. +In particular, an application can seek a printer, query supported +attributes (like paper size, trays, fonts etc.), configure the printer +device to match it\(cqs needs and print on it like on any other X device +reusing parts of the code which is used for the video card Xserver. +.SH OVERVIEW +The "X Print Service" technology allows X rendering to devices such as +printers and fax. Most of the service is available in the X11 +technology stack as Xp, with the remainder in single toolkit stacks (e.g. DtPrint for CDE). +Modifications have also been made to the LessTif/Motif/Qt technology +stacks to support Xprint. +.PP +The Xp portion consists of: +.TP 0.2i +\(bu +Xp Extension for the X-Server (included in the X-Server Xprt) +.TP 0.2i +\(bu +Xp Extension API for the client side (libXp/libXprintUtils) +.TP 0.2i +\(bu +PCL ddx driver that converts core X to native PCL +.TP 0.2i +\(bu +PDF ddx driver that converts core X to native PDF +.TP 0.2i +\(bu +PostScript ddx driver that converts core X to native PostScript +.TP 0.2i +\(bu +Raster ddx driver that generates xwd rasters which can be converted to PCL, PDF or PostScript rasters +.PP +.PP +From an X clients perspective, it can attach to one of two nearly +identical X-Servers, a "Video" X-Server, and a "Print" X-Server +which has the additional Xp capability but otherwise looks and +behaves the same. +.SH "HOW THE X PRINT SERVICE WORKS" +The X Print Service expands on the traditional X-Server and Xlib world +in four ways. +.TP 0.4i +1. +Most obvious is the use of "print ddx drivers" instead of +"video ddx drivers". While a video ddx driver modifies pixels +in a video frame buffer, a print ddx driver generates "page +description language (PDL)" output (such as PCL, PDF or PostScript) +or sends the print rendering instructions to a platform-specific +print API (like Win32/GDI). + +Once a print ddx driver generates PDL output, it can be sent to +a spooler such as \fBlp\fR(1) +or retrieved by the client (to implement functionality like "print-to-file"). + +Though not currently done, a single X-Server can support both +print and video ddx drivers. +.TP 0.4i +2. +Since printers support "paged" output, unlike video, a portion +of the Xp Extension supports APIs to delineate printed output. +For example, XpStartPage and XpEndPage tell the X-Server where +a physical page starts and ends in an otherwise continuous +stream of X rendering primitives. Likewise, XpStartJob and +XpEndJob determine when a collection of pages starts and ends. +XpEndJob typically causes the generated PDL to be submitted to +a spooler, such as \fBlp\fR(1). +.TP 0.4i +3. +Since printers have extensive capabilities, another portion of +the Xp Extension supports APIs to manipulate "print contexts". + +Once a printer is selected using the Xp Extension API, a print +context to represent it can be created. A print context +embodies the printer selected - it contains the printer's +default capabilities, selectable range of capabilities, +printer state, and generated output. Some "attributes" within +the print context can be modified by the user, and the +X-Server and print ddx driver will react accordingly. For +example, the attribute "content-orientation" can be set to +"landscape" or "portrait" (if the printer supports these +values - which can be queried using the Xprint API as well). +.TP 0.4i +4. +Since printers can have "built in" fonts, the Xp Extension in +the X-Server works with the print ddx drivers to make +available (for printing only) additional fonts on a per print +context basis. + +When a print context is created and set for a given printer, +the X font calls may be able to access additional printer +fonts. To do this (typically), the X-Server must have access +to "printer metric files" (.pmf) that describe at minimum the +metrics of the built in fonts. +.PP +.SH USAGE +There are three tasks to start the X Print Service: +.TP 0.4i +1. +configuring the X Print Server, +.TP 0.4i +2. +starting the X Print Service +.TP 0.4i +3. +configuring the user session so that clients can find the running X Print Service +.PP +.PP +The tasks are described in detail below. +.SH "SERVER CONFIGURATION" +The X Print Server (Xprt) can read a number of configuration files which +control its behavior and support for printers. Each vendor platform has +a default location for this information. Xprt can also read the +environment variable \fBXPCONFIGDIR\fR to locate alternate configuration +directories. Common settings include: + +export XPCONFIGDIR=/X11/lib/X11/XpConfig/ +.PP +export XPCONFIGDIR=/proj/x11/xc/programs/Xserver/XpConfig/ + +.PP +Xprt has many built-in defaults, and lacking any configuration files, +will immediately try to support all printers visible via \fBlpstat\fR(1). +.PP +In order of importance for configuration by a system administrator, the +configuration files for a "C" locale are as follows (see \fBXprt\fR(__appmansuffix__) for more +details (including support for non-"C" locales)): +.TP +\fB${XPCONFIGDIR}/C/print/Xprinters\fR +\&'Xprinters' is the top most configuration file. It tells +Xprt which specific printer names (e.g. mylaser) should +be supported, and whether \fBlpstat\fR(1) or other commands +should be used to automatically supplement the list of +printers. +.TP +\fB${XPCONFIGDIR}/C/print/attributes/printer\fR +The 'printer' file maps printer names to model +configurations (see 'model-config' below). For example, +"mylaser" could be mapped to a "HPDJ1600C", and all other +arbitrary printers could be mapped to a default, such as +"HPLJ4SI". When depending on \fBlpstat\fR(1) in the Xprinters +file, setting up defaults in 'printer' becomes all the +more important. +.TP +\fB${XPCONFIGDIR}/C/print/attributes/document\fR +The 'document' file specifies the initial document values +for any print jobs. For example, which paper tray to +use, what default resolution, etc. +.TP +\fB${XPCONFIGDIR}/C/print/attributes/job\fR +The 'job' file specifies the initial job values for any +print jobs. For example, "notification-profile" can be +set so that when a print job is successfully sent to a +printer, e-mail is sent to the user. +.TP +\fB${XPCONFIGDIR}/C/print/models/PSdefault/model\-config\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/fonts.dir\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00051.pmf\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00093.pmf\fR +The 'model-config' file has attributes that describe the +printer model\(cqs capabilities and default settings. +Printer model fonts may also be present. The model-config +file also identifies the print ddx driver to be used. +For each printer model supported, a complete hierarchy of +files should exist. In most cases, these files do not +need to be modified. +.TP +\fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pcl\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pdf\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/postscript\fR +The print ddx drivers can have highly specific +configuration files to control their behavior. In most +cases, these files do not need to be modified. +.PP +More information in how to configure and customize the X print server can be found in the +\fBXprt\fR(__appmansuffix__) +manual page. +.SH "STARTING UP" +The summary checklist for starting the X Print Service is as follows: +.TP 0.4i +1. +Choose an execution model for the X Print Service. The X +Print Service can be run on a per-user session basis, per +machine basis, or can be run on a few machines globally +available to a number of users. +.TP 0.4i +2. +If print jobs are to be submitted to a spooler (almost always +the case), make sure all needed printers are available to the +spooler subsystem (most often \fBlp\fR(1)) +on the same machine running the X Print Service. +.TP 0.4i +3. +Configure the X Print Server. See ``X Print Server +Configuration''. +.TP 0.4i +4. +Depending on #1, start the X Print Server process "Xprt", and +then the toolkit-specific Print Dialog Manager Daemon process +(such as CDEnext's "dtpdmd") at the appropriate times. +Note that libXprintUtils-based applications/toolkits do not need +a Print Dialog Manager Daemon process to use Xprint. +.PP +The details are described below. +.PP +Because the X Print Service is based on X, it can be easily distributed. +The most significant factors in which execution model to choose will be +driven by: +.TP 0.2i +\(bu +how many printers will be accessable through the printer +subsystem on any given machine. A system administrator may +choose to cluster printers on a few given machines, or +scatter them across an organization and possibly make +extensive use of remote spoolers to make them globally +available. +.TP 0.2i +\(bu +how many machines will need a copy of the X Print Server +configuration files. The files have been architected so +that one super-set version of them can be maintained and +distributed (e.g. via NFS), and a per-machine or per-user +version of the `Xprinters' is all that is needed to have the +appropriate information in them utilized or ignored. +.TP 0.2i +\(bu +how many users can demand services from a given X Print +Service. +.PP +With the above in mind, some obvious execution models include: +.TP 0.2i +\(bu +Global - in this model, the system administrator is choosing +to run the X Print Service on a *few* select machines with +appropriate printers configured, and allow clients access to +the global resource. This can centralize the administration +of printers and configuration files, but may have to be +monitored for performance loading. + +Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR). +.TP 0.2i +\(bu +Per-machine - every machine with potential X Print Service +users would run the service. Printer and configuration file +administration is decentralized, and usage would be limited +to the users on the machine. + +Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR). +.TP 0.2i +\(bu +Per-user session - every user would run an entire X Print +Service for themselves. In the future, the Video X Server +normally started may contain Print X Server capability, so +this model becomes very natural. + +Startup would likely be done at session login or by +launching actions or processes manually once the user +logs in. Note: Deamons like "dtpdmd" must be started after Xprt. +.PP +.PP +Starting of the processes is straight forward. In strict order (example is for manually starting the X print server for CDEnext usage): +.TP 0.4i +1. + +.nf +[machineA] % Xprt [\-XpFile ] [:dispNum] & +.fi + + +Note that Xprt will look for configuration files in either +a default location or where \fBXPCONFIGDIR\fR points. + +\fB\-XpFile\fR specifies an alternate `Xprinters' file, rather +than the default one or `\fB${XPCONFIGDIR}/C/print/Xprinters\fR'. +.TP 0.4i +2. + +.nf +[machineA] % dtpdmd \-d machineA[:dispNum] [\-l /tmp/dtpdmd.log] & +.fi + + +The dtpdmd will maintain an X-Selection on the X-Server, +and will start dtpdm's as required to service requests. +.PP +.PP +In all but the per-user session model, the machine running the dtpdmd +(thus dtpdm's) will need display authorization to the users video +display. +.SH "CLIENT CONFIGURATION" +Once a X Print Server and dtpdmd have been started -- many of them +in some cases -- clients will need to find and use them. There are +two mechanisms that allow clients to discover X Print Servers and +printers. +.TP 0.2i +\(bu +"X Print Specifier" - assuming usage of the DtPrint/XprintUtils-based print +applications, the following notation is understood: + + +.nf +printer_name@machine[:dispNum] +.fi + + +For example: + + +.nf +colorlj7@printhub:2 +.fi + + +In the above example, the X Print Server running at `printhub:2' +is assumed to support the printer named `colorlj7'. +.TP 0.2i +\(bu +\fB${XPSERVERLIST}\fR - assuming usage of the DtPrint print dialogs, +the environment variable \fB${XPSERVERLIST}\fR can contain a list +of X Print Servers. For example: + + +.nf +XPSERVERLIST="printhub:2 printhub:3 otherdept:0" +.fi + + +Then in the dialogs, only a printer name needs to be entered. +The dialog will then search the X Print Servers in \fB${XPSERVERLIST}\fR +for a server than supports the printer, and then establish +contact. +.PP +.SH "END-USER SEQUENCE" +From most CDEnext applications, printing is accomplished by bringing +down the menu and selecting . This will result in +the DtPrintSetupBox dialog, which will request the name of a printer, +and offer limited capability to configure print options (e.g. number +of copies). If the user wishes, they can select , which +will start a dtpdm capable of modifying additional print options. +Finally, the user should select . +.SH ENVIRONMENT +.TP +\fB${XPCONFIGDIR}\fR +This environment variable points to the root +of the Xprint server configuration directory hierarchy. +If the variable is not defined, the default +path is be assumed. The default path may be +\fB/usr/X11R6/lib/X11/xserver/\fR, +\fB/usr/lib/X11/xserver/\fR, +\fB/usr/share/Xprint/xserver/\fR or +\fB/usr/openwin/server/etc/XpConfig\fR, depending on the +system, and may be configured in \fB/etc/init.d/xprint\fR. +.TP +\fB${LANG}\fR +This environment variable selects the locale settings used by the Xprint server. +Xprt allows language-specific settings (stored in \fB${XPCONFIGDIR}/${LANG}/print/\fR) +which will override the default settings (stored in \fB${XPCONFIGDIR}/C/print/\fR). +If \fB${LANG}\fR is not set "C" is assumed. +.TP +\fB${XPSERVERLIST}\fR +The environment variable \fB${XPSERVERLIST}\fR contains a list +of display identifiers (separated by whitespace) which tell an +application where it can find the Xprint servers. Usually +\fB${XPSERVERLIST}\fR is set by the profile startup scripts (e.g. +\fB/etc/profile\fR or \fB/etc/profile.d/xprint.sh\fR) using the output of +\fB/etc/init.d/xprint get_xpserverlist\fR. + +Example: + +.nf + + export XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`" +.fi + + +Alternatively \fB${XPSERVERLIST}\fR can be set +manually. Example: + +.nf + + export XPSERVERLIST="littlecat:80 bitdog:72" +.fi + +instructs an application to find an Xprint server at display +80 on the machine "littlecat" and at display 72 on the +machine bigdog. +.TP +\fB${XPRINTER}\fR +The environment variable \fB${XPRINTER}\fR +defines the default printer used by print +applications. The syntax is either +\fIprintername\fR or +\fIprintername\fR@\fIdisplay\fR. + +Examples: +.RS +.TP +\fBXPRINTER=ps003\fR +tells an application to look for the +first printer named "ps003" on all Xprint +servers. +.TP +\fBXPRINTER=hplaser19@littlecat:80\fR +tells an application to use the printer "hplaser19" +on the Xprint server at display +"littlecat:80". +.RE + + +If \fB${XPRINTER}\fR is not set the applications +will examine the values of the \fB${PDPRINTER}\fR, +\fB${LPDEST}\fR, and +\fB${PRINTER}\fR environment variables (in that order). +.SH "SEE ALSO" +\fBX11\fR(__miscmansuffix__), \fBxplsprinters\fR(__appmansuffix__), \fBxprehashprinterlist\fR(__appmansuffix__), \fBxphelloworld\fR(__appmansuffix__), \fBxpxmhelloworld\fR(__appmansuffix__), \fBxpawhelloworld\fR(__appmansuffix__), \fBxpxthelloworld\fR(__appmansuffix__), \fBxpsimplehelloworld\fR(__appmansuffix__), \fBXserver\fR(__appmansuffix__), \fBXprt\fR(__appmansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html), Xprint main site (http://xprint.mozdev.org/) +.SH AUTHORS +This manual page was written by +Roland Mainz based on the original X11R6.6 +\fBxc/programs/Xserver/XpConfig/README\fR. +.\" -*- coding: us-ascii -*- +.TH Xprint __miscmansuffix__ "8 October 2004" +.SH NAME +Xprint \- The "X print service" - a portable, network-transparent printing system based on the X11 protocol +.SH SYNOPSIS +Xprint is a very flexible, extensible, scaleable, client/server +print system based on ISO 10175 (and some other specs) and the X11 +rendering protocol. +Using Xprint an application can search, query and use devices like +printers, FAX machines or create documents in formats like PDF. +In particular, an application can seek a printer, query supported +attributes (like paper size, trays, fonts etc.), configure the printer +device to match it\(cqs needs and print on it like on any other X device +reusing parts of the code which is used for the video card Xserver. +.SH OVERVIEW +The "X Print Service" technology allows X rendering to devices such as +printers and fax. Most of the service is available in the X11 +technology stack as Xp, with the remainder in single toolkit stacks (e.g. DtPrint for CDE). +Modifications have also been made to the LessTif/Motif/Qt technology +stacks to support Xprint. +.PP +The Xp portion consists of: +.TP 0.2i +\(bu +Xp Extension for the X-Server (included in the X-Server Xprt) +.TP 0.2i +\(bu +Xp Extension API for the client side (libXp/libXprintUtils) +.TP 0.2i +\(bu +PCL ddx driver that converts core X to native PCL +.TP 0.2i +\(bu +PDF ddx driver that converts core X to native PDF +.TP 0.2i +\(bu +PostScript ddx driver that converts core X to native PostScript +.TP 0.2i +\(bu +Raster ddx driver that generates xwd rasters which can be converted to PCL, PDF or PostScript rasters +.PP +.PP +From an X clients perspective, it can attach to one of two nearly +identical X-Servers, a "Video" X-Server, and a "Print" X-Server +which has the additional Xp capability but otherwise looks and +behaves the same. +.SH "HOW THE X PRINT SERVICE WORKS" +The X Print Service expands on the traditional X-Server and Xlib world +in four ways. +.TP 0.4i +1. +Most obvious is the use of "print ddx drivers" instead of +"video ddx drivers". While a video ddx driver modifies pixels +in a video frame buffer, a print ddx driver generates "page +description language (PDL)" output (such as PCL, PDF or PostScript) +or sends the print rendering instructions to a platform-specific +print API (like Win32/GDI). + +Once a print ddx driver generates PDL output, it can be sent to +a spooler such as \fBlp\fR(1) +or retrieved by the client (to implement functionality like "print-to-file"). + +Though not currently done, a single X-Server can support both +print and video ddx drivers. +.TP 0.4i +2. +Since printers support "paged" output, unlike video, a portion +of the Xp Extension supports APIs to delineate printed output. +For example, XpStartPage and XpEndPage tell the X-Server where +a physical page starts and ends in an otherwise continuous +stream of X rendering primitives. Likewise, XpStartJob and +XpEndJob determine when a collection of pages starts and ends. +XpEndJob typically causes the generated PDL to be submitted to +a spooler, such as \fBlp\fR(1). +.TP 0.4i +3. +Since printers have extensive capabilities, another portion of +the Xp Extension supports APIs to manipulate "print contexts". + +Once a printer is selected using the Xp Extension API, a print +context to represent it can be created. A print context +embodies the printer selected - it contains the printer's +default capabilities, selectable range of capabilities, +printer state, and generated output. Some "attributes" within +the print context can be modified by the user, and the +X-Server and print ddx driver will react accordingly. For +example, the attribute "content-orientation" can be set to +"landscape" or "portrait" (if the printer supports these +values - which can be queried using the Xprint API as well). +.TP 0.4i +4. +Since printers can have "built in" fonts, the Xp Extension in +the X-Server works with the print ddx drivers to make +available (for printing only) additional fonts on a per print +context basis. + +When a print context is created and set for a given printer, +the X font calls may be able to access additional printer +fonts. To do this (typically), the X-Server must have access +to "printer metric files" (.pmf) that describe at minimum the +metrics of the built in fonts. +.PP +.SH USAGE +There are three tasks to start the X Print Service: +.TP 0.4i +1. +configuring the X Print Server, +.TP 0.4i +2. +starting the X Print Service +.TP 0.4i +3. +configuring the user session so that clients can find the running X Print Service +.PP +.PP +The tasks are described in detail below. +.SH "SERVER CONFIGURATION" +The X Print Server (Xprt) can read a number of configuration files which +control its behavior and support for printers. Each vendor platform has +a default location for this information. Xprt can also read the +environment variable \fBXPCONFIGDIR\fR to locate alternate configuration +directories. Common settings include: + +export XPCONFIGDIR=/X11/lib/X11/XpConfig/ +.PP +export XPCONFIGDIR=/proj/x11/xc/programs/Xserver/XpConfig/ + +.PP +Xprt has many built-in defaults, and lacking any configuration files, +will immediately try to support all printers visible via \fBlpstat\fR(1). +.PP +In order of importance for configuration by a system administrator, the +configuration files for a "C" locale are as follows (see \fBXprt\fR(__appmansuffix__) for more +details (including support for non-"C" locales)): +.TP +\fB${XPCONFIGDIR}/C/print/Xprinters\fR +\&'Xprinters' is the top most configuration file. It tells +Xprt which specific printer names (e.g. mylaser) should +be supported, and whether \fBlpstat\fR(1) or other commands +should be used to automatically supplement the list of +printers. +.TP +\fB${XPCONFIGDIR}/C/print/attributes/printer\fR +The 'printer' file maps printer names to model +configurations (see 'model-config' below). For example, +"mylaser" could be mapped to a "HPDJ1600C", and all other +arbitrary printers could be mapped to a default, such as +"HPLJ4SI". When depending on \fBlpstat\fR(1) in the Xprinters +file, setting up defaults in 'printer' becomes all the +more important. +.TP +\fB${XPCONFIGDIR}/C/print/attributes/document\fR +The 'document' file specifies the initial document values +for any print jobs. For example, which paper tray to +use, what default resolution, etc. +.TP +\fB${XPCONFIGDIR}/C/print/attributes/job\fR +The 'job' file specifies the initial job values for any +print jobs. For example, "notification-profile" can be +set so that when a print job is successfully sent to a +printer, e-mail is sent to the user. +.TP +\fB${XPCONFIGDIR}/C/print/models/PSdefault/model\-config\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/fonts.dir\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00051.pmf\fR, \fB${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00093.pmf\fR +The 'model-config' file has attributes that describe the +printer model\(cqs capabilities and default settings. +Printer model fonts may also be present. The model-config +file also identifies the print ddx driver to be used. +For each printer model supported, a complete hierarchy of +files should exist. In most cases, these files do not +need to be modified. +.TP +\fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pcl\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/pdf\fR, \fB${XPCONFIGDIR}/C/print/ddx\-config/raster/postscript\fR +The print ddx drivers can have highly specific +configuration files to control their behavior. In most +cases, these files do not need to be modified. +.PP +More information in how to configure and customize the X print server can be found in the +\fBXprt\fR(__appmansuffix__) +manual page. +.SH "STARTING UP" +The summary checklist for starting the X Print Service is as follows: +.TP 0.4i +1. +Choose an execution model for the X Print Service. The X +Print Service can be run on a per-user session basis, per +machine basis, or can be run on a few machines globally +available to a number of users. +.TP 0.4i +2. +If print jobs are to be submitted to a spooler (almost always +the case), make sure all needed printers are available to the +spooler subsystem (most often \fBlp\fR(1)) +on the same machine running the X Print Service. +.TP 0.4i +3. +Configure the X Print Server. See ``X Print Server +Configuration''. +.TP 0.4i +4. +Depending on #1, start the X Print Server process "Xprt", and +then the toolkit-specific Print Dialog Manager Daemon process +(such as CDEnext's "dtpdmd") at the appropriate times. +Note that libXprintUtils-based applications/toolkits do not need +a Print Dialog Manager Daemon process to use Xprint. +.PP +The details are described below. +.PP +Because the X Print Service is based on X, it can be easily distributed. +The most significant factors in which execution model to choose will be +driven by: +.TP 0.2i +\(bu +how many printers will be accessable through the printer +subsystem on any given machine. A system administrator may +choose to cluster printers on a few given machines, or +scatter them across an organization and possibly make +extensive use of remote spoolers to make them globally +available. +.TP 0.2i +\(bu +how many machines will need a copy of the X Print Server +configuration files. The files have been architected so +that one super-set version of them can be maintained and +distributed (e.g. via NFS), and a per-machine or per-user +version of the `Xprinters' is all that is needed to have the +appropriate information in them utilized or ignored. +.TP 0.2i +\(bu +how many users can demand services from a given X Print +Service. +.PP +With the above in mind, some obvious execution models include: +.TP 0.2i +\(bu +Global - in this model, the system administrator is choosing +to run the X Print Service on a *few* select machines with +appropriate printers configured, and allow clients access to +the global resource. This can centralize the administration +of printers and configuration files, but may have to be +monitored for performance loading. + +Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR). +.TP 0.2i +\(bu +Per-machine - every machine with potential X Print Service +users would run the service. Printer and configuration file +administration is decentralized, and usage would be limited +to the users on the machine. + +Startup would likely be done by boot-up scripts (such as \fB/etc/init.d/xprint\fR). +.TP 0.2i +\(bu +Per-user session - every user would run an entire X Print +Service for themselves. In the future, the Video X Server +normally started may contain Print X Server capability, so +this model becomes very natural. + +Startup would likely be done at session login or by +launching actions or processes manually once the user +logs in. Note: Deamons like "dtpdmd" must be started after Xprt. +.PP +.PP +Starting of the processes is straight forward. In strict order (example is for manually starting the X print server for CDEnext usage): +.TP 0.4i +1. + +.nf +[machineA] % Xprt [\-XpFile ] [:dispNum] & +.fi + + +Note that Xprt will look for configuration files in either +a default location or where \fBXPCONFIGDIR\fR points. + +\fB\-XpFile\fR specifies an alternate `Xprinters' file, rather +than the default one or `\fB${XPCONFIGDIR}/C/print/Xprinters\fR'. +.TP 0.4i +2. + +.nf +[machineA] % dtpdmd \-d machineA[:dispNum] [\-l /tmp/dtpdmd.log] & +.fi + + +The dtpdmd will maintain an X-Selection on the X-Server, +and will start dtpdm's as required to service requests. +.PP +.PP +In all but the per-user session model, the machine running the dtpdmd +(thus dtpdm's) will need display authorization to the users video +display. +.SH "CLIENT CONFIGURATION" +Once a X Print Server and dtpdmd have been started -- many of them +in some cases -- clients will need to find and use them. There are +two mechanisms that allow clients to discover X Print Servers and +printers. +.TP 0.2i +\(bu +"X Print Specifier" - assuming usage of the DtPrint/XprintUtils-based print +applications, the following notation is understood: + + +.nf +printer_name@machine[:dispNum] +.fi + + +For example: + + +.nf +colorlj7@printhub:2 +.fi + + +In the above example, the X Print Server running at `printhub:2' +is assumed to support the printer named `colorlj7'. +.TP 0.2i +\(bu +\fB${XPSERVERLIST}\fR - assuming usage of the DtPrint print dialogs, +the environment variable \fB${XPSERVERLIST}\fR can contain a list +of X Print Servers. For example: + + +.nf +XPSERVERLIST="printhub:2 printhub:3 otherdept:0" +.fi + + +Then in the dialogs, only a printer name needs to be entered. +The dialog will then search the X Print Servers in \fB${XPSERVERLIST}\fR +for a server than supports the printer, and then establish +contact. +.PP +.SH "END-USER SEQUENCE" +From most CDEnext applications, printing is accomplished by bringing +down the menu and selecting . This will result in +the DtPrintSetupBox dialog, which will request the name of a printer, +and offer limited capability to configure print options (e.g. number +of copies). If the user wishes, they can select , which +will start a dtpdm capable of modifying additional print options. +Finally, the user should select . +.SH ENVIRONMENT +.TP +\fB${XPCONFIGDIR}\fR +This environment variable points to the root +of the Xprint server configuration directory hierarchy. +If the variable is not defined, the default +path is be assumed. The default path may be +\fB/usr/X11R6/lib/X11/xserver/\fR, +\fB/usr/lib/X11/xserver/\fR, +\fB/usr/share/Xprint/xserver/\fR or +\fB/usr/openwin/server/etc/XpConfig\fR, depending on the +system, and may be configured in \fB/etc/init.d/xprint\fR. +.TP +\fB${LANG}\fR +This environment variable selects the locale settings used by the Xprint server. +Xprt allows language-specific settings (stored in \fB${XPCONFIGDIR}/${LANG}/print/\fR) +which will override the default settings (stored in \fB${XPCONFIGDIR}/C/print/\fR). +If \fB${LANG}\fR is not set "C" is assumed. +.TP +\fB${XPSERVERLIST}\fR +The environment variable \fB${XPSERVERLIST}\fR contains a list +of display identifiers (separated by whitespace) which tell an +application where it can find the Xprint servers. Usually +\fB${XPSERVERLIST}\fR is set by the profile startup scripts (e.g. +\fB/etc/profile\fR or \fB/etc/profile.d/xprint.sh\fR) using the output of +\fB/etc/init.d/xprint get_xpserverlist\fR. + +Example: + +.nf + + export XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`" +.fi + + +Alternatively \fB${XPSERVERLIST}\fR can be set +manually. Example: + +.nf + + export XPSERVERLIST="littlecat:80 bitdog:72" +.fi + +instructs an application to find an Xprint server at display +80 on the machine "littlecat" and at display 72 on the +machine bigdog. +.TP +\fB${XPRINTER}\fR +The environment variable \fB${XPRINTER}\fR +defines the default printer used by print +applications. The syntax is either +\fIprintername\fR or +\fIprintername\fR@\fIdisplay\fR. + +Examples: +.RS +.TP +\fBXPRINTER=ps003\fR +tells an application to look for the +first printer named "ps003" on all Xprint +servers. +.TP +\fBXPRINTER=hplaser19@littlecat:80\fR +tells an application to use the printer "hplaser19" +on the Xprint server at display +"littlecat:80". +.RE + + +If \fB${XPRINTER}\fR is not set the applications +will examine the values of the \fB${PDPRINTER}\fR, +\fB${LPDEST}\fR, and +\fB${PRINTER}\fR environment variables (in that order). +.SH "SEE ALSO" +\fBX11\fR(__miscmansuffix__), \fBxplsprinters\fR(__appmansuffix__), \fBxprehashprinterlist\fR(__appmansuffix__), \fBxphelloworld\fR(__appmansuffix__), \fBxpxmhelloworld\fR(__appmansuffix__), \fBxpawhelloworld\fR(__appmansuffix__), \fBxpxthelloworld\fR(__appmansuffix__), \fBxpsimplehelloworld\fR(__appmansuffix__), \fBXserver\fR(__appmansuffix__), \fBXprt\fR(__appmansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html), Xprint main site (http://xprint.mozdev.org/) +.SH AUTHORS +This manual page was written by +Roland Mainz based on the original X11R6.6 +\fBxc/programs/Xserver/XpConfig/README\fR. diff --git a/proto/xorgproto/man/Xprint.sgml b/proto/xorgproto/man/Xprint.sgml new file mode 100644 index 000000000..4172d2b9e --- /dev/null +++ b/proto/xorgproto/man/Xprint.sgml @@ -0,0 +1,1254 @@ + + + + + + + Xprint + __miscmansuffix__ + + + Xprint + + The "X print service" - a portable, network-transparent printing system based on the X11 protocol + + + Xprint is a very flexible, extensible, scaleable, client/server + print system based on ISO 10175 (and some other specs) and the X11 + rendering protocol. + Using Xprint an application can search, query and use devices like + printers, FAX machines or create documents in formats like PDF. + In particular, an application can seek a printer, query supported + attributes (like paper size, trays, fonts etc.), configure the printer + device to match it’s needs and print on it like on any other X device + reusing parts of the code which is used for the video card Xserver. + + + + + OVERVIEW + + The "X Print Service" technology allows X rendering to devices such as + printers and fax. Most of the service is available in the X11 + technology stack as Xp, with the remainder in single toolkit stacks (e.g. DtPrint for CDE). + Modifications have also been made to the LessTif/Motif/Qt technology + stacks to support Xprint. + + + The Xp portion consists of: + + Xp Extension for the X-Server (included in the X-Server Xprt) + Xp Extension API for the client side (libXp/libXprintUtils) + PCL ddx driver that converts core X to native PCL + PDF ddx driver that converts core X to native PDF + PostScript ddx driver that converts core X to native PostScript + Raster ddx driver that generates xwd rasters which can be converted to PCL, PDF or PostScript rasters + + + + From an X clients perspective, it can attach to one of two nearly + identical X-Servers, a "Video" X-Server, and a "Print" X-Server + which has the additional Xp capability but otherwise looks and + behaves the same. + + + + + HOW THE X PRINT SERVICE WORKS + + The X Print Service expands on the traditional X-Server and Xlib world + in four ways. + + + + + Most obvious is the use of "print ddx drivers" instead of + "video ddx drivers". While a video ddx driver modifies pixels + in a video frame buffer, a print ddx driver generates "page + description language (PDL)" output (such as PCL, PDF or PostScript) + or sends the print rendering instructions to a platform-specific + print API (like Win32/GDI). + + + Once a print ddx driver generates PDL output, it can be sent to + a spooler such as lp1 + or retrieved by the client (to implement functionality like "print-to-file"). + + + Though not currently done, a single X-Server can support both + print and video ddx drivers. + + + + + + Since printers support "paged" output, unlike video, a portion + of the Xp Extension supports APIs to delineate printed output. + For example, XpStartPage and XpEndPage tell the X-Server where + a physical page starts and ends in an otherwise continuous + stream of X rendering primitives. Likewise, XpStartJob and + XpEndJob determine when a collection of pages starts and ends. + XpEndJob typically causes the generated PDL to be submitted to + a spooler, such as lp1. + + + + + Since printers have extensive capabilities, another portion of + the Xp Extension supports APIs to manipulate "print contexts". + + + Once a printer is selected using the Xp Extension API, a print + context to represent it can be created. A print context + embodies the printer selected - it contains the printer's + default capabilities, selectable range of capabilities, + printer state, and generated output. Some "attributes" within + the print context can be modified by the user, and the + X-Server and print ddx driver will react accordingly. For + example, the attribute "content-orientation" can be set to + "landscape" or "portrait" (if the printer supports these + values - which can be queried using the Xprint API as well). + + + + + Since printers can have "built in" fonts, the Xp Extension in + the X-Server works with the print ddx drivers to make + available (for printing only) additional fonts on a per print + context basis. + + + When a print context is created and set for a given printer, + the X font calls may be able to access additional printer + fonts. To do this (typically), the X-Server must have access + to "printer metric files" (.pmf) that describe at minimum the + metrics of the built in fonts. + + + + + + + + USAGE + + There are three tasks to start the X Print Service: + + configuring the X Print Server, + starting the X Print Service + configuring the user session so that clients can find the running X Print Service + + + + The tasks are described in detail below. + + + + + SERVER CONFIGURATION + + The X Print Server (Xprt) can read a number of configuration files which + control its behavior and support for printers. Each vendor platform has + a default location for this information. Xprt can also read the + environment variable XPCONFIGDIR to locate alternate configuration + directories. Common settings include: + + + export XPCONFIGDIR=/X11/lib/X11/XpConfig/ + export XPCONFIGDIR=/proj/x11/xc/programs/Xserver/XpConfig/ + + + + Xprt has many built-in defaults, and lacking any configuration files, + will immediately try to support all printers visible via lpstat1. + + + In order of importance for configuration by a system administrator, the + configuration files for a "C" locale are as follows (see Xprt__appmansuffix__ for more + details (including support for non-"C" locales)): + + + ${XPCONFIGDIR}/C/print/Xprinters + + + 'Xprinters' is the top most configuration file. It tells + Xprt which specific printer names (e.g. mylaser) should + be supported, and whether lpstat1 or other commands + should be used to automatically supplement the list of + printers. + + + + + + ${XPCONFIGDIR}/C/print/attributes/printer + + + The 'printer' file maps printer names to model + configurations (see 'model-config' below). For example, + "mylaser" could be mapped to a "HPDJ1600C", and all other + arbitrary printers could be mapped to a default, such as + "HPLJ4SI". When depending on lpstat1 in the Xprinters + file, setting up defaults in 'printer' becomes all the + more important. + + + + + + ${XPCONFIGDIR}/C/print/attributes/document + + + The 'document' file specifies the initial document values + for any print jobs. For example, which paper tray to + use, what default resolution, etc. + + + + + + ${XPCONFIGDIR}/C/print/attributes/job + + + The 'job' file specifies the initial job values for any + print jobs. For example, "notification-profile" can be + set so that when a print job is successfully sent to a + printer, e-mail is sent to the user. + + + + + + ${XPCONFIGDIR}/C/print/models/PSdefault/model-config + ${XPCONFIGDIR}/C/print/models/PSdefault/fonts/fonts.dir + ${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00051.pmf + ${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00093.pmf + + + + The 'model-config' file has attributes that describe the + printer model’s capabilities and default settings. + Printer model fonts may also be present. The model-config + file also identifies the print ddx driver to be used. + + For each printer model supported, a complete hierarchy of + files should exist. In most cases, these files do not + need to be modified. + + + + + + ${XPCONFIGDIR}/C/print/ddx-config/raster/pcl + ${XPCONFIGDIR}/C/print/ddx-config/raster/pdf + ${XPCONFIGDIR}/C/print/ddx-config/raster/postscript + + + + The print ddx drivers can have highly specific + configuration files to control their behavior. In most + cases, these files do not need to be modified. + + + + + + More information in how to configure and customize the X print server can be found in the + Xprt__appmansuffix__ + manual page. + + + + + STARTING UP + + The summary checklist for starting the X Print Service is as follows: + + + + + Choose an execution model for the X Print Service. The X + Print Service can be run on a per-user session basis, per + machine basis, or can be run on a few machines globally + available to a number of users. + + + + + If print jobs are to be submitted to a spooler (almost always + the case), make sure all needed printers are available to the + spooler subsystem (most often lp1) + on the same machine running the X Print Service. + + + + + Configure the X Print Server. See ``X Print Server + Configuration''. + + + + + Depending on #1, start the X Print Server process "Xprt", and + then the toolkit-specific Print Dialog Manager Daemon process + (such as CDEnext's "dtpdmd") at the appropriate times. + Note that libXprintUtils-based applications/toolkits do not need + a Print Dialog Manager Daemon process to use Xprint. + + + + The details are described below. + + + Because the X Print Service is based on X, it can be easily distributed. + The most significant factors in which execution model to choose will be + driven by: + + + + how many printers will be accessable through the printer + subsystem on any given machine. A system administrator may + choose to cluster printers on a few given machines, or + scatter them across an organization and possibly make + extensive use of remote spoolers to make them globally + available. + + + + + how many machines will need a copy of the X Print Server + configuration files. The files have been architected so + that one super-set version of them can be maintained and + distributed (e.g. via NFS), and a per-machine or per-user + version of the `Xprinters' is all that is needed to have the + appropriate information in them utilized or ignored. + + + + + how many users can demand services from a given X Print + Service. + + + + + With the above in mind, some obvious execution models include: + + + + Global - in this model, the system administrator is choosing + to run the X Print Service on a *few* select machines with + appropriate printers configured, and allow clients access to + the global resource. This can centralize the administration + of printers and configuration files, but may have to be + monitored for performance loading. + + + Startup would likely be done by boot-up scripts (such as /etc/init.d/xprint). + + + + + + Per-machine - every machine with potential X Print Service + users would run the service. Printer and configuration file + administration is decentralized, and usage would be limited + to the users on the machine. + + + Startup would likely be done by boot-up scripts (such as /etc/init.d/xprint). + + + + + + Per-user session - every user would run an entire X Print + Service for themselves. In the future, the Video X Server + normally started may contain Print X Server capability, so + this model becomes very natural. + + + Startup would likely be done at session login or by + launching actions or processes manually once the user + logs in. Note: Deamons like "dtpdmd" must be started after Xprt. + + + + + + Starting of the processes is straight forward. In strict order (example is for manually starting the X print server for CDEnext usage): + + + + [machineA] % Xprt [-XpFile <Xprinters file>] [:dispNum] & + + + Note that Xprt will look for configuration files in either + a default location or where XPCONFIGDIR points. + + + specifies an alternate `Xprinters' file, rather + than the default one or `${XPCONFIGDIR}/C/print/Xprinters'. + + + + + [machineA] % dtpdmd -d machineA[:dispNum] [-l /tmp/dtpdmd.log] & + + + The dtpdmd will maintain an X-Selection on the X-Server, + and will start dtpdm's as required to service requests. + + + + + + In all but the per-user session model, the machine running the dtpdmd + (thus dtpdm's) will need display authorization to the users video + display. + + + + + CLIENT CONFIGURATION + + Once a X Print Server and dtpdmd have been started -- many of them + in some cases -- clients will need to find and use them. There are + two mechanisms that allow clients to discover X Print Servers and + printers. + + + + + "X Print Specifier" - assuming usage of the DtPrint/XprintUtils-based print + applications, the following notation is understood: + + + printer_name@machine[:dispNum] + + + For example: + + + colorlj7@printhub:2 + + + In the above example, the X Print Server running at `printhub:2' + is assumed to support the printer named `colorlj7'. + + + + + ${XPSERVERLIST} - assuming usage of the DtPrint print dialogs, + the environment variable ${XPSERVERLIST} can contain a list + of X Print Servers. For example: + + + XPSERVERLIST="printhub:2 printhub:3 otherdept:0" + + + Then in the dialogs, only a printer name needs to be entered. + The dialog will then search the X Print Servers in ${XPSERVERLIST} + for a server than supports the printer, and then establish + contact. + + + + + + + + END-USER SEQUENCE + + From most CDEnext applications, printing is accomplished by bringing + down the <File> menu and selecting <Print...>. This will result in + the DtPrintSetupBox dialog, which will request the name of a printer, + and offer limited capability to configure print options (e.g. number + of copies). If the user wishes, they can select <Setup...>, which + will start a dtpdm capable of modifying additional print options. + Finally, the user should select <Print>. + + + + + ENVIRONMENT + + + ${XPCONFIGDIR} + + This environment variable points to the root + of the Xprint server configuration directory hierarchy. + If the variable is not defined, the default + path is be assumed. The default path may be + /usr/X11R6/lib/X11/xserver/, + /usr/lib/X11/xserver/, + /usr/share/Xprint/xserver/ or + /usr/openwin/server/etc/XpConfig, depending on the + system, and may be configured in /etc/init.d/xprint. + + + + + ${LANG} + + + This environment variable selects the locale settings used by the Xprint server. + Xprt allows language-specific settings (stored in ${XPCONFIGDIR}/${LANG}/print/) + which will override the default settings (stored in ${XPCONFIGDIR}/C/print/). + If ${LANG} is not set "C" is assumed. + + + + + + ${XPSERVERLIST} + + The environment variable ${XPSERVERLIST} contains a list + of display identifiers (separated by whitespace) which tell an + application where it can find the Xprint servers. Usually + ${XPSERVERLIST} is set by the profile startup scripts (e.g. + /etc/profile or /etc/profile.d/xprint.sh) using the output of + /etc/init.d/xprint get_xpserverlist. + Example: + + + export XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`" + + + Alternatively ${XPSERVERLIST} can be set + manually. Example: + + + export XPSERVERLIST="littlecat:80 bitdog:72" + + + instructs an application to find an Xprint server at display + 80 on the machine "littlecat" and at display 72 on the + machine bigdog. + + + + + + ${XPRINTER} + + + The environment variable ${XPRINTER} + defines the default printer used by print + applications. The syntax is either + printername or + printername@display. + Examples: + + + XPRINTER=ps003 + + tells an application to look for the + first printer named "ps003" on all Xprint + servers. + + + + + + XPRINTER=hplaser19@littlecat:80 + + tells an application to use the printer "hplaser19" + on the Xprint server at display + "littlecat:80". + + + + + + If ${XPRINTER} is not set the applications + will examine the values of the ${PDPRINTER}, + ${LPDEST}, and + ${PRINTER} environment variables (in that order). + + + + + + + + SEE ALSO + + + + + + + + X11__miscmansuffix__ + xplsprinters__appmansuffix__ + xprehashprinterlist__appmansuffix__ + xphelloworld__appmansuffix__ + xpxmhelloworld__appmansuffix__ + xpawhelloworld__appmansuffix__ + xpxthelloworld__appmansuffix__ + xpsimplehelloworld__appmansuffix__ + Xserver__appmansuffix__ + Xprt__appmansuffix__ + + libXp__libmansuffix__ + libXprintUtils__libmansuffix__ + libXprintAppUtils__libmansuffix__ + XmPrintShell__libmansuffix__ + XawPrintShell__libmansuffix__ + Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html) + Xprint main site (http://xprint.mozdev.org/) + + + + + + AUTHORS + + This manual page was written by + Roland Mainz roland.mainz@nrubsig.org based on the original X11R6.6 + xc/programs/Xserver/XpConfig/README. + + + + + + + + + + + Xprint + __miscmansuffix__ + + + Xprint + + The "X print service" - a portable, network-transparent printing system based on the X11 protocol + + + Xprint is a very flexible, extensible, scaleable, client/server + print system based on ISO 10175 (and some other specs) and the X11 + rendering protocol. + Using Xprint an application can search, query and use devices like + printers, FAX machines or create documents in formats like PDF. + In particular, an application can seek a printer, query supported + attributes (like paper size, trays, fonts etc.), configure the printer + device to match it’s needs and print on it like on any other X device + reusing parts of the code which is used for the video card Xserver. + + + + + OVERVIEW + + The "X Print Service" technology allows X rendering to devices such as + printers and fax. Most of the service is available in the X11 + technology stack as Xp, with the remainder in single toolkit stacks (e.g. DtPrint for CDE). + Modifications have also been made to the LessTif/Motif/Qt technology + stacks to support Xprint. + + + The Xp portion consists of: + + Xp Extension for the X-Server (included in the X-Server Xprt) + Xp Extension API for the client side (libXp/libXprintUtils) + PCL ddx driver that converts core X to native PCL + PDF ddx driver that converts core X to native PDF + PostScript ddx driver that converts core X to native PostScript + Raster ddx driver that generates xwd rasters which can be converted to PCL, PDF or PostScript rasters + + + + From an X clients perspective, it can attach to one of two nearly + identical X-Servers, a "Video" X-Server, and a "Print" X-Server + which has the additional Xp capability but otherwise looks and + behaves the same. + + + + + HOW THE X PRINT SERVICE WORKS + + The X Print Service expands on the traditional X-Server and Xlib world + in four ways. + + + + + Most obvious is the use of "print ddx drivers" instead of + "video ddx drivers". While a video ddx driver modifies pixels + in a video frame buffer, a print ddx driver generates "page + description language (PDL)" output (such as PCL, PDF or PostScript) + or sends the print rendering instructions to a platform-specific + print API (like Win32/GDI). + + + Once a print ddx driver generates PDL output, it can be sent to + a spooler such as lp1 + or retrieved by the client (to implement functionality like "print-to-file"). + + + Though not currently done, a single X-Server can support both + print and video ddx drivers. + + + + + + Since printers support "paged" output, unlike video, a portion + of the Xp Extension supports APIs to delineate printed output. + For example, XpStartPage and XpEndPage tell the X-Server where + a physical page starts and ends in an otherwise continuous + stream of X rendering primitives. Likewise, XpStartJob and + XpEndJob determine when a collection of pages starts and ends. + XpEndJob typically causes the generated PDL to be submitted to + a spooler, such as lp1. + + + + + Since printers have extensive capabilities, another portion of + the Xp Extension supports APIs to manipulate "print contexts". + + + Once a printer is selected using the Xp Extension API, a print + context to represent it can be created. A print context + embodies the printer selected - it contains the printer's + default capabilities, selectable range of capabilities, + printer state, and generated output. Some "attributes" within + the print context can be modified by the user, and the + X-Server and print ddx driver will react accordingly. For + example, the attribute "content-orientation" can be set to + "landscape" or "portrait" (if the printer supports these + values - which can be queried using the Xprint API as well). + + + + + Since printers can have "built in" fonts, the Xp Extension in + the X-Server works with the print ddx drivers to make + available (for printing only) additional fonts on a per print + context basis. + + + When a print context is created and set for a given printer, + the X font calls may be able to access additional printer + fonts. To do this (typically), the X-Server must have access + to "printer metric files" (.pmf) that describe at minimum the + metrics of the built in fonts. + + + + + + + + USAGE + + There are three tasks to start the X Print Service: + + configuring the X Print Server, + starting the X Print Service + configuring the user session so that clients can find the running X Print Service + + + + The tasks are described in detail below. + + + + + SERVER CONFIGURATION + + The X Print Server (Xprt) can read a number of configuration files which + control its behavior and support for printers. Each vendor platform has + a default location for this information. Xprt can also read the + environment variable XPCONFIGDIR to locate alternate configuration + directories. Common settings include: + + + export XPCONFIGDIR=/X11/lib/X11/XpConfig/ + export XPCONFIGDIR=/proj/x11/xc/programs/Xserver/XpConfig/ + + + + Xprt has many built-in defaults, and lacking any configuration files, + will immediately try to support all printers visible via lpstat1. + + + In order of importance for configuration by a system administrator, the + configuration files for a "C" locale are as follows (see Xprt__appmansuffix__ for more + details (including support for non-"C" locales)): + + + ${XPCONFIGDIR}/C/print/Xprinters + + + 'Xprinters' is the top most configuration file. It tells + Xprt which specific printer names (e.g. mylaser) should + be supported, and whether lpstat1 or other commands + should be used to automatically supplement the list of + printers. + + + + + + ${XPCONFIGDIR}/C/print/attributes/printer + + + The 'printer' file maps printer names to model + configurations (see 'model-config' below). For example, + "mylaser" could be mapped to a "HPDJ1600C", and all other + arbitrary printers could be mapped to a default, such as + "HPLJ4SI". When depending on lpstat1 in the Xprinters + file, setting up defaults in 'printer' becomes all the + more important. + + + + + + ${XPCONFIGDIR}/C/print/attributes/document + + + The 'document' file specifies the initial document values + for any print jobs. For example, which paper tray to + use, what default resolution, etc. + + + + + + ${XPCONFIGDIR}/C/print/attributes/job + + + The 'job' file specifies the initial job values for any + print jobs. For example, "notification-profile" can be + set so that when a print job is successfully sent to a + printer, e-mail is sent to the user. + + + + + + ${XPCONFIGDIR}/C/print/models/PSdefault/model-config + ${XPCONFIGDIR}/C/print/models/PSdefault/fonts/fonts.dir + ${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00051.pmf + ${XPCONFIGDIR}/C/print/models/PSdefault/fonts/9nb00093.pmf + + + + The 'model-config' file has attributes that describe the + printer model’s capabilities and default settings. + Printer model fonts may also be present. The model-config + file also identifies the print ddx driver to be used. + + For each printer model supported, a complete hierarchy of + files should exist. In most cases, these files do not + need to be modified. + + + + + + ${XPCONFIGDIR}/C/print/ddx-config/raster/pcl + ${XPCONFIGDIR}/C/print/ddx-config/raster/pdf + ${XPCONFIGDIR}/C/print/ddx-config/raster/postscript + + + + The print ddx drivers can have highly specific + configuration files to control their behavior. In most + cases, these files do not need to be modified. + + + + + + More information in how to configure and customize the X print server can be found in the + Xprt__appmansuffix__ + manual page. + + + + + STARTING UP + + The summary checklist for starting the X Print Service is as follows: + + + + + Choose an execution model for the X Print Service. The X + Print Service can be run on a per-user session basis, per + machine basis, or can be run on a few machines globally + available to a number of users. + + + + + If print jobs are to be submitted to a spooler (almost always + the case), make sure all needed printers are available to the + spooler subsystem (most often lp1) + on the same machine running the X Print Service. + + + + + Configure the X Print Server. See ``X Print Server + Configuration''. + + + + + Depending on #1, start the X Print Server process "Xprt", and + then the toolkit-specific Print Dialog Manager Daemon process + (such as CDEnext's "dtpdmd") at the appropriate times. + Note that libXprintUtils-based applications/toolkits do not need + a Print Dialog Manager Daemon process to use Xprint. + + + + The details are described below. + + + Because the X Print Service is based on X, it can be easily distributed. + The most significant factors in which execution model to choose will be + driven by: + + + + how many printers will be accessable through the printer + subsystem on any given machine. A system administrator may + choose to cluster printers on a few given machines, or + scatter them across an organization and possibly make + extensive use of remote spoolers to make them globally + available. + + + + + how many machines will need a copy of the X Print Server + configuration files. The files have been architected so + that one super-set version of them can be maintained and + distributed (e.g. via NFS), and a per-machine or per-user + version of the `Xprinters' is all that is needed to have the + appropriate information in them utilized or ignored. + + + + + how many users can demand services from a given X Print + Service. + + + + + With the above in mind, some obvious execution models include: + + + + Global - in this model, the system administrator is choosing + to run the X Print Service on a *few* select machines with + appropriate printers configured, and allow clients access to + the global resource. This can centralize the administration + of printers and configuration files, but may have to be + monitored for performance loading. + + + Startup would likely be done by boot-up scripts (such as /etc/init.d/xprint). + + + + + + Per-machine - every machine with potential X Print Service + users would run the service. Printer and configuration file + administration is decentralized, and usage would be limited + to the users on the machine. + + + Startup would likely be done by boot-up scripts (such as /etc/init.d/xprint). + + + + + + Per-user session - every user would run an entire X Print + Service for themselves. In the future, the Video X Server + normally started may contain Print X Server capability, so + this model becomes very natural. + + + Startup would likely be done at session login or by + launching actions or processes manually once the user + logs in. Note: Deamons like "dtpdmd" must be started after Xprt. + + + + + + Starting of the processes is straight forward. In strict order (example is for manually starting the X print server for CDEnext usage): + + + + [machineA] % Xprt [-XpFile <Xprinters file>] [:dispNum] & + + + Note that Xprt will look for configuration files in either + a default location or where XPCONFIGDIR points. + + + specifies an alternate `Xprinters' file, rather + than the default one or `${XPCONFIGDIR}/C/print/Xprinters'. + + + + + [machineA] % dtpdmd -d machineA[:dispNum] [-l /tmp/dtpdmd.log] & + + + The dtpdmd will maintain an X-Selection on the X-Server, + and will start dtpdm's as required to service requests. + + + + + + In all but the per-user session model, the machine running the dtpdmd + (thus dtpdm's) will need display authorization to the users video + display. + + + + + CLIENT CONFIGURATION + + Once a X Print Server and dtpdmd have been started -- many of them + in some cases -- clients will need to find and use them. There are + two mechanisms that allow clients to discover X Print Servers and + printers. + + + + + "X Print Specifier" - assuming usage of the DtPrint/XprintUtils-based print + applications, the following notation is understood: + + + printer_name@machine[:dispNum] + + + For example: + + + colorlj7@printhub:2 + + + In the above example, the X Print Server running at `printhub:2' + is assumed to support the printer named `colorlj7'. + + + + + ${XPSERVERLIST} - assuming usage of the DtPrint print dialogs, + the environment variable ${XPSERVERLIST} can contain a list + of X Print Servers. For example: + + + XPSERVERLIST="printhub:2 printhub:3 otherdept:0" + + + Then in the dialogs, only a printer name needs to be entered. + The dialog will then search the X Print Servers in ${XPSERVERLIST} + for a server than supports the printer, and then establish + contact. + + + + + + + + END-USER SEQUENCE + + From most CDEnext applications, printing is accomplished by bringing + down the <File> menu and selecting <Print...>. This will result in + the DtPrintSetupBox dialog, which will request the name of a printer, + and offer limited capability to configure print options (e.g. number + of copies). If the user wishes, they can select <Setup...>, which + will start a dtpdm capable of modifying additional print options. + Finally, the user should select <Print>. + + + + + ENVIRONMENT + + + ${XPCONFIGDIR} + + This environment variable points to the root + of the Xprint server configuration directory hierarchy. + If the variable is not defined, the default + path is be assumed. The default path may be + /usr/X11R6/lib/X11/xserver/, + /usr/lib/X11/xserver/, + /usr/share/Xprint/xserver/ or + /usr/openwin/server/etc/XpConfig, depending on the + system, and may be configured in /etc/init.d/xprint. + + + + + ${LANG} + + + This environment variable selects the locale settings used by the Xprint server. + Xprt allows language-specific settings (stored in ${XPCONFIGDIR}/${LANG}/print/) + which will override the default settings (stored in ${XPCONFIGDIR}/C/print/). + If ${LANG} is not set "C" is assumed. + + + + + + ${XPSERVERLIST} + + The environment variable ${XPSERVERLIST} contains a list + of display identifiers (separated by whitespace) which tell an + application where it can find the Xprint servers. Usually + ${XPSERVERLIST} is set by the profile startup scripts (e.g. + /etc/profile or /etc/profile.d/xprint.sh) using the output of + /etc/init.d/xprint get_xpserverlist. + Example: + + + export XPSERVERLIST="`/etc/init.d/xprint get_xpserverlist`" + + + Alternatively ${XPSERVERLIST} can be set + manually. Example: + + + export XPSERVERLIST="littlecat:80 bitdog:72" + + + instructs an application to find an Xprint server at display + 80 on the machine "littlecat" and at display 72 on the + machine bigdog. + + + + + + ${XPRINTER} + + + The environment variable ${XPRINTER} + defines the default printer used by print + applications. The syntax is either + printername or + printername@display. + Examples: + + + XPRINTER=ps003 + + tells an application to look for the + first printer named "ps003" on all Xprint + servers. + + + + + + XPRINTER=hplaser19@littlecat:80 + + tells an application to use the printer "hplaser19" + on the Xprint server at display + "littlecat:80". + + + + + + If ${XPRINTER} is not set the applications + will examine the values of the ${PDPRINTER}, + ${LPDEST}, and + ${PRINTER} environment variables (in that order). + + + + + + + + SEE ALSO + + + + + + + + X11__miscmansuffix__ + xplsprinters__appmansuffix__ + xprehashprinterlist__appmansuffix__ + xphelloworld__appmansuffix__ + xpxmhelloworld__appmansuffix__ + xpawhelloworld__appmansuffix__ + xpxthelloworld__appmansuffix__ + xpsimplehelloworld__appmansuffix__ + Xserver__appmansuffix__ + Xprt__appmansuffix__ + + libXp__libmansuffix__ + libXprintUtils__libmansuffix__ + libXprintAppUtils__libmansuffix__ + XmPrintShell__libmansuffix__ + XawPrintShell__libmansuffix__ + Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html) + Xprint main site (http://xprint.mozdev.org/) + + + + + + AUTHORS + + This manual page was written by + Roland Mainz roland.mainz@nrubsig.org based on the original X11R6.6 + xc/programs/Xserver/XpConfig/README. + + + + diff --git a/proto/xorgproto/meson.build b/proto/xorgproto/meson.build index 071108d61..cfbaa2ca2 100644 --- a/proto/xorgproto/meson.build +++ b/proto/xorgproto/meson.build @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -project('xorgproto', 'c', license : 'MIT', version : '2018.4') +project('xorgproto', 'c', license : 'MIT', version : '2019.2') pkg = import('pkgconfig') cc = meson.get_compiler('c') sed = find_program('sed') @@ -44,7 +44,6 @@ pcs = [ ['scrnsaverproto', '1.2.2'], ['trapproto', '3.4.3'], ['videoproto', '2.3.3'], - ['windowswmproto', '1.0.4'], ['xcmiscproto', '1.2.2'], ['xextproto', '7.3.0'], ['xf86bigfontproto', '1.2.0'], @@ -79,6 +78,7 @@ if get_option('legacy') == true ['fontcacheproto', '0.1.3'], ['lg3dproto', '5.0'], ['printproto', '1.0.5'], + ['windowswmproto', '1.0.4'], ['xcalibrateproto', '0.1.0'], ['xf86rushproto', '1.2.2'], ] diff --git a/proto/xorgproto/presentproto.pc.in b/proto/xorgproto/presentproto.pc.in index 6ec4b7d1e..55b84dce0 100644 --- a/proto/xorgproto/presentproto.pc.in +++ b/proto/xorgproto/presentproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: PresentProto diff --git a/proto/xorgproto/printproto.pc.in b/proto/xorgproto/printproto.pc.in index 8a2e2d63e..a2da66dd5 100644 --- a/proto/xorgproto/printproto.pc.in +++ b/proto/xorgproto/printproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: PrintProto diff --git a/proto/xorgproto/randrproto.pc.in b/proto/xorgproto/randrproto.pc.in index 5a5edb2ab..6d60cbb84 100644 --- a/proto/xorgproto/randrproto.pc.in +++ b/proto/xorgproto/randrproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: RandrProto diff --git a/proto/xorgproto/randrproto.txt b/proto/xorgproto/randrproto.txt index faafc4cff..88f06cc1a 100644 --- a/proto/xorgproto/randrproto.txt +++ b/proto/xorgproto/randrproto.txt @@ -3427,4 +3427,4 @@ Bibliography [RENDER] Packard, Keith, "The X Rendering Extension", work in progress, - http://cgit.freedesktop.org/xorg/proto/renderproto/tree/renderproto.txt + https://gitlab.freedesktop.org/xorg/proto/xorgproto/raw/master/renderproto.txt diff --git a/proto/xorgproto/recordproto.pc.in b/proto/xorgproto/recordproto.pc.in index 0ff4c0b5f..a87aa8264 100644 --- a/proto/xorgproto/recordproto.pc.in +++ b/proto/xorgproto/recordproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: RecordProto diff --git a/proto/xorgproto/renderproto.pc.in b/proto/xorgproto/renderproto.pc.in index e6028ac4f..34b15e037 100644 --- a/proto/xorgproto/renderproto.pc.in +++ b/proto/xorgproto/renderproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: RenderProto diff --git a/proto/xorgproto/resourceproto.pc.in b/proto/xorgproto/resourceproto.pc.in index a409db9cf..f927cbbae 100644 --- a/proto/xorgproto/resourceproto.pc.in +++ b/proto/xorgproto/resourceproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: ResourceProto diff --git a/proto/xorgproto/scrnsaverproto.pc.in b/proto/xorgproto/scrnsaverproto.pc.in index 6556a2cdc..fa7c97a22 100644 --- a/proto/xorgproto/scrnsaverproto.pc.in +++ b/proto/xorgproto/scrnsaverproto.pc.in @@ -1,9 +1,8 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: ScrnSaverProto Description: ScrnSaver extension headers -Version: 1.2.2 +Version: 1.2.3 Cflags: -I${includedir} diff --git a/proto/xorgproto/specs/Makefile.am b/proto/xorgproto/specs/Makefile.am new file mode 100644 index 000000000..f3d77ba32 --- /dev/null +++ b/proto/xorgproto/specs/Makefile.am @@ -0,0 +1,21 @@ +SUBDIRS = \ + bigreqsproto \ + fontsproto \ + kbproto \ + recordproto \ + scrnsaverproto \ + xcmiscproto \ + xextproto \ + xproto + +EXTRA_DIST = \ + printproto/xp_proto.book \ + printproto/xp_proto.mif \ + printproto/xp_proto.ps \ + printproto/xp_protoIX.doc \ + printproto/xp_protoTOC.doc \ + printproto/xp_proto_cov.mif \ + SIAddresses/hostname.txt \ + SIAddresses/IPv6.txt \ + SIAddresses/localuser.txt \ + SIAddresses/README diff --git a/proto/xorgproto/specs/Makefile.in b/proto/xorgproto/specs/Makefile.in new file mode 100644 index 000000000..50c4c463b --- /dev/null +++ b/proto/xorgproto/specs/Makefile.in @@ -0,0 +1,605 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = specs +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = \ + bigreqsproto \ + fontsproto \ + kbproto \ + recordproto \ + scrnsaverproto \ + xcmiscproto \ + xextproto \ + xproto + +EXTRA_DIST = \ + printproto/xp_proto.book \ + printproto/xp_proto.mif \ + printproto/xp_proto.ps \ + printproto/xp_protoIX.doc \ + printproto/xp_protoTOC.doc \ + printproto/xp_proto_cov.mif \ + SIAddresses/hostname.txt \ + SIAddresses/IPv6.txt \ + SIAddresses/localuser.txt \ + SIAddresses/README + +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/SIAddresses/IPv6.txt b/proto/xorgproto/specs/SIAddresses/IPv6.txt index 4b69a997b..9a00cdc96 100644 --- a/proto/xorgproto/specs/SIAddresses/IPv6.txt +++ b/proto/xorgproto/specs/SIAddresses/IPv6.txt @@ -9,3 +9,14 @@ This address type specification will be formally issued once the IETF IPv6 Working Group issues the corresponding RFC. Version 0.9, March 2004 +ServerInterpreted address definition for type "IPv6": + +The X.org Architecture Task Force reserves the ServerInterpreted +address type of "IPv6" for use with IPv6 literal address formats. +The syntax for the value will be defined as specified in RFC 3513 +and the IETF RFC to be published based on the current draft at +http://www.ietf.org/internet-drafts/draft-ietf-ipv6-scoping-arch-00.txt +This address type specification will be formally issued once the +IETF IPv6 Working Group issues the corresponding RFC. + +Version 0.9, March 2004 diff --git a/proto/xorgproto/specs/SIAddresses/README b/proto/xorgproto/specs/SIAddresses/README index 8858529c5..2b6a72a85 100644 --- a/proto/xorgproto/specs/SIAddresses/README +++ b/proto/xorgproto/specs/SIAddresses/README @@ -2,3 +2,7 @@ This directory contains the specifications of address types for the ServerInterpreted address family used in the ChangeHost and ListHosts requests in the X11 Protocol. See Chapter 9 of the X11 Protocol spec for more information. +This directory contains the specifications of address types for the +ServerInterpreted address family used in the ChangeHost and ListHosts +requests in the X11 Protocol. See Chapter 9 of the X11 Protocol spec +for more information. diff --git a/proto/xorgproto/specs/SIAddresses/hostname.txt b/proto/xorgproto/specs/SIAddresses/hostname.txt index 64023d7f3..9b941821a 100644 --- a/proto/xorgproto/specs/SIAddresses/hostname.txt +++ b/proto/xorgproto/specs/SIAddresses/hostname.txt @@ -9,3 +9,14 @@ relevant IETF RFC's before use in the X11 protocol. Note that this definition of hostname does not allow use of literal IP addresses. Version 1.0, March 2004 +ServerInterpreted address definition for type "hostname": + +A ServerInterpreted address with type "hostname" shall have a value +representing a hostname as defined in IETF RFC 2396. Due to Mobile IP +and dynamic DNS, the name service should be consulted at connection +authentication time. Clients supporting Internationalized Domain +Names must convert to ASCII Compatible Encoding as specified in the +relevant IETF RFC's before use in the X11 protocol. Note that this +definition of hostname does not allow use of literal IP addresses. + +Version 1.0, March 2004 diff --git a/proto/xorgproto/specs/SIAddresses/localuser.txt b/proto/xorgproto/specs/SIAddresses/localuser.txt index e67ff01de..74c82cdbd 100644 --- a/proto/xorgproto/specs/SIAddresses/localuser.txt +++ b/proto/xorgproto/specs/SIAddresses/localuser.txt @@ -18,3 +18,23 @@ Examples: xhost +SI:localgroup:wheel xhost +SI:localgroup:#0 +Server-interpreted Authentication Types "localuser" and "localgroup": + +On systems which can determine in a secure fashion the credentials of a client +process, the "localuser" and "localgroup" authentication methods provide access +based on those credentials. The format of the values provided is platform +specific. For POSIX & UNIX platforms, if the value starts with the character +'#', the rest of the string shall be treated as a decimal uid or gid, otherwise +the string is defined as a user name or group name. + +Systems offering this MUST not simply trust a user supplied value (such as an +environment variable or IDENT protocol response). It is expected many systems +will only support this for clients running on the same host using a local IPC +transport. + +Examples: + xhost +SI:localuser:alanc + xhost +SI:localuser:#1234 + xhost +SI:localgroup:wheel + xhost +SI:localgroup:#0 + diff --git a/proto/xorgproto/specs/bigreqsproto/Makefile.am b/proto/xorgproto/specs/bigreqsproto/Makefile.am new file mode 100644 index 000000000..7115fad61 --- /dev/null +++ b/proto/xorgproto/specs/bigreqsproto/Makefile.am @@ -0,0 +1,13 @@ + +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = bigreq.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/bigreqsproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/bigreqsproto/Makefile.in b/proto/xorgproto/specs/bigreqsproto/Makefile.in new file mode 100644 index 000000000..1491974fc --- /dev/null +++ b/proto/xorgproto/specs/bigreqsproto/Makefile.in @@ -0,0 +1,574 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/bigreqsproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = bigreq.xml +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = bigreq.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/bigreqsproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/bigreqsproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/bigreqsproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/bigreq.xml b/proto/xorgproto/specs/bigreqsproto/bigreq.xml similarity index 100% rename from proto/xorgproto/specs/bigreq.xml rename to proto/xorgproto/specs/bigreqsproto/bigreq.xml diff --git a/proto/xorgproto/specs/fontsproto/Makefile.am b/proto/xorgproto/specs/fontsproto/Makefile.am new file mode 100644 index 000000000..7cc8a577c --- /dev/null +++ b/proto/xorgproto/specs/fontsproto/Makefile.am @@ -0,0 +1,13 @@ + +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = fsproto.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/fontsproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/fontsproto/Makefile.in b/proto/xorgproto/specs/fontsproto/Makefile.in new file mode 100644 index 000000000..80ec7d36d --- /dev/null +++ b/proto/xorgproto/specs/fontsproto/Makefile.in @@ -0,0 +1,574 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/fontsproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = fsproto.xml +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = fsproto.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/fontsproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/fontsproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/fontsproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/fsproto.xml b/proto/xorgproto/specs/fontsproto/fsproto.xml similarity index 100% rename from proto/xorgproto/specs/fsproto.xml rename to proto/xorgproto/specs/fontsproto/fsproto.xml diff --git a/proto/xorgproto/specs/kbproto/Makefile.am b/proto/xorgproto/specs/kbproto/Makefile.am new file mode 100644 index 000000000..05719a9ef --- /dev/null +++ b/proto/xorgproto/specs/kbproto/Makefile.am @@ -0,0 +1,48 @@ + +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = xkbproto.xml + +# Included chapters, appendix, images +chapters = \ + acknowledgements.xml \ + appA.xml \ + appB.xml \ + appC.xml \ + appD.xml \ + ch01.xml \ + ch02.xml \ + ch03.xml \ + ch04.xml \ + ch05.xml \ + ch06.xml \ + ch07.xml \ + ch08.xml \ + ch09.xml \ + ch10.xml \ + ch11.xml \ + ch12.xml \ + ch13.xml \ + ch14.xml \ + ch15.xml \ + ch16.xml \ + XKBproto-1.svg \ + XKBproto-2.svg \ + XKBproto-3.svg \ + XKBproto-4.svg \ + XKBproto-5.svg \ + XKBproto-6.svg \ + XKBproto-7.svg \ + XKBproto-8.svg \ + XKBproto-9.svg \ + XKBproto-10.svg \ + XKBproto-11.svg + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/kbproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/kbproto/Makefile.in b/proto/xorgproto/specs/kbproto/Makefile.in new file mode 100644 index 000000000..0fad9a538 --- /dev/null +++ b/proto/xorgproto/specs/kbproto/Makefile.in @@ -0,0 +1,616 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/kbproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = xkbproto.xml acknowledgements.xml appA.xml \ + appB.xml appC.xml appD.xml ch01.xml ch02.xml ch03.xml ch04.xml \ + ch05.xml ch06.xml ch07.xml ch08.xml ch09.xml ch10.xml ch11.xml \ + ch12.xml ch13.xml ch14.xml ch15.xml ch16.xml XKBproto-1.svg \ + XKBproto-2.svg XKBproto-3.svg XKBproto-4.svg XKBproto-5.svg \ + XKBproto-6.svg XKBproto-7.svg XKBproto-8.svg XKBproto-9.svg \ + XKBproto-10.svg XKBproto-11.svg +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = xkbproto.xml + +# Included chapters, appendix, images +@ENABLE_SPECS_TRUE@chapters = \ +@ENABLE_SPECS_TRUE@ acknowledgements.xml \ +@ENABLE_SPECS_TRUE@ appA.xml \ +@ENABLE_SPECS_TRUE@ appB.xml \ +@ENABLE_SPECS_TRUE@ appC.xml \ +@ENABLE_SPECS_TRUE@ appD.xml \ +@ENABLE_SPECS_TRUE@ ch01.xml \ +@ENABLE_SPECS_TRUE@ ch02.xml \ +@ENABLE_SPECS_TRUE@ ch03.xml \ +@ENABLE_SPECS_TRUE@ ch04.xml \ +@ENABLE_SPECS_TRUE@ ch05.xml \ +@ENABLE_SPECS_TRUE@ ch06.xml \ +@ENABLE_SPECS_TRUE@ ch07.xml \ +@ENABLE_SPECS_TRUE@ ch08.xml \ +@ENABLE_SPECS_TRUE@ ch09.xml \ +@ENABLE_SPECS_TRUE@ ch10.xml \ +@ENABLE_SPECS_TRUE@ ch11.xml \ +@ENABLE_SPECS_TRUE@ ch12.xml \ +@ENABLE_SPECS_TRUE@ ch13.xml \ +@ENABLE_SPECS_TRUE@ ch14.xml \ +@ENABLE_SPECS_TRUE@ ch15.xml \ +@ENABLE_SPECS_TRUE@ ch16.xml \ +@ENABLE_SPECS_TRUE@ XKBproto-1.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-2.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-3.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-4.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-5.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-6.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-7.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-8.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-9.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-10.svg \ +@ENABLE_SPECS_TRUE@ XKBproto-11.svg + + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/kbproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/kbproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/kbproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/XKBproto-1.svg b/proto/xorgproto/specs/kbproto/XKBproto-1.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-1.svg rename to proto/xorgproto/specs/kbproto/XKBproto-1.svg diff --git a/proto/xorgproto/specs/XKBproto-10.svg b/proto/xorgproto/specs/kbproto/XKBproto-10.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-10.svg rename to proto/xorgproto/specs/kbproto/XKBproto-10.svg diff --git a/proto/xorgproto/specs/XKBproto-11.svg b/proto/xorgproto/specs/kbproto/XKBproto-11.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-11.svg rename to proto/xorgproto/specs/kbproto/XKBproto-11.svg diff --git a/proto/xorgproto/specs/XKBproto-2.svg b/proto/xorgproto/specs/kbproto/XKBproto-2.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-2.svg rename to proto/xorgproto/specs/kbproto/XKBproto-2.svg diff --git a/proto/xorgproto/specs/XKBproto-3.svg b/proto/xorgproto/specs/kbproto/XKBproto-3.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-3.svg rename to proto/xorgproto/specs/kbproto/XKBproto-3.svg diff --git a/proto/xorgproto/specs/XKBproto-4.svg b/proto/xorgproto/specs/kbproto/XKBproto-4.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-4.svg rename to proto/xorgproto/specs/kbproto/XKBproto-4.svg diff --git a/proto/xorgproto/specs/XKBproto-5.svg b/proto/xorgproto/specs/kbproto/XKBproto-5.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-5.svg rename to proto/xorgproto/specs/kbproto/XKBproto-5.svg diff --git a/proto/xorgproto/specs/XKBproto-6.svg b/proto/xorgproto/specs/kbproto/XKBproto-6.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-6.svg rename to proto/xorgproto/specs/kbproto/XKBproto-6.svg diff --git a/proto/xorgproto/specs/XKBproto-7.svg b/proto/xorgproto/specs/kbproto/XKBproto-7.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-7.svg rename to proto/xorgproto/specs/kbproto/XKBproto-7.svg diff --git a/proto/xorgproto/specs/XKBproto-8.svg b/proto/xorgproto/specs/kbproto/XKBproto-8.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-8.svg rename to proto/xorgproto/specs/kbproto/XKBproto-8.svg diff --git a/proto/xorgproto/specs/XKBproto-9.svg b/proto/xorgproto/specs/kbproto/XKBproto-9.svg similarity index 100% rename from proto/xorgproto/specs/XKBproto-9.svg rename to proto/xorgproto/specs/kbproto/XKBproto-9.svg diff --git a/proto/xorgproto/specs/kbproto/acknowledgements.xml b/proto/xorgproto/specs/kbproto/acknowledgements.xml new file mode 100644 index 000000000..95b9521e0 --- /dev/null +++ b/proto/xorgproto/specs/kbproto/acknowledgements.xml @@ -0,0 +1,41 @@ + +Acknowledgments + + +I am grateful for all of the comments and suggestions I have received over the years. I could not possibly list everyone who has helped, but a few people have gone well above and beyond the call of duty and simply must be listed here. + + + +My managers here at SGI, Tom Paquin (now at Netscape) and Gianni Mariani were wonderful. Rather than insisting on some relatively quick, specialized proprietary solution to the keyboard problems we were having, both Tom and Gianni understood the importance of solving them in a general way and for the community as a whole. That was a difficult position to take and it was even harder to maintain when the scope of the project expanded beyond anything we imagined was possible. Gianni and Tom were unflagging in their support and their desire to “do the right thing” despite the schedule and budget pressure that intervened from time to time. + + + +Will Walker, at Digital Equipment Corporation, has been a longtime supporter of XKB. His help and input was essential to ensure that the extension as a whole fits and works together well. His focus was AccessX but the entire extension has benefited from his input and hard work. Without his unflagging good cheer and willingness to lend a hand, XKB would not be where it is today. + + + +Matt Landau, at the X Consortium, stood behind XKB during some tough spots in the release and standardization process. Without Matt’s support, XKB would likely not be a standard for a long time to come. When it became clear that we had too much to do for the amount of time we had remaining, Matt did a fantastic job of finding people to help finish the work needed for standardization. + + + +One of those people was George Sachs, at Hewlett-Packard, who jumped in to help out. His help was essential in getting the extension into this release. Another was Donna Converse, who helped figure out how to explain all of this stuff to someone who hadn’t had their head buried in it for years. + + + +Amber Benson and Gary Aitken were simply phenomenal. They jumped into a huge and complicated project with good cheer and unbelievable energy. They were “up to speed” and contributing within days. I stand in awe of the amount that they managed to achieve in such a short time. Thanks to Gary and Amber, the XKB library specification is a work of art and a thousand times easier to use and more useful than it would otherwise be. + + + +I truly cannot express my gratitude to all of you, without whom this would not have been possible. + + + +Erik Fortune + + +Silicon Graphics, Inc. + + +5 February 1996 + + diff --git a/proto/xorgproto/specs/appA.xml b/proto/xorgproto/specs/kbproto/appA.xml similarity index 100% rename from proto/xorgproto/specs/appA.xml rename to proto/xorgproto/specs/kbproto/appA.xml diff --git a/proto/xorgproto/specs/appB.xml b/proto/xorgproto/specs/kbproto/appB.xml similarity index 100% rename from proto/xorgproto/specs/appB.xml rename to proto/xorgproto/specs/kbproto/appB.xml diff --git a/proto/xorgproto/specs/appC.xml b/proto/xorgproto/specs/kbproto/appC.xml similarity index 100% rename from proto/xorgproto/specs/appC.xml rename to proto/xorgproto/specs/kbproto/appC.xml diff --git a/proto/xorgproto/specs/appD.xml b/proto/xorgproto/specs/kbproto/appD.xml similarity index 100% rename from proto/xorgproto/specs/appD.xml rename to proto/xorgproto/specs/kbproto/appD.xml diff --git a/proto/xorgproto/specs/ch01.xml b/proto/xorgproto/specs/kbproto/ch01.xml similarity index 100% rename from proto/xorgproto/specs/ch01.xml rename to proto/xorgproto/specs/kbproto/ch01.xml diff --git a/proto/xorgproto/specs/ch02.xml b/proto/xorgproto/specs/kbproto/ch02.xml similarity index 100% rename from proto/xorgproto/specs/ch02.xml rename to proto/xorgproto/specs/kbproto/ch02.xml diff --git a/proto/xorgproto/specs/ch03.xml b/proto/xorgproto/specs/kbproto/ch03.xml similarity index 100% rename from proto/xorgproto/specs/ch03.xml rename to proto/xorgproto/specs/kbproto/ch03.xml diff --git a/proto/xorgproto/specs/ch04.xml b/proto/xorgproto/specs/kbproto/ch04.xml similarity index 100% rename from proto/xorgproto/specs/ch04.xml rename to proto/xorgproto/specs/kbproto/ch04.xml diff --git a/proto/xorgproto/specs/ch05.xml b/proto/xorgproto/specs/kbproto/ch05.xml similarity index 100% rename from proto/xorgproto/specs/ch05.xml rename to proto/xorgproto/specs/kbproto/ch05.xml diff --git a/proto/xorgproto/specs/ch06.xml b/proto/xorgproto/specs/kbproto/ch06.xml similarity index 100% rename from proto/xorgproto/specs/ch06.xml rename to proto/xorgproto/specs/kbproto/ch06.xml diff --git a/proto/xorgproto/specs/ch07.xml b/proto/xorgproto/specs/kbproto/ch07.xml similarity index 100% rename from proto/xorgproto/specs/ch07.xml rename to proto/xorgproto/specs/kbproto/ch07.xml diff --git a/proto/xorgproto/specs/ch08.xml b/proto/xorgproto/specs/kbproto/ch08.xml similarity index 100% rename from proto/xorgproto/specs/ch08.xml rename to proto/xorgproto/specs/kbproto/ch08.xml diff --git a/proto/xorgproto/specs/ch09.xml b/proto/xorgproto/specs/kbproto/ch09.xml similarity index 100% rename from proto/xorgproto/specs/ch09.xml rename to proto/xorgproto/specs/kbproto/ch09.xml diff --git a/proto/xorgproto/specs/ch10.xml b/proto/xorgproto/specs/kbproto/ch10.xml similarity index 100% rename from proto/xorgproto/specs/ch10.xml rename to proto/xorgproto/specs/kbproto/ch10.xml diff --git a/proto/xorgproto/specs/ch11.xml b/proto/xorgproto/specs/kbproto/ch11.xml similarity index 100% rename from proto/xorgproto/specs/ch11.xml rename to proto/xorgproto/specs/kbproto/ch11.xml diff --git a/proto/xorgproto/specs/ch12.xml b/proto/xorgproto/specs/kbproto/ch12.xml similarity index 100% rename from proto/xorgproto/specs/ch12.xml rename to proto/xorgproto/specs/kbproto/ch12.xml diff --git a/proto/xorgproto/specs/ch13.xml b/proto/xorgproto/specs/kbproto/ch13.xml similarity index 100% rename from proto/xorgproto/specs/ch13.xml rename to proto/xorgproto/specs/kbproto/ch13.xml diff --git a/proto/xorgproto/specs/ch14.xml b/proto/xorgproto/specs/kbproto/ch14.xml similarity index 100% rename from proto/xorgproto/specs/ch14.xml rename to proto/xorgproto/specs/kbproto/ch14.xml diff --git a/proto/xorgproto/specs/ch15.xml b/proto/xorgproto/specs/kbproto/ch15.xml similarity index 100% rename from proto/xorgproto/specs/ch15.xml rename to proto/xorgproto/specs/kbproto/ch15.xml diff --git a/proto/xorgproto/specs/ch16.xml b/proto/xorgproto/specs/kbproto/ch16.xml similarity index 100% rename from proto/xorgproto/specs/ch16.xml rename to proto/xorgproto/specs/kbproto/ch16.xml diff --git a/proto/xorgproto/specs/xkbproto.xml b/proto/xorgproto/specs/kbproto/xkbproto.xml similarity index 100% rename from proto/xorgproto/specs/xkbproto.xml rename to proto/xorgproto/specs/kbproto/xkbproto.xml diff --git a/proto/xorgproto/specs/printproto/xp_proto.mif b/proto/xorgproto/specs/printproto/xp_proto.mif new file mode 100644 index 000000000..3ff4705da --- /dev/null +++ b/proto/xorgproto/specs/printproto/xp_proto.mif @@ -0,0 +1,73304 @@ + # Generated by FrameMaker xm5.0P3f +# Options: +# Paragraph Text +# Paragraph Tags +# Paragraph Formats +# Font Information +# Markers +# Anchored Frames +# Tables +# Graphics and TextRect Layout +# Master Page Items +# Condition Catalog +# Table Catalogs +# Font Catalog +# Paragraph Catalog +# Document Template +# Document Dictionary +# Variables +# + + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + > # end of Color + + + + + + > # end of Color +> # end of ColorCatalog + + + + + + > # end of Condition + + + + + + > # end of Condition + + + + + + > # end of Condition +> # end of ConditionCatalog + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + \\t'> + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .. \\t'> + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + ... \\t'> + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + )'> + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + . '> + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + . '> + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf +> # end of PgfCatalog + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font + + + + + + + + + + + + + + + + + + + > # end of Font +> # end of FontCatalog + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling +> # end of RulingCatalog + + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of TblTitlePgf1 + + + + + + + > # end of TblFormat + + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of TblTitlePgf1 + + + + + + + > # end of TblFormat + + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of TblTitlePgf1 + + + + + + + > # end of TblFormat + + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of TblTitlePgf1 + + + + + + + > # end of TblFormat + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblTitlePgf1 + + + + + + + > # end of TblFormat +> # end of TblCatalog + + + > # end of View + + + + + + + + > # end of View + + + + > # end of View + + + > # end of View + + + > # end of View + + + > # end of View +> # end of Views + + '> + > # end of VariableFormat + + <$daynum\>, <$year\>'> + > # end of VariableFormat + + /<$daynum\>/<$shortyear\>'> + > # end of VariableFormat + + <$daynum\>, <$year\> <$hour\>:<$minute00\> <$ampm\>'> + > # end of VariableFormat + + <$daynum\>, <$year\>'> + > # end of VariableFormat + + , <$monthname\> <$daynum01\>, <$year\>'> + > # end of VariableFormat + + /<$daynum\>/<$shortyear\>'> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + + > # end of VariableFormat + + of <$tblsheetcount\>)'> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat +> # end of VariableFormats + + \xd3 on page\x11 <$pagenum\>'> + > # end of XRefFormat + + '> + > # end of XRefFormat + + \xd3 on page\x11 <$pagenum\>.'> + > # end of XRefFormat + + , \xd2 <$paratext\>,\xd3 on page\x11 <$pagenum\>'> + > # end of XRefFormat + + , \xd2 <$paratext\>,\xd3 on page\x11 <$pagenum\>'> + > # end of XRefFormat + + on page\x11 <$pagenum\>'> + > # end of XRefFormat + + on page\x11 <$pagenum\>'> + > # end of XRefFormat + + , \xd2 <$paratext\>,\xd3 on page\x11 <$pagenum\>'> + > # end of XRefFormat + + '> + > # end of XRefFormat + + '> + > # end of XRefFormat + + '> + > # end of XRefFormat + + \xd3 '> + > # end of XRefFormat +> # end of XRefFormats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +> # end of Document +xp_proto.mifIOM.doc'> + + + + + +> # end of BookComponent +xp_proto.mifIX.doc'> + + + + + +> # end of BookComponent +xp_proto.mifTC.doc'> + + + + + + + +> # end of BookComponent + # end of InitialAutoNums + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +> # end of Dictionary + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame +> # end of AFrames + + + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + > # end of TblFormat + + + + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of Font + + > + > # end of Para + > # end of CellContent + > # end of Cell + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + > # end of TblFormat + + + + + + + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + > # end of TblFormat + + + + + + + + + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + + > # end of Pgf + > # end of TblColumnBody + + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + > # end of TblFormat + + + + + + + + + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + + > + + > + + > + + > + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + > + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + > + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + > + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblTitlePgf1 + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblTitlePgf1 + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnH + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + > # end of TblColumnBody + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + > # end of TblFormat + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl + + + + + + + + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > # end of Para + > # end of CellContent + > # end of Cell + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + > # end of CellContent + > # end of Cell + > # end of Row + > # end of TblBody + > # end of Tbl +> # end of Tbls + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + > # end of PolyLine + + + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + > # end of PolyLine +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + > # end of PolyLine + + + + + + + + + + + + + + + > # end of TextRect + + + + + + + + > # end of PolyLine + + + + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + > # end of PolyLine + + + + + + + + + + + + + + + > # end of TextRect + + + + + + + + > # end of PolyLine + + + + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + > # end of PolyLine + + + + + + + + + + + + + + + > # end of TextRect + + + + + + + + > # end of PolyLine + + + + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of Font + + > # end of TextLine + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + > # end of TextLine + + + + + + + + + + + + + + + + + > # end of PolyLine + > # end of Frame +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + > # end of TextLine +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + > # end of TextLine +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + > # end of TextLine +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + > # end of TextLine +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + > # end of Variable + + + + > # end of Variable + + + + > # end of Variable + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + + > # end of TabStop + > # end of Pgf + + + + + + + > # end of Font + + + > # end of Variable + + + > # end of Font + + + + + + + > # end of Font + + + > # end of Variable + + + > # end of Variable + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + > # end of TabStop + > # end of Pgf + + + + + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + > # end of TabStop + > # end of Pgf + + + + > # end of Variable + + + > # end of Variable + + + + > # end of Variable + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + > # end of TabStop + > # end of Pgf + + + + > # end of Variable + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + > # end of TabStop + > # end of Pgf + + + + > # end of Variable + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of Pgf + + '> + + '> + + '> + > + > # end of Para + + + + + + + + + + > # end of TabStop + + + + > # end of TabStop + > # end of Pgf + '> + + '> + + '> + > + > # end of Para + + + + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of Pgf + '> + + '> + + '> + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + + + + > # end of Pgf + + + > + > # end of Para + + + + + > # end of Pgf + + > + > # end of Para + + + + + > # end of Pgf + + + + > + > # end of Para + + + > # end of Pgf + <$numerics\><$alphabetics\>'> + > + > # end of Para + + + + + > # end of Pgf + + > + > # end of Para + + + + + > # end of Pgf + '> + > + > # end of Para + + + > # end of Pgf + + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of Pgf + + '> + + '> + + '> + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + > # end of Pgf + + '> + + '> + + '> + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + + + > + > # end of Para + + + + > + + > + > # end of Para + + + + > + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + + + + > + + > + > # end of Para + + + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + + > + > # end of Para + + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + + + > # end of Font + + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + + + > # end of Font + + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > # end of Para + + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > # end of Pgf + + > + > # end of Para + + + + + + > # end of Pgf + + + + > + > # end of Para + + + + + > # end of Pgf + + > + > # end of Para + + + + > + > # end of Para + + + + > + > # end of Para + + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + > + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + > + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Font + + > + > # end of Para + + + + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + + > + + + + > # end of Font + + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + + > + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + + > # end of Font + + + > + + + + > # end of Font + + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + > + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + > + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + > # end of Para + + + + > # end of Para + + + + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > + + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > # end of Pgf + + > + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + > + + > + > # end of Para + + + + > # end of Para + + + + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + + + + + + > # end of XRef + + + + + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + > + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + + + + + + > # end of XRef + + + + + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + > + + + + > # end of Font + + > + + > + > # end of Para + + + + > # end of Pgf + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Pgf + + > + > # end of Para + + + + > + + > + + + + > # end of Font + + + > + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + + > + > # end of Para + + + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + > + > # end of Para + + + + > + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > + + > + + > + > # end of Para + + + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + > # end of Para + + + + > + > # end of Para + + + + + + + > # end of Font + + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + > + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + + > # end of Marker + + + attributes'> + + + > # end of Marker + > + > # end of Para + + + + + > + + > + + > + > # end of Para + + + + > + + > + + > + + + > + + > + > # end of Para + + + + + + + + + + + + > # end of Pgf + + > + + > + > # end of Para + + + + > + > # end of Para + + + + > + > # end of Para + + + + > + > # end of Para + + + + > + > # end of Para + + + + > + > # end of Para + + + + > + + > + > # end of Para + + + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + > # end of Pgf + + > + + > + + > + > # end of Para + + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + > + > # end of Para + + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + > # end of Para + + + + + > + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + + > + + > + + > + + > + + + > + + > + + > + + > + > # end of Para + + + + + + + + > # end of Marker + + + + + + > # end of Marker + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + > + > # end of Para + + + + > + + > + + > + + > + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + > + + > + + + + > # end of Font + + + > + + + + > # end of Font + + > + > # end of Para + + + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + + + + > # end of Font + + > + > # end of Para + + + + + > + > # end of Para + + + + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Marker + + > + + > + + > + > # end of Para + + + + + + + + > # end of Marker + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Marker + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + + + + > # end of Font + + + + + + + > # end of XRef + + + > + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + + > + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + > + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + > + + > + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + + + + + > # end of Font + + > + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + + > + + > + + > + > # end of Para + + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Marker + + + + + + > # end of Marker + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + + > # end of Marker + + + + + + > # end of Marker + > + > # end of Para + + + + > + > # end of Para + + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + > + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + + > + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + > # end of Font + + + + > # end of Font + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + > + + > + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + + > + > # end of Para + + + + > + > # end of Para + + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + > + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + > # end of Font + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + > # end of Font + + + + > # end of Font + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + > + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + > + + > + + > + > # end of Para + + + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + > + + + > # end of Font + + + + > # end of Font + + > + + + + + + > # end of Font + + + + > # end of Font + + + + + + > # end of Font + + > + + + + > # end of Font + + + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + + + > # end of Font + + > + + + attributes'> + + + > # end of Marker + > + > # end of Para + + + + + + + + + + > # end of Marker + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > + + > + + > + + + + + + > # end of Font + + + + > # end of Font + + > + + + > + + > + > # end of Para + + + + > + > # end of Para + + + + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + > # end of TabStop + + > # end of Pgf + + + > + > # end of Para + + + + + + > # end of Font + + + > + + + + > # end of Font + + > + > # end of Para + + + + > # end of Pgf + + > + > # end of Para + + + + > + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > + + > + > # end of Para + + + + > # end of Pgf + + > + > # end of Para + + + + + > + + > + > # end of Para + + + + > + + > + > # end of Para + + + + > # end of Pgf + + > + > # end of Para + + + + > # end of Para + + + + > # end of Para + + + + + + > + > # end of Para + + + + > + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > + > # end of Para + + + > # end of Para + + + + > # end of Para + + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > + > # end of Para + + + + > # end of Para + + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + > # end of Pgf + + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + > # end of Pgf + + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + > # end of Font + + + + + > # end of Marker + + + + > # end of Font + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + + > # end of Font + + + + + > # end of Font + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + + + + + + + > # end of Font + + + + + > # end of Marker + + + + > # end of Font + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + + > # end of Font + + + + + > # end of Font + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + + + > # end of Font + + + + > # end of Font + > + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + > # end of Marker + + + + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + > # end of Para + + + + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + > # end of Para + + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + > + > # end of Para + + + + + + + + > # end of Pgf + + > # end of Para + + + > # end of Para + + + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para + + + + + + > # end of Font + + + + + > # end of Marker + + + + > # end of Font + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > # end of Font + + > + > # end of Para + + + + + + + > # end of Marker + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + > # end of Pgf + + + > # end of Font + + > + > # end of Para + + + > # end of Para +> # end of TextFlow +# End of MIFFile diff --git a/proto/xorgproto/specs/printproto/xp_proto.ps b/proto/xorgproto/specs/printproto/xp_proto.ps new file mode 100644 index 000000000..47fad333a --- /dev/null +++ b/proto/xorgproto/specs/printproto/xp_proto.ps @@ -0,0 +1,10422 @@ +%!PS-Adobe-3.0 +%%BoundingBox: (atend) +%%Pages: (atend) +%%PageOrder: (atend) +%%DocumentFonts: (atend) +%%Creator: Frame 5.1 +%%DocumentData: Clean7Bit +%%EndComments +%%BeginProlog +%- +%- Frame ps_prolog 5.0, for use with Frame 5.0 products +%- This ps_prolog file is Copyright (c) 1986-1996 Adobe Systems, Incoporated. +%- All rights reserved. This ps_prolog file may be freely copied and +%- distributed in conjunction with documents created using FrameMaker, +%- FrameMaker/SGML FrameReader and FrameViewer as long as this +%- copyright notice is preserved. +%- +%- FrameMaker users specify the proper paper size for each print job in the +%- "Print" dialog's "Printer Paper Size" "Width" and "Height~ fields. If the +%- printer that the PS file is sent to does not support the requested paper +%- size, or if there is no paper tray of the proper size currently installed, +%- then the job will not be printed. The following flag, if set to true, will +%- cause the job to print on the default paper in such cases. +/FMAllowPaperSizeMismatch false def +%- +%- Frame products normally print colors as their true color on a color printer +%- or as shades of gray, based on luminance, on a black-and white printer. The +%- following flag, if set to true, forces all non-white colors to print as pure +%- black. This has no effect on bitmap images. +/FMPrintAllColorsAsBlack false def +%- +%- Frame products can either set their own line screens or use a printer's +%- default settings. Three flags below control this separately for no +%- separations, spot separations and process separations. If a flag +%- is true, then the default printer settings will not be changed. If it is +%- false, Frame products will use their own settings from a table based on +%- the printer's resolution. +/FMUseDefaultNoSeparationScreen true def +/FMUseDefaultSpotSeparationScreen true def +/FMUseDefaultProcessSeparationScreen false def +%- +%- For any given PostScript printer resolution, Frame products have two sets of +%- screen angles and frequencies for printing process separations, which are +%- recomended by Adobe. The following variable chooses the higher frequencies +%- when set to true or the lower frequencies when set to false. This is only +%- effective if the appropriate FMUseDefault...SeparationScreen flag is false. +/FMUseHighFrequencyScreens true def +%- +%- The following is a set of predefined optimal frequencies and angles for various +%- common dpi settings. This is taken from "Advances in Color Separation Using +%- PostScript Software Technology," from Adobe Systems (3/13/89 P.N. LPS 0043) +%- and corrolated with information which is in various PPD (4.0) files. +%- +%- The "dpiranges" figure is the minimum dots per inch device resolution which +%- can support this setting. The "low" and "high" values are controlled by the +%- setting of the FMUseHighFrequencyScreens flag above. The "TDot" flags control +%- the use of the "Yellow Triple Dot" feature whereby the frequency id divided by +%- three, but the dot function is "trippled" giving a block of 3x3 dots per cell. +%- +%- PatFreq is a compromise pattern frequency for ps Level 2 printers which is close +%- to the ideal WYSIWYG pattern frequency of 9 repetitions/inch but does not beat +%- (too badly) against the screen frequencies of any separations for that DPI. +% This is computed by taking dpi/9 as the ideal pixels per repetition, and then +% computing a tiling size in printer pixels for each of the four separations as +% (dpi/screenFreq)*(cos(screenAngle)+sin(screenAngle)) Actually, this is the same +% for Cyan and Magenta). Then, we take a "nice" LCM of the tile sizes close to +% the desired pattern tile where the beat factor is not more than 2 or 3. +% +/dpiranges [ 2540 2400 1693 1270 1200 635 600 0 ] def +/CMLowFreqs [ 100.402 94.8683 89.2289 100.402 94.8683 66.9349 63.2456 47.4342 ] def +/YLowFreqs [ 95.25 90.0 84.65 95.25 90.0 70.5556 66.6667 50.0 ] def +/KLowFreqs [ 89.8026 84.8528 79.8088 89.8026 84.8528 74.8355 70.7107 53.033 ] def +/CLowAngles [ 71.5651 71.5651 71.5651 71.5651 71.5651 71.5651 71.5651 71.5651 ] def +/MLowAngles [ 18.4349 18.4349 18.4349 18.4349 18.4349 18.4349 18.4349 18.4349 ] def +/YLowTDot [ true true false true true false false false ] def + +/CMHighFreqs [ 133.87 126.491 133.843 108.503 102.523 100.402 94.8683 63.2456 ] def +/YHighFreqs [ 127.0 120.0 126.975 115.455 109.091 95.25 90.0 60.0 ] def +/KHighFreqs [ 119.737 113.137 119.713 128.289 121.218 89.8026 84.8528 63.6395 ] def +/CHighAngles [ 71.5651 71.5651 71.5651 70.0169 70.0169 71.5651 71.5651 71.5651 ] def +/MHighAngles [ 18.4349 18.4349 18.4349 19.9831 19.9831 18.4349 18.4349 18.4349 ] def +/YHighTDot [ false false true false false true true false ] def + +/PatFreq [ 10.5833 10.0 9.4055 10.5833 10.0 10.5833 10.0 9.375 ] def +%- +%- PostScript Level 2 printers contain an "Accurate Screens" feature which can +%- improve process separation rendering at the expense of compute time. This +%- flag is ignored by PostScript Level 1 printers. +/FMUseAcccurateScreens true def +%- +%- The following PostScript procedure defines the spot function that Frame +%- products will use for process separations. You may un-comment-out one of +%- the alternative functions below, or use your own. +%- +%- Dot function +/FMSpotFunction {abs exch abs 2 copy add 1 gt + {1 sub dup mul exch 1 sub dup mul add 1 sub } + {dup mul exch dup mul add 1 exch sub }ifelse } def +%- +%- Line function +%- /FMSpotFunction { pop } def +%- +%- Elipse function +%- /FMSpotFunction { dup 5 mul 8 div mul exch dup mul exch add +%- sqrt 1 exch sub } def +%- +%- + +/FMversion (5.0) def % matches PS_VERSION in fmprintdriver + +% PostScript Level 1 = true, 2 = false +/fMLevel1 /languagelevel where {pop languagelevel} {1} ifelse 2 lt def + +% Set up Color vs. Black-and-White +/FMPColor + fMLevel1 { + false + /colorimage where {pop pop true} if + } { +% statusdict /processcolors known { +% statusdict /processcolors get exec +% } {1} ifelse +% 1 gt + true + } ifelse +def + +/FrameDict 400 dict def % should check this value each time changes made + +% +% For NeWS we add a fake errordict, so we can psh files +% +systemdict /errordict known not {/errordict 10 dict def + errordict /rangecheck {stop} put} if + +%- The readline in PS 23.0 doesn't recognize cr's as nl's on AppleTalk +FrameDict /tmprangecheck errordict /rangecheck get put % save old rangecheck +errordict /rangecheck {FrameDict /bug true put} put % will flag bug found +FrameDict /bug false put % flag bug not found +mark % since we're not sure what will happen next +%- Some PS machines read past the CR, so keep the following 3 lines together! +currentfile 5 string readline +00 +0000000000 +cleartomark % junk from readline and rangecheck +errordict /rangecheck FrameDict /tmprangecheck get put % restore rangecheck +FrameDict /bug get { % redefine readline if last one got a rangecheck + /readline { + /gstring exch def + /gfile exch def + /gindex 0 def + { + gfile read pop % get a char + dup 10 eq {exit} if % exit if LF + dup 13 eq {exit} if % exit if CR + gstring exch gindex exch put % store it away + /gindex gindex 1 add def % bump index + } loop + pop % eol character + gstring 0 gindex getinterval true % simulate real readline + } bind def + } if + +% outer-world defs + +/FMshowpage /showpage load def +/FMquit /quit load def + +/FMFAILURE { % enter with two error strings on the stack + dup = flush % send a copy of the message to the console + FMshowpage % msg on a page by itself, so it can't be, say, black on black + /Helvetica findfont 12 scalefont setfont + 72 200 moveto show + 72 220 moveto show + FMshowpage % we might be in the middle of some EPS, where "showpage" + FMquit % and "quit" are redefined + } def % only used once at most, so no bind + +/FMVERSION { + FMversion ne { + (Adobe Frame product version does not match ps_prolog! Check installation;) + (also check ~/fminit and ./fminit for old versions) FMFAILURE + } if + } def % only used at startup, so no bind + +/FMBADEPSF { % Call with bad operator name on stack (as a string) + (Adobe's PostScript Language Reference Manual, 2nd Edition, section H.2.4) + (says your EPS file is not valid, as it calls X ) + dup dup (X) search pop exch pop exch pop length % parmstr errstr errstr indx + 5 -1 roll % errstr errstr index parmstr + putinterval % errstr + FMFAILURE + } def + +% standard concatprocs routine +/fmConcatProcs + { + /proc2 exch cvlit def/proc1 exch cvlit def/newproc proc1 length proc2 length add array def + newproc 0 proc1 putinterval newproc proc1 length proc2 putinterval newproc cvx +}def + +% Put all local variables here in alphabetical order. +FrameDict begin [ + /ALDsave + /FMdicttop + /FMoptop + /FMpointsize + /FMsaveobject + /b + /bitmapsave + /blut + /bpside + /bs + /bstring + /bwidth + /c + /cf + /cs + /cynu + /depth + /edown + /fh + /fillvals + /fw + /fx + /fy + /g + /gfile + /gindex + /grnt + /gryt + /gstring + /height + /hh + /i + /im + /indx + /is + /k + /kk + /landscape + /lb + /len + /llx + /lly + /m + /magu + /manualfeed + /n + /offbits + /onbits + /organgle + /orgbangle + /orgbfreq + /orgbproc + /orgbxfer + /orgfreq + /orggangle + /orggfreq + /orggproc + /orggxfer + /orgmatrix + /orgproc + /orgrangle + /orgrfreq + /orgrproc + /orgrxfer + /orgxfer + /pagesave + /paperheight + /papersizedict + /paperwidth + /pos + /pwid + /r + /rad + /redt + /sl + /str + /tran + /u + /urx + /ury + /val + /width + /width + /ws + /ww + /x + /x1 + /x2 + /xindex + /xpoint + /xscale + /xx + /y + /y1 + /y2 + /yelu + /yindex + /ypoint + /yscale + /yy +] { 0 def } forall + +% Start of PDF/Acrobat support + +% Bind def +/FmBD {bind def} bind def + +systemdict /pdfmark known { + /fMAcrobat true def + + % FmPD is a conditional PDFMark + /FmPD /pdfmark load def + + % FmPT is a show text operator which only show up when distiller is active + /FmPT /show load def + + % FmPD2 and FmPA are Acrobat 2.0-specific + currentdistillerparams /CoreDistVersion get 2000 ge { + + % FmPD2 is like FmPD but for Acrobat 2.0-specific PDF + /FmPD2 /pdfmark load def + + % x y/name FmPA + % is equivalent to + % [/Dest/name/View[/FitH x y FmDC exch pop]/DEST FmPD + % It is a shortcut for pagragraph Uinique ID designators whic occurr commonly. + /FmPA { mark exch /Dest exch 5 3 roll + /View [ /XYZ null 6 -2 roll FmDC exch pop null] /DEST FmPD + }FmBD + } { + % These are No-Ops for Distiller 1.0 + /FmPD2 /cleartomark load def + /FmPA {pop pop pop}FmBD + } ifelse +} { + % these are the No-Ops for regular PostScript + /fMAcrobat false def + /FmPD /cleartomark load def + /FmPD2 /cleartomark load def + /FmPT /pop load def + /FmPA {pop pop pop}FmBD +} ifelse + +% This convert a set of X Y coordinates from the current user space to the default +% PostScript coordinates needed by some pdfmark variants. We also convert to +% integer because the distiller doesn't always like floats! +/FmDC { + transform fMDefaultMatrix itransform cvi exch cvi exch +}FmBD + +% This converts four numbers into a bounding box making sure the first two are maller than the last two +/FmBx { + dup 3 index lt {3 1 roll exch} if + 1 index 4 index lt {4 -1 roll 3 1 roll exch 4 1 roll} if +}FmBD + +% End of PDF/Acrobat support + +% +% Color separation code +% + +% Constants. + +/FMnone 0 def +/FMcyan 1 def +/FMmagenta 2 def +/FMyellow 3 def +/FMblack 4 def +/FMcustom 5 def + +/fMNegative false def % we are inverting the page + +% Variables. + +/FrameSepIs FMnone def % separation we are printing +% If FrameSepIs is FMcustom, this is the custom color +/FrameSepBlack 0 def +/FrameSepYellow 0 def +/FrameSepMagenta 0 def +/FrameSepCyan 0 def +/FrameSepRed 1 def +/FrameSepGreen 1 def +/FrameSepBlue 1 def +/FrameCurGray 1 def +/FrameCurPat null def + +/FrameCurColors [ 0 0 0 1 0 0 0 ] def % c m y k r g b + +% Utility routines + +/FrameColorEpsilon .001 def % epsilon by which values can differ and sill be equal +/eqepsilon { % v1 v2 eqeps bool + sub dup 0 lt {neg} if + FrameColorEpsilon le +} bind def + +% are the cmyk and cmykrgb arrays on the stack the same color? +/FrameCmpColorsCMYK { % [ c1 m1 y1 k1 ] [ c2 m2 y2 k2 r2 g2 b2] -> bool + 2 copy 0 get exch 0 get eqepsilon { + 2 copy 1 get exch 1 get eqepsilon { + 2 copy 2 get exch 2 get eqepsilon { + 3 get exch 3 get eqepsilon + } {pop pop false} ifelse + }{pop pop false} ifelse + } {pop pop false} ifelse +} bind def +% are the rgb and cmykrgb arrays on the stack the same color? +/FrameCmpColorsRGB { % [ r1 g1 b1 ] [ c2 m2 y2 k2 r2 g2 b2] -> bool + 2 copy 4 get exch 0 get eqepsilon { + 2 copy 5 get exch 1 get eqepsilon { + 6 get exch 2 get eqepsilon + }{pop pop false} ifelse + } {pop pop false} ifelse +} bind def + +% convert r g b to c m y k +/RGBtoCMYK { % r g b + 1 exch sub % r g y + 3 1 roll % y r g + 1 exch sub % y r m + 3 1 roll % m y r + 1 exch sub % m y c + 3 1 roll % c m y + 3 copy % c m y c m y + 2 copy % c m y c m y m y + le { pop } { exch pop } ifelse % c m y c min(m,y) + 2 copy % c m y c min(m,y) c min(m,y) + le { pop } { exch pop } ifelse % c m y min(c, min(m,y)) + dup dup dup % c m y k k k k + 6 1 roll % c k m y k k k + 4 1 roll % c k m k y k k + 7 1 roll % k c k m k y k + sub % k c k m k y + 6 1 roll % y k c k m k + sub % y k c k m + 5 1 roll % m y k c k + sub % m y k c + 4 1 roll % c m y k +} bind def +/CMYKtoRGB { % c m y k CMYKtoRGB r g b + dup dup 4 -1 roll add % c m k k y+k + 5 1 roll 3 -1 roll add % y+k c k m+k + 4 1 roll add % m+k y+k c+k + 1 exch sub dup 0 lt {pop 0} if 3 1 roll % r m+k y+k + 1 exch sub dup 0 lt {pop 0} if exch % r b m+k + 1 exch sub dup 0 lt {pop 0} if exch % r g b +} bind def + +% Public routines + + +% Happens at the top of each page that is a separation +/FrameSepInit { + 1.0 RealSetgray +} bind def +% Tell the separation code that this separation is for a custom color +/FrameSetSepColor { % c m y k r g b + /FrameSepBlue exch def + /FrameSepGreen exch def + /FrameSepRed exch def + /FrameSepBlack exch def + /FrameSepYellow exch def + /FrameSepMagenta exch def + /FrameSepCyan exch def + /FrameSepIs FMcustom def + setCurrentScreen +} bind def +% Tell the separation code that this separation is Cyan +/FrameSetCyan { + /FrameSepBlue 1.0 def + /FrameSepGreen 1.0 def + /FrameSepRed 0.0 def + /FrameSepBlack 0.0 def + /FrameSepYellow 0.0 def + /FrameSepMagenta 0.0 def + /FrameSepCyan 1.0 def + /FrameSepIs FMcyan def + setCurrentScreen +} bind def + +% Tell the separation code that this separation is Magenta +/FrameSetMagenta { + /FrameSepBlue 1.0 def + /FrameSepGreen 0.0 def + /FrameSepRed 1.0 def + /FrameSepBlack 0.0 def + /FrameSepYellow 0.0 def + /FrameSepMagenta 1.0 def + /FrameSepCyan 0.0 def + /FrameSepIs FMmagenta def + setCurrentScreen +} bind def + +% Tell the separation code that this separation is Yellow +/FrameSetYellow { + /FrameSepBlue 0.0 def + /FrameSepGreen 1.0 def + /FrameSepRed 1.0 def + /FrameSepBlack 0.0 def + /FrameSepYellow 1.0 def + /FrameSepMagenta 0.0 def + /FrameSepCyan 0.0 def + /FrameSepIs FMyellow def + setCurrentScreen +} bind def + +% Tell the separation code that this separation is Black +/FrameSetBlack { + /FrameSepBlue 0.0 def + /FrameSepGreen 0.0 def + /FrameSepRed 0.0 def + /FrameSepBlack 1.0 def + /FrameSepYellow 0.0 def + /FrameSepMagenta 0.0 def + /FrameSepCyan 0.0 def + /FrameSepIs FMblack def + setCurrentScreen +} bind def + +% Tell the separation code we are not doing a separation +/FrameNoSep { % + /FrameSepIs FMnone def + setCurrentScreen +} bind def + +% Initialize the separation code with all the custom colors we are +% separating (not process colors) +/FrameSetSepColors { % list of arrays of [c m y k r g b] count + FrameDict begin + [ exch 1 add 1 roll ] + /FrameSepColors % array of arrays of colors we are separating + exch def end + } bind def + +% is this color array in the array of custom color separations? +/FrameColorInSepListCMYK { % [ c m y k ] -> bool + FrameSepColors { % color elem-of-array + exch dup 3 -1 roll % color color elem + FrameCmpColorsCMYK % color bool + { pop true exit } if + } forall % exits with either [color] or true + dup true ne {pop false} if + } bind def +/FrameColorInSepListRGB { % [ r g b ] -> bool + FrameSepColors { % color elem-of-array + exch dup 3 -1 roll % color color elem + FrameCmpColorsRGB % color bool + { pop true exit } if + } forall % exits with either [color] or true + dup true ne {pop false} if + } bind def + +% Level 1 color operators saved and redefined +/RealSetgray /setgray load def +/RealSetrgbcolor /setrgbcolor load def +/RealSethsbcolor /sethsbcolor load def +end + +% Setgray patch +/setgray { % num + FrameDict begin + FrameSepIs FMnone eq + { RealSetgray } + { % go to white unless the current sep color is black + FrameSepIs FMblack eq + { RealSetgray } + { FrameSepIs FMcustom eq + FrameSepRed 0 eq and + FrameSepGreen 0 eq and + FrameSepBlue 0 eq and { + RealSetgray + } { + 1 RealSetgray pop + } ifelse + } ifelse + } ifelse + end +} bind def +/setrgbcolor { % r g b + FrameDict begin + FrameSepIs FMnone eq + { RealSetrgbcolor } + { + 3 copy [ 4 1 roll ] % r g b [ r g b ] + FrameColorInSepListRGB + { + FrameSepBlue eq exch + FrameSepGreen eq and exch + FrameSepRed eq and + { 0 } { 1 } ifelse + } + { + FMPColor { + RealSetrgbcolor + currentcmykcolor + } { + RGBtoCMYK + } ifelse + FrameSepIs FMblack eq + {1.0 exch sub 4 1 roll pop pop pop} { + FrameSepIs FMyellow eq + {pop 1.0 exch sub 3 1 roll pop pop} { + FrameSepIs FMmagenta eq + {pop pop 1.0 exch sub exch pop } { + FrameSepIs FMcyan eq + {pop pop pop 1.0 exch sub } + {pop pop pop pop 1} ifelse } ifelse } ifelse } ifelse + } ifelse + RealSetgray + } + ifelse + end +} bind def +/sethsbcolor { + FrameDict begin + FrameSepIs FMnone eq + { RealSethsbcolor } + { + RealSethsbcolor % safe since we will overwrite the color state + currentrgbcolor % r g b - Let PostsCript to the conversion. + setrgbcolor % call our version + } + ifelse + end +} bind def +FrameDict begin + +/setcmykcolor where { + pop /RealSetcmykcolor /setcmykcolor load def +} { + /RealSetcmykcolor { + 4 1 roll + 3 { 3 index add 0 max 1 min 1 exch sub 3 1 roll} repeat + RealSetrgbcolor pop + } bind def +} ifelse +userdict /setcmykcolor { % c m y k + FrameDict begin + FrameSepIs FMnone eq + { RealSetcmykcolor } + { + 4 copy [ 5 1 roll ] + FrameColorInSepListCMYK + { + FrameSepBlack eq exch + FrameSepYellow eq and exch + FrameSepMagenta eq and exch + FrameSepCyan eq and + { 0 } { 1 } ifelse + } + { + FrameSepIs FMblack eq + {1.0 exch sub 4 1 roll pop pop pop} { + FrameSepIs FMyellow eq + {pop 1.0 exch sub 3 1 roll pop pop} { + FrameSepIs FMmagenta eq + {pop pop 1.0 exch sub exch pop } { + FrameSepIs FMcyan eq + {pop pop pop 1.0 exch sub } + {pop pop pop pop 1} ifelse } ifelse } ifelse } ifelse + } ifelse + RealSetgray + } + ifelse + end + } bind put + +% Set up a prototype pattern for PostScript Level 2 +fMLevel1 { + % set up screen functions for the patterns in PS level 1 + % each entry contains an angle, spot function, flipped spot function, + % gray level and frequency multiplier. + /patScreenDict 7 dict dup begin + <0f1e3c78f0e1c387> [ 45 { pop } {exch pop} .5 2 sqrt] FmBD + <0f87c3e1f0783c1e> [ 135 { pop } {exch pop} .5 2 sqrt] FmBD + [ 0 { pop } dup .5 2 ] FmBD + [ 90 { pop } dup .5 2 ] FmBD + <8142241818244281> [ 45 { 2 copy lt {exch} if pop} dup .75 2 sqrt] FmBD + <03060c183060c081> [ 45 { pop } {exch pop} .875 2 sqrt] FmBD + <8040201008040201> [ 135 { pop } {exch pop} .875 2 sqrt] FmBD + end def +} { % prototype level 2 pattern dictionary + % define some PostScript procedures for known jaggy patterns. + /patProcDict 5 dict dup begin + <0f1e3c78f0e1c387> { 3 setlinewidth -1 -1 moveto 9 9 lineto stroke + 4 -4 moveto 12 4 lineto stroke + -4 4 moveto 4 12 lineto stroke} bind def + <0f87c3e1f0783c1e> { 3 setlinewidth -1 9 moveto 9 -1 lineto stroke + -4 4 moveto 4 -4 lineto stroke + 4 12 moveto 12 4 lineto stroke} bind def + <8142241818244281> { 1 setlinewidth -1 9 moveto 9 -1 lineto stroke + -1 -1 moveto 9 9 lineto stroke } bind def + <03060c183060c081> { 1 setlinewidth -1 -1 moveto 9 9 lineto stroke + 4 -4 moveto 12 4 lineto stroke + -4 4 moveto 4 12 lineto stroke} bind def + <8040201008040201> { 1 setlinewidth -1 9 moveto 9 -1 lineto stroke + -4 4 moveto 4 -4 lineto stroke + 4 12 moveto 12 4 lineto stroke} bind def + end def + /patDict 15 dict dup begin + /PatternType 1 def % Always 1 for PS Level 2 + /PaintType 2 def % Uncolored pattern + /TilingType 3 def % constant spacing and faster tiling + /BBox [ 0 0 8 8 ] def % bounding box + /XStep 8 def % X offset + /YStep 8 def % Y offset + /PaintProc { + begin + patProcDict bstring known { + patProcDict bstring get exec + } { + 8 8 true [1 0 0 -1 0 8] bstring imagemask + } ifelse + end + } bind def + end def +} ifelse + +%combineColor puts together the current gray value (which could also be +%a fraction of on bits for a fill pattern and the current color and calls +%the appropriate function +% +/combineColor { + FrameSepIs FMnone eq + { + graymode fMLevel1 or not { + % Level 2 pattern + [/Pattern [/DeviceCMYK]] setcolorspace + FrameCurColors 0 4 getinterval aload pop FrameCurPat setcolor + } { + FrameCurColors 3 get 1.0 ge { + FrameCurGray RealSetgray + } { + fMAcrobat not FMPColor graymode and and { + 0 1 3 { + FrameCurColors exch get + 1 FrameCurGray sub mul + } for + RealSetcmykcolor + } { + 4 1 6 { + FrameCurColors exch get + graymode { + 1 exch sub 1 FrameCurGray sub mul 1 exch sub + } { + 1.0 lt {FrameCurGray} {1} ifelse + } ifelse + } for + RealSetrgbcolor + } ifelse + } ifelse + } ifelse + } { % separation case + FrameCurColors 0 4 getinterval aload + FrameColorInSepListCMYK { + FrameSepBlack eq exch + FrameSepYellow eq and exch + FrameSepMagenta eq and exch + FrameSepCyan eq and + FrameSepIs FMcustom eq and + { FrameCurGray } { 1 } ifelse + } { + FrameSepIs FMblack eq + {FrameCurGray 1.0 exch sub mul 1.0 exch sub 4 1 roll pop pop pop} { + FrameSepIs FMyellow eq + {pop FrameCurGray 1.0 exch sub mul 1.0 exch sub 3 1 roll pop pop} { + FrameSepIs FMmagenta eq + {pop pop FrameCurGray 1.0 exch sub mul 1.0 exch sub exch pop } { + FrameSepIs FMcyan eq + {pop pop pop FrameCurGray 1.0 exch sub mul 1.0 exch sub } + {pop pop pop pop 1} ifelse } ifelse } ifelse } ifelse + } ifelse + graymode fMLevel1 or not { + % Level 2 pattern + [/Pattern [/DeviceGray]] setcolorspace + FrameCurPat setcolor + } { + graymode not fMLevel1 and { + % Level 1 patterns are either all there or not there at all + dup 1 lt {pop FrameCurGray} if + } if + RealSetgray + } ifelse + } ifelse +} bind def + +/savematrix { + orgmatrix currentmatrix pop + } bind def +/restorematrix { + orgmatrix setmatrix + } bind def +/fMDefaultMatrix matrix defaultmatrix def +/fMatrix2 matrix def +/dpi 72 0 fMDefaultMatrix dtransform + dup mul exch dup mul add sqrt def + +% freq and sangle are used for ps Level 1 pattern building. +/freq dpi dup 72 div round dup 0 eq {pop 1} if 8 mul div def +/sangle 1 0 fMDefaultMatrix dtransform exch atan def + sangle fMatrix2 rotate + fMDefaultMatrix fMatrix2 concatmatrix + dup 0 get /sflipx exch def + 3 get /sflipy exch def + +% +% screen index depending on dpi +% - screenIndex smallint +/screenIndex { + 0 1 dpiranges length 1 sub { dup dpiranges exch get 1 sub dpi le {exit} {pop} ifelse } for +} bind def + +% +% These routines get the standard Adobe frequencies, angles, and spot functions +% depending on the DPI +% +% - getCyanScreen freq angle spotfunction +/getCyanScreen { + FMUseHighFrequencyScreens { CHighAngles CMHighFreqs} {CLowAngles CMLowFreqs} ifelse + screenIndex dup 3 1 roll get 3 1 roll get /FMSpotFunction load +} bind def + +% +% - getMagentaScreen freq angle spotFunction +/getMagentaScreen { + FMUseHighFrequencyScreens { MHighAngles CMHighFreqs } {MLowAngles CMLowFreqs} ifelse + screenIndex dup 3 1 roll get 3 1 roll get /FMSpotFunction load +} bind def + +% +% - getYellowScreen freq angle spotFunction +% note that some of these use a "tripple dot" function at 1/3 the frequency +/getYellowScreen { + FMUseHighFrequencyScreens { YHighTDot YHighFreqs} { YLowTDot YLowFreqs } ifelse + screenIndex dup 3 1 roll get 3 1 roll get { 3 div + {2 { 1 add 2 div 3 mul dup floor sub 2 mul 1 sub exch} repeat + FMSpotFunction } } {/FMSpotFunction load } ifelse + 0.0 exch +} bind def + +% +% - getBlackScreen freq angle spotFunction +/getBlackScreen { + FMUseHighFrequencyScreens { KHighFreqs } { KLowFreqs } ifelse + screenIndex get 45.0 /FMSpotFunction load +} bind def + +% +% - getSpotScreen freq angle spotFunction +/getSpotScreen { + getBlackScreen +} bind def + +% +% - getCompositeScreen freq angle spotFunction +/getCompositeScreen { + getBlackScreen +} bind def + +% FmSetScreen sets the screen for either PostScript Level 1 or Level 2 and optionally +% sets the accuratescreens flag in the latter case +% freq angle spotfunction FMSetScreen - +/FMSetScreen + fMLevel1 { /setscreen load + }{ { + 8 dict begin + /HalftoneType 1 def + /SpotFunction exch def + /Angle exch def + /Frequency exch def + /AccurateScreens FMUseAcccurateScreens def + currentdict end sethalftone + } bind } ifelse +def + +% This sets the default screen as was set at the beginning of the job +% - setDefaultScreen - +/setDefaultScreen { + FMPColor { + orgrxfer cvx orggxfer cvx orgbxfer cvx orgxfer cvx setcolortransfer + } + { + orgxfer cvx settransfer + } ifelse + orgfreq organgle orgproc cvx setscreen +} bind def + +% This sets the current screen depending on FrameSepIs +% - setCurrentScreen - +/setCurrentScreen { + FrameSepIs FMnone eq { + FMUseDefaultNoSeparationScreen { + setDefaultScreen + } { + getCompositeScreen FMSetScreen + } ifelse + } { + FrameSepIs FMcustom eq { + FMUseDefaultSpotSeparationScreen { + setDefaultScreen + } { + getSpotScreen FMSetScreen + } ifelse + } { + FMUseDefaultProcessSeparationScreen { + setDefaultScreen + } { + FrameSepIs FMcyan eq { + getCyanScreen FMSetScreen + } { + FrameSepIs FMmagenta eq { + getMagentaScreen FMSetScreen + } { + FrameSepIs FMyellow eq { + getYellowScreen FMSetScreen + } { + getBlackScreen FMSetScreen + } ifelse + } ifelse + } ifelse + } ifelse + } ifelse + } ifelse +} bind def + + +end + +% End of Color separation code +% + +/FMDOCUMENT { % xscale yscale edown negative paperwidth paperheight manfeed numcopies numfonts + array /FMfonts exch def % Why isn't this in FrameDict??? + /#copies exch def + FrameDict begin + 0 ne /manualfeed exch def + /paperheight exch def + /paperwidth exch def + 0 ne /fMNegative exch def % invert page + 0 ne /edown exch def % flip page along y axis + /yscale exch def + /xscale exch def + + fMLevel1 { + manualfeed {setmanualfeed} if + /FMdicttop countdictstack 1 add def % some PS's leave junk on dict ... + /FMoptop count def % ...or on operand stack... + setpapername % This stuff may alter the transfer/screen/angle + manualfeed {true} {papersize} ifelse % true->more work to do + {manualpapersize} {false} ifelse % true->more work to do + {desperatepapersize} {false} ifelse % true->failed completely + {papersizefailure} if + count -1 FMoptop {pop pop} for + countdictstack -1 FMdicttop {pop end} for %...if tray not installed + } + {2 dict + dup /PageSize [paperwidth paperheight] put + manualfeed {dup /ManualFeed manualfeed put} if + {setpagedevice} stopped {papersizefailure} if + } + ifelse % fMLevel1 + + FMPColor { + currentcolorscreen + cvlit /orgproc exch def + /organgle exch def + /orgfreq exch def + cvlit /orgbproc exch def + /orgbangle exch def + /orgbfreq exch def + cvlit /orggproc exch def + /orggangle exch def + /orggfreq exch def + cvlit /orgrproc exch def + /orgrangle exch def + /orgrfreq exch def + + currentcolortransfer + fMNegative { + 1 1 4 { + pop { 1 exch sub } fmConcatProcs 4 1 roll + } for + 4 copy + setcolortransfer + } if + cvlit /orgxfer exch def + cvlit /orgbxfer exch def + cvlit /orggxfer exch def + cvlit /orgrxfer exch def + } { + currentscreen + cvlit /orgproc exch def + /organgle exch def + /orgfreq exch def + + currenttransfer + fMNegative { + { 1 exch sub } fmConcatProcs + dup settransfer + } if + cvlit /orgxfer exch def + } ifelse + + end % FrameDict +} def % only used at startup, so no bind + +/FMBEGINPAGE { % pagewidth pageheight landscape color-arrays count + FrameDict begin % for the whole page... + /pagesave save def + 3.86 setmiterlimit + /landscape exch 0 ne def + landscape { % check for landscape + 90 rotate 0 exch dup /pwid exch def neg translate pop + }{ + pop /pwid exch def + } ifelse + edown { [-1 0 0 1 pwid 0] concat } if +% paint the whole page in "white". If the page is inverted, then +% this will actually paint our black background + 0 0 moveto paperwidth 0 lineto paperwidth paperheight lineto + 0 paperheight lineto 0 0 lineto 1 setgray fill + xscale yscale scale + /orgmatrix matrix def + gsave % for CLIP +} def % only used infrequently, so no bind + +/FMENDPAGE { + grestore % for CLIP + pagesave restore + end % FrameDict + showpage + } def % only used infrequently, so no bind + +/FMFONTDEFINE { % fontindex nonstd_encoding fontname -- + FrameDict begin + findfont % fontindex nonstd_encoding font + ReEncode % fontindex font' + 1 index exch % fontindex fontindex font' + definefont % fontindex font" + FMfonts 3 1 roll % FMfonts fontindex font" + put + end % FrameDict + } def % only used infrequently, so no bind + +/FMFILLS { + FrameDict begin dup + array /fillvals exch def + dict /patCache exch def + end % framedict + } def % Only called once, so no bind + +/FMFILL { + FrameDict begin + fillvals 3 1 roll put + end % FrameDict + } def % only used infrequently, so no bind + +% Set things to a known, quiescent state, for when we switch to another writer +/FMNORMALIZEGRAPHICS { + newpath + 1 setlinewidth + 0 setlinecap + 0 0 0 sethsbcolor + 0 setgray % Not FMsetgray; only called outside of our environment! + } bind def + +/FMBEGINEPSF { % llx lly urx ury fw fh fx fy + end % FrameDict + /FMEPSF save def % in userdict + /showpage {} def % this def is in userdict +%- See Adobe's "PostScript Language Reference Manual, 2nd Edition", page 714. +%- "...the following operators MUST NOT be used in an EPS file:" (emphasis ours) + /banddevice {(banddevice) FMBADEPSF} def + /clear {(clear) FMBADEPSF} def + /cleardictstack {(cleardictstack) FMBADEPSF} def % FMBADEPSF knows this is the longest! + /copypage {(copypage) FMBADEPSF} def + /erasepage {(erasepage) FMBADEPSF} def + /exitserver {(exitserver) FMBADEPSF} def + /framedevice {(framedevice) FMBADEPSF} def + /grestoreall {(grestoreall) FMBADEPSF} def + /initclip {(initclip) FMBADEPSF} def + /initgraphics {(initgraphics) FMBADEPSF} def +% /initmatrix {(initmatrix) FMBADEPSF} def % Aldus Freehand 4.0 epsf uses this harmlessly + /quit {(quit) FMBADEPSF} def + /renderbands {(renderbands) FMBADEPSF} def + /setglobal {(setglobal) FMBADEPSF} def + /setpagedevice {(setpagedevice) FMBADEPSF} def + /setshared {(setshared) FMBADEPSF} def + /startjob {(startjob) FMBADEPSF} def + /lettertray {(lettertray) FMBADEPSF} def + /letter {(letter) FMBADEPSF} def + /lettersmall {(lettersmall) FMBADEPSF} def + /11x17tray {(11x17tray) FMBADEPSF} def + /11x17 {(11x17) FMBADEPSF} def + /ledgertray {(ledgertray) FMBADEPSF} def + /ledger {(ledger) FMBADEPSF} def + /legaltray {(legaltray) FMBADEPSF} def + /legal {(legal) FMBADEPSF} def + /statementtray {(statementtray) FMBADEPSF} def + /statement {(statement) FMBADEPSF} def + /executivetray {(executivetray) FMBADEPSF} def + /executive {(executive) FMBADEPSF} def + /a3tray {(a3tray) FMBADEPSF} def + /a3 {(a3) FMBADEPSF} def + /a4tray {(a4tray) FMBADEPSF} def + /a4 {(a4) FMBADEPSF} def + /a4small {(a4small) FMBADEPSF} def + /b4tray {(b4tray) FMBADEPSF} def + /b4 {(b4) FMBADEPSF} def + /b5tray {(b5tray) FMBADEPSF} def + /b5 {(b5) FMBADEPSF} def + FMNORMALIZEGRAPHICS % in case we're in a strange state + [/fy /fx /fh /fw /ury /urx /lly /llx] {exch def} forall % neat trick + fx fw 2 div add fy fh 2 div add translate + rotate + fw 2 div neg fh 2 div neg translate + fw urx llx sub div fh ury lly sub div scale % then scale + llx neg lly neg translate % then compensate for LL offset + /FMdicttop countdictstack 1 add def % high-water mark of dict stack + /FMoptop count def % tricky! "/FMoptop" on stack + } bind def + +/FMENDEPSF { + count -1 FMoptop {pop pop} for % clear EPS junk from operand stack + countdictstack -1 FMdicttop {pop end} for % ditto for dict stack + FMEPSF restore + FrameDict begin % for the whole page... + } bind def + +FrameDict begin % put most defs here + +/setmanualfeed { +%%BeginFeature *ManualFeed True + statusdict /manualfeed true put +%%EndFeature + } bind def + +/max {2 copy lt {exch} if pop} bind def +/min {2 copy gt {exch} if pop} bind def +/inch {72 mul} def + +/pagedimen { % name width height + paperheight sub abs 16 lt exch % 16pt is an arbitrary slop amount + paperwidth sub abs 16 lt and + {/papername exch def} {pop} ifelse + } bind def + +/setpapername { % Already set up: paperwidth paperheight and manualfeed + /papersizedict 14 dict def % one for /papername, one for /unknown + papersizedict begin + /papername /unknown def % in case no match + /Letter 8.5 inch 11.0 inch pagedimen + /LetterSmall 7.68 inch 10.16 inch pagedimen + /Tabloid 11.0 inch 17.0 inch pagedimen + /Ledger 17.0 inch 11.0 inch pagedimen + /Legal 8.5 inch 14.0 inch pagedimen + /Statement 5.5 inch 8.5 inch pagedimen + /Executive 7.5 inch 10.0 inch pagedimen + /A3 11.69 inch 16.5 inch pagedimen + /A4 8.26 inch 11.69 inch pagedimen + /A4Small 7.47 inch 10.85 inch pagedimen + /B4 10.125 inch 14.33 inch pagedimen + /B5 7.16 inch 10.125 inch pagedimen + end + } bind def + +/papersize { + papersizedict begin + /Letter {lettertray letter} def + /LetterSmall {lettertray lettersmall} def + /Tabloid {11x17tray 11x17} def + /Ledger {ledgertray ledger} def + /Legal {legaltray legal} def + /Statement {statementtray statement} def + /Executive {executivetray executive} def + /A3 {a3tray a3} def + /A4 {a4tray a4} def + /A4Small {a4tray a4small} def + /B4 {b4tray b4} def + /B5 {b5tray b5} def + /unknown {unknown} def + papersizedict dup papername known {papername} {/unknown} ifelse get + end + statusdict begin stopped end % return true if more work to do + } bind def + +/manualpapersize { + papersizedict begin + /Letter {letter} def + /LetterSmall {lettersmall} def + /Tabloid {11x17} def + /Ledger {ledger} def + /Legal {legal} def + /Statement {statement} def + /Executive {executive} def + /A3 {a3} def + /A4 {a4} def + /A4Small {a4small} def + /B4 {b4} def + /B5 {b5} def + /unknown {unknown} def + papersizedict dup papername known {papername} {/unknown} ifelse get + end + stopped % return true if more work to do + } bind def + +/desperatepapersize { + statusdict /setpageparams known + { + paperwidth paperheight 0 1 + statusdict begin + {setpageparams} stopped % return true iff failed + end + } {true} ifelse % return true iff failed + } bind def + +/papersizefailure { + FMAllowPaperSizeMismatch not + { +(The requested paper size is not available in any currently-installed tray) +(Edit the PS file to "FMAllowPaperSizeMismatch true" to use default tray) + FMFAILURE } if + } def + +% +% Font re-encoding to include diacritics +% +/DiacriticEncoding [ + +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /space /exclam /quotedbl +/numbersign /dollar /percent /ampersand /quotesingle /parenleft +/parenright /asterisk /plus /comma /hyphen /period /slash /zero /one +/two /three /four /five /six /seven /eight /nine /colon /semicolon +/less /equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K +/L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash +/bracketright /asciicircum /underscore /grave /a /b /c /d /e /f /g /h +/i /j /k /l /m /n /o /p /q /r /s /t /u /v /w /x /y /z /braceleft /bar +/braceright /asciitilde /.notdef /Adieresis /Aring /Ccedilla /Eacute +/Ntilde /Odieresis /Udieresis /aacute /agrave /acircumflex /adieresis +/atilde /aring /ccedilla /eacute /egrave /ecircumflex /edieresis +/iacute /igrave /icircumflex /idieresis /ntilde /oacute /ograve +/ocircumflex /odieresis /otilde /uacute /ugrave /ucircumflex +/udieresis /dagger /.notdef /cent /sterling /section /bullet +/paragraph /germandbls /registered /copyright /trademark /acute +/dieresis /.notdef /AE /Oslash /.notdef /.notdef /.notdef /.notdef +/yen /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/ordfeminine /ordmasculine /.notdef /ae /oslash /questiondown +/exclamdown /logicalnot /.notdef /florin /.notdef /.notdef +/guillemotleft /guillemotright /ellipsis /.notdef /Agrave /Atilde +/Otilde /OE /oe /endash /emdash /quotedblleft /quotedblright +/quoteleft /quoteright /.notdef /.notdef /ydieresis /Ydieresis +/fraction /currency /guilsinglleft /guilsinglright /fi /fl /daggerdbl +/periodcentered /quotesinglbase /quotedblbase /perthousand +/Acircumflex /Ecircumflex /Aacute /Edieresis /Egrave /Iacute +/Icircumflex /Idieresis /Igrave /Oacute /Ocircumflex /.notdef /Ograve +/Uacute /Ucircumflex /Ugrave /dotlessi /circumflex /tilde /macron +/breve /dotaccent /ring /cedilla /hungarumlaut /ogonek /caron + +] def + +/ReEncode { % nonstd_encoding font -- reencodedfont + dup % nonstd_encoding font font + length % nonstd_encoding font dictlength + dict begin % nonstd_encoding font % currentdict = newdict + {% forall % forall is over font to be copied + 1 index /FID ne % skip FID + {def} % defs go into newfontdict which is currentdict + {pop pop} ifelse % copy all keys including /Encoding + } forall % nonstd_encoding + 0 eq {/Encoding DiacriticEncoding def} if % -- + currentdict % push a copy of the copied font dict onto operand stack + end % font' % before popping it off dictionary stack + } bind def + +FMPColor + % setup procs for color printing + { + + /BEGINBITMAPCOLOR { % iw, ih, width, height, theta, x y + BITMAPCOLOR} def + /BEGINBITMAPCOLORc { % iw, ih, width, height, theta, x y + BITMAPCOLORc} def + /BEGINBITMAPTRUECOLOR { + BITMAPTRUECOLOR } def + /BEGINBITMAPTRUECOLORc { + BITMAPTRUECOLORc } def + /BEGINBITMAPCMYK { + BITMAPCMYK } def + /BEGINBITMAPCMYKc { + BITMAPCMYKc } def + } + % setup procs for B&W printing + { + /BEGINBITMAPCOLOR { % iw, ih, width, height, theta, x y + BITMAPGRAY} def + /BEGINBITMAPCOLORc { % iw, ih, width, height, theta, x y + BITMAPGRAYc} def + /BEGINBITMAPTRUECOLOR { + BITMAPTRUEGRAY } def + /BEGINBITMAPTRUECOLORc { + BITMAPTRUEGRAYc } def + /BEGINBITMAPCMYK { + BITMAPCMYKGRAY } def + /BEGINBITMAPCMYKc { + BITMAPCMYKGRAYc } def + } +ifelse + +/K { % c m y k r g b SEPARATION + FMPrintAllColorsAsBlack { + dup 1 eq 2 index 1 eq and 3 index 1 eq and not + {7 {pop} repeat 0 0 0 1 0 0 0} if + } if + FrameCurColors astore + pop combineColor +} bind def +% +% graymode is true if we are just doing gray fills, this way do not keep calling +% setscreen. I don't know what the cost is on calling setscreen with defaults, but +% this is easy to keep track of, and we know for sure we aren't wasting cycles. +% if graymode is false and fMLevel1 is false, then we are using Level 2 patterns. +% +/graymode true def + +% used by level 1 patterns +% defaultflip matrixentry fmGetFlit -> eith -1 or 1 +fMLevel1 { + /fmGetFlip { + fMatrix2 exch get mul 0 lt { -1 } { 1 } ifelse + } FmBD +} if + +/setPatternMode { + fMLevel1 { + 2 index patScreenDict exch known { + pop pop + patScreenDict exch get aload pop % angle spot fspot gray mult + freq % freq + mul % times multiplier + 5 2 roll % angle spot fspot gray mult freq -> gray freq angle spot fspot + fMatrix2 currentmatrix 1 get 0 ne { + 3 -1 roll 90 add 3 1 roll % landscape + sflipx 1 fmGetFlip sflipy 2 fmGetFlip neg mul + } { % portrait + sflipx 0 fmGetFlip sflipy 3 fmGetFlip mul + } ifelse + 0 lt {exch pop} {pop} ifelse % take regular or flipped spot function + fMNegative { + {neg} fmConcatProcs % invert spot function + } if + bind + % we need to bypass any screen filter and go directly to systemdict + % to avoid problems with Kodak Precision calibration software + % + systemdict /setscreen get exec % leave graylevel on stack + /FrameCurGray exch def + } { + /bwidth exch def + /bpside exch def + /bstring exch def + /onbits 0 def /offbits 0 def + freq sangle landscape {90 add} if + {/ypoint exch def + /xpoint exch def + /xindex xpoint 1 add 2 div bpside mul cvi def + /yindex ypoint 1 add 2 div bpside mul cvi def + bstring yindex bwidth mul xindex 8 idiv add get + 1 7 xindex 8 mod sub bitshift and 0 ne fMNegative {not} if + {/onbits onbits 1 add def 1} + {/offbits offbits 1 add def 0} + ifelse + } + setscreen + offbits offbits onbits add div fMNegative {1.0 exch sub} if + /FrameCurGray exch def + } ifelse + } { % Level 2 version + pop pop + dup patCache exch known { + patCache exch get + } { % not in cache + dup + patDict /bstring 3 -1 roll put + patDict + 9 PatFreq screenIndex get div dup matrix scale +% 9 orgfreq +% organgle sin abs organgle cos abs add div +% dup 16 div round dup 0 le {pop 1} if % Unix pattern size +% dup 9 div round dup 0 le {pop 1} if % Mac larger (WYSIWYG) size +% div div dup matrix scale % This gives Unix pattern size. + makepattern + dup + patCache 4 -1 roll 3 -1 roll put + } ifelse + /FrameCurGray 0 def + /FrameCurPat exch def + } ifelse + /graymode false def + combineColor +} bind def + +/setGrayScaleMode { + graymode not { + /graymode true def + fMLevel1 { + setCurrentScreen + } if + } if + /FrameCurGray exch def + combineColor +} bind def + +/normalize { + transform round exch round exch itransform + } bind def + +/dnormalize { + dtransform round exch round exch idtransform + } bind def + +/lnormalize { % line widths are always odd so that arrow heads work + 0 dtransform exch cvi 2 idiv 2 mul 1 add exch idtransform pop + } bind def + +/H { % THICK + lnormalize setlinewidth + } bind def + +/Z { + setlinecap + } bind def + +% This is used to fill or stroke white behind a Level 2 pattern +/PFill { + graymode fMLevel1 or not { + gsave 1 setgray eofill grestore + } if +} bind def +/PStroke { + graymode fMLevel1 or not { + gsave 1 setgray stroke grestore + } if + stroke +} bind def + +/X { % TEXTURE + fillvals exch get + dup type /stringtype eq + {8 1 setPatternMode} % Silly to pass parameters here + {setGrayScaleMode} + ifelse + } bind def + +/V { % FILL + PFill gsave eofill grestore + } bind def + +/Vclip { + clip + } bind def + +/Vstrk { + currentlinewidth exch setlinewidth PStroke setlinewidth + } bind def + +/N { % PEN + PStroke + } bind def + +/Nclip { + strokepath clip newpath + } bind def + +/Nstrk { + currentlinewidth exch setlinewidth PStroke setlinewidth + } bind def + +/M {newpath moveto} bind def +/E {lineto} bind def +/D {curveto} bind def +/O {closepath} bind def + +/L { % POLYLINE + /n exch def + newpath + normalize + moveto + 2 1 n {pop normalize lineto} for + } bind def + +/Y { % POLYGON !!! + L % POLYLINE + closepath + } bind def + +/R { % RECT x1 y1 x2 y2 + /y2 exch def + /x2 exch def + /y1 exch def + /x1 exch def + x1 y1 + x2 y1 + x2 y2 + x1 y2 + 4 Y % POLYGON + } bind def + +/rarc % Leaves all sorts of junk on the operand stack for caller to clear off + {rad % arcto might fail if we're scaled way down + arcto + } bind def + +/RR { % ROUNDRECT x1 y1 x2 y2 r + /rad exch def + normalize + /y2 exch def + /x2 exch def + normalize + /y1 exch def + /x1 exch def + mark + newpath + { + x1 y1 rad add moveto + x1 y2 x2 y2 rarc + x2 y2 x2 y1 rarc + x2 y1 x1 y1 rarc + x1 y1 x1 y2 rarc + closepath + } stopped {x1 y1 x2 y2 R} if % in case rarc failed for degenerate arcs + cleartomark + } bind def + +/RRR { % ROUNDRECT ROTATED xs ys x1 y1 x2 y2 x3 y3 x4 y4 r + /rad exch def + normalize /y4 exch def /x4 exch def + normalize /y3 exch def /x3 exch def + normalize /y2 exch def /x2 exch def + normalize /y1 exch def /x1 exch def + newpath + normalize moveto % eats xs ys + mark + { + x2 y2 x3 y3 rarc + x3 y3 x4 y4 rarc + x4 y4 x1 y1 rarc + x1 y1 x2 y2 rarc + closepath + } stopped + {x1 y1 x2 y2 x3 y3 x4 y4 newpath moveto lineto lineto lineto closepath} if + cleartomark + } bind def + +/C { % CLIP + grestore + gsave + R % RECT + clip + setCurrentScreen +} bind def + +/CP { % CLIPPOLY p1x p1y p2x p2y ... n + grestore + gsave + Y % POLYGON + clip + setCurrentScreen +} bind def + +/F { % FONT + FMfonts exch get + FMpointsize scalefont + setfont + } bind def + +/Q { % POINTSIZE (& font) + /FMpointsize exch def + F % could be slightly optimized here + } bind def + +/T { % TEXT + moveto show + } bind def + +% Callers of RF (rotate/flip) must gsave (or save) first; (g)restore when done +/RF { % + rotate + 0 ne {-1 1 scale} if + } bind def + +/TF { % TEXTFLIPROTATE + gsave + moveto + RF + show + grestore + } bind def + +/P { % PADTEXT + moveto + 0 32 3 2 roll widthshow + } bind def + +/PF { % PADTEXTFLIPROTATE + gsave + moveto + RF + 0 32 3 2 roll widthshow + grestore + } bind def + +/S { % SPREADTEXT + moveto + 0 exch ashow + } bind def + +/SF { % SPREADTEXTFLIPROTATE + gsave + moveto + RF + 0 exch ashow + grestore + } bind def + +/B { % PADSPREADTEXT + moveto + 0 32 4 2 roll 0 exch awidthshow + } bind def + +/BF { % PADSPREADTEXTFLIPROTATE + gsave + moveto + RF + 0 32 4 2 roll 0 exch awidthshow + grestore + } bind def + +/G { % ARCFILL theta1 theta2 width height x y + gsave + newpath + normalize translate 0.0 0.0 moveto % eats x y + dnormalize scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + closepath + PFill fill + grestore + } bind def + +/Gstrk { + savematrix + newpath + 2 index 2 div add exch 3 index 2 div sub exch % theta1 theta2 width height x y + normalize 2 index 2 div sub exch 3 index 2 div add exch % theta1 theta2 width height x y + translate + scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + restorematrix + currentlinewidth exch setlinewidth PStroke setlinewidth + } bind def + +/Gclip { % ARCFILL theta1 theta2 width height x y swid + newpath + savematrix + normalize translate 0.0 0.0 moveto % eats x y + dnormalize scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + closepath + clip newpath + restorematrix + } bind def + +/GG { % ARCFILL ROTATED theta1 theta2 width height angle x y + gsave + newpath + normalize translate 0.0 0.0 moveto % eats x y + rotate % eats angle + dnormalize scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + closepath + PFill + fill + grestore + } bind def + +/GGclip { % ARCFILL ROTATED theta1 theta2 width height angle x y + savematrix + newpath + normalize translate 0.0 0.0 moveto % eats x y + rotate % eats angle + dnormalize scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + closepath + clip newpath + restorematrix + } bind def + +/GGstrk { % ARCFILL ROTATED swid theta1 theta2 width height angle x y + savematrix + newpath + normalize translate 0.0 0.0 moveto % eats x y + rotate % eats angle + dnormalize scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + closepath + restorematrix + currentlinewidth exch setlinewidth PStroke setlinewidth + } bind def + +/A { % ARCPEN theta1 theta2 width height x y + gsave + savematrix + newpath + 2 index 2 div add exch 3 index 2 div sub exch % theta1 theta2 width height x y + normalize 2 index 2 div sub exch 3 index 2 div add exch % theta1 theta2 width height x y + translate + scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + restorematrix + PStroke + grestore + } bind def + +/Aclip { + newpath + savematrix + normalize translate 0.0 0.0 moveto % eats x y + dnormalize scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + closepath + strokepath clip newpath + restorematrix +} bind def + +/Astrk { + Gstrk +} bind def + +/AA { % ARCPEN ROTATED theta1 theta2 width height angle x y + gsave + savematrix + newpath + % theta1 theta2 width height angle x y + 3 index 2 div add exch 4 index 2 div sub exch + % theta1 theta2 width height angle x y + normalize 3 index 2 div sub exch 4 index 2 div add exch + translate % eats x y + rotate % eats angle + scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + restorematrix + PStroke + grestore + } bind def + +/AAclip { + savematrix + newpath + normalize translate 0.0 0.0 moveto % eats x y + rotate % eats angle + dnormalize scale % eats width height + 0.0 0.0 1.0 5 3 roll arc % eats theta1 theta2 + closepath + strokepath clip newpath + restorematrix +} bind def + +/AAstrk { + GGstrk +} bind def + +/BEGINPRINTCODE { % -x -y width height + /FMdicttop countdictstack 1 add def % high-water mark of dict stack + /FMoptop count 7 sub def % tricky! 7 params on stack, plus "/FMoptop" + /FMsaveobject save def + userdict begin % insulate user from FrameDict; not in /FMdicttop count + /showpage {} def % this def is in userdict + FMNORMALIZEGRAPHICS % in case we're in a strange state + 3 index neg 3 index neg translate + } bind def + +/ENDPRINTCODE { + count -1 FMoptop {pop pop} for % clear user junk from operand stack + countdictstack -1 FMdicttop {pop end} for % ditto for dict stack + FMsaveobject restore % this is now safe, unless user very malicious + } bind def + +/gn { % get a number in a funny encoding scheme + 0 % result on stack + { 46 mul % shift old digits + cf read pop % get next character + 32 sub % zero is the space character + dup 46 lt {exit} if % quit if we're the last digit + 46 sub add % add in this digit and loop around for next + } loop + add % result on stack + } bind def + +/cfs { % create a string of length "sl" filled with "val"s + /str sl string def % create string as "str" + 0 1 sl 1 sub {str exch val put} for % fill array + str def % define real array name, too; name is on stack from caller + } bind def + +/ic [ % "case" stmt list of procedures that the image commands should call + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223 + 0 + {0 hx} {1 hx} {2 hx} {3 hx} {4 hx} {5 hx} {6 hx} {7 hx} {8 hx} {9 hx} + {10 hx} {11 hx} {12 hx} {13 hx} {14 hx} {15 hx} {16 hx} {17 hx} {18 hx} + {19 hx} {gn hx} {0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} + {13} {14} {15} {16} {17} {18} {19} {gn} {0 wh} {1 wh} {2 wh} {3 wh} + {4 wh} {5 wh} {6 wh} {7 wh} {8 wh} {9 wh} {10 wh} {11 wh} {12 wh} + {13 wh} {14 wh} {gn wh} {0 bl} {1 bl} {2 bl} {3 bl} {4 bl} {5 bl} {6 bl} + {7 bl} {8 bl} {9 bl} {10 bl} {11 bl} {12 bl} {13 bl} {14 bl} {gn bl} + {0 fl} {1 fl} {2 fl} {3 fl} {4 fl} {5 fl} {6 fl} {7 fl} {8 fl} {9 fl} + {10 fl} {11 fl} {12 fl} {13 fl} {14 fl} {gn fl} + ] def + +/ms { % make all the strings + /sl exch def % remember length of currently existing strings + /val 255 def % that's white + /ws cfs % make "ws" a string filled with white + /im cfs % and "im" is a complete image scanline + /val 0 def % that's black + /bs cfs % make "bs" a string filled with black + /cs cfs % here's where we'll put complete command lines + } bind def + +400 ms % make strings that will be plenty long for most applications + +/ip { % image procedure; reads and executes commands to make scanlines + is % leave image string and... + 0 % ...image position on stack all through this procedure + cf cs readline pop % get a string of commands + { ic exch get exec % execute next command + add % all commands leave a length on the stack; update pos + } forall % step through all commands + pop % get rid of image position pointer + % image string left on stack, so it's returned to image primitive + } bind def +/rip { % this is similar to ip above, except for 24 bit images + % this takes an extra argument, the width of the image + % do red + bis ris copy pop % copy blue to red + is + 0 + cf cs readline pop + { ic exch get exec + add + } forall + pop pop % remove is and position from stack + ris gis copy pop % copy red to green + dup is exch % position of green is width bytes into is + % do green + cf cs readline pop + { ic exch get exec + add + } forall + pop pop + gis bis copy pop % copy green to blue + dup add is exch % position of blue is 2*width bytes into is + % do blue + cf cs readline pop + { ic exch get exec + add + } forall + pop + + } bind def + +/rip4 { % this is similar to ip above, except for 32 bit images + % this takes an extra argument, the width of the image + % do cyan + kis cis copy pop % copy black to cyan + is + 0 + cf cs readline pop + { ic exch get exec + add + } forall + pop pop % remove is and position from stack + cis mis copy pop % copy cyan to magenta + dup is exch % position of magenta is width bytes into is + % do magenta + cf cs readline pop + { ic exch get exec + add + } forall + pop pop + mis yis copy pop % copy magenta to yellow + dup dup add is exch % position of yellow is 2*width bytes into is + % do yellow + cf cs readline pop + { ic exch get exec + add + } forall + pop pop + yis kis copy pop % copy yellow to black + 3 mul is exch % position of black is 3*width bytes into is + % do black + cf cs readline pop + { ic exch get exec + add + } forall + pop + + } bind def + + +/wh { % fill a number of bytes with "white" + /len exch def % number of bytes to fill + /pos exch def % position to put them at + ws 0 len getinterval im pos len getinterval copy pop + pos len % remember where we got to + } bind def + +/bl { % fill a number of bytes with "black" + /len exch def % number of bytes to fill + /pos exch def % position to put them at + bs 0 len getinterval im pos len getinterval copy pop + pos len % remember where we got to + } bind def + +/s1 1 string def + +/fl { % fill a number of bytes with a specific hex value + /len exch def % number of bytes to fill + /pos exch def % position to put them at + /val cf s1 readhexstring pop 0 get def + pos 1 pos len add 1 sub {im exch val put} for + pos len % remember where we got to + } bind def + +/hx { % read hex bytes directly; on entry, stack has + 3 copy getinterval % stack has + cf exch readhexstring pop pop % stack back to + } bind def + +/wbytes { % width depth -> wb find width in bytes given 1, 2, 8 or 24 or 32 + dup dup + 8 gt { pop 8 idiv mul } + { 8 eq {pop} {1 eq {7 add 8 idiv} {3 add 4 idiv} ifelse} ifelse } ifelse + } bind def +/BEGINBITMAPBWc { % iw, ih, width, height, theta, x y + 1 {} COMMONBITMAPc + } bind def +/BEGINBITMAPGRAYc { % iw, ih, width, height, theta, x y + 8 {} COMMONBITMAPc + } bind def +/BEGINBITMAP2BITc { % iw, ih, width, height, theta, x y + 2 {} COMMONBITMAPc + } bind def +% +% Common routine for imaging compressed images +% +/COMMONBITMAPc { % iw, ih, width, height, theta, x y depth proc + % (x,y) is the lower left corner of the image + /cvtProc exch def + /depth exch def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /lb width depth wbytes def % so "lb" has width in bytes + sl lb lt {lb ms} if % maybe make bigger strings + /bitmapsave save def % LW+ has a buggy memory leak! + cvtProc % run the desired proc after save has occurred + /is im 0 lb getinterval def % image substring + ws 0 lb getinterval is copy pop % whiten it + /cf currentfile def % evaluate "currentfile" only once + width height depth [width 0 0 height neg 0 height] % top to bottom + {ip} image % zap! + bitmapsave restore % avoid occasional disaster on the LW+ + grestore + } bind def +/BEGINBITMAPBW { % iw, ih, width, height, theta, x y + 1 {} COMMONBITMAP + } bind def +/BEGINBITMAPGRAY { % iw, ih, width, height, theta, x y + 8 {} COMMONBITMAP + } bind def +/BEGINBITMAP2BIT { % iw, ih, width, height, theta, x y + 2 {} COMMONBITMAP + } bind def +% +% Common routine for uncompressed images +% +/COMMONBITMAP { % iw, ih, width, height, theta, x y depth proc + /cvtProc exch def + /depth exch def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /bitmapsave save def % LW+ has a buggy memory leak! + cvtProc % run the desired proc after save has occurred + /is width depth wbytes string def + /cf currentfile def % evaluate "currentfile" only once + width height depth [width 0 0 height neg 0 height] % top to bottom + {cf is readhexstring pop} image + bitmapsave restore % avoid occasional disaster on the LW+ + grestore + } bind def + +% +% All this hairy color setup stuff gus wrote on the mac, I just copied and +% changed the variable names to be humanly readable. + +/ngrayt 256 array def +/nredt 256 array def +/nbluet 256 array def +/ngreent 256 array def + +fMLevel1 { +/colorsetup { + currentcolortransfer + /gryt exch def + /blut exch def + /grnt exch def + /redt exch def + 0 1 255 { + /indx exch def + /cynu 1 red indx get 255 div sub def + /magu 1 green indx get 255 div sub def + /yelu 1 blue indx get 255 div sub def + /kk cynu magu min yelu min def +% The HP PaintJet XL300 ignores the gray transfer curve but still sets its +% default black generation and undercolor removal functions as if it is +% used. This causes black colors not to work. Bug#56844 +% - We go back to the old (correct?) way of doing this since this code +% is now bypassed for PS Level 2 printers in favor of colorSetup2 which +% uses PS Level 2 indexed color, which is much cleaner. + /u kk currentundercolorremoval exec def +%- /u 0 def + nredt indx 1 0 cynu u sub max sub redt exec put + ngreent indx 1 0 magu u sub max sub grnt exec put + nbluet indx 1 0 yelu u sub max sub blut exec put + ngrayt indx 1 kk currentblackgeneration exec sub gryt exec put + } for + {255 mul cvi nredt exch get} + {255 mul cvi ngreent exch get} + {255 mul cvi nbluet exch get} + {255 mul cvi ngrayt exch get} + setcolortransfer + {pop 0} setundercolorremoval + {} setblackgeneration + } bind def +} +{ +% Here, we set up indexed color for imaging on PS Level 2 without mucking around +% with the transfer functions. + +/colorSetup2 { + [ /Indexed /DeviceRGB 255 + {dup red exch get 255 div + exch dup green exch get 255 div + exch blue exch get 255 div} + ] setcolorspace +} bind def +} ifelse + +% +% Setup a transfer function to convert psuedo color values into grayscale +% values based on the color lookup tables. +% +/fakecolorsetup { + /tran 256 string def + 0 1 255 {/indx exch def + tran indx + red indx get 77 mul + green indx get 151 mul + blue indx get 28 mul + add add 256 idiv put} for + currenttransfer + {255 mul cvi tran exch get 255.0 div} + exch fmConcatProcs settransfer +} bind def +% +% image a color image +% +/BITMAPCOLOR { % iw, ih, width, height, theta, x y + /depth 8 def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /bitmapsave save def + fMLevel1 { + colorsetup + /is width depth wbytes string def + /cf currentfile def % evaluate "currentfile" only once + width height depth [width 0 0 height neg 0 height] % top to bottom + {cf is readhexstring pop} {is} {is} true 3 colorimage + } { + colorSetup2 + /is width depth wbytes string def + /cf currentfile def % evaluate "currentfile" only once + 7 dict dup begin + /ImageType 1 def + /Width width def + /Height height def + /ImageMatrix [width 0 0 height neg 0 height] def + /DataSource {cf is readhexstring pop} bind def + /BitsPerComponent depth def + /Decode [0 255] def + end image + } ifelse + bitmapsave restore + grestore + } bind def +% +% Compressed color image rendering +% +/BITMAPCOLORc { % iw, ih, width, height, theta, x y + /depth 8 def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /lb width depth wbytes def % so "lb" has width in bytes + sl lb lt {lb ms} if % maybe make bigger strings + /bitmapsave save def + fMLevel1 { + colorsetup + /is im 0 lb getinterval def % image substring + ws 0 lb getinterval is copy pop % whiten it + /cf currentfile def % evaluate "currentfile" only once + width height depth [width 0 0 height neg 0 height] % top to bottom + {ip} {is} {is} true 3 colorimage + } { + colorSetup2 + /is im 0 lb getinterval def % image substring + ws 0 lb getinterval is copy pop % whiten it + /cf currentfile def % evaluate "currentfile" only once + 7 dict dup begin + /ImageType 1 def + /Width width def + /Height height def + /ImageMatrix [width 0 0 height neg 0 height] def + /DataSource {ip} bind def + /BitsPerComponent depth def + /Decode [0 255] def + end image + } ifelse + bitmapsave restore + grestore + } bind def +/BITMAPTRUECOLORc { + /depth 24 def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /lb width depth wbytes def % so "lb" has width in bytes + sl lb lt {lb ms} if % maybe make bigger strings + /bitmapsave save def + + /is im 0 lb getinterval def % Whole scanline + /ris im 0 width getinterval def % red part of im + /gis im width width getinterval def % green part of im + /bis im width 2 mul width getinterval def % blue part of im + + ws 0 lb getinterval is copy pop + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + {width rip pop ris} {gis} {bis} true 3 colorimage + bitmapsave restore + grestore + } bind def +/BITMAPCMYKc { + /depth 32 def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /lb width depth wbytes def % so "lb" has width in bytes + sl lb lt {lb ms} if % maybe make bigger strings + /bitmapsave save def + + /is im 0 lb getinterval def % Whole scanline + /cis im 0 width getinterval def % cyan part of im + /mis im width width getinterval def % magenta part of im + /yis im width 2 mul width getinterval def % yellow part of im + /kis im width 3 mul width getinterval def % black part of im + + ws 0 lb getinterval is copy pop + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + {width rip4 pop cis} {mis} {yis} {kis} true 4 colorimage + bitmapsave restore + grestore + } bind def +/BITMAPTRUECOLOR { + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /bitmapsave save def + /is width string def + /gis width string def + /bis width string def + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + { cf is readhexstring pop } + { cf gis readhexstring pop } + { cf bis readhexstring pop } + true 3 colorimage + bitmapsave restore + grestore + } bind def +/BITMAPCMYK { + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /bitmapsave save def + /is width string def + /mis width string def + /yis width string def + /kis width string def + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + { cf is readhexstring pop } + { cf mis readhexstring pop } + { cf yis readhexstring pop } + { cf kis readhexstring pop } + true 4 colorimage + bitmapsave restore + grestore + } bind def +% +% image a color image to a b&width device +% +/BITMAPTRUEGRAYc { + /depth 24 def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /lb width depth wbytes def % so "lb" has width in bytes + sl lb lt {lb ms} if % maybe make bigger strings + /bitmapsave save def + + /is im 0 lb getinterval def % Whole scanline + /ris im 0 width getinterval def % red part of im + /gis im width width getinterval def % green part of im + /bis im width 2 mul width getinterval def % blue part of im + ws 0 lb getinterval is copy pop + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + {width rip pop ris gis bis width gray} image + bitmapsave restore + grestore + } bind def +/BITMAPCMYKGRAYc { + /depth 32 def + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /lb width depth wbytes def % so "lb" has width in bytes + sl lb lt {lb ms} if % maybe make bigger strings + /bitmapsave save def + + /is im 0 lb getinterval def % Whole scanline + /cis im 0 width getinterval def % cyan part of im + /mis im width width getinterval def % magenta part of im + /yis im width 2 mul width getinterval def % yellow part of im + /kis im width 3 mul width getinterval def % black part of im + ws 0 lb getinterval is copy pop + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + {width rip pop cis mis yis kis width cgray} image + bitmapsave restore + grestore + } bind def +/cgray { % c m y k width + /ww exch def + /k exch def + /y exch def + /m exch def + /c exch def + 0 1 ww 1 sub { /i exch def c i get m i get y i get k i get CMYKtoRGB + .144 mul 3 1 roll .587 mul 3 1 roll .299 mul add add + c i 3 -1 roll floor cvi put } for + c + } bind def +/gray { % r g b width + /ww exch def + /b exch def + /g exch def + /r exch def + 0 1 ww 1 sub { /i exch def r i get .299 mul g i get .587 mul + b i get .114 mul add add r i 3 -1 roll floor cvi put } for + r + } bind def +/BITMAPTRUEGRAY { + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /bitmapsave save def + /is width string def + /gis width string def + /bis width string def + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + { cf is readhexstring pop + cf gis readhexstring pop + cf bis readhexstring pop width gray} image + bitmapsave restore + grestore + } bind def +/BITMAPCMYKGRAY { + gsave + % rotate about center of image + 3 index 2 div add exch % iw ih width height theta y+(height/2) x + 4 index 2 div add exch % iw ih width height theta x+(width/2) y+(height/2) + translate % iw ih width height theta + rotate % iw ih width height + 1 index 2 div neg % iw ih width height -(width/2) + 1 index 2 div neg % iw ih width height -(width/2) -(height/2) + translate % iw ih width height + scale % iw ih + /height exch def /width exch def + /bitmapsave save def + /is width string def + /yis width string def + /mis width string def + /kis width string def + /cf currentfile def + width height 8 [width 0 0 height neg 0 height] + { cf is readhexstring pop + cf mis readhexstring pop + cf yis readhexstring pop + cf kis readhexstring pop width cgray} image + bitmapsave restore + grestore + } bind def +/BITMAPGRAY { % iw, ih, width, height, theta, x y + 8 {fakecolorsetup} COMMONBITMAP + } bind def +/BITMAPGRAYc { % iw, ih, width, height, theta, x y + 8 {fakecolorsetup} COMMONBITMAPc + } bind def +/ENDBITMAP { + } bind def +end % of FrameDict definitions + +% OPI stuff + /ALDmatrix matrix def ALDmatrix currentmatrix pop +/StartALD { + /ALDsave save def + savematrix + ALDmatrix setmatrix + } bind def +/InALD { + restorematrix + } bind def +/DoneALD { + ALDsave restore + } bind def + +% Dashed lines stuff +/I { setdash } bind def +/J { [] 0 setdash } bind def + +%%EndProlog +%%BeginSetup +(5.0) FMVERSION +1 1 0 0 612 792 0 1 11 FMDOCUMENT +0 0 /Times-Bold FMFONTDEFINE +1 0 /Times-Roman FMFONTDEFINE +2 0 /Times-Italic FMFONTDEFINE +3 1 /Symbol FMFONTDEFINE +4 0 /Courier FMFONTDEFINE +32 FMFILLS +0 0 FMFILL +1 0.1 FMFILL +2 0.3 FMFILL +3 0.5 FMFILL +4 0.7 FMFILL +5 0.9 FMFILL +6 0.97 FMFILL +7 1 FMFILL +8 <0f1e3c78f0e1c387> FMFILL +9 <0f87c3e1f0783c1e> FMFILL +10 FMFILL +11 FMFILL +12 <8142241818244281> FMFILL +13 <03060c183060c081> FMFILL +14 <8040201008040201> FMFILL +16 1 FMFILL +17 0.9 FMFILL +18 0.7 FMFILL +19 0.5 FMFILL +20 0.3 FMFILL +21 0.1 FMFILL +22 0.03 FMFILL +23 0 FMFILL +24 FMFILL +25 FMFILL +26 <3333333333333333> FMFILL +27 <0000ffff0000ffff> FMFILL +28 <7ebddbe7e7dbbd7e> FMFILL +29 FMFILL +30 <7fbfdfeff7fbfdfe> FMFILL +%%EndSetup +%%Page: "i" 1 +%%BeginPaperSize: Letter +%%EndPaperSize +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +J +0 0 0 1 0 0 0 K +72 746 540 756 R +7 X +0 0 0 1 0 0 0 K +V +72 33.32 540 43.32 R +V +72 746 540 756 R +V +72 33.32 540 43.32 R +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 72 540 720 R +V +0 18 Q +0 X +(X Print Ser) 247.1 572 T +(vice) 334.91 572 T +0 10 Q +(Pr) 263.12 540.33 T +(otocol V) 273.49 540.33 T +(ersion 1.0) 307.77 540.33 T +(X Consortium Standard) 254.33 514.33 T +(X V) 252.62 501.33 T +(ersion 11, Release 6.4) 268.56 501.33 T +1 F +(A. Deininger) 279.89 440.33 T +(T) 291.92 427.33 T +(. Gilg) 297.3 427.33 T +( J. Miller) 287.8 414.33 T +(H. Phinne) 283.58 401.33 T +(y) 323.42 401.33 T +(C. Prince) 287.39 388.33 T +(He) 264.27 362.33 T +(wlett-P) 275.67 362.33 T +(ackard Co.) 304.42 362.33 T +(K. Samborn) 281.83 297.33 T +(R. Swick) 287.67 284.33 T +(X Consortium, Inc.) 267.39 258.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "i" 1 +%%Page: "ii" 2 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 746 540 756 R +7 X +0 0 0 1 0 0 0 K +V +72 33.32 540 43.32 R +V +72 746 540 756 R +V +72 33.32 540 43.32 R +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 72 540 720 R +V +1 10 Q +0 X +(Copyright \050c\051 1996 Hewlett-Packard Company) 72 569.33 T +(Copyright \050c\051 1996 International Business Machines, Inc.) 72 557.33 T +(Copyright \050c\051 1996 Sun Microsystems, Inc.) 72 545.33 T +(Copyright \050c\051 1996 Novell, Inc.) 72 533.33 T +(Copyright \050c\051 1996 Digital Equipment Corp.) 72 521.33 T +(Copyright \050c\051 1996 Fujitsu Limited) 72 509.33 T +(Copyright \050c\051 1996 Hitachi, Ltd.) 72 497.33 T +(Copyright \050c\051 1996 X Consortium, Inc.) 72 485.33 T +(Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated) 72 461.33 T +(documentation files \050the "Software"\051, to deal in the Software without restriction, including without limitation the) 72 449.33 T +(rights to use, copy, modify, merge, publish, distribute, sublicense, and sell copies of the Software, and to permit) 72 437.33 T +(persons to whom the Software is furnished to do so, subject to the following conditions:) 72 425.33 T +(The above copyright notice and this permission notice shall be included in all copies or substantial portions of the) 72 401.33 T +(Software.) 72 389.33 T +(THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,) 72 365.33 T +(INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A) 72 353.33 T +(PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE) 72 341.33 T +(LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF) 72 329.33 T +(CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE) 72 317.33 T +(SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.) 72 305.33 T +(Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to) 72 281.33 T +(promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.) 72 269.33 T +2 F +(X Window System) 72 245.33 T +1 F +( is a trademark of X Consortium, Inc.) 143.66 245.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "ii" 2 +%%Page: "1" 3 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 746 540 756 R +7 X +0 0 0 1 0 0 0 K +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 33.32 540 43.32 R +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 72 540 720 R +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 18 Q +0 X +(T) 238.33 708 T +(able of Contents) 248.68 708 T +1 10 Q +(1) 72 598.33 T +(Ov) 90 598.33 T +(ervie) 102.07 598.33 T +(w) 121.81 598.33 T +(...................................................................................................................................................) 130 598.33 T +(1) 499 598.33 T +(2) 72 581.33 T +(Protocols) 90 581.33 T +(...................................................................................................................................................) 130 581.33 T +(2) 499 581.33 T +0 0 0 1 0 0 0 K +(2.1) 108 569.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Formats, Syntactic Conventions, and Common Types) 126 569.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(.............................................................) 345 569.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(2) 499 569.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(2.2) 108 557.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Errors) 126 557.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(.........................................................................................................................................) 155 557.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(2) 499 557.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(2.3) 108 545.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( X Print Service Requests) 126 545.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(...........................................................................................................) 230 545.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(2) 499 545.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(2.4) 108 533.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Events) 126 533.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(......................................................................................................................................) 157.5 533.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(11) 494 533.33 T +0 0 0 1 0 0 0 K +(3) 72 516.33 T +(X Print Attrib) 90 516.33 T +(utes) 145.36 516.33 T +(....................................................................................................................................) 162.5 516.33 T +(13) 494 516.33 T +0 0 0 1 0 0 0 K +(3.1) 108 504.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Attribute Value Defaults And Validation) 126 504.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(................................................................................) 292.5 504.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(13) 494 504.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(3.2) 108 492.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Server Attributes) 126 492.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(......................................................................................................................) 197.5 492.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(14) 494 492.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(3.3) 108 480.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Printer Attributes) 126 480.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(.....................................................................................................................) 200 480.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(14) 494 480.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(3.4) 108 468.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Job Attributes) 126 468.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(...........................................................................................................................) 185 468.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(17) 494 468.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(3.5) 108 456.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Document Attributes) 126 456.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(...............................................................................................................) 215 456.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(17) 494 456.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(3.6) 108 444.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Page Attributes) 126 444.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(........................................................................................................................) 192.5 444.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(18) 494 444.33 T +0 0 0 1 0 0 0 K +(4) 72 427.33 T +(Communication with the Print Dialog Manager) 90 427.33 T +(.....................................................................................) 280 427.33 T +(20) 494 427.33 T +(5) 72 410.33 T +(Protocol Encoding) 90 410.33 T +(...................................................................................................................................) 165 410.33 T +(22) 494 410.33 T +0 0 0 1 0 0 0 K +(5.1) 108 398.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Request Protocol Encoding) 126 398.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(.....................................................................................................) 240 398.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(22) 494 398.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(5.2) 108 386.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Event Protocol Encoding) 126 386.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(.........................................................................................................) 230 386.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(31) 494 386.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(5.3) 108 374.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +( Error Protocol Encoding) 126 374.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(..........................................................................................................) 227.5 374.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(32) 494 374.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "1" 3 +%%Page: "2" 4 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 746 540 756 R +7 X +0 0 0 1 0 0 0 K +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 33.32 540 43.32 R +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 72 540 720 R +V +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "2" 4 +%%Page: "1" 5 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Ov) 72 746.67 T +(er) 89.75 746.67 T +(view) 102.04 746.67 T +(1) 533 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 18 Q +(1) 72 699 T +(Ov) 108 699 T +(er) 130.82 699 T +(view) 146.63 699 T +1 10 Q +(X Print Service is an X e) 108 666.33 T +(xtension that allo) 207.28 666.33 T +(ws X imaging to non-display de) 275.92 666.33 T +(vices such as printers and f) 403.72 666.33 T +(ax) 511.65 666.33 T +(machines. The core of the X Print Service is the X Print Serv) 108 654.33 T +(er) 351.98 654.33 T +(.) 359.2 654.33 T +(Applications that require printing operations can mak) 108 630.33 T +(e a connection to X Print Serv) 321.76 630.33 T +(er and list the a) 442.15 630.33 T +(v) 503.05 630.33 T +(ailable) 507.8 630.33 T +(printers using the) 108 618.33 T +0 F +(PrintGetPrinterList) 179.94 618.33 T +1 F +( request. After selecting a printer) 265.48 618.33 T +(, an application must create and set) 396.71 618.33 T +(a print conte) 108 606.33 T +(xt using the) 157.84 606.33 T +0 F +(PrintCr) 207.01 606.33 T +(eateContext) 240.71 606.33 T +1 F +( and) 291.8 606.33 T +0 F +(PrintSetContext) 311.24 606.33 T +1 F +( requests.) 380.67 606.33 T +(The \322print conte) 108 582.33 T +(xt\323 is a fundamental X Print Service concept. A print conte) 173.39 582.33 T +(xt:) 409.59 582.33 T +(\245) 108 564.33 T +(Contains a printer\325) 126 564.33 T +(s def) 200.44 564.33 T +(ault capabilities) 219.5 564.33 T +(\245) 108 552.33 T +(Contains a printer\325) 126 552.33 T +(s range of capabilities) 200.44 552.33 T +(\245) 108 540.33 T +(Maintains the state of the settings on a printer) 126 540.33 T +(\245) 108 528.33 T +(Maintains the state of rendering ag) 126 528.33 T +(ainst a printer) 265.09 528.33 T +(\245) 108 516.33 T +(Maintains rendered output) 126 516.33 T +-0.2 (A print conte) 108 492.33 P +-0.2 (xt also af) 160.23 492.33 P +-0.2 (fects ho) 196.24 492.33 P +-0.2 (w the DDX dri) 227.17 492.33 P +-0.2 (v) 286.04 492.33 P +-0.2 (er generates its page description language \050PDL\051, and ho) 290.89 492.33 P +-0.2 (w the) 515.95 492.33 P +-0.22 (PDL is submitted to a spooler) 108 480.33 P +-0.22 (. It may af) 225.54 480.33 P +-0.22 (fect fonts and other elements in the DDX layer of the X Print Serv) 265.73 480.33 P +-0.22 (er) 528 480.33 P +-0.22 (.) 535.22 480.33 P +(Printer capabilities are de\336ned by attrib) 108 456.33 T +(ute pools within the print conte) 265.83 456.33 T +(xt. The) 390.4 456.33 T +(y contain information related) 418.58 456.33 T +-0.11 (to a conte) 108 444.33 P +-0.11 (xt\325) 146.51 444.33 P +-0.11 (s serv) 157.07 444.33 P +-0.11 (er) 179.86 444.33 P +-0.11 (, printer) 187.23 444.33 P +-0.11 (, job, document, and page options.) 218.38 444.33 P +0 F +-0.11 (PrintGetAttrib) 357.71 444.33 P +-0.11 (utes) 421.94 444.33 P +1 F +-0.11 ( and) 439.16 444.33 P +0 F +-0.11 (PrintSetAttrib) 458.38 444.33 P +-0.11 (utes) 520.39 444.33 P +1 F +(are used to access and modify attrib) 108 432.33 T +(ute pools.) 251.1 432.33 T +0 F +(PrintStartJ) 108 408.33 T +(ob) 156.73 408.33 T +1 F +( and) 167.29 408.33 T +0 F +(PrintEndJ) 186.73 408.33 T +(ob) 231.59 408.33 T +1 F +( are used to delineate print jobs. A \322job\323 is a collection of documents) 242.15 408.33 T +(delineated by) 108 396.33 T +0 F +(PrintStartDoc) 164.1 396.33 T +1 F +( and) 224.64 396.33 T +0 F +(PrintEndDoc) 244.08 396.33 T +1 F +(. Each document is, in turn, a collection of \322pages\323. Upon) 300.75 396.33 T +(completion the serv) 108 384.33 T +(er sends an) 186.73 384.33 T +(y resulting PDL to a print spooler) 231.01 384.33 T +(, or mak) 365.05 384.33 T +(es it a) 398 384.33 T +(v) 421.13 384.33 T +(ailable for retrie) 425.88 384.33 T +(v) 490.05 384.33 T +(al by an) 494.8 384.33 T +(application.) 108 372.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "1" 5 +%%Page: "2" 6 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(2) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocols) 466.22 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(2) 72 749.33 T +(Pr) 448.27 749.33 T +(otocols) 462.78 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 18 Q +0 X +(2) 72 699 T +(Pr) 108 699 T +(otocols) 126.67 699 T +0 14 Q +(2.1) 72 661.67 T +(F) 108 661.67 T +(ormats, Syntactic Con) 116.2 661.67 T +(v) 248.24 661.67 T +(entions, and Common T) 255.1 661.67 T +(ypes) 397.97 661.67 T +1 10 Q +(The type PCONTEXT is a 32-bit v) 108 637.33 T +(alue. Its top three bits are guaranteed to be zero.) 247.74 637.33 T +(Refer to the) 108 613.33 T +2 F +(X W) 157.71 613.33 T +(indow System) 174.1 613.33 T +1 F +( Protocol speci\336cation for a description of other formats, syntactic con) 228.82 613.33 T +(v) 510.32 613.33 T +(en-) 515.17 613.33 T +(tions and common types established in that publication and used in the current document as well.) 108 601.33 T +0 14 Q +(2.2) 72 565.67 T +(Err) 108 565.67 T +(ors) 129.52 565.67 T +1 10 Q +(X Print Service can return the follo) 108 541.33 T +(wing messages, in addition to X core request errors.) 248.28 541.33 T +0 F +(XPBadContext) 108 517.33 T +1 F +(An incorrect print conte) 198 517.33 T +(xt ID w) 293.66 517.33 T +(as speci\336ed.) 324.11 517.33 T +0 F +(XPBadSequence) 108 493.33 T +1 F +(Requests were not speci\336ed in the proper order with respect to other) 198 493.33 T +(requests. F) 198 481.33 T +(or e) 241.18 481.33 T +(xample, a request w) 256.3 481.33 T +(as speci\336ed before a) 336.18 481.33 T +0 F +(PrintSetContext) 420.04 481.33 T +1 F +(request.) 198 469.33 T +-0.24 (Other errors that are conte) 108 445.33 P +-0.24 (xt speci\336c for a particular request are documented in the description of the request) 211.83 445.33 P +-0.24 (itself. If the abo) 108 433.33 P +-0.24 (v) 170.45 433.33 P +-0.24 (e errors ha) 175.3 433.33 P +-0.24 (v) 216.82 433.33 P +-0.24 (e a speci\336c meaning for a particular request, the) 221.66 433.33 P +-0.24 (y are documented in the request) 411.48 433.33 P +(itself as well.) 108 421.33 T +0 14 Q +(2.3) 72 385.67 T +(X Print Ser) 108 385.67 T +(vice Requests) 176.29 385.67 T +0 12 Q +(PrintCr) 108 330 T +(eateContext) 148.44 330 T +1 10 Q +(conte) 108 310.33 T +(xt-id: PCONTEXT) 129.51 310.33 T +(printer) 108 298.33 T +(-name: STRING8) 134.46 298.33 T +(locale: STRING8) 108 286.33 T +(Errors:) 108 262.33 T +0 F +(Match, IDChoice) 138.27 262.33 T +1 F +(This request creates a ne) 108 238.33 T +(w print conte) 206.05 238.33 T +(xt and assigns conte) 258.67 238.33 T +(xt-id to it. The attrib) 338.79 238.33 T +(utes associated with the ne) 419.98 238.33 T +(w) 526.38 238.33 T +(conte) 108 226.33 T +(xt are those determined by the printer) 129.51 226.33 T +(-name. Printer) 279.28 226.33 T +(-name is encoded in COMPOUND_TEXT) 336.29 226.33 T +(.) 506.08 226.33 T +-0.28 (The client must select the conte) 108 202.33 P +-0.28 (xt-id by ORing some combination of bits in the connection resource-id-mask) 232.82 202.33 P +(with the resource-id-base.) 108 190.33 T +(The locale ar) 108 166.33 T +(gument is used as a \322hint\323 to the print serv) 160.02 166.33 T +(er) 330.13 166.33 T +(, and is used to initialize attrib) 337.5 166.33 T +(ute pools with an) 458.13 166.33 T +(y) 526.59 166.33 T +(localized attrib) 108 154.33 T +(ute v) 167.51 154.33 T +(alues.) 186.98 154.33 T +(A) 108 130.33 T +0 F +(Match) 117.72 130.33 T +1 F +( error is generated when the printer) 145.49 130.33 T +(-name does not e) 285.8 130.33 T +(xist.) 353.69 130.33 T +72 322 90 340.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 340.8 72 322.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 340.8 90 340.8 2 L +0.5 H +N +72 340.8 72 322.8 2 L +N +72 340.8 90 340.8 2 L +N +0 0 612 792 C +72 260 90 278 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 278 72 260 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 260 90 260 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "2" 6 +%%Page: "3" 7 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocols) 86.52 746.67 T +(3) 533 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 12 Q +(PrintSetContext) 108 703 T +1 10 Q +(conte) 108 683.33 T +(xt: PCONTEXT or) 129.51 683.33 T +0 F +(None) 208.12 683.33 T +1 F +(Errors:) 108 659.33 T +0 F +( XPBadContext) 135.77 659.33 T +1 F +-0.03 (This request associates the conte) 108 635.33 P +-0.03 (xt speci\336ed with all subsequent print operations for this client. If conte) 238.28 635.33 P +-0.03 (xt is) 520.6 635.33 P +0 F +-0.1 (None) 108 623.33 P +1 F +-0.1 (, the print conte) 130.22 623.33 P +-0.1 (xt pre) 192.54 623.33 P +-0.1 (viously associated with this client is unset. If no print conte) 215.24 623.33 P +-0.1 (xt w) 451.59 623.33 P +-0.1 (as pre) 468.89 623.33 P +-0.1 (viously set,) 492.14 623.33 P +(then no action is tak) 108 611.33 T +(en when) 188.45 611.33 T +0 F +(None) 224.55 611.33 T +1 F +(is speci\336ed.) 249.27 611.33 T +(The e) 108 587.33 T +(x) 130.34 587.33 T +(ecution of the) 135.19 587.33 T +0 F +(PrintSetContext) 192.68 587.33 T +1 F +( request may af) 262.11 587.33 T +(fect the interpretation of the font path. The font path) 323.23 587.33 T +-0.1 (contains font path elements for all printers associated with a print serv) 108 575.33 P +-0.1 (er) 387.56 575.33 P +-0.1 (. Only those associated with the cur-) 394.78 575.33 P +(rent print conte) 108 563.33 T +(xt are returned and used for print rendering.) 168.95 563.33 T +0 12 Q +(PrintGetContext) 108 508 T +3 10 Q +(\256) 100.8 488.33 T +1 F +(conte) 108 472.33 T +(xt: PCONTEXT or None) 129.51 472.33 T +(This request returns the current print conte) 108 448.33 T +(xt for the connection.) 278.37 448.33 T +0 12 Q +(PrintDestr) 108 393 T +(oyContext) 162.43 393 T +1 10 Q +(conte) 108 373.33 T +(xt: PCONTEXT) 129.51 373.33 T +(Errors:) 108 349.33 T +0 F +(XPBadContext) 138.27 349.33 T +1 F +-0.21 (This request unsets and destro) 108 325.33 P +-0.21 (ys a print conte) 227.61 325.33 P +-0.21 (xt. If a print conte) 288.21 325.33 P +-0.21 (xt is destro) 359.16 325.33 P +-0.21 (yed before print operations associ-) 402.53 325.33 P +-0.09 (ated with it ha) 108 313.33 P +-0.09 (v) 164.47 313.33 P +-0.09 (e been completed, the print serv) 169.32 313.33 P +-0.09 (er cancels all those operations as if a) 296.47 313.33 P +0 F +-0.09 (CancelJ) 444.6 313.33 P +-0.09 (ob) 478.89 313.33 P +1 F +-0.09 ( request had) 489.45 313.33 P +(been issued.) 108 301.33 T +0 12 Q +(PrintGetPrinterList) 108 246 T +1 10 Q +(printer) 108 226.33 T +(-name: STRING8) 134.46 226.33 T +(locale: STRING8) 108 214.33 T +3 F +(\256) 100.8 198.33 T +1 F +(printers: LIST) 108 182.33 T +(ofPRINTER) 164.14 182.33 T +(where:) 108 168.33 T +(PRINTER:) 126 156.33 T +(name: STRING8) 180 156.33 T +(description: STRING8) 180 144.33 T +(This request retrie) 108 108.33 T +(v) 180.51 108.33 T +(es a list of all printers supported on a print serv) 185.36 108.33 T +(er) 373.52 108.33 T +(.) 380.74 108.33 T +72 692.2 90 711 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 711 72 693 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 711 90 711 2 L +0.5 H +N +72 711 72 693 2 L +N +72 711 90 711 2 L +N +0 0 612 792 C +72 657 90 675 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 675 72 657 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 657 90 657 2 L +N +0 0 612 792 C +72 500 90 518.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 518.8 72 500.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 518.8 90 518.8 2 L +0.5 H +N +72 518.8 72 500.8 2 L +N +72 518.8 90 518.8 2 L +N +0 0 612 792 C +72 470 90 488 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 488 72 470 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 470 90 470 2 L +N +0 0 612 792 C +72 385 90 403.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 403.8 72 385.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 403.8 90 403.8 2 L +0.5 H +N +72 403.8 72 385.8 2 L +N +72 403.8 90 403.8 2 L +N +0 0 612 792 C +72 347 90 365 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 365 72 347 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 347 90 347 2 L +N +0 0 612 792 C +72 238 90 256.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 256.8 72 238.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 256.8 90 256.8 2 L +0.5 H +N +72 256.8 72 238.8 2 L +N +72 256.8 90 256.8 2 L +N +0 0 612 792 C +72 130 90 148 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 148 72 130 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 130 90 130 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "3" 7 +%%Page: "4" 8 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(4) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocols) 466.22 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(4) 72 749.33 T +(Pr) 448.27 749.33 T +(otocols) 462.78 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 X +(If printer) 108 704.33 T +(-name is an empty string, then a list of all printers is returned. Otherwise the print record that) 143.62 704.33 T +(matches the printer) 108 692.33 T +(-name speci\336ed is returned. If no records match printer) 184.45 692.33 T +(-name, then an empty list is) 404.47 692.33 T +(returned.) 108 680.33 T +(printer) 108 656.33 T +(-name is a COMPOUND_TEXT string. The name and description \336elds returned are) 134.46 656.33 T +(COMPOUND_TEXT) 108 644.33 T +(. If printer) 195.03 644.33 T +(-name is pro) 235.65 644.33 T +(vided in a code-set that the print serv) 285.49 644.33 T +(er cannot con) 433.37 644.33 T +(v) 486.84 644.33 T +(ert, then it) 491.69 644.33 T +(may not be possible to locate the requested printer) 108 632.33 T +(.) 308.53 632.33 T +(The locale ar) 108 608.33 T +(gument is used as a \322hint\323 to locate a localized description for each printer in the list. If the) 160.02 608.33 T +(print serv) 108 596.33 T +(er cannot interpret the hint, then it describes the printers in the serv) 145.9 596.33 T +(er\325) 413.76 596.33 T +(s current locale.) 424.31 596.33 T +0 12 Q +(PrintGetScr) 108 541 T +(eenOfContext) 170.44 541 T +3 10 Q +(\256) 100.8 521.33 T +1 F +(root: WINDO) 108 505.33 T +(W) 163.47 505.33 T +(Errors:) 108 481.33 T +0 F +(XPBadContext) 138.27 481.33 T +1 F +(This request returns the root windo) 108 457.33 T +(w associated with the current print conte) 248.01 457.33 T +(xt.) 410.05 457.33 T +-0.02 (Each printer supported by a print serv) 108 433.33 P +-0.02 (er is associated with e) 258.81 433.33 P +-0.02 (xactly one of the screens returned in the connec-) 346.33 433.33 P +(tion setup reply) 108 421.33 T +(.) 169.57 421.33 T +0 12 Q +(PrintStartJ) 108 366 T +(ob) 166.48 366 T +1 10 Q +(output-mode: {) 108 346.33 T +0 F +(XPSpool, XPGetData) 169.19 346.33 T +1 F +(}) 260.85 346.33 T +(Errors:) 108 322.33 T +0 F +(XPBadSequence, V) 138.27 322.33 T +(alue) 220.13 322.33 T +1 F +-0.17 (This request signals the be) 108 298.33 P +-0.17 (ginning of a ne) 213.29 298.33 P +-0.17 (w print job) 272.82 298.33 P +-0.17 (. It results in the generation of an) 315.98 298.33 P +0 F +-0.17 (XPPrintNotify) 449.36 298.33 P +1 F +-0.17 ( e) 511.57 298.33 P +-0.17 (v) 518.09 298.33 P +-0.17 (ent,) 522.95 298.33 P +(with the detail \336eld set to) 108 286.33 T +0 F +(XPStartJ) 211.89 286.33 T +(obNotify) 251.73 286.33 T +1 F +(.) 288.3 286.33 T +(If output-mode is set to) 108 262.33 T +0 F +(XPSpool) 203.83 262.33 T +1 F +(, then the document data is typically sent to a spooler) 241.06 262.33 T +(.) 452.99 262.33 T +-0.02 (If output-mode is set to) 108 238.33 P +0 F +-0.02 (XPGetData) 203.74 238.33 P +1 F +-0.02 (, then the document data is made a) 253.17 238.33 P +-0.02 (v) 391.16 238.33 P +-0.02 (ailable to) 395.91 238.33 P +0 F +-0.02 (PrintGetDocumentData) 435.32 238.33 P +1 F +-0.22 (and the resulting job is not spooled. In this case, the print serv) 108 226.33 P +-0.22 (er suspends processing further requests on this) 352.96 226.33 P +(print conte) 108 214.33 T +(xt until some other client sends) 150.9 214.33 T +0 F +(PrintGetDocumentData.) 278.12 214.33 T +1 F +(Subsequent operations that use the) 385.32 214.33 T +(print conte) 108 202.33 T +(xt may be suspended at an) 150.9 202.33 T +(y time pending the processing of) 256.01 202.33 T +0 F +(PrintGetDocumentData) 389.33 202.33 T +1 F +( replies to) 491.53 202.33 T +(read an) 108 190.33 T +(y b) 137 190.33 T +(uf) 149.3 190.33 T +(fered output.) 157.38 190.33 T +-0.29 (An) 108 166.33 P +-0.29 (y changes to the) 120.07 166.33 P +0 F +-0.29 (XPJ) 186.13 166.33 P +-0.29 (obAttr) 204.31 166.33 P +1 F +-0.29 ( pool must be made before) 233.19 166.33 P +0 F +-0.29 (PrintStartJ) 340.34 166.33 P +-0.29 (ob) 389.07 166.33 P +-0.29 (.) 399.23 166.33 P +1 F +-0.29 (Further modi\336cations can only be) 403.94 166.33 P +(made to the attrib) 108 154.33 T +(ute pool after a) 178.07 154.33 T +0 F +(PrintEndJ) 240.83 154.33 T +(ob) 285.69 154.33 T +1 F +( request is e) 296.25 154.33 T +(x) 343.59 154.33 T +(ecuted.) 348.44 154.33 T +0 12 Q +(PrintEndJ) 108 99 T +(ob) 161.83 99 T +1 10 Q +(cancel: BOOL) 108 79.33 T +72 533 90 551.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 551.8 72 533.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 551.8 90 551.8 2 L +0.5 H +N +72 551.8 72 533.8 2 L +N +72 551.8 90 551.8 2 L +N +0 0 612 792 C +72 479 90 497 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 497 72 479 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 479 90 479 2 L +N +0 0 612 792 C +72 358 90 376.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 376.8 72 358.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 376.8 90 376.8 2 L +0.5 H +N +72 376.8 72 358.8 2 L +N +72 376.8 90 376.8 2 L +N +0 0 612 792 C +72 320 90 338 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 338 72 320 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 320 90 320 2 L +N +0 0 612 792 C +72 91 90 109.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 109.8 72 91.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 109.8 90 109.8 2 L +0.5 H +N +72 109.8 72 91.8 2 L +N +72 109.8 90 109.8 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "4" 8 +%%Page: "5" 9 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocols) 86.52 746.67 T +(5) 533 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(Errors:) 108 704.33 T +0 F +(XPBadContext, XPBadSequence) 138.27 704.33 T +1 F +(This request causes the print job associated with the current print conte) 108 680.33 T +(xt to end. If cancel is) 391.97 680.33 T +0 F +(F) 478.34 680.33 T +(ALSE) 483.55 680.33 T +1 F +(, an) 509.67 680.33 T +(y) 523.96 680.33 T +(accumulated print data that remains is either sent to the printer or made a) 108 668.33 T +(v) 399.69 668.33 T +(ailable to) 404.44 668.33 T +0 F +(PrintGetDocument-) 443.88 668.33 T +(Data) 108 656.33 T +1 F +(.) 128.55 656.33 T +(The request generates an) 108 632.33 T +0 F +(XPPrintNotify) 209.63 632.33 T +1 F +( e) 271.84 632.33 T +(v) 278.53 632.33 T +(ent with its detail \336eld set to) 283.38 632.33 T +0 F +(XPEndJ) 399.22 632.33 T +(obNotify) 435.19 632.33 T +1 F +(.) 471.76 632.33 T +(When cancel is) 108 608.33 T +0 F +(TR) 171.59 608.33 T +(UE) 185.18 608.33 T +1 F +(, the job currently being processed is canceled. The serv) 199.07 608.33 T +(er may discard an) 423.03 608.33 T +(y pending) 493.69 608.33 T +-0.14 (output or may produce partial output. If the job w) 108 596.33 P +-0.14 (as started in) 305 596.33 P +0 F +-0.14 (XPGetData) 354.86 596.33 P +1 F +-0.14 ( mode, then the entire data output) 404.29 596.33 P +(stream is implementation-de\336ned.) 108 584.33 T +(If) 108 560.33 T +0 F +(PrintEndJ) 117.16 560.33 T +(ob) 162.02 560.33 T +1 F +( is called immediately after) 172.58 560.33 T +0 F +(PrintEndP) 283.95 560.33 T +(age) 329.97 560.33 T +1 F +(, then a synthetic) 344.41 560.33 T +0 F +(PrintEndDoc) 414.68 560.33 T +1 F +( is generated by) 471.35 560.33 T +(print serv) 108 548.33 T +(er before) 145.9 548.33 T +0 F +(PrintEndJ) 184.21 548.33 T +(ob) 229.07 548.33 T +1 F +(. The pool of) 239.23 548.33 T +0 F +(XPJ) 293.39 548.33 T +(obAttr) 311.57 548.33 T +1 F +( attrib) 340.45 548.33 T +(utes that w) 363.86 548.33 T +(as frozen when the) 407.09 548.33 T +0 F +(PrintStart-) 484.84 548.33 T +(J) 108 536.33 T +(ob) 112.85 536.33 T +1 F +( request w) 123.41 536.33 T +(as e) 164.41 536.33 T +(x) 179.53 536.33 T +(ecuted is released when) 184.38 536.33 T +0 F +(PrintEndJ) 281.57 536.33 T +(ob) 326.43 536.33 T +1 F +( is called.) 336.99 536.33 T +0 12 Q +(PrintGetDocumentData) 108 481 T +1 10 Q +(conte) 108 461.33 T +(xt: PCONTEXT) 129.51 461.33 T +(max-bytes: CARD32) 108 449.33 T +3 F +(\256) 100.8 433.33 T +3 9 Q +(+) 110.67 433.33 T +1 10 Q +(status-code: {) 108 417.33 T +0 F +(XPGetDocFinished, XPGetDocSecondConsumer) 163.07 417.33 T +(, XPGetDocErr) 369.91 417.33 T +(or) 435.82 417.33 T +1 F +(}) 445.26 417.33 T +(\336nished-\337ag: CARD32) 108 405.33 T +(data: LIST) 108 393.33 T +(ofBYTE) 150.25 393.33 T +(Errors:) 108 369.33 T +0 F +(XPBadContext, XPBadSequence, V) 138.27 369.33 T +(alue) 289.57 369.33 T +1 F +(This request returns data generated on a conte) 108 345.33 T +(xt by other clients.) 291.41 345.33 T +0 F +(PrintGetDocumentData) 108 321.33 T +1 F +( should be sent only after a) 210.2 321.33 T +0 F +(PrintStartJ) 320.46 321.33 T +(ob) 369.19 321.33 T +1 F +( request with sa) 379.75 321.33 T +(v) 442.04 321.33 T +(e_data set to) 446.89 321.33 T +0 F +(XPGet-) 499.38 321.33 T +(Data) 108 309.33 T +1 F +( has been e) 128.55 309.33 T +(x) 172.55 309.33 T +(ecuted.) 177.4 309.33 T +0 F +-0.04 (PrintGetDocumentData) 108 285.33 P +1 F +-0.04 ( generates multiple replies. Each reply is no lar) 210.2 285.33 P +-0.04 (ger than the v) 397.73 285.33 P +-0.04 (alue speci\336ed in max-) 452.08 285.33 P +(bytes. The \336nal reply is generated by) 108 273.33 T +0 F +(PrintEndJ) 258.53 273.33 T +(ob) 303.39 273.33 T +1 F +( and has \336nished-\337ag set to) 313.95 273.33 T +0 F +(TR) 425.61 273.33 T +(UE) 439.2 273.33 T +1 F +(.) 453.09 273.33 T +(If the v) 108 249.33 T +(alue for max-bytes is zero, a) 136.63 249.33 T +0 F +(V) 252.43 249.33 T +(alue) 258.73 249.33 T +1 F +( error is generated.) 276.51 249.33 T +(An) 108 225.33 T +0 F +(XPBadSequence) 122.72 225.33 T +1 F +( error is generated if) 193.28 225.33 T +0 F +(PrintGetDocumentData) 276.86 225.33 T +1 F +( is e) 379.06 225.33 T +(x) 395.02 225.33 T +(ecuted before) 399.87 225.33 T +0 F +(PrintStartJ) 456.51 225.33 T +(ob) 505.24 225.33 T +1 F +( or if) 515.8 225.33 T +0 F +(PrintGetDocumentData) 108 213.33 T +1 F +( is e) 210.2 213.33 T +(x) 226.16 213.33 T +(ecuted after) 231.01 213.33 T +0 F +(PrintStartJ) 280.43 213.33 T +(ob) 329.16 213.33 T +1 F +( with sa) 339.72 213.33 T +(v) 370.63 213.33 T +(e_data set to) 375.48 213.33 T +0 F +(XPSpool) 427.97 213.33 T +1 F +(.) 465.2 213.33 T +0 12 Q +(PrintPutDocumentData) 108 158 T +1 10 Q +(dra) 108 138.33 T +(w) 120.62 138.33 T +(able: DRA) 127.74 138.33 T +(W) 169.89 138.33 T +(ABLE) 178.13 138.33 T +(data: LIST) 108 126.33 T +(ofBYTE) 150.25 126.33 T +(doc-format, options: STRING8) 108 114.33 T +(Errors:) 108 90.33 T +0 F +(XPBadContext, XPBadSequence, Match, V) 138.27 90.33 T +(alue, Drawable) 322.34 90.33 T +72 693 90 711 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 711 72 693 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 693 90 693 2 L +N +0 0 612 792 C +72 473 90 491.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 491.8 72 473.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 491.8 90 491.8 2 L +0.5 H +N +72 491.8 72 473.8 2 L +N +72 491.8 90 491.8 2 L +N +0 0 612 792 C +72 367 90 385 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 385 72 367 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 367 90 367 2 L +N +0 0 612 792 C +72 150 90 168.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 168.8 72 150.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 168.8 90 168.8 2 L +0.5 H +N +72 168.8 72 150.8 2 L +N +72 168.8 90 168.8 2 L +N +0 0 612 792 C +72 150 90 168.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 168.8 72 150.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 168.8 90 168.8 2 L +0.5 H +N +72 168.8 72 150.8 2 L +N +72 168.8 90 168.8 2 L +N +0 0 612 792 C +72 88 90 106 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 106 72 88 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 88 90 88 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "5" 9 +%%Page: "6" 10 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(6) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocols) 466.22 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(6) 72 749.33 T +(Pr) 448.27 749.33 T +(otocols) 462.78 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 X +(This request allo) 108 704.33 T +(ws an application to send and incorporate data into the print output. It functions in tw) 174.41 704.33 T +(o) 515.39 704.33 T +(modes, depending on whether the) 108 692.33 T +0 F +(PrintStartDoc) 245.2 692.33 T +1 F +( dri) 305.74 692.33 T +(v) 319.1 692.33 T +(er) 323.95 692.33 T +(-mode is set to) 331.52 692.33 T +0 F +(XPDocNormal) 392.63 692.33 T +1 F +( or) 455.39 692.33 T +0 F +(XPDocRaw) 468.72 692.33 T +1 F +(:) 518.15 692.33 T +0 F +(XPDocNormal) 108 668.33 T +(PrintPutDocumentData) 198 668.33 T +1 F +( sends data to the print serv) 299.65 668.33 T +(er and inte) 408.93 668.33 T +(grates data) 450.99 668.33 T +-0.21 (into the output. The root of the dra) 198 656.33 P +-0.21 (w) 334.67 656.33 P +-0.21 (able must be the root of the current print) 341.79 656.33 P +-0.06 (conte) 198 644.33 P +-0.06 (xt. The doc-format and options parameters describe the format of data,) 219.51 644.33 P +(which in turn guides the w) 198 632.33 T +(ay the serv) 304.28 632.33 T +(er interprets it. The) 347.45 632.33 T +0 F +(xp-embedded-f) 426.6 632.33 T +(or-) 490.79 632.33 T +(mats-supported) 198 620.33 T +1 F +( attrib) 265.22 620.33 T +(ute in the) 288.63 620.33 T +0 F +(XPPrinterAttr) 328.35 620.33 T +1 F +( pool de\336nes v) 391.1 620.33 T +(alid v) 449.46 620.33 T +(alues) 471.71 620.33 T +(for doc-format in this mode, else a) 198 608.33 T +0 F +(Match) 338.53 608.33 T +1 F +( error is issued.) 366.3 608.33 T +0 F +(XPDocRaw) 108 584.33 T +(PrintPutDocumentData) 198 584.33 T +1 F +( sends data directly to the print serv) 299.65 584.33 T +(er output. The) 441.98 584.33 T +(print serv) 198 572.33 T +(er does not emit document or page control codes into the output,) 235.9 572.33 T +(and data is passed through unmodi\336ed. Dra) 198 560.33 T +(w) 371.44 560.33 T +(able must be None, else a) 378.56 560.33 T +0 F +(Drawable) 198 548.33 T +1 F +( error is issued. The) 239.66 548.33 T +0 F +(xp-raw-f) 321.31 548.33 T +(ormats-supported) 358.27 548.33 T +1 F +( attrib) 434.93 548.33 T +(ute in the) 458.34 548.33 T +0 F +-0.08 (XPPrinterAttr) 198 536.33 P +1 F +-0.08 ( pool de\336nes v) 260.75 536.33 P +-0.08 (alid v) 318.88 536.33 P +-0.08 (alues for doc-format in this mode, else a) 341.05 536.33 P +0 F +(Match) 198 524.33 T +1 F +( error is issued.) 225.77 524.33 T +(If doc-format is not in) 108 500.33 T +0 F +(xp-embedded-f) 198.82 500.33 T +(ormats-supported) 263.01 500.33 T +1 F +( or) 339.67 500.33 T +0 F +(xp-raw-f) 353 500.33 T +(ormats-supported) 389.96 500.33 T +1 F +( a) 466.62 500.33 T +0 F +(V) 476.06 500.33 T +(alue) 482.36 500.33 T +1 F +( error is) 500.14 500.33 T +(issued. The options \336eld is implementation-dependent and the permitted v) 108 488.33 T +(alues may depend on the current) 404.4 488.33 T +(settings of other attrib) 108 476.33 T +(utes and the v) 195.85 476.33 T +(alue of doc-format. If an unkno) 250.87 476.33 T +(wn options v) 376.14 476.33 T +(alue is speci\336ed a) 427.56 476.33 T +0 F +(V) 500.88 476.33 T +(alue) 507.18 476.33 T +1 F +(error is issued, else if options is not v) 108 464.33 T +(alid in the current state a) 256.91 464.33 T +0 F +(Match) 358 464.33 T +1 F +( error is issued.) 385.77 464.33 T +0 12 Q +(PrintStartDoc) 108 409 T +1 10 Q +(dri) 108 389.33 T +(v) 118.86 389.33 T +(er) 123.71 389.33 T +(-mode: {) 131.28 389.33 T +0 F +(XPDocNormal, XPDocRaw) 166.91 389.33 T +1 F +(}) 284.1 389.33 T +(Errors:) 108 365.33 T +0 F +(V) 138.27 365.33 T +(alue, XPBadSequence) 144.57 365.33 T +1 F +(This request indicates the be) 108 341.33 T +(ginning of an indi) 221.72 341.33 T +(vidual document within a print job) 292.86 341.33 T +(. The serv) 431.07 341.33 T +(er performs the) 470.63 341.33 T +-0.36 (actions necessary to de\336ne a ne) 108 329.33 P +-0.36 (w document, and generates an) 231.76 329.33 P +0 F +-0.36 (XPPrintNotify) 353.27 329.33 P +1 F +-0.36 ( e) 415.48 329.33 P +-0.36 (v) 421.81 329.33 P +-0.36 (ent with its detail \336eld set to) 426.66 329.33 P +0 F +(XPStartDocNotify) 108 317.33 T +1 F +(.) 185.66 317.33 T +(The v) 108 293.33 T +(alue of dri) 130.8 293.33 T +(v) 171.65 293.33 T +(er) 176.5 293.33 T +(-mode) 184.07 293.33 T +(can be:) 212.12 293.33 T +0 F +(XPDocNormal) 108 269.33 T +1 F +(Print serv) 198 269.33 T +(er generates document data. Depending on the DDX dri) 236.46 269.33 T +(v) 459.21 269.33 T +(er) 464.06 269.33 T +(, it can) 471.43 269.33 T +(incorporate data from) 198 257.33 T +0 F +(PrintPutDocumentData) 287.14 257.33 T +1 F +( into the document.) 388.79 257.33 T +0 F +(XPDocRaw) 108 233.33 T +1 F +(The client pro) 198 233.33 T +(vides all data for the document using) 253.95 233.33 T +0 F +(PrintPutDocument-) 404.21 233.33 T +(Data) 198 221.33 T +1 F +(. The print serv) 218.55 221.33 T +(er does not generate an) 279.5 221.33 T +(y data of its o) 371.54 221.33 T +(wn into the docu-) 425.73 221.33 T +(ment.) 198 209.33 T +(If) 108 185.33 T +0 F +(PrintStartP) 117.16 185.33 T +(age) 167.05 185.33 T +1 F +( is sent immediately after) 181.49 185.33 T +0 F +(PrintStartJ) 285.09 185.33 T +(ob) 333.82 185.33 T +1 F +(, then a synthetic) 344.38 185.33 T +0 F +(PrintStartDoc) 414.65 185.33 T +1 F +( with dri) 475.19 185.33 T +(v) 508.83 185.33 T +(er) 513.68 185.33 T +(-) 521.25 185.33 T +(mode) 108 173.33 T +0 F +(XPDocNormal) 132.72 173.33 T +1 F +( will be generated internally by print serv) 195.48 173.33 T +(er before) 360.58 173.33 T +0 F +(PrintStartP) 398.89 173.33 T +(age) 448.78 173.33 T +1 F +(.) 463.22 173.33 T +(An) 108 149.33 T +(y changes to the) 120.07 149.33 T +0 F +(XPDocAttr) 187.28 149.33 T +1 F +( attrib) 235.59 149.33 T +(ute pool must be made before) 259 149.33 T +0 F +(PrintStartDoc) 380.09 149.33 T +1 F +(is e) 443.13 149.33 T +(x) 456.59 149.33 T +(ecuted. Further) 461.44 149.33 T +(modi\336cations can only be made to the attrib) 108 137.33 T +(ute pool after a) 283.62 137.33 T +0 F +(PrintEndDoc) 346.38 137.33 T +1 F +( request is e) 403.05 137.33 T +(x) 450.39 137.33 T +(ecuted.) 455.24 137.33 T +0 12 Q +(PrintEndDoc) 108 82 T +72 401 90 419.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 419.8 72 401.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 419.8 90 419.8 2 L +0.5 H +N +72 419.8 72 401.8 2 L +N +72 419.8 90 419.8 2 L +N +0 0 612 792 C +72 363 90 381 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 381 72 363 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 363 90 363 2 L +N +0 0 612 792 C +72 74 90 92.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 92.8 72 74.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 92.8 90 92.8 2 L +0.5 H +N +72 92.8 72 74.8 2 L +N +72 92.8 90 92.8 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "6" 10 +%%Page: "7" 11 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocols) 86.52 746.67 T +(7) 533 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(cancel: BOOL) 108 704.33 T +(Errors:) 108 680.33 T +0 F +(XPBadSequence) 138.27 680.33 T +1 F +(This request signals the end of a print document. The resulting document data is assembled and combined) 108 656.33 T +(with data that w) 108 644.33 T +(as sent by) 172.06 644.33 T +0 F +(PrintPutDocumentData) 214 644.33 T +1 F +(.) 315.65 644.33 T +(When cancel is) 108 620.33 T +0 F +(TR) 171.59 620.33 T +(UE) 185.18 620.33 T +1 F +(, the document currently being processed is canceled. The serv) 199.07 620.33 T +(er may discard an) 449.69 620.33 T +(y) 520.35 620.33 T +0 (pending output or may produce partial output. If the job w) 108 608.33 P +0 (as started with) 340.9 608.33 P +0 F +0 (XPGetData) 401.16 608.33 P +1 F +0 ( mode, then the entire) 450.59 608.33 P +(data output stream is implementation-de\336ned for this document.) 108 596.33 T +-0.21 (The) 108 572.33 P +0 F +-0.21 (XpDocAttr) 125.84 572.33 P +1 F +-0.21 ( pool that w) 173.6 572.33 P +-0.21 (as frozen when the) 220.35 572.33 P +0 F +-0.21 (PrintStartDoc) 297.25 572.33 P +1 F +-0.21 ( request w) 357.79 572.33 P +-0.21 (as e) 398.36 572.33 P +-0.21 (x) 413.27 572.33 P +-0.21 (ecuted is released when) 418.12 572.33 P +0 F +-0.21 (Print-) 514.45 572.33 P +(EndDoc) 108 560.33 T +1 F +( is called.) 142.45 560.33 T +0 12 Q +(PrintStartP) 108 505 T +(age) 167.87 505 T +1 10 Q +(windo) 108 485.33 T +(w: WINDO) 132.75 485.33 T +(W) 179.33 485.33 T +(Errors:) 108 461.33 T +0 F +(XPBadSequence, W) 138.27 461.33 T +(indo) 223.65 461.33 T +(w) 242.45 461.33 T +1 F +(This request indicates the be) 108 437.33 T +(ginning of a single print page within a document. W) 221.72 437.33 T +(indo) 430.19 437.33 T +(w is the dra) 447.72 437.33 T +(w) 493.95 437.33 T +(able that) 501.07 437.33 T +(represents the page.) 108 425.33 T +0 F +(PrintStartP) 108 401.33 T +(age) 157.89 401.33 T +1 F +( causes windo) 172.33 401.33 T +(w to be mapped. W) 228.18 401.33 T +(ithin a) 305.82 401.33 T +0 F +(PrintStartP) 333.6 401.33 T +(age) 383.49 401.33 T +1 F +(/) 397.93 401.33 T +0 F +(PrintEndP) 400.71 401.33 T +(age) 446.73 401.33 T +1 F +( sequence, an) 461.17 401.33 T +(y) 514.61 401.33 T +-0.11 (attempts to resize, mo) 108 389.33 P +-0.11 (v) 195.28 389.33 P +-0.11 (e, or unmap windo) 200.13 389.33 P +-0.11 (w will be ignored. T) 274.53 389.33 P +-0.11 (o resize or mo) 354.65 389.33 P +-0.11 (v) 411.09 389.33 P +-0.11 (e inferiors of windo) 415.94 389.33 P +-0.11 (w) 494.5 389.33 P +-0.11 (, the stan-) 501.07 389.33 P +-0.38 (dard semantics used for) 108 377.33 P +0 F +-0.38 (Con\336gur) 203.66 377.33 P +-0.38 (eW) 241.82 377.33 P +-0.38 (indo) 256.08 377.33 P +-0.38 (w) 274.88 377.33 P +1 F +-0.38 ( apply) 282.1 377.33 P +-0.38 (, e) 305.79 377.33 P +-0.38 (xcept that the contents of the con\336gured windo) 314.69 377.33 P +-0.38 (w may be) 499.77 377.33 P +(lost. If the contents of a windo) 108 365.33 T +(w are lost, an) 229.68 365.33 T +0 F +(Expose) 285.5 365.33 T +1 F +( e) 316.06 365.33 T +(v) 322.75 365.33 T +(ent is generated.) 327.6 365.33 T +-0.07 (A) 108 341.33 P +0 F +-0.07 (W) 117.65 341.33 P +-0.07 (indo) 127.47 341.33 P +-0.07 (w) 146.27 341.33 P +1 F +-0.07 ( error is issued if windo) 153.49 341.33 P +-0.07 (w is not a descendent of the root windo) 247.6 341.33 P +-0.07 (w of the current print conte) 404 341.33 P +-0.07 (xt. An) 512.64 341.33 P +0 F +(XPBadSequence) 108 329.33 T +1 F +( error is issued if) 178.56 329.33 T +0 F +(PrintStartP) 248.27 329.33 T +(age) 298.16 329.33 T +1 F +( is called in an) 312.6 329.33 T +0 F +(XPDocRaw) 372.87 329.33 T +1 F +( document.) 422.3 329.33 T +(An) 108 305.33 T +(y changes to the) 120.07 305.33 T +0 F +(XPP) 187.28 305.33 T +(ageAttr) 206.62 305.33 T +1 F +( attrib) 239.38 305.33 T +(ute pool must be made before) 262.79 305.33 T +0 F +(PrintStartP) 383.88 305.33 T +(age) 433.77 305.33 T +1 F +(is e) 450.71 305.33 T +(x) 464.17 305.33 T +(ecuted. Further) 469.02 305.33 T +(modi\336cations can only be made to the attrib) 108 293.33 T +(ute pool after a) 283.62 293.33 T +0 F +(PrintEndP) 346.38 293.33 T +(age) 392.4 293.33 T +1 F +( request is e) 406.84 293.33 T +(x) 454.18 293.33 T +(ecuted.) 459.03 293.33 T +0 12 Q +(PrintEndP) 108 238 T +(age) 163.22 238 T +1 10 Q +(cancel: BOOL) 108 218.33 T +(Errors:) 108 194.33 T +0 F +(XPBadContext, XPBadSequence) 138.27 194.33 T +1 F +(This request indicates the end of a print page, and causes windo) 108 170.33 T +(w to be unmapped. If cancel is) 362.7 170.33 T +0 F +(TR) 487.67 170.33 T +(UE) 501.26 170.33 T +1 F +(, the) 515.15 170.33 T +(current print page is canceled.) 108 158.33 T +(When cancel is) 108 134.33 T +0 F +(TR) 171.59 134.33 T +(UE) 185.18 134.33 T +1 F +(, the job currently being processed is canceled. The serv) 199.07 134.33 T +(er may discard an) 423.03 134.33 T +(y pending) 493.69 134.33 T +-0.03 (output or may produce partial output. If the job w) 108 122.33 P +-0.03 (as started with) 305.9 122.33 P +0 F +-0.03 (XPGetData) 366.07 122.33 P +1 F +-0.03 ( mode, then the entire data out-) 415.5 122.33 P +(put stream is implementation-de\336ned for this page.) 108 110.33 T +(The pool of job attrib) 108 86.33 T +(utes that w) 193.35 86.33 T +(as frozen when the) 236.58 86.33 T +0 F +(PrintStartP) 314.33 86.33 T +(age) 364.22 86.33 T +1 F +( request w) 378.66 86.33 T +(as e) 419.66 86.33 T +(x) 434.78 86.33 T +(ecuted is freed when) 439.63 86.33 T +0 F +(PrintEndP) 108 74.33 T +(age) 154.02 74.33 T +1 F +( is called.) 168.46 74.33 T +72 678 90 696 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 696 72 678 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 678 90 678 2 L +N +0 0 612 792 C +72 497 90 515.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 515.8 72 497.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 515.8 90 515.8 2 L +0.5 H +N +72 515.8 72 497.8 2 L +N +72 515.8 90 515.8 2 L +N +0 0 612 792 C +72 459 90 477 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 477 72 459 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 459 90 459 2 L +N +0 0 612 792 C +72 230 90 248.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 248.8 72 230.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 248.8 90 248.8 2 L +0.5 H +N +72 248.8 72 230.8 2 L +N +72 248.8 90 248.8 2 L +N +0 0 612 792 C +72 192 90 210 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 210 72 192 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 192 90 192 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "7" 11 +%%Page: "8" 12 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(8) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocols) 466.22 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(8) 72 749.33 T +(Pr) 448.27 749.33 T +(otocols) 462.78 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 12 Q +0 X +(PrintGetP) 108 577 T +(ageDimensions) 160.54 577 T +1 10 Q +(conte) 108 557.33 T +(xt: PCONTEXT) 129.51 557.33 T +3 F +(\256) 100.8 541.33 T +1 F +(width: CARD16) 108 525.33 T +(height: CARD16) 108 513.33 T +(of) 108 501.33 T +(fset-x: CARD16) 116.08 501.33 T +(of) 108 489.33 T +(fset-y: CARD16) 116.08 489.33 T +(reproducible-width: CARD16) 108 477.33 T +(reproducible-height: CARD16) 108 465.33 T +(Errors:) 108 441.33 T +0 F +(XPBadContext) 138.27 441.33 T +1 F +(This request returns the total width and height of a page in pix) 108 417.33 T +(els, together with the net reproducible area) 356.71 417.33 T +(within the page. The net reproducible area is the portion of the page on which the printer is ph) 108 405.33 T +(ysically capa-) 484.27 405.33 T +(ble of placing ink.) 108 393.33 T +0 12 Q +(PrintSelectInput) 108 338 T +1 10 Q +(conte) 108 318.33 T +(xt: PCONTEXT) 129.51 318.33 T +(e) 108 306.33 T +(v) 112.19 306.33 T +(ent-mask: BITMASK) 117.04 306.33 T +(Errors:) 108 282.33 T +0 F +(XPBadContext, V) 138.27 282.33 T +(alue) 214.01 282.33 T +1 F +(This request speci\336es the print e) 108 258.33 T +(v) 236.9 258.33 T +(ents, from those in the speci\336ed print conte) 241.75 258.33 T +(xt, the client is interested in.) 414.36 258.33 T +(Possible v) 108 246.33 T +(alues for the e) 148.59 246.33 T +(v) 204.71 246.33 T +(ent-mask BITMASK are:) 209.56 246.33 T +(\245) 108 228.33 T +(XPNoEv) 126 228.33 T +(entMask) 161.96 228.33 T +(\245) 108 216.33 T +(XPPrintMask) 126 216.33 T +(\245) 108 204.33 T +(XP) 126 204.33 T +(Attrib) 137.86 204.33 T +(uteMask) 161.55 204.33 T +0 12 Q +(PrintInputSelected) 108 149 T +1 10 Q +(conte) 108 129.33 T +(xt: PCONTEXT) 129.51 129.33 T +3 F +(\256) 100.8 113.33 T +1 F +(e) 108 97.33 T +(v) 112.19 97.33 T +(ent-mask, all-e) 117.04 97.33 T +(v) 176.22 97.33 T +(ents-mask: BITMASK) 181.07 97.33 T +(Errors:) 108 73.33 T +0 F +(XPBadContext) 138.27 73.33 T +72 569 90 587.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 587.8 72 569.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 587.8 90 587.8 2 L +0.5 H +N +72 587.8 72 569.8 2 L +N +72 587.8 90 587.8 2 L +N +0 0 612 792 C +72 439 90 457 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 457 72 439 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 439 90 439 2 L +N +0 0 612 792 C +72 330 90 348.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 348.8 72 330.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 348.8 90 348.8 2 L +0.5 H +N +72 348.8 72 330.8 2 L +N +72 348.8 90 348.8 2 L +N +0 0 612 792 C +72 280 90 298 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 298 72 280 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 280 90 280 2 L +N +0 0 612 792 C +72 141 90 159.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 159.8 72 141.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 159.8 90 159.8 2 L +0.5 H +N +72 159.8 72 141.8 2 L +N +72 159.8 90 159.8 2 L +N +0 0 612 792 C +72 71 90 89 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 89 72 71 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 71 90 71 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "8" 12 +%%Page: "9" 13 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocols) 86.52 746.67 T +(9) 533 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(This request queries which X Print Serv) 108 704.33 T +(er e) 267.83 704.33 T +(v) 282.29 704.33 T +(ents the client has selected to recei) 287.14 704.33 T +(v) 425.19 704.33 T +(e from the speci\336ed print) 430.04 704.33 T +(conte) 108 692.33 T +(xt. all-e) 129.51 692.33 T +(v) 159.81 692.33 T +(ents-mask returns the set of all e) 164.66 692.33 T +(v) 293.83 692.33 T +(ents selected by all clients.) 298.68 692.33 T +0 12 Q +(PrintGetAttrib) 108 589 T +(utes) 185.08 589 T +1 10 Q +(conte) 108 569.33 T +(xt: PCONTEXT) 129.51 569.33 T +(pool: {) 108 557.33 T +0 F +(XPJ) 135.86 557.33 T +(obAttr) 154.04 557.33 T +(, XPDocAttr) 182 557.33 T +(, XPP) 234.39 557.33 T +(ageAttr) 258.73 557.33 T +(, XPPrinterAttr) 290.57 557.33 T +(, XPSer) 357.4 557.33 T +(v) 390.07 557.33 T +(erAttr) 394.97 557.33 T +1 F +(}) 422.17 557.33 T +3 F +(\256) 100.8 541.33 T +1 F +(attrib) 108 525.33 T +(utes: STRING8) 128.91 525.33 T +(Errors:) 108 501.33 T +0 F +(XPBadContext, V) 138.27 501.33 T +(alue) 214.01 501.33 T +1 F +-0.33 (This request returns an attrib) 108 477.33 P +-0.33 (ute pool from the speci\336ed print conte) 221.48 477.33 P +-0.33 (xt. attrib) 372.13 477.33 P +-0.33 (utes is the attrib) 405.49 477.33 P +-0.33 (ute pool speci\336ed) 467.93 477.33 P +(by pool, and is encoded in COMPOUND_TEXT) 108 465.33 T +(.) 302.52 465.33 T +(The format used for attrib) 108 441.33 T +(utes is the same as the format used for an X resource \336le. F) 211.11 441.33 T +(or a description see) 447.58 441.33 T +(Section 15.1, \322Resource File Syntax\323, in the Xlib speci\336cation.) 108 429.33 T +(See section) 108 405.33 T +(3 for a detailed description of attrib) 155.77 405.33 T +(utes.) 297.21 405.33 T +0 12 Q +(PrintGetOneAttrib) 108 350 T +(ute) 206.41 350 T +1 10 Q +(conte) 108 330.33 T +(xt: PCONTEXT) 129.51 330.33 T +(pool: {) 108 318.33 T +0 F +(XPJ) 135.86 318.33 T +(obAttr) 154.04 318.33 T +(, XPDocAttr) 182 318.33 T +(, XPP) 234.39 318.33 T +(ageAttr) 258.73 318.33 T +(, XPPrinterAttr) 290.57 318.33 T +(, XPSer) 357.4 318.33 T +(v) 390.07 318.33 T +(erAttr) 394.97 318.33 T +1 F +(}) 422.17 318.33 T +(name: STRING8) 108 306.33 T +3 F +(\256) 100.8 290.33 T +1 F +(v) 108 274.33 T +(alue: STRING8) 112.75 274.33 T +(Errors:) 108 250.33 T +0 F +(XPBadContext, V) 138.27 250.33 T +(alue) 214.01 250.33 T +1 F +-0.02 (This request retrie) 108 226.33 P +-0.02 (v) 180.47 226.33 P +-0.02 (es a single attrib) 185.32 226.33 P +-0.02 (ute from the speci\336ed print conte) 250.33 226.33 P +-0.02 (xt. It is similar to) 382.55 226.33 P +0 F +-0.02 (PrintGetAttrib) 453.57 226.33 P +-0.02 (utes,) 517.8 226.33 P +1 F +(b) 108 214.33 T +(ut returns only one attrib) 112.8 214.33 T +(ute v) 211.48 214.33 T +(alue instead of an entire pool of attrib) 230.95 214.33 T +(utes. The speci\336c attrib) 381 214.33 T +(ute is speci\336ed) 474.12 214.33 T +(by name. v) 108 202.33 T +(alue is encoded in COMPOUND_TEXT) 151.91 202.33 T +(.) 313.37 202.33 T +0 12 Q +(PrintSetAttrib) 108 147 T +(utes) 182.41 147 T +1 10 Q +(conte) 108 127.33 T +(xt: PCONTEXT) 129.51 127.33 T +(pool: {) 108 115.33 T +0 F +(XPJ) 135.86 115.33 T +(obAttr) 154.04 115.33 T +(, XPDocAttr) 182 115.33 T +(, XPP) 234.39 115.33 T +(ageAttr) 258.73 115.33 T +(, XPPrinterAttr) 290.57 115.33 T +(, XPSer) 357.4 115.33 T +(v) 390.07 115.33 T +(erAttr) 394.97 115.33 T +1 F +(}) 422.17 115.33 T +(rule: {) 108 103.33 T +0 F +(XP) 133.63 103.33 T +(AttrMer) 146.22 103.33 T +(ge, XP) 182.76 103.33 T +(AttrReplace) 209.79 103.33 T +1 F +(}) 261.99 103.33 T +(attrib) 108 91.33 T +(utes: STRING8) 128.91 91.33 T +(Errors:) 108 67.33 T +0 F +(XPBadContext, XPBadSequence, V) 138.27 67.33 T +(alue, Match) 289.57 67.33 T +72 581 90 599.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 599.8 72 581.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 599.8 90 599.8 2 L +0.5 H +N +72 599.8 72 581.8 2 L +N +72 599.8 90 599.8 2 L +N +0 0 612 792 C +72 499 90 517 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 517 72 499 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 499 90 499 2 L +N +0 0 612 792 C +72 342 90 360.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 360.8 72 342.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 360.8 90 360.8 2 L +0.5 H +N +72 360.8 72 342.8 2 L +N +72 360.8 90 360.8 2 L +N +0 0 612 792 C +72 248 90 266 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 266 72 248 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 248 90 248 2 L +N +0 0 612 792 C +72 139 90 157.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 157.8 72 139.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 157.8 90 157.8 2 L +0.5 H +N +72 157.8 72 139.8 2 L +N +72 157.8 90 157.8 2 L +N +0 0 612 792 C +72 65 90 83 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 83 72 65 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 65 90 65 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "9" 13 +%%Page: "10" 14 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(10) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocols) 466.22 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(10) 72 749.33 T +(Pr) 448.27 749.33 T +(otocols) 462.78 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 X +(This request sets the names and v) 108 704.33 T +(alues for one or more attrib) 241.62 704.33 T +(utes within the speci\336ed attrib) 350.56 704.33 T +(ute pool.) 470.91 704.33 T +(attrib) 108 692.33 T +(utes is encoded in COMPOUND_TEXT that represents ne) 128.91 692.33 T +(w name/v) 362.79 692.33 T +(alue pairs according to the v) 401.7 692.33 T +(alue) 514.48 692.33 T +(speci\336ed in rule. F) 108 680.33 T +(or) 182.29 680.33 T +0 F +(XP) 193.12 680.33 T +(AttrReplace) 205.71 680.33 T +1 F +(, the e) 257.91 680.33 T +(xisting attrib) 281.92 680.33 T +(ute pool is discarded and replaced with attrib) 332.56 680.33 T +(utes.) 512.05 680.33 T +(F) 108 668.33 T +(or) 113.41 668.33 T +0 F +(XP) 124.24 668.33 T +(AttrMer) 136.83 668.33 T +(ge) 173.37 668.33 T +1 F +(, attrib) 182.81 668.33 T +(utes is mer) 208.72 668.33 T +(ged into the e) 251.87 668.33 T +(xisting attrib) 305.88 668.33 T +(ute pool; e) 356.52 668.33 T +(xisting name/v) 398.59 668.33 T +(alue pairs are) 457.51 668.33 T +(replaced and ne) 108 656.33 T +(w ones are added.) 170.5 656.33 T +(The format used for attrib) 108 632.33 T +(utes is the same as the format used for an X resource \336le. F) 211.11 632.33 T +(or a description see) 447.58 632.33 T +(Section 15.1, \322Resource File Syntax\323, in the Xlib speci\336cation.) 108 620.33 T +(See section) 108 596.33 T +(3 for a detailed description of attrib) 155.77 596.33 T +(utes.) 297.21 596.33 T +0 (A) 108 572.33 P +0 F +0 (Match) 117.72 572.33 P +1 F +0 ( message is returned if read-only attrib) 145.49 572.33 P +0 (ute pools attempt to use) 299.68 572.33 P +0 F +0 (PrintSetAttrib) 397.17 572.33 P +0 (utes) 459.18 572.33 P +1 F +0 (. An) 476.4 572.33 P +0 F +0 (XPBadSe-) 496.11 572.33 P +-0.14 (quence) 108 560.33 P +1 F +-0.14 ( message is issued when a request is sent to an attrib) 138 560.33 P +-0.14 (ute pool at a time when the attrib) 345.46 560.33 P +-0.14 (ute pool cannot) 476.24 560.33 P +(be modi\336ed.) 108 548.33 T +0 12 Q +(PrintRehashPrinterList) 108 493 T +1 10 Q +(This request causes the print serv) 108 450.33 T +(er to update its list of a) 240.88 450.33 T +(v) 332.34 450.33 T +(ailable printers together with their attrib) 337.09 450.33 T +(utes. The) 496.59 450.33 T +(print f) 108 438.33 T +(acilities underlying X Serv) 132.62 438.33 T +(er may pro) 239.96 438.33 T +(vide it with the ability to detect changes in printer topology and) 283.13 438.33 T +(dynamically update the list to re\337ect the changes. If X Serv) 108 426.33 T +(er does not ha) 345.31 426.33 T +(v) 400.93 426.33 T +(e this capability) 405.78 426.33 T +(, the) 468.46 426.33 T +0 F +(PrintRe-) 488.18 426.33 T +(hashPrinterList) 108 414.33 T +1 F +( must be used to notify it of changes.) 175.78 414.33 T +0 12 Q +(PrintQueryV) 108 359 T +(ersion) 174.79 359 T +3 10 Q +(\256) 100.8 339.33 T +1 F +(major) 108 323.33 T +(-v) 131.13 323.33 T +(ersion, minor) 139.31 323.33 T +(-v) 192.44 323.33 T +(ersion: CARD16) 200.62 323.33 T +(This request returns the major and minor v) 108 299.33 T +(ersion numbers of the X Print Service.) 278.66 299.33 T +0 12 Q +(PrintQueryScr) 108 244 T +(eens) 184.44 244 T +3 10 Q +(\256) 100.8 224.33 T +1 F +(roots: LIST) 108 208.33 T +(ofWINDO) 153.59 208.33 T +(W) 196 208.33 T +(This request returns a list of the X Serv) 108 184.33 T +(er screens that support the X Print Service Extension.) 265.05 184.33 T +0 12 Q +(PrintSetImageResolution) 108 129 T +1 10 Q +(conte) 108 109.33 T +(xt: PCONTEXT) 129.51 109.33 T +(image-resolution: CARD16) 108 97.33 T +3 F +(\256) 100.8 81.33 T +72 485 90 503.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 503.8 72 485.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 503.8 90 503.8 2 L +0.5 H +N +72 503.8 72 485.8 2 L +N +72 503.8 90 503.8 2 L +N +0 0 612 792 C +72 472 90 490 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 490 72 472 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 472 90 472 2 L +N +0 0 612 792 C +72 351 90 369.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 369.8 72 351.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 369.8 90 369.8 2 L +0.5 H +N +72 369.8 72 351.8 2 L +N +72 369.8 90 369.8 2 L +N +0 0 612 792 C +72 321 90 339 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 339 72 321 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 321 90 321 2 L +N +0 0 612 792 C +72 236 90 254.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 254.8 72 236.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 254.8 90 254.8 2 L +0.5 H +N +72 254.8 72 236.8 2 L +N +72 254.8 90 254.8 2 L +N +0 0 612 792 C +72 206 90 224 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 224 72 206 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 206 90 206 2 L +N +0 0 612 792 C +72 121 90 139.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 139.8 72 121.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 139.8 90 139.8 2 L +0.5 H +N +72 139.8 72 121.8 2 L +N +72 139.8 90 139.8 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "10" 14 +%%Page: "11" 15 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocols) 86.52 746.67 T +(11) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(status: BOOL) 108 704.33 T +(pre) 108 692.33 T +(vious-resolution: CARD16) 120.52 692.33 T +(Errors:) 108 668.33 T +0 F +(XPBadContext) 138.27 668.33 T +1 F +(This request sets the resolution for subsequent) 108 644.33 T +0 F +(PutImage) 295.48 644.33 T +1 F +( requests on the screen of conte) 337.14 644.33 T +(xt, in pix) 462.51 644.33 T +(els per) 498.2 644.33 T +(inch.) 108 632.33 T +(When status is) 108 608.33 T +0 F +(TR) 168.83 608.33 T +(UE) 182.42 608.33 T +1 F +(, then the contents of an) 196.31 608.33 T +(y subsequent) 291.7 608.33 T +0 F +(PutImage) 346.14 608.33 T +1 F +( request to a Pixmap or to a W) 387.8 608.33 T +(indo) 509.05 608.33 T +(w) 526.58 608.33 T +-0.26 (on the screen of the speci\336ed print conte) 108 596.33 P +-0.26 (xt will automatically be scaled as part of the) 267.92 596.33 P +0 F +-0.26 (PutImage) 444.7 596.33 P +1 F +-0.26 ( request. The) 486.36 596.33 P +(scale f) 108 584.33 T +(actor is:) 133.72 584.33 T +4 F +(default-printer-resolution / image-resolution) 144 566.33 T +1 F +(where def) 108 542.33 T +(ault-printer) 147.6 542.33 T +(-resolution is the current v) 192.39 542.33 T +(alue of that page attrib) 297.68 542.33 T +(ute. Only the image itself is scaled) 387.46 542.33 T +(\050meaning the ef) 108 530.33 T +(fecti) 170.51 530.33 T +(v) 188.03 530.33 T +(e width and height of the image change\051, the dst-x and dst-y parameters to) 192.88 530.33 T +0 F +(PutImage) 491.99 530.33 T +1 F +(are not altered.) 108 518.33 T +(As a special case, a v) 108 494.33 T +(alue of zero for image_res resets the resolution to automatically track the printer reso-) 192.72 494.33 T +(lution. In this case \050which is also the def) 108 482.33 T +(ault setting for a ne) 269.27 482.33 T +(wly created print conte) 346.23 482.33 T +(xt\051, subsequent images) 438 482.33 T +(will not be scaled.) 108 470.33 T +(pre) 108 446.33 T +(vious-resolution is the pre) 120.52 446.33 T +(vious image resolution that w) 224.43 446.33 T +(as set for conte) 342.66 446.33 T +(xt in pix) 402.77 446.33 T +(els per inch.) 435.96 446.33 T +(If status is) 108 422.33 T +0 F +(F) 151.61 422.33 T +(ALSE) 156.82 422.33 T +1 F +(, then the print serv) 182.94 422.33 T +(er does not support image scaling foor the particular resolution gi) 260.28 422.33 T +(v) 521.66 422.33 T +(en) 526.51 422.33 T +(the current con\336guration of the printer) 108 410.33 T +(, and the application is responsible for an) 261.18 410.33 T +(y desired scaling.) 425.45 410.33 T +0 12 Q +(PrintGetImageResolution) 108 355 T +1 10 Q +(conte) 108 335.33 T +(xt: PCONTEXT) 129.51 335.33 T +3 F +(\256) 100.8 319.33 T +1 F +(image-resolution: CARD16) 108 303.33 T +(Errors:) 108 279.33 T +0 F +(XPBadContext) 138.27 279.33 T +1 F +(This request returns the current image-resolution for conte) 108 255.33 T +(xt in pix) 341.41 255.33 T +(els per inch. A v) 374.6 255.33 T +(alue of zero means the) 440.17 255.33 T +(resolution automatically tracks the printer resolution. If the request f) 108 243.33 T +(ails in some w) 381.19 243.33 T +(ay) 438.59 243.33 T +(, a ne) 447.38 243.33 T +(g) 468.61 243.33 T +(ati) 473.56 243.33 T +(v) 483.31 243.33 T +(e v) 488.16 243.33 T +(alue is) 499.85 243.33 T +(returned.) 108 231.33 T +0 14 Q +(2.4) 72 195.67 T +(Ev) 108 195.67 T +(ents) 124.2 195.67 T +0 12 Q +(XPPrintNotify) 108 140 T +1 10 Q +(detail: {) 108 120.33 T +0 F +(XPStartJ) 140.3 120.33 T +(obNotify) 180.14 120.33 T +(, XPEndJ) 216.81 120.33 T +(obNotify) 257.78 120.33 T +(, XPStartDocNotify) 294.45 120.33 T +(, XPEndDocNotify) 377.21 120.33 T +(,) 456.1 120.33 T +(XPStartP) 136.8 108.33 T +(ageNotify) 177.8 108.33 T +(, XPEndP) 218.35 108.33 T +(ageNotify) 260.48 108.33 T +1 F +(}) 301.58 108.33 T +(conte) 108 96.33 T +(xt: PCONTEXT) 129.51 96.33 T +(cancel: BOOL) 108 84.33 T +72 666 90 684 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 684 72 666 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 666 90 666 2 L +N +0 0 612 792 C +72 347 90 365.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 365.8 72 347.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 365.8 90 365.8 2 L +0.5 H +N +72 365.8 72 347.8 2 L +N +72 365.8 90 365.8 2 L +N +0 0 612 792 C +72 277 90 295 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 295 72 277 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 277 90 277 2 L +N +0 0 612 792 C +72 132 90 150.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 150.8 72 132.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 150.8 90 150.8 2 L +0.5 H +N +72 150.8 72 132.8 2 L +N +72 150.8 90 150.8 2 L +N +0 0 612 792 C +72 82 90 100 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 100 72 82 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 82 90 82 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "11" 15 +%%Page: "12" 16 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(12) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocols) 466.22 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(12) 72 749.33 T +(Pr) 448.27 749.33 T +(otocols) 462.78 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 X +(This e) 108 704.33 T +(v) 132.47 704.33 T +(ent is generated when requests to) 137.32 704.33 T +0 F +(PrintStartDoc) 272.29 704.33 T +1 F +(,) 332.83 704.33 T +0 F +(PrintStartJ) 337.83 704.33 T +(ob) 386.56 704.33 T +1 F +(,) 397.12 704.33 T +0 F +(PrintStartP) 402.12 704.33 T +(age) 452.01 704.33 T +1 F +(,) 466.45 704.33 T +0 F +(PrintEndDoc) 471.45 704.33 T +1 F +(,) 528.12 704.33 T +0 F +(PrintEndJ) 108 692.33 T +(ob) 152.86 692.33 T +1 F +(, and) 163.42 692.33 T +0 F +(PrintEndP) 185.36 692.33 T +(age) 231.38 692.33 T +1 F +( ha) 245.82 692.33 T +(v) 257.56 692.33 T +(e been processed and completed. It is reported to clients selecting) 262.41 692.33 T +0 F +(XPPrintMask) 108 680.33 T +1 F +(.) 167.44 680.33 T +0 12 Q +(XP) 108 625 T +(Attrib) 123.11 625 T +(uteNotify) 154.86 625 T +1 10 Q +(detail: {) 108 605.33 T +0 F +(XPJ) 140.3 605.33 T +(obAttr) 158.48 605.33 T +(, XPDocAttr) 186.44 605.33 T +(, XPP) 238.83 605.33 T +(ageAttr) 263.17 605.33 T +(, XPPrinterAttr) 295.01 605.33 T +(, XPSer) 361.84 605.33 T +(v) 394.51 605.33 T +(erAttr) 399.41 605.33 T +(, XPMe-) 425.69 605.33 T +(diumAttr) 136.8 593.33 T +(, XPSpoolerAttr) 176.43 593.33 T +1 F +(}) 245.86 593.33 T +(conte) 108 581.33 T +(xt: PCONTEXT) 129.51 581.33 T +(This e) 108 557.33 T +(v) 132.47 557.33 T +(ent is generated when an) 137.32 557.33 T +(y of the print attrib) 236.03 557.33 T +(ute pools maintained by the print serv) 311.38 557.33 T +(er ha) 462.33 557.33 T +(v) 481.84 557.33 T +(e been modi-) 486.69 557.33 T +-0.25 (\336ed. The modi\336cations may ha) 108 545.33 P +-0.25 (v) 230.98 545.33 P +-0.25 (e been initiated by the print serv) 235.83 545.33 P +-0.25 (er itself or by a) 363.07 545.33 P +0 F +-0.25 (PrintSetAttrib) 424.88 545.33 P +-0.25 (utes) 486.89 545.33 P +1 F +-0.25 ( request.) 504.11 545.33 P +(It is reported to clients selecting) 108 533.33 T +0 F +(XP) 238.54 533.33 T +(Attrib) 251.13 533.33 T +(uteMask) 277.59 533.33 T +1 F +(.) 314.81 533.33 T +72 617 90 635.8 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 635.8 72 617.8 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 635.8 90 635.8 2 L +0.5 H +N +72 635.8 72 617.8 2 L +N +72 635.8 90 635.8 2 L +N +0 0 612 792 C +72 579 90 597 C +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 597 72 579 2 L +1 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +72 579 90 579 2 L +N +0 0 612 792 C +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "12" 16 +%%Page: "13" 17 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(X Print Attrib) 72 746.67 T +(utes) 157.26 746.67 T +(13) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 18 Q +(3) 72 699 T +(X Print Attrib) 108 699 T +(utes) 217.62 699 T +1 10 Q +(Printing-speci\336c attrib) 108 666.33 T +(utes play a k) 197.52 666.33 T +(e) 247.69 666.33 T +(y role in the X Print Service. The) 251.98 666.33 T +(y pro) 384.59 666.33 T +(vide a general-purpose mecha-) 405.27 666.33 T +(nism for storing information associated with printing. This information includes user print setup options,) 108 654.33 T +(printer capabilities, and spooler subsystem options.) 108 642.33 T +(The X Print Service selects attrib) 108 618.33 T +(utes in a w) 240.28 618.33 T +(ay that is consistent with the X W) 283.23 618.33 T +(indo) 418.1 618.33 T +(ws System, ISO/IEC) 435.63 618.33 T +(10175 \050ISO DP) 108 606.33 T +(A\051, and POSIX 1387.4 print standards. The ISO DP) 169.3 606.33 T +(A de\336nes a number of abstract objects) 375.86 606.33 T +(that are managed and manipulated during the printing process. These are kno) 108 594.33 T +(wn as DP) 416.02 594.33 T +(A-Objects. Each) 453.43 594.33 T +-0.13 (DP) 108 582.33 P +-0.13 (A-Object is represented by a set of attrib) 119.86 582.33 P +-0.13 (utes which characterize that object. Each attrib) 281.24 582.33 P +-0.13 (ute in turn is com-) 467.17 582.33 P +(posed of an attrib) 108 570.33 T +(ute-type \050attrib) 177.51 570.33 T +(ute name\051 and zero or more attrib) 237.02 570.33 T +(ute-v) 370.67 570.33 T +(alues.) 390.97 570.33 T +(The X Print Service utilizes selected DP) 108 552.33 T +(A-Objects, and for each of these, a subset of the associated) 268.17 552.33 T +(attrib) 108 540.33 T +(utes. The DP) 128.91 540.33 T +(A-Objects used are:) 179.93 540.33 T +0 F +(Ser) 108 518.33 T +(v) 122.34 518.33 T +(er Object) 127.24 518.33 T +1 F +(Speci\336es attrib) 198 518.33 T +(utes de\336ned for the X print serv) 257.52 518.33 T +(er) 384.57 518.33 T +(.) 391.79 518.33 T +0 F +(J) 108 496.33 T +(ob Object) 112.85 496.33 T +1 F +(Speci\336es attrib) 198 496.33 T +(utes for a single print request as sent to the spooler) 257.52 496.33 T +(.) 459.72 496.33 T +0 F +(Document Object) 108 474.33 T +1 F +(Speci\336es attrib) 198 474.33 T +(utes used to de\336ne a single document within a job) 257.52 474.33 T +(. If supported by) 456.83 474.33 T +(the implementation, multiple documents may be submitted within a gi) 198 462.33 T +(v) 478.31 462.33 T +(en job) 483.16 462.33 T +(.) 507.48 462.33 T +0 F +(Printer Object) 108 440.33 T +1 F +(Speci\336es attrib) 198 440.33 T +(utes that identify printer capabilities.) 257.52 440.33 T +(The X Print Service also pro) 108 418.33 T +(vides for changing certain attrib) 222 418.33 T +(utes on a page-by-page basis. This is a) 349.55 418.33 T +(capability for which the ISO DP) 108 406.33 T +(A does not de\336ne a separate DP) 236.23 406.33 T +(A-Object. This set of attrib) 363.06 406.33 T +(utes is kno) 470.9 406.33 T +(wn) 513.43 406.33 T +(within the X Print Service as P) 108 394.33 T +(age Attrib) 231.18 394.33 T +(utes.) 271.25 394.33 T +(The X Print Service requires some additional attrib) 108 372.33 T +(utes that are not de\336ned by the ISO DP) 311.94 372.33 T +(A. The attrib) 467.67 372.33 T +(ute) 518.85 372.33 T +(names for these attrib) 108 360.33 T +(utes are pre\336x) 194.17 360.33 T +(ed with \322) 250.67 360.33 T +0 F +(xp-) 287.33 360.33 T +1 F +(\323.) 301.22 360.33 T +(A serv) 108 338.33 T +(er implementation can de\336ne additional attrib) 134.23 338.33 T +(utes.) 316.51 338.33 T +(This section de\336nes the follo) 108 316.33 T +(wing sets of attrib) 223.3 316.33 T +(utes for the X Print Service:) 295.04 316.33 T +(\245) 108 294.33 T +(Serv) 126 294.33 T +(er Attrib) 144.18 294.33 T +(utes) 178.14 294.33 T +(\245) 108 282.33 T +(Printer Attrib) 126 282.33 T +(utes) 179.41 282.33 T +(\245) 108 270.33 T +(Job Attrib) 126 270.33 T +(utes) 166.08 270.33 T +(\245) 108 258.33 T +(Document Attrib) 126 258.33 T +(utes) 193.85 258.33 T +(\245) 108 246.33 T +(P) 126 246.33 T +(age Attrib) 131.41 246.33 T +(utes) 171.48 246.33 T +0 14 Q +(3.1) 72 210.67 T +(Attrib) 108 210.67 T +(ute V) 145.04 210.67 T +(alue Defaults And V) 176.03 210.67 T +(alidation) 295.68 210.67 T +1 10 Q +(This section pro) 108 186.33 T +(vides an o) 172.29 186.33 T +(v) 212.69 186.33 T +(ervie) 217.54 186.33 T +(w of the handling of def) 237.28 186.33 T +(ault attrib) 333.55 186.33 T +(ute v) 371.96 186.33 T +(alues and the procedure for the v) 391.43 186.33 T +(ali-) 522.25 186.33 T +-0.14 (dation of attrib) 108 174.33 P +-0.14 (ute v) 166.96 174.33 P +-0.14 (alues within the X Print Service. Details for indi) 186.3 174.33 P +-0.14 (vidual attrib) 377.99 174.33 P +-0.14 (utes can be found in the rest) 426.26 174.33 P +(of this chapter) 108 162.33 T +(.) 164.66 162.33 T +0 14 Q +(3.1.1) 72 129.67 T +(Assigning Attrib) 126 129.67 T +(ute V) 224.9 129.67 T +(alue Defaults) 255.88 129.67 T +1 10 Q +(An attrib) 108 105.33 T +(ute speci\336cation with an empty v) 143.63 105.33 T +(alue indicates that the attrib) 275.87 105.33 T +(ute has no v) 386.21 105.33 T +(alue. W) 434.01 105.33 T +(ithin X Print Ser-) 464.71 105.33 T +(vice con\336guration \336les and attrib) 108 93.33 T +(ute pools, an attrib) 240.01 93.33 T +(ute speci\336cation that omits the v) 314.25 93.33 T +(alue is ef) 443.72 93.33 T +(fecti) 479.57 93.33 T +(v) 497.09 93.33 T +(ely) 501.94 93.33 T +-0.37 (treated as if there were no attrib) 108 81.33 P +-0.37 (ute speci\336cation. An empty v) 232.78 81.33 P +-0.37 (alued attrib) 348.56 81.33 P +-0.37 (ute speci\336cation that has precedence) 393.26 81.33 P +(o) 108 69.33 T +(v) 112.85 69.33 T +(er a non-empty attrib) 117.7 69.33 T +(ute speci\336cation \050for instance, an empty printer quali\336ed attrib) 201.65 69.33 T +(ute o) 451.69 69.33 T +(v) 471.26 69.33 T +(er a non-empty) 476.11 69.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "13" 17 +%%Page: "14" 18 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(14) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(X Print Attrib) 432.53 41.28 T +(utes) 487.89 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(14) 72 749.33 T +(X Print Attrib) 394.63 749.33 T +(utes) 479.89 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 X +-0.02 (model quali\336ed attrib) 108 704.33 P +-0.02 (ute\051 will ef) 193.88 704.33 P +-0.02 (fecti) 237.48 704.33 P +-0.02 (v) 255 704.33 P +-0.02 (ely \322unset\323 the lo) 259.85 704.33 P +-0.02 (wer precedence attrib) 329.26 704.33 P +-0.02 (ute speci\336cation. When a print) 415.1 704.33 P +(job commences, the X Print Service may infer a def) 108 692.33 T +(ault v) 315.08 692.33 T +(alue for an attrib) 337.33 692.33 T +(ute that has no v) 403.5 692.33 T +(alue. In some) 468.8 692.33 T +(cases the X Print Service may e) 108 680.33 T +(xplicitly assign a def) 234.49 680.33 T +(ault v) 317.44 680.33 T +(alue to an attrib) 339.69 680.33 T +(ute before presenting it in an) 401.98 680.33 T +(attrib) 108 668.33 T +(ute pool.) 128.91 668.33 T +0 14 Q +(3.1.2) 72 635.67 T +(V) 126 635.67 T +(alidating Attrib) 134.82 635.67 T +(ute V) 228.27 635.67 T +(alues) 259.25 635.67 T +1 10 Q +-0.23 (The X Print Serv) 108 611.33 P +-0.23 (er ensures that attrib) 175.21 611.33 P +-0.23 (ute pools presented to the client are al) 255.69 611.33 P +-0.23 (w) 405.33 611.33 P +-0.23 (ays comprised of v) 412.45 611.33 P +-0.23 (alid attrib) 487.33 611.33 P +-0.23 (ute) 525.51 611.33 P +-0.22 (speci\336cations for attrib) 108 599.33 P +-0.22 (utes de\336ned by the X Print Service. V) 199.57 599.33 P +-0.22 (alidation is \336rst performed when a print conte) 348.59 599.33 P +-0.22 (xt) 529.94 599.33 P +(is created. V) 108 587.33 T +(alidation is also performed whene) 157.15 587.33 T +(v) 292.43 587.33 T +(er a client requests an update to an attrib) 297.28 587.33 T +(ute pool.) 458.71 587.33 T +-0.32 (V) 108 563.33 P +-0.32 (alidation in) 114.11 563.33 P +-0.32 (v) 158.67 563.33 P +-0.32 (olv) 163.47 563.33 P +-0.32 (es checking the attrib) 176.1 563.33 P +-0.32 (ute v) 260.19 563.33 P +-0.32 (alue ag) 279.33 563.33 P +-0.32 (ainst its set of v) 307.56 563.33 P +-0.32 (alid v) 368.8 563.33 P +-0.32 (alues. The process may also tak) 390.72 563.33 P +-0.32 (e into) 515.65 563.33 P +(account the current v) 108 551.33 T +(alues of other attrib) 191.89 551.33 T +(utes and the capabilities of the DDX dri) 269.73 551.33 T +(v) 428.62 551.33 T +(er) 433.47 551.33 T +(.) 440.69 551.33 T +(Attrib) 108 527.33 T +(utes may be single-v) 131.69 527.33 T +(alued or multi-v) 213.93 527.33 T +(alued.) 278.12 527.33 T +(When a print conte) 108 503.33 T +(xt is created, if the serv) 184.22 503.33 T +(er determines that an attrib) 277.38 503.33 T +(ute v) 384.38 503.33 T +(alue is in) 403.85 503.33 T +(v) 439.56 503.33 T +(alid, the serv) 444.31 503.33 T +(er will) 495.54 503.33 T +(ignore the in) 108 491.33 T +(v) 158.15 491.33 T +(alid attrib) 162.9 491.33 T +(ute speci\336cation and may set an e) 201.31 491.33 T +(xplicit def) 335.58 491.33 T +(ault for the attrib) 376.31 491.33 T +(ute in the pool. F) 443.6 491.33 T +(or) 511.51 491.33 T +(multi-v) 108 479.33 T +(alued attrib) 137.2 479.33 T +(utes, the serv) 182.27 479.33 T +(er will ignore each v) 234.61 479.33 T +(alue component that is in) 316.56 479.33 T +(v) 416.71 479.33 T +(alid. If all of the speci\336ed) 421.46 479.33 T +(components are in) 108 467.33 T +(v) 180.92 467.33 T +(alid the serv) 185.67 467.33 T +(er will reject the attrib) 234.4 467.33 T +(ute speci\336cation, and for certain attrib) 323.07 467.33 T +(utes will set an) 475.06 467.33 T +(e) 108 455.33 T +(xplicit def) 112.29 455.33 T +(ault for the attrib) 153.02 455.33 T +(ute in the pool.) 220.31 455.33 T +-0.07 (When the client requests an update to an attrib) 108 431.33 P +-0.07 (ute pool \050e.g. when issuing) 292.73 431.33 P +0 F +-0.07 (PrintSetAttrib) 402.63 431.33 P +-0.07 (utes) 464.64 431.33 P +1 F +-0.07 (\051, if the serv) 481.86 431.33 P +-0.07 (er) 529.8 431.33 P +(determines that a single-v) 108 419.33 T +(alued attrib) 210.79 419.33 T +(ute is in) 255.86 419.33 T +(v) 287.13 419.33 T +(alid, that attrib) 291.88 419.33 T +(ute will not be updated. If all components of a) 350.29 419.33 T +(multi-v) 108 407.33 T +(alued attrib) 137.2 407.33 T +(ute are in) 182.27 407.33 T +(v) 219.08 407.33 T +(alid the attrib) 223.83 407.33 T +(ute will not be updated, otherwise an) 276.96 407.33 T +(y in) 424.29 407.33 T +(v) 439.17 407.33 T +(alid components are) 443.92 407.33 T +(ignored. Unrecognized attrib) 108 395.33 T +(utes will be stored in the corresponding attrib) 223.05 395.33 T +(ute pool and returned in) 404.22 395.33 T +0 F +(Print-) 502.26 395.33 T +(GetAttrib) 108 383.33 T +(ute) 150.01 383.33 T +1 F +(, b) 163.34 383.33 T +(ut are otherwise ignored.) 173.14 383.33 T +(As part of the v) 108 359.33 T +(alidation for a gi) 169.96 359.33 T +(v) 236.09 359.33 T +(en attrib) 240.94 359.33 T +(ute, the print serv) 273.79 359.33 T +(er may alter other attrib) 343.63 359.33 T +(utes in response to the) 437.85 359.33 T +-0.07 (change. F) 108 347.33 P +-0.07 (or e) 146.66 347.33 P +-0.07 (xample, changing the v) 161.71 347.33 P +-0.07 (alue of the) 254.57 347.33 P +0 F +-0.07 (document-f) 299.08 347.33 P +-0.07 (ormat) 347.7 347.33 P +1 F +-0.07 ( attrib) 373.8 347.33 P +-0.07 (ute might cause the v) 397.15 347.33 P +-0.07 (alue of the) 481.61 347.33 P +0 F +-0.07 (xp-) 526.11 347.33 P +(embedded-f) 108 335.33 T +(ormats-supported) 158.3 335.33 T +1 F +( attrib) 234.96 335.33 T +(ute to change as.) 258.37 335.33 T +0 14 Q +(3.1.3) 72 302.67 T +(Structur) 126 302.67 T +(ed V) 177.07 302.67 T +(alues) 203.39 302.67 T +(3.2) 72 242.67 T +(Ser) 108 242.67 T +(v) 128.08 242.67 T +(er Attrib) 134.94 242.67 T +(utes) 187.91 242.67 T +1 10 Q +(The serv) 108 218.33 T +(er attrib) 142.56 218.33 T +(ute pool is identi\336ed by XPServ) 173.74 218.33 T +(erAttr and describes the capabilities of the X Print Serv) 301.65 218.33 T +(er) 522.85 218.33 T +(.) 530.07 218.33 T +0 F +(locale) 108 200.33 T +1 F +(The v) 198 200.33 T +(alue of this attrib) 220.8 200.33 T +(ute is the locale in which the X Print Serv) 288.65 200.33 T +(er is running.) 455.43 200.33 T +0 F +(multiple-documents-supported) 108 178.33 T +1 F +(This attrib) 198 166.33 T +(ute indicates whether the serv) 239.19 166.33 T +(er supports jobs containing multiple) 357.9 166.33 T +(documents.) 198 154.33 T +0 14 Q +(3.3) 72 118.67 T +(Printer Attrib) 108 118.67 T +(utes) 192.08 118.67 T +1 10 Q +(The printer attrib) 108 94.33 T +(ute pool is identi\336ed by XPPrinterAttr and describes printer capabilities.) 176.12 94.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "14" 18 +%%Page: "15" 19 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(X Print Attrib) 72 746.67 T +(utes) 157.26 746.67 T +(15) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 10 Q +(content-orientations-supported) 108 704.33 T +1 F +(A list of orientations supported in the print conte) 198 692.33 T +(xt. The list is a group of strings) 392.84 692.33 T +(separated by white space. V) 198 680.33 T +(alid v) 308.8 680.33 T +(alues are) 331.05 680.33 T +0 F +(portrait) 368.81 680.33 T +1 F +(,) 402.69 680.33 T +0 F +(landscape) 407.69 680.33 T +1 F +(,) 449.92 680.33 T +0 F +(r) 454.92 680.33 T +(e) 459.18 680.33 T +(v) 463.47 680.33 T +(erse-portrait) 468.37 680.33 T +1 F +(,) 522.79 680.33 T +(and) 198 668.33 T +0 F +(r) 214.94 668.33 T +(e) 219.2 668.33 T +(v) 223.49 668.33 T +(erse-landscape) 228.39 668.33 T +1 F +(.) 291.16 668.33 T +(The def) 198 644.33 T +(ault v) 228.72 644.33 T +(alue is determined by the DDX, and is e) 250.97 644.33 T +(xplicitly set in the printer pool.) 411.07 644.33 T +(V) 198 632.33 T +(alidation for this attrib) 204.11 632.33 T +(ute is as described for multi-v) 293.63 632.33 T +(alued attrib) 412.53 632.33 T +(utes in \322V) 457.6 632.33 T +(alidating) 497.04 632.33 T +(Attrib) 198 620.33 T +(ute V) 221.69 620.33 T +(alues\323.) 242.52 620.33 T +(The initial v) 198 596.33 T +(alue of the) 246.64 596.33 T +0 F +(content-orientations-supported) 291.35 596.33 T +1 F +( attrib) 424.12 596.33 T +(ute is typically set by) 447.53 596.33 T +(the printer v) 198 584.33 T +(endor in the model-con\336g \336le.) 246.73 584.33 T +0 F +(descriptor) 108 562.33 T +1 F +(The) 198 562.33 T +0 F +(descriptor) 216.05 562.33 T +1 F +( is a human readable description of the printer encoded as) 259.93 562.33 T +(COMPOUND_TEXT) 198 550.33 T +(. This description may contain more than one line.) 285.03 550.33 T +0 F +(document-attrib) 108 528.33 T +(utes-supported) 177.79 528.33 T +1 F +(A list of document attrib) 198 516.33 T +(utes supported in the print conte) 296.13 516.33 T +(xt. This list is returned as a) 424.58 516.33 T +(set of whitespace-delimited attrib) 198 504.33 T +(ute names.) 331.39 504.33 T +0 F +(document-f) 108 482.33 T +(ormats-supported) 156.63 482.33 T +1 F +(A list of document formats, including format v) 198 470.33 T +(ariants and format v) 384.96 470.33 T +(ersions that are) 465.07 470.33 T +(supported in the print conte) 198 458.33 T +(xt. Each entry in the list is a structure comprised of the) 307.84 458.33 T +(document-format, document-format-v) 198 446.33 T +(ariant, and a document-format-v) 349.94 446.33 T +(ersion.) 479.2 446.33 T +(V) 198 434.33 T +(ariant and v) 204.11 434.33 T +(ersion may be omitted in some cases. The triple v) 251.17 434.33 T +(alue is enclosed by) 449.23 434.33 T +(curly braces \322{}\323 and delimited by whitespace.) 198 422.33 T +0 F +(input-trays-medium) 108 400.33 T +1 F +(This attrib) 198 400.33 T +(ute identi\336es what medium is loaded in each printer tray) 239.19 400.33 T +(. The v) 463.79 400.33 T +(alue is) 491.59 400.33 T +(speci\336ed as a list of structures, each of which contains a tray identi\336er and a) 198 388.33 T +(medium identi\336er) 198 376.33 T +(. V) 268.84 376.33 T +(alid tray identi\336ers are) 279.95 376.33 T +0 F +(top) 372.71 376.33 T +1 F +(,) 386.6 376.33 T +0 F +(middle) 391.6 376.33 T +1 F +(,) 421.05 376.33 T +0 F +(bottom) 426.05 376.33 T +1 F +(,) 456.6 376.33 T +0 F +(en) 461.6 376.33 T +(v) 471.2 376.33 T +(elope) 476.1 376.33 T +1 F +(,) 498.32 376.33 T +0 F +(manual) 198 364.33 T +1 F +(,) 230.23 364.33 T +0 F +(lar) 235.23 364.33 T +(ge-capacity) 247.35 364.33 T +1 F +(,) 295.02 364.33 T +0 F +(main) 300.02 364.33 T +1 F +(, and) 321.69 364.33 T +0 F +(side) 343.63 364.33 T +1 F +(. The X Print Service de\336nes v) 360.3 364.33 T +(alid medium) 483.09 364.33 T +(identi\336ers to be the standard v) 198 352.33 T +(alues of the) 318.57 352.33 T +0 F +(medium-size) 367.17 352.33 T +1 F +( attrib) 421.05 352.33 T +(ute as speci\336ed in) 444.46 352.33 T +(ISO/IEC 10175-1.) 198 340.33 T +(F) 198 316.33 T +(or each tray / medium \050size\051 combination, the tray must be present in the v) 203.41 316.33 T +(alue of) 501.17 316.33 T +(the) 198 304.33 T +0 F +(medium-sour) 212.72 304.33 T +(ce-sizes-supported) 269.76 304.33 T +1 F +( attrib) 348.08 304.33 T +(ute, and the medium size must be listed) 371.49 304.33 T +(for that tray) 198 292.33 T +(.) 244.56 292.33 T +0 F +(job-attrib) 108 270.33 T +(utes-supported) 149.46 270.33 T +1 F +(A list of the job attrib) 198 258.33 T +(utes supported for the printer) 284.19 258.33 T +(. This list is returned as a set of) 399.73 258.33 T +(whitespace-delimited attrib) 198 246.33 T +(ute names.) 306.95 246.33 T +0 F +(medium-sour) 108 224.33 T +(ce-sizes-supported) 165.04 224.33 T +1 F +(This attrib) 198 212.33 T +(ute identi\336es or speci\336es the sizes of media that are supported by the) 239.19 212.33 T +(printer) 198 200.33 T +(. F) 224.11 200.33 T +(or each input tray a set of supported media sizes is indicated. F) 234.52 200.33 T +(or each) 485.72 200.33 T +(medium, the page size, an indicator as to the medium feed direction, and the assured) 198 188.33 T +(reproduction area the printer supports are speci\336ed.) 198 176.33 T +(V) 198 152.33 T +(alid input tray v) 204.11 152.33 T +(alues are) 267.47 152.33 T +0 F +(top) 305.23 152.33 T +1 F +(,) 319.12 152.33 T +0 F +(middle) 324.12 152.33 T +1 F +(,) 353.57 152.33 T +0 F +(bottom) 358.57 152.33 T +1 F +(,) 389.12 152.33 T +0 F +(en) 394.12 152.33 T +(v) 403.72 152.33 T +(elope) 408.62 152.33 T +1 F +(,) 430.84 152.33 T +0 F +(manual) 435.84 152.33 T +1 F +(,) 468.07 152.33 T +0 F +(lar) 198 140.33 T +(ge-capacity) 210.12 140.33 T +1 F +(,) 257.79 140.33 T +0 F +(main) 262.79 140.33 T +1 F +(, and) 284.46 140.33 T +0 F +(side) 306.4 140.33 T +1 F +(. If the printer has only one input tray) 323.07 140.33 T +(, speci\336cation) 472.12 140.33 T +(of this v) 198 128.33 T +(alue is optional.) 230.53 128.33 T +(The page size is a descripti) 198 104.33 T +(v) 305.78 104.33 T +(e-name indicating the size of the page. Examples are) 310.63 104.33 T +0 F +(iso-a4) 198 92.33 T +1 F +(,) 223 92.33 T +0 F +(na-letter) 228 92.33 T +1 F +(, and) 264.25 92.33 T +0 F +(na-legal) 286.19 92.33 T +1 F +(. The complete list of v) 320.08 92.33 T +(alid v) 412.6 92.33 T +(alues is the set of) 434.85 92.33 T +(descripti) 198 80.33 T +(v) 232.19 80.33 T +(e-names de\336ned for the standard v) 237.04 80.33 T +(alues of the) 374.81 80.33 T +0 F +(medium-size) 423.41 80.33 T +1 F +( attrib) 477.29 80.33 T +(ute as) 500.7 80.33 T +(speci\336ed in ISO/IEC 10175-1.) 198 68.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "15" 19 +%%Page: "16" 20 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(16) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(X Print Attrib) 432.53 41.28 T +(utes) 487.89 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(16) 72 749.33 T +(X Print Attrib) 394.63 749.33 T +(utes) 479.89 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 X +(The medium feed direction is represented as a boolean v) 198 704.33 T +(alue indicating whether the) 423.53 704.33 T +(long edge \050) 198 692.33 T +0 F +(TR) 242.99 692.33 T +(UE) 256.58 692.33 T +1 F +(\051 or the short edge \050) 270.47 692.33 T +0 F +(F) 349.06 692.33 T +(ALSE) 354.27 692.33 T +1 F +(\051 feeds into the printer so that) 380.39 692.33 T +(orientation is speci\336ed.) 198 680.33 T +(The assured reproduction area is the area within the current medium tp which the) 198 656.33 T +(printer can render) 198 644.33 T +(. This area is speci\336ed in millimeters according to the RCS) 268.53 644.33 T +(coordinate system de\336ned by the ISO DP) 198 632.33 T +(A. The area v) 362.62 632.33 T +(alue is de\336ned by a structure) 416.79 632.33 T +(containing the minimum-x, maximum-x, minimum-y) 198 620.33 T +(, and maximum-y) 410.14 620.33 T +(.) 480.32 620.33 T +(The v) 198 596.33 T +(alue for a medium size is speci\336ed in a structure comprised of the page size,) 220.8 596.33 T +(the feed direction indicator) 198 584.33 T +(, and the assured reproduction area.) 305.63 584.33 T +(The v) 198 560.33 T +(alue of the) 220.8 560.33 T +0 F +(medium-sour) 265.51 560.33 T +(ce-sizes-supported) 322.55 560.33 T +1 F +( attrib) 400.87 560.33 T +(ute is a list of structures,) 424.28 560.33 T +(each comprised of the input tray v) 198 548.33 T +(alue and a set of medium size v) 334.39 548.33 T +(alues.) 459.95 548.33 T +0 F +(plexes-supported) 108 526.33 T +1 F +(A list of ple) 198 526.33 T +(x options that the printer supports. The list is a group of strings) 245.35 526.33 T +(separated by white space. V) 198 514.33 T +(alid v) 308.8 514.33 T +(alues are) 331.05 514.33 T +0 F +(simplex) 368.81 514.33 T +1 F +(,) 401.59 514.33 T +0 F +(duplex) 406.59 514.33 T +1 F +(, and) 435.49 514.33 T +0 F +(tumble) 457.43 514.33 T +1 F +(.) 487.43 514.33 T +0 F +(printer) 108 492.33 T +(-model) 138.18 492.33 T +1 F +(Human-readable te) 198 492.33 T +(xt that identi\336es the mak) 274.21 492.33 T +(e and model of the printer) 373 492.33 T +(. This v) 476.04 492.33 T +(alue is) 506.07 492.33 T +(encoded as COMPOUND_TEXT) 198 480.33 T +(.) 331.68 480.33 T +0 F +(printer) 108 458.33 T +(-name) 138.18 458.33 T +1 F +(This attrib) 198 458.33 T +(ute uniquely identi\336es a printer on a gi) 239.19 458.33 T +(v) 393.65 458.33 T +(en X Print Serv) 398.5 458.33 T +(er) 460.29 458.33 T +(.) 467.51 458.33 T +0 F +(printer) 108 436.33 T +(-r) 138.18 436.33 T +(esolutions-supported) 145.77 436.33 T +1 F +(A list of the resolutions in dots per inch that the printer supports.) 198 424.33 T +0 F +(xp-embedded-f) 108 402.33 T +(ormats-supported) 172.19 402.33 T +1 F +(This attrib) 198 390.33 T +(ute identi\336es the set of data formats recognized as v) 239.19 390.33 T +(alid v) 446.4 390.33 T +(alues for the) 468.65 390.33 T +(doc_fmt parameter of) 198 378.33 T +0 F +(PrintPutDocumentData) 287.14 378.33 T +1 F +(, when this request is issued within a) 388.79 378.33 T +(print document of type) 198 366.33 T +0 F +(XPDocNormal) 291.88 366.33 T +1 F +(.) 354.64 366.33 T +(The v) 198 342.33 T +(alue is a list of data formats. Each entry in the list is a structure comprised of) 220.8 342.33 T +(the data format, a format v) 198 330.33 T +(ariant, and a format v) 304.39 330.33 T +(ersion. The v) 390.05 330.33 T +(ariant and the v) 442.29 330.33 T +(ersion) 504.07 330.33 T +(may be omitted in some cases. Structure v) 198 318.33 T +(alues are enclosed by curly braces \322{}\323) 366.62 318.33 T +(and delimited by whitespace. V) 198 306.33 T +(alid v) 323.26 306.33 T +(alues are de\336ned by the printer DDX dri) 345.51 306.33 T +(v) 506.61 306.33 T +(er) 511.46 306.33 T +(.) 518.68 306.33 T +0 F +(xp-listf) 108 284.33 T +(onts-modes-supported) 137.75 284.33 T +1 F +(De\336nes the set of v) 198 272.33 T +(alues that may be used to comprise the v) 274.96 272.33 T +(alue of the) 436.91 272.33 T +0 F +(xp-listf) 481.62 272.33 T +(onts-) 511.37 272.33 T +(modes) 198 260.33 T +1 F +( document / page attrib) 225.22 260.33 T +(ute. The v) 317.23 260.33 T +(alue is a whitespace delimited list of) 357.25 260.33 T +(listfonts mode v) 198 248.33 T +(alues, which are de\336ned belo) 262.2 248.33 T +(w) 378.31 248.33 T +(.) 384.88 248.33 T +0 F +(xp-page-attrib) 108 226.33 T +(utes-supported) 169.46 226.33 T +1 F +(A list of page attrib) 198 214.33 T +(utes supported for the printer) 275.57 214.33 T +(. This list is comprised of a set of) 391.11 214.33 T +(whitespace-delimited attrib) 198 202.33 T +(ute names.) 306.95 202.33 T +0 F +(xp-raw-f) 108 180.33 T +(ormats-supported) 144.96 180.33 T +1 F +(This attrib) 198 168.33 T +(ute identi\336es the set of data formats recognized as v) 239.19 168.33 T +(alid v) 446.4 168.33 T +(alues for the) 468.65 168.33 T +(doc_fmt parameter of) 198 156.33 T +0 F +(PrintPutDocumentData) 287.14 156.33 T +1 F +(, when this function is called within) 388.79 156.33 T +(a print document of type) 198 144.33 T +0 F +(XPDocRaw) 298.82 144.33 T +1 F +(.) 347.6 144.33 T +(The v) 198 120.33 T +(alue is a list of data formats. Each entry in the list is a structure comprised of) 220.8 120.33 T +(the data format, an optional format v) 198 108.33 T +(ariant, and an optional format v) 344.67 108.33 T +(ersion. Structure) 470.61 108.33 T +(v) 198 96.33 T +(alues are enclosed by curly braces \322{}\323 and delimited by whitespace. V) 202.75 96.33 T +(alid v) 487.83 96.33 T +(alues) 510.08 96.33 T +(are de\336ned based on the ph) 198 84.33 T +(ysical printer\325) 307.09 84.33 T +(s capabilities.) 362.36 84.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "16" 20 +%%Page: "17" 21 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(X Print Attrib) 72 746.67 T +(utes) 157.26 746.67 T +(17) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 10 Q +(xp-setup-pr) 108 704.33 T +(o) 157.82 704.33 T +(viso) 162.72 704.33 T +1 F +(This attrib) 198 704.33 T +(ute indicates whether or not a required attrib) 239.19 704.33 T +(ute or set of attrib) 416.45 704.33 T +(utes must be) 487.35 704.33 T +(set prior to commencing the print job) 198 692.33 T +(.) 346.48 692.33 T +(V) 198 668.33 T +(alid v) 204.11 668.33 T +(alues for this attrib) 226.36 668.33 T +(ute are) 301.43 668.33 T +0 F +(xp-setup-mandatory) 330.86 668.33 T +1 F +( and) 418.08 668.33 T +0 F +(xp-setup-optional) 437.52 668.33 T +1 F +(. If) 512.53 668.33 T +(this attrib) 198 656.33 T +(ute is not speci\336ed,) 235.86 656.33 T +0 F +(xp-setup-optional) 315.58 656.33 T +1 F +( is assumed.) 390.59 656.33 T +(The initial v) 198 632.33 T +(alue of the) 246.64 632.33 T +0 F +(xp-setup-pr) 291.35 632.33 T +(o) 341.17 632.33 T +(viso) 346.07 632.33 T +1 F +( attrib) 362.74 632.33 T +(ute is typically set by the printer) 386.15 632.33 T +(v) 198 620.33 T +(endor in the model-con\336g \336le.) 202.85 620.33 T +0 14 Q +(3.4) 72 584.67 T +(J) 108 584.67 T +(ob Attrib) 114.79 584.67 T +(utes) 170.12 584.67 T +1 10 Q +(The job attrib) 108 560.33 T +(ute pool is identi\336ed by XPJobAttr and pro) 162.24 560.33 T +(vides information on ho) 334.59 560.33 T +(w to process a print job) 430.17 560.33 T +(.) 523.37 560.33 T +(T) 108 548.33 T +(ypically) 113.31 548.33 T +(, job attrib) 144.88 548.33 T +(utes are set by the Print Dialog Manager based on user input from the setup dialog.) 186.07 548.33 T +0 F +(job-name) 108 530.33 T +1 F +(This is the name of the job to be used in subsequent processing and in printing) 198 530.33 T +(banner pages. The v) 198 518.33 T +(alue is free form te) 278.28 518.33 T +(xt.) 353.66 518.33 T +0 F +(job-o) 108 496.33 T +(wner) 130.12 496.33 T +1 F +(This attrib) 198 496.33 T +(ute identi\336es the human o) 239.19 496.33 T +(wner of the print job) 342.27 496.33 T +(.) 424.08 496.33 T +0 F +(noti\336cation-pr) 108 474.33 T +(o\336le) 169.49 474.33 T +1 F +(This attrib) 198 474.33 T +(ute is a speci\336cation of e) 239.19 474.33 T +(v) 338.09 474.33 T +(ents about which the user is to be noti\336ed. The) 342.94 474.33 T +(X Print service uses this attrib) 198 462.33 T +(ute to determine whether or not to notify the user of) 318.07 462.33 T +(print job completion via electronic mail, or in ISO DP) 198 450.33 T +(A parlance, the X Print) 413.18 450.33 T +(Service recognizes the) 198 438.33 T +0 F +(e) 290.47 438.33 T +(v) 294.76 438.33 T +(ent-r) 299.66 438.33 T +(eport-job-completed) 320.58 438.33 T +1 F +( e) 407.78 438.33 T +(v) 414.47 438.33 T +(ent with a) 419.32 438.33 T +0 F +(deli) 461.26 438.33 T +(v) 476.72 438.33 T +(ery-method) 481.62 438.33 T +1 F +(of) 198 426.33 T +0 F +(electr) 208.83 426.33 T +(onic-mail) 232.52 426.33 T +1 F +(.) 272.52 426.33 T +(The v) 198 402.33 T +(alues may be) 220.8 402.33 T +0 F +({{e) 275.51 402.33 T +(v) 287.68 402.33 T +(ent-r) 292.58 402.33 T +(eport-job-completed} electr) 313.5 402.33 T +(onic-mail}) 430.83 402.33 T +1 F +( to send an) 474.77 402.33 T +(email message, and) 198 390.33 T +0 F +({}) 278.54 390.33 T +1 F +( if no message is to be sent. Serv) 286.42 390.33 T +(ers may implement additional) 417.09 390.33 T +(v) 198 378.33 T +(alues.) 202.75 378.33 T +0 F +(xp-setup-state) 108 356.33 T +1 F +(If the v) 198 356.33 T +(alue of the) 226.63 356.33 T +0 F +(xp-setup-pr) 271.34 356.33 T +(o) 321.16 356.33 T +(viso) 326.06 356.33 T +1 F +( printer attrib) 342.73 356.33 T +(ute is) 395.3 356.33 T +0 F +(xp-setup-mandatory) 419.19 356.33 T +1 F +(, then) 505.76 356.33 T +0 F +(xp-setup-state) 198 344.33 T +1 F +( is used to indicate the current setup state as determined byX Print) 257.99 344.33 T +(Serv) 198 332.33 T +(er) 216.18 332.33 T +(. If the v) 223.4 332.33 T +(alue of) 257.03 332.33 T +0 F +(xp-setup-pr) 287.02 332.33 T +(o) 336.84 332.33 T +(viso) 341.74 332.33 T +1 F +( is) 358.41 332.33 T +0 F +(xp-setup-optional) 370.08 332.33 T +1 F +(, the v) 445.09 332.33 T +(alue of) 469.56 332.33 T +0 F +(xp-setup-) 499.55 332.33 T +(state) 198 320.33 T +1 F +( is ignored.) 217.99 320.33 T +(V) 198 296.33 T +(alid v) 204.11 296.33 T +(alues for) 226.36 296.33 T +0 F +(xp-setup-state) 263.57 296.33 T +1 F +( are) 323.56 296.33 T +0 F +(xp-setup-ok) 340.77 296.33 T +1 F +( and) 391.33 296.33 T +0 F +(xp-setup-incomplete) 410.77 296.33 T +1 F +(.) 497.43 296.33 T +0 F +(xp-) 502.43 296.33 T +(setup-ok) 198 284.33 T +1 F +( indicates that all attrib) 234.67 284.33 T +(utes the print serv) 326.13 284.33 T +(er requires the user to set are v) 397.36 284.33 T +(alid,) 519.57 284.33 T +(indicating a client may commence printing if desired.) 198 272.33 T +0 F +(xp-setup-incomplete) 414.36 272.33 T +1 F +(indicates that one or more attrib) 198 260.33 T +(utes the dri) 325.28 260.33 T +(v) 369.47 260.33 T +(er requires are unspeci\336ed or in) 374.32 260.33 T +(v) 500.27 260.33 T +(alid;) 505.02 260.33 T +(printing should not be attempted.) 198 248.33 T +0 F +(xp-spooler) 108 226.33 T +(-command-options) 152.63 226.33 T +1 F +(A free form te) 198 214.33 T +(xt string that will be included v) 254.77 214.33 T +(erbatim on the command line used to) 379.62 214.33 T +(in) 198 202.33 T +(v) 205.38 202.33 T +(ok) 210.18 202.33 T +(e the spooler) 220.08 202.33 T +(. V) 270.63 202.33 T +(alid v) 281.74 202.33 T +(alues are spooler) 303.99 202.33 T +(-dependent.) 370.99 202.33 T +0 F +(xp-spooler) 108 180.33 T +(-command-r) 152.63 180.33 T +(esults) 205.77 180.33 T +1 F +(A free form te) 198 168.33 T +(xt string that will contain the spooler command output that w) 254.77 168.33 T +(ould) 499.11 168.33 T +(otherwise appear on a terminal \050e.g. stderr and stdout\051. This te) 198 156.33 T +(xt may be useful to) 446.41 156.33 T +(present to the user to allo) 198 144.33 T +(w tracking of the resulting spooler job) 298.57 144.33 T +(. Applications should) 450.93 144.33 T +(retrie) 198 132.33 T +(v) 218.85 132.33 T +(e this v) 223.7 132.33 T +(alue follo) 252.34 132.33 T +(wing receipt of the) 290.14 132.33 T +0 F +(XPEndJ) 367.9 132.33 T +(obNotify) 403.87 132.33 T +1 F +( e) 441.09 132.33 T +(v) 447.78 132.33 T +(ent.) 452.63 132.33 T +0 14 Q +(3.5) 72 96.67 T +(Document Attrib) 108 96.67 T +(utes) 209.98 96.67 T +1 10 Q +-0.07 (The document attrib) 108 72.33 P +-0.07 (ute pool is identi\336ed by XPDocAttr and indicates ho) 188.76 72.33 P +-0.07 (w to process the current document.) 397.95 72.33 P +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "17" 21 +%%Page: "18" 22 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(18) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(X Print Attrib) 432.53 41.28 T +(utes) 487.89 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(18) 72 749.33 T +(X Print Attrib) 394.63 749.33 T +(utes) 479.89 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 F +0 X +(content-orientation) 108 704.33 T +1 F +(Speci\336es the orientation to be used for this document. V) 198 704.33 T +(alid v) 421.87 704.33 T +(alues are:) 444.12 704.33 T +0 F +(portrait) 198 692.33 T +1 F +(,) 231.88 692.33 T +0 F +(landscape) 236.88 692.33 T +1 F +(,) 279.11 692.33 T +0 F +(r) 284.11 692.33 T +(e) 288.37 692.33 T +(v) 292.66 692.33 T +(erse-portrait) 297.56 692.33 T +1 F +(, and) 351.98 692.33 T +0 F +(r) 373.92 692.33 T +(e) 378.18 692.33 T +(v) 382.47 692.33 T +(erse-landscape) 387.37 692.33 T +1 F +(.) 450.14 692.33 T +0 F +(copy-count) 108 670.33 T +1 F +(Speci\336es the number of copies of this document to print.) 198 670.33 T +(The def) 198 646.33 T +(ault v) 228.72 646.33 T +(alue is implicitly tak) 250.97 646.33 T +(en to be) 332.82 646.33 T +0 F +(1) 366.98 646.33 T +1 F +( by the X Print Serv) 371.98 646.33 T +(er) 451.55 646.33 T +(.) 458.77 646.33 T +0 F +(default-printer) 108 624.33 T +(-r) 171.51 624.33 T +(esolution) 179.1 624.33 T +1 F +(Speci\336es the resolution in dots per inch to be used for this document.) 198 612.33 T +0 F +(default-input-tray) 108 590.33 T +1 F +(The name of the input tray from which media will be dra) 198 590.33 T +(wn for printing the) 425.31 590.33 T +(document. V) 198 578.33 T +(alid v) 248.55 578.33 T +(alues are:) 270.8 578.33 T +0 F +(top) 311.34 578.33 T +1 F +(,) 325.23 578.33 T +0 F +(middle) 330.23 578.33 T +1 F +(,) 359.68 578.33 T +0 F +(bottom) 364.68 578.33 T +1 F +(,) 395.23 578.33 T +0 F +(en) 400.23 578.33 T +(v) 409.83 578.33 T +(elope) 414.73 578.33 T +1 F +(,) 436.95 578.33 T +0 F +(manual) 441.95 578.33 T +1 F +(,) 474.18 578.33 T +0 F +(lar) 479.18 578.33 T +(ge-) 491.3 578.33 T +(capacity) 198 566.33 T +1 F +(,) 232.9 566.33 T +0 F +(main) 237.9 566.33 T +1 F +(, and) 259.57 566.33 T +0 F +(side) 281.51 566.33 T +1 F +(. If the) 298.18 566.33 T +0 F +(default-medium) 327.06 566.33 T +1 F +( attrib) 395.39 566.33 T +(ute is speci\336ed, it will tak) 418.8 566.33 T +(e) 521.48 566.33 T +(precedence o) 198 554.33 T +(v) 250.32 554.33 T +(er) 255.17 554.33 T +0 F +(default-input-tray) 265.44 554.33 T +1 F +(.) 342.01 554.33 T +0 F +(default-medium) 108 532.33 T +1 F +(Speci\336es the medium on which the document is to be printed. The X Print Service) 198 532.33 T +(de\336nes v) 198 520.33 T +(alid) 233.58 520.33 T +0 F +(default-medium) 251.08 520.33 T +1 F +( v) 319.41 520.33 T +(alues to be the standard v) 326.66 520.33 T +(alues of the) 427.78 520.33 T +0 F +(medium-size) 476.38 520.33 T +1 F +(attrib) 198 508.33 T +(ute as speci\336ed in ISO/IEC 10175-1.) 218.91 508.33 T +0 F +(document-f) 108 486.33 T +(ormat) 156.63 486.33 T +1 F +(Speci\336es the format of the document. The v) 198 486.33 T +(alue is a structure comprised of the) 373.28 486.33 T +(document-format, an optional document-format-v) 198 474.33 T +(ariant, and an optional document-) 397.16 474.33 T +(format-v) 198 462.33 T +(ersion. Speci\336c printer DDX dri) 232.84 462.33 T +(v) 361.18 462.33 T +(ers may require speci\336cation of the) 366.03 462.33 T +(optional v) 198 450.33 T +(alues. The structure v) 238.03 450.33 T +(alues are enclosed by curly braces \322{}\323 and) 323.87 450.33 T +(delimited by whitespace.) 198 438.33 T +0 F +(plex) 108 416.33 T +1 F +(Speci\336es the) 198 416.33 T +0 F +(plex) 251.33 416.33 T +1 F +( to be used for this document. V) 269.11 416.33 T +(alid v) 396.32 416.33 T +(alues are) 418.57 416.33 T +0 F +(simplex) 456.33 416.33 T +1 F +(,) 489.11 416.33 T +0 F +(duplex) 494.11 416.33 T +1 F +(,) 523.01 416.33 T +(and) 198 404.33 T +0 F +(tumble) 214.94 404.33 T +1 F +(.) 244.94 404.33 T +0 F +(xp-listf) 108 382.33 T +(onts-modes) 137.75 382.33 T +1 F +(The v) 198 382.33 T +(alue of this attrib) 220.8 382.33 T +(ute controls the beha) 288.65 382.33 T +(vior of) 371.49 382.33 T +0 F +(ListF) 400.93 382.33 T +(onts) 423.46 382.33 T +1 F +( and) 441.24 382.33 T +0 F +(ListF) 198 370.33 T +(ontsW) 220.53 370.33 T +(ithInf) 248.13 370.33 T +(o) 272.33 370.33 T +1 F +( when a print conte) 277.33 370.33 T +(xt has been set. The v) 353.83 370.33 T +(alue is a whitespace) 440.23 370.33 T +(delimited list of one or more listfonts mode v) 198 358.33 T +(alues. V) 378.86 358.33 T +(alid listfonts mode v) 410.52 358.33 T +(alues) 492.22 358.33 T +(include) 198 346.33 T +0 F +(xp-list-inter) 229.94 346.33 T +(nal-printer) 280.34 346.33 T +(-f) 327.19 346.33 T +(onts) 333.6 346.33 T +1 F +( and) 351.38 346.33 T +0 F +(xp-list-glyph-f) 370.82 346.33 T +(onts) 431.13 346.33 T +1 F +(.) 448.91 346.33 T +(When a print conte) 198 322.33 T +(xt is set on a display connection, the def) 274.22 322.33 T +(ault beha) 434.38 322.33 T +(vior of) 470.56 322.33 T +0 F +(ListF) 198 310.33 T +(onts) 220.53 310.33 T +1 F +( and) 238.31 310.33 T +0 F +(ListF) 257.75 310.33 T +(ontsW) 280.28 310.33 T +(ithInf) 307.88 310.33 T +(o) 332.08 310.33 T +1 F +( is to list all of the fonts normally associated with) 337.08 310.33 T +(the X print serv) 198 298.33 T +(er \050i.e. fonts containing glyphs\051 as well as an) 260.34 298.33 T +(y internal printer fonts) 439.05 298.33 T +(de\336ned for the printer) 198 286.33 T +(. The) 284.93 286.33 T +0 F +(xp-listf) 307.98 286.33 T +(onts-modes) 337.73 286.33 T +1 F +( attrib) 386.06 286.33 T +(ute is pro) 409.47 286.33 T +(vided so that) 446.54 286.33 T +(applications can control the beha) 198 274.33 T +(vior of) 329.44 274.33 T +0 F +(ListF) 358.88 274.33 T +(onts) 381.41 274.33 T +1 F +( and) 399.19 274.33 T +0 F +(ListF) 418.63 274.33 T +(ontsW) 441.16 274.33 T +(ithInf) 468.76 274.33 T +(o) 492.96 274.33 T +1 F +(and is) 500.46 274.33 T +(typically to sho) 198 262.33 T +(w just internal printer fonts. Using only internal printer fonts is) 259.42 262.33 T +(useful for performance reasons; the glyphs associated with the font are contained) 198 250.33 T +(within the printer and do not ha) 198 238.33 T +(v) 323.9 238.33 T +(e to be do) 328.75 238.33 T +(wnloaded to it.) 367.66 238.33 T +(If the v) 198 214.33 T +(alue of) 226.63 214.33 T +0 F +(xp-listf) 256.62 214.33 T +(onts-modes) 286.37 214.33 T +1 F +( includes) 334.7 214.33 T +0 F +(xp-list-glyph-f) 373.03 214.33 T +(onts,) 433.34 214.33 T +(ListF) 456.12 214.33 T +(onts) 478.65 214.33 T +1 F +( and) 496.43 214.33 T +0 F +(ListF) 198 202.33 T +(ontsW) 220.53 202.33 T +(ithInf) 248.13 202.33 T +(o) 272.33 202.33 T +1 F +( will include all of the fonts a) 277.33 202.33 T +(v) 394.62 202.33 T +(ailable to the serv) 399.37 202.33 T +(er which ha) 470.04 202.33 T +(v) 516.49 202.33 T +(e) 521.34 202.33 T +(glyphs associated with them. If the v) 198 190.33 T +(alue of) 344.68 190.33 T +0 F +(xp-listf) 374.67 190.33 T +(onts-modes) 404.42 190.33 T +1 F +( includes) 452.75 190.33 T +0 F +(xp-list-) 491.08 190.33 T +(inter) 198 178.33 T +(nal-printer) 218.4 178.33 T +(-f) 265.25 178.33 T +(onts,) 271.66 178.33 T +1 F +( then) 291.94 178.33 T +0 F +(ListF) 314.16 178.33 T +(onts) 336.69 178.33 T +1 F +( and) 354.47 178.33 T +0 F +(ListF) 373.91 178.33 T +(ontsW) 396.44 178.33 T +(ithInf) 424.04 178.33 T +(o) 448.24 178.33 T +1 F +( will include all of) 453.24 178.33 T +(the fonts de\336ned as internal printer fonts.) 198 166.33 T +0 14 Q +(3.6) 72 130.67 T +(P) 108 130.67 T +(age Attrib) 116.41 130.67 T +(utes) 177.17 130.67 T +1 10 Q +-0.25 (The page attrib) 108 106.33 P +-0.25 (ute pool is identi\336ed by XPP) 167.83 106.33 P +-0.25 (ageAttr) 281.7 106.33 P +-0.25 (. These are document attrib) 311.14 106.33 P +-0.25 (utes that can be o) 419.07 106.33 P +-0.25 (v) 487.34 106.33 P +-0.25 (erridden on) 492.19 106.33 P +(a page by page basis within the X Print Service.) 108 94.33 T +(The def) 108 70.33 T +(ault for each page attrib) 138.72 70.33 T +(ute is the current v) 233.49 70.33 T +(alue of the corresponding document attrib) 307.67 70.33 T +(ute.) 474.94 70.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "18" 22 +%%Page: "19" 23 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(X Print Attrib) 72 746.67 T +(utes) 157.26 746.67 T +(19) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 10 Q +(content-orientation) 108 704.33 T +1 F +(Speci\336es the orientation to be used for this page. V) 198 704.33 T +(alid v) 401.31 704.33 T +(alues are:) 423.56 704.33 T +0 F +(portrait) 198 692.33 T +1 F +(,) 231.88 692.33 T +0 F +(landscape) 236.88 692.33 T +1 F +(,) 279.11 692.33 T +0 F +(r) 284.11 692.33 T +(e) 288.37 692.33 T +(v) 292.66 692.33 T +(erse-portrait) 297.56 692.33 T +1 F +(, and) 351.98 692.33 T +0 F +(r) 373.92 692.33 T +(e) 378.18 692.33 T +(v) 382.47 692.33 T +(erse-landscape) 387.37 692.33 T +1 F +(.) 450.14 692.33 T +0 F +(default-printer) 108 670.33 T +(-r) 171.51 670.33 T +(esolution) 179.1 670.33 T +1 F +(Speci\336es the resolution in dots per inch to be used for this page.) 198 658.33 T +0 F +(default-input-tray) 108 636.33 T +1 F +(The name of the input tray from which media will be dra) 198 636.33 T +(wn for printing the) 425.31 636.33 T +(document. V) 198 624.33 T +(alid v) 248.55 624.33 T +(alues are:) 270.8 624.33 T +0 F +(top) 311.34 624.33 T +1 F +(,) 325.23 624.33 T +0 F +(middle) 330.23 624.33 T +1 F +(,) 359.68 624.33 T +0 F +(bottom) 364.68 624.33 T +1 F +(,) 395.23 624.33 T +0 F +(en) 400.23 624.33 T +(v) 409.83 624.33 T +(elope) 414.73 624.33 T +1 F +(,) 436.95 624.33 T +0 F +(manual) 441.95 624.33 T +1 F +(,) 474.18 624.33 T +0 F +(lar) 479.18 624.33 T +(ge-) 491.3 624.33 T +(capacity) 198 612.33 T +1 F +(,) 232.9 612.33 T +0 F +(main) 237.9 612.33 T +1 F +(, and) 259.57 612.33 T +0 F +(side) 281.51 612.33 T +1 F +(. If the) 298.18 612.33 T +0 F +(default-medium) 327.06 612.33 T +1 F +( attrib) 395.39 612.33 T +(ute is speci\336ed, it will tak) 418.8 612.33 T +(e) 521.48 612.33 T +(precedence o) 198 600.33 T +(v) 250.32 600.33 T +(er) 255.17 600.33 T +0 F +(default-input-tray) 265.44 600.33 T +1 F +(.) 342.01 600.33 T +0 F +(default-medium) 108 578.33 T +1 F +(Speci\336es the medium on which the document is to be printed. The X Print Service) 198 578.33 T +(de\336nes v) 198 566.33 T +(alid) 233.58 566.33 T +0 F +(default-medium) 251.08 566.33 T +1 F +( v) 319.41 566.33 T +(alues to be the standard v) 326.66 566.33 T +(alues of the) 427.78 566.33 T +0 F +(medium-size) 476.38 566.33 T +1 F +(attrib) 198 554.33 T +(ute as speci\336ed in ISO/IEC 10175-1.) 218.91 554.33 T +0 F +(plex) 108 532.33 T +1 F +(Speci\336es the) 198 532.33 T +0 F +(plex) 251.33 532.33 T +1 F +( to be used for this document. V) 269.11 532.33 T +(alid v) 396.32 532.33 T +(alues are) 418.57 532.33 T +0 F +(simplex) 456.33 532.33 T +1 F +(,) 489.11 532.33 T +0 F +(duplex) 494.11 532.33 T +1 F +(,) 523.01 532.33 T +(and) 198 520.33 T +0 F +(tumble) 214.94 520.33 T +1 F +(.) 244.94 520.33 T +0 F +(xp-listf) 108 498.33 T +(onts-modes) 137.75 498.33 T +1 F +(The v) 198 498.33 T +(alue of this attrib) 220.8 498.33 T +(ute controls the beha) 288.65 498.33 T +(vior of) 371.49 498.33 T +0 F +(ListF) 400.93 498.33 T +(onts) 423.46 498.33 T +1 F +( and) 441.24 498.33 T +0 F +(ListF) 198 486.33 T +(ontsW) 220.53 486.33 T +(ithInf) 248.13 486.33 T +(o) 272.33 486.33 T +1 F +( when a print conte) 277.33 486.33 T +(xt has been set. The v) 353.83 486.33 T +(alue is a whitespace) 440.23 486.33 T +(delimited list of one or more listfonts mode v) 198 474.33 T +(alues. V) 378.86 474.33 T +(alid listfonts mode v) 410.52 474.33 T +(alues) 492.22 474.33 T +(include) 198 462.33 T +0 F +(xp-list-inter) 229.94 462.33 T +(nal-printer) 280.34 462.33 T +(-f) 327.19 462.33 T +(onts) 333.6 462.33 T +1 F +( and) 351.38 462.33 T +0 F +(xp-list-glyph-f) 370.82 462.33 T +(onts) 431.13 462.33 T +1 F +(.) 448.91 462.33 T +(When a print conte) 198 438.33 T +(xt is set on a display connection, the def) 274.22 438.33 T +(ault beha) 434.38 438.33 T +(vior of) 470.56 438.33 T +0 F +(ListF) 198 426.33 T +(onts) 220.53 426.33 T +1 F +( and) 238.31 426.33 T +0 F +(ListF) 257.75 426.33 T +(ontsW) 280.28 426.33 T +(ithInf) 307.88 426.33 T +(o) 332.08 426.33 T +1 F +( is to list all of the fonts normally associated with) 337.08 426.33 T +(the X print serv) 198 414.33 T +(er \050i.e. fonts containing glyphs\051 as well as an) 260.34 414.33 T +(y internal printer fonts) 439.05 414.33 T +(de\336ned for the printer) 198 402.33 T +(. The) 284.93 402.33 T +0 F +(xp-listf) 307.98 402.33 T +(onts-modes) 337.73 402.33 T +1 F +( attrib) 386.06 402.33 T +(ute is pro) 409.47 402.33 T +(vided so that) 446.54 402.33 T +(applications can control the beha) 198 390.33 T +(vior of) 329.44 390.33 T +0 F +(ListF) 358.88 390.33 T +(onts) 381.41 390.33 T +1 F +( and) 399.19 390.33 T +0 F +(ListF) 418.63 390.33 T +(ontsW) 441.16 390.33 T +(ithInf) 468.76 390.33 T +(o) 492.96 390.33 T +1 F +(and is) 500.46 390.33 T +(typically to sho) 198 378.33 T +(w just internal printer fonts. Using only internal printer fonts is) 259.42 378.33 T +(useful for performance reasons; the glyphs associated with the font are contained) 198 366.33 T +(within the printer and do not ha) 198 354.33 T +(v) 323.9 354.33 T +(e to be do) 328.75 354.33 T +(wnloaded to it.) 367.66 354.33 T +(If the v) 198 330.33 T +(alue of) 226.63 330.33 T +0 F +(xp-listf) 256.62 330.33 T +(onts-modes) 286.37 330.33 T +1 F +( includes) 334.7 330.33 T +0 F +(xp-list-glyph-f) 373.03 330.33 T +(onts,) 433.34 330.33 T +(ListF) 456.12 330.33 T +(onts) 478.65 330.33 T +1 F +( and) 496.43 330.33 T +0 F +(ListF) 198 318.33 T +(ontsW) 220.53 318.33 T +(ithInf) 248.13 318.33 T +(o) 272.33 318.33 T +1 F +( will include all of the fonts a) 277.33 318.33 T +(v) 394.62 318.33 T +(ailable to the serv) 399.37 318.33 T +(er which ha) 470.04 318.33 T +(v) 516.49 318.33 T +(e) 521.34 318.33 T +(glyphs associated with them. If the v) 198 306.33 T +(alue of) 344.68 306.33 T +0 F +(xp-listf) 374.67 306.33 T +(onts-modes) 404.42 306.33 T +1 F +( includes) 452.75 306.33 T +0 F +(xp-list-) 491.08 306.33 T +(inter) 198 294.33 T +(nal-printer) 218.4 294.33 T +(-f) 265.25 294.33 T +(onts,) 271.66 294.33 T +1 F +( then) 291.94 294.33 T +0 F +(ListF) 314.16 294.33 T +(onts) 336.69 294.33 T +1 F +( and) 354.47 294.33 T +0 F +(ListF) 373.91 294.33 T +(ontsW) 396.44 294.33 T +(ithInf) 424.04 294.33 T +(o) 448.24 294.33 T +1 F +( will include all of) 453.24 294.33 T +(the fonts de\336ned as internal printer fonts.) 198 282.33 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "19" 23 +%%Page: "20" 24 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(20) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +-0.5 (Communication with the Print Dialog) 352.88 41.28 P +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(20) 72 749.33 T +(Communication with the Print Dialog Manager) 220.51 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 18 Q +0 X +(4) 72 699 T +(Communication with the Print Dialog Manager) 108 699 T +1 10 Q +(Print Dialog Managers \050PDMs\051 pro) 108 666.33 T +(vide users with a graphical interf) 249.5 666.33 T +(ace to specify printer) 380.76 666.33 T +(-speci\336c and) 464.7 666.33 T +(spooler) 108 654.33 T +(-speci\336c information. This section describes the interaction between X Print Service and PDMs.) 137.24 654.33 T +(F) 108 630.33 T +(or each serv) 113.41 630.33 T +(er w) 161.57 630.33 T +(anting to use print dialog services, a Print Dialog Manager acquires o) 178.96 630.33 T +(wnership of a selec-) 455.89 630.33 T +(tion named PDM_MAN) 108 618.33 T +(A) 204.87 618.33 T +(GER on the def) 211.69 618.33 T +(ault root windo) 274.08 618.33 T +(w \050a dif) 334.94 618.33 T +(ferent name can be used, as long as it is) 365.79 618.33 T +(kno) 108 606.33 T +(wn to both the client and the PDM\051. Print Dialog Managers should comply with the con) 122.75 606.33 T +(v) 473.44 606.33 T +(entions for) 478.29 606.33 T +(\322Manager Selections\323 described in section 2.8 of the) 108 594.33 T +2 F +( Inter) 318.51 594.33 T +(-Client Communication Con) 340.25 594.33 T +(ventions Manual) 453.19 594.33 T +1 F +(\050ICCCM\051. A printing client establishes a print conte) 108 582.33 T +(xt, and then requests services of the Print Dialog Man-) 316.17 582.33 T +(ager by issuing con) 108 570.33 T +(v) 185.09 570.33 T +(ersion requests on this selection.) 189.94 570.33 T +(Print Dialog Managers should support con) 108 546.33 T +(v) 277.31 546.33 T +(ersion of the follo) 282.16 546.33 T +(wing tar) 353.29 546.33 T +(gets on their manager selection:) 386.16 546.33 T +0 14 Q +( The PDM_ST) 72 454.67 T +(AR) 157.08 454.67 T +(T Selection T) 176.73 454.67 T +(ar) 254.78 454.67 T +(get) 267.86 454.67 T +1 10 Q +-0.17 (The PDM_ST) 108 430.33 P +-0.17 (AR) 163.29 430.33 P +-0.17 (T tar) 176.58 430.33 P +-0.17 (get is parametized \050ICCCM section 2.2\051, and the property named in the) 195.39 430.33 P +0 F +-0.17 (Con) 480.52 430.33 P +-0.17 (v) 497.9 430.33 P +-0.17 (ertSelec-) 502.8 430.33 P +(tion) 108 418.33 T +1 F +( request contains the follo) 124.67 418.33 T +(wing list of information:) 227.74 418.33 T +-0.27 (The PDM_ST) 108 246.33 P +-0.27 (AR) 163.19 246.33 P +-0.27 (T tar) 176.48 246.33 P +-0.27 (get has a side ef) 195.19 246.33 P +-0.27 (fect \050ICCCM, section 2.6.3\051. The PDM interprets the parameters listed) 257.73 246.33 P +(abo) 108 234.33 T +(v) 122.29 234.33 T +(e and pro) 127.14 234.33 T +(vides a user interf) 164.2 234.33 T +(ace dialog on behalf of the client in which the user can modify attrib) 235.47 234.33 T +(utes on) 508.83 234.33 T +(the print-conte) 108 222.33 T +(xt on the print-display pro) 166.45 222.33 T +(vided.) 270.74 222.33 T +-0.09 (The PDM will use the video-display) 108 198.33 P +-0.09 (, video-windo) 252.19 198.33 P +-0.09 (w) 307.4 198.33 P +-0.09 (, and locale parameters to con\336gure and manage its user) 313.97 198.33 P +(interf) 108 186.33 T +(ace.) 129.56 186.33 T +(The selection reply is placed in the property pro) 108 162.33 T +(vided, where type is A) 299.48 162.33 T +(T) 388.63 162.33 T +(OM, format is 32, and the data con-) 394.56 162.33 T +(sists of a single A) 108 150.33 T +(T) 178 150.33 T +(OM element:) 183.93 150.33 T +(A) 114 508.33 T +(T) 120.11 508.33 T +(OM) 126.04 508.33 T +(D) 186 508.33 T +(A) 192.82 508.33 T +(T) 198.93 508.33 T +(A RECEIVED) 204.11 508.33 T +(PDM_ST) 114 492.33 T +(AR) 151.41 492.33 T +(T) 164.7 492.33 T +(Request that a dialog be managed for a particular print conte) 186 492.33 T +(xt) 428.02 492.33 T +(P) 114 380.33 T +(ARAMETER) 118.64 380.33 T +(FORMA) 186 380.33 T +(T) 220.45 380.33 T +(DESCRIPTION) 294 380.33 T +(video-display) 114 364.33 T +(\322host:port[.screen]\323) 186 364.33 T +(X display of video serv) 294 364.33 T +(er) 387.17 364.33 T +(video-windo) 114 348.33 T +(w) 164.3 348.33 T +(\3220x12345678\323) 186 348.33 T +(W) 294 348.33 T +(indo) 303.04 348.33 T +(w to act as parent of PDM dialog) 320.57 348.33 T +(print-display) 114 332.33 T +(\322host:port[.screen]\323) 186 332.33 T +(X display of print serv) 294 332.33 T +(er) 383.84 332.33 T +(print-windo) 114 316.33 T +(w) 160.97 316.33 T +(\3220x12345678\323) 186 316.33 T +(W) 294 316.33 T +(indo) 303.04 316.33 T +(w on print serv) 320.57 316.33 T +(er for subsequent) 380.69 316.33 T +(communication) 294 304.33 T +(print-conte) 114 288.33 T +(xt) 157.73 288.33 T +(\3220x12345678\323) 186 288.33 T +(Conte) 294 288.33 T +(xt of print job) 317.74 288.33 T +(locale) 114 272.33 T +(\322C\323) 186 272.33 T +(Hint to PDM re) 294 272.33 T +(g) 356.35 272.33 T +(arding the locale) 361.3 272.33 T +(A) 114 112.33 T +(T) 120.11 112.33 T +(OM) 126.04 112.33 T +(DESCRIPTION) 258 112.33 T +(PDM_ST) 114 96.33 T +(AR) 151.41 96.33 T +(T_OK) 164.7 96.33 T +(The PDM w) 258 96.33 T +(as started successfully) 307.34 96.33 T +(PDM_ST) 114 80.33 T +(AR) 151.41 80.33 T +(T_VXA) 164.7 80.33 T +(UTH) 196.92 80.33 T +(The PDM w) 258 80.33 T +(as not authorized to connect to video-display) 307.34 80.33 T +108 503 468 503 2 L +V +0.5 H +0 Z +N +108 375 468 375 2 L +V +N +108 107 540 107 2 L +V +N +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "20" 24 +%%Page: "21" 25 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Communication with the Print Dialog Manager) 72 746.67 T +(21) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(If the PDM starts successfully) 108 660.33 T +(, once the user completes the PDM dialog, the PDM \336nishes communication) 227.89 660.33 T +(with the client by sending a ClientMessage to print-windo) 108 648.33 T +(w on the print-display) 339.96 648.33 T +(.) 427.36 648.33 T +-0.05 (The type of this ClientMessage is \322PDM_REPL) 108 624.33 P +-0.05 (Y\323, its format is 32, and the data consists of a single A) 298.92 624.33 P +-0.05 (T) 515.51 624.33 P +-0.05 (OM) 521.44 624.33 P +(element:) 108 612.33 T +(PDM_ST) 114 700.33 T +(AR) 151.41 700.33 T +(T_PXA) 164.7 700.33 T +(UTH) 195.26 700.33 T +(The PDM w) 258 700.33 T +(as not authorized to connect to print-display) 307.34 700.33 T +(PDM_ST) 114 684.33 T +(AR) 151.41 684.33 T +(T_ERR) 164.7 684.33 T +(OR) 194.86 684.33 T +(The PDM encountered an error) 258 684.33 T +(A) 114 574.33 T +(T) 120.11 574.33 T +(OM) 126.04 574.33 T +(DESCRIPTION) 258 574.33 T +(PDM_EXIT_OK) 114 558.33 T +(The user selected \322OK\323. The PDM may or may not ha) 258 558.33 T +(v) 475.25 558.33 T +(e changed) 480.1 558.33 T +(an) 258 546.33 T +(y attrib) 267.29 546.33 T +(utes.) 295.7 546.33 T +(PDM_EXIT_CANCEL) 114 530.33 T +-0.29 (The user selected \322Cancel\323. Attrib) 258 530.33 P +-0.29 (utes ha) 394.09 530.33 P +-0.29 (v) 421.65 530.33 P +-0.29 (e been left in the state the) 426.5 530.33 P +-0.29 (y) 526.79 530.33 P +(were in before communication be) 258 518.33 T +(g) 392.26 518.33 T +(an.) 397.21 518.33 T +(PDM_EXIT_VXA) 114 502.33 T +(UTH) 189.55 502.33 T +(The PDM w) 258 502.33 T +(as not authorized to connect to video-display) 307.34 502.33 T +(PDM_EXIT_PXA) 114 486.33 T +(UTH) 187.89 486.33 T +(The PDM w) 258 486.33 T +(as not authorized to connect to print-display) 307.34 486.33 T +(PDM_EXIT_ERR) 114 470.33 T +(OR) 187.49 470.33 T +(The PDM encountered an error) 258 470.33 T +108 569 540 569 2 L +V +0.5 H +0 Z +N +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "21" 25 +%%Page: "22" 26 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(22) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocol Encoding) 429.28 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(22) 72 749.33 T +(Pr) 393.41 749.33 T +(otocol Encoding) 407.93 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 18 Q +0 X +(5) 72 699 T +(Pr) 108 699 T +(otocol Encoding) 126.67 699 T +1 10 Q +(The follo) 108 666.33 T +(wing sections describe protocol encoding for X Print Extension Protocol requests, e) 144.69 666.33 T +(v) 479.4 666.33 T +(ents, and) 484.25 666.33 T +(errors.) 108 654.33 T +0 14 Q +(5.1) 72 618.67 T +(Request Pr) 108 618.67 T +(otocol Encoding) 174.23 618.67 T +0 12 Q +(PrintQueryV) 108 563 T +(ersion) 174.79 563 T +3 10 Q +(\256) 100.8 472.33 T +0 12 Q +(PrintGetPrinterList) 108 322 T +3 10 Q +(\256) 100.8 153.33 T +1 9 Q +(1) 114 522 T +(base) 168 522 T +(major im) 306.56 522 T +(1) 114 509 T +(0) 168 509 T +(minor opcode) 306.56 509 T +(2) 114 496 T +(1) 168 496 T +(request length) 306.56 496 T +(1) 114 457 T +(1) 168 457 T +(Reply) 306.56 457 T +(1) 114 444 T +(unused) 168 444 T +(2) 114 431 T +(CARD16) 168 431 T +(sequence number) 306.56 431 T +(4) 114 418 T +(0) 168 418 T +(reply length) 306.56 418 T +(2) 114 405 T +(CARD16) 168 405 T +(major) 306.56 405 T +(-v) 327.38 405 T +(ersion) 334.74 405 T +(2) 114 392 T +(CARD16) 168 392 T +(minor) 306.56 392 T +(-v) 327.88 392 T +(ersion) 335.24 392 T +(20) 114 379 T +(unused) 168 379 T +(1) 114 281 T +(base) 168 281 T +(major opcode) 306.56 281 T +(1) 114 268 T +(1) 168 268 T +(minor opcode) 306.56 268 T +(2) 114 255 T +(3+\050nl+np + ll+lp\051/4) 168 255 T +(request length) 306.56 255 T +(4) 114 242 T +(CARD32) 168 242 T +(printerNameLen) 306.56 242 T +(4) 114 229 T +(CARD32) 168 229 T +(localeLen) 306.56 229 T +(nl) 114 216 T +(STRING8) 168 216 T +(printer) 306.56 216 T +(-name) 330.38 216 T +(np) 114 203 T +(BYTE) 168 203 T +(p=pad\050nl\051) 306.56 203 T +(ll) 114 190 T +(STRING8) 168 190 T +(locale) 306.56 190 T +(lp) 114 177 T +(BYTE) 168 177 T +(lp=pad\050ll\051) 306.56 177 T +(1) 114 116 T +(1) 168 116 T +(Reply) 306.56 116 T +(1) 114 103 T +(unused) 306.56 103 T +(2) 114 90 T +(CARD16) 168 90 T +(sequenceNumber) 306.56 90 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "22" 26 +%%Page: "23" 27 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocol Encoding) 86.52 746.67 T +(23) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 12 Q +(PrintRehashPrinterList) 108 439 T +(PrintCr) 108 315 T +(eateContext) 148.44 315 T +1 9 Q +(4) 114 703 T +( \0508 + nl+nlp + dl+dlp\051/4 computed) 168 703 T +(listCount times) 168 692 T +(length) 306.56 703 T +(4) 114 679 T +(CARD32) 168 679 T +(listCount) 306.56 679 T +(20) 114 666 T +(unused) 306.56 666 T +( \0508 +) 114 653 T +(nl+nlp +) 114 642 T +(dl+dlp\051) 114 631 T +(computed) 114 620 T +(listCount) 114 609 T +(times) 114 598 T +(LIST) 168 653 T +(ofPRINTER) 186.28 653 T +(printers) 306.56 653 T +(PRINTER) 114 572 T +(4) 114 559 T +(CARD32) 168 559 T +(nameLen) 306.56 559 T +(nl) 114 546 T +(STRING8) 168 546 T +(name) 306.56 546 T +(nlp) 114 533 T +(BYTE) 168 533 T +(nlp=pad\050nl\051) 306.56 533 T +(4) 114 520 T +(CARD32) 168 520 T +(descLen) 306.56 520 T +(dl) 114 507 T +(STRING8) 168 507 T +(description) 306.56 507 T +(dlp) 114 494 T +(BYTE) 168 494 T +(dlp=pad\050dl\051) 306.56 494 T +(1) 114 398 T +(base) 168 398 T +(major opcode) 306.56 398 T +(1) 114 385 T +(20) 168 385 T +(minor opcode) 306.56 385 T +(2) 114 372 T +(1) 168 372 T +(request length) 306.56 372 T +(1) 114 274 T +(base) 168 274 T +(major opcode) 306.56 274 T +(1) 114 261 T +(2) 168 261 T +(minor opcode) 306.56 261 T +(2) 114 248 T +(4 + \050nl+np + ll+lp\051/4) 168 248 T +(request length) 306.56 248 T +(4) 114 235 T +(CARD32) 168 235 T +(conte) 306.56 235 T +(xt-id) 325.92 235 T +(4) 114 222 T +(CARD32) 168 222 T +(printerNameLen) 306.56 222 T +(4) 114 209 T +(CARD32) 168 209 T +(localeLen) 306.56 209 T +(nl) 114 196 T +(STRING8) 168 196 T +(printer) 306.56 196 T +(-name) 330.38 196 T +(np) 114 183 T +(BYTE\051) 168 183 T +(np=pad\050nl\051) 306.56 183 T +(ll) 114 170 T +(STRING8) 168 170 T +(locale) 306.56 170 T +(lp) 114 157 T +(BYTE) 168 157 T +(lp=pad\050ll\051) 306.56 157 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "23" 27 +%%Page: "24" 28 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(24) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocol Encoding) 429.28 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(24) 72 749.33 T +(Pr) 393.41 749.33 T +(otocol Encoding) 407.93 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 12 Q +0 X +(PrintSetContext) 108 703 T +(PrintGetContext) 108 566 T +3 10 Q +(\256) 100.8 475.33 T +0 12 Q +(PrintDestr) 108 316 T +(oyContext) 162.43 316 T +(PrintGetScr) 108 179 T +(eenofContext) 170.44 179 T +3 10 Q +(\256) 100.8 88.33 T +1 9 Q +(1) 114 662 T +(base) 168 662 T +(major opcode) 306.56 662 T +(1) 114 649 T +(3) 168 649 T +(minor opcode) 306.56 649 T +(2) 114 636 T +(2) 168 636 T +(request length) 306.56 636 T +(4) 114 623 T +(CARD32) 168 623 T +(conte) 306.56 623 T +(xt) 325.92 623 T +(1) 114 525 T +(base) 168 525 T +(major opcode) 306.56 525 T +(1) 114 512 T +(4) 168 512 T +(minor opcode) 306.56 512 T +(2) 114 499 T +(1) 168 499 T +(request length) 306.56 499 T +(1) 114 438 T +(1) 168 438 T +(Reply) 306.56 438 T +(1) 114 425 T +(unused) 306.56 425 T +(2) 114 412 T +(CARD16) 168 412 T +(sequence number) 306.56 412 T +(4) 114 399 T +(0) 168 399 T +(reply length) 306.56 399 T +(4) 114 386 T +(CARD32) 168 386 T +(conte) 306.56 386 T +(xt) 325.92 386 T +(16) 114 373 T +(unused) 306.56 373 T +(1) 114 275 T +(base) 168 275 T +(major opcode) 306.56 275 T +(1) 114 262 T +(5) 168 262 T +(minor opcode) 306.56 262 T +(2) 114 249 T +(2) 168 249 T +(request length) 306.56 249 T +(4) 114 236 T +(CARD32) 168 236 T +(conte) 306.56 236 T +(xt) 325.92 236 T +(1) 114 138 T +(base) 168 138 T +(major opcode) 306.56 138 T +(1) 114 125 T +(6) 168 125 T +(minor opcode) 306.56 125 T +(2) 114 112 T +(1) 168 112 T +(request length) 306.56 112 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "24" 28 +%%Page: "25" 29 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocol Encoding) 86.52 746.67 T +(25) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 12 Q +(PrintStartJ) 108 561 T +(ob) 166.48 561 T +(PrintEndJ) 108 411 T +(ob) 161.83 411 T +(PrintStartDoc) 108 261 T +1 9 Q +(1) 114 683 T +(1) 203.26 683 T +(Reply) 341.82 683 T +(1) 114 670 T +(unused) 341.82 670 T +(2) 114 657 T +(CARD16) 203.26 657 T +(sequence number) 341.82 657 T +(4) 114 644 T +(0) 203.26 644 T +(reply length) 341.82 644 T +(4) 114 631 T +(WINDO) 203.26 631 T +(W) 233.93 631 T +(root) 341.82 631 T +(16) 114 618 T +(unused) 341.82 618 T +(1) 114 520 T +(base) 168 520 T +(major opcode) 306.56 520 T +(1) 114 507 T +(7) 168 507 T +(minor opcode) 306.56 507 T +(2) 114 494 T +(2) 168 494 T +(request length) 306.56 494 T +(1) 114 481 T +(CARD8) 168 481 T +(output-mode) 306.56 481 T +(3) 114 468 T +(unused) 306.56 468 T +(1) 114 370 T +(base) 168 370 T +(major opcode) 306.56 370 T +(1) 114 357 T +(8) 168 357 T +(minor opcode) 306.56 357 T +(2) 114 344 T +(2) 168 344 T +(request length) 306.56 344 T +(1) 114 331 T +(BOOL) 168 331 T +(cancel) 306.56 331 T +(3) 114 318 T +(unused) 306.56 318 T +(1) 114 220 T +(base) 168 220 T +(major opcode) 306.56 220 T +(1) 114 207 T +(9) 168 207 T +(minor opcode) 306.56 207 T +(2) 114 194 T +(2) 168 194 T +(request length) 306.56 194 T +(1) 114 181 T +(CARD8) 168 181 T +(dri) 306.56 181 T +(v) 316.33 181 T +(er) 320.7 181 T +(-mode) 327.51 181 T +(3) 114 168 T +(unused) 306.56 168 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "25" 29 +%%Page: "26" 30 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(26) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocol Encoding) 429.28 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(26) 72 749.33 T +(Pr) 393.41 749.33 T +(otocol Encoding) 407.93 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 12 Q +0 X +(PrintEndDoc) 108 703 T +(PrintPutDocumentData) 108 553 T +(PrintGetDocumentData) 108 299 T +3 10 Q +(\256+) 100.8 182.33 T +1 9 Q +(1) 114 662 T +(base) 168 662 T +(major opcode) 306.56 662 T +(1) 114 649 T +(10) 168 649 T +(minor opcode) 306.56 649 T +(2) 114 636 T +(2) 168 636 T +(request length) 306.56 636 T +(1) 114 623 T +(BOOL) 168 623 T +(cancel) 306.56 623 T +(3) 114 610 T +(unused) 306.56 610 T +(1) 114 512 T +(base) 168 512 T +(major opcode) 306.56 512 T +(1) 114 499 T +(11) 168 499 T +(minor opcode) 306.56 499 T +(2) 114 486 T +(4 + \050d+dp + f+fp + o+op\051/4) 168 486 T +(request length) 306.56 486 T +(4) 114 473 T +(DRA) 168 473 T +(W) 186.19 473 T +(ABLE) 193.6 473 T +(dra) 306.56 473 T +(w) 317.92 473 T +(able) 324.33 473 T +(4) 114 460 T +(CARD32) 168 460 T +(len_data) 306.56 460 T +(2) 114 447 T +(CARD16) 168 447 T +(len_fmt) 306.56 447 T +(2) 114 434 T +(CARD16) 168 434 T +(len_options) 306.56 434 T +(d) 114 421 T +(LIST) 168 421 T +(ofBYTE) 186.28 421 T +(data) 306.56 421 T +(dp) 114 408 T +(BYTE) 168 408 T +(dp=pad\050d\051) 306.56 408 T +(f) 114 395 T +(STRING8) 168 395 T +(doc-format) 306.56 395 T +(fp) 114 382 T +(BYTE) 168 382 T +(fp=pad\050f\051) 306.56 382 T +(o) 114 369 T +(STRING8) 168 369 T +(options) 306.56 369 T +(op) 114 356 T +(BYTE) 168 356 T +(op=pad\050o\051) 306.56 356 T +(1) 114 258 T +(base) 168 258 T +(major opcode) 306.56 258 T +(1) 114 245 T +(12) 168 245 T +(minor opcode) 306.56 245 T +(2) 114 232 T +(3) 168 232 T +(request length) 306.56 232 T +(4) 114 219 T +(PCONTEXT) 168 219 T +(conte) 306.56 219 T +(xt) 325.92 219 T +(4) 114 206 T +(CARD32) 168 206 T +(max-bytes) 306.56 206 T +(1) 114 167 T +(1) 168 167 T +(Reply) 306.56 167 T +(1) 114 154 T +(unused) 306.56 154 T +(2) 114 141 T +(CARD16) 168 141 T +(sequence number) 306.56 141 T +(4) 114 128 T +(\050n + p\051/4) 168 128 T +(reply length) 306.56 128 T +(4) 114 115 T +(0 XPGetDocFinished) 168 115 T +(1 XPGetDocSecondConsumer) 168 104 T +(status-code) 306.56 115 T +(4) 114 91 T +(CARD32) 168 91 T +(\336nished-\337ag) 306.56 91 T +(4) 114 78 T +(CARD32) 168 78 T +(dataLen) 306.56 78 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "26" 30 +%%Page: "27" 31 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocol Encoding) 86.52 746.67 T +(27) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 12 Q +(PrintStartP) 108 610 T +(age) 167.87 610 T +(PrintEndP) 108 473 T +(age) 163.22 473 T +(PrintSelectInput) 108 323 T +(PrintInputSelected) 108 134 T +1 9 Q +(12) 114 703 T +(unused) 306.56 703 T +(n) 114 690 T +(LIST) 168 690 T +(ofBYTE) 186.28 690 T +(data) 306.56 690 T +(p) 114 677 T +(BYTE) 168 677 T +(p=pad\050n\051) 306.56 677 T +(1) 114 569 T +(base) 168 569 T +(major opcode) 306.56 569 T +(1) 114 556 T +(13) 168 556 T +(minor opcode) 306.56 556 T +(2) 114 543 T +(2) 168 543 T +(request length) 306.56 543 T +(4) 114 530 T +(WINDO) 168 530 T +(W) 198.67 530 T +(windo) 306.56 530 T +(w) 328.84 530 T +(1) 114 432 T +(base) 168 432 T +(major opcode) 306.56 432 T +(1) 114 419 T +(14) 168 419 T +(minor opcode) 306.56 419 T +(2) 114 406 T +(2) 168 406 T +(request length) 306.56 406 T +(1) 114 393 T +(BOOL) 168 393 T +(cancel) 306.56 393 T +(3) 114 380 T +(unused) 306.56 380 T +(1) 114 282 T +(base) 168 282 T +(major opcode) 306.56 282 T +(1) 114 269 T +(15) 168 269 T +(minor opcode) 306.56 269 T +(2) 114 256 T +(3) 168 256 T +(request length) 306.56 256 T +(4) 114 243 T +(PCONTEXT) 168 243 T +(conte) 306.56 243 T +(xt) 325.92 243 T +(4) 114 230 T +(BITMASK) 168 230 T +(e) 306.56 230 T +(v) 310.33 230 T +(ent-mask) 314.7 230 T +(#x00000000) 168 217 T +(XPNoEv) 306.56 217 T +(entMask) 338.92 217 T +(#x00000001) 168 204 T +(XPPrintMask) 306.56 204 T +(#x00000002) 168 191 T +(XP) 306.56 191 T +(Attrib) 317.23 191 T +(uteMask) 338.56 191 T +(1) 114 93 T +(base) 168 93 T +(major opcode) 306.56 93 T +(1) 114 80 T +(16) 168 80 T +(minor opcode) 306.56 80 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "27" 31 +%%Page: "28" 32 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(28) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocol Encoding) 429.28 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(28) 72 749.33 T +(Pr) 393.41 749.33 T +(otocol Encoding) 407.93 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +3 F +0 X +(\256) 100.8 674.33 T +0 12 Q +(PrintGetAttrib) 108 502 T +(utes) 185.08 502 T +3 10 Q +(\256) 100.8 372.33 T +0 12 Q +(PrintGetOneAttrib) 108 178 T +(ute) 206.41 178 T +1 9 Q +(2) 114 703 T +(2) 168 703 T +(request length) 306.56 703 T +(4) 114 690 T +(PCONTEXT) 168 690 T +(conte) 306.56 690 T +(xt) 325.92 690 T +(1) 114 649 T +(1) 168 649 T +(Reply) 306.56 649 T +(1) 114 636 T +(unused) 306.56 636 T +(2) 114 623 T +(CARD16) 168 623 T +(sequence number) 306.56 623 T +(4) 114 610 T +(0) 168 610 T +(reply length) 306.56 610 T +(4) 114 597 T +(BITMASK) 168 597 T +(e) 306.56 597 T +(v) 310.33 597 T +(ent-mask) 314.7 597 T +(4) 114 584 T +(BITMASK) 168 584 T +(all-e) 306.56 584 T +(v) 322.33 584 T +(ents-mask) 326.69 584 T +(16) 114 571 T +(unused) 306.56 571 T +(1) 114 461 T +(base) 168 461 T +(major opcode) 306.56 461 T +(1) 114 448 T +(17) 168 448 T +(minor opcode) 306.56 448 T +(2) 114 435 T +(3) 168 435 T +(request length) 306.56 435 T +(4) 114 422 T +(PCONTEXT) 168 422 T +(conte) 306.56 422 T +(xt) 325.92 422 T +(1) 114 409 T +(CARD8) 168 409 T +(pool) 306.56 409 T +(3) 114 396 T +(unused) 306.56 396 T +(1) 114 342 T +(1) 168 342 T +(Reply) 306.56 342 T +(1) 114 329 T +(unused) 306.56 329 T +(2) 114 316 T +(CARD16) 168 316 T +(sequence number) 306.56 316 T +(4) 114 303 T +(\050n+p\051/4) 168 303 T +(reply length) 306.56 303 T +(4) 114 290 T +(CARD32) 168 290 T +(stringLen) 306.56 290 T +(20) 114 277 T +(unused) 306.56 277 T +(n) 114 264 T +(STRING8) 168 264 T +(attrib) 306.56 264 T +(utes) 325.38 264 T +(p) 114 251 T +(p=pad\050n\051) 306.56 251 T +(1) 114 137 T +(base) 168 137 T +(major opcode) 306.56 137 T +(1) 114 124 T +(19) 168 124 T +(minor opcode) 306.56 124 T +(2) 114 111 T +(4 + \050n+p\051/4) 168 111 T +(request length) 306.56 111 T +(4) 114 98 T +(PCONTEXT) 168 98 T +(conte) 306.56 98 T +(xt) 325.92 98 T +(4) 114 85 T +(CARD32) 168 85 T +(nameLen) 306.56 85 T +(1) 114 72 T +(CARD8) 168 72 T +(pool) 306.56 72 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "28" 32 +%%Page: "29" 33 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocol Encoding) 86.52 746.67 T +(29) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +3 10 Q +(\256) 100.8 651.33 T +0 12 Q +(PrintSetAttrib) 108 466 T +(utes) 182.41 466 T +(PrintGetP) 108 251 T +(ageDimensions) 160.54 251 T +3 10 Q +(\256) 100.8 147.33 T +1 9 Q +(3) 114 703 T +(unused) 306.56 703 T +(n) 114 690 T +(STRING8) 168 690 T +(name) 306.56 690 T +(p) 114 677 T +(p=pad\050n\051) 306.56 677 T +(1) 114 626 T +(1) 168 626 T +(Reply) 306.56 626 T +(1) 114 613 T +(unused) 306.56 613 T +(2) 114 600 T +(CARD16) 168 600 T +(sequence number) 306.56 600 T +(4) 114 587 T +(\050n+p\051/4) 168 587 T +(reply length) 306.56 587 T +(4) 114 574 T +(CARD32) 168 574 T +(v) 306.56 574 T +(alueLen) 310.84 574 T +(20) 114 561 T +(unused) 306.56 561 T +(n) 114 548 T +(STRING8) 168 548 T +(v) 306.56 548 T +(alue) 310.84 548 T +(p) 114 535 T +(p=pad\050n\051) 306.56 535 T +(1) 114 425 T +(base) 168 425 T +(major opcode) 306.56 425 T +(1) 114 412 T +(18) 168 412 T +(minor opcode) 306.56 412 T +(2) 114 399 T +(4 + \050n+p\051/4) 168 399 T +(request length) 306.56 399 T +(4) 114 386 T +(PCONTEXT) 168 386 T +(conte) 306.56 386 T +(xt) 325.92 386 T +(4) 114 373 T +(CARD32) 168 373 T +(stringLen) 306.56 373 T +(1) 114 360 T +(CARD8) 168 360 T +(pool) 306.56 360 T +(1) 114 347 T +(CARD8) 168 347 T +(rule) 306.56 347 T +(2) 114 334 T +(unused) 306.56 334 T +(n) 114 321 T +(STRING8) 168 321 T +(attrib) 306.56 321 T +(utes) 325.38 321 T +(p) 114 308 T +(BYTE) 168 308 T +(p=pad\050n\051) 306.56 308 T +(1) 114 210 T +(base) 168 210 T +(major opcode) 306.56 210 T +(1) 114 197 T +(21) 168 197 T +(minor opcode) 306.56 197 T +(2) 114 184 T +(2) 168 184 T +(request length) 306.56 184 T +(4) 114 171 T +(PCONTEXT) 168 171 T +(conte) 306.56 171 T +(xt) 325.92 171 T +(1) 114 110 T +(1) 168 110 T +(Reply) 306.56 110 T +(1) 114 97 T +(unused) 306.56 97 T +(2) 114 84 T +(CARD16) 168 84 T +(sequence number) 306.56 84 T +(4) 114 71 T +(0) 168 71 T +(reply length) 306.56 71 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "29" 33 +%%Page: "30" 34 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(30) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocol Encoding) 429.28 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(30) 72 749.33 T +(Pr) 393.41 749.33 T +(otocol Encoding) 407.93 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 12 Q +0 X +(PrintQueryScr) 108 570 T +(eens) 184.44 570 T +3 10 Q +(\256) 100.8 479.33 T +0 12 Q +(PrintSetImageResolution) 108 246 T +3 10 Q +(\256) 100.8 116.33 T +1 9 Q +(2) 114 703 T +(CARD) 168 703 T +(16) 193 703 T +(width) 306.56 703 T +(2) 114 690 T +(CARD) 168 690 T +(16) 193 690 T +(height) 306.56 690 T +(2) 114 677 T +(CARD) 168 677 T +(16) 193 677 T +(of) 306.56 677 T +(fset-x) 313.83 677 T +(2) 114 664 T +(CARD) 168 664 T +(16) 193 664 T +(of) 306.56 664 T +(fset-y) 313.83 664 T +(2) 114 651 T +(CARD) 168 651 T +(16) 193 651 T +(reproducible-width) 306.56 651 T +(2) 114 638 T +(CARD) 168 638 T +(16) 193 638 T +(reproducible-height) 306.56 638 T +(12) 114 625 T +(unused) 306.56 625 T +(1) 114 529 T +(base) 168 529 T +(major opcode) 306.56 529 T +(1) 114 516 T +(22) 168 516 T +(minor opcode) 306.56 516 T +(2) 114 503 T +(2) 168 503 T +(request length) 306.56 503 T +(1) 114 442 T +(1) 168 442 T +(Reply) 306.56 442 T +(1) 114 429 T +(unused) 306.56 429 T +(2) 114 416 T +(CARD16) 168 416 T +(sequence number) 306.56 416 T +(4) 114 403 T +(listCount) 168 403 T +(reply length) 306.56 403 T +(4) 114 390 T +(CAR) 168 390 T +(D32) 186.5 390 T +(listCount) 306.56 390 T +(20) 114 377 T +(unused) 306.56 377 T +(4 * list-) 114 364 T +(Count) 114 353 T +(LIST) 168 364 T +(ofWINDO) 186.28 364 T +(W) 224.45 364 T +(roots) 306.56 364 T +(R) 114 327 T +(OO) 119.64 327 T +(T-) 132.28 327 T +(WINDO) 114 316 T +(W) 144.67 316 T +(4) 114 303 T +(WINDO) 168 303 T +(W) 198.67 303 T +(rootW) 306.56 303 T +(indo) 329.2 303 T +(w) 344.97 303 T +(1) 114 205 T +(base) 168 205 T +(major opcode) 306.56 205 T +(1) 114 192 T +(23) 168 192 T +(minor opcode) 306.56 192 T +(2) 114 179 T +(3) 168 179 T +(request length) 306.56 179 T +(4) 114 166 T +(PCONTEXT) 168 166 T +(conte) 306.56 166 T +(xt) 325.92 166 T +(2) 114 153 T +(CARD16) 168 153 T +(image-resolution) 306.56 153 T +(2) 114 140 T +(unused) 306.56 140 T +(1) 114 86 T +(1) 168 86 T +(Reply) 306.56 86 T +(1) 114 73 T +(BOOL) 168 73 T +(status) 306.56 73 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "30" 34 +%%Page: "31" 35 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 54 540 54 2 L +0.25 H +2 Z +0 X +0 0 0 1 0 0 0 K +N +1 10 Q +(X V) 72 41.28 T +(ersion 11) 87.83 41.28 T +(Release 6.4) 493.9 41.28 T +108 54 540 54 2 L +N +72 740.81 540 756 R +7 X +V +0 14 Q +0 X +(Pr) 72 746.67 T +(otocol Encoding) 86.52 746.67 T +(31) 526 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 12 Q +(PrintGetImageResolution) 108 597 T +3 10 Q +(\256) 100.8 493.33 T +0 14 Q +(5.2) 72 360.67 T +(Ev) 108 360.67 T +(ent Pr) 124.2 360.67 T +(otocol Encoding) 160.88 360.67 T +0 12 Q +(PrintNotify) 108 305 T +1 9 Q +(2) 114 703 T +(CARD16) 168 703 T +(sequence number) 306.56 703 T +(4) 114 690 T +(0) 168 690 T +(reply length) 306.56 690 T +(2) 114 677 T +(CARD16) 168 677 T +(pre) 306.56 677 T +(vious-resolution) 317.83 677 T +(22) 114 664 T +(unused) 306.56 664 T +(1) 114 556 T +(base) 168 556 T +(major opcode) 306.56 556 T +(1) 114 543 T +(24) 168 543 T +(minor opcode) 306.56 543 T +(2) 114 530 T +(2) 168 530 T +(request length) 306.56 530 T +(4) 114 517 T +(PCONTEXT) 168 517 T +(conte) 306.56 517 T +(xt) 325.92 517 T +(1) 114 463 T +(1) 168 463 T +(Reply) 306.56 463 T +(1) 114 450 T +(unused) 306.56 450 T +(2) 114 437 T +(CARD16) 168 437 T +(sequence number) 306.56 437 T +(4) 114 424 T +(0) 168 424 T +(reply length) 306.56 424 T +(2) 114 411 T +(CARD16) 168 411 T +(image-resolution) 306.56 411 T +(22) 114 398 T +(unused) 306.56 398 T +(1) 114 264 T +(0 + base) 168 264 T +(code) 306.56 264 T +(1) 114 251 T +(0 XPStartJobNotify) 168 251 T +(1 XPEndJobNotify) 168 236 T +(2 XPStartDocNotify) 168 221 T +(3 XPEndDocNotify) 168 206 T +(4 XPStartP) 168 191 T +(ageNotify) 208.12 191 T +(5 XPEndP) 168 176 T +(ageNotify) 205.62 176 T +(detail) 306.56 251 T +(2) 114 163 T +(CARD16) 168 163 T +(sequence number) 306.56 163 T +(4) 114 150 T +(PCONTEXT) 168 150 T +(conte) 306.56 150 T +(xt) 325.92 150 T +(1) 114 137 T +(BOOL) 168 137 T +(cancel) 306.56 137 T +(23) 114 124 T +(unused) 306.56 124 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "31" 35 +%%Page: "32" 36 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 36.66 504 47.95 R +7 X +0 0 0 1 0 0 0 K +V +1 10 Q +0 X +(32) 72 41.28 T +(December 15, 1997) 248.71 41.28 T +(Protocol Encoding) 429.28 41.28 T +72 54 504 54 2 L +7 X +V +0.25 H +2 Z +0 X +N +72 740.81 504 756 R +7 X +V +0 14 Q +0 X +(32) 72 749.33 T +(Pr) 393.41 749.33 T +(otocol Encoding) 407.93 749.33 T +72 36.66 540 47.95 R +7 X +V +1 10 Q +0 X +(Release 6.4) 72 41.28 T +(X V) 487.23 41.28 T +(ersion 11) 503.06 41.28 T +72 54 540 54 2 L +7 X +V +0 X +N +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 63 540 711 R +7 X +V +0 12 Q +0 X +(Attrib) 108 703 T +(uteNotify) 139.75 703 T +0 14 Q +(5.3) 72 438.67 T +(E) 108 438.67 T +(rr) 117.34 438.67 T +(or Pr) 129.52 438.67 T +(otocol Encoding) 160.75 438.67 T +0 12 Q +(B) 108 383 T +(adContext) 116 383 T +(BadSequence) 108 259 T +1 9 Q +(1) 114 662 T +(1 + base) 168 662 T +(code) 327.62 662 T +(1) 114 649 T +(1 XPJobAttr) 168 649 T +(2 XPDocAttr) 168 634 T +(3 XPP) 168 619 T +(ageAttr) 191.12 619 T +(4 XPPrinterAttr) 168 604 T +(5 XPServ) 168 589 T +(erAttr) 202.61 589 T +(6 XPMediumAttr \050future use\051) 168 574 T +(7 XPSpoolerAttr \050future use\051) 168 559 T +(detail) 327.62 649 T +(2) 114 546 T +(CARD16) 168 546 T +(sequence number) 327.62 546 T +(4) 114 533 T +(PCONTEXT) 168 533 T +(conte) 327.62 533 T +(xt) 346.98 533 T +(24) 114 520 T +(unused) 327.62 520 T +(1) 114 342 T +(0) 168 342 T +(Error) 306.56 342 T +(1) 114 329 T +(0 +) 168 329 T +( base) 179.83 329 T +(code) 306.56 329 T +(2) 114 316 T +(CARD16) 168 316 T +(sequence number) 306.56 316 T +(1) 114 218 T +(0) 168 218 T +(Error) 306.56 218 T +(1) 114 205 T +(1 +) 168 205 T +( base) 179.83 205 T +(code) 306.56 205 T +(2) 114 192 T +(CARD16) 168 192 T +(sequence number) 306.56 192 T +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "32" 36 +%%Page: "33" 37 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 746 540 756 R +7 X +0 0 0 1 0 0 0 K +V +0 0 0 1 0 0 0 K +0 14 Q +0 X +(33) 72 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(Index) 505.77 746.67 T +0 0 0 1 0 0 0 K +72 33.32 540 43.32 R +7 X +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 72 540 720 R +V +0 12 Q +0 X +(A) 72 712 T +0 0 0 1 0 0 0 K +1 10 Q +(AttributeNotify, encoding) 72 692.33 T +1 12 Q +( 32) 175.88 692.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(attributes) 72 680.33 T +1 12 Q +( 13\32019) 109.22 680.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(defaults) 90 668.33 T +1 12 Q +( 13) 121.66 668.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(document) 90 656.33 T +1 12 Q +( 17) 129.44 656.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(job) 90 644.33 T +1 12 Q +( 17) 102.78 644.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(page) 90 632.33 T +1 12 Q +( 18) 108.88 632.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(printer) 90 620.33 T +1 12 Q +( 14) 116.66 620.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(server) 90 608.33 T +1 12 Q +( 14) 114.43 608.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(validating) 90 596.33 T +1 12 Q +( 14) 130 596.33 T +0 0 0 1 0 0 0 K +0 F +(B) 72 569 T +0 0 0 1 0 0 0 K +1 10 Q +(BadContext, encoding) 72 549.33 T +1 12 Q +( 32) 161.44 549.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(BadSequence, encoding) 72 537.33 T +1 12 Q +( 32) 168.09 537.33 T +0 0 0 1 0 0 0 K +0 F +(C) 72 510 T +0 0 0 1 0 0 0 K +1 10 Q +(content-orientation) 72 490.33 T +1 12 Q +( 18, 19) 148.1 490.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(content-orientations-supported) 72 478.33 T +1 12 Q +( 15) 194.76 478.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(copy-count) 72 466.33 T +1 12 Q +( 18) 116.99 466.33 T +0 0 0 1 0 0 0 K +0 F +(D) 72 439 T +0 0 0 1 0 0 0 K +1 10 Q +(default-input-tray) 72 419.33 T +1 12 Q +( 18, 19) 142.54 419.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(default-medium) 72 407.33 T +1 12 Q +( 18, 19) 135.88 407.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(default-printer-resolution) 72 395.33 T +1 12 Q +( 18, 19) 173.09 395.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(defaults, attributes) 72 383.33 T +1 12 Q +( 13) 145.88 383.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(descriptor) 72 371.33 T +1 12 Q +( 15) 111.99 371.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(document attributes) 72 359.33 T +1 12 Q +( 17) 151.16 359.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(document-attributes-supported) 72 347.33 T +1 12 Q +( 15) 194.76 347.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(document-format) 72 335.33 T +1 12 Q +( 18) 141.43 335.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(document-formats-supported) 72 323.33 T +1 12 Q +( 15) 188.09 323.33 T +0 0 0 1 0 0 0 K +0 F +(E) 72 296 T +0 0 0 1 0 0 0 K +1 10 Q +(errors) 72 276.33 T +1 12 Q +( 2) 95.32 276.33 T +0 0 0 1 0 0 0 K +0 F +(I) 72 249 T +0 0 0 1 0 0 0 K +1 10 Q +(input-trays-medium) 72 229.33 T +1 12 Q +( 15) 151.44 229.33 T +0 0 0 1 0 0 0 K +0 F +(J) 72 202 T +0 0 0 1 0 0 0 K +1 10 Q +(job attributes) 72 182.33 T +1 12 Q +( 17) 124.5 182.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(job-attributes-supported) 72 170.33 T +1 12 Q +( 15) 168.1 170.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(job-name) 72 158.33 T +1 12 Q +( 17) 109.77 158.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(job-owner) 72 146.33 T +1 12 Q +( 17) 113.1 146.33 T +0 0 0 1 0 0 0 K +0 F +(L) 72 119 T +0 0 0 1 0 0 0 K +1 10 Q +(locale, attribute) 72 99.33 T +1 12 Q +( 14) 134.21 99.33 T +0 0 0 1 0 0 0 K +0 F +(M) 315 712 T +0 0 0 1 0 0 0 K +1 10 Q +(medium-source-sizes-supported) 315 692.33 T +1 12 Q +( 15) 442.75 692.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(multiple-documents-supported) 315 680.33 T +1 12 Q +( 14) 437.77 680.33 T +0 0 0 1 0 0 0 K +0 F +(N) 315 653 T +0 0 0 1 0 0 0 K +1 10 Q +(notification-profile) 315 633.33 T +1 12 Q +( 17) 391.1 633.33 T +0 0 0 1 0 0 0 K +0 F +(P) 315 606 T +0 0 0 1 0 0 0 K +1 10 Q +(page attributes) 315 586.33 T +1 12 Q +( 18) 373.6 586.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PCONTEXT, type) 315 574.33 T +1 12 Q +( 2) 389.44 574.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(plex) 315 562.33 T +1 12 Q +( 18, 19) 332.22 562.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(plexes-supported) 315 550.33 T +1 12 Q +( 16) 383.32 550.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(Print Dialog Manager, communicating with) 315 538.33 T +1 12 Q +( 20) 489.71 538.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintCreateContext) 315 526.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 514.33 T +1 12 Q +( 23) 369.66 514.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 502.33 T +1 12 Q +( 2) 361.88 502.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintDestroyContext) 315 490.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 478.33 T +1 12 Q +( 24) 369.66 478.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 466.33 T +1 12 Q +( 3) 361.88 466.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintEndDoc) 315 454.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 442.33 T +1 12 Q +( 26) 369.66 442.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 430.33 T +1 12 Q +( 6) 361.88 430.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintEndJob) 315 418.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 406.33 T +1 12 Q +( 25) 369.66 406.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 394.33 T +1 12 Q +( 4) 361.88 394.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintEndPage) 315 382.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 370.33 T +1 12 Q +( 27) 369.66 370.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 358.33 T +1 12 Q +( 7) 361.88 358.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(printer attributes) 315 346.33 T +1 12 Q +( 14) 381.38 346.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(printer-model) 315 334.33 T +1 12 Q +( 16) 369.99 334.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(printer-name) 315 322.33 T +1 12 Q +( 16) 366.65 322.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(printer-resolutions-supported) 315 310.33 T +1 12 Q +( 16) 431.65 310.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetAttributes) 315 298.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 286.33 T +1 12 Q +( 28) 369.66 286.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 274.33 T +1 12 Q +( 9) 361.88 274.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetContext) 315 262.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 250.33 T +1 12 Q +( 24) 369.66 250.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 238.33 T +1 12 Q +( 3) 361.88 238.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetDocumentData) 315 226.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 214.33 T +1 12 Q +( 26) 369.66 214.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 202.33 T +1 12 Q +( 5) 361.88 202.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetImageResolution) 315 190.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 178.33 T +1 12 Q +( 31) 369.66 178.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 166.33 T +1 12 Q +( 11) 361.88 166.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetOneAttribute) 315 154.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 142.33 T +1 12 Q +( 28) 369.66 142.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 130.33 T +1 12 Q +( 9) 361.88 130.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetPageDimensions) 315 118.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 333 106.33 T +1 12 Q +( 29) 369.66 106.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 333 94.33 T +1 12 Q +( 8) 361.88 94.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetPrinterList) 315 82.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "33" 37 +%%Page: "34" 38 +612 792 0 FMBEGINPAGE +[0 0 0 1 0 0 0] +[ 0 1 1 0 1 0 0] +[ 1 0 1 0 0 1 0] +[ 1 1 0 0 0 0 1] +[ 1 0 0 0 0 1 1] +[ 0 1 0 0 1 0 1] +[ 0 0 1 0 1 1 0] + 7 FrameSetSepColors +FrameNoSep +0 0 0 1 0 0 0 K +72 746 540 756 R +7 X +0 0 0 1 0 0 0 K +V +0 0 0 1 0 0 0 K +0 14 Q +0 X +(Index) 72 746.67 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(34) 526 746.67 T +0 0 0 1 0 0 0 K +72 33.32 540 43.32 R +7 X +V +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +72 72 540 720 R +V +0 0 0 1 0 0 0 K +1 10 Q +0 X +(encoding) 90 713.33 T +1 12 Q +( 22) 126.66 713.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 701.33 T +1 12 Q +( 3) 118.88 701.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintGetScreenOfContext) 72 689.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 677.33 T +1 12 Q +( 24) 126.66 677.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 665.33 T +1 12 Q +( 4) 118.88 665.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintInputSelected) 72 653.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 641.33 T +1 12 Q +( 27) 126.66 641.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 629.33 T +1 12 Q +( 8) 118.88 629.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintNotify, encoding) 72 617.33 T +1 12 Q +( 31) 159.22 617.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintPutDocumentData) 72 605.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 593.33 T +1 12 Q +( 26) 126.66 593.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 581.33 T +1 12 Q +( 5) 118.88 581.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintQueryScreens) 72 569.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 557.33 T +1 12 Q +( 30) 126.66 557.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 545.33 T +1 12 Q +( 10) 118.88 545.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintQueryVersion) 72 533.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 521.33 T +1 12 Q +( 22) 126.66 521.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 509.33 T +1 12 Q +( 10) 118.88 509.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintRehashPrinterList) 72 497.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 485.33 T +1 12 Q +( 23) 126.66 485.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 473.33 T +1 12 Q +( 10) 118.88 473.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintSelectInput) 72 461.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 449.33 T +1 12 Q +( 27) 126.66 449.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 437.33 T +1 12 Q +( 8) 118.88 437.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintSetAttributes) 72 425.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 413.33 T +1 12 Q +( 29) 126.66 413.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 401.33 T +1 12 Q +( 9, 10) 118.88 401.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintSetContext) 72 389.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 377.33 T +1 12 Q +( 24) 126.66 377.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 365.33 T +1 12 Q +( 3) 118.88 365.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintSetImageResolution) 72 353.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 341.33 T +1 12 Q +( 30) 126.66 341.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 329.33 T +1 12 Q +( 10) 118.88 329.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintStartDoc) 72 317.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 305.33 T +1 12 Q +( 25) 126.66 305.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 293.33 T +1 12 Q +( 6) 118.88 293.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintStartJob) 72 281.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 269.33 T +1 12 Q +( 25) 126.66 269.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 257.33 T +1 12 Q +( 4) 118.88 257.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(PrintStartPage) 72 245.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(encoding) 90 233.33 T +1 12 Q +( 27) 126.66 233.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(request) 90 221.33 T +1 12 Q +( 7) 118.88 221.33 T +0 0 0 1 0 0 0 K +0 F +(S) 72 194 T +0 0 0 1 0 0 0 K +1 10 Q +(server attributes) 72 174.33 T +1 12 Q +( 14) 136.15 174.33 T +0 0 0 1 0 0 0 K +0 F +(V) 72 147 T +0 0 0 1 0 0 0 K +1 10 Q +(validating attributes) 72 127.33 T +1 12 Q +( 14) 151.72 127.33 T +0 0 0 1 0 0 0 K +0 F +(X) 72 100 T +0 0 0 1 0 0 0 K +1 10 Q +(XPAttributeNotify) 72 80.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(event) 333 713.33 T +1 12 Q +( 12) 354.66 713.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(XPBadContext, error description) 315 701.33 T +1 12 Q +( 2) 446.93 701.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(XPBadSequence, error description) 315 689.33 T +1 12 Q +( 2) 453.58 689.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-embedded-formats-supported) 315 677.33 T +1 12 Q +( 16) 446.08 677.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-listfonts-modes) 315 665.33 T +1 12 Q +( 18, 19) 390 665.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-listfonts-modes-supported) 315 653.33 T +1 12 Q +( 16) 432.77 653.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-page-attributes-supported) 315 641.33 T +1 12 Q +( 16) 430.53 641.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(XPPrintNotify) 315 629.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +(event) 333 617.33 T +1 12 Q +( 11) 354.66 617.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-raw-formats-supported) 315 605.33 T +1 12 Q +( 16) 419.97 605.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-setup-proviso) 315 593.33 T +1 12 Q +( 17) 382.77 593.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-setup-state) 315 581.33 T +1 12 Q +( 17) 371.1 581.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-spooler-command-options) 315 569.33 T +1 12 Q +( 17) 433.32 569.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +1 10 Q +(xp-spooler-command-results) 315 557.33 T +1 12 Q +( 17) 429.98 557.33 T +0 0 0 1 0 0 0 K +0 0 0 1 0 0 0 K +FMENDPAGE +%%EndPage: "34" 38 +%%Trailer +%%BoundingBox: 0 0 612 792 +%%PageOrder: Ascend +%%Pages: 38 +%%DocumentFonts: Times-Bold +%%+ Times-Roman +%%+ Times-Italic +%%+ Symbol +%%+ Courier +%%EOF diff --git a/proto/xorgproto/specs/printproto/xp_proto_cov.mif b/proto/xorgproto/specs/printproto/xp_proto_cov.mif new file mode 100644 index 000000000..cdc13107e --- /dev/null +++ b/proto/xorgproto/specs/printproto/xp_proto_cov.mif @@ -0,0 +1,3467 @@ + # Generated by FrameMaker xm5.0P3f +# Options: +# Paragraph Text +# Paragraph Tags +# Paragraph Formats +# Font Information +# Markers +# Anchored Frames +# Tables +# Graphics and TextRect Layout +# Master Page Items +# Condition Catalog +# Table Catalogs +# Font Catalog +# Paragraph Catalog +# Document Template +# Document Dictionary +# Variables +# + + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color + + + + + + + + > # end of Color +> # end of ColorCatalog + + + + + + > # end of Condition +> # end of ConditionCatalog + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + .\\t'> + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + : '> + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + + + + + + + + + + + + + + + > # end of Pgf +> # end of PgfCatalog + + + + > # end of Font + + + + > # end of Font +> # end of FontCatalog + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling + + + + + + + + > # end of Ruling +> # end of RulingCatalog + + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of TblTitlePgf1 + + + + + + + > # end of TblFormat + + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + > # end of TblColumnH + + > # end of TblColumnBody + + + + + + > # end of Pgf + > # end of TblColumnF + > # end of TblColumn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of TblTitlePgf1 + + + + + + + > # end of TblFormat +> # end of TblCatalog + + + > # end of View + + + + + + + + > # end of View + + + + > # end of View + + + > # end of View + + + > # end of View + + + > # end of View +> # end of Views + + '> + > # end of VariableFormat + + <$daynum\>, <$year\>'> + > # end of VariableFormat + + /<$daynum\>/<$shortyear\>'> + > # end of VariableFormat + + <$daynum\>, <$year\> <$hour\>:<$minute00\> <$ampm\>'> + > # end of VariableFormat + + /<$daynum\>/<$shortyear\>'> + > # end of VariableFormat + + <$daynum\>, <$year\>'> + > # end of VariableFormat + + /<$daynum\>/<$shortyear\>'> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + '> + > # end of VariableFormat + + + > # end of VariableFormat + + of <$tblsheetcount\>)'> + > # end of VariableFormat +> # end of VariableFormats + + \xd3 on page\x11 <$pagenum\>'> + > # end of XRefFormat + + '> + > # end of XRefFormat + + \xd3 on page\x11 <$pagenum\>.'> + > # end of XRefFormat + + , \xd2 <$paratext\>,\xd3 on page\x11 <$pagenum\>'> + > # end of XRefFormat + + , \xd2 <$paratext\>,\xd3 on page\x11 <$pagenum\>'> + > # end of XRefFormat + + on page\x11 <$pagenum\>'> + > # end of XRefFormat +> # end of XRefFormats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +> # end of Document +anncovTOC.doc'> + + + + + + +> # end of BookComponent + # end of InitialAutoNums + # end of Dictionary + # end of AFrames + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of Font + + > # end of TextLine + + + + + + + > # end of TextLine + + + + + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + > # end of TextLine + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + + + + + + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + + + > # end of Frame + + + + + + + > # end of TextLine + + + + + + + > # end of TextLine + + + + + + + > # end of TextLine + + + + + + + + + + + + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + > # end of TextLine + + + + + + + + + + + + + + + + + + + + > # end of PolyLine + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + + + + + + + + + + + > # end of PolyLine + > # end of Frame + + + + + + + + + + + > # end of Frame + + + + + + + > # end of TextLine +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + + + + + + + + + + + + + + + + + > # end of DashedPattern + + + + + + + + + + + + + > # end of TextRect +> # end of Page + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + + + + + + + + + + + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + + + + > # end of TabStop + + + + > # end of TabStop + + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + # end of Notes + + + + > # end of Pgf + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + > + > # end of Para + + + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + > # end of Pgf + + + > + + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + > # end of Pgf + + + > + + > + > # end of Para + + + + > # end of Para + + + + > # end of Para + + + + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + + > # end of Pgf + + + > + + + > + + + > + + + > + + + > + + > + + + > + + > + + > + + > + + > + + + > + + + > + + > + + > + > # end of Para + + + + > # end of Para + + + + > # end of Para +> # end of TextFlow + + + # end of Notes + + + + + > # end of Pgf + + > + > # end of Para + + + + > # end of Pgf + + > # end of Para + + + + > # end of Pgf + + > # end of Para + + + + > # end of Pgf + + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + > + + + > + + + > + + + > + + + > + + + > + + + > + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + + > + + > + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + + > + + > + + > + + > + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + > + + > + > # end of Para + + + + + + + + + + + + + + + + + + + + + + + + + + > # end of PgfFont + > # end of Pgf + + + + + > # end of Font + + + + > # end of Font + + > + > # end of Para +> # end of TextFlow +# End of MIFFile diff --git a/proto/xorgproto/specs/recordproto/Makefile.am b/proto/xorgproto/specs/recordproto/Makefile.am new file mode 100644 index 000000000..499f04e89 --- /dev/null +++ b/proto/xorgproto/specs/recordproto/Makefile.am @@ -0,0 +1,13 @@ + +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = record.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/recordproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/recordproto/Makefile.in b/proto/xorgproto/specs/recordproto/Makefile.in new file mode 100644 index 000000000..808e789b0 --- /dev/null +++ b/proto/xorgproto/specs/recordproto/Makefile.in @@ -0,0 +1,574 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/recordproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = record.xml +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = record.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/recordproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/recordproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/recordproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/record.xml b/proto/xorgproto/specs/recordproto/record.xml similarity index 100% rename from proto/xorgproto/specs/record.xml rename to proto/xorgproto/specs/recordproto/record.xml diff --git a/proto/xorgproto/specs/scrnsaverproto/Makefile.am b/proto/xorgproto/specs/scrnsaverproto/Makefile.am new file mode 100644 index 000000000..ad4b871d2 --- /dev/null +++ b/proto/xorgproto/specs/scrnsaverproto/Makefile.am @@ -0,0 +1,13 @@ + +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = saver.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/scrnsaverproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/scrnsaverproto/Makefile.in b/proto/xorgproto/specs/scrnsaverproto/Makefile.in new file mode 100644 index 000000000..5db0f89e9 --- /dev/null +++ b/proto/xorgproto/specs/scrnsaverproto/Makefile.in @@ -0,0 +1,574 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/scrnsaverproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = saver.xml +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = saver.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/scrnsaverproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/scrnsaverproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/scrnsaverproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/saver.xml b/proto/xorgproto/specs/scrnsaverproto/saver.xml similarity index 100% rename from proto/xorgproto/specs/saver.xml rename to proto/xorgproto/specs/scrnsaverproto/saver.xml diff --git a/proto/xorgproto/specs/xcmiscproto/Makefile.am b/proto/xorgproto/specs/xcmiscproto/Makefile.am new file mode 100644 index 000000000..e2dfc611b --- /dev/null +++ b/proto/xorgproto/specs/xcmiscproto/Makefile.am @@ -0,0 +1,13 @@ + +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = xc-misc.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/xcmiscproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/xcmiscproto/Makefile.in b/proto/xorgproto/specs/xcmiscproto/Makefile.in new file mode 100644 index 000000000..7c6ddaa43 --- /dev/null +++ b/proto/xorgproto/specs/xcmiscproto/Makefile.in @@ -0,0 +1,574 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/xcmiscproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = xc-misc.xml +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = xc-misc.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/xcmiscproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/xcmiscproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/xcmiscproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/xc-misc.xml b/proto/xorgproto/specs/xcmiscproto/xc-misc.xml similarity index 100% rename from proto/xorgproto/specs/xc-misc.xml rename to proto/xorgproto/specs/xcmiscproto/xc-misc.xml diff --git a/proto/xorgproto/specs/xextproto/Makefile.am b/proto/xorgproto/specs/xextproto/Makefile.am new file mode 100644 index 000000000..947686f88 --- /dev/null +++ b/proto/xorgproto/specs/xextproto/Makefile.am @@ -0,0 +1,29 @@ + +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = \ + appgrp.xml \ + dbe.xml \ + dpms.xml \ + evi.xml \ + geproto.xml \ + lbx.xml \ + multibuf.xml \ + security.xml \ + shape.xml \ + shm.xml \ + sync.xml \ + tog-cup.xml \ + xtest.xml + +# Included chapters, appendix, images +chapters = appendix.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/xextproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/xextproto/Makefile.in b/proto/xorgproto/specs/xextproto/Makefile.in new file mode 100644 index 000000000..3d2066740 --- /dev/null +++ b/proto/xorgproto/specs/xextproto/Makefile.in @@ -0,0 +1,593 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/xextproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = appgrp.xml dbe.xml dpms.xml evi.xml \ + geproto.xml lbx.xml multibuf.xml security.xml shape.xml \ + shm.xml sync.xml tog-cup.xml xtest.xml appendix.xml +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = \ +@ENABLE_SPECS_TRUE@ appgrp.xml \ +@ENABLE_SPECS_TRUE@ dbe.xml \ +@ENABLE_SPECS_TRUE@ dpms.xml \ +@ENABLE_SPECS_TRUE@ evi.xml \ +@ENABLE_SPECS_TRUE@ geproto.xml \ +@ENABLE_SPECS_TRUE@ lbx.xml \ +@ENABLE_SPECS_TRUE@ multibuf.xml \ +@ENABLE_SPECS_TRUE@ security.xml \ +@ENABLE_SPECS_TRUE@ shape.xml \ +@ENABLE_SPECS_TRUE@ shm.xml \ +@ENABLE_SPECS_TRUE@ sync.xml \ +@ENABLE_SPECS_TRUE@ tog-cup.xml \ +@ENABLE_SPECS_TRUE@ xtest.xml + + +# Included chapters, appendix, images +@ENABLE_SPECS_TRUE@chapters = appendix.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/xextproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/xextproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/xextproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/appendix.xml b/proto/xorgproto/specs/xextproto/appendix.xml similarity index 100% rename from proto/xorgproto/specs/appendix.xml rename to proto/xorgproto/specs/xextproto/appendix.xml diff --git a/proto/xorgproto/specs/appgrp.xml b/proto/xorgproto/specs/xextproto/appgrp.xml similarity index 100% rename from proto/xorgproto/specs/appgrp.xml rename to proto/xorgproto/specs/xextproto/appgrp.xml diff --git a/proto/xorgproto/specs/dbe.xml b/proto/xorgproto/specs/xextproto/dbe.xml similarity index 100% rename from proto/xorgproto/specs/dbe.xml rename to proto/xorgproto/specs/xextproto/dbe.xml diff --git a/proto/xorgproto/specs/dpms.xml b/proto/xorgproto/specs/xextproto/dpms.xml similarity index 100% rename from proto/xorgproto/specs/dpms.xml rename to proto/xorgproto/specs/xextproto/dpms.xml diff --git a/proto/xorgproto/specs/evi.xml b/proto/xorgproto/specs/xextproto/evi.xml similarity index 100% rename from proto/xorgproto/specs/evi.xml rename to proto/xorgproto/specs/xextproto/evi.xml diff --git a/proto/xorgproto/specs/geproto.xml b/proto/xorgproto/specs/xextproto/geproto.xml similarity index 100% rename from proto/xorgproto/specs/geproto.xml rename to proto/xorgproto/specs/xextproto/geproto.xml diff --git a/proto/xorgproto/specs/lbx.xml b/proto/xorgproto/specs/xextproto/lbx.xml similarity index 100% rename from proto/xorgproto/specs/lbx.xml rename to proto/xorgproto/specs/xextproto/lbx.xml diff --git a/proto/xorgproto/specs/multibuf.xml b/proto/xorgproto/specs/xextproto/multibuf.xml similarity index 100% rename from proto/xorgproto/specs/multibuf.xml rename to proto/xorgproto/specs/xextproto/multibuf.xml diff --git a/proto/xorgproto/specs/security.xml b/proto/xorgproto/specs/xextproto/security.xml similarity index 100% rename from proto/xorgproto/specs/security.xml rename to proto/xorgproto/specs/xextproto/security.xml diff --git a/proto/xorgproto/specs/shape.xml b/proto/xorgproto/specs/xextproto/shape.xml similarity index 100% rename from proto/xorgproto/specs/shape.xml rename to proto/xorgproto/specs/xextproto/shape.xml diff --git a/proto/xorgproto/specs/shm.xml b/proto/xorgproto/specs/xextproto/shm.xml similarity index 100% rename from proto/xorgproto/specs/shm.xml rename to proto/xorgproto/specs/xextproto/shm.xml diff --git a/proto/xorgproto/specs/sync.xml b/proto/xorgproto/specs/xextproto/sync.xml similarity index 100% rename from proto/xorgproto/specs/sync.xml rename to proto/xorgproto/specs/xextproto/sync.xml diff --git a/proto/xorgproto/specs/tog-cup.xml b/proto/xorgproto/specs/xextproto/tog-cup.xml similarity index 100% rename from proto/xorgproto/specs/tog-cup.xml rename to proto/xorgproto/specs/xextproto/tog-cup.xml diff --git a/proto/xorgproto/specs/xtest.xml b/proto/xorgproto/specs/xextproto/xtest.xml similarity index 100% rename from proto/xorgproto/specs/xtest.xml rename to proto/xorgproto/specs/xextproto/xtest.xml diff --git a/proto/xorgproto/specs/xproto/Makefile.am b/proto/xorgproto/specs/xproto/Makefile.am new file mode 100644 index 000000000..bf20b99cd --- /dev/null +++ b/proto/xorgproto/specs/xproto/Makefile.am @@ -0,0 +1,19 @@ +if ENABLE_SPECS + +# Main DocBook/XML files (DOCTYPE book) +docbook = x11protocol.xml + +# Included chapters, appendix, images +chapters = \ + encoding.xml \ + glossary.xml \ + keysyms.xml \ + sect1-9.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(datarootdir)/doc/xproto + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_SPECS diff --git a/proto/xorgproto/specs/xproto/Makefile.in b/proto/xorgproto/specs/xproto/Makefile.in new file mode 100644 index 000000000..b642b7660 --- /dev/null +++ b/proto/xorgproto/specs/xproto/Makefile.in @@ -0,0 +1,583 @@ +# Makefile.in generated by automake 1.12.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) +subdir = specs/xproto +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__dist_shelf_DATA_DIST = x11protocol.xml encoding.xml glossary.xml \ + keysyms.xml sect1-9.xml +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +DATA = $(dist_shelf_DATA) $(shelf_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ +ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APP_MAN_DIR = @APP_MAN_DIR@ +APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHANGELOG_CMD = @CHANGELOG_CMD@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CWARNFLAGS = @CWARNFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ +DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FILE_MAN_DIR = @FILE_MAN_DIR@ +FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FOP = @FOP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIB_MAN_DIR = @LIB_MAN_DIR@ +LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ +MISC_MAN_DIR = @MISC_MAN_DIR@ +MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ +STRIP = @STRIP@ +STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ +USE_FDS_BITS = @USE_FDS_BITS@ +VERSION = @VERSION@ +XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ +XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ +XSL_STYLESHEET = @XSL_STYLESHEET@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_SPECS_TRUE@docbook = x11protocol.xml + +# Included chapters, appendix, images +@ENABLE_SPECS_TRUE@chapters = \ +@ENABLE_SPECS_TRUE@ encoding.xml \ +@ENABLE_SPECS_TRUE@ glossary.xml \ +@ENABLE_SPECS_TRUE@ keysyms.xml \ +@ENABLE_SPECS_TRUE@ sect1-9.xml + + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_SPECS_TRUE@shelfdir = $(datarootdir)/doc/xproto + +# DocBook/XML generated output formats to be installed +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign specs/xproto/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign specs/xproto/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/docbook.am: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-dist_shelfDATA: $(dist_shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-dist_shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +install-shelfDATA: $(shelf_DATA) + @$(NORMAL_INSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shelfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shelfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(shelfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(shelfdir)" || exit $$?; \ + done + +uninstall-shelfDATA: + @$(NORMAL_UNINSTALL) + @list='$(shelf_DATA)'; test -n "$(shelfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(shelfdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_shelfDATA install-shelfDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_shelfDATA uninstall-shelfDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-shelfDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-shelfDATA + +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/proto/xorgproto/specs/encoding.xml b/proto/xorgproto/specs/xproto/encoding.xml similarity index 100% rename from proto/xorgproto/specs/encoding.xml rename to proto/xorgproto/specs/xproto/encoding.xml diff --git a/proto/xorgproto/specs/glossary.xml b/proto/xorgproto/specs/xproto/glossary.xml similarity index 100% rename from proto/xorgproto/specs/glossary.xml rename to proto/xorgproto/specs/xproto/glossary.xml diff --git a/proto/xorgproto/specs/keysyms.xml b/proto/xorgproto/specs/xproto/keysyms.xml similarity index 100% rename from proto/xorgproto/specs/keysyms.xml rename to proto/xorgproto/specs/xproto/keysyms.xml diff --git a/proto/xorgproto/specs/sect1-9.xml b/proto/xorgproto/specs/xproto/sect1-9.xml similarity index 100% rename from proto/xorgproto/specs/sect1-9.xml rename to proto/xorgproto/specs/xproto/sect1-9.xml diff --git a/proto/xorgproto/specs/x11protocol.xml b/proto/xorgproto/specs/xproto/x11protocol.xml similarity index 100% rename from proto/xorgproto/specs/x11protocol.xml rename to proto/xorgproto/specs/xproto/x11protocol.xml diff --git a/proto/xorgproto/trapproto.pc.in b/proto/xorgproto/trapproto.pc.in index 8cb0aa8e6..8a220b965 100644 --- a/proto/xorgproto/trapproto.pc.in +++ b/proto/xorgproto/trapproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: TrapProto diff --git a/proto/xorgproto/videoproto.pc.in b/proto/xorgproto/videoproto.pc.in index 14b907a4f..5c22f7afe 100644 --- a/proto/xorgproto/videoproto.pc.in +++ b/proto/xorgproto/videoproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: VideoProto diff --git a/proto/xorgproto/windowswmproto.pc.in b/proto/xorgproto/windowswmproto.pc.in index 0a2ec0bfd..ec56e8295 100644 --- a/proto/xorgproto/windowswmproto.pc.in +++ b/proto/xorgproto/windowswmproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: WindowsWMProto diff --git a/proto/xorgproto/xcalibrateproto.pc.in b/proto/xorgproto/xcalibrateproto.pc.in index 40b6fd082..f1ea5deba 100644 --- a/proto/xorgproto/xcalibrateproto.pc.in +++ b/proto/xorgproto/xcalibrateproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XCalibrate diff --git a/proto/xorgproto/xcmiscproto.pc.in b/proto/xorgproto/xcmiscproto.pc.in index 0dfbf21ab..b72bbc68e 100644 --- a/proto/xorgproto/xcmiscproto.pc.in +++ b/proto/xorgproto/xcmiscproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XCMiscProto diff --git a/proto/xorgproto/xextproto.pc.in b/proto/xorgproto/xextproto.pc.in index f66eeaed9..9419c91be 100644 --- a/proto/xorgproto/xextproto.pc.in +++ b/proto/xorgproto/xextproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XExtProto diff --git a/proto/xorgproto/xf86bigfontproto.pc.in b/proto/xorgproto/xf86bigfontproto.pc.in index 18c5647a0..4a67be664 100644 --- a/proto/xorgproto/xf86bigfontproto.pc.in +++ b/proto/xorgproto/xf86bigfontproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XF86BigFontProto diff --git a/proto/xorgproto/xf86dgaproto.pc.in b/proto/xorgproto/xf86dgaproto.pc.in index 5c5f8b16b..e029cd43e 100644 --- a/proto/xorgproto/xf86dgaproto.pc.in +++ b/proto/xorgproto/xf86dgaproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XF86DGAProto diff --git a/proto/xorgproto/xf86driproto.pc.in b/proto/xorgproto/xf86driproto.pc.in index 93df292d9..c8faf147f 100644 --- a/proto/xorgproto/xf86driproto.pc.in +++ b/proto/xorgproto/xf86driproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XF86DRIProto diff --git a/proto/xorgproto/xf86miscproto.pc.in b/proto/xorgproto/xf86miscproto.pc.in index af73fa317..05d5d9e30 100644 --- a/proto/xorgproto/xf86miscproto.pc.in +++ b/proto/xorgproto/xf86miscproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XF86MiscProto diff --git a/proto/xorgproto/xf86rushproto.pc.in b/proto/xorgproto/xf86rushproto.pc.in index fc5f63b55..1c7ff1b99 100644 --- a/proto/xorgproto/xf86rushproto.pc.in +++ b/proto/xorgproto/xf86rushproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XF86RushProto diff --git a/proto/xorgproto/xf86vidmodeproto.pc.in b/proto/xorgproto/xf86vidmodeproto.pc.in index fcb74f229..ef062b3b5 100644 --- a/proto/xorgproto/xf86vidmodeproto.pc.in +++ b/proto/xorgproto/xf86vidmodeproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XF86VidModeProto diff --git a/proto/xorgproto/xineramaproto.pc.in b/proto/xorgproto/xineramaproto.pc.in index 1ffd37d18..9172f1e96 100644 --- a/proto/xorgproto/xineramaproto.pc.in +++ b/proto/xorgproto/xineramaproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XineramaProto diff --git a/proto/xorgproto/xproto.pc.in b/proto/xorgproto/xproto.pc.in index 8ff2d3d4e..899316acc 100644 --- a/proto/xorgproto/xproto.pc.in +++ b/proto/xorgproto/xproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ includex11dir=@includedir@/X11 diff --git a/proto/xorgproto/xproxymngproto.pc.in b/proto/xorgproto/xproxymngproto.pc.in index 5c6fad633..1a81e285c 100644 --- a/proto/xorgproto/xproxymngproto.pc.in +++ b/proto/xorgproto/xproxymngproto.pc.in @@ -1,6 +1,5 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ Name: XProxyManagementProtocol