libxaw: Changes to 'upstream-unstable'
COPYING | 8 -
Makefile.am | 2
configure.ac | 29 ++---
docbook.am | 105 +++++++++++++++++++
include/X11/Xaw/AsciiSink.h | 8 -
include/X11/Xaw/AsciiSinkP.h | 12 +-
include/X11/Xaw/AsciiSrc.h | 4
include/X11/Xaw/AsciiSrcP.h | 18 +--
include/X11/Xaw/AsciiText.h | 12 +-
include/X11/Xaw/AsciiTextP.h | 12 +-
include/X11/Xaw/Box.h | 14 +-
include/X11/Xaw/BoxP.h | 10 -
include/X11/Xaw/Command.h | 8 -
include/X11/Xaw/CommandP.h | 20 +--
include/X11/Xaw/Dialog.h | 8 -
include/X11/Xaw/DialogP.h | 8 -
include/X11/Xaw/Form.h | 12 +-
include/X11/Xaw/FormP.h | 8 -
include/X11/Xaw/Grip.h | 8 -
include/X11/Xaw/GripP.h | 8 -
include/X11/Xaw/Label.h | 8 -
include/X11/Xaw/LabelP.h | 12 +-
include/X11/Xaw/List.h | 26 ++--
include/X11/Xaw/ListP.h | 4
include/X11/Xaw/MenuButtoP.h | 2
include/X11/Xaw/MenuButton.h | 2
include/X11/Xaw/MultiSink.h | 8 -
include/X11/Xaw/MultiSinkP.h | 12 +-
include/X11/Xaw/MultiSrc.h | 2
include/X11/Xaw/MultiSrcP.h | 18 +--
include/X11/Xaw/Paned.h | 14 +-
include/X11/Xaw/PanedP.h | 16 +-
include/X11/Xaw/Panner.h | 12 +-
include/X11/Xaw/Porthole.h | 14 +-
include/X11/Xaw/Repeater.h | 12 +-
include/X11/Xaw/Scrollbar.h | 10 -
include/X11/Xaw/ScrollbarP.h | 8 -
include/X11/Xaw/Simple.h | 8 -
include/X11/Xaw/SimpleMenP.h | 4
include/X11/Xaw/SimpleMenu.h | 2
include/X11/Xaw/SimpleP.h | 8 -
include/X11/Xaw/Sme.h | 4
include/X11/Xaw/SmeBSB.h | 2
include/X11/Xaw/SmeLine.h | 4
include/X11/Xaw/SmeP.h | 4
include/X11/Xaw/StripCharP.h | 10 -
include/X11/Xaw/StripChart.h | 12 +-
include/X11/Xaw/Text.h | 10 -
include/X11/Xaw/TextP.h | 16 +-
include/X11/Xaw/TextSink.h | 14 +-
include/X11/Xaw/TextSinkP.h | 8 -
include/X11/Xaw/TextSrc.h | 12 +-
include/X11/Xaw/TextSrcP.h | 8 -
include/X11/Xaw/Toggle.h | 4
include/X11/Xaw/ToggleP.h | 4
include/X11/Xaw/Tree.h | 30 ++---
include/X11/Xaw/TreeP.h | 8 -
include/X11/Xaw/VendorEP.h | 4
include/X11/Xaw/Viewport.h | 8 -
include/X11/Xaw/ViewportP.h | 8 -
include/X11/Xaw/XawImP.h | 4
man/Xaw.man | 2
old-doc/CHANGES | 20 +--
old-doc/Changelog | 28 ++---
specs/.gitignore | 1
specs/AsciiSink.xml | 2
specs/AsciiSource.xml | 48 ++++----
specs/AsciiText.xml | 4
specs/Box.xml | 2
specs/CH1.xml | 10 -
specs/CH2.xml | 91 ++++++++--------
specs/CH3.xml | 2
specs/CH4.xml | 2
specs/CH5.xml | 6 -
specs/CH6.xml | 4
specs/CH7.xml | 8 -
specs/Dialog.xml | 32 ++---
specs/Form.xml | 28 ++---
specs/Grip.xml | 2
specs/Label.xml | 2
specs/List.xml | 18 +--
specs/Makefile.am | 65 +-----------
specs/MenuButton.xml | 4
specs/Paned.xml | 26 ++--
specs/Panner.xml | 4
specs/Porthole.xml | 12 +-
specs/Repeater.xml | 2
specs/Scrollbar.xml | 10 -
specs/Simple.xml | 2
specs/SimpleMenu.xml | 16 +-
specs/Sme.xml | 4
specs/SmeBSB.xml | 4
specs/SmeLine.xml | 2
specs/StripChart.xml | 2
specs/Template.xml | 2
specs/Template_public_header_file.xml | 2
specs/Text.xml | 4
specs/TextActions.xml | 4
specs/TextActions_text_widget_actions.xml | 4
specs/TextFuncs.xml | 84 +++++++--------
specs/TextSink.xml | 50 ++++-----
specs/TextSource.xml | 34 +++---
specs/Toggle.xml | 40 +++----
specs/Tree.xml | 12 +-
specs/Viewport.xml | 6 -
specs/libXaw.xml | 71 ++++++-------
src/Actions.c | 65 +++++-------
src/AllWidgets.c | 67 +++++-------
src/AsciiSink.c | 16 +-
src/AsciiSrc.c | 30 ++---
src/AsciiText.c | 16 +-
src/Box.c | 31 ++---
src/Command.c | 58 +++++-----
src/Converters.c | 37 +++---
src/Dialog.c | 16 +-
src/DisplayList.c | 26 ++--
src/Form.c | 8 -
src/Grip.c | 8 -
src/Label.c | 24 ++--
src/List.c | 62 +++++------
src/Makefile.am | 1
src/MenuButton.c | 23 ++--
src/MultiSink.c | 10 -
src/MultiSrc.c | 90 ++++++++--------
src/Paned.c | 161 ++++++++++++++----------------
src/Panner.c | 6 -
src/Pixmap.c | 6 -
src/Porthole.c | 6 -
src/Private.h | 2
src/Repeater.c | 6 -
src/Scrollbar.c | 22 ++--
src/Simple.c | 27 ++---
src/SimpleMenu.c | 99 +++++++++---------
src/Sme.c | 14 +-
src/SmeBSB.c | 49 ++++-----
src/SmeLine.c | 18 +--
src/StripChart.c | 48 ++++----
src/Text.c | 35 +++---
src/TextAction.c | 34 +++---
src/TextPop.c | 117 ++++++++++-----------
src/TextSink.c | 57 +++++-----
src/TextSrc.c | 34 +++---
src/Tip.c | 4
src/Toggle.c | 37 +++---
src/Tree.c | 100 +++++++++---------
src/Vendor.c | 28 ++---
src/Viewport.c | 40 +++----
src/XawI18n.c | 4
src/XawIm.c | 28 ++---
src/XawInit.c | 12 +-
150 files changed, 1550 insertions(+), 1500 deletions(-)
New commits:
commit b16cc35e551860a0bff54c47b33317536ddeae52
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 22 19:51:33 2012 -0700
libXaw 1.0.10
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5b52876..2423263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXaw], [1.0.9],
+AC_INIT([libXaw], [1.0.10],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 8a78d3aef0f6f1f51997468daf5f67231f4a3ecd
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Feb 1 13:44:05 2012 -0500
Include headers instead of using extern definitions
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/AllWidgets.c b/src/AllWidgets.c
index 27be437..3b13438 100644
--- a/src/AllWidgets.c
+++ b/src/AllWidgets.c
@@ -28,46 +28,37 @@ in this Software without prior written authorization from The Open Group.
#include <config.h>
#endif
#include <X11/IntrinsicP.h>
-#include <X11/Xmu/WidgetNode.h>
#include <X11/Xaw/AllWidgets.h>
-extern WidgetClass applicationShellWidgetClass;
-extern WidgetClass asciiSinkObjectClass;
-extern WidgetClass asciiSrcObjectClass;
-extern WidgetClass asciiTextWidgetClass;
-extern WidgetClass boxWidgetClass;
-extern WidgetClass commandWidgetClass;
-extern WidgetClass dialogWidgetClass;
-extern WidgetClass formWidgetClass;
-extern WidgetClass gripWidgetClass;
-extern WidgetClass labelWidgetClass;
-extern WidgetClass listWidgetClass;
-extern WidgetClass menuButtonWidgetClass;
-extern WidgetClass multiSinkObjectClass;
-extern WidgetClass multiSrcObjectClass;
-extern WidgetClass overrideShellWidgetClass;
-extern WidgetClass panedWidgetClass;
-extern WidgetClass pannerWidgetClass;
-extern WidgetClass portholeWidgetClass;
-extern WidgetClass repeaterWidgetClass;
-extern WidgetClass scrollbarWidgetClass;
-extern WidgetClass shellWidgetClass;
-extern WidgetClass simpleMenuWidgetClass;
-extern WidgetClass simpleWidgetClass;
-extern WidgetClass smeBSBObjectClass;
-extern WidgetClass smeLineObjectClass;
-extern WidgetClass smeObjectClass;
-extern WidgetClass stripChartWidgetClass;
-extern WidgetClass textSinkObjectClass;
-extern WidgetClass textSrcObjectClass;
-extern WidgetClass textWidgetClass;
-extern WidgetClass toggleWidgetClass;
-extern WidgetClass topLevelShellWidgetClass;
-extern WidgetClass transientShellWidgetClass;
-extern WidgetClass treeWidgetClass;
-extern WidgetClass vendorShellWidgetClass;
-extern WidgetClass viewportWidgetClass;
-extern WidgetClass wmShellWidgetClass;
+#include <X11/Composite.h>
+#include <X11/Constraint.h>
+#include <X11/Core.h>
+#include <X11/Object.h>
+#include <X11/RectObj.h>
+#include <X11/Shell.h>
+#include <X11/Vendor.h>
+#include <X11/Xaw/AsciiSink.h>
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Box.h>
+#include <X11/Xaw/Dialog.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Grip.h>
+#include <X11/Xaw/List.h>
+#include <X11/Xaw/MenuButton.h>
+#include <X11/Xaw/MultiSink.h>
+#include <X11/Xaw/Paned.h>
+#include <X11/Xaw/Panner.h>
+#include <X11/Xaw/Porthole.h>
+#include <X11/Xaw/Repeater.h>
+#include <X11/Xaw/Scrollbar.h>
+#include <X11/Xaw/SimpleMenu.h>
+#include <X11/Xaw/Sme.h>
+#include <X11/Xaw/SmeBSB.h>
+#include <X11/Xaw/SmeLine.h>
+#include <X11/Xaw/StripChart.h>
+#include <X11/Xaw/Toggle.h>
+#include <X11/Xaw/Tree.h>
+#include <X11/Xaw/Viewport.h>
XmuWidgetNode XawWidgetArray[] = {
{ "applicationShell", &applicationShellWidgetClass },
commit 49c0a2441946f0d70fbd2612f193c95b84dde102
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Nov 1 20:47:34 2011 -0700
Build fix for -Werror=pointer-to-int-cast
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/XawIm.c b/src/XawIm.c
index d1da5ae..7a7152f 100644
--- a/src/XawIm.c
+++ b/src/XawIm.c
@@ -184,14 +184,14 @@ static VendorShellWidget SearchVendorShell(Widget w)
return(NULL);
}
-static XContext extContext = (XContext)NULL;
+static XContext extContext = (XContext)0;
static XawVendorShellExtPart *
SetExtPart(VendorShellWidget w, XawVendorShellExtWidget vew)
{
contextDataRec *contextData;
- if (extContext == (XContext)NULL) extContext = XUniqueContext();
+ if (extContext == (XContext)0) extContext = XUniqueContext();
contextData = XtNew(contextDataRec);
contextData->parent = (Widget)w;
@@ -296,13 +296,13 @@ ConfigureCB(Widget w, XtPointer closure, XEvent *event, Boolean *unused)
}
}
-static XContext errContext = (XContext)NULL;
+static XContext errContext = (XContext)0;
static Widget SetErrCnxt(Widget w, XIM xim)
{
contextErrDataRec *contextErrData;
- if (errContext == (XContext)NULL) errContext = XUniqueContext();
+ if (errContext == (XContext)0) errContext = XUniqueContext();
contextErrData = XtNew(contextErrDataRec);
contextErrData->widget = w;
@@ -1407,12 +1407,12 @@ Destroy(Widget w, XawVendorShellExtPart *ve)
return;
XtFree( (char*) ve->im.resources );
- if (extContext != (XContext)NULL &&
+ if (extContext != (XContext)0 &&
!XFindContext (XtDisplay (w), (Window)w,
extContext, (XPointer*)&contextData))
XtFree( (char*) contextData );
- if (errContext != (XContext)NULL &&
+ if (errContext != (XContext)0 &&
!XFindContext (XDisplayOfIM( ve->im.xim ), (Window) ve->im.xim,
errContext, (XPointer*) &contextErrData))
XtFree( (char*) contextErrData );
commit fe00db0ecafd95f6e1353b1d5f11ee6012a9b64c
Author: Matt Dew <marcoz@osource.org>
Date: Wed Oct 5 22:33:05 2011 -0600
Cleanup IDs and links in doc
1 - fix the capitalization of the ID attributes to match either the
<title> or <funcdef> string it goes with.
2 - fix any <linkend>'s that were affected by 1.
3 - any <function> in the docs that has an actual funcdef,
will become an olink.
Signed-off-by: Matt Dew <marcoz@osource.org>
diff --git a/specs/AsciiSink.xml b/specs/AsciiSink.xml
index 06bc87d..aba588b 100644
--- a/specs/AsciiSink.xml
+++ b/specs/AsciiSink.xml
@@ -38,7 +38,7 @@ handling Tab and Carriage
Return.\fP The source object also reports the text window metrics to the
text widgets.
</para>
-<sect2 id="asciisink_resources">
+<sect2 id='AsciiSink::Resources'>
<title>Resources</title>
<para>
<!-- .LP -->
diff --git a/specs/AsciiSource.xml b/specs/AsciiSource.xml
index ba170b9..b3ca6da 100644
--- a/specs/AsciiSource.xml
+++ b/specs/AsciiSource.xml
@@ -50,7 +50,7 @@ into an internal buffer. This buffer may then be modified, provided the
text widget is in the correct edit mode, just as if it were a source of
type <function>XawAsciiString</function>. Unlike R3 and earlier versions of the AsciiSrc,
it is now possible to specify an editable disk source. The file is not
-updated, however, until a call to <function>XawAsciiSave</function> is made. When the
+updated, however, until a call to <xref linkend='XawAsciiSave' xrefstyle='select: title'/> is made. When the
source is in this mode the <function>useStringInPlace</function> resource is ignored.
</para>
<para>
@@ -68,22 +68,22 @@ In the default case for AsciiSrc objects of type <function>XawAsciiString</funct
the resource <function>useStringInPlace</function> is false,
and the widget owns the string. The initial value of the
string resource, and any update made by the application
-programmer to the string resource with <function>XtSetValues</function>, is copied
+programmer to the string resource with <xref linkend='XtSetValues' xrefstyle='select: title'/>, is copied
into memory private to the widget, and managed internally by the widget.
The application writer
does not need to worry about running out of buffer space
(subject to the total memory available to the application).
The performance does not decay linearly as the buffer grows
large, as is necessarily the case when the text buffer is used
-in place. The application writer must use <function>XtGetValues</function> to
+in place. The application writer must use <xref linkend='XtGetValues' xrefstyle='select: title'/> to
determine the contents of the text buffer, which will return
a copy of the widget's text buffer as
-it existed at the time of the <function>XtGetValues</function> call. This copy
+it existed at the time of the <xref linkend='XtGetValues' xrefstyle='select: title'/> call. This copy
is not affected by subsequent updates to the text buffer, i.e.,
it is not updated as the user types input into the text buffer.
This copy is freed upon the next call to XtGetValues to
retrieve the string resource; however, to conserve memory,
-there is a convenience routine, <function>XawAsciiSourceFreeString</function>, allowing the
+there is a convenience routine, <xref linkend='XawAsciiSourceFreeString' xrefstyle='select: title'/>, allowing the
application programmer to direct the widget to free the copy.
</para>
<para>
@@ -94,12 +94,12 @@ is the string owner. The widget will take the value
of the string resource as its own text buffer, and the <function>length</function>
resource indicates the buffer size. In this case
the buffer contents change as the user types at the widget;
-it is not necessary to call <function>XtGetValues</function> on the string
+it is not necessary to call <xref linkend='XtGetValues' xrefstyle='select: title'/> on the string
resource to determine the contents of the buffer-it will
simply return the address of the application's implementation
of the text buffer.
</para>
-<sect2 id="asciisource_resources">
+<sect2 id='AsciiSource::Resources'>
<title>Resources</title>
<para>
<!-- .LP -->
@@ -206,7 +206,7 @@ retrieved from the argument list or from the resource database:
<!-- .Ou Bold -->
</para>
</sect2>
-<sect2 id="asciisource_convenience_routines">
+<sect2 id='AsciiSource::Convenience_Routines'>
<title>Convenience Routines</title>
<para>
<!-- .LP -->
@@ -220,11 +220,11 @@ commonly used functionality of the AsciiSrc.
<!-- .LP -->
When the AsciiSrc widget is not in <function>useStringInPlace</function> mode
space must be allocated whenever the file is saved, or the string is
-requested with a call to <function>XtGetValues</function>. This memory is allocated on the
+requested with a call to <xref linkend='XtGetValues' xrefstyle='select: title'/>. This memory is allocated on the
fly, and remains valid until the next time a string needs to be allocated.
You may save memory by freeing this string as soon as you are done
-with it by calling <function>XawAsciiSourceFreeString</function>.
-<funcsynopsis id='xawasciisourcefreestring'>
+with it by calling <xref linkend='XawAsciiSourceFreeString' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSourceFreeString'>
<funcprototype>
<funcdef>void<function> XawAsciiSourceFreeString</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -247,8 +247,8 @@ Specifies the AsciiSrc object.
<para>
<!-- .LP -->
This function will free the memory that contains the string pointer returned
-by <function>XtGetValues</function>. This will normally happen automatically when
-the next call to <function>XtGetValues</function> occurs, or when the widget is destroyed.
+by <xref linkend='XtGetValues' xrefstyle='select: title'/>. This will normally happen automatically when
+the next call to <xref linkend='XtGetValues' xrefstyle='select: title'/> occurs, or when the widget is destroyed.
</para>
</sect3>
<sect3 id="Saving_Files">
@@ -256,8 +256,8 @@ the next call to <function>XtGetValues</function> occurs, or when the widget is
<para>
<!-- .LP -->
To save the changes made in the current text source into a file use
-<function>XawAsciiSave</function>.
-<funcsynopsis id='xawasciisave'>
+<xref linkend='XawAsciiSave' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSave'>
<funcprototype>
<funcdef>Boolean<function> XawAsciiSave</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -279,7 +279,7 @@ Specifies the AsciiSrc object.
</para>
<para>
<!-- .LP -->
-<function>XawAsciiSave</function> returns <function>True</function> if the save was successful.
+<xref linkend='XawAsciiSave' xrefstyle='select: title'/> returns <function>True</function> if the save was successful.
It will update the file named in the <function>string</function> resource.
If the buffer has not been changed, no action will be taken. This function
only works on an AsciiSrc of type <function>XawAsciiFile</function>.
@@ -288,8 +288,8 @@ only works on an AsciiSrc of type <function>XawAsciiFile</function>.
<!-- .LP -->
<!-- .sp 1 -->
To save the contents of the current text buffer into a named file use
-<function>XawAsciiSaveAsFile</function>.
-<funcsynopsis id='xawasciisaveasfile'>
+<xref linkend='XawAsciiSaveAsFile' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSaveAsFile'>
<funcprototype>
<funcdef>Boolean<function> XawAsciiSaveAsFile</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -323,7 +323,7 @@ The name of the file to save the current buffer into.
<para>
<!-- .LP -->
This function returns <function>True</function> if the save was successful.
-<function>XawAsciiSaveAsFile</function> will work with a buffer of either type
+<xref linkend='XawAsciiSaveAsFile' xrefstyle='select: title'/> will work with a buffer of either type
<function>XawAsciiString</function> or type <function>XawAsciiFile</function>.
</para>
</sect3>
@@ -332,10 +332,10 @@ This function returns <function>True</function> if the save was successful.
<para>
<!-- .LP -->
To find out if the text buffer in an AsciiSrc object has changed
-since the last time it was saved with <function>XawAsciiSave</function> or queried
+since the last time it was saved with <xref linkend='XawAsciiSave' xrefstyle='select: title'/> or queried
<!-- .IN "XawAsciiSave" "" -->
-use <function>XawAsciiSourceChanged</function>.
-<funcsynopsis id='xawasciisourcechanged'>
+use <xref linkend='XawAsciiSourceChanged' xrefstyle='select: title'/>.
+<funcsynopsis id='XawAsciiSourceChanged'>
<funcprototype>
<funcdef>Boolean<function> XawAsciiSourceChanged</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -359,8 +359,8 @@ Specifies the AsciiSrc object.
<!-- .LP -->
This function will return <function>True</function> if the source has changed since
the last time it was saved or queried. The internal change flag is
-reset whenever the string is queried via <function>XtGetValues</function> or the
-buffer is saved via <function>XawAsciiSave</function>.
+reset whenever the string is queried via <xref linkend='XtGetValues' xrefstyle='select: title'/> or the
+buffer is saved via <xref linkend='XawAsciiSave' xrefstyle='select: title'/>.
</para>
</sect3>
diff --git a/specs/AsciiText.xml b/specs/AsciiText.xml
index 1a336d6..156e0c0 100644
--- a/specs/AsciiText.xml
+++ b/specs/AsciiText.xml
@@ -47,9 +47,9 @@ specifying these resources in a resource file it is necessary to use
<emphasis remap='I'>*AsciiText.resource_name</emphasis>, since they actually belong to the
children of the AsciiText widget, and not the AsciiText widget itself.
However, these resources may be set directly on the AsciiText widget at
-widget creation time, or via <function>XtSetValues</function>.
+widget creation time, or via <xref linkend='XtSetValues' xrefstyle='select: title'/>.
</para>
-<sect2 id="asciitext_resources">
+<sect2 id='AsciiText::Resources'>
<title>Resources</title>
<para>
<!-- .LP -->
diff --git a/specs/Box.xml b/specs/Box.xml
index fe93b42..692d7d2 100644
--- a/specs/Box.xml
+++ b/specs/Box.xml
@@ -38,7 +38,7 @@ are often called ButtonBox widgets, but the children are not
limited to buttons. The Box's children are arranged on a background that
has its own specified dimensions and color.
</para>
-<sect2 id="box_resources">
+<sect2 id='Box::Resources'>
<title>Resources</title>
<para>
<!-- .LP -->
diff --git a/specs/CH1.xml b/specs/CH1.xml
index 3363723..8d913b8 100644
--- a/specs/CH1.xml
+++ b/specs/CH1.xml
@@ -1,4 +1,4 @@
-<chapter id="athena_widgets_and_the_intrinsics">
+<chapter id='Athena_Widgets_and_The_Intrinsics'>
<title>Athena Widgets and The Intrinsics</title>
<para>
The X Toolkit is made up of two distinct pieces, the Xt Intrinsics and a
@@ -42,7 +42,7 @@ design allows for, but does not necessarily encourage, the free mixing
of radically differing widget implementations.
</para>
-<sect1 id="Introduction_to_the_tk">
+<sect1 id='Introduction_to_the_X_Toolkit'>
<title>Introduction to the X Toolkit</title>
<para>
<!-- .LP -->
@@ -646,7 +646,7 @@ resource is changed.
<listitem>
<para>
This resource is only settable at widget creation time, and may not
-be modified with <function>XtSetValues</function>.
+be modified with <xref linkend='XtSetValues' xrefstyle='select: title'/>.
</para>
</listitem>
</varlistentry>
diff --git a/specs/CH2.xml b/specs/CH2.xml
index 5cc8410..98ac97e 100644
--- a/specs/CH2.xml
+++ b/specs/CH2.xml
@@ -1,5 +1,5 @@
<chapter><title>Using Widgets</title>
-<sect1 id="using_widgets">
+<sect1 id='Using_Widgets'>
<title>Using Widgets</title>
<para>
Widgets serve as the primary tools for building a user interface or
@@ -35,7 +35,7 @@ description of the programming interface is provided in the document
If it is desirable that the application take advantage of
internationalization (i18n), you must establish locale with
<function>XtSetLanguageProc</function>
-before <function>XtDisplayInitialize</function> or <function>XtAppInitialize</function>
+before <function>XtDisplayInitialize</function> or <xref linkend='XtAppInitialize' xrefstyle='select: title'/>
is called. For full details, please refer to the document
<emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis>, section 2.2. However, the following simplest-case
call is sufficient in many or most applications.
@@ -69,7 +69,7 @@ of programs in the default "C" locale.
<!-- .XE -->
You must call a toolkit initialization function before invoking any
other toolkit routines (besides locale setting, above).
-<function>XtAppInitialize</function>
+<xref linkend='XtAppInitialize' xrefstyle='select: title'/>
opens the X server connection, parses the command line,
and creates an initial widget that will serve as the root of
a tree of widgets created by this application.
@@ -77,7 +77,7 @@ a tree of widgets created by this application.
<!-- .IN "toolkit initialization" "" "@DEF@" -->
<!-- .IN "XtAppInitialize" "" "@DEF@" -->
<!-- .IN "fallback resources" "" "@DEF@" -->
-<funcsynopsis id='xtappinitialize'>
+<funcsynopsis id='XtAppInitialize'>
<funcprototype>
<funcdef>Widget<function> XtAppInitialize</function></funcdef>
<paramdef>XtAppContext<parameter> app_context_return</parameter></paramdef>
@@ -126,7 +126,7 @@ first letter of the application name. For example, the application named
Specifies how to parse the command line for any application-specific
resources.
The options argument is passed as a parameter to
-<function>XrmParseCommand</function> .
+<olink targetdoc='libX11' targetptr='XrmParseCommand'><function>XrmParseCommand</function></olink>.
For further information,
see <emphasis remap='I'>Xlib - C Language Interface</emphasis>.
</para>
@@ -220,10 +220,10 @@ Creating a widget is a three-step process. First, the widget instance
is allocated, and various instance-specific attributes are set by
using <function>XtCreateWidget</function>. Second, the widget's parent is informed
of the new child by using <function>XtManageChild</function>. Finally, X windows are
-created for the parent and all its children by using <function>XtRealizeWidget</function>
+created for the parent and all its children by using <xref linkend='XtRealizeWidget' xrefstyle='select: title'/>
and specifying the top-most widget. The first two steps can be
-combined by using <function>XtCreateManagedWidget</function>. In addition,
-<function>XtRealizeWidget</function> is automatically called when the child becomes
+combined by using <xref linkend='XtCreateManagedWidget' xrefstyle='select: title'/>. In addition,
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/> is automatically called when the child becomes
managed if the parent is already realized.
</para>
<para>
@@ -231,7 +231,7 @@ managed if the parent is already realized.
To allocate, initialize, and manage a widget, use
<function>XtCreateManagedWidget .</function>
<!-- .IN "XtCreateManagedWidget" "" "@DEF@" -->
-<funcsynopsis id='xtcreatemanagedwidget'>
+<funcsynopsis id='XtCreateManagedWidget'>
<funcprototype>
<funcdef>Widget<function> XtCreateManagedWidget</function></funcdef>
<paramdef>String<parameter> name</parameter></paramdef>
@@ -659,7 +659,7 @@ directory is
<!-- .XE -->
<!-- .IN "realizing widgets" "" "@DEF@" -->
The
-<function>XtRealizeWidget</function>
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/>
function performs two tasks:
</para>
<itemizedlist>
@@ -675,7 +675,7 @@ for performance reasons.
Creates an X window for the widget and, if it is a composite widget,
realizes each of its managed children.
<!-- .IN "XtRealizeWidget" "" "@DEF@" -->
-<funcsynopsis id='xtrealizewidget'>
+<funcsynopsis id='XtRealizeWidget'>
<funcprototype>
<funcdef>void<function> XtRealizeWidget</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -708,9 +708,9 @@ see the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasi
Now that the application has created, managed and realized its
widgets, it is ready to process the events that will be delivered by the
X Server to this client. A function call that will process the
-events is <function>XtAppMainLoop</function>.
+events is <xref linkend='XtAppMainLoop' xrefstyle='select: title'/>.
<!-- .IN "XtAppMainLoop" "" "@DEF@" -->
-<funcsynopsis id='xtappmainloop'>
+<funcsynopsis id='XtAppMainLoop'>
<funcprototype>
<funcdef>void<function> XtAppMainLoop</function></funcdef>
<paramdef>XtAppContext<parameter> app_context</parameter></paramdef>
@@ -725,7 +725,7 @@ events is <function>XtAppMainLoop</function>.
<listitem>
<para>
Specifies the application context of this application. The value is
-normally returned by <function>XtAppInitialize</function>.
+normally returned by <xref linkend='XtAppInitialize' xrefstyle='select: title'/>.
</para>
</listitem>
</varlistentry>
@@ -786,13 +786,13 @@ Set an argument value
<!-- .LP -->
By default,
widget windows are mapped (made viewable) automatically by
-<function>XtRealizeWidget</function>. This behavior can be disabled by using
-<function>XtSetMappedWhenManaged</function>, making the client responsible for calling
-<function>XtMapWidget</function> to make the widget viewable.
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/>. This behavior can be disabled by using
+<xref linkend='XtSetMappedWhenManaged' xrefstyle='select: title'/>, making the client responsible for calling
+<xref linkend='XtMapWidget' xrefstyle='select: title'/> to make the widget viewable.
<!-- .IN "XtSetMappedWhenManaged" "" "@DEF@" -->
<!-- .IN "XtMapWidget" "" "" -->
<!-- .IN "XtRealizeWidget" "" "" -->
-<funcsynopsis id='xtsetmappedwhenmanaged'>
+<funcsynopsis id='XtSetMappedWhenManaged'>
<funcprototype>
<funcdef>void<function> XtSetMappedWhenManaged</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -821,9 +821,9 @@ Specifies the new value.
If map_when_managed is <function>True</function>, the widget is mapped automatically
when it is realized. If map_when_managed is <function>False</function>, the client
must call
-<function>XtMapWidget</function>
+<xref linkend='XtMapWidget' xrefstyle='select: title'/>
or make a second call to
-<function>XtSetMappedWhenManaged</function>
+<xref linkend='XtSetMappedWhenManaged' xrefstyle='select: title'/>
to cause the child window to be mapped.
</para>
</listitem>
@@ -834,10 +834,10 @@ to cause the child window to be mapped.
<!-- .LP -->
<!-- .sp -->
The definition for
-<function>XtMapWidget</function>
+<xref linkend='XtMapWidget' xrefstyle='select: title'/>
is:
<!-- .IN "XtMapWidget" "" "@DEF@" -->
-<funcsynopsis id='xtmapwidget'>
+<funcsynopsis id='XtMapWidget'>
<funcprototype>
<funcdef>void<function> XtMapWidget</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -862,13 +862,13 @@ Specifies the widget.
When you are creating several children in sequence for a previously
realized common parent it is generally more efficient to construct a
list of children as they are created (using <function>XtCreateWidget</function>) and
-then use <function>XtManageChildren</function> to request that their parent managed
+then use <xref linkend='XtManageChildren' xrefstyle='select: title'/> to request that their parent managed
them all at once. By managing a list of children at one time, the
parent can avoid wasteful duplication of geometry processing and the
associated ``screen flash''.
<!-- .IN "XtManageChildren" "" "@DEF@" -->
<!-- .IN "XtCreateWidget" "" "" -->
-<funcsynopsis id='xtmanagechildren'>
+<funcsynopsis id='XtManageChildren'>
<funcprototype>
<funcdef>void<function> XtManageChildren</function></funcdef>
<paramdef>WidgetList<parameter> children</parameter></paramdef>
@@ -916,9 +916,9 @@ see the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasi
<para>
<!-- .LP -->
To destroy a widget instance of any type, use
-<function>XtDestroyWidget</function>
+<xref linkend='XtDestroyWidget' xrefstyle='select: title'/>
<!-- .IN "XtDestroyWidget" "" "@DEF@" -->
-<funcsynopsis id='xtdestroywidget'>
+<funcsynopsis id='XtDestroyWidget'>
<funcprototype>
<funcdef>void<function> XtDestroyWidget</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -940,7 +940,7 @@ Specifies the widget.
</para>
<para>
<!-- .LP -->
-<function>XtDestroyWidget</function>
+<xref linkend='XtDestroyWidget' xrefstyle='select: title'/>
destroys the widget and recursively destroys any children that it may have,
including the windows created by its children.
After calling
@@ -957,7 +957,7 @@ To retrieve the current value of a resource attribute associated
with a widget instance, use
<function>XtGetValues .</function>
<!-- .IN "XtGetValues" "" "@DEF@" -->
-<funcsynopsis id='xtgetvalues'>
+<funcsynopsis id='XtGetValues'>
<funcprototype>
<funcdef>void<function> XtGetValues</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1018,7 +1018,7 @@ To modify the current value of a resource attribute associated with a
widget instance, use
<function>XtSetValues .</function>
<!-- .IN "XtSetValues" "" "@DEF@" -->
-<funcsynopsis id='xtsetvalues'>
+<funcsynopsis id='XtSetValues'>
<funcprototype>
<funcdef>void<function> XtSetValues</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1066,7 +1066,7 @@ Specifies the number of arguments in the argument list.
The arguments and values that are passed will depend on the widget
being modified. Some widgets may not allow certain resources to be
modified after the widget instance has been created or realized.
-No notification is given if any part of a <function>XtSetValues</function> request is
+No notification is given if any part of a <xref linkend='XtSetValues' xrefstyle='select: title'/> request is
ignored.
</para>
<para>
@@ -1076,7 +1076,7 @@ For further information about these functions, see the <emphasis remap='I'>X Too
<!-- .IN "XtSetValues" "" "" -->
<!-- .NT -->
The argument list entry for
-<function>XtGetValues</function>
+<xref linkend='XtGetValues' xrefstyle='select: title'/>
specifies the address to which the caller wants the value copied. The
argument list entry for
<function>XtSetValues ,</function>
@@ -1100,7 +1100,7 @@ Widgets can communicate changes in their state to their clients
by means of a callback facility.
The format for a client's callback handler is:
<!-- .IN "CallbackProc" "" "@DEF@" -->
-<funcsynopsis id='callbackproc'>
+<funcsynopsis id='CallbackProc'>
<funcprototype>
<funcdef>void<function> CallbackProc</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1154,7 +1154,7 @@ it passes the current position of the thumb in <emphasis remap='I'>call_data</em
<!-- .LP -->
Callbacks can be registered either by creating an argument containing
the callback list described below or by using the special convenience
-routines <function>XtAddCallback</function> and <function>XtAddCallbacks</function>. When the widget
+routines <xref linkend='XtAddCallback' xrefstyle='select: title'/> and <function>XtAddCallbacks</function>. When the widget
is created, a pointer to a list of callback procedure and data pairs can
be passed in the argument list to
<function>XtCreateWidget .</function>
@@ -1191,10 +1191,10 @@ callback when the callback list is executed.
<para>
<!-- .LP -->
The second method for registering callbacks is to use
-<function>XtAddCallback</function>
+<xref linkend='XtAddCallback' xrefstyle='select: title'/>
after the widget has been created.
<!-- .IN "XtAddCallback" "" "@DEF@" -->
-<funcsynopsis id='xtaddcallback'>
+<funcsynopsis id='XtAddCallback'>
<funcprototype>
<funcdef>void<function> XtAddCallback</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -1249,7 +1249,7 @@ Specifies the data to be passed to the callback when it is invoked.
</para>
<para>
<!-- .LP -->
-<function>XtAddCallback</function>
+<xref linkend='XtAddCallback' xrefstyle='select: title'/>
adds the specified callback to the list for the named widget.
</para>
<para>
@@ -1310,7 +1310,7 @@ and
<listitem>
<para>
Call the
-<function>XtAppInitialize</function>
+<xref linkend='XtAppInitialize' xrefstyle='select: title'/>
<!-- .IN "XtAppInitialize" -->
function before invoking any other toolkit or Xlib functions.
For further information,
@@ -1336,7 +1336,7 @@ For further information, see Section 2.9.2.2. <!-- xref -->
<listitem>
<para>
When the argument list is set up, create the widget with the
-<function>XtCreateManagedWidget</function> function. For further information, see
+<xref linkend='XtCreateManagedWidget' xrefstyle='select: title'/> function. For further information, see
Section 2.2 and the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interface</emphasis>.
<!-- .IN "XtCreateManagedWidget" -->
</para>
@@ -1346,7 +1346,7 @@ Section 2.2 and the <emphasis remap='I'>X Toolkit Intrinsics - C Language Interf
If the widget has any callback routines, set by the
<function>XtNcallback</function>
argument or the
-<function>XtAddCallback</function>
+<xref linkend='XtAddCallback' xrefstyle='select: title'/>
function, declare these routines within the application.
<!-- .IN "XtAddCallback" -->
</para>
@@ -1355,7 +1355,7 @@ function, declare these routines within the application.
<para>
After creating the initial widget hierarchy, windows must be created
for each widget by calling
-<function>XtRealizeWidget</function>
+<xref linkend='XtRealizeWidget' xrefstyle='select: title'/>
on the top level widget.
<!-- .IN "XtRealizeWidget" -->
</para>
@@ -1591,7 +1591,7 @@ This matches any widget in the Foo application that is named <emphasis remap='I'
<para>
<!-- .LP -->
The root of all application widget trees is the widget returned by
-<function>XtAppInitialize</function>. Even though this is actually an
+<xref linkend='XtAppInitialize' xrefstyle='select: title'/>. Even though this is actually an
ApplicationShell widget, the toolkit replaces its widget class with the
class name of the application. The name of this widget is either
the name used to invoke the application (<function>argv[0]</function>) or the name of
diff --git a/specs/CH3.xml b/specs/CH3.xml
index 8fdefcc..37ee8b5 100644
--- a/specs/CH3.xml
+++ b/specs/CH3.xml
@@ -1,4 +1,4 @@
-<chapter id="simple_widgets">
+<chapter id='Simple_Widgets'>
<title>Simple Widgets</title>
<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="CH3.intro.xml"/> -->
diff --git a/specs/CH4.xml b/specs/CH4.xml
index 00c89f7..0546af5 100644
--- a/specs/CH4.xml
+++ b/specs/CH4.xml
@@ -1,4 +1,4 @@
-<chapter id="menus">
+<chapter id='Menus'>
<title>Menus</title>
<para>
The Athena widget set provides support for single paned non-hierarchical
diff --git a/specs/CH5.xml b/specs/CH5.xml
index eb3f2fb..2636aff 100644
--- a/specs/CH5.xml
+++ b/specs/CH5.xml
@@ -1,4 +1,4 @@
-<chapter id="text_widgets">
+<chapter id='Text_Widgets'>
<title>Text Widgets</title>
<para>
@@ -37,8 +37,8 @@ modifications a user is allowed to make:
<para>
Read-only mode does not allow the user or the programmer to modify the text
in the widget. While the entire string may be reset in
-read-only mode with <function>XtSetValues</function>, it cannot be modified via
-with <function>XawTextReplace</function>. Append-only and editable modes allow
+read-only mode with <xref linkend='XtSetValues' xrefstyle='select: title'/>, it cannot be modified via
+with <xref linkend='XawTextReplace' xrefstyle='select: title'/>. Append-only and editable modes allow
the text at the insertion point to be modified. The only difference is
that text may only be added to or removed from the end of a buffer in
append-only mode.
diff --git a/specs/CH6.xml b/specs/CH6.xml
index e8009af..8424387 100644
--- a/specs/CH6.xml
+++ b/specs/CH6.xml
@@ -1,4 +1,4 @@
-<chapter id="composite_and_constraint_widgets">
+<chapter id='Composite_and_Constraint_Widgets'>
<title>Composite and Constraint Widgets</title>
<para>
These widgets may contain arbitrary widget children. They implement a
@@ -87,7 +87,7 @@ application programmer.
<para>
<!-- .LP -->
If the application wishes to change the size or location of
-any widget it should make a call to <function>XtSetValues</function>. This will
+any widget it should make a call to <xref linkend='XtSetValues' xrefstyle='select: title'/>. This will
<!-- .IN "XtSetValues" "" -->
allow the widget to ask its parent for the new size or location.
As noted above the parent is allowed to refuse this request,
diff --git a/specs/CH7.xml b/specs/CH7.xml
index 62d23bb..a84e3cf 100644
--- a/specs/CH7.xml
+++ b/specs/CH7.xml
@@ -1,4 +1,4 @@
-<chapter id="creating_new_widgets__subclassing_">
+<chapter id='Creating_New_Widgets_Subclassing'>
<title>Creating New Widgets (Subclassing)</title>
<para>
Although the task of creating a new widget may at first appear a little
diff --git a/specs/Dialog.xml b/specs/Dialog.xml
index c779d76..aff03d7 100644
--- a/specs/Dialog.xml
+++ b/specs/Dialog.xml
@@ -40,7 +40,7 @@ into which the user types input. The third line can contain buttons
that let the user confirm or cancel the Dialog input. Any of these
areas may be omitted by the application.
</para>
-<sect2 id="dialog_resources">
+<sect2 id='Dialog::Resources'>
<title>Resources</title>
<para>
<!-- .LP -->
@@ -422,7 +422,7 @@ resizable If this resource is False then the parent
<!-- .Rl -->
</para>
</sect2>
-<sect2 id="dialog_layout_semantics">
+<sect2 id='Dialog::Layout_Semantics'>
<title>Layout Semantics</title>
<!-- .IN "Dialog widget" "layout semantics" -->
<para>
@@ -556,7 +556,7 @@ own Dialog policy.
</para>
</sect3>
</sect2>
-<sect2 id="Automatically_Created_Children_">
+<sect2 id='Automatically_Created_Children'>
<title>Automatically Created Children.</title>
<!-- .IN "Dialog widget" "automatically created children" -->
<para>
@@ -573,14 +573,14 @@ available through the Dialog widget itself.
<!-- .LP -->
</para>
</sect2>
-<sect2 id="dialog_convenience_routines">
+<sect2 id='Dialog::Convenience_Routines'>
<title>Convenience Routines</title>
<para>
<!-- .LP -->
To return the character string in the text field, use
<!-- .PN XawDialogGetValueString . -->
<!-- .IN "XawDialogGetValueString" "" "@DEF@" -->
-<funcsynopsis id='xawdialoggetvaluestring'>
+<funcsynopsis id='XawDialogGetValueString'>
<funcprototype>
<funcdef>String<function> XawDialogGetValueString</function></funcdef>
<paramdef>Widget<parameter> w</parameter></paramdef>
@@ -605,19 +605,19 @@ Specifies the Dialog widget.
This function returns a copy of the value string of the Dialog
widget. This string is allocated by the AsciiText widget and will
remain valid and unchanged until another call to
-<function>XawDialogGetValueString</function> or an <function>XtGetValues</function> call on the
+<xref linkend='XawDialogGetValueString' xrefstyle='select: title'/> or an <xref linkend='XtGetValues' xrefstyle='select: title'/> call on the
<function>value</function> widget, when the string will be automatically freed, and
a new string is returned. This string may be freed earlier by calling
Reply to: