.gitignore | 78 +++++++++++++- Makefile.am | 13 +- README | 30 +++++ configure.ac | 21 ++- debian/changelog | 15 ++ debian/control | 7 - debian/rules | 6 - debian/x11proto-xcmisc-dev.install | 3 specs/.gitignore | 6 + specs/Makefile.am | 64 +++++++++++ specs/xc-misc.xml | 199 +++++++++++++++++++++++++++++++++++++ 11 files changed, 417 insertions(+), 25 deletions(-)
New commits: commit 9294837fa0bd843a0e9c1f74e0d84fcf77e1db57 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:57:50 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 618cb7a..14f9fd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low +x11proto-xcmisc (1.2.1-1) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -19,7 +19,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low * No longer pass --disable-shared, this option is gone. * Add myself to Uploaders. - -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 + -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 01:57:44 +0100 x11proto-xcmisc (1.2.0-1) unstable; urgency=low commit 156f97f4226c581e235bf983ef76b309e8bf9d06 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:57:41 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index df1f57e..618cb7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low * Ship *.html, *.css, and *.txt from the doc directory. * Switch from --list-missing to --fail-missing for additional safety. * No longer pass --disable-shared, this option is gone. + * Add myself to Uploaders. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/control b/debian/control index e79732a..feca004 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11proto-xcmisc Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Andres Salomon <[email protected]> +Uploaders: David Nusinow <[email protected]>, Andres Salomon <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), automake, commit 8290000b06d7dd2f248a8400bc9a812bb792e580 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:57:23 2010 +0100 No longer pass --disable-shared, this option is gone. diff --git a/debian/changelog b/debian/changelog index 0d0ab4a..df1f57e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low * Kill *.xml in the doc directory, no point in shipping them. * Ship *.html, *.css, and *.txt from the doc directory. * Switch from --list-missing to --fail-missing for additional safety. + * No longer pass --disable-shared, this option is gone. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/rules b/debian/rules index 25e5754..8359d94 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ build-stamp: mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info --disable-shared \ + --infodir=\$${prefix}/share/info \ --with-xmlto --without-fop \ $(confflags) CFLAGS="$(CFLAGS)" cd build && $(MAKE) commit 212d0ed81c1e6121b734b4e021675f12ef4fe297 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:56:58 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index e389d67..0d0ab4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low * Pass --with-xmlto and --without-fop, we want html and txt only. * Kill *.xml in the doc directory, no point in shipping them. * Ship *.html, *.css, and *.txt from the doc directory. + * Switch from --list-missing to --fail-missing for additional safety. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/rules b/debian/rules index f89c69b..25e5754 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,7 @@ binary-indep: build install dh_installdocs dh_installman find debian/tmp/usr/share/doc/xcmiscproto -name '*.xml' -delete - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs dh_link dh_strip commit b61336f43162a93282d2b64bff7550a08c7a48fa Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:56:08 2010 +0100 Ship *.html, *.css, and *.txt from the doc directory. diff --git a/debian/changelog b/debian/changelog index e735906..e389d67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs. * Pass --with-xmlto and --without-fop, we want html and txt only. * Kill *.xml in the doc directory, no point in shipping them. + * Ship *.html, *.css, and *.txt from the doc directory. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/x11proto-xcmisc-dev.install b/debian/x11proto-xcmisc-dev.install index 55eb076..45382a8 100644 --- a/debian/x11proto-xcmisc-dev.install +++ b/debian/x11proto-xcmisc-dev.install @@ -1,2 +1,5 @@ usr/include/X11/extensions/* usr/lib/pkgconfig/xcmiscproto.pc +usr/share/doc/xcmiscproto/*.html usr/share/doc/x11proto-xcmisc-dev/ +usr/share/doc/xcmiscproto/*.css usr/share/doc/x11proto-xcmisc-dev/ +usr/share/doc/xcmiscproto/*.txt usr/share/doc/x11proto-xcmisc-dev/ commit 32e93c384f11afc7029588eda1c60ff482fe5744 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:55:21 2010 +0100 Kill *.xml in the doc directory, no point in shipping them. diff --git a/debian/changelog b/debian/changelog index b1388a5..e735906 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low * Add pkg-config build-dep. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs. * Pass --with-xmlto and --without-fop, we want html and txt only. + * Kill *.xml in the doc directory, no point in shipping them. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/rules b/debian/rules index 2e52de6..f89c69b 100755 --- a/debian/rules +++ b/debian/rules @@ -76,6 +76,7 @@ binary-indep: build install dh_installdocs dh_installman + find debian/tmp/usr/share/doc/xcmiscproto -name '*.xml' -delete dh_install --sourcedir=debian/tmp --list-missing dh_installchangelogs dh_link commit 78c3315b90f29738e1d47f550f2a1fb0c2c423c1 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:54:30 2010 +0100 Pass --with-xmlto and --without-fop, we want html and txt only. diff --git a/debian/changelog b/debian/changelog index 237ab31..b1388a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low * Bump xutils-dev build-dep for new macros. * Add pkg-config build-dep. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs. + * Pass --with-xmlto and --without-fop, we want html and txt only. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/rules b/debian/rules index 906cec8..2e52de6 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,7 @@ build-stamp: cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --disable-shared \ + --with-xmlto --without-fop \ $(confflags) CFLAGS="$(CFLAGS)" cd build && $(MAKE) >$@ commit 932d31eacfec17ef2379eb66c3b82817bf8c6620 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:54:03 2010 +0100 Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs. diff --git a/debian/changelog b/debian/changelog index 3a6f0f5..237ab31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Bump xutils-dev build-dep for new macros. * Add pkg-config build-dep. + * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/control b/debian/control index fbaed51..e79732a 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,8 @@ Build-Depends: automake, xutils-dev (>= 1:7.5+4), pkg-config, +# specs: + xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xcmisc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xcmisc.git commit 535cc371751903e42205fd7ad6f6490ea6aaf5cd Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:53:13 2010 +0100 Add pkg-config build-dep. diff --git a/debian/changelog b/debian/changelog index dfd0d84..3a6f0f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Bump xutils-dev build-dep for new macros. + * Add pkg-config build-dep. -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 diff --git a/debian/control b/debian/control index 63a6d20..fbaed51 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 5.0.0), automake, xutils-dev (>= 1:7.5+4), + pkg-config, Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xcmisc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xcmisc.git commit 0d50e04bec3243c966bec5778349da6d5b045cf2 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 01:53:02 2010 +0100 Bump xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index cd82a20..dfd0d84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ x11proto-xcmisc (1.2.1-1) UNRELEASED; urgency=low [ Robert Hooker ] * New upstream release. + [ Cyril Brulebois ] + * Bump xutils-dev build-dep for new macros. + -- Robert Hooker <[email protected]> Tue, 02 Nov 2010 20:03:35 -0400 x11proto-xcmisc (1.2.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2e96fff..63a6d20 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Andres Salomon <dilin...@debian. Build-Depends: debhelper (>= 5.0.0), automake, - xutils-dev (>= 1:7.4+4) + xutils-dev (>= 1:7.5+4), Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xcmisc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xcmisc.git commit bff39d1e68056ffdf83924e708e55730236655dd Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 00:04:11 2010 -0700 XCMiscProto 1.2.1 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 2abc4dc..9bed793 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XCMiscProto], [1.2.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit bd15ca56e689a63832cd6aa63b638fcdbe406b04 Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 00:03:21 2010 -0700 xc-misc.xml: Misc. markup cleanups Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 65ba0d2..f3f8f62 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -13,16 +13,17 @@ <author> <firstname>Bob</firstname><surname>Scheifler</surname> </author> + <author> + <firstname>David</firstname><surname>Wiggins</surname> + </author> + <corpauthor>X Consortium</corpauthor> </authorgroup> -<othercredit><firstname>David</firstname><surname>Wiggins</surname></othercredit> - <corpname>X Consortium Standard</corpname> <copyright><year>1994</year><holder>X Consortium</holder></copyright> <releaseinfo>Version 1.1</releaseinfo> <affiliation><orgname>X Consortium</orgname></affiliation> <productnumber>X Version 11, Release 6.9/7.0</productnumber> <legalnotice> -<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para> <para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para> @@ -70,60 +71,61 @@ exhausted its current pool of resource IDs.</para> <chapter id='requests'> <title>Requests</title> -<para><function>XCMiscGetVersion</function></para> +<para> +<function>XCMiscGetVersion</function></para> <itemizedlist> - <listitem><para><emphasis remap='I'>client_major_version</emphasis>: CARD16</para></listitem> - <listitem><para><emphasis remap='I'>client_minor_version</emphasis>: CARD16</para></listitem> + <listitem><para><parameter>client_major_version</parameter>: CARD16</para></listitem> + <listitem><para><parameter>client_minor_version</parameter>: CARD16</para></listitem> </itemizedlist> <para> =></para> <itemizedlist> - <listitem><para><emphasis remap='I'>client_major_version</emphasis>: CARD16</para></listitem> - <listitem><para><emphasis remap='I'>client_minor_version</emphasis>: CARD16</para></listitem> + <listitem><para><parameter>client_major_version</parameter>: CARD16</para></listitem> + <listitem><para><parameter>client_minor_version</parameter>: CARD16</para></listitem> </itemizedlist> -<para>If supplied, the <emphasis remap='I'>client_major_version</emphasis> and -<emphasis remap='I'>client_minor_version</emphasis> indicate what version of -the protocol the client wants the server to implement. The server version +<para>If supplied, the <parameter>client_major_version</parameter> and +<parameter>client_minor_version</parameter> indicate what version of +the protocol the client wants the server to implement. The server version numbers returned indicate the protocol this extension actually supports. This might not equal the version sent by the client. An implementation can (but need not) support more than one version simultaneously. The -<emphasis remap='I'>server_major_version</emphasis> and the <emphasis remap='I'>server_minor_version</emphasis> are a +<parameter>server_major_version</parameter> and the <parameter>server_minor_version</parameter> are a mechanism to support future revisions of the XC-MISC protocol which may be necessary. In general, the major version would increment for incompatible changes, and the minor version would increment for small, upward-compatible changes. Servers that support the protocol -defined in this document will return a -<emphasis remap='I'>server_major_version</emphasis> of one (1), and a -<emphasis remap='I'>server_minor_version</emphasis> of one (1).</para> +defined in this document will return a +<parameter>server_major_version</parameter> of one (1), and a +<parameter>server_minor_version</parameter> of one (1).</para> <para><function>XCMiscGetXIDRange</function></para> <para> =></para> <itemizedlist> - <listitem><para><emphasis remap='I'>start_id</emphasis>: XID</para></listitem> - <listitem><para><emphasis remap='I'>count</emphasis>: CARD32</para></listitem> + <listitem><para><parameter>start_id</parameter>: XID</para></listitem> + <listitem><para><parameter>count</parameter>: CARD32</para></listitem> </itemizedlist> <para>This request returns a range of available resource IDs for the client -issuing the request. <emphasis remap='I'>start_id</emphasis> is the first -ID in the range. <emphasis remap='I'>count</emphasis> is the number of IDs -in the range. The returned range may or may not be the largest possible +issuing the request. <parameter>start_id</parameter> is the first +ID in the range. <parameter>count</parameter> is the number of IDs +in the range. The returned range may or may not be the largest possible range.</para> <para><function>XCMiscGetXIDList</function></para> <itemizedlist> - <listitem><para><emphasis remap='I'>count</emphasis>: CARD32</para></listitem> + <listitem><para><parameter>count</parameter>: CARD32</para></listitem> </itemizedlist> <para> =></para> <itemizedlist> - <listitem><para><emphasis remap='I'>ids</emphasis>: LISTofXID</para></listitem> + <listitem><para><parameter>ids</parameter>: LISTofXID</para></listitem> </itemizedlist> -<para>This request returns the a list of individual resource IDs in -<emphasis remap='I'>ids</emphasis>. -<emphasis remap='I'>count</emphasis> is the number of resource IDs requested. +<para>This request returns the a list of individual resource IDs in +<parameter>ids</parameter>. +<parameter>count</parameter> is the number of resource IDs requested. The number returned may be smaller than the number requested.</para> </chapter> @@ -141,16 +143,14 @@ conventions established there.</para> <para>The name of this extension is “XC-MISC”.</para> -<literallayout remap='Ds'> +<synopsis> <function>XCMiscGetVersion</function> 1 CARD8 opcode 1 0 XC-MISC opcode 2 2 request length 2 CARD16 client_major_version 2 CARD16 client_minor_version -</literallayout> -<literallayout remap='Ds'> -<synopsis> + => 1 1 Reply 1 unused @@ -160,16 +160,13 @@ conventions established there.</para> 2 CARD16 server_minor_version 20 unused </synopsis> -</literallayout> -<literallayout remap='Ds'> +<synopsis> <function>XCMiscGetXIDRange</function> 1 CARD8 opcode 1 1 XC-MISC opcode 2 1 request length -</literallayout> -<literallayout remap='Ds'> -<synopsis> + => 1 1 Reply 1 unused @@ -179,17 +176,15 @@ conventions established there.</para> 4 CARD32 count 16 unused </synopsis> -</literallayout> <!-- remap='De' --> -<literallayout remap='Ds'> + +<synopsis> <function>XCMiscGetXIDList</function> 1 CARD8 opcode 1 2 XC-MISC opcode 2 2 request length 4 CARD32 count -</literallayout> -<literallayout remap='Ds'> -<synopsis> + => 1 1 Reply 1 unused @@ -199,7 +194,6 @@ conventions established there.</para> 20 unused 4n LISTofXID ids </synopsis> -</literallayout> </chapter> </book> commit 3b999f69545b921738f3d51c55c427a83250ee5f Author: Matt Dew <[email protected]> Date: Mon Jun 28 08:46:21 2010 -0400 specs: convert xc-misc.ms from xorg-docs module to DocBook XML Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/Makefile.am b/Makefile.am index 7937ee6..08d6331 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=specs + xcmiscdir = $(includedir)/X11/extensions xcmisc_HEADERS = \ xcmiscproto.h \ diff --git a/configure.ac b/configure.ac index 7f355d8..2abc4dc 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,16 @@ AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?prod AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros minimum of 1.10 for DocBook XML documentation m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS +XORG_ENABLE_SPECS +XORG_WITH_XMLTO(0.0.20) +XORG_WITH_FOP +XORG_CHECK_SGML_DOCTOOLS(1.5) AC_OUTPUT([Makefile + specs/Makefile xcmiscproto.pc]) diff --git a/specs/.gitignore b/specs/.gitignore new file mode 100644 index 0000000..12fe512 --- /dev/null +++ b/specs/.gitignore @@ -0,0 +1,6 @@ +# Add & Override for this directory and it's subdirectories +*.html +*.ps +*.pdf +*.txt +*.css diff --git a/specs/Makefile.am b/specs/Makefile.am new file mode 100644 index 0000000..5b3225d --- /dev/null +++ b/specs/Makefile.am @@ -0,0 +1,64 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS 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. +# + +if ENABLE_SPECS +doc_sources = xc-misc.xml +dist_doc_DATA = $(doc_sources) + +if HAVE_XMLTO +doc_DATA = $(doc_sources:.xml=.html) + +if HAVE_FOP +doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) +endif + +if HAVE_XMLTO_TEXT +doc_DATA += $(doc_sources:.xml=.txt) +endif + +if HAVE_STYLESHEETS +XMLTO_FLAGS = -m $(XSL_STYLESHEET) + +doc_DATA += xorg.css +xorg.css: $(STYLESHEET_SRCDIR)/xorg.css + $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ +endif + +CLEANFILES = $(doc_DATA) + +SUFFIXES = .xml .ps .pdf .txt .html + +.xml.txt: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< + +.xml.html: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< + +.xml.pdf: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< + +.xml.ps: + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< + +endif HAVE_XMLTO +endif ENABLE_SPECS diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml new file mode 100644 index 0000000..65ba0d2 --- /dev/null +++ b/specs/xc-misc.xml @@ -0,0 +1,205 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";> + +<!-- lifted from troff+ms+XMan by doclifter --> +<book id="xcmisc"> + +<bookinfo> + <title>XC-MISC Extension</title> + <subtitle>X Consortium Standard</subtitle> + <releaseinfo>X Version 11, Release 6.9/7.0</releaseinfo> + <authorgroup> + <author> + <firstname>Bob</firstname><surname>Scheifler</surname> + </author> + </authorgroup> +<othercredit><firstname>David</firstname><surname>Wiggins</surname></othercredit> + <corpname>X Consortium Standard</corpname> + <copyright><year>1994</year><holder>X Consortium</holder></copyright> + <releaseinfo>Version 1.1</releaseinfo> + <affiliation><orgname>X Consortium</orgname></affiliation> + <productnumber>X Version 11, Release 6.9/7.0</productnumber> + +<legalnotice> +<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para> + +<para>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</para> + +<para>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</para> + +<para>THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM 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.</para> + +<para>Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.</para> + +<para>X Window System is a trademark of The Open Group.</para> +</legalnotice> + +</bookinfo> + +<chapter id='overview'> +<title>Overview</title> + +<para>When an X client connects to an X server, it receives a fixed range of +resource IDs to use to identify the client's resources inside the X +server. Xlib hands these out sequentially as needed. When it +overruns the end of the range, an IDChoice protocol error results. +Long running clients, or clients that use resource IDs at a rapid +rate, may encounter this circumstance. When it happens, there are +usually many resource IDs available, but Xlib doesn't know about them.</para> + +<para>One approach to solving this problem would be to have Xlib notice when +a resource is freed and recycle its ID for future use. This strategy +runs into difficulties because sometimes freeing one resource causes +others to be freed (for example, when a window is destroyed, so are +its children). To do a complete job, Xlib would have to maintain a +large amount of state that currently resides only in the server (the +entire window tree in the above example). Even if a less +comprehensive strategy was adopted, such as recycling only those IDs +that Xlib can identify without maintaining additional state, the +additional bookkeeping at resource creation and destruction time +would likely introduce unacceptable overhead.</para> + +<para>To avoid the problems listed above, the server's complete knowledge of +all resource IDs in use by a client is leveraged. This extension +provides two ways for Xlib to query the server for available resource +IDs. Xlib can use these extension requests behind the scenes when it has +exhausted its current pool of resource IDs.</para> +</chapter> + +<chapter id='requests'> +<title>Requests</title> + +<para><function>XCMiscGetVersion</function></para> + +<itemizedlist> + <listitem><para><emphasis remap='I'>client_major_version</emphasis>: CARD16</para></listitem> + <listitem><para><emphasis remap='I'>client_minor_version</emphasis>: CARD16</para></listitem> +</itemizedlist> +<para> =></para> +<itemizedlist> + <listitem><para><emphasis remap='I'>client_major_version</emphasis>: CARD16</para></listitem> + <listitem><para><emphasis remap='I'>client_minor_version</emphasis>: CARD16</para></listitem> +</itemizedlist> + +<para>If supplied, the <emphasis remap='I'>client_major_version</emphasis> and +<emphasis remap='I'>client_minor_version</emphasis> indicate what version of +the protocol the client wants the server to implement. The server version +numbers returned indicate the protocol this extension actually supports. This +might not equal the version sent by the client. An implementation can +(but need not) support more than one version simultaneously. The +<emphasis remap='I'>server_major_version</emphasis> and the <emphasis remap='I'>server_minor_version</emphasis> are a +mechanism to support future revisions of the XC-MISC protocol +which may be necessary. In general, the major version would increment +for incompatible changes, and the minor version would increment for +small, upward-compatible changes. Servers that support the protocol +defined in this document will return a +<emphasis remap='I'>server_major_version</emphasis> of one (1), and a +<emphasis remap='I'>server_minor_version</emphasis> of one (1).</para> + +<para><function>XCMiscGetXIDRange</function></para> + +<para> =></para> +<itemizedlist> + <listitem><para><emphasis remap='I'>start_id</emphasis>: XID</para></listitem> + <listitem><para><emphasis remap='I'>count</emphasis>: CARD32</para></listitem> +</itemizedlist> + +<para>This request returns a range of available resource IDs for the client +issuing the request. <emphasis remap='I'>start_id</emphasis> is the first +ID in the range. <emphasis remap='I'>count</emphasis> is the number of IDs +in the range. The returned range may or may not be the largest possible +range.</para> + +<para><function>XCMiscGetXIDList</function></para> + +<itemizedlist> + <listitem><para><emphasis remap='I'>count</emphasis>: CARD32</para></listitem> +</itemizedlist> +<para> =></para> +<itemizedlist> + <listitem><para><emphasis remap='I'>ids</emphasis>: LISTofXID</para></listitem> +</itemizedlist> + +<para>This request returns the a list of individual resource IDs in +<emphasis remap='I'>ids</emphasis>. +<emphasis remap='I'>count</emphasis> is the number of resource IDs requested. +The number returned may be smaller than the number requested.</para> +</chapter> + +<chapter id='events_and_errors'> +<title>Events and Errors</title> + +<para>No new events or errors are defined by this extension.</para> +</chapter> + +<chapter id='encoding'> +<title>Encoding</title> + +<para>Please refer to the X11 Protocol Encoding document as this document uses +conventions established there.</para> + +<para>The name of this extension is “XC-MISC”.</para> + +<literallayout remap='Ds'> +<function>XCMiscGetVersion</function> + 1 CARD8 opcode + 1 0 XC-MISC opcode + 2 2 request length + 2 CARD16 client_major_version + 2 CARD16 client_minor_version +</literallayout> +<literallayout remap='Ds'> +<synopsis> + => + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 0 length + 2 CARD16 server_major_version + 2 CARD16 server_minor_version + 20 unused +</synopsis> +</literallayout> + +<literallayout remap='Ds'> +<function>XCMiscGetXIDRange</function> + 1 CARD8 opcode + 1 1 XC-MISC opcode + 2 1 request length +</literallayout> +<literallayout remap='Ds'> +<synopsis> + => + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 0 length + 4 XID start_id + 4 CARD32 count + 16 unused +</synopsis> +</literallayout> <!-- remap='De' --> + +<literallayout remap='Ds'> +<function>XCMiscGetXIDList</function> + 1 CARD8 opcode + 1 2 XC-MISC opcode + 2 2 request length + 4 CARD32 count +</literallayout> +<literallayout remap='Ds'> +<synopsis> + => + 1 1 Reply + 1 unused + 2 CARD16 sequence number + 4 CARD32 length + 4 CARD32 number of XIDs in ids + 20 unused + 4n LISTofXID ids +</synopsis> +</literallayout> +</chapter> +</book> + commit 4f05216edd9122d82c4a451914ee78a332b6a2e3 Author: Gaetan Nadon <[email protected]> Date: Sun Mar 28 19:25:52 2010 -0400 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index dbae5c4..7f355d8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([XCMiscProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit bf6d08091e350fa8069d74129fc8b61c4349314b Author: Gaetan Nadon <[email protected]> Date: Sun Mar 28 19:00:31 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/Makefile.am b/Makefile.am index 1671823..7937ee6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ xcmisc_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xcmiscproto.pc -EXTRA_DIST = xcmiscproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL commit 9844fba5c3db9afffd86604db81e76d89da69777 Author: Gaetan Nadon <[email protected]> Date: Sun Nov 22 19:24:48 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 60e34b0..1671823 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ pkgconfig_DATA = xcmiscproto.pc EXTRA_DIST = xcmiscproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: commit f1c491cb1cd56c7689fefbd8cf9e64b8fd9f2a54 Author: Gaetan Nadon <[email protected]> Date: Mon Nov 16 11:13:30 2009 -0500 README: file created or updated #24206 Contains a set of URLs to freedesktop.org. diff --git a/README b/README new file mode 100644 index 0000000..12ce76e --- /dev/null +++ b/README @@ -0,0 +1,30 @@ + XC-MISC Extension + +This extension defines a protocol that provides Xlib two ways to query +the server for available resource IDs. + +Extension name: XC-MISC + +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 + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/xcmiscproto + + http://cgit.freedesktop.org/xorg/proto/xcmiscproto + +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 + commit bac51967621114c8314339c5db7a876bc9a724f0 Author: Gaetan Nadon <[email protected]> Date: Sun Nov 15 19:45:27 2009 -0500 Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. diff --git a/Makefile.am b/Makefile.am index ce2d109..60e34b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,6 @@ pkgconfig_DATA = xcmiscproto.pc EXTRA_DIST = xcmiscproto.pc.in -EXTRA_DIST += ChangeLog -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
