libx11: Changes to 'upstream-unstable'
configure.ac | 28 +----
docbook.am | 6 -
include/X11/Xlibint.h | 11 +-
man/DisplayOfCCC.man | 2
man/Makefile.am | 2
man/XChangeKeyboardMapping.man | 2
man/XFreeModifierMap.man | 1
man/XFreeModifiermap.man | 1
man/xkb/XkbComputeShapeTop.man | 2
man/xkb/XkbPtrActionX.man | 2
man/xkb/XkbPtrActionY.man | 2
man/xkb/XkbSetPtrActionX.man | 2
man/xkb/XkbSetPtrActionY.man | 2
modules/im/ximcp/imCallbk.c | 2
modules/im/ximcp/imDefIc.c | 7 -
modules/im/ximcp/imDefIm.c | 51 ++++-----
modules/im/ximcp/imDefLkup.c | 4
modules/im/ximcp/imInt.c | 9 -
modules/im/ximcp/imLcIc.c | 3
modules/im/ximcp/imLcIm.c | 5
modules/im/ximcp/imRm.c | 37 ++----
modules/im/ximcp/imRmAttr.c | 23 +---
modules/im/ximcp/imThaiIc.c | 3
modules/im/ximcp/imTrX.c | 3
modules/im/ximcp/imTrans.c | 7 -
modules/lc/gen/lcGenConv.c | 3
modules/lc/xlocale/lcJis.c | 3
modules/om/generic/omGeneric.c | 99 +++++++-----------
nls/Makefile.am | 5
nls/xmlrules.in | 59 +++++++++++
specs/XIM/Makefile.am | 2
specs/XKB/Makefile.am | 2
specs/i18n/framework/Makefile.am | 4
specs/i18n/framework/framework.xml | 78 +++++++-------
specs/i18n/localedb/Makefile.am | 4
specs/i18n/trans/Makefile.am | 4
specs/i18n/trans/trans.xml | 14 +-
specs/libX11/AppC.xml | 115 ++++++++++-----------
specs/libX11/AppD.xml | 43 ++++----
specs/libX11/CH01.xml | 19 ++-
specs/libX11/CH02.xml | 174 ++++++++++++++++----------------
specs/libX11/CH03.xml | 93 +++++++++--------
specs/libX11/CH04.xml | 52 +++++----
specs/libX11/CH05.xml | 18 +--
specs/libX11/CH06.xml | 142 +++++++++++++-------------
specs/libX11/CH07.xml | 62 +++++------
specs/libX11/CH08.xml | 99 +++++++++---------
specs/libX11/CH09.xml | 65 ++++++------
specs/libX11/CH10.xml | 23 ++--
specs/libX11/CH11.xml | 95 +++++++++--------
specs/libX11/CH12.xml | 64 ++++++------
specs/libX11/CH13.xml | 197 ++++++++++++++++++-------------------
specs/libX11/CH14.xml | 153 +++++++++++++++-------------
specs/libX11/CH15.xml | 73 +++++++------
specs/libX11/CH16.xml | 104 +++++++++----------
specs/libX11/Makefile.am | 4
specs/xmlrules.in | 67 ------------
src/FSWrap.c | 5
src/InitExt.c | 3
src/Quarks.c | 3
src/RdBitF.c | 5
src/SetLocale.c | 3
src/Xrm.c | 6 -
src/xcb_io.c | 96 +++++++++++++++---
src/xcms/LRGB.c | 8 -
src/xcms/PrOfId.c | 11 --
src/xkb/XKBGAlloc.c | 13 --
src/xkb/XKBGeom.c | 4
src/xlibi18n/XDefaultIMIF.c | 6 -
src/xlibi18n/XDefaultOMIF.c | 41 ++-----
src/xlibi18n/XlcDL.c | 40 -------
src/xlibi18n/lcCharSet.c | 3
src/xlibi18n/lcDB.c | 18 +--
src/xlibi18n/lcFile.c | 14 --
src/xlibi18n/lcGeneric.c | 33 ++----
src/xlibi18n/lcPublic.c | 9 -
76 files changed, 1220 insertions(+), 1257 deletions(-)
New commits:
commit fc74dc12b1ff3c43e240e1a713316ce1bf525d61
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 28 19:32:40 2011 -0700
libX11 1.4.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index a449ba8..6a4878e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.4.3],
+AC_INIT([libX11], [1.4.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
commit ab1f30231755d99ed123af6873b981834640f01d
Author: Matt Dew <marcoz@osource.org>
Date: Wed Jul 13 12:33:40 2011 -0600
Add id attributes to error codes to allow linking from other docs.
Signed-off-by: Matt Dew <marcoz@osource.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/libX11/CH11.xml b/specs/libX11/CH11.xml
index 3fe6f23..3352d7e 100644
--- a/specs/libX11/CH11.xml
+++ b/specs/libX11/CH11.xml
@@ -2061,7 +2061,7 @@ chapter:
</thead>
<tbody>
<row>
- <entry><errorname>BadAccess</errorname></entry>
+ <entry><errorname id='BadAccess'>BadAccess</errorname></entry>
<entry>A client attempts to grab a key/button combination already grabbed
by another client.</entry>
</row>
@@ -2085,7 +2085,7 @@ chapter:
has already selected.</entry>
</row>
<row>
- <entry><errorname>BadAlloc</errorname></entry>
+ <entry><errorname id='BadAlloc'>BadAlloc</errorname></entry>
<entry>The server fails to allocate the requested resource.
Note that the explicit listing of
<errorname>BadAlloc</errorname>
@@ -2100,42 +2100,42 @@ chapter:
them.</entry>
</row>
<row>
- <entry><errorname>BadAtom</errorname></entry>
+ <entry><errorname id='BadAtom'>BadAtom</errorname></entry>
<entry>A value for an atom argument does not name a defined atom.</entry>
</row>
<row>
- <entry><errorname>BadColor</errorname></entry>
+ <entry><errorname id='BadColor'>BadColor</errorname></entry>
<entry>A value for a colormap argument does not name a defined colormap.</entry>
</row>
<row>
- <entry><errorname>BadCursor</errorname></entry>
+ <entry><errorname id='BadCursor'>BadCursor</errorname></entry>
<entry>A value for a cursor argument does not name a defined cursor.</entry>
</row>
<row>
- <entry><errorname>BadDrawable</errorname></entry>
+ <entry><errorname id='BadDrawable'>BadDrawable</errorname></entry>
<entry>A value for a drawable argument does not name a defined window or pixmap.</entry>
</row>
<row>
- <entry><errorname>BadFont</errorname></entry>
+ <entry><errorname id='BadFont'>BadFont</errorname></entry>
<entry>A value for a font argument does not name a defined font (or, in some cases,
<type>GContext</type>).</entry>
</row>
<row>
- <entry><errorname>BadGC</errorname></entry>
+ <entry><errorname id='BadGC'>BadGC</errorname></entry>
<entry>A value for a
<type>GContext</type>
argument does not name a defined
<type>GContext</type>.</entry>
</row>
<row>
- <entry><errorname>BadIDChoice</errorname></entry>
+ <entry><errorname id='BadIDChoice'>BadIDChoice</errorname></entry>
<entry>The value chosen for a resource identifier either is not included in the
range assigned to the client or is already in use.
Under normal circumstances,
this cannot occur and should be considered a server or Xlib error.</entry>
</row>
<row>
- <entry><errorname>BadImplementation</errorname></entry>
+ <entry><errorname id='BadImplementation'>BadImplementation</errorname></entry>
<entry>The server does not implement some aspect of the request.
A server that generates this error for a core request is deficient.
As such, this error is not listed for any of the requests,
@@ -2143,7 +2143,7 @@ chapter:
and handle or discard them.</entry>
</row>
<row>
- <entry><errorname>BadLength</errorname></entry>
+ <entry><errorname id='BadLength'>BadLength</errorname></entry>
<entry>The length of a request is shorter or longer than that required to
contain the arguments.
This is an internal Xlib or server error.</entry>
@@ -2154,7 +2154,7 @@ chapter:
The length of a request exceeds the maximum length accepted by the server.</entry>
</row>
<row>
- <entry><errorname>BadMatch</errorname></entry>
+ <entry><errorname id='BadMatch'>BadMatch</errorname></entry>
<entry>In a graphics request,
the root and depth of the graphics context do not match those of the drawable.</entry>
</row>
@@ -2174,20 +2174,20 @@ chapter:
window lacks this attribute.</entry>
</row>
<row>
- <entry><errorname>BadName</errorname></entry>
+ <entry><errorname id='BadName'>BadName</errorname></entry>
<entry>A font or color of the specified name does not exist.</entry>
</row>
<row>
- <entry><errorname>BadPixmap</errorname></entry>
+ <entry><errorname id='BadPixmap'>BadPixmap</errorname></entry>
<entry>A value for a pixmap argument does not name a defined pixmap.</entry>
</row>
<row>
- <entry><errorname>BadRequest</errorname></entry>
+ <entry><errorname id='BadRequest'>BadRequest</errorname></entry>
<entry>The major or minor opcode does not specify a valid request.
This usually is an Xlib or server error.</entry>
</row>
<row>
- <entry><errorname>BadValue</errorname></entry>
+ <entry><errorname id='BadValue'>BadValue</errorname></entry>
<entry>Some numeric value falls outside of the range of values accepted
by the request.
Unless a specific range is specified for an argument,
@@ -2196,7 +2196,7 @@ chapter:
this error (due to the encoding).</entry>
</row>
<row>
- <entry><errorname>BadWindow</errorname></entry>
+ <entry><errorname id='BadWindow'>BadWindow</errorname></entry>
<entry>A value for a window argument does not name a defined window.</entry>
</row>
</tbody>
commit 5c831fef402914ccf2ec14005c25be48852f119b
Author: David Coppa <dcoppa@gmail.com>
Date: Tue Jul 12 10:05:47 2011 +0200
Fix libpthread linkage on OpenBSD.
OpenBSD prefers to use the -pthread to fetch pthread libs when needed.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 0c68ff4..a449ba8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,7 +279,7 @@ AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
# XXX incomplete, please fill this in
if test x$xthreads = xyes ; then
case $host_os in
- linux*|openbsd*|gnu*|k*bsd*-gnu)
+ linux*|gnu*|k*bsd*-gnu)
XTHREADLIB=-lpthread ;;
netbsd*)
XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
@@ -287,7 +287,7 @@ if test x$xthreads = xyes ; then
freebsd*)
XTHREAD_CFLAGS="-D_THREAD_SAFE"
XTHREADLIB="-pthread" ;;
- dragonfly*)
+ dragonfly*|openbsd*)
XTHREADLIB="-pthread" ;;
solaris*)
XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
commit 445b0b3efc04a74fc77cd3e483b25cfb5da82f12
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jun 22 20:46:26 2011 -0400
config: use XORG_WITH_PERL macro to replace custom program check
New in version util-macros 1.15, the macro does the usual checking
for program path and provides an interface for makefile variables.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 0231de6..0c68ff4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ XORG_WITH_FOP([],[no])
XORG_WITH_XSLTPROC
XORG_CHECK_SGML_DOCTOOLS(1.8)
XORG_PROG_RAWCPP
+XORG_WITH_PERL
# Required when PKG_CHECK_MODULES called within an if statement
PKG_PROG_PKG_CONFIG
@@ -65,15 +66,6 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
fi
AC_SUBST(LDFLAGS_FOR_BUILD)
-# Find perl for "make check" tests in nls/Makefile.am
-AC_ARG_WITH(perl,
- AS_HELP_STRING([--with-perl=<path>],
- [path to perl interpreter for build-time tests]),
- [PERL=$withval ; AC_MSG_CHECKING([perl]) ;
- AC_MSG_RESULT([(from --with-perl) $PERL])],
- AC_CHECK_PROGS([PERL], [perl], [no]))
-AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)
-
# Checks for pkg-config packages
# Always required
commit 47d99a324db9232029a22dd523e3bc3ed0936aca
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jun 22 20:41:18 2011 -0400
config: update XORG_WITH_FOP macro usage
A new feature to test for a minimum version has been added.
The parameter position changed. Due to limited usage
and requiring 1.15, it turns out to be backward compatible.
There is no functional change to how docs are build.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c085df3..0231de6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,14 +20,14 @@ AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
-# Require xorg-macros minimum of 1.12 for DocBook external references
+# Require xorg-macros minimum of 1.15 for fop minimum version
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.12)
+ [m4_fatal([must install xorg-macros 1.15 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.15)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.22)
-XORG_WITH_FOP([no])
+XORG_WITH_FOP([],[no])
XORG_WITH_XSLTPROC
XORG_CHECK_SGML_DOCTOOLS(1.8)
XORG_PROG_RAWCPP
commit e659683ad51ecc26c989fbdefdfe20f83af2c5a5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jun 22 11:48:49 2011 -0400
Remove unused xmlrules.in in specs, now in /nls
The specs dir has been converted to docbook.am
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/xmlrules.in b/specs/xmlrules.in
deleted file mode 100644
index 8b105f3..0000000
--- a/specs/xmlrules.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# 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 HAVE_XMLTO
-spec_DATA = $(doc_sources:.xml=.html)
-
-if HAVE_FOP
-spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
-
-if HAVE_XMLTO_TEXT
-spec_DATA += $(doc_sources:.xml=.txt)
-endif
-
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = \
- -m $(XSL_STYLESHEET) \
- --stringparam img.src.path=$(abs_builddir)/ \
- --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-endif
-
-CLEANFILES = $(spec_DATA)
-
-%.txt: %.xml $(dist_spec_DATA)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-
-%.html: %.xml $(dist_spec_DATA)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
-
-%.pdf: %.xml $(dist_spec_DATA)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
-%.ps: %.xml $(dist_spec_DATA)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
-
-chunked-html: $(doc_sources)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
-
-endif HAVE_XMLTO
commit 9992092609bd83a0db778e9a9ac1e879d445e637
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 31 10:23:22 2011 -0400
nls: move xmlrules.in from specs to nls
It is no longer used in the specs dir.
Remove html from CLEANFILES as it breaks. Make do not clean directories
Remove SUFFIXES as pattern rules are used rather than suffix rules.
Other improvements are possible, the first priority is to move it out
of the specs dir.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 470a048..cabaf40 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -1,8 +1,11 @@
x11localedir = $(X11_LOCALEDATADIR)
specdir = $(docdir)/Compose
+CLEANFILES =
+XMLTO_FLAGS =
+SUFFIXES =
-include $(top_srcdir)/specs/xmlrules.in
+include $(top_srcdir)/nls/xmlrules.in
EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \
compose-check.pl compose-chart.pl
diff --git a/nls/xmlrules.in b/nls/xmlrules.in
new file mode 100644
index 0000000..5a6be24
--- /dev/null
+++ b/nls/xmlrules.in
@@ -0,0 +1,59 @@
+#
+# 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 HAVE_XMLTO
+spec_DATA = $(doc_sources:.xml=.html)
+
+if HAVE_FOP
+spec_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
+endif
+
+if HAVE_XMLTO_TEXT
+spec_DATA += $(doc_sources:.xml=.txt)
+endif
+
+if HAVE_STYLESHEETS
+XMLTO_FLAGS += \
+ -m $(XSL_STYLESHEET) \
+ --stringparam img.src.path=$(abs_builddir)/ \
+ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+endif
+
+CLEANFILES += $(spec_DATA)
+
+%.txt: %.xml $(dist_spec_DATA)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
+
+%.html: %.xml $(dist_spec_DATA)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+
+%.pdf: %.xml $(dist_spec_DATA)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
+
+%.ps: %.xml $(dist_spec_DATA)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+
+chunked-html: $(doc_sources)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+
+endif HAVE_XMLTO
diff --git a/specs/xmlrules.in b/specs/xmlrules.in
index 7687860..8b105f3 100644
--- a/specs/xmlrules.in
+++ b/specs/xmlrules.in
@@ -21,10 +21,6 @@
# DEALINGS IN THE SOFTWARE.
#
-CLEANFILES =
-SUFFIXES =
-XMLTO_FLAGS =
-
if HAVE_XMLTO
spec_DATA = $(doc_sources:.xml=.html)
@@ -37,15 +33,13 @@ spec_DATA += $(doc_sources:.xml=.txt)
endif
if HAVE_STYLESHEETS
-XMLTO_FLAGS += \
+XMLTO_FLAGS = \
-m $(XSL_STYLESHEET) \
--stringparam img.src.path=$(abs_builddir)/ \
--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
endif
-CLEANFILES += $(spec_DATA)
-
-SUFFIXES += .xml .ps .pdf .txt .html
+CLEANFILES = $(spec_DATA)
%.txt: %.xml $(dist_spec_DATA)
$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
@@ -62,6 +56,4 @@ SUFFIXES += .xml .ps .pdf .txt .html
chunked-html: $(doc_sources)
$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
-CLEANFILES += html
-
endif HAVE_XMLTO
commit b370eeb0191b0e2a8bde2f03a442a8ca62e35d58
Author: Gaetan Nadon <memsize@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
diff --git a/configure.ac b/configure.ac
index a39ab8d..c085df3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP([no])
XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
XORG_PROG_RAWCPP
# Required when PKG_CHECK_MODULES called within an if statement
diff --git a/docbook.am b/docbook.am
index 6937083..2ffb7e6 100644
--- a/docbook.am
+++ b/docbook.am
@@ -72,7 +72,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
@@ -94,4 +94,4 @@ endif HAVE_XSLTPROC
endif HAVE_STYLESHEETS
endif HAVE_XMLTO
-CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+CLEANFILES = $(shelf_DATA)
commit 4e741654b7e0a283779b8b4af5bb32e05b7fc678
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 7 18:41:30 2011 -0700
specs/libX11: Turn appendix references into links
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index 957d390..79f8fa9 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -867,7 +867,7 @@ If you define further properties of complex type,
you must encode and decode them yourself.
These functions must be carefully written if they are to be portable.
For further information about how to write a library extension,
-see appendix C. <!-- xref -->
+see <link linkend="extensions">appendix C</link>.
<!-- .NE -->
The type of a property is defined by an atom, which allows for
arbitrary extension in this type scheme.
diff --git a/specs/libX11/CH05.xml b/specs/libX11/CH05.xml
index 3ad7076..6df3509 100644
--- a/specs/libX11/CH05.xml
+++ b/specs/libX11/CH05.xml
@@ -277,7 +277,7 @@ The initial colors of a cursor are a black foreground and a white
background (see
<function>XRecolorCursor</function>).
For further information about cursor shapes,
-see appendix B.
+see <link linkend="x_font_cursors">appendix B</link>.
</para>
<para>
<!-- .LP -->
commit a3d1152bc4b300f59ea2f08925739aab1ebfbc4e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 7 18:37:41 2011 -0700
specs/libX11: Turn chapter references into links
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/libX11/AppD.xml b/specs/libX11/AppD.xml
index cacf1af..3c8af3f 100644
--- a/specs/libX11/AppD.xml
+++ b/specs/libX11/AppD.xml
@@ -1051,7 +1051,7 @@ geometry specifications.
The
<function>XGetDefault</function>
function provides a primitive interface to the resource manager facilities
-discussed in chapter 15. <!-- xref -->
+discussed in <link linkend="resource_manager_functions">chapter 15</link>.
It is only useful in very simple applications.
</para>
<para>
diff --git a/specs/libX11/CH01.xml b/specs/libX11/CH01.xml
index c2132e4..21750ab 100644
--- a/specs/libX11/CH01.xml
+++ b/specs/libX11/CH01.xml
@@ -316,8 +316,8 @@ reference this file directly.
<indexterm><primary>Headers</primary><secondary><X11/Xcms.h></secondary></indexterm>
<para>
This file contains symbols for much of the color management facilities
-described in chapter 6. All functions, types, and symbols with the
-prefix "Xcms", <!-- xref -->
+described in <link linkend="color_management_functions">chapter 6</link>.
+All functions, types, and symbols with the prefix "Xcms",
plus the Color Conversion Contexts macros, are declared in this file.
<filename class="headerfile"><X11/Xlib.h></filename>
must be included before including this file.
@@ -333,7 +333,9 @@ must be included before including this file.
<para>
This file declares various functions, types, and symbols used for
inter-client communication and application utility functions,
-which are described in chapters 14 and 16. <!-- xref -->
+which are described in chapters
+<link linkend="inter_client_communication_functions">14</link> and
+<link linkend="application_utility_functions">16</link>.
<filename class="headerfile"><X11/Xlib.h></filename> must be included before including this file.
</para>
</listitem>
@@ -346,7 +348,8 @@ which are described in chapters 14 and 16. <!-- xref -->
<indexterm><primary>Headers</primary><secondary><X11/Xresource.h></secondary></indexterm>
<para>
This file declares all functions, types, and symbols for the
-resource manager facilities, which are described in chapter 15.
+resource manager facilities, which are described in
+<link linkend="resource_manager_functions">chapter 15</link>.
<filename class="headerfile"><X11/Xlib.h></filename> <!-- xref -->
must be included before including this file.
</para>
@@ -680,7 +683,7 @@ rather than presume control of the entire screen.
What you do inside of your top-level window, however,
is up to your application.
For further information,
-see chapter 14 <!-- xref -->
+see <link linkend="inter_client_communication_functions">chapter 14</link>
and the <citetitle>Inter-Client Communication Conventions Manual</citetitle>.
</para>
</listitem>
diff --git a/specs/libX11/CH02.xml b/specs/libX11/CH02.xml
index c8135ae..4a57266 100644
--- a/specs/libX11/CH02.xml
+++ b/specs/libX11/CH02.xml
@@ -3205,7 +3205,9 @@ for threads using
<!-- .LP -->
In addition to the connection to the X server, an Xlib implementation
may require connections to other kinds of servers (for example, to
-input method servers as described in chapter 13). Toolkits and clients
+input method servers as described in
+<link linkend="locales_and_internationalized_text_functions">chapter 13</link>).
+Toolkits and clients
that use multiple displays, or that use displays in combination with
other inputs, need to obtain these additional connections to correctly
block until input is available and need to process that input
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index b74ac4c..d26a814 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -1072,7 +1072,7 @@ or
<symbol>False</symbol>
(default).
Window managers use this information to avoid tampering with pop-up windows
-(see also chapter 14).
+(see also <link linkend="inter_client_communication_functions">chapter 14</link>).
</para>
</sect2>
<sect2 id="Colormap_Attribute">
@@ -1167,7 +1167,7 @@ which are discussed in the appropriate toolkit documentation.
If you do not use a toolkit, however,
you must provide some standard information or hints for the window
manager by using the Xlib inter-client communication functions
-(see chapter 14).
+(see <link linkend="inter_client_communication_functions">chapter 14</link>).
</para>
<para>
<!-- .LP -->
@@ -1211,7 +1211,8 @@ you should set these properties for top-level windows before mapping them.
<para>
<!-- .LP -->
For further information,
-see chapter 14 and the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
+see <link linkend="inter_client_communication_functions">chapter 14</link> and
+the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
</para>
<para>
<!-- .LP -->
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index bd37ae6..957d390 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -887,7 +887,7 @@ To avoid name clashes with user symbols, the
name for each atom has the XA_ prefix.
For an explanation of the functions that let you get and set
much of the information stored in these predefined properties,
-see chapter 14. <!-- xref -->
+see <link linkend="inter_client_communication_functions">chapter 14</link>.
</para>
<para>
<!-- .LP -->
@@ -1397,7 +1397,8 @@ is used to represent 32-bit quantities.
Xlib provides functions that you can use to obtain,
change, update, or interchange window properties.
In addition, Xlib provides other utility functions for inter-client
-communication (see chapter 14). <!-- xref -->
+communication
+(see <link linkend="inter_client_communication_functions">chapter 14</link>).
</para>
<para>
<!-- .LP -->
diff --git a/specs/libX11/CH10.xml b/specs/libX11/CH10.xml
index 4ecbdde..8a06a70 100644
--- a/specs/libX11/CH10.xml
+++ b/specs/libX11/CH10.xml
@@ -24,7 +24,8 @@ This chapter discusses the following topics associated with events:
</itemizedlist>
<para>
-Functions for handling events are dealt with in the next chapter.
+Functions for handling events are dealt with in
+<link linkend="event_handling_functions">the next chapter</link>.
</para>
<sect1 id="Event_Types">
@@ -999,7 +1000,7 @@ and the pointer events
and
<symbol>MotionNotify</symbol>.
For information about the keyboard event-handling utilities,
-see chapter 11.
+see <link linkend="event_handling_functions">chapter 11</link>.
</para>
<para>
<!-- .LP -->
diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml
index f317ea4..b648306 100644
--- a/specs/libX11/CH14.xml
+++ b/specs/libX11/CH14.xml
@@ -251,7 +251,8 @@ of top-level windows (that is, those that were created as children
of the root window).
Note that the subwindows that you create are ignored by window managers.
Therefore,
-you should use the basic window functions described in chapter 3
+you should use the basic window functions described in
+<link linkend="window_functions">chapter 3</link>
to manipulate your application's subwindows.
</para>
<para>
diff --git a/specs/libX11/CH16.xml b/specs/libX11/CH16.xml
index bc79f96..fecbb2f 100644
--- a/specs/libX11/CH16.xml
+++ b/specs/libX11/CH16.xml
@@ -655,7 +655,8 @@ if the specified KeySym is a PF key.
<!-- .XE -->
<para>
<!-- .LP -->
-Chapter 13 describes internationalized text input facilities,
+<link linkend="locales_and_internationalized_text_functions">Chapter 13</link>
+describes internationalized text input facilities,
but sometimes it is expedient to write an application that
only deals with Latin-1 characters and ASCII controls,
so Xlib provides a simple function for that purpose.
commit d0cc949dfe44a41a71f19e4fe6c7547bb3d9bdbe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 7 00:52:32 2011 -0700
specs/libX11: Turn many "see section ..." into links
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/libX11/AppC.xml b/specs/libX11/AppC.xml
index 08d1555..da687ec 100644
--- a/specs/libX11/AppC.xml
+++ b/specs/libX11/AppC.xml
@@ -1262,7 +1262,8 @@ returned to.
If your procedure returns a zero value,
the error is not suppressed, and
the client's error handler is called.
-(For further information, see section 11.8.2.)
+(For further information,
+see <link linkend="Using_the_Default_Error_Handlers">section 11.8.2</link>.)
If your procedure returns nonzero,
the error is suppressed, and
<function>_XReply</function>
diff --git a/specs/libX11/AppD.xml b/specs/libX11/AppD.xml
index afe6590..cacf1af 100644
--- a/specs/libX11/AppD.xml
+++ b/specs/libX11/AppD.xml
@@ -753,7 +753,8 @@ with the following syntax:
<programlisting>
XGetStandardColormap(dpy, DefaultRootWindow(dpy), &cmap, XA_RGB_GRAY_MAP);
</programlisting>
-See section 14.3 for the semantics of standard colormaps.
+See <link linkend="Standard_Colormaps">section 14.3</link> for the
+semantics of standard colormaps.
</para>
<para>
<!-- .LP -->
@@ -1548,7 +1549,7 @@ dash-offset, dash-list, fill-style, and fill-rule.
<para>
<!-- .LP -->
These functions have been superseded by the context management functions
-(see section 16.10).
+(see <link linkend="Using_the_Context_Manager">section 16.10</link>).
It is often necessary to associate arbitrary information with resource IDs.
Xlib provides the
<function>XAssocTable</function>
diff --git a/specs/libX11/CH01.xml b/specs/libX11/CH01.xml
index 7a2d115..c2132e4 100644
--- a/specs/libX11/CH01.xml
+++ b/specs/libX11/CH01.xml
@@ -255,7 +255,7 @@ Because Xlib usually does not transmit requests to the server immediately
actually occur.
For debugging purposes, however,
Xlib provides a mechanism for forcing synchronous behavior
-(see section 11.8.1). <!-- xref -->
+(see <link linkend="Enabling_or_Disabling_Synchronization">section 11.8.1</link>).
When synchronization is enabled,
errors are reported as they are generated.
</para>
@@ -812,7 +812,7 @@ Where applicable,
the last paragraph of the explanation lists the possible
Xlib error codes that the function can generate.
For a complete discussion of the Xlib error codes,
-see section 11.8.2. <!-- xref -->
+see <link linkend="Using_the_Default_Error_Handlers">section 11.8.2</link>.
</para>
</listitem>
<listitem>
diff --git a/specs/libX11/CH02.xml b/specs/libX11/CH02.xml
index 901a385..c8135ae 100644
--- a/specs/libX11/CH02.xml
+++ b/specs/libX11/CH02.xml
@@ -158,7 +158,8 @@ using the
<function>DefaultScreen</function>
macro or the
<function>XDefaultScreen</function>
-function if you are using languages other than C (see section 2.2.1).
+function if you are using languages other than C
+(see <link linkend="Display_Macros_">section 2.2.1</link>).
</para>
</listitem>
</varlistentry>
@@ -242,12 +243,12 @@ For information about using macros and functions to obtain information from
the
<type>Display</type>
structure,
-see section 2.2.1.
+see <link linkend="Display_Macros_">section 2.2.1</link>.
</para>
<para>
<!-- .LP -->
X servers may implement various types of access control mechanisms
-(see section 9.8).
+(see <link linkend="Controlling_Host_Access">section 9.8</link>).
</para>
</sect1>
<sect1 id="Obtaining_Information_about_the_Display_Image_Formats_or_Screens">
@@ -886,7 +887,7 @@ Specifies the appropriate screen number on the host server.
<indexterm significance="preferred"><primary>XDefaultVisual</primary></indexterm>
Both return the default visual type for the specified screen.
For further information about visual types,
-see section 3.1.
+see <link linkend="Visual_Types">section 3.1</link>.
</para>
<para>
<!-- .LP -->
@@ -1476,7 +1477,9 @@ Applications are required to present data to the X server
in a format that the server demands.
To help simplify applications,
most of the work required to convert the data is provided by Xlib
-(see sections 8.7 and 16.8).
+(see sections
+<link linkend="Transferring_Images_between_Client_and_Server">8.7</link> and
+<link linkend="Manipulating_Images">16.8</link>).
</para>
<para>
<!-- .LP -->
@@ -2166,7 +2169,7 @@ structure.
<indexterm significance="preferred"><primary>XDefaultVisualOfScreen</primary></indexterm>
Both return the default visual of the specified screen.
For information on visual types,
-see section 3.1.
+see <link linkend="Visual_Types">section 3.1</link>.
</para>
<para>
<!-- .LP -->
@@ -2209,7 +2212,7 @@ The value returned can be one of
<symbol>NotUseful</symbol>,
or
<symbol>Always</symbol>
-(see section 3.2.4).
+(see <link linkend="Backing_Store_Attribute">section 3.2.4</link>).
</para>
<para>
<!-- .LP -->
@@ -2252,7 +2255,8 @@ If
the screen supports save unders.
If
<symbol>False</symbol>,
-the screen does not support save unders (see section 3.2.5).
+the screen does not support save unders
+(see <link linkend="Save_Under_Flag">section 3.2.5</link>).
</para>
<para>
<!-- .LP -->
@@ -2543,7 +2547,8 @@ structure.
<indexterm significance="preferred"><primary>MaxCmapsOfScreen</primary></indexterm>
<indexterm significance="preferred"><primary>XMaxCmapsOfScreen</primary></indexterm>
Both return the maximum number of installed colormaps supported
-by the specified screen (see section 9.3).
+by the specified screen
+(see <link linkend="Managing_Installed_Colormaps">section 9.3</link>).
</para>
<para>
<!-- .LP -->
@@ -2580,7 +2585,8 @@ structure.
<indexterm significance="preferred"><primary>MinCmapsOfScreen</primary></indexterm>
<indexterm significance="preferred"><primary>XMinCmapsOfScreen</primary></indexterm>
Both return the minimum number of installed colormaps supported
-by the specified screen (see section 9.3).
+by the specified screen
+(see <link linkend="Managing_Installed_Colormaps">section 9.3</link>).
</para>
Reply to: