AUTHORS | 6 COPYING | 16 +- ChangeLog | 257 +++++++++++++++++++++++++++++++++ configure.ac | 6 debian/changelog | 10 + debian/control | 4 debian/libxext-dev.install | 3 debian/rules | 8 - docbook.am | 116 ++++++++------ include/X11/extensions/XLbx.h | 4 include/X11/extensions/Xdbe.h | 10 - include/X11/extensions/Xge.h | 2 include/X11/extensions/dpms.h | 10 - include/X11/extensions/extutil.h | 6 include/X11/extensions/sync.h | 16 +- include/X11/extensions/xtestext1.h | 4 man/DBE.man | 118 +++++++-------- man/DPMSCapable.man | 18 +- man/DPMSDisable.man | 16 +- man/DPMSEnable.man | 32 ++-- man/DPMSForceLevel.man | 22 +- man/DPMSGetTimeouts.man | 36 ++-- man/DPMSGetVersion.man | 22 +- man/DPMSInfo.man | 24 +-- man/DPMSQueryExtension.man | 40 ++--- man/DPMSSetTimeouts.man | 80 +++++----- man/XShape.man | 136 ++++++++--------- man/XShm.man | 30 +-- man/XcupGetReservedColormapEntries.man | 22 +- man/XcupQueryVersion.man | 18 +- man/XcupStoreColors.man | 22 +- man/XdbeAllocateBackBufferName.man | 38 ++-- man/XdbeBeginIdiom.man | 30 +-- man/XdbeDeallocateBackBufferName.man | 30 +-- man/XdbeEndIdiom.man | 30 +-- man/XdbeFreeVisualInfo.man | 30 +-- man/XdbeGetBackBufferAttributes.man | 34 ++-- man/XdbeGetVisualInfo.man | 36 ++-- man/XdbeQueryExtension.man | 32 ++-- man/XdbeSwapBuffers.man | 30 +-- man/Xevi.man | 56 +++---- man/Xmbuf.man | 72 ++++----- specs/Makefile.am | 2 specs/dbelib.xml | 109 +++++++------ specs/dpmslib.xml | 38 ++-- specs/shapelib.xml | 67 +++++--- specs/synclib.xml | 110 +++++++------- specs/xtest1.xml | 32 +++- src/DPMS.c | 18 +- src/MITMisc.c | 4 src/Makefile.am | 2 src/XAppgroup.c | 16 +- src/XEVI.c | 2 src/XLbx.c | 8 - src/XMultibuf.c | 56 +++---- src/XSecurity.c | 4 src/XShape.c | 8 - src/XShm.c | 6 src/XSync.c | 6 src/XTestExt1.c | 36 ++-- src/Xcup.c | 10 - src/Xdbe.c | 28 +-- src/Xge.c | 2 src/extutil.c | 24 +-- src/globals.c | 2 65 files changed, 1226 insertions(+), 896 deletions(-)
New commits: commit dd29028c64e47677607f43955f49ccc32e58fec8 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 20:46:16 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index a97f1a3..a0e5d60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxext (2:1.3.1-1) UNRELEASED; urgency=low +libxext (2:1.3.1-1) unstable; urgency=low * New upstream release. * Bump xorg-sgml-doctools build-dep per configure.ac. @@ -6,7 +6,7 @@ libxext (2:1.3.1-1) UNRELEASED; urgency=low call. * Don't require (fake)root for debian/rules clean. - -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 20:28:07 +0200 + -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 20:46:06 +0200 libxext (2:1.3.0-3) unstable; urgency=low commit 69b59d7a6ba31a71787a318a13ff8564d808f056 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 20:36:20 2012 +0200 Don't require (fake)root for debian/rules clean. diff --git a/debian/changelog b/debian/changelog index 6dfa8eb..a97f1a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libxext (2:1.3.1-1) UNRELEASED; urgency=low * Bump xorg-sgml-doctools build-dep per configure.ac. * Adjust rules for new location of .db files, and set docdir in configure call. + * Don't require (fake)root for debian/rules clean. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 20:28:07 +0200 diff --git a/debian/rules b/debian/rules index b65eafd..89cb2dd 100755 --- a/debian/rules +++ b/debian/rules @@ -56,9 +56,7 @@ build-stamp: clean: xsfclean dh_testdir - dh_testroot rm -f build-stamp - rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* @@ -67,7 +65,6 @@ clean: xsfclean rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs find -name Makefile.in -delete - dh_clean install: build commit 12414861b830548e2c3eb0b370459ead426eaae5 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 20:35:48 2012 +0200 Adjust rules for new location of .db files, and set docdir in configure call. diff --git a/debian/changelog b/debian/changelog index bca2d4f..6dfa8eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libxext (2:1.3.1-1) UNRELEASED; urgency=low * New upstream release. * Bump xorg-sgml-doctools build-dep per configure.ac. + * Adjust rules for new location of .db files, and set docdir in configure + call. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 20:28:07 +0200 diff --git a/debian/libxext-dev.install b/debian/libxext-dev.install index cbf3b1e..c8de106 100644 --- a/debian/libxext-dev.install +++ b/debian/libxext-dev.install @@ -3,5 +3,4 @@ usr/lib/*/libXext.a usr/lib/*/libXext.so usr/lib/*/pkgconfig/xext.pc usr/include/X11/extensions/ -usr/share/doc/libXext/*.html usr/share/doc/libxext-dev -usr/share/doc/libXext/*.txt usr/share/doc/libxext-dev +usr/share/doc/libxext-dev diff --git a/debian/rules b/debian/rules index eca2aec..b65eafd 100755 --- a/debian/rules +++ b/debian/rules @@ -46,6 +46,7 @@ build-stamp: cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + --docdir=\$${datadir}/doc/libxext-dev \ --infodir=\$${prefix}/share/info $(confflags) \ --with-xmlto \ --without-fop \ @@ -84,8 +85,8 @@ binary-arch: build install dh_installdocs # Kill *.xml, we don't need them: - find debian/tmp -name '*.xml' -delete - find debian/tmp/usr/share/sgml/X11/dbs -name '*.db' -delete + find debian/tmp/usr/share/doc/libxext-dev -name '*.xml' -delete + find debian/tmp/usr/share/doc/libxext-dev -name '*.db' -delete dh_install --sourcedir=debian/tmp --fail-missing -XlibXext.la dh_installchangelogs ChangeLog dh_link commit 0bd0052d7b942cc69576aac215328d2820c0fe60 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 20:29:34 2012 +0200 Bump xorg-sgml-doctools build-dep per configure.ac. diff --git a/debian/changelog b/debian/changelog index 55a5070..bca2d4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxext (2:1.3.1-1) UNRELEASED; urgency=low * New upstream release. + * Bump xorg-sgml-doctools build-dep per configure.ac. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 20:28:07 +0200 diff --git a/debian/control b/debian/control index 8c0deb1..1e40803 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: libtool, xutils-dev (>= 1:7.6+2), # specs - xmlto, - xorg-sgml-doctools (>= 1:1.7), + xmlto (>= 0.0.22), + xorg-sgml-doctools (>= 1:1.8), w3m, xsltproc, Standards-Version: 3.9.2 commit deec3c00426ea39dfd572a34cfb094e49ebb2cbc Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 20:28:33 2012 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index d544f10..be43714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,260 @@ +commit e9c1e346c90e697d5d8f0e756ef8b6e3ed339e29 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Wed Mar 7 19:54:50 2012 -0800 + + libXext 1.3.1 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit c0c2a0c7819c425f3df0992b6873a15c8ec27e01 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Wed Sep 28 16:19:27 2011 -0700 + + Add const attributes to fix gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a8f18777099ca5d61929bc37e4741457b6671e59 +Author: Matt Dew <mar...@osource.org> +Date: Fri Oct 7 23:25:45 2011 -0600 + + more Cleanup of IDs and links in doc + +commit 3464d6eebfaaf015ea6b25a9a437192ddb1b02b0 +Author: Matt Dew <mar...@osource.org> +Date: Tue Sep 20 22:06:05 2011 -0600 + + Fix id attributes capitolization + + #1 - fix the capitolization of the ID attriutes to match either + the <title> or <funcdef> string it goes with. + #2 - fix any <linkend>'s that were affected by #1 + #3 - any <function> in the docs that has an actual funcdef, will + become an olink. + + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Gaetan Nadon <mems...@videotron.ca> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 17271b78c5d8d9864eda2476863543ba284bee2d +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Sep 20 19:01:41 2011 -0400 + + specs: regroup <author> <editor> <othercredit> under authorgroup + + Some elements are not displayed when outside authorgroup + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit a58e7d756111eafd4b75763692808198315f1c75 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Sep 20 10:18:22 2011 -0400 + + xtest1: adding legal text related to the X Consortium Copyright + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 276df4dd2de616617cb439df4367cbaa4f568a0a +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Sep 20 10:07:06 2011 -0400 + + dpmslib: minor markup fix in legal text + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit ca39a358c35ea364c10fa7c16b6a584171d27600 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Sep 20 09:57:26 2011 -0400 + + synclib: refactor copyright legal text for multiple licensing + + One sentence added as per the xorg License doc. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 877e74e518ec74a07cb8998a3f517ab043cf76be +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Mon Sep 19 17:26:02 2011 -0400 + + specs: add missing legal text information + + The reference being the xorg License doc. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit b46167511d429792086fb8e8cfea6f19b2fc9847 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Sep 16 22:18:56 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit ead0cea593266b91f08d33a0c83170ba92d8ac7e +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Fri Sep 16 16:30:09 2011 -0400 + + dbelib: refactor docbook copyright markup + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit d01ff169e5a07cb0eda3a8fd1489abb964db7ede +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Sep 15 10:39:25 2011 -0400 + + synclib: fix authors and affiliations + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit d7d0ad299214c4cb0b8dac579ffb7a6722de2d7f +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Sep 14 17:40:14 2011 -0400 + + dbelib: fix typo in author's name + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 1a147b7a6d1842d02e40674353716e5c3eb3b432 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Sep 14 17:27:09 2011 -0400 + + dpmslib: restore DEC copyright + + Somehow during docbook conversion the copyright was changed from DEC + to X Consortium. There are suprious instances of X Consortium + in many docs. The dpms protocol doc was intact. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit a41bfcd7aa93046a5e917ccd4af321d4a6703160 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Sep 14 16:30:26 2011 -0400 + + docs: fix author affiliation + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit e493d8f2a6441ea7bd92bb9dc9681d0bd8cfb7dc +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Sep 14 16:06:55 2011 -0400 + + docs: remove orphan affiliation + + Move releaseinfo elements together + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 0344dafef098d64a9be7bafc859c8c1f27b75942 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Sep 14 16:03:45 2011 -0400 + + docs: fix author affiliation + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit a8248f0dbb84ab2530bd11f2c396b7fcd4b128f4 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Mon Sep 12 16:54:45 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 426514bee44ccbb849b959c917a191545e7472fa +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Sep 11 19:49:54 2011 -0400 + + docs: remove <productnumber> which is not used by default + + This element is not rendered by default on the title. A template + customization is required to display it. + X Window System does not have a product number. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit aec3220c5ca4942fdb2ad40d3b460ddd90603428 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Sep 8 20:00:00 2011 -0400 + + docbook.am: embed css styles inside the HTML HEAD element + + Rather than referring to the external xorg.css stylesheet, embed the content + of the file in the html output produced. This is accomplished by using + version 1.10 of xorg-xhtml.xsl. + + This makes the whole html docs tree much more relocatable. + In addition, it eliminates xorg.css as a runtime file which makes + xorg-sgml-doctools a build time only package. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 23b5f7d36f850cef9a135290bec23099f33245d1 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Sep 7 10:31:04 2011 -0400 + + docbook.am: global maintenance update - entities, images and olinking + + Adding support in libX11 for html chunking caused a reorg of docbook.am + as well as the xorg-sgml-doctools masterdb for olinking. + The parameter img.src.path is added for pdf images. + A searchpath to the root builddir is added for local entities, if present. + + The docbook.am makefile hides all the details and is identical for + all 22 modules having DocBook documentation. It is included by a thin + Makefile.am which requires no docbook knowledge. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 1b9487304a4757478aa923174272dd4062af9735 +Author: Matt Dew <mar...@osource.org> +Date: Wed Jul 13 12:32:49 2011 -0600 + + Add some links for quick referencing definitions. + + Signed-off-by: Matt Dew <mar...@osource.org> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Acked-by: Gaetan Nadon <mems...@videotron.ca> + +commit b6fc6e6a0784b747863ee9b586fb09a81340bea4 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Jun 5 16:27:36 2011 -0400 + + Install target dbs alongside generated documents + + This matches a change in xorg-sgml-docs whereby the masterdb will look for + the target dbs into the same location as the generated documents. + + The target dbs are now installed alongside the generated documents. + Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which + has the potential of installing outside the package prefix and cause + distcheck to fail when user does not have write permission in this package. + + Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 + +commit acc529ed1f1cff6c79d3b6f711ff64da97bb864c +Author: Matt Dew <mar...@osource.org> +Date: Wed May 25 23:49:37 2011 -0600 + + add id attributes to funcsynopsis to allow other docs to olink to them. + + Signed-off-by: Matt Dew <mar...@osource.org> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Gaetan Nadon <mems...@videotron.ca> + +commit 8451664d228852f7b57eb11a35be3328b6fff13a +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri May 6 18:45:55 2011 -0700 + + Install xml versions of specs even if HAVE_XMLTO is false + + Moves HAVE_XMLTO check into docbook.am, more closely matches behaviour + from before docbook.am changes. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + commit f9a140097dace149a2c6b6f72080edee24b068f4 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Fri May 6 16:41:36 2011 -0700 diff --git a/debian/changelog b/debian/changelog index 9f5b55a..55a5070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxext (2:1.3.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 20:28:07 +0200 + libxext (2:1.3.0-3) unstable; urgency=low * Team upload. commit e9c1e346c90e697d5d8f0e756ef8b6e3ed339e29 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Mar 7 19:54:50 2012 -0800 libXext 1.3.1 Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/configure.ac b/configure.ac index dd9788a..7f81504 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXext], [1.3.0], +AC_INIT([libXext], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) commit c0c2a0c7819c425f3df0992b6873a15c8ec27e01 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Sep 28 16:19:27 2011 -0700 Add const attributes to fix gcc -Wwrite-strings warnings Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/include/X11/extensions/extutil.h b/include/X11/extensions/extutil.h index 7f05aff..29404d5 100644 --- a/include/X11/extensions/extutil.h +++ b/include/X11/extensions/extutil.h @@ -123,7 +123,7 @@ extern void XextDestroyExtension( extern XExtDisplayInfo *XextAddDisplay( XExtensionInfo* /* extinfo */, Display* /* dpy */, - char* /* ext_name */, + _Xconst char* /* ext_name */, XExtensionHooks* /* hooks */, int /* nevents */, XPointer /* data */ diff --git a/src/DPMS.c b/src/DPMS.c index 07818a0..a4f0595 100644 --- a/src/DPMS.c +++ b/src/DPMS.c @@ -42,7 +42,7 @@ Equipment Corporation. static XExtensionInfo _dpms_info_data; static XExtensionInfo *dpms_info = &_dpms_info_data; -static char *dpms_extension_name = DPMSExtensionName; +static const char *dpms_extension_name = DPMSExtensionName; #define DPMSCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, dpms_extension_name, val) diff --git a/src/MITMisc.c b/src/MITMisc.c index bc452db..b8c21b6 100644 --- a/src/MITMisc.c +++ b/src/MITMisc.c @@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group. static XExtensionInfo _mit_info_data; static XExtensionInfo *mit_info = &_mit_info_data; -static /* const */ char *mit_extension_name = MITMISCNAME; +static const char *mit_extension_name = MITMISCNAME; #define MITCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, mit_extension_name, val) diff --git a/src/XAppgroup.c b/src/XAppgroup.c index 16650b6..b5642f3 100644 --- a/src/XAppgroup.c +++ b/src/XAppgroup.c @@ -52,7 +52,7 @@ struct xagstuff { static XExtensionInfo _xag_info_data; static XExtensionInfo *xag_info = &_xag_info_data; -static char *xag_extension_name = XAGNAME; +static const char *xag_extension_name = XAGNAME; #define XagCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, xag_extension_name, val) diff --git a/src/XEVI.c b/src/XEVI.c index a30daac..eb09daa 100644 --- a/src/XEVI.c +++ b/src/XEVI.c @@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/extensions/extutil.h> #include <X11/Xutil.h> static XExtensionInfo *xevi_info;/* needs to move to globals.c */ -static /* const */ char *xevi_extension_name = EVINAME; +static const char *xevi_extension_name = EVINAME; #define XeviCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, xevi_extension_name, val) /***************************************************************************** diff --git a/src/XLbx.c b/src/XLbx.c index b3ba1b2..fda00ea 100644 --- a/src/XLbx.c +++ b/src/XLbx.c @@ -33,7 +33,7 @@ static XExtensionInfo _lbx_info_data; static XExtensionInfo *lbx_info = &_lbx_info_data; -static /* const */ char *lbx_extension_name = LBXNAME; +static const char *lbx_extension_name = LBXNAME; #define LbxCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, lbx_extension_name, val) @@ -55,7 +55,7 @@ static /* const */ XExtensionHooks lbx_extension_hooks = { error_string, /* error_string */ }; -static /* const */ char *lbx_error_list[] = { +static const char *lbx_error_list[] = { "BadLbxClient", /* BadLbxClient */ }; diff --git a/src/XMultibuf.c b/src/XMultibuf.c index fb995f8..7a746ba 100644 --- a/src/XMultibuf.c +++ b/src/XMultibuf.c @@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group. static XExtensionInfo _multibuf_info_data; static XExtensionInfo *multibuf_info = &_multibuf_info_data; -static /* const */ char *multibuf_extension_name = MULTIBUFFER_PROTOCOL_NAME; +static const char *multibuf_extension_name = MULTIBUFFER_PROTOCOL_NAME; #define MbufCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, multibuf_extension_name, val) @@ -72,7 +72,7 @@ static /* const */ XExtensionHooks multibuf_extension_hooks = { error_string, /* error_string */ }; -static /* const */ char *multibuf_error_list[] = { +static const char *multibuf_error_list[] = { "BadBuffer", /* MultibufferBadBuffer */ }; diff --git a/src/XSecurity.c b/src/XSecurity.c index b2aa98c..f8c7da1 100644 --- a/src/XSecurity.c +++ b/src/XSecurity.c @@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group. static XExtensionInfo _Security_info_data; static XExtensionInfo *Security_info = &_Security_info_data; -static char *Security_extension_name = SECURITY_EXTENSION_NAME; +static const char *Security_extension_name = SECURITY_EXTENSION_NAME; #define SecurityCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, Security_extension_name, val) @@ -76,7 +76,7 @@ static XExtensionHooks Security_extension_hooks = { error_string /* error_string */ }; -static char *security_error_list[] = { +static const char *security_error_list[] = { "BadAuthorization", "BadAuthorizationProtocol" }; diff --git a/src/XShape.c b/src/XShape.c index 1e3a77f..6e8fbae 100644 --- a/src/XShape.c +++ b/src/XShape.c @@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group. static XExtensionInfo _shape_info_data; static XExtensionInfo *shape_info = &_shape_info_data; -static /* const */ char *shape_extension_name = SHAPENAME; +static const char *shape_extension_name = SHAPENAME; #define ShapeCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, shape_extension_name, val) diff --git a/src/XShm.c b/src/XShm.c index e3f8fa0..f82455c 100644 --- a/src/XShm.c +++ b/src/XShm.c @@ -40,7 +40,7 @@ in this Software without prior written authorization from The Open Group. static XExtensionInfo _shm_info_data; static XExtensionInfo *shm_info = &_shm_info_data; -static /* const */ char *shm_extension_name = SHMNAME; +static const char *shm_extension_name = SHMNAME; #define ShmCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, shm_extension_name, val) @@ -70,7 +70,7 @@ static /* const */ XExtensionHooks shm_extension_hooks = { error_string, /* error_string */ }; -static /* const */ char *shm_error_list[] = { +static const char *shm_error_list[] = { "BadShmSeg", /* BadShmSeg */ }; diff --git a/src/XSync.c b/src/XSync.c index 0e19922..df7c435 100644 --- a/src/XSync.c +++ b/src/XSync.c @@ -62,7 +62,7 @@ PERFORMANCE OF THIS SOFTWARE. static XExtensionInfo _sync_info_data; static XExtensionInfo *sync_info = &_sync_info_data; -static char *sync_extension_name = SYNC_NAME; +static const char *sync_extension_name = SYNC_NAME; #define SyncCheckExtension(dpy,i,val) \ XextCheckExtension(dpy, i, sync_extension_name, val) @@ -89,7 +89,7 @@ static XExtensionHooks sync_extension_hooks = { error_string, /* error_string */ }; -static char *sync_error_list[] = { +static const char *sync_error_list[] = { "BadCounter", "BadAlarm", "BadFence", diff --git a/src/Xcup.c b/src/Xcup.c index ad78699..bb9e90f 100644 --- a/src/Xcup.c +++ b/src/Xcup.c @@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group. static XExtensionInfo _xcup_info_data; static XExtensionInfo *xcup_info = &_xcup_info_data; -static char *xcup_extension_name = XCUPNAME; +static const char *xcup_extension_name = XCUPNAME; /***************************************************************************** * * diff --git a/src/Xdbe.c b/src/Xdbe.c index 1b9e2da..4b5fa18 100644 --- a/src/Xdbe.c +++ b/src/Xdbe.c @@ -42,7 +42,7 @@ static XExtensionInfo _dbe_info_data; static XExtensionInfo *dbe_info = &_dbe_info_data; -static char *dbe_extension_name = DBE_PROTOCOL_NAME; +static const char *dbe_extension_name = DBE_PROTOCOL_NAME; #define DbeCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, dbe_extension_name, val) @@ -86,7 +86,7 @@ static XExtensionHooks dbe_extension_hooks = { error_string, /* error_string */ }; -static char *dbe_error_list[] = { +static const char *dbe_error_list[] = { "BadBuffer", /* DbeBadBuffer */ }; diff --git a/src/Xge.c b/src/Xge.c index d28a4f0..74e4802 100644 --- a/src/Xge.c +++ b/src/Xge.c @@ -76,7 +76,7 @@ static Bool _xgeCheckExtension(Display* dpy, XExtDisplayInfo* info); /* main extension information data */ static XExtensionInfo *xge_info; -static char xge_extension_name[] = GE_NAME; +static const char xge_extension_name[] = GE_NAME; static XExtensionHooks xge_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ diff --git a/src/extutil.c b/src/extutil.c index 361a327..93cab73 100644 --- a/src/extutil.c +++ b/src/extutil.c @@ -96,7 +96,7 @@ void XextDestroyExtension (XExtensionInfo *info) XExtDisplayInfo *XextAddDisplay ( XExtensionInfo *extinfo, Display *dpy, - char *ext_name, + _Xconst char *ext_name, XExtensionHooks *hooks, int nevents, XPointer data) commit a8f18777099ca5d61929bc37e4741457b6671e59 Author: Matt Dew <mar...@osource.org> Date: Fri Oct 7 23:25:45 2011 -0600 more Cleanup of IDs and links in doc diff --git a/specs/dpmslib.xml b/specs/dpmslib.xml index 60565b5..ba5682e 100644 --- a/specs/dpmslib.xml +++ b/specs/dpmslib.xml @@ -85,7 +85,7 @@ These are mapped onto the X DPMS Extension like this: <title>DPMS Functions</title> -<funcsynopsis id='dpmsqueryextention'> +<funcsynopsis id='DPMSQueryExtention'> <funcprototype> <funcdef>Bool <function>DPMSQueryExtention</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -120,7 +120,7 @@ return value is FALSE, and the values of <emphasis remap='I'>error_base</emphasis> are undefined. </para> -<funcsynopsis id='dpmsgetversion'> +<funcsynopsis id='DPMSGetVersion'> <funcprototype> <funcdef>Status <function>DPMSGetVersion</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -156,7 +156,7 @@ incompatible changes, and the minor version will be incremented for small, upwardly compatible changes. </para> -<funcsynopsis id='dpmscapable'> +<funcsynopsis id='DPMSCapable'> <funcprototype> <funcdef>Bool <function>DPMSCapable</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -179,7 +179,7 @@ is capable of DPMS on one head, and incapable on another, the truth value of this function is defined by the X server implementation. </para> -<funcsynopsis id='dpmssettimeouts'> +<funcsynopsis id='DPMSSetTimeouts'> <funcprototype> <funcdef>Status <function>DPMSSetTimeouts</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -255,7 +255,7 @@ or equal to the timeout values of earlier modes. If inconsistent values are supplied, a BadValue error will result. </para> -<funcsynopsis id='dpmsgettimeouts'> +<funcsynopsis id='DPMSGetTimeouts'> <funcprototype> <funcdef>Status <function>DPMSGetTimeouts</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -307,7 +307,7 @@ inactivity in seconds before the third and final level of power savings is invoked. A value of zero indicates that this mode has been disabled. </para> -<funcsynopsis id='dpmsenable'> +<funcsynopsis id='DPMSEnable'> <funcprototype> <funcdef>Status <function>DPMSEnable</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -331,7 +331,7 @@ error is returned. If DPMSEnable is invoked on a display without support for DPMS, no change is made and no error is returned. </para> -<funcsynopsis id='dpmsdisable'> +<funcsynopsis id='DPMSDisable'> <funcprototype> <funcdef>Status <function>DPMSDisable</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -353,7 +353,7 @@ and no error is returned. If DPMSDisable is invoked on a display without support for DPMS, no change is made and no error is returned. </para> -<funcsynopsis id='dpmsforcelevel'> +<funcsynopsis id='DPMSForceLevel'> <funcprototype> <funcdef>Status <function>DPMSForceLevel</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> @@ -382,7 +382,7 @@ is disabled on the display, a BadMatch protocol error will result. <para>Status DPMSInfo(<emphasis remap='I'>display, power_level, state</emphasis>)</para> -<funcsynopsis id='dpmsinfo'> +<funcsynopsis id='DPMSInfo'> <funcprototype> <funcdef>Status <function>DPMSInfo</function></funcdef> <paramdef>Display <parameter>*display</parameter></paramdef> commit 3464d6eebfaaf015ea6b25a9a437192ddb1b02b0 Author: Matt Dew <mar...@osource.org> Date: Tue Sep 20 22:06:05 2011 -0600 Fix id attributes capitolization #1 - fix the capitolization of the ID attriutes to match either the <title> or <funcdef> string it goes with. #2 - fix any <linkend>'s that were affected by #1 #3 - any <function> in the docs that has an actual funcdef, will become an olink. Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Gaetan Nadon <mems...@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/specs/dbelib.xml b/specs/dbelib.xml index b0001b3..f1692d0 100644 --- a/specs/dbelib.xml +++ b/specs/dbelib.xml @@ -56,7 +56,7 @@ purpose of the information in this document. This documentation is provided </bookinfo> -<chapter id="introduction"> +<chapter id='Introduction'> <title>Introduction</title> <para> The Double Buffer Extension (DBE) provides a standard way to utilize @@ -74,7 +74,7 @@ frame. The result is a flicker-free animation. </chapter> -<chapter id="goals"> +<chapter id='Goals'> <title>Goals</title> <para> @@ -142,7 +142,7 @@ hardware access (DGHA) architectures. </chapter> -<chapter id="concepts"> +<chapter id='Concepts'> <title>Concepts</title> <para> Normal windows are created using the core CreateWindow request, which @@ -293,7 +293,7 @@ that need such facilities (for example, to maintain a constant frame rate) should investigate the Synchronization Extension, an X Consortium standard. </para> -<sect1 id="window_management_operations"> +<sect1 id='Window_Management_Operations'> <title>Window Management Operations</title> <para> @@ -344,7 +344,7 @@ events are generated for D. </sect1> -<sect1 id="complex_swap_actions"> +<sect1 id='Complex_Swap_Actions'> <title>Complex Swap Actions</title> <para> DBE has no explicit knowledge of ancillary buffers (for example, depth buffers @@ -451,14 +451,14 @@ variety of implementations. </sect1> </chapter> -<chapter id="c_language_bindings"> +<chapter id='C_Language_Binding'> <title>C Language Binding</title> <para> All identiļ¬er The header for this extension is <X11/extensions/Xdbe.h>. names provided by this header begin with Xdbe. </para> -<sect1 id="types"> +<sect1 id='Types'> <title>Types</title> <para> @@ -475,7 +475,7 @@ The type <function>XdbeSwapAction</function> can be one of the constants </sect1> -<sect1 id="c_functions"> +<sect1 id='C_Functions'> <title>C Functions</title> <para> The C functions provide direct access to the protocol and add no additional @@ -486,7 +486,7 @@ start of the function name with DBE. All functions that have return type zero for failure. </para> -<funcsynopsis id='xdbequeryextension'> +<funcsynopsis id='XdbeQueryExtension'> <funcprototype> <funcdef>Status <function>XdbeQueryExtension</function></funcdef> <paramdef>Display <parameter> *dpy</parameter></paramdef> @@ -496,7 +496,7 @@ zero for failure. </funcsynopsis> <para> -<function>XdbeQueryExtension</function> sets major version return and minor +<olink targetdoc='dbelib' targetptr='XdbeQueryExtension'><function>XdbeQueryExtension</function></olink> sets major version return and minor version return to the major and minor DBE protocol version supported by the server. If the DBE library is compatible with the version returned by the server, it returns nonzero. If dpy does not support the DBE extension, @@ -507,7 +507,7 @@ violates this rule, the effects of all subsequent Xdbe calls that it makes are undefined. </para> -<funcsynopsis id='xdbegetvisualinfo'> +<funcsynopsis id='XdbeGetVisualInfo'> <funcprototype> <funcdef>XdbeScreenVisualInfo *<function>XdbeGetVisualInfo</function></funcdef> <paramdef>Display <parameter> *dpy</parameter></paramdef> @@ -518,7 +518,7 @@ are undefined. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1sjuwk-0008p3...@vasks.debian.org