From dbf5531e9aaded40d1e086ebe7fbf3b9030acc57 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 15:54:35 +0000 Subject: R6.6 is the Xorg base-line --- bigreqstr.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 bigreqstr.h diff --git a/bigreqstr.h b/bigreqstr.h new file mode 100644 index 0000000..ab09882 --- /dev/null +++ b/bigreqstr.h @@ -0,0 +1,63 @@ +/* $Xorg: bigreqstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ +/* + +Copyright 1992, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#define X_BigReqEnable 0 + +#define XBigReqNumberEvents 0 + +#define XBigReqNumberErrors 0 + +#define XBigReqExtensionName "BIG-REQUESTS" + +typedef struct { + CARD8 reqType; /* always XBigReqCode */ + CARD8 brReqType; /* always X_BigReqEnable */ + CARD16 length B16; +} 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; +} xBigReqEnableReply; +#define sz_xBigReqEnableReply 32 + + +typedef struct { + CARD8 reqType; + CARD8 data; + CARD16 zero B16; + CARD32 length B32; +} xBigReq; -- cgit v1.2.3 -- cgit v1.2.3 From ba70ef76128f24cd2a78ea6aa7ac496dad76cb71 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:02 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- bigreqstr.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bigreqstr.h b/bigreqstr.h index ab09882..81dd2e6 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -24,6 +24,10 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ + +#ifndef _BIGREQSTR_H_ +#define _BIGREQSTR_H_ #define X_BigReqEnable 0 @@ -61,3 +65,5 @@ typedef struct { CARD16 zero B16; CARD32 length B32; } xBigReq; + +#endif /* _BIGREQSTR_H_ */ -- cgit v1.2.3 From 94e21f55a8c7d410694672af054ea32890ef33e9 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 09:22:28 +0000 Subject: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 --- bigreqstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigreqstr.h b/bigreqstr.h index 81dd2e6..fc31eb8 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -24,7 +24,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. */ -/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86$ */ #ifndef _BIGREQSTR_H_ #define _BIGREQSTR_H_ -- cgit v1.2.3 From a1b848a3408aa1eac5be57b6f92dfeb4d037a141 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 26 Feb 2004 13:35:11 +0000 Subject: readding XFree86's cvs IDs --- bigreqstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigreqstr.h b/bigreqstr.h index fc31eb8..81dd2e6 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -24,7 +24,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. */ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ #ifndef _BIGREQSTR_H_ #define _BIGREQSTR_H_ -- cgit v1.2.3 From 44275021333dbd3c9fefabdae1f32f200179fa2e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 3 Mar 2004 12:10:54 +0000 Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 --- bigreqstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigreqstr.h b/bigreqstr.h index 81dd2e6..fc31eb8 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -24,7 +24,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. */ -/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86$ */ #ifndef _BIGREQSTR_H_ #define _BIGREQSTR_H_ -- cgit v1.2.3 From 1488710946b114406f05ef31a787fa80ec6a7c32 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:31:36 +0000 Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- bigreqstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigreqstr.h b/bigreqstr.h index fc31eb8..81dd2e6 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -24,7 +24,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. */ -/* $XFree86$ */ +/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ #ifndef _BIGREQSTR_H_ #define _BIGREQSTR_H_ -- cgit v1.2.3 From 15f8c805114c55274de8c76e98af06b8cfbc5bf6 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 18:43:06 +0000 Subject: Merging XORG-CURRENT into trunk --- bigreqstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigreqstr.h b/bigreqstr.h index 81dd2e6..fc31eb8 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -24,7 +24,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. */ -/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86$ */ #ifndef _BIGREQSTR_H_ #define _BIGREQSTR_H_ -- cgit v1.2.3 From 6629d05366b6d375397be21fd35ae28dd7da5d3d Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 6 May 2005 01:46:29 +0000 Subject: Initial build system files for proto module. --- Makefile.am | 8 ++++++++ autogen.sh | 12 ++++++++++++ bigreqsext.pc.in | 9 +++++++++ configure.ac | 6 ++++++ 4 files changed, 35 insertions(+) create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 bigreqsext.pc.in create mode 100644 configure.ac diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..8705e9a --- /dev/null +++ b/Makefile.am @@ -0,0 +1,8 @@ +bigreqsdir = $(includedir)/X11/extensions +bigreqs_HEADERS = \ + bigreqstr.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = bigreqsext.pc + +EXTRA_DIST = autogen.sh bigreqsext.pc.in diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/bigreqsext.pc.in b/bigreqsext.pc.in new file mode 100644 index 0000000..e7d01dd --- /dev/null +++ b/bigreqsext.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: BigReqsExt +Description: BigReqs extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..01ee2ae --- /dev/null +++ b/configure.ac @@ -0,0 +1,6 @@ +AC_PREREQ([2.57]) +AC_INIT([BigReqsExt], [7.0], [xorg@lists.freedesktop.org]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +AC_OUTPUT([Makefile + bigreqsext.pc]) -- cgit v1.2.3 From 7a08cc923ec903837ed23c2045b8227600fe3343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 9 May 2005 18:20:03 +0000 Subject: Change all the protonames from Ext to Proto. --- Makefile.am | 4 ++-- bigreqsext.pc.in | 9 --------- bigreqsproto.pc.in | 9 +++++++++ configure.ac | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 bigreqsext.pc.in create mode 100644 bigreqsproto.pc.in diff --git a/Makefile.am b/Makefile.am index 8705e9a..c070e05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,6 @@ bigreqs_HEADERS = \ bigreqstr.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = bigreqsext.pc +pkgconfig_DATA = bigreqsproto.pc -EXTRA_DIST = autogen.sh bigreqsext.pc.in +EXTRA_DIST = autogen.sh bigreqsproto.pc.in diff --git a/bigreqsext.pc.in b/bigreqsext.pc.in deleted file mode 100644 index e7d01dd..0000000 --- a/bigreqsext.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: BigReqsExt -Description: BigReqs extension headers -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} diff --git a/bigreqsproto.pc.in b/bigreqsproto.pc.in new file mode 100644 index 0000000..e3adbfd --- /dev/null +++ b/bigreqsproto.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: BigReqsProto +Description: BigReqs extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac index 01ee2ae..851da63 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) -AC_INIT([BigReqsExt], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([BigReqsProto], [7.0], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile - bigreqsext.pc]) + bigreqsproto.pc]) -- cgit v1.2.3 From ae7cf77b7a5261cc97a07deeaf1cce05895a27ed Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 14 May 2005 07:55:09 +0000 Subject: Add some COPYING files. --- COPYING | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..142f2fa --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +Copyright 1992, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. -- cgit v1.2.3 From 2ed368b8b8fdc31712f5456ae27a66a4dc53d5ed Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:10:12 +0000 Subject: Require automake 1.7 in AM_INIT_AUTOMAKE --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 851da63..0d9acf6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([BigReqsProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) AC_OUTPUT([Makefile bigreqsproto.pc]) -- cgit v1.2.3 From c009d17f803b8af11145803d3abf2433d1c87d55 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 19 May 2005 00:22:38 +0000 Subject: revert last change, didn't do right thing at all, sorry for the noise --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0d9acf6..851da63 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.57]) AC_INIT([BigReqsProto], [7.0], [xorg@lists.freedesktop.org]) -AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile bigreqsproto.pc]) -- cgit v1.2.3 From 41700c770a1687d1acab5531eee81ff251948f99 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sat, 21 May 2005 03:46:57 +0000 Subject: Change version to 1.0. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 851da63..153ab45 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([BigReqsProto], [7.0], [xorg@lists.freedesktop.org]) +AC_INIT([BigReqsProto], [1.0], [xorg@lists.freedesktop.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_OUTPUT([Makefile -- cgit v1.2.3 From 58a1b1e0b98d1902b9214a4a425e0e90cdbbbce2 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 29 Jul 2005 21:22:54 +0000 Subject: Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 153ab45..20f0e85 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ([2.57]) -AC_INIT([BigReqsProto], [1.0], [xorg@lists.freedesktop.org]) +AC_INIT([BigReqsProto], [1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - + +XORG_RELEASE_VERSION + AC_OUTPUT([Makefile bigreqsproto.pc]) -- cgit v1.2.3 From cc15ee9aeb69aff196a2fd3651aeb88261062066 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 2 Aug 2005 19:19:37 +0000 Subject: Add basic .cvsignore files for proto modules. --- .cvsignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..b10eb37 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +bigreqsproto.pc -- cgit v1.2.3 From 6242a2e0b2d8c9fb6e01a96a2029eb880d270f5e Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Wed, 19 Oct 2005 02:48:13 +0000 Subject: Update package version number for RC1 release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 20f0e85..13dcbfb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([BigReqsProto], [1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([BigReqsProto], [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From 4c9ed5d885a39fa78e3789c4e7b2465b78d6221a Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Thu, 15 Dec 2005 00:24:36 +0000 Subject: Update package version number for final X11R7 release candidate. --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..c722b51 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,4 @@ +2005-12-14 Kevin E. Martin + + * configure.ac: + Update package version number for final X11R7 release candidate. diff --git a/configure.ac b/configure.ac index 13dcbfb..902ce6c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([BigReqsProto], [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([BigReqsProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION -- cgit v1.2.3 From f48a0bfa3378127acd37131fe2e0b95930ff7508 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 14 Jul 2006 18:56:07 -0700 Subject: renamed: .cvsignore -> .gitignore --- .cvsignore | 10 ---------- .gitignore | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index b10eb37..0000000 --- a/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.log -config.status -configure -install-sh -missing -bigreqsproto.pc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b10eb37 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +bigreqsproto.pc -- cgit v1.2.3 From e8c0c8be01746b4306d4b791540c0ad4f852be13 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 3 Sep 2007 05:53:59 -0400 Subject: Add *~ to .gitignore to skip patch/emacs droppings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b10eb37..6aa5b98 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing bigreqsproto.pc +*~ -- cgit v1.2.3 From 403cbefd6af734884c4254666134ce6b01574efe Mon Sep 17 00:00:00 2001 From: James Cloos Date: Thu, 6 Dec 2007 16:38:56 -0500 Subject: Replace static ChangeLog with dist-hook to generate from git log --- ChangeLog | 4 ---- Makefile.am | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index c070e05..2417840 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,3 +6,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bigreqsproto.pc EXTRA_DIST = autogen.sh bigreqsproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog -- cgit v1.2.3 From ca477537b1f7807539e928bb1230098d963558f8 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 27 Jan 2009 20:06:27 -0200 Subject: Janitor: Correct make distcheck and dont distribute autogen.sh --- .gitignore | 3 +++ Makefile.am | 4 ++-- configure.ac | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6aa5b98..1b7309b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing bigreqsproto.pc *~ +bigreqsproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 2417840..ea2ce67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ bigreqs_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bigreqsproto.pc -EXTRA_DIST = autogen.sh bigreqsproto.pc.in +EXTRA_DIST = bigreqsproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -13,6 +13,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 902ce6c..ccf57d5 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([BigReqsProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile bigreqsproto.pc]) -- cgit v1.2.3 From 222389bd9daa750b4ea79dd9085dc66c5f914496 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 25 Aug 2009 15:12:36 +1000 Subject: Remove RCS tags. --- bigreqstr.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/bigreqstr.h b/bigreqstr.h index fc31eb8..bbbc10d 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -1,4 +1,3 @@ -/* $Xorg: bigreqstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ #ifndef _BIGREQSTR_H_ #define _BIGREQSTR_H_ -- cgit v1.2.3 From 04e6f43c2645419569325919b7c6e69e8d5244dd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 25 Aug 2009 15:23:39 +1000 Subject: Move bigreqstr.h to bigreqsproto.h. Leave a stub for bigreqstr.h to warn potential users. Signed-off-by: Peter Hutterer --- Makefile.am | 1 + bigreqsproto.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ bigreqstr.h | 70 +++------------------------------------------------------- 3 files changed, 71 insertions(+), 67 deletions(-) create mode 100644 bigreqsproto.h diff --git a/Makefile.am b/Makefile.am index ea2ce67..d748fcb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ bigreqsdir = $(includedir)/X11/extensions bigreqs_HEADERS = \ + bigreqsproto.h \ bigreqstr.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/bigreqsproto.h b/bigreqsproto.h new file mode 100644 index 0000000..bd0f8e5 --- /dev/null +++ b/bigreqsproto.h @@ -0,0 +1,67 @@ +/* + +Copyright 1992, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +#ifndef _BIGREQSPROTO_H_ +#define _BIGREQSPROTO_H_ + +#define X_BigReqEnable 0 + +#define XBigReqNumberEvents 0 + +#define XBigReqNumberErrors 0 + +#define XBigReqExtensionName "BIG-REQUESTS" + +typedef struct { + CARD8 reqType; /* always XBigReqCode */ + CARD8 brReqType; /* always X_BigReqEnable */ + CARD16 length B16; +} 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; +} xBigReqEnableReply; +#define sz_xBigReqEnableReply 32 + + +typedef struct { + CARD8 reqType; + CARD8 data; + CARD16 zero B16; + CARD32 length B32; +} xBigReq; + +#endif /* _BIGREQSPROTO_H_ */ diff --git a/bigreqstr.h b/bigreqstr.h index bbbc10d..0a023db 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -1,67 +1,3 @@ -/* - -Copyright 1992, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ - -#ifndef _BIGREQSTR_H_ -#define _BIGREQSTR_H_ - -#define X_BigReqEnable 0 - -#define XBigReqNumberEvents 0 - -#define XBigReqNumberErrors 0 - -#define XBigReqExtensionName "BIG-REQUESTS" - -typedef struct { - CARD8 reqType; /* always XBigReqCode */ - CARD8 brReqType; /* always X_BigReqEnable */ - CARD16 length B16; -} 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; -} xBigReqEnableReply; -#define sz_xBigReqEnableReply 32 - - -typedef struct { - CARD8 reqType; - CARD8 data; - CARD16 zero B16; - CARD32 length B32; -} xBigReq; - -#endif /* _BIGREQSTR_H_ */ +#warning "bigreqstr.h is obsolete and may be removed in the future." +#warning "include for the protocol defines." +#include -- cgit v1.2.3 From e19e245ff8e5ddedbcc5853786ca55b56f8ab40c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 11 Aug 2009 10:28:21 +1000 Subject: bigreqsproto 1.1.0 Signed-off-by: Peter Hutterer --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ccf57d5..8ecc229 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([BigReqsProto], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([BigReqsProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG -- cgit v1.2.3 From c242da1467928c1e43b2ae0b12876aa4487aac23 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 14 Nov 2009 18:26:46 -0500 Subject: .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. --- .gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1b7309b..9edb463 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,78 @@ -Makefile -Makefile.in +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno +config.sub configure +configure.scan +depcomp +.deps/ +INSTALL install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -bigreqsproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -bigreqsproto-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for bigreqsproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- cgit v1.2.3 From fb8a4e291007c3cc25f3dda7a9e69bb6f1a8cc15 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 13:55:24 -0500 Subject: configure.ac: AM_MAINTAINER_MODE missing #24238 This turns off maintainer mode build rules in tarballs. Works in conjunction with autogen.sh --enable-maintainer-mode --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 8ecc229..2bcc715 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([BigReqsProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require xorg-macros: XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -- cgit v1.2.3 From 07c29532215f8a210aa871fde3c8f5907f325ca2 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:11:36 -0500 Subject: configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2bcc715..fe9f1b5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,11 @@ AC_INIT([BigReqsProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?pro AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile bigreqsproto.pc]) -- cgit v1.2.3 From 862e353a49eaa17dd60882b5941d4beff969860c Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 18:31:28 -0500 Subject: Makefile.am: INSTALL file is missing or incorrect #24206 The standard GNU file on building/installing tarball is copied using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS Add INSTALL target --- Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d748fcb..1a9415e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,9 +11,12 @@ EXTRA_DIST = bigreqsproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL -- cgit v1.2.3 From 104cb17755f7529a8f4410abad84398c0a4fd839 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 15 Nov 2009 19:45:26 -0500 Subject: Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1a9415e..fc8e90c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,6 @@ pkgconfig_DATA = bigreqsproto.pc EXTRA_DIST = bigreqsproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From c3e90c94335ee9f835ec2546782547f0aaa46934 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 16 Nov 2009 11:13:29 -0500 Subject: README: file created or updated #24206 Contains a set of URLs to freedesktop.org. --- README | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..f8b14de --- /dev/null +++ b/README @@ -0,0 +1,30 @@ + Big Requests Extension + +This extension defines a protocol to enable the use of requests +that exceed 262140 bytes in length. + +Extension name: BIG-REQUESTS + +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/bigreqsproto + + http://cgit.freedesktop.org/xorg/proto/bigreqsproto + +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 + -- cgit v1.2.3 From 1c9119c86437a58df4890b5ebf79bfdab40f0997 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 22 Nov 2009 19:24:47 -0500 Subject: Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index fc8e90c..6bd4bde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ pkgconfig_DATA = bigreqsproto.pc EXTRA_DIST = bigreqsproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: -- cgit v1.2.3 From b77888df9f01a9332d3cd15c413e5caa7fa18d80 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:00:30 -0400 Subject: config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6bd4bde..45960ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ bigreqs_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bigreqsproto.pc -EXTRA_DIST = bigreqsproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL -- cgit v1.2.3 From 18e93e57afeed6ea9872e7aab90da47f334690e1 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 28 Mar 2010 19:25:52 -0400 Subject: 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 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fe9f1b5..9c1cf55 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([BigReqsProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 3145dbb0c713a24e58f642a2acdafb5b1f63d948 Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Mon, 28 Jun 2010 08:09:05 -0400 Subject: specs: convert bigreq.ms from xorg-docs module to DocBook XML Signed-off-by: Gaetan Nadon --- Makefile.am | 2 + configure.ac | 11 +- specs/.gitignore | 6 + specs/Makefile.am | 64 +++++++++++ specs/bigreq.xml | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 402 insertions(+), 3 deletions(-) create mode 100644 specs/.gitignore create mode 100644 specs/Makefile.am create mode 100644 specs/bigreq.xml diff --git a/Makefile.am b/Makefile.am index 45960ba..d39cc1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=specs + bigreqsdir = $(includedir)/X11/extensions bigreqs_HEADERS = \ bigreqsproto.h \ diff --git a/configure.ac b/configure.ac index 9c1cf55..72faf98 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,16 @@ AC_INIT([BigReqsProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?pro 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 bigreqsproto.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..c1819a7 --- /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 = bigreq.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/bigreq.xml b/specs/bigreq.xml new file mode 100644 index 0000000..6ca4c23 --- /dev/null +++ b/specs/bigreq.xml @@ -0,0 +1,322 @@ + + + + + + + + Big Requests Extension + X Consortium Standard + X Version 11, Release 6.4 + + + BobScheifler + + + X Consortium Standard + 1993X Consortium + 1994X Consortium + Version 2.0 + X Consortium + X Version 11, Release 7 + + +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: + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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. + +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. + +X Window System is a trademark of The Open Group. + + + + + +Overview + +This extension enables the use of protocol requests that exceed 262140 bytes in length. + +The core protocol restricts the maximum length of a protocol request to 262140 bytes, in that it uses a 16-bit length field specifying the number of 4-byte units in the request. This is a problem in the core protocol when joining large numbers of lines (PolyLine) or arcs (PolyArc), since these requests cannot be broken up into smaller requests without disturbing the rendering of the join points. It is also much more of a problem for protocol extensions, such as the PEX extension for 3D graphics and the XIE extension for imaging, that need to send long data lists in output commands. + +This extension defines a mechanism for extending the length field beyond 16 bits. If the normal 16-bit length field of the protocol request is zero, then an additional 32-bit field containing the actual length (in 4-byte units) is inserted into the request, immediately following the 16-bit length field. + +For example, a normal PolyLine encoding is: + + + + + + + + + + PolyLine + + + + + 1 + 65 + + opcode + + + 1 + + + coordinate-mode + + + + 0 + Origin + + + + + 1 + Previous + + + + 2 + 3+n + + + + + 4 + DRAWABLE + + drawable + + + 4 + GCONTEXT + + gc + + + 4n + LISTofPOINT + + points + + + + + +An extended-length PolyLine encoding is: + + + + + + + + + + PolyLine + + + + + 1 + 65 + + opcode + + + 1 + + + coordinate-mode + + + + 0 + Origin + + + + + 1 + Previous + + + + 2 + 0 + + extended length flag + + + 4 + 4+n + + request length + + + 4 + DRAWABLE + + drawable + + + 4 + GCONTEXT + + gc + + + 4n + LISTofPOINT + + points + + + + + +Extended-length protocol encodings, once enabled, can be used on all protocol requests, including all extensions. + + + +Requests + +BigReqEnable + + => + +maximum-request-length: CARD32 + +This request enables extended-length protocol requests for the requesting client. It also returns the maximum length of a request, in 4-byte units, that can be used in extended-length protocol requests. This value will always be greater than the maximum-request-length returned in the connection setup information. + + + +Events and Errors + +No new events or errors are defined by this extension. + + + +Encoding + +Please refer to the X11 Protocol Encoding document as this document uses conventions established there. + +The name of this extension is “BIG-REQUESTS”. + + + + + + + + + BigReqEnable + + + + + 1 + Card8 + opcode + + + 1 + 0 + bigreq opcode + + + 2 + 1 + request length + + + + + + + + + + + + + => + + + + + 1 + 1 + Reply + + + 1 + + unused + + + 2 + CARD16 + sequence number + + + 4 + 0 + length + + + 4 + CARD32 + maximum-request-length + + + 2 + 0 + unused + + + + + + + + +C language binding + +It is desirable for core Xlib, and other extensions, to use this extension internally when necessary. It is also desirable to make the use of this extension as transparent as possible to the X client. For example, if enabling of the extension were delayed until the first time it was needed, an application that used XNextRequest to determine the sequence number of a request would no longer get the correct sequence number. As such, XOpenDisplay will determine if the extension is supported by the server and, if it is, enable extended-length encodings. + +The core Xlib functions XDrawLines XDrawArcs XFillPolygon XChangeProperty XSetClipRectangles and XSetRegion are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions (XDrawPoints, XDrawRectangles XDrawSegments XFillArcs XFillRectangles XPutImage is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead. + +To permit clients to know what the maximum-request-length for extended-length encodings is, the following function is added to Xlib: + +long + +XExtendedMaxRequestSize (display) + +Display *display; + + + + long XExtendedMaxRequestSize + Display *display + + + +Returns zero (0) if the specified display does not support this extension, otherwise returns the maximum-request-length (in 4-byte units) supported by the server through the extended-length encoding. + + + +Acknowledgements + +Clive Feather (IXI) originated the extended-length encoding used in this extension proposal. + + -- cgit v1.2.3 From f7f5f73576dbfeba63be400d16ec9e815962fea7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 29 Oct 2010 20:19:29 -0700 Subject: Cleanup bigreq.xml a bit Signed-off-by: Alan Coopersmith --- specs/bigreq.xml | 233 ++++++++++++++++++++++++++----------------------------- 1 file changed, 111 insertions(+), 122 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 6ca4c23..5655bab 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -15,8 +15,8 @@ X Consortium Standard - 1993X Consortium - 1994X Consortium + 19931994 + X Consortium Version 2.0 X Consortium X Version 11, Release 7 @@ -24,8 +24,6 @@ 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: -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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. @@ -48,65 +46,65 @@ For example, a normal PolyLine encoding is: - - + + - PolyLine + PolyLine - 1 - 65 - - opcode + 1 + 65 + + opcode - 1 - - - coordinate-mode + 1 + + + coordinate-mode - - 0 - Origin - + + 0 + Origin + - - 1 - Previous - + + 1 + Previous + - 2 - 3+n - - + 2 + 3+n + + - 4 - DRAWABLE - - drawable + 4 + DRAWABLE + + drawable - 4 - GCONTEXT - - gc + 4 + GCONTEXT + + gc - 4n - LISTofPOINT - - points + 4n + LISTofPOINT + + points @@ -114,71 +112,71 @@ An extended-length PolyLine encoding is: - - + + - PolyLine + PolyLine - 1 - 65 - - opcode + 1 + 65 + + opcode - 1 - - - coordinate-mode + 1 + + + coordinate-mode - - 0 - Origin - + + 0 + Origin + - - 1 - Previous - + + 1 + Previous + - 2 - 0 - - extended length flag + 2 + 0 + + extended length flag - 4 - 4+n - - request length + 4 + 4+n + + request length - 4 - DRAWABLE - - drawable + 4 + DRAWABLE + + drawable - 4 - GCONTEXT - - gc + 4 + GCONTEXT + + gc - 4n - LISTofPOINT - - points + 4n + LISTofPOINT + + points @@ -212,76 +210,73 @@ The name of this extension is “BIG-REQUESTS”. - - + + - BigReqEnable + BigReqEnable - 1 - Card8 - opcode + 1 + Card8 + opcode - 1 - 0 - bigreq opcode + 1 + 0 + bigreq opcode - 2 - 1 - request length + 2 + 1 + request length - - - - + - => + => - 1 - 1 - Reply + 1 + 1 + Reply - 1 - - unused + 1 + + unused - 2 - CARD16 - sequence number + 2 + CARD16 + sequence number - 4 - 0 - length + 4 + 0 + length - 4 - CARD32 - maximum-request-length + 4 + CARD32 + maximum-request-length - 2 - 0 - unused + 2 + 0 + unused @@ -294,16 +289,10 @@ It is desirable for core Xlib, and other extensions, to use this extension internally when necessary. It is also desirable to make the use of this extension as transparent as possible to the X client. For example, if enabling of the extension were delayed until the first time it was needed, an application that used XNextRequest to determine the sequence number of a request would no longer get the correct sequence number. As such, XOpenDisplay will determine if the extension is supported by the server and, if it is, enable extended-length encodings. -The core Xlib functions XDrawLines XDrawArcs XFillPolygon XChangeProperty XSetClipRectangles and XSetRegion are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions (XDrawPoints, XDrawRectangles XDrawSegments XFillArcs XFillRectangles XPutImage is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead. +The core Xlib functions XDrawLines, XDrawArcs, XFillPolygon, XChangeProperty, XSetClipRectangles, and XSetRegion are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions (XDrawPoints, XDrawRectangles, XDrawSegments. XFillArcs, XFillRectangles, XPutImage is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead. -To permit clients to know what the maximum-request-length for extended-length encodings is, the following function is added to Xlib: +To permit clients to know what the maximum-request-length for extended-length encodings is, the following function is added to Xlib: -long - -XExtendedMaxRequestSize (display) - -Display *display; - long XExtendedMaxRequestSize @@ -311,7 +300,7 @@ Display *display; -Returns zero (0) if the specified display does not support this extension, otherwise returns the maximum-request-length (in 4-byte units) supported by the server through the extended-length encoding. +Returns zero (0) if the specified display does not support this extension, otherwise returns the maximum-request-length (in 4-byte units) supported by the server through the extended-length encoding. -- cgit v1.2.3 From 59730aba859c0b586b7e63e79c07b7741719845d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 29 Oct 2010 20:21:07 -0700 Subject: bigreqsproto 1.1.1 Signed-off-by: Alan Coopersmith --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 72faf98..2a0765f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([BigReqsProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([BigReqsProto], [1.1.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 0c63dfb7abac7648638384cd1807e36c27ff6d0e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 9 Nov 2010 15:19:09 -0500 Subject: config: HTML file generation: use the installed copy of xorg.css Currenlty the xorg.css file is copied in each location where a DocBook/XML file resides. This produces about 70 copies in the $(docdir) install tree. Signed-off-by: Gaetan Nadon --- specs/.gitignore | 2 -- specs/Makefile.am | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/specs/.gitignore b/specs/.gitignore index 12fe512..6fa5c31 100644 --- a/specs/.gitignore +++ b/specs/.gitignore @@ -1,6 +1,4 @@ -# Add & Override for this directory and it's subdirectories *.html *.ps *.pdf *.txt -*.css diff --git a/specs/Makefile.am b/specs/Makefile.am index c1819a7..8afe66e 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -37,11 +37,8 @@ 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 $@ +XMLTO_FLAGS = -m $(XSL_STYLESHEET) \ + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css endif CLEANFILES = $(doc_DATA) -- cgit v1.2.3 From d9ee7b60c2b677323cf71ebb203a73d1aaf3f528 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 16 Dec 2010 13:36:00 -0200 Subject: Use docbookx.dtd version 4.3 for all docs Signed-off-by: Paulo Zanoni Signed-off-by: Alan Coopersmith --- specs/bigreq.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 5655bab..6eb6bf1 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3 From 872a6cb826f1d21c841d7df4b59a5fb993342353 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Thu, 24 Feb 2011 20:37:00 -0500 Subject: Docbook: change the book id to match the xml file basename This is required for the up-coming external references support. Signed-off-by: Gaetan Nadon --- specs/bigreq.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 6eb6bf1..c5b08b2 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> - + Big Requests Extension -- cgit v1.2.3 From 20537dba79058f09d3dc9cfafb6114f2c77f1e83 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 27 Feb 2011 15:06:18 -0500 Subject: Documentation: add Docbook external references support When writing technical documentation, it is often necessary to cross reference to other information. When that other information is not in the current document, additional support is needed, namely . A new feature with version 1.7 of xorg-sgml-doctools adds references to other documents within or outside this package. This patch adds technical support for this feature but does not change the content of the documentation as seen by the end user. Each book or article must generate a database containing the href of sections that can be referred to from another document. This database is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that the value of DATAROOTDIR for xorg-sgml-doctools and for the package documentation is the same. This forms a virtual document tree. This database is consulted by other documents while they are being generated in order to fulfill the missing information for linking. Refer to the xorg-sgml-doctools for further technical information. Co-authored-by: Matt Dew Signed-off-by: Gaetan Nadon --- configure.ac | 11 ++++--- docbook.am | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ specs/.gitignore | 1 + specs/Makefile.am | 58 ++++----------------------------- 4 files changed, 108 insertions(+), 57 deletions(-) create mode 100644 docbook.am diff --git a/configure.ac b/configure.ac index 2a0765f..85e86b3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,15 +4,16 @@ AC_INIT([BigReqsProto], [1.1.1], AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.7) AC_OUTPUT([Makefile specs/Makefile diff --git a/docbook.am b/docbook.am new file mode 100644 index 0000000..3cf21e8 --- /dev/null +++ b/docbook.am @@ -0,0 +1,95 @@ +# +# 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) + +# +# Generate DocBook/XML output formats with or without stylesheets +# + +# Stylesheets are available if the package xorg-sgml-doctools is installed +if HAVE_STYLESHEETS + +# The location where all cross reference databases are installed +sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs +masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml" +XMLTO_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --stringparam target.database.document=$(masterdb) \ + --stringparam current.docid="$(<:.xml=)" \ + --stringparam collect.xref.targets="no" + +XMLTO_XHTML_FLAGS = \ + -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \ + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css + +XMLTO_FO_FLAGS = \ + -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +endif HAVE_STYLESHEETS + +shelf_DATA += $(docbook:.xml=.html) +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< + +if HAVE_FOP +shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $< +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP + +if HAVE_XMLTO_TEXT +shelf_DATA += $(docbook:.xml=.txt) +%.txt: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $< +endif HAVE_XMLTO_TEXT + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed +if HAVE_STYLESHEETS +if HAVE_XSLTPROC + +# DocBook/XML generated document cross-reference database +sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) + +# Generate DocBook/XML document cross-reference database +# Flags for the XSL Transformation processor generating xref target databases +XSLTPROC_FLAGS = \ + --path "$(XORG_SGML_PATH)/X11" \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --nonet --xinclude + +%.html.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ + http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< + +%.fo.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ + http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< + +endif HAVE_XSLTPROC +endif HAVE_STYLESHEETS + +CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) diff --git a/specs/.gitignore b/specs/.gitignore index 6fa5c31..92946c9 100644 --- a/specs/.gitignore +++ b/specs/.gitignore @@ -2,3 +2,4 @@ *.ps *.pdf *.txt +*.db diff --git a/specs/Makefile.am b/specs/Makefile.am index 8afe66e..63b20ae 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -1,61 +1,15 @@ -# -# 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 = bigreq.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) \ - --stringparam html.stylesheet=$(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 $< +# Main DocBook/XML files (DOCTYPE book) +docbook = bigreq.xml -.xml.pdf: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -.xml.ps: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif HAVE_XMLTO endif ENABLE_SPECS -- cgit v1.2.3 From f107d40a9e91e0cd06635c29a51633339f0f7465 Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Sun, 22 May 2011 19:34:50 -0600 Subject: Add olinks to functions decribed in libX11 documentation. This patch is used with the libX11 patch. It turns the functions listed in this doc into hyperlinks to the declarations that are in libX11 documentation. Signed-off-by: Matt Dew Reviewed-by: Gaetan Nadon --- specs/bigreq.xml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index c5b08b2..31281cb 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -287,9 +287,27 @@ C language binding -It is desirable for core Xlib, and other extensions, to use this extension internally when necessary. It is also desirable to make the use of this extension as transparent as possible to the X client. For example, if enabling of the extension were delayed until the first time it was needed, an application that used XNextRequest to determine the sequence number of a request would no longer get the correct sequence number. As such, XOpenDisplay will determine if the extension is supported by the server and, if it is, enable extended-length encodings. - -The core Xlib functions XDrawLines, XDrawArcs, XFillPolygon, XChangeProperty, XSetClipRectangles, and XSetRegion are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions (XDrawPoints, XDrawRectangles, XDrawSegments. XFillArcs, XFillRectangles, XPutImage is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead. +It is desirable for core Xlib, and other extensions, to use this extension internally when necessary. It is also desirable to make the use of this extension as transparent as possible to the X client. For example, if enabling of the extension were delayed until the first time it was needed, an application that used +XNextRequest +to determine the sequence number of a request would no longer get the correct sequence number. As such, +XOpenDisplay +will determine if the extension is supported by the server and, if it is, enable extended-length encodings. + +The core Xlib functions +XDrawLines, +XDrawArcs, +XFillPolygon, +XChangeProperty, +XSetClipRectangles, and +XSetRegion. +are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions +(XDrawPoints, +XDrawRectangles, +XDrawSegments. +XFillArcs, +XFillRectangles, +XPutImage +is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead. To permit clients to know what the maximum-request-length for extended-length encodings is, the following function is added to Xlib: -- cgit v1.2.3 From f92b5feb06129abb6a7a1eb86504bcb584f94320 Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Wed, 25 May 2011 22:00:07 -0600 Subject: Add id attribute to funcsynopsis to allow other docs to olink Signed-off-by: Matt Dew Reviewed-by: Alan Coopersmith Reviewed-by: Gaetan Nadon --- specs/bigreq.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 31281cb..2611dac 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -311,7 +311,7 @@ is permitted but not required; an Xlib implementation may choose to split the da To permit clients to know what the maximum-request-length for extended-length encodings is, the following function is added to Xlib: - + long XExtendedMaxRequestSize Display *display -- cgit v1.2.3 From 301dd63364857bc1547f1beb58c787bfdf11e19b Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 5 Jun 2011 16:27:37 -0400 Subject: 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 --- configure.ac | 2 +- docbook.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 85e86b3..22a6941 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ XORG_ENABLE_SPECS XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP XORG_WITH_XSLTPROC -XORG_CHECK_SGML_DOCTOOLS(1.7) +XORG_CHECK_SGML_DOCTOOLS(1.8) AC_OUTPUT([Makefile specs/Makefile diff --git a/docbook.am b/docbook.am index 3cf21e8..5864c9e 100644 --- a/docbook.am +++ b/docbook.am @@ -71,7 +71,7 @@ if HAVE_STYLESHEETS if HAVE_XSLTPROC # DocBook/XML generated document cross-reference database -sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @@ -92,4 +92,4 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +CLEANFILES = $(shelf_DATA) -- cgit v1.2.3 From d5028b4fd5d4541378fd0523f013a5e3cf1c6414 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 12 Jun 2011 17:54:50 -0400 Subject: Install xml versions of specs even if HAVE_XMLTO is false DocBook/XML input source is also a usefull output format that can be viewed with an XML viewer or editor and by some O/S help system. Signed-off-by: Gaetan Nadon --- docbook.am | 2 ++ specs/Makefile.am | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docbook.am b/docbook.am index 5864c9e..2ffb7e6 100644 --- a/docbook.am +++ b/docbook.am @@ -20,6 +20,7 @@ shelf_DATA = # DocBook/XML file with chapters, appendix and images it includes dist_shelf_DATA = $(docbook) $(chapters) +if HAVE_XMLTO # # Generate DocBook/XML output formats with or without stylesheets # @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS +endif HAVE_XMLTO CLEANFILES = $(shelf_DATA) diff --git a/specs/Makefile.am b/specs/Makefile.am index 63b20ae..5917b8f 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = bigreq.xml @@ -11,5 +10,4 @@ shelfdir = $(docdir) # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS -- cgit v1.2.3 From 2e7dba38d2795735d6cbca4b6a799a2050e64313 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 7 Sep 2011 10:31:04 -0400 Subject: 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 --- docbook.am | 114 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/docbook.am b/docbook.am index 2ffb7e6..9377f5b 100644 --- a/docbook.am +++ b/docbook.am @@ -21,74 +21,84 @@ shelf_DATA = dist_shelf_DATA = $(docbook) $(chapters) if HAVE_XMLTO -# -# Generate DocBook/XML output formats with or without stylesheets -# - -# Stylesheets are available if the package xorg-sgml-doctools is installed if HAVE_STYLESHEETS -# The location where all cross reference databases are installed -sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs -masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml" -XMLTO_FLAGS = \ - --searchpath "$(XORG_SGML_PATH)/X11" \ - --stringparam target.database.document=$(masterdb) \ - --stringparam current.docid="$(<:.xml=)" \ - --stringparam collect.xref.targets="no" - -XMLTO_XHTML_FLAGS = \ - -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css - -XMLTO_FO_FLAGS = \ - -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -endif 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_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css +XMLTO_HTML_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_HTML_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_OLINK_FLAGS) shelf_DATA += $(docbook:.xml=.html) -%.html: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< - -if HAVE_FOP -shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -%.pdf: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $< -%.ps: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $< -endif HAVE_FOP +%.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_FLAGS) $(XMLTO_XHTML_FLAGS) txt $< + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< endif HAVE_XMLTO_TEXT -# -# Generate documents cross-reference target databases -# +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 $< -# This is only possible if the xorg-sgml-doctools package is installed -if HAVE_STYLESHEETS -if HAVE_XSLTPROC +shelf_DATA += $(docbook:.xml=.ps) +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP -# DocBook/XML generated document cross-reference database -shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +# Generate documents cross-reference target databases +if HAVE_XSLTPROC -# Generate DocBook/XML document cross-reference database -# Flags for the XSL Transformation processor generating xref target databases -XSLTPROC_FLAGS = \ +XSLT_SEARCHPATH_FLAGS = \ --path "$(XORG_SGML_PATH)/X11" \ - --stringparam targets.filename "$@" \ - --stringparam collect.xref.targets "only" \ - --nonet --xinclude - + --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) $(XSLTPROC_FLAGS) \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< + $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< -%.fo.db: %.xml $(chapters) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ - http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< +shelf_DATA += $(docbook:.xml=.pdf.db) +%.pdf.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< endif HAVE_XSLTPROC endif HAVE_STYLESHEETS -- cgit v1.2.3 From 5306b4b7f3254a8ba3d24be86a8dd53b3d0699a1 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Thu, 8 Sep 2011 20:00:00 -0400 Subject: 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 --- docbook.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/docbook.am b/docbook.am index 9377f5b..bba4d54 100644 --- a/docbook.am +++ b/docbook.am @@ -30,11 +30,9 @@ 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_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css XMLTO_HTML_FLAGS = \ $(XMLTO_SEARCHPATH_FLAGS) \ $(XMLTO_HTML_STYLESHEET_FLAGS) \ - $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \ $(XMLTO_HTML_OLINK_FLAGS) shelf_DATA += $(docbook:.xml=.html) -- cgit v1.2.3 From 6540a8ea44213746d76d07c94444e937a791c1ff Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 11 Sep 2011 19:49:54 -0400 Subject: docs: remove 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 --- specs/bigreq.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 2611dac..bf8614a 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -19,7 +19,6 @@ X Consortium Version 2.0 X Consortium - X Version 11, Release 7 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: -- cgit v1.2.3 From 1d7e57287990ec1631432299bad25cdd4180c62e Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 12 Sep 2011 16:54:45 -0400 Subject: docs: use the &fullrelvers; entity to set X11 release information Signed-off-by: Gaetan Nadon --- specs/bigreq.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index bf8614a..546c856 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -1,6 +1,9 @@ + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + %defs; +]> @@ -8,7 +11,7 @@ Big Requests Extension X Consortium Standard - X Version 11, Release 6.4 + X Version 11, Release &fullrelvers; BobScheifler -- cgit v1.2.3 From abdd33c74d55238f5db4f7d5b40278f78c13ac25 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 16 Sep 2011 17:09:05 -0400 Subject: specs: fix author affiliation Signed-off-by: Gaetan Nadon --- specs/bigreq.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 546c856..0b208a4 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -12,16 +12,14 @@ Big Requests Extension X Consortium Standard X Version 11, Release &fullrelvers; + Version 2.0 BobScheifler + X Consortium - X Consortium Standard - 19931994 - X Consortium - Version 2.0 - X Consortium + 19931994X Consortium 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: -- cgit v1.2.3 From cc6006cb0db1373fffe92e9f00a8d06c8387e914 Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Sat, 1 Oct 2011 01:52:59 -0600 Subject: 1 - fix the capitolization of the ID attriutes to match either the 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. Signed-off-by: Matt Dew <marcoz@osource.org> --- specs/bigreq.xml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 0b208a4..5cc04ec 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -35,7 +35,7 @@ </bookinfo> -<chapter id='overview'> +<chapter id='Overview'> <title>Overview This extension enables the use of protocol requests that exceed 262140 bytes in length. @@ -46,7 +46,7 @@ For example, a normal PolyLine encoding is: - + @@ -185,7 +185,7 @@ Extended-length protocol encodings, once enabled, can be used on all protocol requests, including all extensions. - + Requests BigReqEnable @@ -197,13 +197,13 @@ This request enables extended-length protocol requests for the requesting client. It also returns the maximum length of a request, in 4-byte units, that can be used in extended-length protocol requests. This value will always be greater than the maximum-request-length returned in the connection setup information. - + Events and Errors No new events or errors are defined by this extension. - + Encoding Please refer to the X11 Protocol Encoding document as this document uses conventions established there. @@ -284,34 +284,34 @@ - + C language binding It is desirable for core Xlib, and other extensions, to use this extension internally when necessary. It is also desirable to make the use of this extension as transparent as possible to the X client. For example, if enabling of the extension were delayed until the first time it was needed, an application that used -XNextRequest +XNextRequest to determine the sequence number of a request would no longer get the correct sequence number. As such, -XOpenDisplay +XOpenDisplay will determine if the extension is supported by the server and, if it is, enable extended-length encodings. The core Xlib functions -XDrawLines, -XDrawArcs, -XFillPolygon, -XChangeProperty, -XSetClipRectangles, and -XSetRegion. +XDrawLines, +XDrawArcs, +XFillPolygon, +XChangeProperty, +XSetClipRectangles, and +XSetRegion. are required to use extended-length encodings when necessary, if supported by the server. Use of extended-length encodings in other core Xlib functions -(XDrawPoints, -XDrawRectangles, -XDrawSegments. -XFillArcs, -XFillRectangles, -XPutImage +(XDrawPoints, +XDrawRectangles, +XDrawSegments. +XFillArcs, +XFillRectangles, +XPutImage is permitted but not required; an Xlib implementation may choose to split the data across multiple smaller requests instead. To permit clients to know what the maximum-request-length for extended-length encodings is, the following function is added to Xlib: - + long XExtendedMaxRequestSize Display *display @@ -321,7 +321,7 @@ is permitted but not required; an Xlib implementation may choose to split the da Returns zero (0) if the specified display does not support this extension, otherwise returns the maximum-request-length (in 4-byte units) supported by the server through the extended-length encoding. - + Acknowledgements Clive Feather (IXI) originated the extended-length encoding used in this extension proposal. -- cgit v1.2.3 From 65ba594c8e6c28ed5ec99552812bc238855f8f9a Mon Sep 17 00:00:00 2001 From: Matt Dew Date: Sat, 14 Jan 2012 23:02:51 -0700 Subject: informaltable cleanup On certain tables, add top and bottom borders to table header and a bottom border to the table. This matches what those tables in the old pdfs looked like. the prevents tables from splitting across pages. Useful for tiny tables. Converting the colwidth to a floating point, WARNING: table-layout="fixed" and column-width unspecified => falling back to proportional-column-width(1) Signed-off-by: Matt Dew --- specs/bigreq.xml | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 5cc04ec..13a233e 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -46,12 +46,13 @@ For example, a normal PolyLine encoding is: - - - - - - + + + + + + + PolyLine @@ -112,12 +113,13 @@ An extended-length PolyLine encoding is: - - - - - - + + + + + + + PolyLine @@ -210,11 +212,12 @@ The name of this extension is “BIG-REQUESTS”. - - - - - + + + + + + BigReqEnable @@ -238,10 +241,10 @@ - - - - + + + + => -- cgit v1.2.3 From 9880dfa3489eddd8aaa1bdf24f621b13e514d5db Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 22 Mar 2012 20:38:40 -0700 Subject: bigreqsproto 1.1.2 Signed-off-by: Alan Coopersmith --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 22a6941..8acfd66 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([BigReqsProto], [1.1.1], +AC_INIT([BigReqsProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 4fc19e2d2e53fa7f8569467225e8b876548cd73a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Jan 2013 14:01:10 -0500 Subject: configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8acfd66..50a1aa9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,6 @@ AC_PREREQ([2.60]) AC_INIT([BigReqsProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], -- cgit v1.2.3 From d6ed3e927a756900ad4c9fd7235f8f7f34f376db Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 4 Jan 2012 17:37:06 -0500 Subject: autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson --- autogen.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi -- cgit v1.2.3 From 24f8010136522dfec9356547cfd549dac829a7e2 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 3 Sep 2013 10:31:41 -0700 Subject: Fix length of padding in server reply Length of "20" with unspecified contents was accidentally split into a length of "2" and contents of "0" in the docbook conversion. Verified against old spec in http://www.x.org/docs/Xext/bigreq.pdf Reported-by: shoop_da_whoop on #xorg-devel IRC Signed-off-by: Alan Coopersmith Reviewed-by: Jasper St. Pierre --- specs/bigreq.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/bigreq.xml b/specs/bigreq.xml index 13a233e..1d1d84d 100644 --- a/specs/bigreq.xml +++ b/specs/bigreq.xml @@ -277,8 +277,8 @@ maximum-request-length - 2 - 0 + 20 + unused -- cgit v1.2.3 From 869dca17f1fb15a824c4e1a78fefe9a13f640291 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 26 Oct 2013 09:42:04 -0400 Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES Fix Automake warning: AC_OUTPUT should be used without arguments. www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files Signed-off-by: Gaetan Nadon --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 50a1aa9..79da47d 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,7 @@ XORG_WITH_FOP XORG_WITH_XSLTPROC XORG_CHECK_SGML_DOCTOOLS(1.8) -AC_OUTPUT([Makefile +AC_CONFIG_FILES([Makefile specs/Makefile bigreqsproto.pc]) +AC_OUTPUT -- cgit v1.2.3 From 9852481b4dfa16208b46a197d811424963954211 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 24 Jan 2017 10:32:07 +1000 Subject: autogen.sh: use exec instead of waiting for configure to finish Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index fc34bd5..fd9c59a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,5 +10,5 @@ autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec $srcdir/configure "$@" fi -- cgit v1.2.3 From d0efe126cbbcd316378e148f0c36c226ba80dfe7 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 9 Mar 2015 12:00:52 +0000 Subject: autogen.sh: use quoted string variables Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- autogen.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index fd9c59a..0006de8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,14 +1,14 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? if test -z "$NOCONFIGURE"; then - exec $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi -- cgit v1.2.3 From 04797d4f1c00c42d828608d05f8c72fcab07f0b8 Mon Sep 17 00:00:00 2001 From: Mihail Konev Date: Thu, 26 Jan 2017 13:52:48 +1000 Subject: autogen: add default patch prefix Signed-off-by: Mihail Konev --- autogen.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autogen.sh b/autogen.sh index 0006de8..00747fd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,6 +9,9 @@ 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 bigreqsproto" + if test -z "$NOCONFIGURE"; then exec "$srcdir"/configure "$@" fi -- cgit v1.2.3