[xorg-commit-diffs] xc/doc/man/X11 Imakefile, 1.1.4.3,
1.1.4.4 IsCKey.man, 1.1.4.3, 1.1.4.4 XAddHost.man, 1.1.4.4,
1.1.4.5 XSLTTProp.man, 1.1.4.5, 1.1.4.6 XSeWMProp.man, 1.1.4.4,
1.1.4.5 XTLTTProp.man, 1.1.4.5, 1.1.4.6 XmbDIStr.man, 1.1.4.4,
1.1.4.5 XmbDStr.man, 1.1.4.4, 1.1.4.5 XmbDTxt.man, 1.1.4.5,
1.1.4.6 XmbLStr.man, 1.1.4.4, 1.1.4.5 XmbRIC.man, 1.1.4.4,
1.1.4.5 XmbTEsc.man, 1.1.4.4, 1.1.4.5 XmbTExt.man, 1.1.4.4,
1.1.4.5 XmbTPCEx.man, 1.1.4.4, 1.1.4.5
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:13:30 PDT 2004
Committed by: eich
Update of /cvs/xorg/xc/doc/man/X11
In directory pdx:/home/eich/tstbuild/xc/doc/man/X11
Modified Files:
Tag: XORG-CURRENT
Imakefile IsCKey.man XAddHost.man XSLTTProp.man XSeWMProp.man
XTLTTProp.man XmbDIStr.man XmbDStr.man XmbDTxt.man XmbLStr.man
XmbRIC.man XmbTEsc.man XmbTExt.man XmbTPCEx.man
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile 5 Mar 2004 13:38:15 -0000 1.1.4.3
+++ b/Imakefile 15 Apr 2004 10:13:24 -0000 1.1.4.4
@@ -257,7 +257,7 @@
InstallManPageLong(XSeWMName,$(MANDIR),XSetWMName)
InstallManPageAliases(XSetWMName,$(MANDIR),XGetWMName XStoreName XFetchName)
InstallManPageLong(XSeWMProp,$(MANDIR),XSetWMProperties)
-InstallManPageAliases(XSetWMProperties,$(MANDIR),XmbSetWMProperties XFree86utf8SetWMProperties)
+InstallManPageAliases(XSetWMProperties,$(MANDIR),XmbSetWMProperties Xutf8SetWMProperties)
InstallManPageLong(XSeWMProt,$(MANDIR),XSetWMProtocols)
InstallManPageAliases(XSetWMProtocols,$(MANDIR),XGetWMProtocols)
InstallManPageLong(XStBytes,$(MANDIR),XStoreBytes)
@@ -271,7 +271,7 @@
InstallManPageLong(XSync,$(MANDIR),XSynchronize)
InstallManPageAliases(XSynchronize,$(MANDIR),XSetAfterFunction)
InstallManPageLong(XTLTTProp,$(MANDIR),XmbTextListToTextProperty)
-InstallManPageAliases(XmbTextListToTextProperty,$(MANDIR),XwcTextListToTextProperty XFree86utf8TextListToTextProperty XmbTextPropertyToTextList XwcTextPropertyToTextList XFree86utf8TextPropertyToTextList XwcFreeStringList XDefaultString)
+InstallManPageAliases(XmbTextListToTextProperty,$(MANDIR),XwcTextListToTextProperty Xutf8TextListToTextProperty XmbTextPropertyToTextList XwcTextPropertyToTextList Xutf8TextPropertyToTextList XwcFreeStringList XDefaultString)
InstallManPageLong(XTextExt,$(MANDIR),XTextExtents)
InstallManPageAliases(XTextExtents,$(MANDIR),XTextExtents16 XQueryTextExtents XQueryTextExtents16)
InstallManPageLong(XTextWid,$(MANDIR),XTextWidth)
@@ -312,21 +312,21 @@
InstallManPageLong(XcmsTQMC,$(MANDIR),XcmsTekHVCQueryMaxC)
InstallManPageAliases(XcmsTekHVCQueryMaxC,$(MANDIR),XcmsTekHVCQueryMaxV XcmsTekHVCQueryMaxVC XcmsTekHVCQueryMaxVSamples XcmsTekHVCQueryMinV)
InstallManPageLong(XmbDIStr,$(MANDIR),XmbDrawImageString)
-InstallManPageAliases(XmbDrawImageString,$(MANDIR),XwcDrawImageString XFree86utf8DrawImageString)
+InstallManPageAliases(XmbDrawImageString,$(MANDIR),XwcDrawImageString Xutf8DrawImageString)
InstallManPageLong(XmbDStr,$(MANDIR),XmbDrawString)
-InstallManPageAliases(XmbDrawString,$(MANDIR),XwcDrawString XFree86utf8DrawString)
+InstallManPageAliases(XmbDrawString,$(MANDIR),XwcDrawString Xutf8DrawString)
InstallManPageLong(XmbDTxt,$(MANDIR),XmbDrawText)
-InstallManPageAliases(XmbDrawText,$(MANDIR),XwcDrawText XFree86utf8DrawText)
+InstallManPageAliases(XmbDrawText,$(MANDIR),XwcDrawText Xutf8DrawText)
InstallManPageLong(XmbLStr,$(MANDIR),XmbLookupString)
-InstallManPageAliases(XmbLookupString,$(MANDIR),XwcLookupString XFree86utf8LookupString)
+InstallManPageAliases(XmbLookupString,$(MANDIR),XwcLookupString Xutf8LookupString)
InstallManPageLong(XmbRIC,$(MANDIR),XmbResetIC)
-InstallManPageAliases(XmbResetIC,$(MANDIR),XwcResetIC XFree86utf8ResetIC)
+InstallManPageAliases(XmbResetIC,$(MANDIR),XwcResetIC Xutf8ResetIC)
InstallManPageLong(XmbTEsc,$(MANDIR),XmbTextEscapement)
-InstallManPageAliases(XmbTextEscapement,$(MANDIR),XwcTextEscapement XFree86utf8TextEscapement)
+InstallManPageAliases(XmbTextEscapement,$(MANDIR),XwcTextEscapement Xutf8TextEscapement)
InstallManPageLong(XmbTExt,$(MANDIR),XmbTextExtents)
-InstallManPageAliases(XmbTextExtents,$(MANDIR),XwcTextExtents XFree86utf8TextExtents)
+InstallManPageAliases(XmbTextExtents,$(MANDIR),XwcTextExtents Xutf8TextExtents)
InstallManPageLong(XmbTPCEx,$(MANDIR),XmbTextPerCharExtents)
-InstallManPageAliases(XmbTextPerCharExtents,$(MANDIR),XwcTextPerCharExtents XFree86utf8TextPerCharExtents)
+InstallManPageAliases(XmbTextPerCharExtents,$(MANDIR),XwcTextPerCharExtents Xutf8TextPerCharExtents)
#else
InstallManPage(AllPlanes,$(MANDIR))
InstallManPage(BlkPScrn,$(MANDIR))
Index: IsCKey.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/IsCKey.man,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/IsCKey.man 5 Mar 2004 13:38:15 -0000 1.1.4.3
+++ b/IsCKey.man 15 Apr 2004 10:13:24 -0000 1.1.4.4
@@ -1,3 +1,4 @@
+.\" $XdotOrg$
.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@@ -142,7 +143,7 @@
.ny0
.TH IsCursorKey 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-IsCursorKey, IsFunctionKey, IsKeypadKey, IsMiscFunctionKey, IsModiferKey, IsPFKey, IsPrivateKeypadKey \- keysym classification macros
+IsCursorKey, IsFunctionKey, IsKeypadKey, IsMiscFunctionKey, IsModifierKey, IsPFKey, IsPrivateKeypadKey \- keysym classification macros
.SH SYNTAX
int IsCursorKey\^(\^KeySym \fIkeysym\fP\^);
.LP
@@ -187,7 +188,7 @@
if the specified KeySym is a miscellaneous function key.
.LP
The
-.ZN IsModiferKey
+.ZN IsModifierKey
macro returns
.ZN True
if the specified KeySym is a modifier key.
Index: XAddHost.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XAddHost.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XAddHost.man 5 Mar 2004 13:38:15 -0000 1.1.4.4
+++ b/XAddHost.man 15 Apr 2004 10:13:24 -0000 1.1.4.5
@@ -1,28 +1,34 @@
.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2004 Sun Microsystems, Inc.
.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining
-.\" a copy of this software and associated documentation files (the
+.\" 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 shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
+.\" distribute, and/or sell copies of the Software, and to permit persons
+.\" to whom the Software is furnished to do so, provided that the above
+.\" copyright notice(s) and this permission notice appear in all copies of
+.\" the Software and that both the above copyright notice(s) and this
+.\" permission notice appear in supporting documentation.
+.\"
.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of a copyright holder
+.\" shall not be used in advertising or otherwise to promote the sale, use
+.\" or other dealings in this Software without prior written authorization
+.\" of the copyright holder.
+.\"
+.\" X Window System is a trademark of The Open Group.
.\"
.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
.\" Digital Equipment Corporation
@@ -143,7 +149,7 @@
.ny0
.TH XAddHost 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XAddHost, XAddHosts, XListHosts, XRemoveHost, XRemoveHosts, XSetAccessControl, XEnableAccessControl, XDisableAccessControl, XHostAddress \- control host access and host control structure
+XAddHost, XAddHosts, XListHosts, XRemoveHost, XRemoveHosts, XSetAccessControl, XEnableAccessControl, XDisableAccessControl, XHostAddress, XServerInterpretedAddress \- control host access and host control structure
.SH SYNTAX
.HP
int XAddHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^);
@@ -308,11 +314,34 @@
The family member specifies which protocol address family to use
(for example, TCP/IP or DECnet) and can be
.ZN FamilyInternet ,
+.ZN FamilyInternet6 ,
+.ZN FamilyServerInterpreted ,
.ZN FamilyDECnet ,
or
.ZN FamilyChaos .
The length member specifies the length of the address in bytes.
The address member specifies a pointer to the address.
+.LP
+For the ServerInterpreted family, the length is ignored and the address
+member is a pointer to a
+.ZN XServerInterpretedAddress
+structure which contains:
+.LP
+.Ds 0
+.TA .5i 3i
+.ta .5i 3i
+typedef struct {
+ int typelength; /\(** length of type string, in bytes */
+ int valuelength; /\(** length of value string, in bytes */
+ char *type; /\(** pointer to where to find the type string */
+ char *value; /\(** pointer to where to find the address */
+} XServerInterpretedAddress;
+.De
+.LP
+The type and value members point to strings representing the type and value of
+the server interpreted entry. These strings may not be NULL-terminated so care
+should be used when accessing them. The typelength and valuelength members
+specify the length in byte of the type and value strings.
.SH DIAGNOSTICS
.TP 1i
.ZN BadAccess
Index: XSLTTProp.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XSLTTProp.man,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/XSLTTProp.man 5 Mar 2004 13:38:16 -0000 1.1.4.5
+++ b/XSLTTProp.man 15 Apr 2004 10:13:25 -0000 1.1.4.6
@@ -216,7 +216,7 @@
.ZN XFreeStringList
function releases memory allocated by
.ZN XmbTextPropertyToTextList ,
-.ZN XFree86utf8TextPropertyToTextList
+.ZN Xutf8TextPropertyToTextList
and
.ZN XTextPropertyToStringList
and the missing charset list allocated by
Index: XSeWMProp.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XSeWMProp.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XSeWMProp.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XSeWMProp.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -143,7 +143,7 @@
.ny0
.TH XSetWMProperties 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XSetWMProperties, XmbSetWMProperties, XFree86utf8SetWMProperties \- set standard window properties
+XSetWMProperties, XmbSetWMProperties, Xutf8SetWMProperties \- set standard window properties
.SH SYNTAX
.HP
void XSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
@@ -156,7 +156,7 @@
\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
XClassHint *\fIclass_hints\fP\^);
.HP
-void XFree86utf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+void Xutf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
XClassHint *\fIclass_hints\fP\^);
@@ -243,7 +243,7 @@
The
.ZN XmbSetWMProperties
and
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
convenience functions provide a simple programming interface
for setting those essential window properties that are used
for communicating with other clients
@@ -256,7 +256,7 @@
The window_name and icon_name arguments are null-terminated strings, for
.ZN XmbSetWMProperties
in the encoding of the current locale, for
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
in UTF-8 encoding.
If the arguments can be fully converted to the STRING encoding,
the properties are created with type ``STRING'';
@@ -266,14 +266,14 @@
If the normal_hints argument is non-NULL,
.ZN XmbSetWMProperties
and
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
call
.ZN XSetWMNormalHints ,
which sets the WM_NORMAL_HINTS property (see section 14.1.7).
If the wm_hints argument is non-NULL,
.ZN XmbSetWMProperties
and
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
call
.ZN XSetWMHints ,
which sets the WM_HINTS property (see section 14.1.6).
@@ -281,7 +281,7 @@
If the argv argument is non-NULL,
.ZN XmbSetWMProperties
and
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
set the WM_COMMAND property from argv and argc.
An argc of zero indicates a zero-length command.
.LP
@@ -292,7 +292,7 @@
If the class_hints argument is non-NULL,
.ZN XmbSetWMProperties
and
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
set the WM_CLASS property.
If the res_name member in the
.ZN XClassHint
@@ -315,7 +315,7 @@
For clients that need to process the property text in a locale,
.ZN XmbSetWMProperties
and
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
set the WM_LOCALE_NAME property to be the name of the current locale.
The name is assumed to be in the Host Portable Character Encoding
and is converted to STRING for storage in the property.
@@ -323,7 +323,7 @@
.ZN XSetWMProperties ,
.ZN XmbSetWMProperties
and
-.ZN XFree86utf8SetWMProperties
+.ZN Xutf8SetWMProperties
can generate
.ZN BadAlloc
and
@@ -331,8 +331,9 @@
errors.
.LP
The function
-.ZN XFree86utf8SetWMProperties
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8SetWMProperties
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH PROPERTIES
Index: XTLTTProp.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XTLTTProp.man,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/XTLTTProp.man 5 Mar 2004 13:38:16 -0000 1.1.4.5
+++ b/XTLTTProp.man 15 Apr 2004 10:13:25 -0000 1.1.4.6
@@ -146,7 +146,7 @@
'\" t
.TH XmbTextListToTextProperty 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbTextListToTextProperty, XwcTextListToTextProperty, XFree86utf8TextListToTextProperty, XmbTextPropertyToTextList, XwcTextPropertyToTextList, XFree86utf8TextPropertyToTextList, XwcFreeStringList, XDefaultString \- convert text lists and text property structures
+XmbTextListToTextProperty, XwcTextListToTextProperty, Xutf8TextListToTextProperty, XmbTextPropertyToTextList, XwcTextPropertyToTextList, Xutf8TextPropertyToTextList, XwcFreeStringList, XDefaultString \- convert text lists and text property structures
.SH SYNTAX
.HP
int XmbTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
@@ -157,7 +157,7 @@
**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
XTextProperty *\fItext_prop_return\fP\^);
.HP
-int XFree86utf8TextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
+int Xutf8TextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
XTextProperty *\fItext_prop_return\fP\^);
.HP
@@ -168,7 +168,7 @@
*\fItext_prop\fP\^, wchar_t ***\fIlist_return\fP\^, int
*\fIcount_return\fP\^);
.HP
-int XFree86utf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+int Xutf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
*\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^);
.HP
void XwcFreeStringList\^(\^wchar_t **\fIlist\fP\^);
@@ -203,7 +203,7 @@
.ZN XmbTextListToTextProperty ,
.ZN XwcTextListToTextProperty
and
-.ZN XFree86utf8TextListToTextProperty
+.ZN Xutf8TextListToTextProperty
functions set the specified
.ZN XTextProperty
value to a set of null-separated elements representing the concatenation
@@ -213,7 +213,7 @@
and
.ZN XwcTextListToTextProperty ),
or in UTF-8 encoding (for
-.ZN XFree86utf8TextListToTextProperty ).
+.ZN Xutf8TextListToTextProperty ).
.LP
The functions set the encoding field of text_prop_return to an
.ZN Atom
@@ -228,10 +228,11 @@
is specified,
this encoding is ``STRING'' or ``COMPOUND_TEXT'', respectively.
If the style
-.ZN XFree86Utf8StringStyle
+.ZN XUTF8StringStyle
is specified,
-this encoding is ``UTF8_STRING''. (This is an XFree86 extension introduced in
-XFree86 4.0.2. Its presence is indicated by the macro
+this encoding is ``UTF8_STRING''.
+(This is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is indicated by the macro
.ZN X_HAVE_UTF8_STRING .)
If the style
.ZN XTextStyle
@@ -276,7 +277,7 @@
.ZN XmbTextPropertyToTextList ,
.ZN XwcTextPropertyToTextList
and
-.ZN XFree86utf8TextPropertyToTextList
+.ZN Xutf8TextPropertyToTextList
functions return a list of text strings representing the
null-separated elements of the specified
.ZN XTextProperty
@@ -286,7 +287,7 @@
and
.ZN XwcTextPropertyToTextList )
or in UTF-8 (for
-.ZN XFree86utf8TextPropertyToTextList ).
+.ZN Xutf8TextPropertyToTextList ).
The data in text_prop must be format 8.
.LP
Multiple elements of the property (for example, the strings in a disjoint
@@ -298,7 +299,7 @@
.ZN XmbTextPropertyToTextList ,
.ZN XwcTextPropertyToTextList
and
-.ZN XFree86utf8TextPropertyToTextList
+.ZN Xutf8TextPropertyToTextList
return
.ZN XNoMemory .
If the current locale is not supported,
@@ -324,7 +325,7 @@
.ZN XmbTextPropertyToTextList ,
.ZN XwcTextPropertyToTextList
and
-.ZN XFree86utf8TextPropertyToTextList
+.ZN Xutf8TextPropertyToTextList
return the list of null-terminated text strings to list_return
and the number of text strings to count_return.
.LP
@@ -340,14 +341,14 @@
.ZN XmbTextPropertyToTextList ,
.ZN XwcTextPropertyToTextList
and
-.ZN XFree86utf8TextPropertyToTextList
+.ZN Xutf8TextPropertyToTextList
return
.ZN Success .
.LP
To free the storage for the list and its contents returned by
.ZN XmbTextPropertyToTextList
or
-.ZN XFree86utf8TextPropertyToTextList ,
+.ZN Xutf8TextPropertyToTextList ,
use
.ZN XFreeStringList .
To free the storage for the list and its contents returned by
@@ -391,10 +392,11 @@
Until freed, it will not be modified by Xlib.
.LP
The functions
-.ZN XFree86utf8TextListToTextProperty
+.ZN Xutf8TextListToTextProperty
and
-.ZN XFree86utf8TextPropertyToTextList
-are an XFree86 extension introduced in XFree86 4.0.2. Their presence is
+.ZN Xutf8TextPropertyToTextList
+are extensions introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Their presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH STRUCTURES
@@ -449,7 +451,7 @@
XCompoundTextStyle, /\(** COMPOUND_TEXT */
XTextStyle, /\(** text in owner's encoding (current locale) */
XStdICCTextStyle, /\(** STRING, else COMPOUND_TEXT */
- XFree86Utf8StringStyle /\(** UTF8_STRING */
+ XUTF8StringStyle /\(** UTF8_STRING */
} XICCEncodingStyle;
.De
.SH "SEE ALSO"
Index: XmbDIStr.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbDIStr.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XmbDIStr.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XmbDIStr.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -143,7 +143,7 @@
.ny0
.TH XmbDrawImageString 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbDrawImageString, XwcDrawImageString, XFree86utf8DrawImageString \- draw image text using a single font set
+XmbDrawImageString, XwcDrawImageString, Xutf8DrawImageString \- draw image text using a single font set
.SH SYNTAX
.HP
void XmbDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
@@ -154,7 +154,7 @@
XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
wchar_t *\fIstring\fP\^, int \fInum_wchars\fP\^);
.HP
-void XFree86utf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+void Xutf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
*\fIstring\fP\^, int \fInum_bytes\fP\^);
.SH ARGUMENTS
@@ -183,14 +183,14 @@
.ZN XmbDrawImageString ,
.ZN XwcDrawImageString
and
-.ZN XFree86utf8DrawImageString
+.ZN Xutf8DrawImageString
functions fill a destination rectangle with the background pixel defined
in the GC and then paint the text with the foreground pixel.
The filled rectangle is the rectangle returned to overall_logical_return by
.ZN XmbTextExtents ,
.ZN XwcTextExtents
or
-.ZN XFree86utf8TextExtents
+.ZN Xutf8TextExtents
for the same text and
.ZN XFontSet .
.LP
@@ -202,8 +202,9 @@
The behavior for an invalid codepoint is undefined.
.LP
The function
-.ZN XFree86utf8TextExtents
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8TextExtents
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH "SEE ALSO"
Index: XmbDStr.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbDStr.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XmbDStr.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XmbDStr.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -143,7 +143,7 @@
.ny0
.TH XmbDrawString 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbDrawString, XwcDrawString, XFree86utf8DrawString \- draw text using a single font set
+XmbDrawString, XwcDrawString, Xutf8DrawString \- draw text using a single font set
.SH SYNTAX
.HP
void XmbDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
@@ -154,7 +154,7 @@
\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, wchar_t
*\fIstring\fP\^, int \fInum_wchars\fP\^);
.HP
-void XFree86utf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+void Xutf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
*\fIstring\fP\^, int \fInum_bytes\fP\^);
.SH ARGUMENTS
@@ -183,7 +183,7 @@
.ZN XmbDrawString ,
.ZN XwcDrawString
and
-.ZN XFree86utf8DrawString
+.ZN Xutf8DrawString
functions draw the specified text with the foreground pixel.
When the
.ZN XFontSet
@@ -193,8 +193,9 @@
The behavior for an invalid codepoint is undefined.
.LP
The function
-.ZN XFree86utf8DrawString
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8DrawString
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH "SEE ALSO"
Index: XmbDTxt.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbDTxt.man,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/XmbDTxt.man 5 Mar 2004 13:38:16 -0000 1.1.4.5
+++ b/XmbDTxt.man 15 Apr 2004 10:13:25 -0000 1.1.4.6
@@ -144,7 +144,7 @@
.ny0
.TH XmbDrawText 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbDrawText, XwcDrawText, XFree86utf8DrawText \- draw text using multiple font sets
+XmbDrawText, XwcDrawText, Xutf8DrawText \- draw text using multiple font sets
.SH SYNTAX
.HP
void XmbDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
@@ -155,7 +155,7 @@
\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XwcTextItem *\fIitems\fP\^, int
\fInitems\fP\^);
.HP
-void XFree86utf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+void Xutf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int \fInitems\fP\^);
.SH ARGUMENTS
.IP \fId\fP 1i
@@ -179,7 +179,7 @@
.ZN XmbDrawText ,
.ZN XwcDrawText
and
-.ZN XFree86utf8DrawText
+.ZN Xutf8DrawText
functions allow complex spacing and font set shifts between text strings.
Each text item is processed in turn, with the origin of a text
element advanced in the primary draw direction by the escapement of the
@@ -197,16 +197,16 @@
.ZN XmbDrawText ,
.ZN XwcDrawText
and
-.ZN XFree86utf8DrawText
+.ZN Xutf8DrawText
do not perform any context-dependent rendering between text segments.
Clients may compute the drawing metrics by passing each text segment to
.ZN XmbTextExtents ,
.ZN XwcTextExtents ,
-.ZN XFree86utf8TextExtents
+.ZN Xutf8TextExtents
or
.ZN XmbTextPerCharExtents ,
.ZN XwcTextPerCharExtents .
-.ZN XFree86utf8TextPerCharExtents .
+.ZN Xutf8TextPerCharExtents .
When the
.ZN XFontSet
has missing charsets, each unavailable character is drawn
@@ -215,8 +215,9 @@
The behavior for an invalid codepoint is undefined.
.LP
The function
-.ZN XFree86utf8DrawText
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8DrawText
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH STRUCTURES
Index: XmbLStr.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbLStr.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XmbLStr.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XmbLStr.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -145,7 +145,7 @@
'\" t
.TH XmbLookupString 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbLookupString, XwcLookupString, XFree86utf8LookupString \- obtain composed input from an input method
+XmbLookupString, XwcLookupString, Xutf8LookupString \- obtain composed input from an input method
.SH SYNTAX
.HP
int XmbLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
@@ -156,7 +156,7 @@
wchar_t *\fIbuffer_return\fP\^, int \fIwchars_buffer\fP\^, KeySym
*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^);
.HP
-int XFree86utf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
+int Xutf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^);
.SH ARGUMENTS
@@ -182,7 +182,7 @@
.ZN XmbLookupString ,
.ZN XwcLookupString
and
-.ZN XFree86utf8LookupString
+.ZN Xutf8LookupString
functions return the string from the input method specified
in the buffer_return argument.
If no string is returned,
@@ -196,7 +196,7 @@
.LP
.ZN XmbLookupString
and
-.ZN XFree86utf8LookupString
+.ZN Xutf8LookupString
return the length of the string in bytes, and
.ZN XwcLookupString
returns the length of the string in characters.
@@ -206,7 +206,7 @@
.ZN XwcLookupString
return text in the encoding of the locale bound to the input method
of the specified input context, and
-.ZN XFree86utf8LookupString
+.ZN Xutf8LookupString
returns text in UTF-8 encoding.
.LP
Each string returned by
@@ -223,7 +223,7 @@
.ZN XmbLookupString ,
.ZN XwcLookupString
and
-.ZN XFree86utf8LookupString .
+.ZN Xutf8LookupString .
Their behavior when a client passes a
.ZN KeyRelease
event is undefined.
@@ -242,7 +242,7 @@
The input string to be returned is too large for the supplied buffer_return.
The required size (for
.ZN XmbLookupString ,
-.ZN XFree86utf8LookupString
+.ZN Xutf8LookupString
in bytes; for
.ZN XwcLookupString
in characters) is returned as the value of the function,
@@ -289,19 +289,20 @@
.ZN XmbLookupString ,
.ZN XwcLookupString
and
-.ZN XFree86utf8LookupString
+.ZN Xutf8LookupString
is the one currently in possession of the focus or not.
Input may have been composed within an input context before it lost the focus,
and that input may be returned on subsequent calls to
.ZN XmbLookupString ,
.ZN XwcLookupString
or
-.ZN XFree86utf8LookupString
+.ZN Xutf8LookupString
even though it does not have any more keyboard focus.
.LP
The function
-.ZN XFree86utf8LookupString
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8LookupString
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH "SEE ALSO"
Index: XmbRIC.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbRIC.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XmbRIC.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XmbRIC.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -143,14 +143,14 @@
.ny0
.TH XmbResetIC 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbResetIC, XwcResetIC, XFree86utf8ResetIC \- reset the state of an input context
+XmbResetIC, XwcResetIC, Xutf8ResetIC \- reset the state of an input context
.SH SYNTAX
.HP
char *XmbResetIC\^(\^XIC \fIic\fP\^);
.HP
wchar_t *XwcResetIC\^(\^XIC \fIic\fP\^);
.HP
-char *XFree86utf8ResetIC\^(\^XIC \fIic\fP\^);
+char *Xutf8ResetIC\^(\^XIC \fIic\fP\^);
.SH ARGUMENTS
.IP \fIic\fP 1i
Specifies the input context.
@@ -162,7 +162,7 @@
.ZN XmbResetIC ,
.ZN XwcResetIC
and
-.ZN XFree86utf8ResetIC
+.ZN Xutf8ResetIC
reset an input context to its initial state;
when
.ZN XNResetState
@@ -176,7 +176,7 @@
.ZN XmbResetIC ,
.ZN XwcResetIC
or
-.ZN XFree86utf8ResetIC
+.ZN Xutf8ResetIC
does not change the focus.
.LP
The return value of
@@ -186,7 +186,7 @@
.ZN XwcResetIC
is its current preedit string as a wide character string.
The return value of
-.ZN XFree86utf8ResetIC
+.ZN Xutf8ResetIC
is its current preedit string as an UTF-8 string.
If there is any preedit text drawn or visible to the user,
then these procedures must return a non-NULL string.
@@ -198,8 +198,9 @@
.ZN XFree .
.LP
The function
-.ZN XFree86utf8ResetIC
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8ResetIC
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH "SEE ALSO"
Index: XmbTEsc.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbTEsc.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XmbTEsc.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XmbTEsc.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -143,7 +143,7 @@
.ny0
.TH XmbTextEscapement 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbTextEscapement, XwcTextEscapement, XFree86utf8TextEscapement \- obtain the escapement of text
+XmbTextEscapement, XwcTextEscapement, Xutf8TextEscapement \- obtain the escapement of text
.SH SYNTAX
.HP
int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
@@ -152,7 +152,7 @@
int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^,
int \fInum_wchars\fP\^);
.HP
-int XFree86utf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^,
+int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^,
int \fInum_bytes\fP\^);
.SH ARGUMENTS
.IP \fIfont_set\fP 1i
@@ -168,7 +168,7 @@
.ZN XmbTextEscapement ,
.ZN XwcTextEscapement
and
-.ZN XFree86utf8TextEscapement
+.ZN Xutf8TextEscapement
functions return the escapement in pixels of the specified string as a value,
using the fonts loaded for the specified font set.
The escapement is the distance in pixels in the primary draw
@@ -180,8 +180,9 @@
the escapement is always positive.
.LP
The function
-.ZN XFree86utf8TextEscapement
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8TextEscapement
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH "SEE ALSO"
Index: XmbTExt.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbTExt.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XmbTExt.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XmbTExt.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -143,7 +143,7 @@
.ny0
.TH XmbTextExtents 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbTextExtents, XwcTextExtents, XFree86utf8TextExtents \- compute text extents
+XmbTextExtents, XwcTextExtents, Xutf8TextExtents \- compute text extents
.SH SYNTAX
.HP
int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
@@ -154,7 +154,7 @@
\fInum_wchars\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
*\fIoverall_logical_return\fP\^);
.HP
-int XFree86utf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+int Xutf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
*\fIoverall_logical_return\fP\^);
.SH ARGUMENTS
@@ -176,7 +176,7 @@
.ZN XmbTextExtents ,
.ZN XwcTextExtents
and
-.ZN XFree86utf8TextExtents
+.ZN Xutf8TextExtents
functions set the components of the specified overall_ink_return and
overall_logical_return
arguments to the overall bounding box of the string's image
@@ -185,7 +185,7 @@
.ZN XmbTextEscapement ,
.ZN XwcTextEscapement
or
-.ZN XFree86utf8TextEscapement .
+.ZN Xutf8TextEscapement .
These metrics are relative to the drawing origin of the string,
using the fonts loaded for the specified font set.
.LP
@@ -216,8 +216,9 @@
The behavior for an invalid codepoint is undefined.
.LP
The function
-.ZN XFree86utf8TextExtents
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8TextExtents
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH "SEE ALSO"
Index: XmbTPCEx.man
===================================================================
RCS file: /cvs/xorg/xc/doc/man/X11/XmbTPCEx.man,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/XmbTPCEx.man 5 Mar 2004 13:38:16 -0000 1.1.4.4
+++ b/XmbTPCEx.man 15 Apr 2004 10:13:25 -0000 1.1.4.5
@@ -143,7 +143,7 @@
.ny0
.TH XmbTextPerCharExtents 3X11 __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XmbTextPerCharExtents, XwcTextPerCharExtents, XFree86utf8TextPerCharExtents \- obtain per-character information for a text string
+XmbTextPerCharExtents, XwcTextPerCharExtents, Xutf8TextPerCharExtents \- obtain per-character information for a text string
.SH SYNTAX
.HP
Status XmbTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
@@ -158,7 +158,7 @@
\fIarray_size\fP\^, int *\fInum_chars_return\fP\^, XRectangle
*\fIoverall_ink_return\fP\^, XRectangle *\fIoverall_logical_return\fP\^);
.HP
-Status XFree86utf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
+Status Xutf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
*\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,
XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int
*\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
@@ -191,7 +191,7 @@
.ZN XmbTextPerCharExtents ,
.ZN XwcTextPerCharExtents
and
-.ZN XFree86utf8TextPerCharExtents
+.ZN Xutf8TextPerCharExtents
functions return the text dimensions of each character of the specified text,
using the fonts loaded for the specified font set.
Each successive element of ink_array_return and logical_array_return
@@ -237,17 +237,18 @@
.ZN XmbTextPerCharExtents ,
.ZN XwcTextPerCharExtents
and
-.ZN XFree86utf8TextPerCharExtents
+.ZN Xutf8TextPerCharExtents
return the maximum extent of the string's metrics to overall_ink_return
or overall_logical_return, as returned by
.ZN XmbTextExtents ,
.ZN XwcTextExtents
or
-.ZN XFree86utf8TextExtents .
+.ZN Xutf8TextExtents .
.LP
The function
-.ZN XFree86utf8TextPerCharExtents
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
+.ZN Xutf8TextPerCharExtents
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
indicated by the macro
.ZN X_HAVE_UTF8_STRING .
.SH "SEE ALSO"
More information about the xorg-commit-diffs
mailing list