diff --git a/man/XtAppAddSignal.man b/man/XtAppAddSignal.man
index 885682d9655b4f1033fc17ffb5fda1c8d64bd78f..53e336049b420c9e7626f64c529e560ff18bdee6 100644
--- a/man/XtAppAddSignal.man
+++ b/man/XtAppAddSignal.man
@@ -31,6 +31,10 @@
.ds xC Inter-Client Communication Conventions Manual
.ds Rn 3
.ds Vn 2.2
+.ie \n(.g .ds `` \(lq
+.el .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el .ds '' ''
.hw XtApp-Add-Signal wid-get
.na
.TH XtAppAddSignal __libmansuffix__ __xorgversion__ "XT FUNCTIONS"
@@ -83,7 +87,7 @@ If
is called multiple times before the Intrinsics are able to invoke the
registered callback, the callback is only called once.
Logically the
-Intrinsics maintain ``pending'' for each registered callback.
+Intrinsics maintain \*(``pending\*('' for each registered callback.
This flag is initially
.B False
and is set to
diff --git a/man/XtCreatePopupShell.man b/man/XtCreatePopupShell.man
index 2c6729f066d20e324718658256669c32ed2eb4f0..911a56da4775aed67fbe37d18f7ceace2d92e189 100644
--- a/man/XtCreatePopupShell.man
+++ b/man/XtCreatePopupShell.man
@@ -32,6 +32,10 @@
.ds xC Inter-Client Communication Conventions Manual
.ds Rn 3
.ds Vn 2.2
+.ie \n(.g .ds `` \(lq
+.el .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el .ds '' ''
.hw XtCreate-Popup-Shell XtVaCreate-Popup-Shell wid-get
.na
.TH XtCreatePopupShell __libmansuffix__ __xorgversion__ "XT FUNCTIONS"
@@ -69,7 +73,7 @@ children list, attaches the shell to the parent's pop-ups list directly.
A spring-loaded pop-up invoked from a translation table already must exist
at the time that the translation is invoked,
so the translation manager can find the shell by name.
-Pop-ups invoked in other ways can be created ``on-the-fly'' when
+Pop-ups invoked in other ways can be created \*(``on-the-fly\*('' when
the pop-up actually is needed.
This delayed creation of the shell is particularly useful when you pop up
an unspecified number of pop-ups.
diff --git a/man/XtDisplayStringConversionWarning.man b/man/XtDisplayStringConversionWarning.man
index ff4c03d99e89bcb61b1ce678800dfc2efad66caf..3e0b0c98c294711fad0b5bc3c74aedbc0d604889 100644
--- a/man/XtDisplayStringConversionWarning.man
+++ b/man/XtDisplayStringConversionWarning.man
@@ -32,6 +32,10 @@
.ds xC Inter-Client Communication Conventions Manual
.ds Rn 3
.ds Vn 2.2
+.ie \n(.g .ds `` \(lq
+.el .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el .ds '' ''
.hw XtDisplay-String-Conversion-Warning wid-get
.na
.TH XtDisplayStringConversionWarning __libmansuffix__ __xorgversion__ "XT FUNCTIONS"
@@ -55,9 +59,11 @@ The
.B XtDisplayStringConversionWarning
function issues a warning message using
.B XtAppWarningMsg
-with name ``conversionError'', type ``string'', class ``XtToolkitError,
-and the default message string ``Cannot convert "\fIfrom_value\fP" to
-type \fIto_type\fP''.
+with name \*(``conversionError\*('',
+type \*(``string\*('',
+class \*(``XtToolkitError\*('',
+and the default message string
+\*(``Cannot convert "\fIfrom_value\fP" to type \fIto_type\fP\*(''.
.LP
To issue other types of warning or error messages, the type converter
should use
diff --git a/man/XtFindFile.man b/man/XtFindFile.man
index 3a87a9b8ffc9c7f65d03b276be1662bd10720d84..2a361b2cbef630c1653b024771b17644a350e848 100644
--- a/man/XtFindFile.man
+++ b/man/XtFindFile.man
@@ -31,6 +31,10 @@
.ds xC Inter-Client Communication Conventions Manual
.ds Rn 3
.ds Vn 2.2
+.ie \n(.g .ds `` \(lq
+.el .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el .ds '' ''
.hw XtFind-File wid-get
.na
.TH XtFindFile __libmansuffix__ __xorgversion__ "XT FUNCTIONS"
@@ -56,10 +60,10 @@ potential file names delimited by colons.
Within each name, the
percent character specifies a string substitution selected by the
following character.
-The character sequence ``%:'' specifies an
+The character sequence \*(``%:\*('' specifies an
embedded colon that is not a delimiter; the sequence is replaced by a
single colon.
-The character sequence ``%%'' specifies a percent
+The character sequence \*(``%%\*('' specifies a percent
character that does not introduce a substitution; the sequence is
replaced by a single percent character.
If a percent character is
@@ -73,7 +77,7 @@ A \fIsubstitution\fP field entry of NULL
is equivalent to a pointer to an empty string.
If the operating
system does not interpret multiple embedded name separators in the
-path (i.e., ``/'' in POSIX) the same way as a single separator,
+path (i.e., \*(``/\*('' in POSIX) the same way as a single separator,
.B XtFindFile
will collapse multiple separators into a single one after performing
all string substitutions.
diff --git a/man/XtResolvePathname.man b/man/XtResolvePathname.man
index ad1c3079fffaa7f7f950a4a61976f9135b9cbc90..26cfba16bf13f7abad235ff14e41842b50a4fd67 100644
--- a/man/XtResolvePathname.man
+++ b/man/XtResolvePathname.man
@@ -31,6 +31,10 @@
.ds xC Inter-Client Communication Conventions Manual
.ds Rn 3
.ds Vn 2.2
+.ie \n(.g .ds `` \(lq
+.el .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el .ds '' ''
.hw XtResolve-Pathname wid-get
.na
.TH XtResolvePathname __libmansuffix__ __xorgversion__ "XT FUNCTIONS"
@@ -72,13 +76,14 @@ are determined from the value of the language string retrieved by
.B XtDisplayInitialize
for the specified display.
To set the
-language for all applications specify ``*xnlLanguage: \fIlang\fP'' in the
+language for all applications specify \*(``*xnlLanguage: \fIlang\fP\*('' in the
resource database.
The format and content of the language string are
implementation-defined.
One suggested syntax is to compose
-the language string of three parts; a ``language part'', a
-``territory part'' and a ``codeset part''.
+the language string of three parts:
+a \*(``language part\*('', a
+\*(``territory part\*('' and a \*(``codeset part\*(''.
The manner in which
this composition is accomplished is implementation-defined
and the \*(xI make no interpretation of the parts other
@@ -146,10 +151,10 @@ adjacent colons, \fB%N%S\fP will be inserted between them.
The \fItype\fP parameter is intended to be a category of files, usually
being translated into a directory in the pathname.
Possible values
-might include ``app-defaults'', ``help'', and ``bitmap''.
+might include \*(``app-defaults\*('', \*(``help\*('', and \*(``bitmap\*(''.
.LP
The \fIsuffix\fP parameter is intended to be appended to the file name.
-Possible values might include ``.txt'', ``.dat'', and ``.bm''.
+Possible values might include \*(``.txt\*('', \*(``.dat\*('', and \*(``.bm\*(''.
.LP
A suggested value for the default path on POSIX-based systems is
.IP
@@ -175,7 +180,7 @@ elements to the implementation-specific default path, typically to
allow additional directories to be searched without preventing
resources in the system directories from being found.
For example, a
-user installing resource files under a directory called ``ourdir''
+user installing resource files under a directory called \*(``ourdir\*(''
might set
.B \s-1XFILESEARCHPATH\s+1
to
diff --git a/man/XtSetLanguageProc.man b/man/XtSetLanguageProc.man
index d82aecb216c8e68656d59753698d9d9c6e005a34..fa2cb6f70ed1686146bcb97bdc735a74e34e880d 100644
--- a/man/XtSetLanguageProc.man
+++ b/man/XtSetLanguageProc.man
@@ -32,6 +32,10 @@
.ds xC Inter-Client Communication Conventions Manual
.ds Rn 3
.ds Vn 2.2
+.ie \n(.g .ds `` \(lq
+.el .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el .ds '' ''
.hw XtSet-Language-Proc wid-get
.na
.TH XtSetLanguageProc __libmansuffix__ __xorgversion__ "XT FUNCTIONS"
@@ -89,7 +93,7 @@ to verify that the current locale is supported.
If the locale is not
supported, a warning message is issued with
.B XtWarning
-and the locale is set to ``C''.
+and the locale is set to \*(``C\*(''.
.IP \(bu 5
Calls
.B XSetLocaleModifiers
diff --git a/man/XtStringConversionWarning.man b/man/XtStringConversionWarning.man
index bfe6117b3c77e0fd6c008fca05813474740c5777..b99e92ce6c3a03d7c4e87f608e9a83b6dadb6229 100644
--- a/man/XtStringConversionWarning.man
+++ b/man/XtStringConversionWarning.man
@@ -32,6 +32,10 @@
.ds xC Inter-Client Communication Conventions Manual
.ds Rn 3
.ds Vn 2.2
+.ie \n(.g .ds `` \(lq
+.el .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el .ds '' ''
.hw XtString-Conversion-Warning wid-get
.na
.TH XtStringConversionWarning __libmansuffix__ __xorgversion__ "XT COMPATIBILITY FUNCTIONS"
@@ -49,9 +53,11 @@ Specifies the name of the type to which the string could not be converted.
.SH DESCRIPTION
The
.B XtStringConversionWarning
-function issues a warning message with name ``conversionError'',
-type ``string'', class ``XtToolkitError, and the default message string
-``Cannot convert "\fIsrc\fP" to type \fIdst_type\fP''.
+function issues a warning message with name \*(``conversionError\*('',
+type \*(``string\*('',
+class \*(``XtToolkitError\*('',
+and the default message string
+\*(``Cannot convert "\fIsrc\fP" to type \fIdst_type\fP\*(''.
.LP
.B XtStringConversionWarning
has been replaced by
diff --git a/specs/CH01.xml b/specs/CH01.xml
index 793fd574196057ab2a7c9021b70381719d55b2e0..e208a3c4e19911c0a49e4700213ff83ae0380bd0 100644
--- a/specs/CH01.xml
+++ b/specs/CH01.xml
@@ -77,29 +77,29 @@ any module, widget, or application that calls an Intrinsics procedure.
Applications that use the Intrinsics mechanisms
must include the header files
-<X11/Intrinsic.h>
+
and
-<X11/StringDefs.h>,
+,
or their equivalent,
and they may also include
-<X11/Xatoms.h>
+
and
-<X11/Shell.h>.
+.
In addition, widget implementations should include
-<X11/IntrinsicP.h>
+
instead of
-<X11/Intrinsic.h>.
+.
The applications must also include the additional header files for
each widget class that they are to use (for example,
-<X11/Xaw/Label.h>
+
or
-<X11/Xaw/Scrollbar.h>).
+
On a POSIX-based system,
the Intrinsics object library file is named
-libXt.a
+libXt.a
and is usually referenced as -lXt when linking the application.
@@ -279,7 +279,7 @@ creating instances of Core are
In
-IntrinsicP.h:
+:
extern WidgetClassRec widgetClassRec;
@@ -287,7 +287,7 @@ extern WidgetClassRec widgetClassRec;
In
-Intrinsic.h:
+:
extern WidgetClass widgetClass, coreWidgetClass;
@@ -303,7 +303,7 @@ are defined for generic actions on widgets.
In order to make these types opaque and ensure that the compiler
does not allow applications to access private data, the Intrinsics use
incomplete structure definitions in
-Intrinsic.h:
+:
typedef struct _WidgetClassRec *WidgetClass, *CoreWidgetClass;
@@ -368,7 +368,7 @@ to specific widget types.
In order to make these types opaque and ensure that the compiler
does not allow applications to access private data, the Intrinsics use
incomplete structure definitions in
-Intrinsic.h.
+.
typedef struct _WidgetRec *Widget, *CoreWidget;
@@ -677,14 +677,14 @@ instances of Composite are
In
-IntrinsicP.h:
+:
extern CompositeClassRec compositeClassRec;
In
-Intrinsic.h:
+:
extern WidgetClass compositeWidgetClass;
@@ -703,7 +703,7 @@ The symbolic constant for the
version identifier is
XtCompositeExtensionVersion
(see ).
-Intrinsic.h
+
uses an incomplete structure
definition to ensure that the compiler catches attempts to access
private data.
@@ -743,7 +743,7 @@ typedef struct {
} CompositeRec, *CompositeWidget;
-Intrinsic.h
+
uses an incomplete structure definition to ensure that the
compiler catches attempts to access private data.
@@ -924,14 +924,14 @@ instances of Constraint are
In
-IntrinsicP.h:
+:
extern ConstraintClassRec constraintClassRec;
In
-Intrinsic.h:
+:
extern WidgetClass constraintWidgetClass;
@@ -951,7 +951,7 @@ The symbolic constant for the
version identifier is
XtConstraintExtensionVersion
(see ).
-Intrinsic.h
+
uses an incomplete structure definition to ensure that the
compiler catches attempts to access private data.
@@ -990,7 +990,7 @@ typedef struct {
} ConstraintRec, *ConstraintWidget;
-Intrinsic.h
+
uses an incomplete structure definition to ensure that the
compiler catches attempts to access private data.
@@ -1048,7 +1048,7 @@ value
-An unsigned integer datum with a minimum range of [0..2^16-1].
+An unsigned integer datum with a minimum range of [0..216-1].
@@ -1059,7 +1059,7 @@ An unsigned integer datum with a minimum range of [0..2^16-1].
-An unsigned integer datum with a minimum range of [0..2^16-1].
+An unsigned integer datum with a minimum range of [0..216-1].
@@ -1070,7 +1070,7 @@ An unsigned integer datum with a minimum range of [0..2^16-1].
-A signed integer datum with a minimum range of [-2^15..2^15-1].
+A signed integer datum with a minimum range of [-215..215-1].
@@ -1267,7 +1267,7 @@ the background_pixmap field has the corresponding
XtNbackgroundPixmap,
which is defined as the string “backgroundPixmap”.
Many predefined names are listed in
-<X11/StringDefs.h>.
+.
Before you invent a new name,
you should make sure there is not already a name that you can use.
@@ -1280,7 +1280,7 @@ Each resource class string should have a symbolic identifier prefixed with
“XtC”
(for example, XtCBorderWidth).
Many predefined classes are listed in
-<X11/StringDefs.h>.
+.
@@ -1291,7 +1291,7 @@ Each representation string should have a symbolic identifier prefixed with
“XtR”
(for example, XtRTranslationTable).
Many predefined representation types are listed in
-<X11/StringDefs.h>.
+.
@@ -1456,7 +1456,7 @@ For example,
the public .h file for the
Constraint
widget class is
-Constraint.h.
+.
@@ -1626,7 +1626,7 @@ For example,
the private .h file for the
Constraint
widget class is
-ConstrainP.h.
+.
@@ -2009,7 +2009,7 @@ To check a widget's class
and to generate a debugging error message, use
,
defined in
-<X11/IntrinsicP.h>:
+:
@@ -2427,7 +2427,7 @@ is a procedure that issues an error message if it is actually called.
For example,
-CompositeP.h
+
contains these definitions:
@@ -2453,6 +2453,7 @@ static void CompositeClassPartInitialize(WidgetClass widgetClass)
.
.
.
+}
Nonprocedure fields may be inherited in the same manner as procedure
diff --git a/specs/CH02.xml b/specs/CH02.xml
index 395cd0653b61189bc8f82eba92c685fb4eb9d019..13333aca37a686ab019b0bb866c9ee55ab7ebdbc 100644
--- a/specs/CH02.xml
+++ b/specs/CH02.xml
@@ -435,7 +435,7 @@ add it to an application context, use
- Display *XtOpenDisplay
+ Display *XtOpenDisplay
XtAppContext app_context
const char * display_string
const char * application_name
diff --git a/specs/CH04.xml b/specs/CH04.xml
index c92eb2025280216422d419c4789999bdfbe0ecc9..e449e1be9f3d9cdf94c94b32323f7786f20a3602 100644
--- a/specs/CH04.xml
+++ b/specs/CH04.xml
@@ -399,17 +399,17 @@ Shell.
The declarations for all Intrinsics-defined shells except
VendorShell appear in
-Shell.h
+
and
-ShellP.h.
+.
VendorShell has separate public and private .h files which are included by
-Shell.h
+
and
-ShellP.h.
+.
-Shell.h
+
uses incomplete structure definitions to ensure that the
compiler catches attempts to access private data in any of the Shell
instance or class data structures.
diff --git a/specs/CH06.xml b/specs/CH06.xml
index cdc1268b1047633c457f83fbdaa5633cd03b93d3..5e5b090d26cf2be9f3b89b7720a2df53f3314a93 100644
--- a/specs/CH06.xml
+++ b/specs/CH06.xml
@@ -289,7 +289,7 @@ typedef enum {
The request_mode definitions are from
-<X11/X.h>.
+.
@@ -376,7 +376,7 @@ structure the caller wants to specify.
The stack_mode definitions are from
-<X11/X.h>:
+:
diff --git a/specs/CH07.xml b/specs/CH07.xml
index 7eefd04953d015eb854bdc8885a1bf91ede00b0b..6d8127ff49f31e77f1f603a52cfeef03b665b1cc 100644
--- a/specs/CH07.xml
+++ b/specs/CH07.xml
@@ -626,7 +626,7 @@ call
and store the resulting identifier in a place accessible to the signal
handler. When a signal arrives, the signal handler should call
-to notify the Intrinsics that a signal has occured. To register a signal
+to notify the Intrinsics that a signal has occurred. To register a signal
callback use
.
@@ -713,7 +713,7 @@ call.
-To notify the Intrinsics that a signal has occured, use
+To notify the Intrinsics that a signal has occurred, use
.
@@ -2259,7 +2259,7 @@ The mask is the bitwise inclusive OR of any combination of
and
XtIMSignal.
As a convenience,
-Intrinsic.h
+
defines the symbolic name
XtIMAll
to be the bitwise inclusive OR of these four event types.
diff --git a/specs/CH09.xml b/specs/CH09.xml
index 8f1a5c676403a96eb51509443aadf90049efd367..76219dbac40931b81246dab2743f7b91c72d1ff2 100644
--- a/specs/CH09.xml
+++ b/specs/CH09.xml
@@ -84,7 +84,7 @@ sequence “Xt” are reserved to the Intrinsics for future standard and
implementation-dependent uses.
Widget header files typically contain a symbolic name for each resource name.
All resource names, classes, and types used by the Intrinsics are named in
-<X11/StringDefs.h>.
+.
The Intrinsics's symbolic resource names begin with
“XtN”
and are followed by the string name (for example, XtNbackgroundPixel
@@ -370,7 +370,7 @@ The Intrinsics define the following resource types:
-<X11/StringDefs.h>
+
also defines the following resource types as a
convenience for widgets, although they do not have any corresponding
data type assigned:
@@ -1754,7 +1754,7 @@ an input value of representation type
Type converters use pointers to
XrmValue
structures (defined in
-<X11/Xresource.h>;
+
see Section 15.4 in
Xlib — C Language X Interface.)
for input and output values.
@@ -2514,7 +2514,7 @@ and the structure
XtConvertArgRec
specify how each argument is derived.
These are defined in
-<X11/Intrinsic.h>.
+.
typedef enum {
diff --git a/specs/CH11.xml b/specs/CH11.xml
index 91f5f868309f8e82f8baa4c9deb1fcd324d28595..fc45a72e404fe7f8801fda7eba6a75f278bc7edc 100644
--- a/specs/CH11.xml
+++ b/specs/CH11.xml
@@ -3277,7 +3277,7 @@ event.
Specifies the region object (as defined in
-<X11/Xutil.h>).
+).
diff --git a/specs/CH12.xml b/specs/CH12.xml
index 531411d7c2e1f5a2ed1c2c479405e857d0a0868a..70bc84f1ff8cb1637ac9416a092e39e717cba495 100644
--- a/specs/CH12.xml
+++ b/specs/CH12.xml
@@ -141,14 +141,14 @@ are
In
-IntrinsicP.h:
+:
extern ObjectClassRec objectClassRec;
In
-Intrinsic.h:
+:
extern WidgetClass objectClass;
@@ -166,7 +166,7 @@ The symbolic constant for the
version identifier is
XtObjectExtensionVersion
(see ).
-Intrinsic.h
+
uses an incomplete structure definition to ensure that the
compiler catches attempts to access private data:
@@ -207,7 +207,7 @@ object types.
In
-IntrinsicP.h:
+:
typedef struct _ObjectRec {
@@ -216,7 +216,7 @@ typedef struct _ObjectRec {
In
-Intrinsic.h:
+:
typedef struct _ObjectRec *Object;
@@ -571,14 +571,14 @@ are
In
-Intrinsic.h:
+:
extern RectObjClassRec rectObjClassRec;
In
-Intrinsic.h:
+:
extern WidgetClass rectObjClass;
@@ -593,7 +593,7 @@ and the opaque variable
are defined for generic actions on objects
whose class is RectObj or a subclass of
RectObj.
-Intrinsic.h
+
uses an incomplete structure definition to ensure that the compiler
catches attempts to access private data:
@@ -637,7 +637,7 @@ typedef struct _RectObjRec {
In
-Intrinsic.h:
+:
typedef struct _RectObjRec* RectObj;
diff --git a/specs/CH13.xml b/specs/CH13.xml
index 9b6bc88a2186bfc1c3eb271bb4c72ad5c91b96da..0b54bbd42444db8b0e83dcca22a39171a9e9b16b 100644
--- a/specs/CH13.xml
+++ b/specs/CH13.xml
@@ -591,7 +591,7 @@ the session manager in restarting applications based on the Intrinsics.
The resource name and class strings defined by the Intrinsics shell
widgets in
-<X11/Shell.h>
+
are now listed in Appendix E. The addition of a new symbol
for the
WMShell
diff --git a/specs/acknowledgement.xml b/specs/acknowledgement.xml
index 86eb7172b36da0ed61f5822c56df28b4dac011da..cabfa691aca2454c97383e7b9dc7efe5a88ef041 100644
--- a/specs/acknowledgement.xml
+++ b/specs/acknowledgement.xml
@@ -208,7 +208,7 @@ to the Intrinsics:
Steve Pitschke (Stellar)
- C.Doug Blewett (AT&T)
+ C. Doug Blewett (AT&T)
Bob Miller (HP)
@@ -220,7 +220,7 @@ to the Intrinsics:
Marcel Meth (AT&T)
- JimFulton (MIT)
+ Jim Fulton (MIT)
Mike Collins (Digital)
@@ -236,7 +236,7 @@ to the Intrinsics:
Gabriel Beged-Dov (HP)
- GlennWidener (Tektronix)
+ Glenn Widener (Tektronix)
@@ -273,7 +273,7 @@ code contributed by each of the following:
Don Alecci (AT&T)
- EllisCohen (OSF)
+ Ellis Cohen (OSF)
Donna Converse (MIT)
diff --git a/specs/appB.xml b/specs/appB.xml
index f8396c515a90ea5421931e7daddd0f073711c92a..059374668932e2f79f324cf42543b0f541d2237e 100644
--- a/specs/appB.xml
+++ b/specs/appB.xml
@@ -830,7 +830,7 @@ corresponding Latin 1 KeySym, for example, “0” is the KeySym XK_0.
Other single character KeySyms are treated as literal constants from Latin 1,
for example, “!” is treated as 0x21.
Standard KeySym names are as defined in
-<X11/keysymdef.h>
+<X11/keysymdef.h>
with the “XK_” prefix removed.
diff --git a/specs/appE.xml b/specs/appE.xml
index 0fc9097f124dccfe3d19da98662fe214accf7fa0..6c309646f1955e2ef69999dcd4ecaaa3b06e8db1 100644
--- a/specs/appE.xml
+++ b/specs/appE.xml
@@ -5,7 +5,7 @@
Defined Strings
-The StringDefs.h
+The
header file contains definitions for the following resource name,
class, and representation type symbolic constants.
@@ -311,10 +311,6 @@ class, and representation type symbolic constants.
XtNsensitive
"sensitive"
-
- XtNsession
- "session"
-
XtNshells
"shells"
@@ -628,10 +624,6 @@ class, and representation type symbolic constants.
XtCSensitive
"Sensitive"
-
- XtCSession
- "Session"
-
XtCSpace
"Space"
@@ -1187,7 +1179,7 @@ class, and representation type symbolic constants.
The
-Shell.h
+
header file contains definitions for the following resource name,
class, and representation type symbolic constants.
diff --git a/src/Functions.c b/src/Functions.c
index 9937a50abfafe3d6a1a77d7b9dc0652c7b3aa68b..7694cdbcb0e7420b80767bf3ef3735c3ac39fb13 100644
--- a/src/Functions.c
+++ b/src/Functions.c
@@ -212,5 +212,5 @@ String XtNewString(String str)
if (str == NULL)
return NULL;
else
- return strcpy(__XtMalloc((unsigned)strlen(str) + 1), str);
+ return strdup(str);
}
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index de41b53b2c7dd7ebf31f6737a13dcab888ac141e..461267967f244add58a4254be822ad0692790986 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -1239,9 +1239,8 @@ static String ExtractLocaleName(
# ifdef WHITEFILL
if (strchr(lang, ' ')) {
if (buf != NULL) XtFree (buf);
- else buf = XtMalloc ((Cardinal)strlen (lang) + 1);
+ buf = strdup (lang);
if (buf == NULL) return NULL;
- strcpy(buf, lang);
for (temp = buf; (temp = strchr(temp, ' ')) != NULL; )
*temp++ = '-';
return buf;
diff --git a/src/NextEvent.c b/src/NextEvent.c
index 49f6f8e443ad57364e081d649ca56123e310b1e3..75e74adf278caaa8441c1883895e8f9337b47e2d 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -326,24 +326,26 @@ static void AdjustTimes (
wait_times_ptr_t wt)
{
if (app->timerQueue != NULL && !ignoreTimers && block) {
+#ifndef USE_POLL
if (IS_AFTER (wt->cur_time, app->timerQueue->te_timer_value)) {
TIMEDELTA (wt->wait_time, app->timerQueue->te_timer_value, wt->cur_time);
if (howlong == NULL || IS_AFTER (wt->wait_time, wt->max_wait_time))
-#ifndef USE_POLL
wt->wait_time_ptr = &wt->wait_time;
else
wt->wait_time_ptr = &wt->max_wait_time;
} else
wt->wait_time_ptr = &zero_time;
- }
#else
+ if (IS_AFTER (wt->cur_time, app->timerQueue->te_timer_value)) {
+ TIMEDELTA (wt->wait_time, app->timerQueue->te_timer_value, wt->cur_time);
+ if (howlong == NULL || IS_AFTER (wt->wait_time, wt->max_wait_time))
wt->poll_wait = (int) (wt->wait_time.tv_sec * 1000 + wt->wait_time.tv_usec / 1000);
else
wt->poll_wait = (int) (wt->max_wait_time.tv_sec * 1000 + wt->max_wait_time.tv_usec / 1000);
} else
wt->poll_wait = X_DONT_BLOCK;
- }
#endif
+ }
}