[xorg-commit-diffs] xc/doc/specs/X11 CH01, 1.1.4.1,
1.1.4.1.16.1 CH13, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 CH14,
1.1.4.1.6.1, 1.1.4.1.6.1.6.1 abstract.t, 1.1.4.1,
1.1.4.1.16.1 glossary, 1.1.4.1.6.1,
1.1.4.1.6.1.6.1 indexmacros.t, 1.1, 1.1.20.1
Roland Mainz
xorg-commit at pdx.freedesktop.org
Sat Apr 10 02:03:53 PDT 2004
Committed by: gisburn
Update of /cvs/xorg/xc/doc/specs/X11
In directory pdx:/tmp/cvs-serv7662/xc/doc/specs/X11
Modified Files:
Tag: XPRINT
CH01 CH13 CH14 abstract.t glossary indexmacros.t
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch
Index: CH01
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/X11/CH01,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.16.1
diff -u -d -r1.1.4.1 -r1.1.4.1.16.1
--- a/CH01 17 Nov 2003 19:03:19 -0000 1.1.4.1
+++ b/CH01 10 Apr 2004 09:03:45 -0000 1.1.4.1.16.1
@@ -1,5 +1,4 @@
.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
-.\" Copyright \(co 2000 The XFree86 Project, Inc.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -40,11 +39,9 @@
.\" Digital and Tektronix makes no representations about the suitability
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
-.\"
-.\" $XFree86: xc/doc/specs/X11/CH01,v 1.2 2000/11/28 18:49:17 dawes Exp $
.\"
-.EH '\fBXlib \- C Library\fP''\fBX11, Release 6.4\fP'
-.OH '\fBXlib \- C Library\fP''\fBX11, Release 6.4\fP'
+.EH '\fBXlib \- C Library\fP''\fBX11, Release 6.7\fP'
+.OH '\fBXlib \- C Library\fP''\fBX11, Release 6.7\fP'
.EF ''\fB % \fP''
.OF ''\fB % \fP''
.hw WM_NORMAL_HINTS
@@ -590,7 +587,7 @@
.IP \(bu 5
Latin-1
.IP
-The coded character set defined by the ISO 8859-1 standard.
+The coded character set defined by the ISO8859-1 standard.
.IP \(bu 5
Latin Portable Character Encoding
.IP
@@ -604,11 +601,6 @@
.IP
Latin-1, plus tab and newline.
.IP \(bu 5
-UTF-8 Encoding
-.IP
-The ASCII compatible character encoding scheme defined by the ISO 10646-1
-standard.
-.IP \(bu 5
POSIX Portable Filename Character Set
.IP
The set of 65 characters,
Index: CH13
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/X11/CH13,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/CH13 4 Mar 2004 17:46:00 -0000 1.1.4.1.6.1
+++ b/CH13 10 Apr 2004 09:03:45 -0000 1.1.4.1.6.1.6.1
@@ -1,5 +1,4 @@
.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
-.\" Copyright \(co 2000 The XFree86 Project, Inc.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -40,8 +39,6 @@
.\" Digital and Tektronix makes no representations about the suitability
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
-.\"
-.\" $XFree86: xc/doc/specs/X11/CH13,v 1.4 2000/11/28 18:49:17 dawes Exp $
[...981 lines suppressed...]
-.PN Xutf8LookupString
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
-indicated by the macro
-.PN X_HAVE_UTF8_STRING .
.NH 3
Input Method Conventions
.XS
@@ -7455,10 +7202,9 @@
.PN KeyPress
event with a KeyCode of zero is used exclusively as a
signal that an input method has composed input that can be returned by
-.PN XmbLookupString ,
-.PN XwcLookupString
+.PN XmbLookupString
or
-.PN Xutf8LookupString .
+.PN XwcLookupString .
No other use is made of a
.PN KeyPress
event with KeyCode of zero.
Index: CH14
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/X11/CH14,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/CH14 4 Mar 2004 17:46:00 -0000 1.1.4.1.6.1
+++ b/CH14 10 Apr 2004 09:03:45 -0000 1.1.4.1.6.1.6.1
@@ -1,5 +1,4 @@
.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
-.\" Copyright \(co 2000 The XFree86 Project, Inc.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -40,8 +39,6 @@
.\" Digital and Tektronix makes no representations about the suitability
.\" of this documentation for any purpose.
.\" It is provided ``as is'' without express or implied warranty.
-.\"
-.\" $XFree86$
.\"
\&
.sp 1
@@ -502,29 +499,21 @@
XStringStyle, /* STRING */
XCompoundTextStyle, /* COMPOUND_TEXT */
XTextStyle, /* text in owner's encoding (current locale) */
- XStdICCTextStyle, /* STRING, else COMPOUND_TEXT */
- XUTF8StringStyle /* UTF8_STRING */
+ XStdICCTextStyle /* STRING, else COMPOUND_TEXT */
} XICCEncodingStyle;
.De
.LP
.eM
-The value
-.PN XUTF8StringStyle
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
-indicated by the macro
-.PN X_HAVE_UTF8_STRING .
-.LP
.sp
+.LP
To convert a list of text strings to an
.PN XTextProperty
structure, use
-.PN XmbTextListToTextProperty ,
-.PN XwcTextListToTextProperty
+.PN XmbTextListToTextProperty
or
-.PN Xutf8TextListToTextProperty .
+.PN XwcTextListToTextProperty .
.IN "XmbTextListToTextProperty" "" "@DEF@"
.IN "XwcTextListToTextProperty" "" "@DEF@"
-.IN "Xutf8TextListToTextProperty" "" "@DEF@"
.sM
.FD 0
int XmbTextListToTextProperty\^(\^\fIdisplay\fP\^, \fIlist\fP\^, \fIcount\fP\^, \fIstyle\fP\^, \fItext_prop_return\fP\^)
@@ -552,19 +541,6 @@
.br
XTextProperty *\fItext_prop_return\fP\^;
.FN
-.FD 0
-int Xutf8TextListToTextProperty\^(\^\fIdisplay\fP\^, \fIlist\fP\^, \fIcount\fP\^, \fIstyle\fP\^, \fItext_prop_return\fP\^)
-.br
- Display *\fIdisplay\fP\^;
-.br
- char **\fIlist\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- XICCEncodingStyle \fIstyle\fP\^;
-.br
- XTextProperty *\fItext_prop_return\fP\^;
-.FN
.IP \fIdisplay\fP 1i
Specifies the connection to the X server.
.IP \fIlist\fP 1i
@@ -580,20 +556,15 @@
.LP
.eM
The
-.PN XmbTextListToTextProperty ,
-.PN XwcTextListToTextProperty
+.PN XmbTextListToTextProperty
and
-.PN Xutf8TextListToTextProperty
+.PN XwcTextListToTextProperty
functions set the specified
.PN XTextProperty
value to a set of null-separated elements representing the concatenation
-of the specified list of null-terminated text strings. The input text
-strings must be given in the current locale encoding (for
-.PN XmbTextListToTextProperty
-and
-.PN XwcTextListToTextProperty ),
-or in UTF-8 encoding (for
-.PN Xutf8TextListToTextProperty ).
+of the specified list of null-terminated text strings.
+A final terminating null is stored at the end of the value field
+of text_prop_return but is not included in the nitems member.
.LP
The functions set the encoding field of text_prop_return to an
.PN Atom
@@ -607,12 +578,6 @@
.PN XCompoundTextStyle
is specified,
this encoding is ``STRING'' or ``COMPOUND_TEXT'', respectively.
-If the style
-.PN 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
-.PN X_HAVE_UTF8_STRING .)
If the style
.PN XTextStyle
is specified,
@@ -622,8 +587,6 @@
is specified,
this encoding is ``STRING'' if the text is fully convertible to STRING,
else ``COMPOUND_TEXT''.
-A final terminating null byte is stored at the end of the value field
-of text_prop_return but is not included in the nitems member.
.LP
If insufficient memory is available for the new value string,
the functions return
@@ -651,24 +614,16 @@
.LP
To free the storage for the value field, use
.PN XFree .
-.LP
-The function
-.PN Xutf8TextListToTextProperty
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
-indicated by the macro
-.PN X_HAVE_UTF8_STRING .
.sp
.LP
To obtain a list of text strings from an
.PN XTextProperty
structure, use
-.PN XmbTextPropertyToTextList ,
-.PN XwcTextPropertyToTextList
+.PN XmbTextPropertyToTextList
or
-.PN Xutf8TextPropertyToTextList .
+.PN XwcTextPropertyToTextList .
.IN "XmbTextPropertyToTextList" "" "@DEF@"
.IN "XwcTextPropertyToTextList" "" "@DEF@"
-.IN "Xutf8TextPropertyToTextList" "" "@DEF@"
.sM
.FD 0
int XmbTextPropertyToTextList\^(\^\fIdisplay\fP\^, \fItext_prop\fP\^, \fIlist_return\fP\^, \fIcount_return\fP\^)
@@ -692,17 +647,6 @@
.br
int *\fIcount_return\fP\^;
.FN
-.FD 0
-int Xutf8TextPropertyToTextList\^(\^\fIdisplay\fP\^, \fItext_prop\fP\^, \fIlist_return\fP\^, \fIcount_return\fP\^)
-.br
- Display *\fIdisplay\fP\^;
-.br
- XTextProperty *\fItext_prop\fP\^;
-.br
- char ***\fIlist_return\fP\^;
-.br
- int *\fIcount_return\fP\^;
-.FN
.IP \fIdisplay\fP 1i
Specifies the connection to the X server.
.IP \fItext_prop\fP 1i
@@ -717,20 +661,13 @@
.LP
.eM
The
-.PN XmbTextPropertyToTextList ,
-.PN XwcTextPropertyToTextList
+.PN XmbTextPropertyToTextList
and
-.PN Xutf8TextPropertyToTextList
-functions return a list of text strings representing the
+.PN XwcTextPropertyToTextList
+functions return a list of text strings in the current locale representing the
null-separated elements of the specified
.PN XTextProperty
-structure. The returned strings are encoded using the current locale encoding
-(for
-.PN XmbTextPropertyToTextList
-and
-.PN XwcTextPropertyToTextList )
-or in UTF-8 (for
-.PN Xutf8TextPropertyToTextList ).
+structure.
The data in text_prop must be format 8.
.LP
Multiple elements of the property (for example, the strings in a disjoint
@@ -739,10 +676,9 @@
any terminating null should not be included in text_prop.nitems.
.LP
If insufficient memory is available for the list and its elements,
-.PN XmbTextPropertyToTextList ,
-.PN XwcTextPropertyToTextList
+.PN XmbTextPropertyToTextList
and
-.PN Xutf8TextPropertyToTextList
+.PN XwcTextPropertyToTextList
return
.PN XNoMemory .
If the current locale is not supported,
@@ -753,7 +689,7 @@
the functions return
.PN XConverterNotFound .
For supported locales,
-existence of a converter from COMPOUND_TEXT, STRING, UTF8_STRING
+existence of a converter from COMPOUND_TEXT, STRING
or the encoding of the current locale is guaranteed if
.PN XSupportsLocale
returns
@@ -765,15 +701,14 @@
the functions do not set any return values.
.LP
Otherwise,
-.PN XmbTextPropertyToTextList ,
-.PN XwcTextPropertyToTextList
+.PN XmbTextPropertyToTextList
and
-.PN Xutf8TextPropertyToTextList
+.PN XwcTextPropertyToTextList
return the list of null-terminated text strings to list_return
and the number of text strings to count_return.
.LP
-If the value field of text_prop is not fully convertible to the
-encoding of the current locale,
+If the value field of text_prop is not fully convertible to the encoding of
+the current locale,
the functions return the number of unconvertible characters.
Each unconvertible character is converted to a string in the
current locale that is specific to the current locale.
@@ -781,29 +716,20 @@
use
.PN XDefaultString .
Otherwise,
-.PN XmbTextPropertyToTextList ,
-.PN XwcTextPropertyToTextList
+.PN XmbTextPropertyToTextList
and
-.PN Xutf8TextPropertyToTextList
+.PN XwcTextPropertyToTextList
return
.PN Success .
.LP
To free the storage for the list and its contents returned by
-.PN XmbTextPropertyToTextList
-or
-.PN Xutf8TextPropertyToTextList ,
+.PN XmbTextPropertyToTextList ,
use
.PN XFreeStringList .
To free the storage for the list and its contents returned by
.PN XwcTextPropertyToTextList ,
use
.PN XwcFreeStringList .
-.LP
-The function
-.PN Xutf8TextPropertyToTextList
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
-indicated by the macro
-.PN X_HAVE_UTF8_STRING .
.sp
.LP
To free the in-memory data associated with the specified
@@ -975,8 +901,7 @@
The
.PN XFreeStringList
function releases memory allocated by
-.PN XmbTextPropertyToTextList ,
-.PN Xutf8TextPropertyToTextList
+.PN XmbTextPropertyToTextList
and
.PN XTextPropertyToStringList
and the missing charset list allocated by
@@ -2755,16 +2680,13 @@
.LP
The
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
-functions store the standard set of window manager properties,
+function stores the standard set of window manager properties,
with text properties in standard encodings
for internationalized text communication.
The standard window manager properties for a given window are
WM_NAME, WM_ICON_NAME, WM_HINTS, WM_NORMAL_HINTS, WM_CLASS,
WM_COMMAND, WM_CLIENT_MACHINE, and WM_LOCALE_NAME.
.IN "XmbSetWMProperties" "" "@DEF@"
-.IN "Xutf8SetWMProperties" "" "@DEF@"
.sM
.FD 0
void XmbSetWMProperties\^(\^\fIdisplay\fP\^, \fIw\fP\^, \fIwindow_name\fP\^, \fIicon_name\fP\^, \fIargv\fP\^, \fIargc\fP\^,
@@ -2789,29 +2711,6 @@
.br
XClassHint *\fIclass_hints\fP\^;
.FN
-.FD 0
-void Xutf8SetWMProperties\^(\^\fIdisplay\fP\^, \fIw\fP\^, \fIwindow_name\fP\^, \fIicon_name\fP\^, \fIargv\fP\^, \fIargc\fP\^,
-.br
- \fInormal_hints\fP\^, \fIwm_hints\fP\^, \fIclass_hints\fP\^)
-.br
- Display *\fIdisplay\fP\^;
-.br
- Window \fIw\fP\^;
-.br
- char *\fIwindow_name\fP\^;
-.br
- char *\fIicon_name\fP\^;
-.br
- char *\fIargv\fP\^[];
-.br
- int \fIargc\fP\^;
-.br
- XSizeHints *\fInormal_hints\fP\^;
-.br
- XWMHints *\fIwm_hints\fP\^;
-.br
- XClassHint *\fIclass_hints\fP\^;
-.FN
.IP \fIdisplay\fP 1i
Specifies the connection to the X server.
.IP \fIw\fP 1i
@@ -2840,22 +2739,19 @@
.eM
The
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
-convenience functions provide a simple programming interface
+convenience function provides a simple programming interface
for setting those essential window properties that are used
for communicating with other clients
(particularly window and session managers).
.LP
If the window_name argument is non-NULL,
-they set the WM_NAME property.
+.PN XmbSetWMProperties
+sets the WM_NAME property.
If the icon_name argument is non-NULL,
-they set the WM_ICON_NAME property.
-The window_name and icon_name arguments are null-terminated strings, for
.PN XmbSetWMProperties
-in the encoding of the current locale, for
-.PN Xutf8SetWMProperties
-in UTF-8 encoding.
+sets the WM_ICON_NAME property.
+The window_name and icon_name arguments are null-terminated strings
+in the encoding of the current locale.
If the arguments can be fully converted to the STRING encoding,
the properties are created with type ``STRING'';
otherwise, the arguments are converted to Compound Text,
@@ -2863,24 +2759,18 @@
.LP
If the normal_hints argument is non-NULL,
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
-call
+calls
.PN XSetWMNormalHints ,
which sets the WM_NORMAL_HINTS property (see section 14.1.7).
If the wm_hints argument is non-NULL,
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
-call
+calls
.PN XSetWMHints ,
which sets the WM_HINTS property (see section 14.1.6).
.LP
If the argv argument is non-NULL,
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
-set the WM_COMMAND property from argv and argc.
+sets the WM_COMMAND property from argv and argc.
An argc of zero indicates a zero-length command.
.LP
The hostname of the machine is stored using
@@ -2889,9 +2779,7 @@
.LP
If the class_hints argument is non-NULL,
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
-set the WM_CLASS property.
+sets the WM_CLASS property.
If the res_name member in the
.PN XClassHint
structure is set to the NULL pointer and the RESOURCE_NAME
@@ -2904,34 +2792,24 @@
.LP
It is assumed that the supplied class_hints.res_name and argv,
the RESOURCE_NAME environment variable, and the hostname of the machine
-are in the encoding of the current locale.
+are in the encoding of the locale announced for the LC_CTYPE category
+(on POSIX-compliant systems, the LC_CTYPE, else LANG environment variable).
The corresponding WM_CLASS, WM_COMMAND, and WM_CLIENT_MACHINE properties
are typed according to the local host locale announcer.
-No encoding conversion is performed for these strings prior to storage
-in the properties.
+No encoding conversion is performed prior to storage in the properties.
.LP
For clients that need to process the property text in a locale,
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
-set the WM_LOCALE_NAME property to be the name of the current locale.
+sets 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.
.LP
.PN XmbSetWMProperties
-and
-.PN Xutf8SetWMProperties
can generate
.PN BadAlloc
and
.PN BadWindow
errors.
-.LP
-The function
-.PN Xutf8SetWMProperties
-is an XFree86 extension introduced in XFree86 4.0.2. Its presence is
-indicated by the macro
-.PN X_HAVE_UTF8_STRING .
.sp
.LP
To set a window's standard window manager properties
Index: abstract.t
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/X11/abstract.t,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.16.1
diff -u -d -r1.1.4.1 -r1.1.4.1.16.1
--- a/abstract.t 26 Nov 2003 22:48:18 -0000 1.1.4.1
+++ b/abstract.t 10 Apr 2004 09:03:45 -0000 1.1.4.1.16.1
@@ -10,7 +10,7 @@
.ce 6
\s+2\fBXlib \- C Language X Interface\fP\s-2
-\s+1\fBX Consortium Standard\fP\s-1
+\s+1\fBX Window System Standard\fP\s-1
\s+1\fBX Version 11, Release 6.7\fP\s-1
.sp 6
Index: glossary
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/X11/glossary,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/glossary 4 Mar 2004 17:46:00 -0000 1.1.4.1.6.1
+++ b/glossary 10 Apr 2004 09:03:45 -0000 1.1.4.1.6.1.6.1
@@ -1,6 +1,3 @@
-.\"
-.\" $XFree86$
-.\"
\&
.sp 1
.ce 1
@@ -405,7 +402,7 @@
The representations do not have to be of uniform length.
Examples are an ISO2022 graphic set, a state-independent
or state-dependent combination of graphic sets, possibly including control
-sets, the X Compound Text encoding, and the UTF-8 ISO10646/Unicode encoding.
+sets, and the X Compound Text encoding.
.IP
In X, encodings are identified by a string
which appears as: the
Index: indexmacros.t
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/X11/indexmacros.t,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -u -d -r1.1 -r1.1.20.1
--- a/indexmacros.t 14 Nov 2003 15:54:32 -0000 1.1
+++ b/indexmacros.t 10 Apr 2004 09:03:45 -0000 1.1.20.1
@@ -1,3 +1,3 @@
-.eh '\fBXlib \- C Library\fP''\fBX11, Release 6.4\fP'
-.oh '\fBXlib \- C Library\fP''\fBX11, Release 6.4\fP'
+.eh '\fBXlib \- C Library\fP''\fBX11, Release 6.7\fP'
+.oh '\fBXlib \- C Library\fP''\fBX11, Release 6.7\fP'
.so index.pageno
More information about the xorg-commit-diffs
mailing list