[xorg-commit-diffs] xc/doc/specs/ICCCM icccm.ms, 1.1.4.2,
1.1.4.3 indexmacros.t, 1.1, 1.1.4.1
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:13:35 PDT 2004
Committed by: eich
Update of /cvs/xorg/xc/doc/specs/ICCCM
In directory pdx:/home/eich/tstbuild/xc/doc/specs/ICCCM
Modified Files:
Tag: XORG-CURRENT
icccm.ms indexmacros.t
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: icccm.ms
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/ICCCM/icccm.ms,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/icccm.ms 5 Mar 2004 13:38:24 -0000 1.1.4.2
+++ b/icccm.ms 15 Apr 2004 10:13:29 -0000 1.1.4.3
@@ -1,10 +1,5 @@
.\" $Xorg: icccm.ms,v 1.3 2000/08/17 19:42:08 cpqbld Exp $
-.\"
-.\"
-.\"
-.\"
-.\" $XFree86: xc/doc/specs/ICCCM/icccm.ms,v 1.2 2000/12/11 19:39:43 dawes Exp $
-.\"
+.\" $XdotOrg$
.\" Use tbl, eqn, -ms, and macros.t
.\" @(#)icccm.ms 1.50 16 Apr 1994 14:13:55
.EH ''''
@@ -45,19 +40,11 @@
.B
\s+2Inter-Client Communication Conventions Manual\s0
-Version 2.0.xf86.1
-
-XFree86 4.0.2
-
-XFree86, Inc.
-
-.I "based on"
-
Version 2.0
X Consortium Standard
-X Version 11, Release 6.4
+X Version 11, Release 6.7
.R
.ce 0
.sp 6
@@ -76,7 +63,7 @@
.nr PS 9
.sp 8
.LP
-X Window System is a trademark of X Consortium, Inc.
+X Window System is a trademark of The Open Group
.LP
.LP
Copyright \(co 1988, 1991, 1993, 1994
@@ -228,8 +215,8 @@
.De
.bp 1
.af PN 1
-.EH '\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.4\fP'
-.OH '\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.4\fP'
+.EH '\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.7\fP'
+.OH '\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.7\fP'
.EF ''\fB % \fP''
.OF ''\fB % \fP''
.nH 1 Introduction
@@ -1403,9 +1390,6 @@
USER TEXT T{
The name of the user running the owner
T}
-UTF8_STRING TEXT T{
-UTF-8 text
-T}
.sp 6p
_
.TE
@@ -1682,7 +1666,6 @@
PIXMAP 32 Fixed-size
SPAN 32 Fixed-size
STRING 8 Zero
-UTF8_STRING 8 Zero
WINDOW 32 Fixed-size
.sp 6p
_
@@ -1717,7 +1700,7 @@
it would be STRING or some other ATOM naming the encoding chosen by the owner.
.LP
STRING as a type or a target specifies the ISO Latin-1 character set plus the
-control characters TAB (hex 09) and NEWLINE (hex 0A).
+control characters TAB (octal 11) and NEWLINE (octal 12).
The spacing interpretation of TAB is context dependent.
Other ASCII control characters are explicitly not included in STRING
at the present time.
@@ -1725,9 +1708,6 @@
COMPOUND_TEXT as a type or a target specifies the Compound Text interchange
format; see the \fICompound Text Encoding\fP.
.LP
-UTF8_STRING as a type or a target specifies an UTF-8 encoded string, with
-NEWLINE (U+000A, hex 0A) as end-of-line marker.
-.LP
There are some text objects where the source or intended user, as the
case may be, does not have a specific character set for the text, but
instead merely requires a zero-terminated sequence of bytes with no
@@ -1750,9 +1730,9 @@
property type is suitable.
.NE
.LP
-Type STRING, COMPOUND_TEXT, UTF8_STRING, and C_STRING properties will
-consist of a list of elements separated by null characters; other encodings
-will need to specify an appropriate list format.
+Type STRING, COMPOUND_TEXT, and C_STRING properties will consist of a list
+of elements separated by null characters; other encodings will need to
+specify an appropriate list format.
.nH 3 "INCR Properties"
.LP
Requestors may receive a property of type INCR\**
@@ -5221,10 +5201,11 @@
.DE
or to
.DS
- Registry
- X Consortium
- 201 Broadway
- Cambridge, MA 02139-1955
+ The X.Org Group -- X11 Registry
+ c/o Ienup Sung
+ Sun Microsystems, Inc.
+ 4150 Network Circle, MS SJC07-201
+ Santa Clara, CA 95054
USA
.DE
Electronic mail will be acknowledged upon receipt. Please allow up to 4
Index: indexmacros.t
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/ICCCM/indexmacros.t,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/indexmacros.t 14 Nov 2003 15:54:31 -0000 1.1
+++ b/indexmacros.t 15 Apr 2004 10:13:29 -0000 1.1.4.1
@@ -1,3 +1,3 @@
-.eh '\s+1\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.4\fP\s-1'
-.oh '\s+1\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.4\fP\s-1'
+.eh '\s+1\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.7\fP\s-1'
+.oh '\s+1\fBInter-Client Communication Conventions\fP''\fBX11, Release 6.7\fP\s-1'
.so index.pageno
More information about the xorg-commit-diffs
mailing list