diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 12:18:05 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 12:18:05 +0000 |
| commit | 3b745a5f1a883a4ea7a7cdbc649b2e2124a907e3 (patch) | |
| tree | 2a398ae25d29df19b659b250a64a8c9fd5757627 | |
| parent | 58850e6a67f59fba4a01954997cd3fe476d67698 (diff) | |
merge with XORG-RELEASE-1
89 files changed, 448 insertions, 956 deletions
diff --git a/hardcopy/BDF/bdf.PS.gz b/hardcopy/BDF/bdf.PS.gz Binary files differindex d6f78a6..79385ad 100644 --- a/hardcopy/BDF/bdf.PS.gz +++ b/hardcopy/BDF/bdf.PS.gz diff --git a/hardcopy/CTEXT/ctext.PS.gz b/hardcopy/CTEXT/ctext.PS.gz Binary files differindex 227044c..b973eea 100644 --- a/hardcopy/CTEXT/ctext.PS.gz +++ b/hardcopy/CTEXT/ctext.PS.gz diff --git a/hardcopy/ICCCM/icccm.PS.gz b/hardcopy/ICCCM/icccm.PS.gz Binary files differindex e0d9454..5855d7a 100644 --- a/hardcopy/ICCCM/icccm.PS.gz +++ b/hardcopy/ICCCM/icccm.PS.gz diff --git a/hardcopy/ICCCM/icccm.idx.PS.gz b/hardcopy/ICCCM/icccm.idx.PS.gz Binary files differindex 9745373..37dd983 100644 --- a/hardcopy/ICCCM/icccm.idx.PS.gz +++ b/hardcopy/ICCCM/icccm.idx.PS.gz diff --git a/hardcopy/ICE/ICElib.PS.gz b/hardcopy/ICE/ICElib.PS.gz Binary files differindex 64d544e..538f19e 100644 --- a/hardcopy/ICE/ICElib.PS.gz +++ b/hardcopy/ICE/ICElib.PS.gz diff --git a/hardcopy/ICE/ice.PS.gz b/hardcopy/ICE/ice.PS.gz Binary files differindex 4b5f8d5..287f40b 100644 --- a/hardcopy/ICE/ice.PS.gz +++ b/hardcopy/ICE/ice.PS.gz diff --git a/hardcopy/SM/SMlib.PS.gz b/hardcopy/SM/SMlib.PS.gz Binary files differindex 06858ff..a81cfe2 100644 --- a/hardcopy/SM/SMlib.PS.gz +++ b/hardcopy/SM/SMlib.PS.gz diff --git a/hardcopy/SM/xsmp.PS.gz b/hardcopy/SM/xsmp.PS.gz Binary files differindex 3c6d0b6..167b4c2 100644 --- a/hardcopy/SM/xsmp.PS.gz +++ b/hardcopy/SM/xsmp.PS.gz diff --git a/hardcopy/X11/xlib.PS.gz b/hardcopy/X11/xlib.PS.gz Binary files differindex d197ff5..80da2ed 100644 --- a/hardcopy/X11/xlib.PS.gz +++ b/hardcopy/X11/xlib.PS.gz diff --git a/hardcopy/X11/xlib.idx.PS.gz b/hardcopy/X11/xlib.idx.PS.gz Binary files differindex eeab2ab..9f754ae 100644 --- a/hardcopy/X11/xlib.idx.PS.gz +++ b/hardcopy/X11/xlib.idx.PS.gz diff --git a/hardcopy/XDMCP/xdmcp.PS.gz b/hardcopy/XDMCP/xdmcp.PS.gz Binary files differindex 837ba0a..a536897 100644 --- a/hardcopy/XDMCP/xdmcp.PS.gz +++ b/hardcopy/XDMCP/xdmcp.PS.gz diff --git a/hardcopy/XIM/xim.PS.gz b/hardcopy/XIM/xim.PS.gz Binary files differindex 9e4c38a..fbc493a 100644 --- a/hardcopy/XIM/xim.PS.gz +++ b/hardcopy/XIM/xim.PS.gz diff --git a/hardcopy/XLFD/xlfd.PS.gz b/hardcopy/XLFD/xlfd.PS.gz Binary files differindex e814c9b..c978f0f 100644 --- a/hardcopy/XLFD/xlfd.PS.gz +++ b/hardcopy/XLFD/xlfd.PS.gz diff --git a/hardcopy/XProtocol/proto.PS.gz b/hardcopy/XProtocol/proto.PS.gz Binary files differindex c7e3d0e..490b303 100644 --- a/hardcopy/XProtocol/proto.PS.gz +++ b/hardcopy/XProtocol/proto.PS.gz diff --git a/hardcopy/XProtocol/proto.idx.PS.gz b/hardcopy/XProtocol/proto.idx.PS.gz Binary files differindex 445e5c0..5b2a4f2 100644 --- a/hardcopy/XProtocol/proto.idx.PS.gz +++ b/hardcopy/XProtocol/proto.idx.PS.gz diff --git a/hardcopy/Xaw/widg.idx.PS.gz b/hardcopy/Xaw/widg.idx.PS.gz Binary files differindex a0f6240..b7981d4 100644 --- a/hardcopy/Xaw/widg.idx.PS.gz +++ b/hardcopy/Xaw/widg.idx.PS.gz diff --git a/hardcopy/Xaw/widgets.PS.gz b/hardcopy/Xaw/widgets.PS.gz Binary files differindex 078b7d7..6b1bd1f 100644 --- a/hardcopy/Xaw/widgets.PS.gz +++ b/hardcopy/Xaw/widgets.PS.gz diff --git a/hardcopy/Xext/DPMS.PS.gz b/hardcopy/Xext/DPMS.PS.gz Binary files differindex 543f8c5..b34f290 100644 --- a/hardcopy/Xext/DPMS.PS.gz +++ b/hardcopy/Xext/DPMS.PS.gz diff --git a/hardcopy/Xext/DPMSLib.PS.gz b/hardcopy/Xext/DPMSLib.PS.gz Binary files differindex 8bb9254..74c01d1 100644 --- a/hardcopy/Xext/DPMSLib.PS.gz +++ b/hardcopy/Xext/DPMSLib.PS.gz diff --git a/hardcopy/Xext/bigreq.PS.gz b/hardcopy/Xext/bigreq.PS.gz Binary files differindex 63e884e..3bb2419 100644 --- a/hardcopy/Xext/bigreq.PS.gz +++ b/hardcopy/Xext/bigreq.PS.gz diff --git a/hardcopy/Xext/evi.PS.gz b/hardcopy/Xext/evi.PS.gz Binary files differindex 385ec8b..705e20e 100644 --- a/hardcopy/Xext/evi.PS.gz +++ b/hardcopy/Xext/evi.PS.gz diff --git a/hardcopy/Xext/record.PS.gz b/hardcopy/Xext/record.PS.gz Binary files differindex a75c54e..c6137f4 100644 --- a/hardcopy/Xext/record.PS.gz +++ b/hardcopy/Xext/record.PS.gz diff --git a/hardcopy/Xext/recordlib.PS.gz b/hardcopy/Xext/recordlib.PS.gz Binary files differindex 79a95b2..149cd22 100644 --- a/hardcopy/Xext/recordlib.PS.gz +++ b/hardcopy/Xext/recordlib.PS.gz diff --git a/hardcopy/Xext/security.PS.gz b/hardcopy/Xext/security.PS.gz Binary files differindex 740b427..a4c0ffc 100644 --- a/hardcopy/Xext/security.PS.gz +++ b/hardcopy/Xext/security.PS.gz diff --git a/hardcopy/Xext/shape.PS.gz b/hardcopy/Xext/shape.PS.gz Binary files differindex fe85f70..d270ae4 100644 --- a/hardcopy/Xext/shape.PS.gz +++ b/hardcopy/Xext/shape.PS.gz diff --git a/hardcopy/Xext/shapelib.PS.gz b/hardcopy/Xext/shapelib.PS.gz Binary files differindex 8785f61..13b1990 100644 --- a/hardcopy/Xext/shapelib.PS.gz +++ b/hardcopy/Xext/shapelib.PS.gz diff --git a/hardcopy/Xext/sync.PS.gz b/hardcopy/Xext/sync.PS.gz Binary files differindex 24c369c..18692a4 100644 --- a/hardcopy/Xext/sync.PS.gz +++ b/hardcopy/Xext/sync.PS.gz diff --git a/hardcopy/Xext/synclib.PS.gz b/hardcopy/Xext/synclib.PS.gz Binary files differindex 11fa3e9..344c000 100644 --- a/hardcopy/Xext/synclib.PS.gz +++ b/hardcopy/Xext/synclib.PS.gz diff --git a/hardcopy/Xext/tog-cup.PS.gz b/hardcopy/Xext/tog-cup.PS.gz Binary files differindex d6836c6..fe9d7e7 100644 --- a/hardcopy/Xext/tog-cup.PS.gz +++ b/hardcopy/Xext/tog-cup.PS.gz diff --git a/hardcopy/Xext/xc-misc.PS.gz b/hardcopy/Xext/xc-misc.PS.gz Binary files differindex 1eae2f9..b9ecebe 100644 --- a/hardcopy/Xext/xc-misc.PS.gz +++ b/hardcopy/Xext/xc-misc.PS.gz diff --git a/hardcopy/Xi/lib.PS.gz b/hardcopy/Xi/lib.PS.gz Binary files differindex d96925d..45c64c6 100644 --- a/hardcopy/Xi/lib.PS.gz +++ b/hardcopy/Xi/lib.PS.gz diff --git a/hardcopy/Xi/port.PS.gz b/hardcopy/Xi/port.PS.gz Binary files differindex 19e9651..32d716d 100644 --- a/hardcopy/Xi/port.PS.gz +++ b/hardcopy/Xi/port.PS.gz diff --git a/hardcopy/Xi/proto.PS.gz b/hardcopy/Xi/proto.PS.gz Binary files differindex 30eb0eb..bd45e61 100644 --- a/hardcopy/Xi/proto.PS.gz +++ b/hardcopy/Xi/proto.PS.gz diff --git a/hardcopy/Xmu/xmu.PS.gz b/hardcopy/Xmu/xmu.PS.gz Binary files differindex eabecfb..69c72ec 100644 --- a/hardcopy/Xmu/xmu.PS.gz +++ b/hardcopy/Xmu/xmu.PS.gz diff --git a/hardcopy/Xt/intr.idx.PS.gz b/hardcopy/Xt/intr.idx.PS.gz Binary files differindex d6bca14..4b15faf 100644 --- a/hardcopy/Xt/intr.idx.PS.gz +++ b/hardcopy/Xt/intr.idx.PS.gz diff --git a/hardcopy/Xt/intrinsics.PS.gz b/hardcopy/Xt/intrinsics.PS.gz Binary files differindex e0cee8f..ca2efad 100644 --- a/hardcopy/Xt/intrinsics.PS.gz +++ b/hardcopy/Xt/intrinsics.PS.gz diff --git a/hardcopy/i18n/Framework.PS.gz b/hardcopy/i18n/Framework.PS.gz Binary files differindex 7c48a4d..b95fcfd 100644 --- a/hardcopy/i18n/Framework.PS.gz +++ b/hardcopy/i18n/Framework.PS.gz diff --git a/hardcopy/i18n/LocaleDB.PS.gz b/hardcopy/i18n/LocaleDB.PS.gz Binary files differindex 7cc6db2..3c7eb55 100644 --- a/hardcopy/i18n/LocaleDB.PS.gz +++ b/hardcopy/i18n/LocaleDB.PS.gz diff --git a/hardcopy/i18n/Trans.PS.gz b/hardcopy/i18n/Trans.PS.gz Binary files differindex 1d66350..8c7fa29 100644 --- a/hardcopy/i18n/Trans.PS.gz +++ b/hardcopy/i18n/Trans.PS.gz diff --git a/man/general/Standards.man b/man/general/Standards.man index cb6ee22..9d53c5b 100644 --- a/man/general/Standards.man +++ b/man/general/Standards.man @@ -1,170 +1,159 @@ .\" $Xorg: Standards.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $ .\" $XdotOrg: xc/doc/man/general/Standards.man,v 1.1.10.2 2004/03/16 02:44:56 alanc Exp $ -.\" Copyright (c) 1993, 1994, 1996 X Consortium -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining -.\" a copy of this software and associated documentation files (the +.\" Copyright (c) 1993, 1994, 1996, 2004 The Open Group +.\" +.\" 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. .\" -.\" $XFree86$ +.\" 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. .\" .TH XSTANDARDS __miscmansuffix__ __xorgversion__ .SH NAME -XStandards \- X Consortium Standards and X Project Team Specifications +XStandards \- X Window System Standards and Specifications .SH SYNOPSIS The major goal of the X Consortium was to promote cooperation within the computer industry in the creation of standard software interfaces at -all layers in the X Window System environment. +all layers in the X Window System environment. The X Consortium produced standards - documents which defined network protocols, programming interfaces, and other aspects of the X environment. These standards -continue to exist in The Open Group's X Project Team -releases. The X Project Team produces specifications. -Like X Consortium Standards, these are documents +continue to exist in the X.Org Foundation releases. +The X.Org Foundation also produces specifications. +Like X Window System Standards, these are documents which define network protocols, programming interfaces, and other aspects of the X environment. Under the aegis -of The Open Group, X Consortium standards, X Project -Team specifications, and other specifications are the +of The Open Group, X Window System standards, X.Org Foundation +specifications, and other specifications are the basis for portions of The Open Group's various CAE specifications. .PP The status of various standards, specifications, and -the software in the X11R6.4 distribution, is explained below. +the software in the X11R6.7 distribution, is explained below. .SH STANDARDS -The following documents are X Consortium standards: +The following documents are X Window System standards: .nf X Window System Protocol -X Version 11, Release 6.4 +X Version 11, Release 6.7 Robert W. Scheifler Xlib \- C Language X Interface -X Version 11, Release 6.4 +X Version 11, Release 6.7 James Gettys, Robert W. Scheifler, Ron Newman X Toolkit Intrinsics \- C Language Interface -X Version 11, Release 6.4 +X Version 11, Release 6.7 Joel McCormack, Paul Asente, Ralph R. Swick, Donna Converse Bitmap Distribution Format Version 2.1 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Inter-Client Communication Conventions Manual Version 2.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 David Rosenthal, Stuart W. Marks Compound Text Encoding Version 1.1 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Robert W. Scheifler X Logical Font Description Conventions Version 1.5 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Jim Flowers, Stephen Gildea X Display Manager Control Protocol -Version 1.0 -X Version 11, Release 6.4 +Version 1.1 +X Version 11, Release 6.7 Keith Packard X11 Nonrectangular Window Shape Extension Version 1.0.1 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Keith Packard X11 Input Extension Protocol Specification Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 George Sachs, Mark Patrick X11 Input Extension Library Specification -X Version 11, Release 6.4 +X Version 11, Release 6.7 Mark Patrick, George Sachs The X Font Service Protocol Version 2.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Jim Fulton -PEX Protocol Specification -Version 5.1 -Cheryl Huntington (architect), Paula Womack (editor) - -PEXlib Specification and C Language Binding -Version 5.1 -Jeff Stevenson - Inter-Client Exchange (ICE) Protocol Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Robert Scheifler, Jordan Brown Inter-Client Exchange (ICE) Library Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Ralph Mor X Session Management Protocol Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Mike Wexler X Session Management Library Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Ralph Mor The Input Method Protocol Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Masahiko Narita, Hideki Hiura X Synchronization Extension Version 3.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Tim Glauert, Dave Carver, Jim Gettys, David P. Wiggins -X Image Extension, Protocol Reference Manual -Version 5.0 -X Version 11, Release 6.4 -Bob Shelley - XTEST Extension Version 2.2 Kieron Drake Big Requests Extension Version 2.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Bob Scheifler XC-MISC Extension Version 1.1 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Bob Scheifler, Dave Wiggins Double Buffer Extension @@ -180,41 +169,41 @@ Version 1.13 Martha Zimet, Stephen Gildea X Keyboard Extension Protocol -X Version 11, Release 6.4 +X Version 11, Release 6.7 Erik Fortune X Keyboard Extension Library -X Version 11, Release 6.4 +X Version 11, Release 6.7 Amber J. Benson, Gary Aitken, Erik Fortune, Donna Converse, George Sachs, and Will Walker X Print Extension Protocol -X Version 11, Release 6.4 +X Version 11, Release 6.7 X Print Extension Library -X Version 11, Release 6.4 +X Version 11, Release 6.7 X Application Group Extension Protocol and Library Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Kaleb Keithley X Security Extension Protocol and Library Version 4.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Dave Wiggins X Proxy Manager Protocol -X Version 11, Release 6.4 +X Version 11, Release 6.7 Ralph Swick LBX Extension Protocol and Library -X Version 11, Release 6.4 +X Version 11, Release 6.7 Keith Packard, Dave Lemke, Donna Converse, Ralph Mor, Ray Tice Remote Execution MIME Type Version 1.0 -X Version 11, Release 6.4 +X Version 11, Release 6.7 Arnaud Le Hors .fi .SH SPECIFICATIONS @@ -233,23 +222,6 @@ X Display Power Management (DPMS) Extension Protocol and Library Version 1.0 Rob Lembree -.SH "DRAFT STANDARDS" -The following documents are currently draft standards of the X Consortium. -.nf - -X Image Extension Library -Public Review Draft -Gary Rogers - -PEX Protocol Specification -Version 5.2 -Jeff Stevenson (architect), Jane Sczechowski (editor) - -PEXlib Specification and C Language Binding -Version 5.2 -Karl Schultz -.fi - .SH "INCLUDE FILES" The following include files are part of the Xlib standard. .PP @@ -306,16 +278,6 @@ The following include files are part of the X Input Extension standard. <X11/extensions/XIproto.h> .fi .PP -The following include files are part of the PEXlib standard. -.PP -.nf -<X11/PEX5/PEX.h> -<X11/PEX5/PEXlib.h> -<X11/PEX5/PEXlibint.h> -<X11/PEX5/PEXproto.h> -<X11/PEX5/PEXprotost.h> -.fi -.PP The following include files are part of the ICElib standard. .PP .nf @@ -341,15 +303,6 @@ The following include file is part of the Synchronization standard. <X11/extensions/sync.h> .fi .PP -The following include files are part of the XIElib draft standard. -.PP -.nf -<X11/extensions/XIE.h> -<X11/extensions/XIElib.h> -<X11/extensions/XIEproto.h> -<X11/extensions/XIEprotost.h> -.fi -.PP The following include file is part of the XTEST standard. .PP .nf @@ -418,7 +371,7 @@ The following include files are part of the LBX Extension library standard. <X11/extensions/lbxzlib.h> .fi .PP -The following include files are part of the Colormap Utilization +The following include files are part of the Colormap Utilization Policy and Extention specification. .PP .nf @@ -443,14 +396,14 @@ Signaling Extension specification. .fi .SH "NON STANDARDS" -The X11R6.4 distribution contains \fIsample\fP implementations, not +The X11R6.7 distribution contains \fIsample\fP implementations, not \fIreference\fP implementations. Although much of the code is believed to be correct, the code should be assumed to be in error wherever it conflicts with the specification. .PP -The only X Consortium standards are the ones listed above. -No other documents, include files, or software in X11R6.4 carry special -status within the X Consortium. For example, none of the following +The only X Window System standards are the ones listed above. +No other documents, include files, or software in X11R6.7 carry special +status within the X Window System. For example, none of the following are standards: internal interfaces of the sample server; the MIT-SHM extension; @@ -459,10 +412,10 @@ the Xmu library; the Xau library; the RGB database; the X Locale database; -the fonts distributed with X11R6.4; -the applications distributed with X11R6.4; +the fonts distributed with X11R6.7; +the applications distributed with X11R6.7; the include files <X11/XWDFile.h>, <X11/Xfuncproto.h>, <X11/Xfuncs.h>, -<X11/Xosdefs.h>, <X11/Xos.h>, <X11/Xos_r.h>, <X11/Xwinsock.h>, and +<X11/Xosdefs.h>, <X11/Xos.h>, <X11/Xos_r.h>, <X11/Xwinsock.h>, and <X11/Xthreads.h>; the bitmap files in <X11/bitmaps>. .PP @@ -470,15 +423,13 @@ The Multi-Buffering extension was a draft standard of the X Consortium but has been superseded by DBE as a standard. .SH "X REGISTRY" -The X Consortium maintained a registry of certain X-related items, to +The X.Org Foundation maintains a registry of certain X-related items, to aid in avoiding conflicts and to aid in sharing of such items. .PP -The registry is published as part of the X Consortium software +The registry is published as part of the X Window System software release. -The latest version may also be available by sending a message to -xstuff@x.org. The message can have a subject line and no body, or a -single-line body and no subject, in either case the line looking like: +The latest version may also be found at .nf - send docs registry + ftp://ftp.x.org/pub/DOCS/registry .fi -The X Registry and the names in it are not X Consortium standards. +The X Registry and the names in it are not X Window System standards. diff --git a/man/general/X.man b/man/general/X.man index 20a3f8f..02bcef9 100644 --- a/man/general/X.man +++ b/man/general/X.man @@ -1,29 +1,37 @@ .\" $Xorg: X.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $ -.\" Copyright (c) 1994 X Consortium +.\" $XdotOrg$ +.\" +.\" Copyright (c) 1994, 2004 The Open Group .\" Copyright \(co 2000 The XFree86 Project, Inc. .\" +.\" 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 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. -.\" -.\" 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 -.\" dealing in this Software without prior written authorization from the -.\" X Consortium. +.\" 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, 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 +.\" 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. .\" .\" $XFree86: xc/doc/man/general/X.man,v 1.7 2001/10/01 13:43:56 eich Exp $ .\" @@ -34,11 +42,11 @@ X \- a portable, network-transparent window system .PP The X Window System is a network transparent window system which runs on a wide range of computing and graphics machines. It should be -relatively straightforward to build the X Consortium software +relatively straightforward to build the X.Org Foundation software distribution on most ANSI C and POSIX compliant systems. Commercial implementations are also available for a wide range of platforms. .PP -The X Consortium requests that the following names be used when +The X.Org Foundation requests that the following names be used when referring to this software: .sp .ce 5 @@ -53,7 +61,7 @@ X Window System, Version 11 X11 .PP .I "X Window System" -is a trademark of X Consortium, Inc. +is a trademark of The Open Group. .SH DESCRIPTION X Window System servers run on computers with bitmap displays. The server distributes user input to and accepts output requests from various @@ -74,7 +82,7 @@ the \fIX Toolkit Intrinsics - C Language Interface\fP manual, and various toolkit documents. .PP The number of programs that use \fIX\fP is quite large. -Programs provided in the core X Consortium distribution include: +Programs provided in the core X.Org Foundation distribution include: a terminal emulator, \fIxterm\fP; a window manager, \fItwm\fP; a display manager, \fIxdm\fP; @@ -94,7 +102,6 @@ screen image manipulation utilities, \fIxwd\fP, \fIxwud\fP, and \fIxmag\fP; a performance measurement utility, \fIx11perf\fP; a font compiler, \fIbdftopcf\fP; a font server and related utilities, \fIxfs\fP, \fIfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP; -an X Image Extension exerciser, \fIxieperf\fP; a display server and related utilities, \fIXserver\fP, \fIrgb\fP, \fImkfontdir\fP; remote execution utilities, \fIrstart\fP and \fIxon\fP; a clipboard manager, \fIxclipboard\fP; @@ -110,7 +117,7 @@ an RX MIME-type helper program, \fIxrx\fP; and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP. .PP Many other utilities, window managers, games, toolkits, etc. are included -as user-contributed software in the X Consortium distribution, or are +as user-contributed software in the X.Org Foundation distribution, or are available using anonymous ftp on the Internet. See your site administrator for details. .SH "STARTING UP" @@ -364,12 +371,12 @@ to explicitly draw the window's region on the screen with the pointer, for example). .PP Since window managers are regular (albeit complex) client programs, -a variety of different user interfaces can be built. The X Consortium distribution +a variety of different user interfaces can be built. The X.Org Foundation distribution comes with a window manager named \fItwm\fP which supports overlapping windows, popup menus, point-and-click or click-to-type input models, title bars, nice icons (and an icon manager for those who don't like separate icon windows). .PP -See the user-contributed software in the X Consortium distribution for other +See the user-contributed software in the X.Org Foundation distribution for other popular window managers. .SH "FONT NAMES" Collections of characters for displaying text and symbols in X are known as @@ -1255,7 +1262,6 @@ the appropriate instance name can be placed before the asterisk: .BR xfs (1), .BR xfwp (1), .BR xhost (1), -.BR xieperf (1), .BR xinit (1), .BR xkbbell (1), .BR xkbcomp (1), @@ -1300,21 +1306,19 @@ and .I "X Toolkit Intrinsics \- C Language Interface" .SH TRADEMARKS .PP -X Window System is a trademark of X Consortium, Inc. +X Window System is a trademark of The Open Group. .SH AUTHORS .PP -A cast of thousands, literally. The Release 6.3 distribution is -brought to you by X Consortium, Inc. The names of all people who -made it a reality will be found in the individual documents and -source files. The staff members at the X Consortium responsible -for this release are: Donna Converse (emeritus), Stephen Gildea -(emeritus), Kaleb Keithley, Matt Landau (emeritus), Ralph Mor -(emeritus), Janet O'Halloran, Bob Scheifler, Ralph Swick, Dave -Wiggins (emeritus), and Reed Augliere. +A cast of thousands, literally. The Release 6.7 distribution is +brought to you by the X.Org Foundation and it's members and contributors. +The names of all people who made it a reality will be found in the +individual documents and source files. More information about the +X.Org Foundation can be found on the internet at +.I http://www.x.org/ .PP The X Window System standard was originally developed at the Laboratory for Computer Science at the Massachusetts Institute of Technology, and all rights thereto were assigned to the X Consortium on January 1, 1994. X Consortium, Inc. closed its doors on December 31, 1996. All rights to the -X Window System have been assigned to the Open Software Foundation. +X Window System have been assigned to The Open Group. @@ -1694,8 +1694,8 @@ REFERENCES Markus G. Kuhn University of Cambridge Computer Laboratory - New Museums Site, Pembroke Street - Cambridge CB2 3QG + 15 JJ Thomson Avenue + Cambridge CB3 0FD United Kingdom [134] In R6.6 X.Org is reserving the string UTF8_STRING for use as an ICCCM diff --git a/specs/BDF/bdf.ms b/specs/BDF/bdf.ms index 328e345..911ab42 100644 --- a/specs/BDF/bdf.ms +++ b/specs/BDF/bdf.ms @@ -6,9 +6,9 @@ \s+1\fBVersion 2.1\fP\s-1 -X Consortium Standard +X Window System Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 3 Copyright 1984, 1987, 1988 Adobe Systems, Inc. .sp 1 diff --git a/specs/CTEXT/ctext.tbl.ms b/specs/CTEXT/ctext.tbl.ms index b7edfff..02d1013 100644 --- a/specs/CTEXT/ctext.tbl.ms +++ b/specs/CTEXT/ctext.tbl.ms @@ -1,40 +1,12 @@ +.\" $XdotOrg$ .\" Use tbl and -ms -.\" -.\" $XFree86$ -.\" -.\" --- bP --- bulleted paragraph macro -.\" -.de bP -.IP \(bu 4 -.. -.\" -.\" --- cT --- centered title; centers $1, adds TOC entry unless $2 is "no" -.\" -.de cT -\\& \" filler so that the following .sp really leaves a space -.sp 1 -.ce 1 -\\s+1\\fB\\$1\\fP\\s-1 -.sp 1 -.if !'\\$2'no' \{\ -.XS \\n(PN -\\$1 -.XE -\} -.. .sp 8 -.ce 9 +.ce 5 \s+2\fBCompound Text Encoding\fP\s-2 .sp 6p -Version 1.1.xf86.1 -XFree86 4.0.2 -XFree86, Inc. -.sp 6p -.I "based on" -.sp 6p Version 1.1 X Consortium Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 Robert W. Scheifler .sp 2 .LP @@ -249,7 +221,7 @@ _ .sp 4p _ .sp 6p -04/02 94 7-bit ASCII graphics (ANSI X3.4-1968), +4/02 94 7-bit ASCII graphics (ANSI X3.4-1968), Left half of ISO 8859 sets 04/09 94 Right half of JIS X0201-1976 (reaffirmed 1984), 8-Bit Alphanumeric-Katakana Code @@ -265,16 +237,10 @@ _ 04/08 96 Right half of ISO 8859-8, Latin/Hebrew alphabet 04/12 96 Right half of ISO 8859-5, Latin/Cyrillic alphabet 04/13 96 Right half of ISO 8859-9, Latin alphabet No. 5 -05/06 96 Right half of ISO 8859-10, Latin alphabet No. 6 -05/09 96 Right half of ISO 8859-13, Latin alphabet No. 7 (Baltic Rim) -05/15 96 Right half of ISO 8859-14, Latin alphabet No. 8 (Celtic) -06/02 96 Right half of ISO 8859-15, Latin alphabet No. 9 -06/06 96 Right half of ISO 8859-16, Latin alphabet No. 10 .sp 6p 04/01 94\u\s-22\s+2\d GB2312-1980, China (PRC) Hanzi -04/02 94\u\s-22\s+2\d JIS X0208-1983/1990, Japanese Graphic Character Set +04/02 94\u\s-22\s+2\d JIS X0208-1983, Japanese Graphic Character Set 04/03 94\u\s-22\s+2\d KS C5601-1987, Korean Graphic Character Set -04/02 94\u\s-22\s+2\d JIS X0212-1990, Supplementary Japanese Graphic Character Set .sp 6p _ .TE @@ -335,33 +301,9 @@ for example, they may contain octets in the C0 and C1 ranges, including 00/00, and octets comprising a given character may differ in their most significant bit. .LP -[Except for UTF-8, -ISO-registered ``other coding systems'' are not used in Compound Text; +[ISO-registered ``other coding systems'' are not used in Compound Text; extended segments are the only mechanism for non-2022 encodings.] .NH 1 -The UTF-8 encoding -.LP -Unicode characters that are not contained in one of the approved standard -encodings can be encoded using the UTF-8 encoding. The following escape -sequences are used: -.RS -.TS -l l. -01/11 02/05 04/07 switch into UTF-8 mode -01/11 02/05 04/00 return from UTF-8 mode -.TE -.RE -.LP -The first is the ISO registered sequence for UTF-8 (ISO-IR-196), the second -is the ISO-2022 ``standard return'' sequence. While in UTF-8 mode, the UTF-8 -encoding replaces the currently designated GL and GR encodings. After return -from UTF-8 mode, the previously designated GL and GR encodings are -reactivated. -.LP -[This is the only ``other coding system'' used in Compound Text.] -.LP -[This is an XFree86 extension introduced in XFree86 4.0.2.] -.NH 1 Directionality .LP If desired, horizontal text direction can be indicated using the following @@ -434,16 +376,9 @@ ISO8859-6 ISO 8859-6 Latin/Arabic alphabet ISO8859-7 ISO 8859-7 Latin/Greek alphabet ISO8859-8 ISO 8859-8 Latin/Hebrew alphabet ISO8859-9 ISO 8859-9 Latin alphabet No. 5 -ISO8859-10 ISO 8859-10 Latin alphabet No. 6 -ISO8859-13 ISO 8859-13 Latin alphabet No. 7 (Baltic Rim) -ISO8859-14 ISO 8859-14 Latin alphabet No. 8 (Celtic) -ISO8859-15 ISO 8859-15 Latin alphabet No. 9 -ISO8859-16 ISO 8859-16 Latin alphabet No. 10 JISX0201.1976-0 JIS X0201-1976 (reaffirmed 1984) 8-bit Alphanumeric-Katakana Code GB2312.1980-0 GB2312-1980, GL encoding China (PRC) Hanzi JISX0208.1983-0 JIS X0208-1983, GL encoding Japanese Graphic Character Set -JISX0208.1990-0 JIS X0208-1990, GL encoding Japanese Graphic Character Set -JISX0212.1990-0 JIS X0212-1990, GL encoding Supplementary Japanese Graphic Character Set KSC5601.1987-0 KS C5601-1987, GL encoding Korean Graphic Character Set .sp 6p _ @@ -513,28 +448,3 @@ If a Compound Text string does not match the specification here (e.g., uses undefined control characters, or undefined control sequences, or incorrectly formatted extended segments), it is best to treat the entire string as invalid, except as indicated by a version control sequence. -.bp -.\" Set registers to number the appendixes A.1, B.1, C.1, ... -.nr H1 0 -.af H1 A -.cT "Appendix A" no -.nH 1 "Revision History" -.LP -This appendix describes the revision history of this document and -summarizes the incompatibilities between this and earlier versions. -.nH 2 "Version 1.1" -.LP -Version 1.1 is the original X11 specification. -.nH 2 "Version 1.1.xf86.1" -.LP -Version 1.1.xf86.1 was released with XFree86 4.0.2 in December 2000. -It adds the following changes: -.bP -Added ISO 8859-10,13,14,15,16 and JIS X0212 to the list of standard -encodings. Mention the 1990 revision of JIS X0208 as an alternative to -the 1983 edition. -.bP -Added ISO8859-10, ISO8859-13, ISO8859-14, ISO8859-15, ISO8859-16, -JISX0208.1990-0, JISX0212.1990-0 to the list of font charsets. -.bP -The section about UTF-8 encoding was added. diff --git a/specs/FSProtocol/protocol.ms b/specs/FSProtocol/protocol.ms index 613e8c1..6945233 100644 --- a/specs/FSProtocol/protocol.ms +++ b/specs/FSProtocol/protocol.ms @@ -1,4 +1,5 @@ .\" $Xorg: protocol.ms,v 1.3 2000/08/17 19:42:07 cpqbld Exp $ +.\" $XdotOrg$ .\" Use tbl, -ms, and macros.t .EH '''' .OH '''' @@ -12,9 +13,9 @@ \s+3\fBThe X Font Service Protocol\fP\s-3 .sp \fBVersion 2.0\fP -\fBX Consortium Standard\fR +\fBX Window System Standard\fR .sp -\fBX Version 11, Release 6.4\fR +\fBX Version 11, Release 6.7\fR .sp 6 Jim Fulton Network Computing Devices, Inc. @@ -63,8 +64,8 @@ in this Software without prior written authorization from the X Consortium. .ps 11 .nr PS 11 .bp 1 -.EH '\fBX Font Service Protocol\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Font Service Protocol\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Font Service Protocol\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Font Service Protocol\fP''\fBX11, Release 6.7\fP' .EF ''\fB\\\\n(PN\fP'' .OF ''\fB\\\\n(PN\fP'' .NH 1 @@ -76,7 +77,7 @@ Introduction The management of fonts in large, heterogeneous environments is one of the hardest aspects of using the X Window System.* .FS -* \fIX Window System\fP is a trademark of X Consortium, Inc. +* \fIX Window System\fP is a trademark of The Open Group. .FE Multiple formats and the lack of a consistent mechanism for exporting font data to all displays on a network diff --git a/specs/ICCCM/icccm.ms b/specs/ICCCM/icccm.ms index c094a10..f21c84b 100644 --- a/specs/ICCCM/icccm.ms +++ b/specs/ICCCM/icccm.ms @@ -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 @@ X Version 11, Release 6.4 .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 @@ John Interrante John Thomas .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 @@ T} 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 @@ T} 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 @@ The type would not actually be TEXT; 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 @@ at the present time. 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 @@ way to treat them as the same. Thus no character-set based 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 @@ delim off .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 diff --git a/specs/ICCCM/indexmacros.t b/specs/ICCCM/indexmacros.t index d7853fd..0520638 100644 --- a/specs/ICCCM/indexmacros.t +++ b/specs/ICCCM/indexmacros.t @@ -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 diff --git a/specs/ICE/ICElib.ms b/specs/ICE/ICElib.ms index 36540f4..b7f4046 100644 --- a/specs/ICE/ICElib.ms +++ b/specs/ICE/ICElib.ms @@ -1,4 +1,5 @@ .\" $Xorg: ICElib.ms,v 1.3 2000/08/17 19:42:09 cpqbld Exp $ +.\" $XdotOrg$ .\" .\" Use tbl, -ms, and macros.t .\" @@ -28,7 +29,7 @@ Version 1.0 .sp X Consortium Standard .sp -X Version 11, Release 6.4 +X Version 11, Release 6.7 .AU Ralph Mor .AI @@ -60,10 +61,10 @@ 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. .sp 5 -X Window System is a trademark of X Consortium, Inc. +X Window System is a trademark of The Open Group. .bp -.EH '\fBInter-Client Exchange Library\fP''\fBX11, Release 6.4\fP' -.OH '\fBInter-Client Exchange Library\fP''\fBX11, Release 6.4\fP' +.EH '\fBInter-Client Exchange Library\fP''\fBX11, Release 6.7\fP' +.OH '\fBInter-Client Exchange Library\fP''\fBX11, Release 6.7\fP' .bp 1 .EF ''\- \\\\n(PN \-'' .OF ''\- \\\\n(PN \-'' diff --git a/specs/ICE/ice.ms b/specs/ICE/ice.ms index 144734a..3d4295d 100644 --- a/specs/ICE/ice.ms +++ b/specs/ICE/ice.ms @@ -1,4 +1,5 @@ .\" Use tbl macros.t ice.ms | troff -ms +.\" $XdotOrg$ .\" .\" TODO: .\" Think about connector/listener originator/answerer terminology. @@ -88,7 +89,7 @@ Version 1.1 .sp X Consortium Standard .sp -X Version 11, Release 6.4 +X Version 11, Release 6.7 @@ -150,9 +151,9 @@ 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. .sp 5 -X Window System is a trademark of X Consortium, Inc. -.EH '\fBInter-Client Exchange Protocol\fP''\fBX11, Release 6.4\fP' -.OH '\fBInter-Client Exchange Protocol\fP''\fBX11, Release 6.4\fP' +X Window System is a trademark of The Open Group. +.EH '\fBInter-Client Exchange Protocol\fP''\fBX11, Release 6.7\fP' +.OH '\fBInter-Client Exchange Protocol\fP''\fBX11, Release 6.7\fP' .bp 1 .EF ''\fB % \fP'' .OF ''\fB % \fP'' diff --git a/specs/SIAddresses/IPv6.txt b/specs/SIAddresses/IPv6.txt new file mode 100644 index 0000000..2d76f22 --- /dev/null +++ b/specs/SIAddresses/IPv6.txt @@ -0,0 +1,11 @@ +ServerInterpreted address definition for type "IPv6": + +The X.org Architecture Task Force reserves the ServerInterpreted +address type of "IPv6" for use with IPv6 literal address formats. +The syntax for the value will be defined as specified in RFC 3513 +and the IETF RFC to be published based on the current draft at +http://www.ietf.org/internet-drafts/draft-ietf-ipv6-scoping-arch-00.txt +This address type specification will be formally issued once the +IETF IPv6 Working Group issues the corresponding RFC. + +Version 0.9, March 2004 diff --git a/specs/SIAddresses/README b/specs/SIAddresses/README new file mode 100644 index 0000000..b68beb7 --- /dev/null +++ b/specs/SIAddresses/README @@ -0,0 +1,6 @@ +$XdotOrg: xc/doc/specs/SIAddresses/README,v 1.1.2.1 2004/03/13 18:48:39 alanc Exp $ + +This directory contains the specifications of address types for the +ServerInterpreted address family used in the ChangeHost and ListHosts +requests in the X11 Protocol. See Chapter 9 of the X11 Protocol spec +for more information. diff --git a/specs/SIAddresses/hostname.txt b/specs/SIAddresses/hostname.txt new file mode 100644 index 0000000..498fb01 --- /dev/null +++ b/specs/SIAddresses/hostname.txt @@ -0,0 +1,11 @@ +ServerInterpreted address definition for type "hostname": + +A ServerInterpreted address with type "hostname" shall have a value +representing a hostname as defined in IETF RFC 2396. Due to Mobile IP +and dynamic DNS, the name service should be consulted at connection +authentication time. Clients supporting Internationalized Domain +Names must convert to ASCII Compatible Encoding as specified in the +relevant IETF RFC's before use in the X11 protocol. Note that this +definition of hostname does not allow use of literal IP addresses. + +Version 1.0, March 2004 diff --git a/specs/SM/SMlib.ms b/specs/SM/SMlib.ms index 38fb64c..5f1c81a 100644 --- a/specs/SM/SMlib.ms +++ b/specs/SM/SMlib.ms @@ -1,4 +1,5 @@ .\" $Xorg: SMlib.ms,v 1.3 2000/08/17 19:42:19 cpqbld Exp $ +.\" $XdotOrg$ .\" .\" Use tbl, -ms, and macros.t .\" edited for DP edits and code consistency w/ core protocol/xlib 4/18/96 @@ -28,7 +29,7 @@ Version 1.0 .sp X Consortium Standard .sp -X Version 11, Release 6.4 +X Version 11, Release 6.7 .AU Ralph Mor .AI @@ -60,11 +61,11 @@ 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. .sp 3 -X Window System is a trademark of X Consortium, Inc. +X Window System is a trademark of The Open Group. .bp .bp 1 -.EH '\fBX Session Management Library\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Session Management Library\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Session Management Library\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Session Management Library\fP''\fBX11, Release 6.7\fP' .EF ''\- \\\\n(PN \-'' .OF ''\- \\\\n(PN \-'' .NH 1 diff --git a/specs/SM/xsmp.ms b/specs/SM/xsmp.ms index 3f24869..57be4cb 100644 --- a/specs/SM/xsmp.ms +++ b/specs/SM/xsmp.ms @@ -1,6 +1,6 @@ .\" Use tbl, -ms, and macros.t .\" $Xorg: xsmp.ms,v 1.3 2000/08/17 19:42:19 cpqbld Exp $ -.\" $XFree86$ +.\" $XdotOrg$ .EH '''' .OH '''' .EF '''' @@ -59,8 +59,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .OF ''\\\\n(PN'' .bp 1 .af PN 1 -.EH '\fBX Session Management Protocol\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Session Management Protocol\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Session Management Protocol\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Session Management Protocol\fP''\fBX11, Release 6.7\fP' .EF ''\fB\\\\n(PN\fP'' .OF ''\fB\\\\n(PN\fP'' .nH 1 "Acknowledgements" diff --git a/specs/X11/CH01 b/specs/X11/CH01 index 92205b4..528df0a 100644 --- a/specs/X11/CH01 +++ b/specs/X11/CH01 @@ -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 @@ in the host encoding. .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 @@ STRING Encoding .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, diff --git a/specs/X11/CH13 b/specs/X11/CH13 index 66cfba1..539743c 100644 --- a/specs/X11/CH13 +++ b/specs/X11/CH13 @@ -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 $ .\" \& .sp 1 @@ -348,9 +345,6 @@ Encoding of supplied/returned T} text (some WM_ property text in environment locale) - T{ -.PN Xutf8SetWMProperties -T} .sp 6p T{ .PN setlocale @@ -363,17 +357,11 @@ T} .PN XwcTextPropertyToTextList T} T{ -.PN Xutf8TextPropertyToTextList -T} - T{ .PN XmbTextListToTextProperty T} T{ .PN XwcTextListToTextProperty T} - T{ -.PN Xutf8TextListToTextProperty -T} .sp Text Input: .sp 6p @@ -419,9 +407,6 @@ T} T} T{ Encoding of returned text T} - T{ -.PN Xutf8LookupString -T} .sp Text Drawing: .sp 6p @@ -465,12 +450,6 @@ T} T{ Locale of supplied text T} T{ -.PN Xutf8DrawText , -and so on -T} T{ -Locale-dependent metrics -T} - T{ .PN XExtentsOfFontSet , and so on T} T{ @@ -480,10 +459,7 @@ T} .PN XmbTextExtents , T} T{ -.PN XwcTextExtents , -T} - T{ -.PN Xutf8TextExtents , +.PN XwcTextExtents , and so on T} .sp @@ -771,11 +747,7 @@ function presents a variable argument list programming interface for setting properties or features of the specified output method. This function returns NULL if it succeeds; otherwise, -it returns the name of the first argument that could not be set. -Xlib does not attempt to set arguments from the supplied list that -follow the failed argument; -all arguments in the list preceding the failed argument have been set -correctly. +it returns the name of the first argument that could not be obtained. .LP No standard arguments are currently defined by Xlib. .LP @@ -1856,7 +1828,7 @@ returns a valid .PN XFontSet to font_set. .LP -When an Xmb/wc/utf8 drawing or measuring function is called with an +When an Xmb/wc drawing or measuring function is called with an .PN XFontSet that has missing charsets, some characters in the locale will not be drawable. @@ -1929,7 +1901,7 @@ The .PN XFontsOfFontSet function returns a list of one or more .PN XFontStructs -and font names for the fonts used by the Xmb/wc/utf8 layer +and font names for the fonts used by the Xmb and Xwc layers for the given font set. A list of pointers to the .PN XFontStruct @@ -2108,10 +2080,9 @@ Regardless of the character rendering order, the origins of all characters are on the primary draw direction side of the drawing origin. The screen location of a particular character image may be determined with -.PN XmbTextPerCharExtents , -.PN XwcTextPerCharExtents +.PN XmbTextPerCharExtents or -.PN Xutf8TextPerCharExtents . +.PN XwcTextPerCharExtents . .LP The drawing functions are allowed to implement context-dependent rendering, where the glyphs drawn for a string are not simply a @@ -2225,10 +2196,9 @@ The max_ink_extent member gives the maximum extent, over all drawable characters the rectangles that bound the character glyph image drawn in the foreground color, relative to a constant origin. See -.PN XmbTextExtents , -.PN XwcTextExtents +.PN XmbTextExtents and -.PN Xutf8TextExtents +.PN XwcTextExtents for detailed semantics. .LP The max_logical_extent member gives the maximum extent, @@ -2247,10 +2217,9 @@ the string's extent by an amount other than that character's individual extent. .LP The rectangles for a given character in a string can be obtained from -.PN XmbPerCharExtents , -.PN XwcPerCharExtents +.PN XmbPerCharExtents or -.PN Xutf8PerCharExtents . +.PN XwcPerCharExtents . .LP .sp To obtain the maximum extents structure given an @@ -2272,7 +2241,7 @@ The .PN XExtentsOfFontSet function returns an .PN XFontSetExtents -structure for the fonts used by the Xmb/wc/utf8 layer +structure for the fonts used by the Xmb and Xwc layers for the given font set. .LP The @@ -2288,13 +2257,11 @@ Until freed, its contents will not be modified by Xlib. .sp To obtain the escapement in pixels of the specified text as a value, use -.PN XmbTextEscapement , -.PN XwcTextEscapement +.PN XmbTextEscapement or -.PN Xutf8TextEscapement . +.PN XwcTextEscapement . .IN "XmbTextEscapement" "" "@DEF@" .IN "XwcTextEscapement" "" "@DEF@" -.IN "Xutf8TextEscapement" "" "@DEF@" .sM .FD 0 int XmbTextEscapement\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^) @@ -2314,15 +2281,6 @@ int XwcTextEscapement\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_wchars\fP\^) .br int \fInum_wchars\fP\^; .FN -.FD 0 -int Xutf8TextEscapement\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^) -.br - XFontSet \fIfont_set\fP\^; -.br - char *\fIstring\fP\^; -.br - int \fInum_bytes\fP\^; -.FN .IP \fIfont_set\fP 1i Specifies the font set. .IP \fIstring\fP 1i @@ -2334,10 +2292,9 @@ Specifies the number of characters in the string argument. .LP .eM The -.PN XmbTextEscapement , -.PN XwcTextEscapement +.PN XmbTextEscapement and -.PN Xutf8TextEscapement +.PN XwcTextEscapement 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 @@ -2348,23 +2305,15 @@ dependent on the supplied string. Regardless of the character rendering order, the escapement is always positive. .LP -The function -.PN Xutf8TextEscapement -is an XFree86 extension introduced in XFree86 4.0.2. Its presence is -indicated by the macro -.PN X_HAVE_UTF8_STRING . -.LP .sp To obtain the overall_ink_return and overall_logical_return arguments, the overall bounding box of the string's image, and a logical bounding box, use -.PN XmbTextExtents , -.PN XwcTextExtents -or -.PN Xutf8TextExtents . +.PN XmbTextExtents + or +.PN XwcTextExtents . .IN "XmbTextExtents" "" "@DEF@" .IN "XwcTextExtents" "" "@DEF@" -.IN "Xutf8TextExtents" "" "@DEF@" .sM .FD 0 int XmbTextExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIoverall_ink_return\fP\^, \fIoverall_logical_return\fP\^) @@ -2393,19 +2342,6 @@ int XwcTextExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_wchars\fP\^, .br XRectangle *\fIoverall_logical_return\fP\^; .FN -.FD 0 -int Xutf8TextExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIoverall_ink_return\fP\^, \fIoverall_logical_return\fP\^) -.br - XFontSet \fIfont_set\fP\^; -.br - char *\fIstring\fP\^; -.br - int \fInum_bytes\fP\^; -.br - XRectangle *\fIoverall_ink_return\fP\^; -.br - XRectangle *\fIoverall_logical_return\fP\^; -.FN .IP \fIfont_set\fP 1i Specifies the font set. .IP \fIstring\fP 1i @@ -2422,19 +2358,17 @@ Returns the overall logical \*(Ov. .LP .eM The -.PN XmbTextExtents , -.PN XwcTextExtents +.PN XmbTextExtents and -.PN Xutf8TextExtents +.PN XwcTextExtents 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 and a logical bounding box for spacing purposes, respectively. They return the value returned by -.PN XmbTextEscapement , -.PN XwcTextEscapement +.PN XmbTextEscapement or -.PN Xutf8TextEscapement . +.PN XwcTextEscapement . These metrics are relative to the drawing origin of the string, using the fonts loaded for the specified font set. .LP @@ -2475,22 +2409,14 @@ or to justify words, but for context-dependent rendering, the client should not assume that it can redraw the character by itself and get the same rendering. .LP -The function -.PN Xutf8TextExtents -is an XFree86 extension introduced in XFree86 4.0.2. Its presence is -indicated by the macro -.PN X_HAVE_UTF8_STRING . -.LP .sp To obtain per-character information for a text string, use -.PN XmbTextPerCharExtents , -.PN XwcTextPerCharExtents +.PN XmbTextPerCharExtents or -.PN Xutf8TextPerCharExtents . +.PN XwcTextPerCharExtents . .IN "XmbTextPerCharExtents" "" "@DEF@" .IN "XwcTextPerCharExtents" "" "@DEF@" -.IN "Xutf8TextPerCharExtents" "" "@DEF@" .sM .FD 0 Status XmbTextPerCharExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIink_array_return\fP\^, @@ -2538,29 +2464,6 @@ Status XwcTextPerCharExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_wchars .br XRectangle *\fIoverall_logical_return\fP\^; .FN -.FD 0 -Status Xutf8TextPerCharExtents\^(\^\fIfont_set\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^, \fIink_array_return\fP\^, -.br - \fIlogical_array_return\fP\^, \fIarray_size\fP\^, \fInum_chars_return\fP\^, \fIoverall_ink_return\fP\^, \fIoverall_logical_return\fP\^) -.br - XFontSet \fIfont_set\fP\^; -.br - char *\fIstring\fP\^; -.br - int \fInum_bytes\fP\^; -.br - XRectangle *\fIink_array_return\fP\^; -.br - XRectangle *\fIlogical_array_return\fP\^; -.br - int \fIarray_size\fP\^; -.br - int *\fInum_chars_return\fP\^; -.br - XRectangle *\fIoverall_ink_return\fP\^; -.br - XRectangle *\fIoverall_logical_return\fP\^; -.FN .IP \fIfont_set\fP 1i Specifies the font set. .IP \fIstring\fP 1i @@ -2586,10 +2489,9 @@ Returns the overall logical \*(Ov. .LP .eM The -.PN XmbTextPerCharExtents , -.PN XwcTextPerCharExtents +.PN XmbTextPerCharExtents and -.PN Xutf8TextPerCharExtents +.PN XwcTextPerCharExtents 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 @@ -2632,22 +2534,14 @@ and num_chars_return is set to the number of rectangles required. Otherwise, the functions return a nonzero value. .LP If the overall_ink_return or overall_logical_return argument is non-NULL, -.PN XmbTextPerCharExtents , -.PN XwcTextPerCharExtents +.PN XmbTextPerCharExtents and -.PN Xutf8TextPerCharExtents +.PN XwcTextPerCharExtents return the maximum extent of the string's metrics to overall_ink_return or overall_logical_return, as returned by -.PN XmbTextExtents , -.PN XwcTextExtents +.PN XmbTextExtents or -.PN Xutf8TextExtents . -.LP -The function -.PN Xutf8TextPerCharExtents -is an XFree86 extension introduced in XFree86 4.0.2. Its presence is -indicated by the macro -.PN X_HAVE_UTF8_STRING . +.PN XwcTextExtents . .NH 3 Drawing Text Using Font Sets .XS @@ -2663,8 +2557,6 @@ and .PN XDrawImageString except that they work with font sets instead of single fonts and interpret the text based on the locale of the font set -(for functions whose name starts with Xmb or Xwc) or as UTF-8 encoded -text (for functions whose name starts with Xutf8), instead of treating the bytes of the string as direct font indexes. See section 8.6 for details of the use of Graphics Contexts (GCs) and possible protocol errors. @@ -2678,10 +2570,9 @@ the font in the GC is ignored and may be modified by the functions. No validation that all fonts conform to some width rule is performed. .LP The text functions -.PN XmbDrawText , -.PN XwcDrawText +.PN XmbDrawText and -.PN Xutf8DrawText +.PN XwcDrawText use the following structures: .LP .IN "XmbTextItem" "" "@DEF@" @@ -2712,13 +2603,11 @@ typedef struct { .eM .sp To draw text using multiple font sets in a given drawable, use -.PN XmbDrawText , -.PN XwcDrawText +.PN XmbDrawText or -.PN Xutf8DrawText . +.PN XwcDrawText . .IN "XmbDrawText" "" "@DEF@" .IN "XwcDrawText" "" "@DEF@" -.IN "Xutf8DrawText" "" "@DEF@" .sM .FD 0 void XmbDrawText\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIitems\fP\^, \fInitems\fP\^) @@ -2750,21 +2639,6 @@ void XwcDrawText\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\ .br int \fInitems\fP\^; .FN -.FD 0 -void Xutf8DrawText\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIitems\fP\^, \fInitems\fP\^) -.br - Display *\fIdisplay\fP\^; -.br - Drawable \fId\fP\^; -.br - GC \fIgc\fP\^; -.br - int \fIx\fP\^, \fIy\fP\^; -.br - XmbTextItem *\fIitems\fP\^; -.br - int \fInitems\fP\^; -.FN .IP \fIdisplay\fP 1i Specifies the connection to the X server. .IP \fId\fP 1i @@ -2784,10 +2658,9 @@ Specifies the number of text items in the array. .LP .eM The -.PN XmbDrawText , -.PN XwcDrawText +.PN XmbDrawText and -.PN Xutf8DrawText +.PN XwcDrawText 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 @@ -2802,19 +2675,18 @@ Leading text items with a font_set member set to .PN None will not be drawn. .LP -.PN XmbDrawText , -.PN XwcDrawText +.PN XmbDrawText and -.PN Xutf8DrawText +.PN XwcDrawText do not perform any context-dependent rendering between text segments. Clients may compute the drawing metrics by passing each text segment to -.PN XmbTextExtents , -.PN XwcTextExtents , -.PN Xutf8TextExtents -or -.PN XmbTextPerCharExtents , +.PN XmbTextExtents +and +.PN XwcTextExtents +or +.PN XmbTextPerCharExtents +and .PN XwcTextPerCharExtents . -.PN Xutf8TextPerCharExtents . When the .PN XFontSet has missing charsets, each unavailable character is drawn @@ -2822,21 +2694,13 @@ with the default string returned by .PN XCreateFontSet . The behavior for an invalid codepoint is undefined. .LP -The function -.PN Xutf8DrawText -is an XFree86 extension introduced in XFree86 4.0.2. Its presence is -indicated by the macro -.PN X_HAVE_UTF8_STRING . -.LP .sp To draw text using a single font set in a given drawable, use -.PN XmbDrawString , -.PN XwcDrawString +.PN XmbDrawString or -.PN Xutf8DrawString . +.PN XwcDrawString . .IN "XmbDrawString" "" "@DEF@" .IN "XwcDrawString" "" "@DEF@" -.IN "Xutf8DrawString" "" "@DEF@" .sM .FD 0 void XmbDrawString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^) @@ -2872,23 +2736,6 @@ void XwcDrawString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, .br int \fInum_wchars\fP\^; .FN -.FD 0 -void Xutf8DrawString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^) -.br - Display *\fIdisplay\fP\^; -.br - Drawable \fId\fP\^; -.br - XFontSet \fIfont_set\fP\^; -.br - GC \fIgc\fP\^; -.br - int \fIx\fP\^, \fIy\fP\^; -.br - char *\fIstring\fP\^; -.br - int \fInum_bytes\fP\^; -.FN .IP \fIdisplay\fP 1i Specifies the connection to the X server. .IP \fId\fP 1i @@ -2912,10 +2759,9 @@ Specifies the number of characters in the string argument. .LP .eM The -.PN XmbDrawString , -.PN XwcDrawString +.PN XmbDrawString and -.PN Xutf8DrawString +.PN XwcDrawString functions draw the specified text with the foreground pixel. When the .PN XFontSet @@ -2924,21 +2770,13 @@ with the default string returned by .PN XCreateFontSet . The behavior for an invalid codepoint is undefined. .LP -The function -.PN Xutf8DrawString -is an XFree86 extension introduced in XFree86 4.0.2. Its presence is -indicated by the macro -.PN X_HAVE_UTF8_STRING . -.LP .sp To draw image text using a single font set in a given drawable, use -.PN XmbDrawImageString , -.PN XwcDrawImageString +.PN XmbDrawImageString or -.PN Xutf8DrawImageString . +.PN XwcDrawImageString . .IN "XmbDrawImageString" "" "@DEF@" .IN "XwcDrawImageString" "" "@DEF@" -.IN "Xutf8DrawImageString" "" "@DEF@" .sM .FD 0 void XmbDrawImageString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^) @@ -2974,23 +2812,6 @@ void XwcDrawImageString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\ .br int \fInum_wchars\fP\^; .FN -.FD 0 -void Xutf8DrawImageString\^(\^\fIdisplay\fP\^, \fId\fP\^, \fIfont_set\fP\^, \fIgc\fP\^, \fIx\fP\^, \fIy\fP\^, \fIstring\fP\^, \fInum_bytes\fP\^) -.br - Display *\fIdisplay\fP\^; -.br - Drawable \fId\fP\^; -.br - XFontSet \fIfont_set\fP\^; -.br - GC \fIgc\fP\^; -.br - int \fIx\fP\^, \fIy\fP\^; -.br - char *\fIstring\fP\^; -.br - int \fInum_bytes\fP\^; -.FN .IP \fIdisplay\fP 1i Specifies the connection to the X server. .IP \fId\fP 1i @@ -3014,17 +2835,15 @@ Specifies the number of characters in the string argument. .LP .eM The -.PN XmbDrawImageString , -.PN XwcDrawImageString +.PN XmbDrawImageString and -.PN Xutf8DrawImageString +.PN XwcDrawImageString 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 -.PN XmbTextExtents , -.PN XwcTextExtents +.PN XmbTextExtents or -.PN Xutf8TextExtents +.PN XwcTextExtents for the same text and .PN XFontSet . .LP @@ -3034,12 +2853,6 @@ has missing charsets, each unavailable character is drawn with the default string returned by .PN XCreateFontSet . The behavior for an invalid codepoint is undefined. -.LP -The function -.PN Xutf8TextExtents -is an XFree86 extension introduced in XFree86 4.0.2. Its presence is -indicated by the macro -.PN X_HAVE_UTF8_STRING . .NH 2 Input Methods .XS @@ -3382,10 +3195,9 @@ Getting Keyboard Input .LP To obtain characters from an input method, a client must call the function -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString or -.PN Xutf8LookupString +.PN XwcLookupString with an input context created from that input method. Both a locale and display are bound to an input method when it is opened, and an input context inherits this locale and display. @@ -3393,9 +3205,7 @@ Any strings returned by .PN XmbLookupString or .PN XwcLookupString -will be encoded in that locale. Strings returned by -.PN Xutf8LookupString -are encoded in UTF-8. +will be encoded in that locale. .NH 4 Focus Management .XS @@ -3403,10 +3213,9 @@ Focus Management .XE .LP For each text entry area in which the -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString or -.PN Xutf8LookupString +.PN XwcLookupString functions are used, there will be an associated input context. .LP @@ -3538,10 +3347,9 @@ Event Filtering A filtering mechanism is provided to allow input methods to capture X events transparently to clients. It is expected that toolkits (or clients) using -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString or -.PN Xutf8LookupString +.PN XwcLookupString will call this filter at some point in the event processing mechanism to make sure that events needed by an input method can be filtered by that input method. @@ -3578,10 +3386,9 @@ by the client itself, tightly coupled with the input method logic. .LP When the user enters a keystroke, the client calls -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString or -.PN Xutf8LookupString . +.PN XwcLookupString . At this point, in the on-the-spot case, the echo of the keystroke in the preedit has not yet been done. Before returning to the client logic that handles the input characters, @@ -3629,10 +3436,9 @@ As highlighted before, the input method architecture provides preediting, which supports a type of preprocessor input composition. In this case, composition consists of interpreting a sequence of key events and returning a committed string via -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString or -.PN Xutf8LookupString . +.PN XwcLookupString . This provides the basics for input methods. .LP In addition to preediting based on key events, a general framework @@ -3703,10 +3509,9 @@ and starts editing again. .sp For this reason, an input method supporting this type of conversion should take notice of when the client calls -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC or -.PN Xutf8ResetIC , +.PN XwcResetIC , which is usually an indication of a context change. .LP Context-sensitive conversions just need a copy of the client's text, @@ -3714,10 +3519,9 @@ while other conversions replace the client's text with new text to achieve the reconversion or transliteration. Yet in all cases the result of a conversion, either immediately or via preediting, is returned by the -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString and -.PN Xutf8LookupString +.PN XwcLookupString functions. .LP String conversion support is dependent on the availability of the @@ -4884,13 +4688,11 @@ events from the input method that are directed to the focus window. .LP .sp To reset the state of an input context to its initial state, use -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC or -.PN Xutf8ResetIC . +.PN XwcResetIC . .IN "XmbResetIC" "" "@DEF@" .IN "XwcResetIC" "" "@DE@" -.IN "Xutf8ResetIC" "" "@DE@" .sM .FD 0 char * XmbResetIC\^(\^\fIic\fP\^) @@ -4902,11 +4704,6 @@ wchar_t * XwcResetIC\^(\^\fIic\fP\^) .br XIC \fIic\fP\^; .FN -.FD 0 -char * Xutf8ResetIC\^(\^\fIic\fP\^) -.br - XIC \fIic\fP\^; -.FN .IP \fIic\fP 1i Specifies the input context. .LP @@ -4915,10 +4712,9 @@ When .PN XNResetState is set to .PN XIMInitialState , -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC and -.PN Xutf8ResetIC +.PN XwcResetIC reset an input context to its initial state; when .PN XNResetState @@ -4929,21 +4725,14 @@ In both cases, any input pending on that context is deleted. The input method is required to clear the preedit area, if any, and update the status accordingly. Calling -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC or -.PN Xutf8ResetIC +.PN XwcResetIC does not change the focus. .LP The return value of .PN XmbResetIC is its current preedit string as a multibyte string. -The return value of -.PN XwcResetIC -is its current preedit string as a wide character string. -The return value of -.PN 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. If there is no visible preedit text, @@ -4953,12 +4742,6 @@ whether these procedures return a non-NULL string or NULL. The client should free the returned string by calling .PN XFree . .LP -The function -.PN Xutf8ResetIC -is an XFree86 extension introduced in XFree86 4.0.2. Its presence is -indicated by the macro -.PN X_HAVE_UTF8_STRING . -.LP .sp To get the input method associated with an input context, use .PN XIMOfIC . @@ -5493,10 +5276,9 @@ Reset State The .PN XNResetState argument specifies the state the input context will return to after calling -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC or -.PN Xutf8ResetIC . +.PN XwcResetIC . .LP The XIC state may be set to its initial state, as specified by the .PN XNPreeditState @@ -5537,10 +5319,9 @@ T} If .PN XIMInitialState is set, then -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC and -.PN Xutf8ResetIC +.PN XwcResetIC will return to the initial .PN XNPreeditState state of the XIC. @@ -5548,10 +5329,9 @@ state of the XIC. If .PN XIMPreserveState is set, then -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC and -.PN Xutf8ResetIC +.PN XwcResetIC will preserve the current state of the XIC. .LP If @@ -6025,10 +5805,9 @@ is set to the .PN XNPreeditState value specified at the creation time will be reflected as the initial state for -.PN XmbResetIC , -.PN XwcResetIC +.PN XmbResetIC and -.PN Xutf8ResetIC . +.PN XwcResetIC . .LP Because this XIC value is optional, a client should call .PN XGetIMValues @@ -7225,13 +7004,11 @@ Getting Keyboard Input .LP To get composed input from an input method, use -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString or -.PN Xutf8LookupString . +.PN XwcLookupString . .IN "XmbLookupString" "" "@DEF@" .IN "XwcLookupString" "" "@DEF@" -.IN "Xutf8LookupString" "" "@DEF@" .sM .FD 0 int XmbLookupString\^(\^\fIic\fP\^, \fIevent\fP\^, \fIbuffer_return\fP\^, \fIbytes_buffer\fP\^, \fIkeysym_return\fP\^, \fIstatus_return\fP\^) @@ -7263,21 +7040,6 @@ int XwcLookupString\^(\^\fIic\fP\^, \fIevent\fP\^, \fIbuffer_return\fP\^, \fIbyt .br Status *\fIstatus_return\fP\^; .FN -.FD 0 -int Xutf8LookupString\^(\^\fIic\fP\^, \fIevent\fP\^, \fIbuffer_return\fP\^, \fIbytes_buffer\fP\^, \fIkeysym_return\fP\^, \fIstatus_return\fP\^) -.br - XIC \fIic\fP\^; -.br - XKeyPressedEvent *\fIevent\fP; -.br - char *\fIbuffer_return\fP\^; -.br - int \fIbytes_buffer\fP\^; -.br - KeySym *\fIkeysym_return\fP\^; -.br - Status *\fIstatus_return\fP\^; -.FN .IP \fIic\fP 1i Specifies the input context. .ds Ev key event to be used @@ -7298,10 +7060,9 @@ Returns a value indicating what kind of data is returned. .LP .eM The -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString and -.PN Xutf8LookupString +.PN XwcLookupString functions return the string from the input method specified in the buffer_return argument. If no string is returned, @@ -7314,9 +7075,7 @@ If both a string and a KeySym are returned, the KeySym value does not necessarily correspond to the string returned. .LP .PN XmbLookupString -and -.PN Xutf8LookupString -return the length of the string in bytes, and +returns the length of the string in bytes, and .PN XwcLookupString returns the length of the string in characters. Both @@ -7324,9 +7083,7 @@ Both and .PN XwcLookupString return text in the encoding of the locale bound to the input method -of the specified input context, and -.PN Xutf8LookupString -returns text in UTF-8 encoding. +of the specified input context. .LP Each string returned by .PN XmbLookupString @@ -7335,14 +7092,13 @@ and begins in the initial state of the encoding of the locale (if the encoding of the locale is state-dependent). .NT -To ensure proper input processing, +To insure proper input processing, it is essential that the client pass only .PN KeyPress events to -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString and -.PN Xutf8LookupString . +.PN XwcLookupString . Their behavior when a client passes a .PN KeyRelease event is undefined. @@ -7350,7 +7106,7 @@ event is undefined. .LP Clients should check the status_return argument before using the other returned values. -These three functions each return a value to status_return +These two functions both return a value to status_return that indicates what has been returned in the other arguments. The possible values returned are: .TS @@ -7359,10 +7115,9 @@ T{ .PN XBufferOverflow T} T{ The input string to be returned is too large for the supplied buffer_return. -The required size (for -.PN XmbLookupString , -.PN Xutf8LookupString -in bytes; for +The required size +.Pn ( XmbLookupString +in bytes; .PN XwcLookupString in characters) is returned as the value of the function, and the contents of buffer_return and keysym_return are not modified. @@ -7380,9 +7135,9 @@ T{ .PN XLookupChars T} T{ Some input characters have been composed. -They are placed in the buffer_return argument, using the encoding -described above, +They are placed in the buffer_return argument, and the string length is returned as the value of the function. +The string is encoded in the locale bound to the input context. The content of the keysym_return argument is not modified. T} T{ @@ -7405,24 +7160,16 @@ T} .TE .LP It does not make any difference if the input context passed as an argument to -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString and -.PN Xutf8LookupString +.PN XwcLookupString 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 -.PN XmbLookupString , -.PN XwcLookupString +.PN XmbLookupString or -.PN Xutf8LookupString +.PN XwcLookupString even though it does not have any more keyboard focus. -.LP -The function -.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 @@ A .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. diff --git a/specs/X11/CH14 b/specs/X11/CH14 index 6b0792d..34c09da 100644 --- a/specs/X11/CH14 +++ b/specs/X11/CH14 @@ -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 @@ typedef enum { 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 @@ int XwcTextListToTextProperty\^(\^\fIdisplay\fP\^, \fIlist\fP\^, \fIcount\fP\^, .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 @@ structure. .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 @@ or .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 @@ If the style 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 @@ is guaranteed. .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 @@ int XwcTextPropertyToTextList\^(\^\fIdisplay\fP\^, \fItext_prop\fP\^, \fIlist_re .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 @@ Returns the number of \*(Cn. .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 @@ The contents of the property are not required to be null-terminated; 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 @@ to the encoding of the current locale, 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 @@ In all of these error cases, 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 @@ To obtain the value of this string, 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 @@ Specifies the list of strings to be freed. 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 @@ Using Window Manager Convenience Functions .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 @@ void XmbSetWMProperties\^(\^\fIdisplay\fP\^, \fIw\fP\^, \fIwindow_name\fP\^, \fI .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 @@ structure to be used. .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 @@ and the properties are created with type ``COMPOUND_TEXT''. .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 @@ The hostname of the machine is stored using .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 @@ is substituted for res_name. .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 diff --git a/specs/X11/abstract.t b/specs/X11/abstract.t index 00abef4..b9c3ef1 100644 --- a/specs/X11/abstract.t +++ b/specs/X11/abstract.t @@ -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 diff --git a/specs/X11/glossary b/specs/X11/glossary index 9abb4ab..a130928 100644 --- a/specs/X11/glossary +++ b/specs/X11/glossary @@ -1,6 +1,3 @@ -.\" -.\" $XFree86$ -.\" \& .sp 1 .ce 1 @@ -405,7 +402,7 @@ characters. 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 diff --git a/specs/X11/indexmacros.t b/specs/X11/indexmacros.t index e1b873d..1b616f8 100644 --- a/specs/X11/indexmacros.t +++ b/specs/X11/indexmacros.t @@ -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 diff --git a/specs/XDMCP/xdmcp.ms b/specs/XDMCP/xdmcp.ms index 8346403..45e0b03 100644 --- a/specs/XDMCP/xdmcp.ms +++ b/specs/XDMCP/xdmcp.ms @@ -1,7 +1,6 @@ .\" Use eqn, tbl, and -ms -.\" $XdotOrg: xc/doc/specs/XDMCP/xdmcp.ms,v 1.1.4.2.4.1 2004/03/04 17:46:01 eich Exp $ .\" $Xorg: xdmcp.ms,v 1.3 2000/08/17 19:42:20 cpqbld Exp $ -.\" $XFree86: xc/doc/specs/XDMCP/xdmcp.ms,v 1.2 2003/07/09 15:27:26 tsi Exp $ +.\" $XdotOrg$ .EQ delim @@ define oc % "\\fR{\\fP" % @@ -18,7 +17,7 @@ define cc % "\\fR}\\fP" % .ce 7 \s+2\fBX Display Manager Control Protocol\fP\s-2 -\s+1\fBVersion 1.1 DRAFT +\s+1\fBVersion 1.1 X.Org Standard @@ -34,7 +33,7 @@ Massachusetts Institute of Technology\s+1 .br \& .sp 15 -Copyright \(co 1989, 2002 The Open Group +Copyright \(co 1989, 2004 The Open Group .sp 3 .LP Permission is hereby granted, free of charge, to any person obtaining a copy @@ -2057,13 +2056,10 @@ Other authentication protocols may be developed, depending on local needs. In an unsecure environment, the display must be able to verify that the source of the various packets is a trusted manager. These packets will contain authentication information. As an example of such a system, the -following discussion describes the "XDM-AUTHENTICATION-1" and -"XDM-AUTHENTICATION-2" authentication systems. The "XDM-AUTHENTICATION-1" -system uses a 56-bit shared private key, and 64 bits of -authentication data. "XDM-AUTHENTICATION-2" uses a 256 bit shared private key, -and 256 bits of authentication data. Associated example X authorization -protocol "XDM-AUTHORIZATION-1" and "XDM-AUTHORIZATION-2" will also be -discussed. The 56-bit key is represented +following discussion describes the "XDM-AUTHENTICATION-1" authentication +system. This system uses a 56-bit shared private key, and 64 bits of +authentication data. An associated example X authorization protocol +"XDM-AUTHORIZATION-1" will also be discussed. The 56-bit key is represented as a 64-bit number in network order (big endian). This means that the first octet in the representation will be zero. When incrementing a 64-bit value, the 8 octets of data will be interpreted in network order (big endian). @@ -2105,19 +2101,14 @@ sigma lineup = "per-session private key, generated by manager" beta lineup = "authorization data" .EN .LP -"XDM-AUTHENTICATION-1" encryption will use the Data Encryption Standard (DES, -FIPS 46-3); blocks shorter than 64 bits will be zero-filled on the right to -64 bits. Blocks longer than 64 bits will use block chaining: +Encryption will use the Data Encryption Standard (DES, FIPS 46-3); blocks +shorter than 64 bits will be zero-filled +on the right to 64 bits. Blocks longer than 64 bits will use block chaining: .EQ oc { D } cc sup kappa lineup = oc { D sub 1 } cc sup kappa " " oc { D sub 2 } " " xor " " oc { D sub 1 } cc sup kappa cc sup kappa .EN .LP -"XDM-AUTHENTICATION-2" encryption will use the Advanced Encryption Standard -(AES, FIPS-197); blocks shorter than 128 bits will be zero-filled on the right -to 128 bits. Blocks longer than 128 bits will use block chaining as shown -above. -.LP The display generates the first authentication data in the .PN Request packet: @@ -2177,15 +2168,6 @@ been received before, the current time is set to @T@. .IP \(bu 5 No packet containing the same pair (@N@, @T@) can have been received in the last 1200 seconds (20 minutes). -.LP -``XDM-AUTHORIZATION-2'' is identical to ``XDM-AUTHORIZATION-1'', except that -for TCP connections @N@ is 256 bits long and contains the 128 bit -IPv6 address of the client host followed by the 16 bit port number of the -client socket, with the remainder filled with zeros, and @T@ is extended to -64-bits. IPv4 addresses are represented as IPv4-mapped IPv6 addresses, with -an 80-bit prefix of zero bits, followed by a 16-byte value of 0xFFFF, -followed by the IPv4 address value, as defined in IETF RFC 2373. Formats for -other connections must be registered. .bp .EH '''' .OH '''' diff --git a/specs/XIM/xim.ms b/specs/XIM/xim.ms index 5ffb74b..49260f3 100644 --- a/specs/XIM/xim.ms +++ b/specs/XIM/xim.ms @@ -1,6 +1,7 @@ .\" $Xorg: xim.ms,v 1.3 2000/08/17 19:42:21 cpqbld Exp $ .\" To print this out, type tbl macros.t ThisFile | troff -ms .\" $XFree86: xc/doc/specs/XIM/xim.ms,v 1.2 2000/12/14 17:48:58 dawes Exp $ +.\" $XdotOrg: xc/doc/specs/XIM/xim.ms,v 1.1.4.1.6.2 2004/03/25 04:56:41 alanc Exp $ .EH '''' .OH '''' .EF '''' @@ -16,7 +17,7 @@ .sp \fBX Consortium Standard\fP .sp -\fBX Version 11, Release 6.4\fP +\fBX Version 11, Release 6.7\fP .sp 3 .AU Masahiko Narita @@ -97,8 +98,8 @@ This documentation is provided as is without express or implied warranty. .ps 11 .nr PS 11 .bp 1 -.EH '\fBX Input Method Protocol\fP''\fBX11, Release 6.1\fP' -.OH '\fBX Input Method Protocol\fP''\fBX11, Release 6.1\fP' +.EH '\fBX Input Method Protocol\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Input Method Protocol\fP''\fBX11, Release 6.7\fP' .EF ''\fB % \fP'' .OF ''\fB % \fP'' .NH 1 diff --git a/specs/XLFD/xlfd.tbl.ms b/specs/XLFD/xlfd.tbl.ms index d761be4..17772b3 100644 --- a/specs/XLFD/xlfd.tbl.ms +++ b/specs/XLFD/xlfd.tbl.ms @@ -1,5 +1,6 @@ .\" Use tbl and -ms and macros.t -*- Nroff -*- .\" $Xorg: xlfd.tbl.ms,v 1.3 2000/08/17 19:42:22 cpqbld Exp $ +.\" $XdotOrg$ .nr sM 4 \" section on Matrix Transformations .nr sS 5 \" section on Scalable fonts .nr sP 6 \" section on Polymorphic font support @@ -19,7 +20,7 @@ \fBX Consortium Standard\fP -\fBX Version 11, Release 6.4\fP +\fBX Version 11, Release 6.7\fP .sp 6 \s+1Jim Flowers\s-1 .sp 6p @@ -35,7 +36,7 @@ .nr PS 9 .sp 8 .LP -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .LP Helvetica and Times are registered trademarks of Linotype Company. .LP @@ -88,8 +89,8 @@ This documentation is provided as is without express or implied warranty. .ps 11 .nr PS 11 .bp 1 -.EH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Logical Font Description Conventions\fP''\fBX11, Release 6.7\fP' .EF ''\fB\\\\n(PN\fP'' .OF ''\fB\\\\n(PN\fP'' .NH 1 diff --git a/specs/XProtocol/X11.protocol b/specs/XProtocol/X11.protocol index 84de68f..253315f 100644 --- a/specs/XProtocol/X11.protocol +++ b/specs/XProtocol/X11.protocol @@ -32,7 +32,7 @@ X Consortium, Inc. .LP X Window System is a trademark of The Open Group. .LP -Copyright \(co 1986, 1987, 1988, 1994, 2002 The Open Group +Copyright \(co 1986, 1987, 1988, 1994, 2004 The Open Group .LP Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal @@ -125,8 +125,8 @@ Robert W. Scheifler X Consortium, Inc. .De .bp 1 -.EH '\fBX Protocol\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Protocol\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Protocol\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Protocol\fP''\fBX11, Release 6.7\fP' .EF ''\fB % \fP'' .OF ''\fB % \fP'' .NH 1 @@ -534,6 +534,7 @@ HOST T{ [family: .Pn { Internet , .PN InternetV6 , +.PN ServerInterpreted , .PN DECnet , .PN Chaos } T} @@ -942,7 +943,7 @@ requests in most applications. Note that they are predefined only in the sense of having numeric values, not in the sense of having required semantics. The core protocol imposes no semantics on these names, -but semantics are specified in other X.Org standards, +but semantics are specified in other X Window System standards, such as the \fIInter-Client Communication Conventions Manual\fP and the \fIX Logical Font Description Conventions\fP. .LP @@ -8739,9 +8740,9 @@ length up to 65535 bytes. The address consists of two strings of ASCII characters, separated by a byte with a value of 0. The first string represents the type of address, and the second string contains the address value. Address types and the syntax -for their associated values will be registered via the X.org Registry. +for their associated values will be registered via the X.Org Registry. Implementors who wish to add implementation specific types may register -a unique prefix with the X.org registry to prevent namespace +a unique prefix with the X.Org registry to prevent namespace collisions. .LP Use of a host address in the ChangeHosts request is deprecated. It is diff --git a/specs/XProtocol/indexmacros.t b/specs/XProtocol/indexmacros.t index 3ceba91..2f7e703 100644 --- a/specs/XProtocol/indexmacros.t +++ b/specs/XProtocol/indexmacros.t @@ -1,3 +1,3 @@ -.eh '\s+1\fBX Protocol\fP''\fBX11, Release 6.4\fP\s-1' -.oh '\s+1\fBX Protocol\fP''\fBX11, Release 6.4\fP\s-1' +.eh '\s+1\fBX Protocol\fP''\fBX11, Release 6.7\fP\s-1' +.oh '\s+1\fBX Protocol\fP''\fBX11, Release 6.7\fP\s-1' .so index.pageno diff --git a/specs/Xaw/CH1 b/specs/Xaw/CH1 index 8262a86..f411717 100644 --- a/specs/Xaw/CH1 +++ b/specs/Xaw/CH1 @@ -3,7 +3,7 @@ .nr PS 11 .ds LH \fBAthena Widget Set\fP .ds CH -.ds RH \fBX11, Release 6.4\fP +.ds RH \fBX11, Release 6.7\fP .bp 1 .af PN 1 \& diff --git a/specs/Xaw/TPage_Credits b/specs/Xaw/TPage_Credits index 70418c6..fa0df8c 100644 --- a/specs/Xaw/TPage_Credits +++ b/specs/Xaw/TPage_Credits @@ -1,4 +1,5 @@ .\" $Xorg: TPage_Credits,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XdotOrg$ .ds CH .ds CF .ps 11 @@ -10,7 +11,7 @@ \s+1\fBX Window System\fP\s-1 -\s+1\fBX Version 11, Release 6.4\fP\s-1 +\s+1\fBX Version 11, Release 6.7\fP\s-1 .sp 6 .ce 4 @@ -23,7 +24,7 @@ formerly MIT X Consortium .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 Copyright \(co 1985, 1986, 1987, 1988, 1989, 1991, 1994 X Consortium .LP diff --git a/specs/Xaw/widg.idxmac.t b/specs/Xaw/widg.idxmac.t index e5a0527..1461abf 100644 --- a/specs/Xaw/widg.idxmac.t +++ b/specs/Xaw/widg.idxmac.t @@ -1,3 +1,3 @@ -.eh '\fBAthena Widget Set\fP''\fBX11, Release 6.4\fP' -.oh '\fBAthena Widget Set\fP''\fBX11, Release 6.4\fP' +.eh '\fBAthena Widget Set\fP''\fBX11, Release 6.7\fP' +.oh '\fBAthena Widget Set\fP''\fBX11, Release 6.7\fP' .so index.pageno diff --git a/specs/Xext/DPMS.ms b/specs/Xext/DPMS.ms index 0636bf3..57cc24f 100644 --- a/specs/Xext/DPMS.ms +++ b/specs/Xext/DPMS.ms @@ -1,5 +1,5 @@ .\" Use -ms and macros.t -.\" $XFree86$ +.\" $XDotOrg$ .EH '''' .OH '''' .EF '''' @@ -17,7 +17,7 @@ .ce 3 Version 1.0 X Project Team Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 Rob Lembree @@ -56,7 +56,7 @@ This extension provides X Protocol control over the VESA Display Power Management Signaling (DPMS) characteristics of video boards under control of the X Window System. .FS -1. \fIX Window System\fP is a trademark of X Consortium, Inc. +1. \fIX Window System\fP is a trademark of The Open Group. .FE .LP Traditionally, the X Window System has provided for both blanking and diff --git a/specs/Xext/DPMSLib.ms b/specs/Xext/DPMSLib.ms index 9b13a48..10ae2e6 100644 --- a/specs/Xext/DPMSLib.ms +++ b/specs/Xext/DPMSLib.ms @@ -1,4 +1,5 @@ .\" Use -ms and macros.t +.\" $XdotOrg$ .EH '''' .OH '''' .EF '''' @@ -16,7 +17,7 @@ .ce 3 Version 1.0 X Project Team Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 Rob Lembree @@ -55,7 +56,7 @@ This extension provides X Protocol control over the VESA Display Power Management Signaling (DPMS) characteristics of video boards under control of the X Window System. .FS -1. \fIX Window System\fP is a trademark of X Consortium, Inc. +1. \fIX Window System\fP is a trademark of The Open Group. .FE .LP Traditionally, the X Window System has provided for both blanking and diff --git a/specs/Xext/bigreq.ms b/specs/Xext/bigreq.ms index 06e56ed..a186ac2 100644 --- a/specs/Xext/bigreq.ms +++ b/specs/Xext/bigreq.ms @@ -1,5 +1,6 @@ .\" Use -ms and macros.t .\" $Xorg: bigreq.ms,v 1.3 2000/08/17 19:42:30 cpqbld Exp $ +.\" $XdotOrg$ .EH '''' .OH '''' .EF '''' @@ -14,7 +15,7 @@ .ce 3 Version 2.0 X Consortium Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 Bob Scheifler diff --git a/specs/Xext/evi.ms b/specs/Xext/evi.ms index 601fdc1..0ae12b5 100644 --- a/specs/Xext/evi.ms +++ b/specs/Xext/evi.ms @@ -1,5 +1,6 @@ .\" Use -ms and macros.t .\" $Xorg: evi.ms,v 1.3 2000/08/17 19:42:31 cpqbld Exp $ +.\" $XdotOrg$ .\" .\" .\" @@ -21,7 +22,7 @@ .ce 3 Version 1.0 X Project Team Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 Peter Daifuku diff --git a/specs/Xext/record.ms b/specs/Xext/record.ms index e536382..ffd5de1 100644 --- a/specs/Xext/record.ms +++ b/specs/Xext/record.ms @@ -1,6 +1,7 @@ .\" Record Extension Protocol, v1.13 .\" Use tbl, -ms and macros.t .\" $Xorg: record.ms,v 1.3 2000/08/17 19:42:36 cpqbld Exp $ +.\" $XdotOrg$ .\" ----------------------------------------------- .de Ip .IP \(bu 3 @@ -38,7 +39,7 @@ .sp \fBX Consortium Standard\fP .sp -\fBX Version 11, Release 6.4\fP +\fBX Version 11, Release 6.7\fP .sp 6 Martha Zimet Network Computing Devices, Inc. @@ -97,8 +98,8 @@ from the X Consortium. .nr LT 6.5i .nr FL 6.5i .ll 6.5i -.EH '\fBRecord Extension Protocol, Version 1.13\fP''\fBX11, Release 6.4\fP' -.OH '\fBX11, Release 6.4\fP''\fBRecord Extension Protocol, Version 1.13\fP' +.EH '\fBRecord Extension Protocol, Version 1.13\fP''\fBX11, Release 6.7\fP' +.OH '\fBX11, Release 6.7\fP''\fBRecord Extension Protocol, Version 1.13\fP' .bp 1 .EF ''\fB\\\\n(PN\fP'' .OF ''\fB\\\\n(PN\fP'' @@ -114,7 +115,7 @@ Several proposals have been written over the past few years that address some of the issues surrounding the recording and playback of user actions in the X Window System\**: .FS -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .FE .Ip \fISome Proposals for a Minimal X11 Testing Extension\fP, diff --git a/specs/Xext/recordlib.ms b/specs/Xext/recordlib.ms index 0d9a14d..41e5696 100644 --- a/specs/Xext/recordlib.ms +++ b/specs/Xext/recordlib.ms @@ -2,6 +2,7 @@ .\" Use -ms and macros.t .\" edited for DP edits and code consistency w/ core protocol/xlib 4/1/96 .\" $Xorg: recordlib.ms,v 1.3 2000/08/17 19:42:36 cpqbld Exp $ +.\" $XdotOrg$ .\" ----------------------------------------------- .de Ip .IP \(bu 5 @@ -41,7 +42,7 @@ .sp \fBX Consortium Standard\fP .sp -\fBX Version 11, Release 6.4\fP +\fBX Version 11, Release 6.7\fP .sp 6 Martha Zimet Network Computing Devices, Inc. @@ -100,8 +101,8 @@ from the X Consortium. .nr LT 6.5i .nr FL 6.5i .ll 6.5i -.EH '\fBX Record Extension Library, Version 1.13\fP''\fBX11, Release 6.4\fP' -.OH '\fBX11, Release 6.4\fP''\fBX Record Extension Library, Version 1.13\fP' +.EH '\fBX Record Extension Library, Version 1.13\fP''\fBX11, Release 6.7\fP' +.OH '\fBX11, Release 6.7\fP''\fBX Record Extension Library, Version 1.13\fP' .bp 1 .EF ''\fB\\\\n(PN\fP'' .OF ''\fB\\\\n(PN\fP'' diff --git a/specs/Xext/security.tex b/specs/Xext/security.tex index 269f363..103c5f9 100644 --- a/specs/Xext/security.tex +++ b/specs/Xext/security.tex @@ -50,7 +50,7 @@ \begin{document} -\title{Security Extension Specification\\Version 7.1\\X11 Release 6.4} +\title{Security Extension Specification\\Version 7.1\\X11 Release 6.7} \author{David P. Wiggins\\X Consortium, Inc.} \date{November 15, 1996} \maketitle diff --git a/specs/Xext/shape.ms b/specs/Xext/shape.ms index 6ebdbe4..41e889a 100644 --- a/specs/Xext/shape.ms +++ b/specs/Xext/shape.ms @@ -18,7 +18,7 @@ Shape Extension Protocol\fP\s-2 .ce 3 Version 1.0.1 X.Org Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 \s-1Keith Packard diff --git a/specs/Xext/shapelib.ms b/specs/Xext/shapelib.ms index b42befc..cf5116e 100644 --- a/specs/Xext/shapelib.ms +++ b/specs/Xext/shapelib.ms @@ -1,5 +1,6 @@ .\" Use -ms and macros.t .\" $Xorg: shapelib.ms,v 1.3 2000/08/17 19:42:36 cpqbld Exp $ +.\" $XdotOrg$ .\" edited for DP edits and code consistency w/ core protocol/xlib 4/1/96 .EH '''' .OH '''' @@ -17,7 +18,7 @@ Shape Extension Library\fP\s-2 .ce 3 Version 1.0 X Consortium Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 \s-1Keith Packard diff --git a/specs/Xext/sync.tex b/specs/Xext/sync.tex index b202abc..94ae6b8 100644 --- a/specs/Xext/sync.tex +++ b/specs/Xext/sync.tex @@ -1,4 +1,5 @@ % $Xorg: sync.tex,v 1.3 2000/08/17 19:42:37 cpqbld Exp $ +% $XdotOrg$ % % Copyright 1991 by Olivetti Research Limited, Cambridge, England and % Digital Equipment Corporation, Maynard, Massachusetts. @@ -84,7 +85,7 @@ {\large X Synchronization Extension Protocol}\\[10pt] {\large Version 3.0}\\[15pt] {\large X Consortium Standard}\\[15pt] -{\large X Version 11, Release 6.4}\\[15pt] +{\large X Version 11, Release 6.7}\\[15pt] {\it Tim Glauert}\\[0pt] {\tt thg@cam-orl.co.uk}\\[0pt] {\bf Olivetti Research / MultiWorks}\\[5pt] diff --git a/specs/Xext/synclib.tex b/specs/Xext/synclib.tex index d48d1d7..de2ef4a 100644 --- a/specs/Xext/synclib.tex +++ b/specs/Xext/synclib.tex @@ -1,4 +1,5 @@ % $Xorg: synclib.tex,v 1.3 2000/08/17 19:42:37 cpqbld Exp $ +% $XdotOrg$ % % Copyright 1991 by Olivetti Research Limited, Cambridge, England and % Digital Equipment Corporation, Maynard, Massachusetts. @@ -82,7 +83,7 @@ {\large X Synchronization Extension Library}\\[10pt] {\large Version 3.0}\\[15pt] {\large X Consortium Standard}\\[15pt] -{\large X Version 11, Release 6.4}\\[15pt] +{\large X Version 11, Release 6.7}\\[15pt] {\it Tim Glauert}\\[0pt] {\tt thg@cam-orl.co.uk}\\[0pt] {\bf Olivetti Research / MultiWorks}\\[5pt] diff --git a/specs/Xext/tog-cup.ms b/specs/Xext/tog-cup.ms index 9a44753..9b9427f 100644 --- a/specs/Xext/tog-cup.ms +++ b/specs/Xext/tog-cup.ms @@ -1,5 +1,6 @@ .\" Use -ms and macros.t .\" $Xorg: tog-cup.ms,v 1.3 2000/08/17 19:42:37 cpqbld Exp $ +.\" $XdotOrg$ .EH '''' .OH '''' .EF '''' @@ -16,7 +17,7 @@ .ce 3 Version 1.0 X Project Team Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 Kaleb S. KEITHLEY diff --git a/specs/Xext/xc-misc.ms b/specs/Xext/xc-misc.ms index 464b86e..ecf74e0 100644 --- a/specs/Xext/xc-misc.ms +++ b/specs/Xext/xc-misc.ms @@ -1,5 +1,6 @@ .\" Use -ms and macros.t .\" $Xorg: xc-misc.ms,v 1.3 2000/08/17 19:42:37 cpqbld Exp $ +.\" $XdotOrg$ .EH '''' .OH '''' .EF '''' @@ -14,7 +15,7 @@ .ce 3 Version 1.1 X Consortium Standard -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 6 .ce 4 Bob Scheifler diff --git a/specs/Xi/library.ms b/specs/Xi/library.ms index e2f5522..0ceaad8 100644 --- a/specs/Xi/library.ms +++ b/specs/Xi/library.ms @@ -1,4 +1,5 @@ .\" $Xorg: library.ms,v 1.3 2000/08/17 19:42:38 cpqbld Exp $ +.\" $XdotOrg$ .\" Input Extension now coded to macros.t .\" edited for DP edits and code consistency w/ core protocol/xlib 4/5/96 .EH '''' @@ -16,7 +17,7 @@ .sp 2 X Consortium Standard .sp 1 -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 16 .ps 15 \fBMark Patrick\0\0\0\0Ardent Computer @@ -61,12 +62,12 @@ 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. .sp 3 -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .ps .vs .bp 1 -.EH '\fBX Input Extension Library\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Input Extension Library\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Input Extension Library\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Input Extension Library\fP''\fBX11, Release 6.7\fP' .EF ''\fB\\\\n(PN\fP'' .OF ''\fB\\\\n(PN\fP'' .\" Force the heading counter for level 1 to one diff --git a/specs/Xi/porting.ms b/specs/Xi/porting.ms index 58280ab..959e4f3 100644 --- a/specs/Xi/porting.ms +++ b/specs/Xi/porting.ms @@ -1,4 +1,4 @@ -.\" $XFree86$ +.\" $XdotOrg$ .\" Input Extension Porting Document .EH '''' .OH '''' @@ -11,7 +11,7 @@ \fBX11 Input Extension Porting Document .sp 2 .ps 12 -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 16 .ps 15 George Sachs\0\0\0\0Hewlett-Packard @@ -56,10 +56,10 @@ 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. .sp 3 -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .bp 1 -.EH '\fBX Input Extension Porting Document\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Input Extension Porting Document\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Input Extension Porting Document\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Input Extension Porting Document\fP''\fBX11, Release 6.7\fP' .EF ''\fB % \fP'' .OF ''\fB % \fP'' .\" Force the heading counter for level 1 to one diff --git a/specs/Xi/protocol.ms b/specs/Xi/protocol.ms index 50c56c9..105200c 100644 --- a/specs/Xi/protocol.ms +++ b/specs/Xi/protocol.ms @@ -1,4 +1,5 @@ .\" $Xorg: protocol.ms,v 1.3 2000/08/17 19:42:40 cpqbld Exp $ +.\" $XdotOrg$ .\" Input Extension .EH '''' .OH '''' @@ -17,7 +18,7 @@ Version 1.0 .sp 1 X Consortium Standard .sp 1 -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 16 .ps 15 \fBMark Patrick\0\0\0\0Ardent Computer @@ -62,12 +63,12 @@ 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. .sp 3 -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .ps .vs .bp 1 -.EH '\fBX Input Extension Protocol Specification\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Input Extension Protocol Specification\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Input Extension Protocol Specification\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Input Extension Protocol Specification\fP''\fBX11, Release 6.7\fP' .EF ''\fB\\\\n(PN\fP'' .OF ''\fB\\\\n(PN\fP'' .\" Force the heading counter for level 1 to one diff --git a/specs/Xmu/Xmu.ms b/specs/Xmu/Xmu.ms index c647bdf..c6ac607 100644 --- a/specs/Xmu/Xmu.ms +++ b/specs/Xmu/Xmu.ms @@ -1,11 +1,11 @@ -.\" +.\" $XdotOrg$ .\" $XFree86$ .\" .sp 8 .ce 2 \s+2\fBXmu Library\fP\s-2 .sp 6p -X Version 11, Release 6.4 +X Version 11, Release 6.7 .sp 1 .ce 1 ``\fIDon't ask.\fP'' @@ -34,7 +34,7 @@ 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. .sp 3 -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .bp .NH 1 Introduction diff --git a/specs/Xt/strings.mit b/specs/Xt/strings.mit index 8df4a48..c40df4f 100644 --- a/specs/Xt/strings.mit +++ b/specs/Xt/strings.mit @@ -6,7 +6,7 @@ .ds xL Xlib \(em C Language X Interface .ds xC Inter-Client Communication Conventions Manual .ds xP X Window System Protocol -.ds Rn 6.4 +.ds Rn 6.7 .ds Vn 2.2 .ds oI Must be of class Object or any subclass thereof. .ds rI Must be of class RectObj or any subclass thereof. diff --git a/specs/i18n/Framework.ms b/specs/i18n/Framework.ms index 67c8a0c..de727a3 100644 --- a/specs/i18n/Framework.ms +++ b/specs/i18n/Framework.ms @@ -1,4 +1,5 @@ .\" $Xorg: Framework.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XdotOrg$ .\" To print this out, type tbl macros.t ThisFile | troff -ms .\" $XFree86: xc/doc/specs/i18n/Framework.ms,v 1.4 2001/01/17 16:57:45 dawes Exp $ .EH '''' @@ -62,12 +63,12 @@ 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. .sp 3 -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .ps 11 .nr PS 11 .bp 1 -.EH '\fBSample Implementation Frame Work\fP''\fBX11, Release 6.4\fP' -.OH '\fBSample Implementation Frame Work\fP''\fBX11, Release 6.4\fP' +.EH '\fBSample Implementation Frame Work\fP''\fBX11, Release 6.7\fP' +.OH '\fBSample Implementation Frame Work\fP''\fBX11, Release 6.7\fP' .EF ''\fB % \fP'' .OF ''\fB % \fP'' .NH 1 diff --git a/specs/i18n/LocaleDB.ms b/specs/i18n/LocaleDB.ms index f83ccc7..2e3f3d0 100644 --- a/specs/i18n/LocaleDB.ms +++ b/specs/i18n/LocaleDB.ms @@ -1,4 +1,5 @@ .\" $Xorg: LocaleDB.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XdotOrg$ .\" To print this out, type tbl macros.t ThisFile | troff -ms .EH '''' .OH '''' @@ -66,13 +67,13 @@ 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. .sp 3 -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .LP .bp 1 .ps 11 .nr PS 11 -.EH '\fBX Locale Database Definition\fP''\fBX11, Release 6.4\fP' -.OH '\fBX Locale Database Definition\fP''\fBX11, Release 6.4\fP' +.EH '\fBX Locale Database Definition\fP''\fBX11, Release 6.7\fP' +.OH '\fBX Locale Database Definition\fP''\fBX11, Release 6.7\fP' .EF ''\fB % \fP'' .OF ''\fB % \fP'' .NH 1 diff --git a/specs/i18n/Trans.ms b/specs/i18n/Trans.ms index 40ed2e3..92ec898 100644 --- a/specs/i18n/Trans.ms +++ b/specs/i18n/Trans.ms @@ -1,4 +1,5 @@ .\" $Xorg: Trans.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XdotOrg$ .\" To print this out, type tbl macros.t This File | troff -ms .EH '''' .OH '''' @@ -16,7 +17,7 @@ .sp \fBRevision 0.1\fP .sp -\fBX Version 11, Release 6.4\fP +\fBX Version 11, Release 6.7\fP .sp 3 .AU Takashi Fujiwara @@ -71,12 +72,12 @@ 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. .sp 3 -\fIX Window System\fP is a trademark of X Consortium, Inc. +\fIX Window System\fP is a trademark of The Open Group. .ps 11 .nr PS 11 .bp 1 -.EH '\fBXIM Transport Specification\fP''\fBX11, Release 6.4\fP' -.OH '\fBXIM Transport Specification\fP''\fBX11, Release 6.4\fP' +.EH '\fBXIM Transport Specification\fP''\fBX11, Release 6.7\fP' +.OH '\fBXIM Transport Specification\fP''\fBX11, Release 6.7\fP' .EF ''\fB % \fP'' .OF ''\fB % \fP'' .NH 1 |