summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2004-03-16 02:44:56 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2004-03-16 02:44:56 +0000
commitdaaa0e46261c1ad98ccb2d47f655b345bd9d83c8 (patch)
tree0e3c14f64b0e3950c3b3a49950e4e59479a5c508
parentfc975b0202b554d7c94484461a3cd1b9b37367ae (diff)
40. Update SHAPE extension protocol spec to version 1.0.1, fixing
freedesktop.org bugzilla #282 (old X.org defect #9453) (Alan Coopersmith)
-rw-r--r--hardcopy/Xext/shape.PS.gzbin15263 -> 13782 bytes
-rw-r--r--man/general/Standards.man3
-rw-r--r--specs/Xext/shape.ms24
3 files changed, 18 insertions, 9 deletions
diff --git a/hardcopy/Xext/shape.PS.gz b/hardcopy/Xext/shape.PS.gz
index a0e1330..fe85f70 100644
--- a/hardcopy/Xext/shape.PS.gz
+++ b/hardcopy/Xext/shape.PS.gz
Binary files differ
diff --git a/man/general/Standards.man b/man/general/Standards.man
index ce64884..933b639 100644
--- a/man/general/Standards.man
+++ b/man/general/Standards.man
@@ -1,4 +1,5 @@
.\" $Xorg: Standards.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $
+.\" $XdotOrg: $
.\" Copyright (c) 1993, 1994, 1996 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@@ -91,7 +92,7 @@ X Version 11, Release 6.4
Keith Packard
X11 Nonrectangular Window Shape Extension
-Version 1.0
+Version 1.0.1
X Version 11, Release 6.4
Keith Packard
diff --git a/specs/Xext/shape.ms b/specs/Xext/shape.ms
index a39fd2a..07905df 100644
--- a/specs/Xext/shape.ms
+++ b/specs/Xext/shape.ms
@@ -1,5 +1,6 @@
.\" Use -ms and macros.t
.\" $Xorg: shape.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 ''''
@@ -15,8 +16,8 @@
Shape Extension Protocol\fP\s-2
.sp 3
.ce 3
-Version 1.0
-X Consortium Standard
+Version 1.0.1
+X.Org Standard
X Version 11, Release 6.4
.sp 6
.ce 4
@@ -27,7 +28,7 @@ MIT X Consortium
.nr PS 9
.sp 8
.LP
-Copyright \(co 1989 X Consortium
+Copyright \(co 1989, 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
@@ -42,13 +43,13 @@ 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
+OPEN GROUP 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.
.LP
-Except as contained in this notice, the name of the X Consortium shall not be
+Except as contained in this notice, the name of the Open Group 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.
+in this Software without prior written authorization from the Open Group.
.ps 10
.nr PS 10
.bp 1
@@ -736,7 +737,7 @@ Requests
.PN ShapeInputSelected
.sp 6p
1 CARD8 opcode
- 1 6 shape opcode
+ 1 7 shape opcode
2 2 request length
4 WINDOW destination window
.De
@@ -759,7 +760,7 @@ Requests
.PN ShapeGetRectangles
.sp 6p
1 CARD8 opcode
- 1 7 shape opcode
+ 1 8 shape opcode
2 3 request length
4 WINDOW window
1 SHAPE_KIND source kind
@@ -877,3 +878,10 @@ the default clip region, the client clip region (if any) and the client
bounding region (if any). Otherwise, the effective clip region is the
same as the default clip region.
.KE
+.NH 1
+Revision History
+.LP
+1.0 - 1989 - Original Revision
+.LP
+1.0.1 - March 2004 - Corrected misnumbering of \fIShapeInputSelected\fP
+and \fIShapeGetRectangles\fP requests in encoding section.