diff options
| author | dawes <dawes> | 2001-12-14 19:53:18 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-12-14 19:53:18 +0000 |
| commit | 1fdfc4105d26af1652dede3bd0cd94895ff73c8c (patch) | |
| tree | be712f9775407a0ca9a153b0f8c005329bc7423c | |
| parent | 47a4e5c2e702b94be38b67385be465d9e3bf0a26 (diff) | |
568. Fix "The Open Group" copyright notices to reflect the change in
post R6.4 licensing (#5093, Mark Snitily, from X11R6.6).
1842 files changed, 15142 insertions, 8612 deletions
diff --git a/config/imake/ccimake.c b/config/imake/ccimake.c index a2c59a85c..5a2146d17 100644 --- a/config/imake/ccimake.c +++ b/config/imake/ccimake.c @@ -1,9 +1,13 @@ -/* $Xorg: ccimake.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ +/* $Xorg: ccimake.c,v 1.4 2001/02/09 02:03:15 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group . */ -/* $XFree86$ */ +/* $XFree86: xc/config/imake/ccimake.c,v 1.2 2001/04/01 13:59:56 tsi Exp $ */ /* * Warning: This file must be kept as simple as posible so that it can diff --git a/config/imake/imake.c b/config/imake/imake.c index 5068a66b1..176bb725a 100644 --- a/config/imake/imake.c +++ b/config/imake/imake.c @@ -7,13 +7,17 @@ * be passed to the template file. * * * ***************************************************************************/ -/* $XFree86: xc/config/imake/imake.c,v 3.46tsi Exp $ */ +/* $XFree86: xc/config/imake/imake.c,v 3.47 2001/11/16 00:45:05 dawes Exp $ */ /* * Copyright (c) 1985, 1986, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -1570,7 +1574,7 @@ ReadLine(FILE *tmpfd, char *tmpfname) initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", - "$Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $"); + "$Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $"); } for (p1 = pline; p1 < end; p1++) { diff --git a/config/imake/imake.man b/config/imake/imake.man index 77240696a..6d75145ad 100644 --- a/config/imake/imake.man +++ b/config/imake/imake.man @@ -1,7 +1,11 @@ -.\" $Xorg: imake.man,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ +.\" $Xorg: imake.man,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/config/imake/imake.man,v 1.6 2001/01/27 18:19:54 dawes Exp $ +.\" $XFree86: xc/config/imake/imake.man,v 1.7 2001/02/07 22:51:55 tsi Exp $ .\" .TH IMAKE 1 __xorgversion__ .SH NAME diff --git a/config/imake/imakemdep.h b/config/imake/imakemdep.h index a03765169..fe834ea20 100644 --- a/config/imake/imakemdep.h +++ b/config/imake/imakemdep.h @@ -1,9 +1,13 @@ -/* $Xorg: imakemdep.h,v 1.5 2000/08/17 19:41:50 cpqbld Exp $ */ +/* $Xorg: imakemdep.h,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/imake/imakemdep.h,v 3.54 2001/08/06 20:51:02 dawes Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.55 2001/11/16 16:47:51 dawes Exp $ */ /* diff --git a/config/makedepend/cppsetup.c b/config/makedepend/cppsetup.c index d7e623021..c305542bf 100644 --- a/config/makedepend/cppsetup.c +++ b/config/makedepend/cppsetup.c @@ -1,9 +1,13 @@ -/* $Xorg: cppsetup.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ +/* $Xorg: cppsetup.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.8 2001/04/27 03:03:51 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.9 2001/04/29 23:25:02 tsi Exp $ */ #include "def.h" diff --git a/config/makedepend/def.h b/config/makedepend/def.h index 053a2208e..66c1cfbc9 100644 --- a/config/makedepend/def.h +++ b/config/makedepend/def.h @@ -1,9 +1,13 @@ -/* $Xorg: def.h,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ +/* $Xorg: def.h,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group. -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/def.h,v 3.9 2001/04/29 23:25:02 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/def.h,v 3.10 2001/07/25 15:04:40 dawes Exp $ */ #include "Xos.h" #include "Xfuncproto.h" diff --git a/config/makedepend/include.c b/config/makedepend/include.c index 8c6f3693d..65ce78338 100644 --- a/config/makedepend/include.c +++ b/config/makedepend/include.c @@ -1,9 +1,13 @@ -/* $Xorg: include.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ +/* $Xorg: include.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/include.c,v 3.5 2001/01/17 16:38:59 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/include.c,v 3.6 2001/04/29 23:25:02 tsi Exp $ */ #include "def.h" diff --git a/config/makedepend/main.c b/config/makedepend/main.c index 366b4864e..5b83e5062 100644 --- a/config/makedepend/main.c +++ b/config/makedepend/main.c @@ -1,9 +1,13 @@ -/* $Xorg: main.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ +/* $Xorg: main.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/main.c,v 3.21 2001/06/07 18:30:41 alanh Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.22 2001/07/25 15:04:40 dawes Exp $ */ #include "def.h" #ifdef hpux diff --git a/config/makedepend/mkdepend.man b/config/makedepend/mkdepend.man index cc7c77418..78c82b1f9 100644 --- a/config/makedepend/mkdepend.man +++ b/config/makedepend/mkdepend.man @@ -1,7 +1,11 @@ -.\" $Xorg: mkdepend.man,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ +.\" $Xorg: mkdepend.man,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.3 2001/01/27 18:19:54 dawes Exp $ +.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.4 2001/02/07 22:51:55 tsi Exp $ .\" .TH MAKEDEPEND 1 __xorgversion__ .UC 4 diff --git a/config/makedepend/parse.c b/config/makedepend/parse.c index 272435d31..4e36cd7c1 100644 --- a/config/makedepend/parse.c +++ b/config/makedepend/parse.c @@ -1,9 +1,13 @@ -/* $Xorg: parse.c,v 1.4 2000/08/17 19:41:51 cpqbld Exp $ */ +/* $Xorg: parse.c,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/parse.c,v 1.8 2001/04/29 23:25:02 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/parse.c,v 1.9 2001/05/18 16:03:05 tsi Exp $ */ #include "def.h" diff --git a/config/makedepend/pr.c b/config/makedepend/pr.c index de186ce3a..5d0e1c4da 100644 --- a/config/makedepend/pr.c +++ b/config/makedepend/pr.c @@ -1,9 +1,13 @@ -/* $Xorg: pr.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ +/* $Xorg: pr.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/pr.c,v 1.3 2001/01/17 16:39:00 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/pr.c,v 1.4 2001/04/29 23:25:02 tsi Exp $ */ #include "def.h" diff --git a/config/util/checktree.c b/config/util/checktree.c index 9041a0615..8bebdc5a3 100644 --- a/config/util/checktree.c +++ b/config/util/checktree.c @@ -1,10 +1,14 @@ -/* $Xorg: checktree.c,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ */ +/* $Xorg: checktree.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ 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 Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/config/util/checktree.c,v 1.3 2001/07/29 05:01:10 tsi Exp $ */ #include <X11/Xos.h> #include <stdio.h> diff --git a/config/util/chownxterm.c b/config/util/chownxterm.c index a68e67108..d8c4b9c2a 100644 --- a/config/util/chownxterm.c +++ b/config/util/chownxterm.c @@ -1,14 +1,13 @@ -/* $XConsortium: chownxterm.c,v 1.3 94/04/17 20:10:41 gildea Exp $ */ +/* $Xorg: chownxterm.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* -Copyright (c) 1993, 1994 X Consortium +Copyright (c) 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/config/util/lndir.c b/config/util/lndir.c index 2aa3ca6fe..9da473ed8 100644 --- a/config/util/lndir.c +++ b/config/util/lndir.c @@ -1,11 +1,15 @@ -/* $Xorg: lndir.c,v 1.4 2000/08/17 19:41:52 cpqbld Exp $ */ +/* $Xorg: lndir.c,v 1.5 2001/02/09 02:03:17 xorgcvs Exp $ */ /* Create shadow link tree (after X11R4 script of the same name) Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */ /* Copyright (c) 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/lndir.c,v 3.13 2001/04/01 13:59:57 tsi Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.14 2001/07/25 15:04:41 dawes Exp $ */ /* From the original /bin/sh script: diff --git a/config/util/lndir.man b/config/util/lndir.man index 796ee5157..bbaaab440 100644 --- a/config/util/lndir.man +++ b/config/util/lndir.man @@ -1,8 +1,12 @@ -.\" $Xorg: lndir.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +.\" $Xorg: lndir.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ .\" .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be .\" included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86$ +.\" $XFree86: xc/config/util/lndir.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ .\" .TH LNDIR 1 __xorgversion__ .SH NAME diff --git a/config/util/makeg.man b/config/util/makeg.man index 0ce3691c9..815031d94 100644 --- a/config/util/makeg.man +++ b/config/util/makeg.man @@ -1,7 +1,11 @@ -.\" $Xorg: makeg.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +.\" $Xorg: makeg.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ .\" Copyright (c) 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be .\" included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86$ +.\" $XFree86: xc/config/util/makeg.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ .\" .TH MAKEG 1 __xorgversion__ .SH NAME diff --git a/extras/freetype2/src/pcf/pcfutil.c b/extras/freetype2/src/pcf/pcfutil.c index ca0c7c1ee..1b019bf8a 100644 --- a/extras/freetype2/src/pcf/pcfutil.c +++ b/extras/freetype2/src/pcf/pcfutil.c @@ -2,7 +2,11 @@ Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.3 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86: xc/extras/freetype2/src/pcf/pcfutil.c,v 1.1.1.1 2001/05/16 03:45:34 keithp Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/fonts/PEX/lex.l b/fonts/PEX/lex.l index a21b28ed0..cc99b80e6 100644 --- a/fonts/PEX/lex.l +++ b/fonts/PEX/lex.l @@ -1,11 +1,15 @@ %{ -/* $Xorg: lex.l,v 1.3 2000/08/17 19:42:52 cpqbld Exp $ */ +/* $Xorg: lex.l,v 1.4 2001/02/09 02:03:21 xorgcvs Exp $ */ /***************************************************************** Copyright 1989,1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/fonts/PEX/lex.l,v 3.11 2001/01/17 17:33:08 dawes Exp $ */ +/* $XFree86: xc/fonts/PEX/lex.l,v 3.12 2001/04/01 13:59:58 tsi Exp $ */ #include <ctype.h> diff --git a/fonts/PEX/to_wfont.y b/fonts/PEX/to_wfont.y index 7e7aa7d00..409761119 100644 --- a/fonts/PEX/to_wfont.y +++ b/fonts/PEX/to_wfont.y @@ -1,11 +1,15 @@ %{ -/* $Xorg: to_wfont.y,v 1.3 2000/08/17 19:42:52 cpqbld Exp $ */ +/* $Xorg: to_wfont.y,v 1.4 2001/02/09 02:03:21 xorgcvs Exp $ */ /***************************************************************** Copyright 1989,1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/fonts/PEX/to_wfont.y,v 3.12 2001/06/30 22:41:44 tsi Exp $ */ +/* $XFree86: xc/fonts/PEX/to_wfont.y,v 3.13 2001/07/25 15:04:41 dawes Exp $ */ #define YYMAXDEPTH 10000 diff --git a/fonts/PEX/wfont.h b/fonts/PEX/wfont.h index 37c388966..84fce0b56 100644 --- a/fonts/PEX/wfont.h +++ b/fonts/PEX/wfont.h @@ -1,15 +1,14 @@ -/* $XConsortium: wfont.h,v 5.2 94/04/17 20:10:09 rws Exp $ */ +/* $Xorg: wfont.h,v 1.4 2001/02/09 02:03:21 xorgcvs Exp $ */ /***************************************************************** -Copyright (c) 1989,1990, 1991 X Consortium +Copyright 1989,1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. diff --git a/include/DECkeysym.h b/include/DECkeysym.h index d8ab5a4f3..6ab103e5d 100644 --- a/include/DECkeysym.h +++ b/include/DECkeysym.h @@ -1,15 +1,14 @@ -/* $XConsortium: DECkeysym.h,v 1.4 94/04/17 20:10:47 rws Exp $ */ +/* $Xorg: DECkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/include/extensions/MITMisc.h b/include/extensions/MITMisc.h index b9e2eb33d..2e87bff3b 100644 --- a/include/extensions/MITMisc.h +++ b/include/extensions/MITMisc.h @@ -1,13 +1,12 @@ /************************************************************ -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,19 +14,19 @@ 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. -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. ********************************************************/ -/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM BLESSING */ +/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $XConsortium: MITMisc.h,v 1.5 94/04/17 20:11:10 rws Exp $ */ +/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ #ifndef _XMITMISC_H_ #define _XMITMISC_H_ diff --git a/include/fonts/FS.h b/include/fonts/FS.h index d07385147..e579ed75d 100644 --- a/include/fonts/FS.h +++ b/include/fonts/FS.h @@ -1,4 +1,4 @@ -/* $Xorg: FS.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ +/* $Xorg: FS.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; @@ -29,7 +29,11 @@ Portions Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/fonts/FS.h,v 1.6 2001/01/17 17:53:25 dawes Exp $ */ +/* $XFree86: xc/include/fonts/FS.h,v 1.7 2001/08/01 00:44:37 tsi Exp $ */ #ifndef _FS_H_ #define _FS_H_ diff --git a/include/fonts/FSproto.h b/include/fonts/FSproto.h index 3702e7d50..03b28089f 100644 --- a/include/fonts/FSproto.h +++ b/include/fonts/FSproto.h @@ -1,9 +1,13 @@ -/* $Xorg: FSproto.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ +/* $Xorg: FSproto.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86$ */ +/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */ #ifndef _FS_PROTO_H_ #define _FS_PROTO_H_ diff --git a/include/fonts/fsmasks.h b/include/fonts/fsmasks.h index 6693b9ed2..434ee97b5 100644 --- a/include/fonts/fsmasks.h +++ b/include/fonts/fsmasks.h @@ -1,4 +1,4 @@ -/* $XConsortium: fsmasks.h,v 1.5 94/04/17 20:11:08 dpw Exp $ */ +/* $Xorg: fsmasks.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -26,14 +26,13 @@ /* -Portions Copyright (c) 1987, 1994 X Consortium +Portions Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,13 +40,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. -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. */ diff --git a/lib/FS/FSClServ.c b/lib/FS/FSClServ.c index 1de1b5c78..704eaac24 100644 --- a/lib/FS/FSClServ.c +++ b/lib/FS/FSClServ.c @@ -1,4 +1,4 @@ -/* $Xorg: FSClServ.c,v 1.3 2000/08/17 19:44:01 cpqbld Exp $ */ +/* $Xorg: FSClServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSClServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSClServ.c,v 1.3 1999/02/20 15:07:12 hohndel Exp $ */ +/* $XFree86: xc/lib/FS/FSClServ.c,v 1.4 2001/01/17 19:41:27 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSCloseFt.c b/lib/FS/FSCloseFt.c index e0c2c85d4..ba5e67c1b 100644 --- a/lib/FS/FSCloseFt.c +++ b/lib/FS/FSCloseFt.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSCloseFt.c,v 1.4 94/04/17 20:15:09 dpw Exp $ */ +/* $Xorg: FSCloseFt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSCloseFt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,19 +41,20 @@ 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. -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. */ #include "FSlibint.h" +int FSCloseFont(svr, fid) FSServer *svr; Font fid; @@ -63,4 +63,5 @@ FSCloseFont(svr, fid) GetResReq(CloseFont, fid, req); SyncHandle(); + return 1; } diff --git a/lib/FS/FSConnServ.c b/lib/FS/FSConnServ.c index 50a3c72b1..6d66dbe08 100644 --- a/lib/FS/FSConnServ.c +++ b/lib/FS/FSConnServ.c @@ -1,4 +1,4 @@ -/* $Xorg: FSConnServ.c,v 1.3 2000/08/17 19:44:01 cpqbld Exp $ */ +/* $Xorg: FSConnServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -29,7 +29,11 @@ Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.9 2001/07/25 15:04:42 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.10 2001/10/28 03:32:27 tsi Exp $ */ #include <stdio.h> #include "FSlibint.h" diff --git a/lib/FS/FSErrDis.c b/lib/FS/FSErrDis.c index 21129de47..313812846 100644 --- a/lib/FS/FSErrDis.c +++ b/lib/FS/FSErrDis.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSErrDis.c,v 1.5 94/04/17 20:15:10 dpw Exp $ */ +/* $Xorg: FSErrDis.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSErrDis.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ @@ -73,7 +72,24 @@ char *FSErrorList[] = { int FSErrorListSize = sizeof(FSErrorList); -FSGetErrorText(svr, code, buffer, nbytes) +/* ARGSUSED */ +int FSGetErrorDatabaseText(svr, name, type, defaultp, buffer, nbytes) + register char *name, + *type; + char *defaultp; + FSServer *svr; + char *buffer; + int nbytes; +{ + if (nbytes == 0) + return 0; + (void) strncpy(buffer, (char *) defaultp, nbytes); + if ((strlen(defaultp) + 1) > nbytes) + buffer[nbytes - 1] = '\0'; + return 1; +} + +int FSGetErrorText(svr, code, buffer, nbytes) register int code; register FSServer *svr; char *buffer; @@ -85,7 +101,7 @@ FSGetErrorText(svr, code, buffer, nbytes) register _FSExtension *ext; if (nbytes == 0) - return; + return 0; sprintf(buf, "%d", code); if (code <= (FSErrorListSize / sizeof(char *)) && code > 0) { defaultp = FSErrorList[code]; @@ -97,21 +113,6 @@ FSGetErrorText(svr, code, buffer, nbytes) (*ext->error_string) (svr, code, &ext->codes, buffer, nbytes); ext = ext->next; } - return; + return 1; } -/* ARGSUSED */ -FSGetErrorDatabaseText(svr, name, type, defaultp, buffer, nbytes) - register char *name, - *type; - char *defaultp; - FSServer *svr; - char *buffer; - int nbytes; -{ - if (nbytes == 0) - return; - (void) strncpy(buffer, (char *) defaultp, nbytes); - if ((strlen(defaultp) + 1) > nbytes) - buffer[nbytes - 1] = '\0'; -} diff --git a/lib/FS/FSErrHndlr.c b/lib/FS/FSErrHndlr.c index cd2da6ea2..2440c4f95 100644 --- a/lib/FS/FSErrHndlr.c +++ b/lib/FS/FSErrHndlr.c @@ -1,4 +1,4 @@ -/* $Xorg: FSErrHndlr.c,v 1.3 2000/08/17 19:44:01 cpqbld Exp $ */ +/* $Xorg: FSErrHndlr.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSErrHndlr.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.3 1999/02/20 15:07:12 hohndel Exp $ */ +/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSFlush.c b/lib/FS/FSFlush.c index 3018e4fc1..caa3d174a 100644 --- a/lib/FS/FSFlush.c +++ b/lib/FS/FSFlush.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSFlush.c,v 1.4 94/04/17 20:15:11 dpw Exp $ */ +/* $Xorg: FSFlush.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,19 +41,20 @@ 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. -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. */ #include "FSlibint.h" -FSFlush(svr) +int FSFlush(svr) FSServer *svr; { _FSFlush(svr); + return 1; } diff --git a/lib/FS/FSFontInfo.c b/lib/FS/FSFontInfo.c index 041fb6ca2..8ed2c96bd 100644 --- a/lib/FS/FSFontInfo.c +++ b/lib/FS/FSFontInfo.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSFontInfo.c,v 1.7 94/04/17 20:15:12 rws Exp $ */ +/* $Xorg: FSFontInfo.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -26,14 +26,13 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,13 +40,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. -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. */ #include "FSlibint.h" @@ -221,7 +220,7 @@ FSListFontsWithXInfo(svr, pattern, maxNames, count, info, pprops, offsets, prop_ { /* get the name */ if (!flist[i]) { - nbytes = reply.nameLength + 3 & ~3; + nbytes = (reply.nameLength + 3) & ~3; _FSEatData(svr, (unsigned long) nbytes); goto badmem; } @@ -273,7 +272,7 @@ FSListFontsWithXInfo(svr, pattern, maxNames, count, info, pprops, offsets, prop_ { /* get the name */ if (!flist[i]) { - nbytes = reply.nameLength + 3 & ~3; + nbytes = (reply.nameLength + 3) & ~3; _FSEatData(svr, (unsigned long) nbytes); goto badmem; } diff --git a/lib/FS/FSFtNames.c b/lib/FS/FSFtNames.c index 9a642695f..9a9025a35 100644 --- a/lib/FS/FSFtNames.c +++ b/lib/FS/FSFtNames.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSFtNames.c,v 1.5 94/04/17 20:15:12 gildea Exp $ */ +/* $Xorg: FSFtNames.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ @@ -88,7 +87,7 @@ FSListFonts(svr, pattern, maxNames, actualCount) if (flist) FSfree((char *) flist); if (c) - FSFree(c); + FSfree(c); _FSEatData(svr, (unsigned long) rlen); SyncHandle(); return (char **) NULL; @@ -113,11 +112,12 @@ FSListFonts(svr, pattern, maxNames, actualCount) } -FSFreeFontNames(list) +int FSFreeFontNames(list) char **list; { if (list) { - FSFree(list[0] - 1); - FSFree((char *) list); + FSfree(list[0] - 1); + FSfree((char *) list); } + return 1; } diff --git a/lib/FS/FSGetCats.c b/lib/FS/FSGetCats.c index 9082457fd..87f2fcf0e 100644 --- a/lib/FS/FSGetCats.c +++ b/lib/FS/FSGetCats.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSGetCats.c,v 1.3 94/04/17 20:15:13 gildea Exp $ */ +/* $Xorg: FSGetCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ diff --git a/lib/FS/FSListCats.c b/lib/FS/FSListCats.c index 061dd14fc..eb4152a20 100644 --- a/lib/FS/FSListCats.c +++ b/lib/FS/FSListCats.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSListCats.c,v 1.3 94/04/17 20:15:13 gildea Exp $ */ +/* $Xorg: FSListCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ @@ -89,7 +88,7 @@ FSListCatalogues(svr, pattern, maxNames, actualCount) if (clist) FSfree((char *) clist); if (c) - FSFree(c); + FSfree(c); _FSEatData(svr, (unsigned long) rlen); SyncHandle(); return (char **) NULL; @@ -114,11 +113,12 @@ FSListCatalogues(svr, pattern, maxNames, actualCount) } -FSFreeCatalogues(list) +int FSFreeCatalogues(list) char **list; { if (list) { - FSFree(list[0] - 1); - FSFree((char *) list); + FSfree(list[0] - 1); + FSfree((char *) list); } + return 1; } diff --git a/lib/FS/FSListExt.c b/lib/FS/FSListExt.c index b2949b0eb..fb874a396 100644 --- a/lib/FS/FSListExt.c +++ b/lib/FS/FSListExt.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSListExt.c,v 1.4 94/04/17 20:15:14 dpw Exp $ */ +/* $Xorg: FSListExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSListExt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ @@ -75,7 +74,7 @@ FSListExtensions(svr, next) } if (rep.nExtensions) { list = (char **) FSmalloc((unsigned)(rep.nExtensions * sizeof(char *))); - rlen = rep.length << 2; + rlen = (rep.length << 2) - SIZEOF(fsListExtensionsReply); c = (char *) FSmalloc((unsigned) rlen + 1); if ((!list) || (!c)) { if (list) @@ -106,11 +105,12 @@ FSListExtensions(svr, next) } -FSFreeExtensionList(list) +int FSFreeExtensionList(list) char **list; { if (list != NULL) { FSfree(list[0] - 1); FSfree((char *) list); } + return 1; } diff --git a/lib/FS/FSMisc.c b/lib/FS/FSMisc.c index f559eb1c3..075753674 100644 --- a/lib/FS/FSMisc.c +++ b/lib/FS/FSMisc.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSMisc.c,v 1.4 94/04/17 20:15:14 dpw Exp $ */ +/* $Xorg: FSMisc.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSMisc.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ diff --git a/lib/FS/FSNextEv.c b/lib/FS/FSNextEv.c index c3e39a95c..9694b8e9c 100644 --- a/lib/FS/FSNextEv.c +++ b/lib/FS/FSNextEv.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSNextEv.c,v 1.5 94/04/17 20:15:15 dpw Exp $ */ +/* $Xorg: FSNextEv.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSNextEv.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ @@ -56,7 +55,7 @@ in this Software without prior written authorization from the X Consortium. extern _FSQEvent *_FSqfree; -FSNextEvent(svr, event) +int FSNextEvent(svr, event) FSServer *svr; FSEvent *event; { @@ -72,4 +71,6 @@ FSNextEvent(svr, event) qelt->next = _FSqfree; _FSqfree = qelt; svr->qlen--; + + return 1; } diff --git a/lib/FS/FSOpenFont.c b/lib/FS/FSOpenFont.c index abe472b0a..96f8aa61a 100644 --- a/lib/FS/FSOpenFont.c +++ b/lib/FS/FSOpenFont.c @@ -1,4 +1,4 @@ -/* $Xorg: FSOpenFont.c,v 1.3 2000/08/17 19:44:04 cpqbld Exp $ */ +/* $Xorg: FSOpenFont.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.4 1999/02/25 06:00:55 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.5 2001/01/17 19:41:28 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSOpenServ.c b/lib/FS/FSOpenServ.c index 47009931d..20b2dd2b7 100644 --- a/lib/FS/FSOpenServ.c +++ b/lib/FS/FSOpenServ.c @@ -1,4 +1,4 @@ -/* $Xorg: FSOpenServ.c,v 1.3 2000/08/17 19:44:04 cpqbld Exp $ */ +/* $Xorg: FSOpenServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSOpenServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.5 2001/07/25 15:04:42 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSQGlyphs.c b/lib/FS/FSQGlyphs.c index c6bfcc838..550a0423f 100644 --- a/lib/FS/FSQGlyphs.c +++ b/lib/FS/FSQGlyphs.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSQGlyphs.c,v 1.6 94/04/17 20:15:16 gildea Exp $ */ +/* $Xorg: FSQGlyphs.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ diff --git a/lib/FS/FSQXExt.c b/lib/FS/FSQXExt.c index 363945857..94aaa12d6 100644 --- a/lib/FS/FSQXExt.c +++ b/lib/FS/FSQXExt.c @@ -1,4 +1,4 @@ -/* $Xorg: FSQXExt.c,v 1.3 2000/08/17 19:44:04 cpqbld Exp $ */ +/* $Xorg: FSQXExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.3 1999/02/20 15:07:13 hohndel Exp $ */ +/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSQXInfo.c b/lib/FS/FSQXInfo.c index da8b3abea..f65b4e144 100644 --- a/lib/FS/FSQXInfo.c +++ b/lib/FS/FSQXInfo.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSQXInfo.c,v 1.5 94/04/17 20:15:17 gildea Exp $ */ +/* $Xorg: FSQXInfo.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ diff --git a/lib/FS/FSQuExt.c b/lib/FS/FSQuExt.c index 986ced64d..adec9e586 100644 --- a/lib/FS/FSQuExt.c +++ b/lib/FS/FSQuExt.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSQuExt.c,v 1.4 94/04/17 20:15:18 gildea Exp $ */ +/* $Xorg: FSQuExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ diff --git a/lib/FS/FSServName.c b/lib/FS/FSServName.c index b438591ec..f9fa3eabe 100644 --- a/lib/FS/FSServName.c +++ b/lib/FS/FSServName.c @@ -1,4 +1,4 @@ -/* $Xorg: FSServName.c,v 1.3 2000/08/17 19:44:05 cpqbld Exp $ */ +/* $Xorg: FSServName.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSServName.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/FS/FSServName.c,v 1.3 2001/07/29 05:01:11 tsi Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSSetCats.c b/lib/FS/FSSetCats.c index 7ab47453b..513647815 100644 --- a/lib/FS/FSSetCats.c +++ b/lib/FS/FSSetCats.c @@ -1,4 +1,4 @@ -/* $Xorg: FSSetCats.c,v 1.3 2000/08/17 19:44:05 cpqbld Exp $ */ +/* $Xorg: FSSetCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.3 1999/03/14 03:20:36 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSSync.c b/lib/FS/FSSync.c index 33e1effa4..6d339bff4 100644 --- a/lib/FS/FSSync.c +++ b/lib/FS/FSSync.c @@ -1,4 +1,4 @@ -/* $XConsortium: FSSync.c,v 1.5 94/04/17 20:15:19 gildea Exp $ */ +/* $Xorg: FSSync.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -27,14 +27,13 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,13 +41,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. -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. */ @@ -58,7 +57,7 @@ extern _FSQEvent *_FSqfree; /* synchronize with errors and events */ -FSSync(svr, discard) +int FSSync(svr, discard) FSServer *svr; Bool discard; { @@ -74,4 +73,6 @@ FSSync(svr, discard) svr->head = svr->tail = NULL; svr->qlen = 0; } + + return 1; } diff --git a/lib/FS/FSSynchro.c b/lib/FS/FSSynchro.c index 87d450f85..2520971e6 100644 --- a/lib/FS/FSSynchro.c +++ b/lib/FS/FSSynchro.c @@ -1,4 +1,4 @@ -/* $Xorg: FSSynchro.c,v 1.3 2000/08/17 19:44:05 cpqbld Exp $ */ +/* $Xorg: FSSynchro.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSSynchro.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.3 1999/02/20 15:07:13 hohndel Exp $ */ +/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSlib.h b/lib/FS/FSlib.h index 9822f0c99..10249da15 100644 --- a/lib/FS/FSlib.h +++ b/lib/FS/FSlib.h @@ -1,4 +1,4 @@ -/* $Xorg: FSlib.h,v 1.4 2000/08/17 19:44:05 cpqbld Exp $ */ +/* $Xorg: FSlib.h,v 1.5 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -24,13 +24,17 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSlib.h,v 1.4 2001/01/17 19:41:28 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSlib.h,v 1.5 2001/04/05 17:42:26 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/FS/FSlibInt.c b/lib/FS/FSlibInt.c index 9e0f0a89d..93f1bdc8c 100644 --- a/lib/FS/FSlibInt.c +++ b/lib/FS/FSlibInt.c @@ -1,4 +1,4 @@ -/* $Xorg: FSlibInt.c,v 1.4 2000/08/17 19:44:05 cpqbld Exp $ */ +/* $Xorg: FSlibInt.c,v 1.5 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -29,7 +29,11 @@ Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.8 2001/01/17 19:41:28 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.9 2001/04/05 17:42:26 dawes Exp $ */ /* * FSlibInt.c - Internal support routines for the C subroutine diff --git a/lib/FS/FSlibint.h b/lib/FS/FSlibint.h index ebe7cda07..9dc395f04 100644 --- a/lib/FS/FSlibint.h +++ b/lib/FS/FSlibint.h @@ -1,4 +1,4 @@ -/* $Xorg: FSlibint.h,v 1.3 2000/08/17 19:44:06 cpqbld Exp $ */ +/* $Xorg: FSlibint.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; @@ -29,7 +29,11 @@ Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSlibint.h,v 3.5 2001/01/17 19:41:28 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSlibint.h,v 3.6 2001/07/25 15:04:42 dawes Exp $ */ /* * FSlib internal decls diff --git a/lib/FS/FSlibos.h b/lib/FS/FSlibos.h index ad4aea144..211f1711e 100644 --- a/lib/FS/FSlibos.h +++ b/lib/FS/FSlibos.h @@ -1,4 +1,4 @@ -/* $Xorg: FSlibos.h,v 1.3 2000/08/17 19:44:06 cpqbld Exp $ */ +/* $Xorg: FSlibos.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* @(#)FSlibos.h 4.1 91/05/02 * Copyright 1990 Network Computing Devices; @@ -29,7 +29,11 @@ Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSlibos.h,v 3.6 2001/01/17 19:41:28 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSlibos.h,v 3.7 2001/07/25 15:04:42 dawes Exp $ */ /* * FSlib networking & os include file diff --git a/lib/ICE/ICE.h b/lib/ICE/ICE.h index 09ebabaf8..e2924f1ab 100644 --- a/lib/ICE/ICE.h +++ b/lib/ICE/ICE.h @@ -1,15 +1,14 @@ -/* $XConsortium: ICE.h,v 1.6 94/04/17 20:15:23 mor Exp $ */ +/* $Xorg: ICE.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium diff --git a/lib/ICE/ICEconn.h b/lib/ICE/ICEconn.h index 9910b98c8..cdfaccaea 100644 --- a/lib/ICE/ICEconn.h +++ b/lib/ICE/ICEconn.h @@ -1,15 +1,14 @@ -/* $XConsortium: ICEconn.h,v 1.4 94/04/17 20:15:24 mor Exp $ */ +/* $Xorg: ICEconn.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ @@ -31,6 +30,8 @@ Author: Ralph Mor, X Consortium #ifndef _ICECONN_H_ #define _ICECONN_H_ +#include <X11/ICE/ICElib.h> + /* * Data structures for ICE connection object */ diff --git a/lib/ICE/ICElib.h b/lib/ICE/ICElib.h index 5a5f90d93..8a8cdbedc 100644 --- a/lib/ICE/ICElib.h +++ b/lib/ICE/ICElib.h @@ -1,10 +1,14 @@ -/* $Xorg: ICElib.h,v 1.4 2000/08/17 19:44:10 cpqbld Exp $ */ +/* $Xorg: ICElib.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElib.h,v 3.2 1998/10/03 08:41:09 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElib.h,v 3.3 2001/01/17 19:41:29 dawes Exp $ */ #ifndef _ICELIB_H_ #define _ICELIB_H_ diff --git a/lib/ICE/ICElibint.h b/lib/ICE/ICElibint.h index 82b11d6c2..548c46fe8 100644 --- a/lib/ICE/ICElibint.h +++ b/lib/ICE/ICElibint.h @@ -1,10 +1,14 @@ -/* $Xorg: ICElibint.h,v 1.3 2000/08/17 19:44:10 cpqbld Exp $ */ +/* $Xorg: ICElibint.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.4 2001/01/17 19:41:29 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.5 2001/07/25 15:04:43 dawes Exp $ */ #ifndef _ICELIBINT_H_ #define _ICELIBINT_H_ diff --git a/lib/ICE/ICEmsg.h b/lib/ICE/ICEmsg.h index eb25ee78f..99976b567 100644 --- a/lib/ICE/ICEmsg.h +++ b/lib/ICE/ICEmsg.h @@ -1,15 +1,14 @@ -/* $XConsortium: ICEmsg.h,v 1.5 94/04/17 20:15:26 mor Exp $ */ +/* $Xorg: ICEmsg.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ diff --git a/lib/ICE/ICEproto.h b/lib/ICE/ICEproto.h index 6e8b44172..9ca7c44ce 100644 --- a/lib/ICE/ICEproto.h +++ b/lib/ICE/ICEproto.h @@ -1,15 +1,14 @@ -/* $XConsortium: ICEproto.h,v 1.7 94/04/17 20:15:27 mor Exp $ */ +/* $Xorg: ICEproto.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ @@ -31,6 +30,8 @@ Author: Ralph Mor, X Consortium #ifndef _ICEPROTO_H_ #define _ICEPROTO_H_ +#include <X11/Xmd.h> + typedef struct { CARD8 majorOpcode; CARD8 minorOpcode; diff --git a/lib/ICE/ICEutil.h b/lib/ICE/ICEutil.h index 6e8a94cc9..0784a6631 100644 --- a/lib/ICE/ICEutil.h +++ b/lib/ICE/ICEutil.h @@ -1,15 +1,14 @@ -/* $XConsortium: ICEutil.h,v 1.5 94/04/17 20:15:27 mor Exp $ */ +/* $Xorg: ICEutil.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ @@ -32,6 +31,7 @@ Author: Ralph Mor, X Consortium #define _ICEUTIL_H_ #include <stdio.h> +#include <X11/Xlib.h> /* * Data structure for entry in ICE authority file diff --git a/lib/ICE/accept.c b/lib/ICE/accept.c index 6ec275d2a..eea5389da 100644 --- a/lib/ICE/accept.c +++ b/lib/ICE/accept.c @@ -1,15 +1,14 @@ -/* $XConsortium: accept.c,v 1.23 94/04/17 20:15:30 mor Exp $ */ +/* $Xorg: accept.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ @@ -60,6 +59,13 @@ IceAcceptStatus *statusRet; /* + * Set close-on-exec so that programs that fork() don't get confused. + */ + + _IceTransSetOption (newconn, TRANS_CLOSEONEXEC, 1); + + + /* * Create an ICE object for this connection. */ diff --git a/lib/ICE/authutil.c b/lib/ICE/authutil.c index 2de1ba491..fc4e5713e 100644 --- a/lib/ICE/authutil.c +++ b/lib/ICE/authutil.c @@ -1,10 +1,14 @@ -/* $Xorg: authutil.c,v 1.4 2000/08/17 19:44:12 cpqbld Exp $ */ +/* $Xorg: authutil.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/authutil.c,v 3.6 2001/01/17 19:41:29 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/authutil.c,v 3.7 2001/07/25 15:04:43 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/connect.c b/lib/ICE/connect.c index 1cbc8e010..2a65980ff 100644 --- a/lib/ICE/connect.c +++ b/lib/ICE/connect.c @@ -1,10 +1,14 @@ -/* $Xorg: connect.c,v 1.3 2000/08/17 19:44:12 cpqbld Exp $ */ +/* $Xorg: connect.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/connect.c,v 3.7 2001/07/23 13:15:41 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/connect.c,v 3.8 2001/07/25 15:04:43 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/error.c b/lib/ICE/error.c index 6c75d94d4..09fbbb285 100644 --- a/lib/ICE/error.c +++ b/lib/ICE/error.c @@ -1,10 +1,14 @@ -/* $Xorg: error.c,v 1.3 2000/08/17 19:44:13 cpqbld Exp $ */ +/* $Xorg: error.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/error.c,v 1.4 2001/07/25 15:04:43 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/error.c,v 1.5 2001/10/28 03:32:28 tsi Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/getauth.c b/lib/ICE/getauth.c index f84b533b9..15db492e1 100644 --- a/lib/ICE/getauth.c +++ b/lib/ICE/getauth.c @@ -1,10 +1,14 @@ -/* $Xorg: getauth.c,v 1.3 2000/08/17 19:44:14 cpqbld Exp $ */ +/* $Xorg: getauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/lib/ICE/getauth.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/globals.h b/lib/ICE/globals.h index 18340b12b..69dd62a4d 100644 --- a/lib/ICE/globals.h +++ b/lib/ICE/globals.h @@ -1,10 +1,14 @@ -/* $Xorg: globals.h,v 1.3 2000/08/17 19:44:14 cpqbld Exp $ */ +/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/globals.h,v 1.2 1998/12/20 11:56:49 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/globals.h,v 1.3 2001/01/17 19:41:29 dawes Exp $ */ extern void _IceDefaultErrorHandler (); extern void _IceDefaultIOErrorHandler (); diff --git a/lib/ICE/iceauth.c b/lib/ICE/iceauth.c index be2baf9a0..ca860a3d3 100644 --- a/lib/ICE/iceauth.c +++ b/lib/ICE/iceauth.c @@ -1,10 +1,14 @@ -/* $Xorg: iceauth.c,v 1.3 2000/08/17 19:44:15 cpqbld Exp $ */ +/* $Xorg: iceauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/iceauth.c,v 3.3 2001/01/17 19:41:29 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/iceauth.c,v 3.4 2001/07/25 15:04:43 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/listen.c b/lib/ICE/listen.c index 9c9b400f8..cee141ff2 100644 --- a/lib/ICE/listen.c +++ b/lib/ICE/listen.c @@ -1,15 +1,14 @@ -/* $XConsortium: listen.c,v 1.14 94/04/17 20:15:34 mor Exp $ */ +/* $Xorg: listen.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Author: Ralph Mor, X Consortium +Author: Ralph Mor, X Consortium ******************************************************************************/ #include <X11/ICE/ICElib.h> @@ -45,9 +44,7 @@ char *errorStringRet; { struct _IceListenObj *listenObjs; char *networkId; - int fd, transCount, partial, i, j; - int family, addrlen; - Xtransaddr *addr; + int transCount, partial, i, j; Status status = 1; XtransConnInfo *transConns = NULL; @@ -77,11 +74,7 @@ char *errorStringRet; for (i = 0; i < transCount; i++) { - _IceTransGetMyAddr (transConns[i], &family, &addrlen, &addr); - - networkId = _IceTransGetMyNetworkId (family, addrlen, addr); - - free (addr); + networkId = _IceTransGetMyNetworkId (transConns[i]); if (networkId) { @@ -214,15 +207,34 @@ IceListenObj *listenObjs; return (NULL); else { + int doneCount = 0; + list[0] = '\0'; - for (i = 0; i < count - 1; i++) + + for (i = 0; i < count; i++) { - strcat (list, listenObjs[i]->network_id); - strcat (list, ","); + if (_IceTransIsLocal (listenObjs[i]->trans_conn)) + { + strcat (list, listenObjs[i]->network_id); + doneCount++; + if (doneCount < count) + strcat (list, ","); + } } - strcat (list, listenObjs[count - 1]->network_id); - list[strlen (list)] = '\0'; + if (doneCount < count) + { + for (i = 0; i < count; i++) + { + if (!_IceTransIsLocal (listenObjs[i]->trans_conn)) + { + strcat (list, listenObjs[i]->network_id); + doneCount++; + if (doneCount < count) + strcat (list, ","); + } + } + } return (list); } diff --git a/lib/ICE/listenwk.c b/lib/ICE/listenwk.c index 3ff3e6657..ee0872372 100644 --- a/lib/ICE/listenwk.c +++ b/lib/ICE/listenwk.c @@ -1,10 +1,14 @@ -/* $Xorg: listenwk.c,v 1.4 2000/08/17 19:44:15 cpqbld Exp $ */ +/* $Xorg: listenwk.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/ICE/listenwk.c,v 1.2 1999/05/23 06:33:24 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/listenwk.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */ /* Author: Ralph Mor, X Consortium */ diff --git a/lib/ICE/locking.c b/lib/ICE/locking.c index e31c55522..c16c3a131 100644 --- a/lib/ICE/locking.c +++ b/lib/ICE/locking.c @@ -1,15 +1,14 @@ -/* $XConsortium: locking.c,v 1.4 94/04/17 20:15:35 mor Exp $ */ +/* $Xorg: locking.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ diff --git a/lib/ICE/misc.c b/lib/ICE/misc.c index 333038e6f..e174b6063 100644 --- a/lib/ICE/misc.c +++ b/lib/ICE/misc.c @@ -1,10 +1,14 @@ -/* $Xorg: misc.c,v 1.3 2000/08/17 19:44:15 cpqbld Exp $ */ +/* $Xorg: misc.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/misc.c,v 1.2 1999/05/23 06:33:24 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/misc.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/lib/ICE/ping.c b/lib/ICE/ping.c index e77733b22..bee042a06 100644 --- a/lib/ICE/ping.c +++ b/lib/ICE/ping.c @@ -1,15 +1,14 @@ -/* $XConsortium: ping.c,v 1.8 94/04/17 20:15:36 mor Exp $ */ +/* $Xorg: ping.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ diff --git a/lib/ICE/process.c b/lib/ICE/process.c index fd8731568..4781d2777 100644 --- a/lib/ICE/process.c +++ b/lib/ICE/process.c @@ -1,10 +1,14 @@ -/* $Xorg: process.c,v 1.3 2000/08/17 19:44:16 cpqbld Exp $ */ +/* $Xorg: process.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/process.c,v 3.6 2001/07/23 13:15:41 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/process.c,v 3.7 2001/10/28 03:32:28 tsi Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/protosetup.c b/lib/ICE/protosetup.c index 67feaeb12..fa363190f 100644 --- a/lib/ICE/protosetup.c +++ b/lib/ICE/protosetup.c @@ -1,10 +1,14 @@ -/* $Xorg: protosetup.c,v 1.3 2000/08/17 19:44:17 cpqbld Exp $ */ +/* $Xorg: protosetup.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/lib/ICE/protosetup.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/register.c b/lib/ICE/register.c index bf8ab28e3..45ec62cdb 100644 --- a/lib/ICE/register.c +++ b/lib/ICE/register.c @@ -1,15 +1,14 @@ -/* $XConsortium: register.c,v 1.13 94/04/17 20:15:38 mor Exp $ */ +/* $Xorg: register.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ diff --git a/lib/ICE/replywait.c b/lib/ICE/replywait.c index 80c9c67a1..2c816f2d1 100644 --- a/lib/ICE/replywait.c +++ b/lib/ICE/replywait.c @@ -1,15 +1,14 @@ -/* $XConsortium: replywait.c,v 1.4 94/04/17 20:15:39 mor Exp $ */ +/* $Xorg: replywait.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ diff --git a/lib/ICE/setauth.c b/lib/ICE/setauth.c index 795145c74..94db2f995 100644 --- a/lib/ICE/setauth.c +++ b/lib/ICE/setauth.c @@ -1,10 +1,14 @@ -/* $Xorg: setauth.c,v 1.3 2000/08/17 19:44:18 cpqbld Exp $ */ +/* $Xorg: setauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/setauth.c,v 1.2 1998/12/20 11:56:50 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/setauth.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/shutdown.c b/lib/ICE/shutdown.c index fc170e5f3..103aa4727 100644 --- a/lib/ICE/shutdown.c +++ b/lib/ICE/shutdown.c @@ -1,10 +1,14 @@ -/* $Xorg: shutdown.c,v 1.3 2000/08/17 19:44:18 cpqbld Exp $ */ +/* $Xorg: shutdown.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/lib/ICE/shutdown.c,v 3.3 2001/08/01 00:44:37 tsi Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/lib/ICE/watch.c b/lib/ICE/watch.c index 12f77f21a..6c331925f 100644 --- a/lib/ICE/watch.c +++ b/lib/ICE/watch.c @@ -1,15 +1,14 @@ -/* $XConsortium: watch.c,v 1.6 94/04/17 20:15:41 mor Exp $ */ +/* $Xorg: watch.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Author: Ralph Mor, X Consortium ******************************************************************************/ diff --git a/lib/PEX5/PEXlibint.h b/lib/PEX5/PEXlibint.h index 6e9cfdb2a..9415f7e5b 100644 --- a/lib/PEX5/PEXlibint.h +++ b/lib/PEX5/PEXlibint.h @@ -1,10 +1,14 @@ -/* $Xorg: PEXlibint.h,v 1.4 2000/08/17 19:44:20 cpqbld Exp $ */ +/* $Xorg: PEXlibint.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/PEX5/PEXproto.h b/lib/PEX5/PEXproto.h index 2a029889d..d74b5ef72 100644 --- a/lib/PEX5/PEXproto.h +++ b/lib/PEX5/PEXproto.h @@ -1,15 +1,13 @@ -/* $XConsortium: PEXproto.h,v 1.9 94/04/17 20:22:25 mor Exp $ */ +/* $Xorg: PEXproto.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /* -Copyright (c) 1992 X Consortium +Copyright 1992, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/PEX5/PEXprotost.h b/lib/PEX5/PEXprotost.h index 6e9ee6c1d..39b396bf3 100644 --- a/lib/PEX5/PEXprotost.h +++ b/lib/PEX5/PEXprotost.h @@ -1,15 +1,13 @@ -/* $XConsortium: PEXprotost.h,v 1.7 94/04/17 20:22:27 mor Exp $ */ +/* $Xorg: PEXprotost.h,v 1.4 2001/02/09 02:03:27 xorgcvs Exp $ */ /* -Copyright (c) 1992 X Consortium +Copyright 1992, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/SM/SM.h b/lib/SM/SM.h index 7d6d0eaa5..0621b4918 100644 --- a/lib/SM/SM.h +++ b/lib/SM/SM.h @@ -1,15 +1,14 @@ -/* $XConsortium: SM.h,v 1.9 94/04/17 20:16:49 mor Exp $ */ +/* $Xorg: SM.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/SM/SMlib.h b/lib/SM/SMlib.h index 853c3b28e..8ec7ea26e 100644 --- a/lib/SM/SMlib.h +++ b/lib/SM/SMlib.h @@ -1,15 +1,14 @@ -/* $XConsortium: SMlib.h,v 1.22 94/04/17 20:16:50 mor Exp $ */ +/* $Xorg: SMlib.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ @@ -386,6 +385,8 @@ typedef void (*SmsErrorHandler) ( * Function Prototypes */ +_XFUNCPROTOBEGIN + extern SmcConn SmcOpenConnection ( #if NeedFunctionPrototypes char * /* networkIdsList */, @@ -653,4 +654,6 @@ extern void SmFreeReasons ( #endif ); +_XFUNCPROTOEND + #endif /* _SMLIB_H_ */ diff --git a/lib/SM/SMlibint.h b/lib/SM/SMlibint.h index b0426e5be..e9fa9cd96 100644 --- a/lib/SM/SMlibint.h +++ b/lib/SM/SMlibint.h @@ -1,10 +1,14 @@ -/* $Xorg: SMlibint.h,v 1.3 2000/08/17 19:44:28 cpqbld Exp $ */ +/* $Xorg: SMlibint.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/SM/SMlibint.h,v 1.3 2001/07/29 05:01:11 tsi Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/lib/SM/SMproto.h b/lib/SM/SMproto.h index dd61dc7fc..f60ab3e4a 100644 --- a/lib/SM/SMproto.h +++ b/lib/SM/SMproto.h @@ -1,15 +1,14 @@ -/* $XConsortium: SMproto.h,v 1.9 94/04/17 20:16:52 mor Exp $ */ +/* $Xorg: SMproto.h,v 1.5 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ @@ -34,6 +33,8 @@ in this Software without prior written authorization from the X Consortium. #ifndef _SMPROTO_H_ #define _SMPROTO_H_ +#include <X11/Xmd.h> + typedef struct { CARD8 majorOpcode; CARD8 minorOpcode; diff --git a/lib/SM/globals.h b/lib/SM/globals.h index 114e90c8c..15207adba 100644 --- a/lib/SM/globals.h +++ b/lib/SM/globals.h @@ -1,10 +1,14 @@ -/* $Xorg: globals.h,v 1.3 2000/08/17 19:44:29 cpqbld Exp $ */ +/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/globals.h,v 1.2 1998/12/20 11:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/SM/globals.h,v 1.3 2001/01/17 19:41:31 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/lib/SM/sm_auth.c b/lib/SM/sm_auth.c index 37eeac1f1..a709cda7b 100644 --- a/lib/SM/sm_auth.c +++ b/lib/SM/sm_auth.c @@ -1,15 +1,14 @@ -/* $XConsortium: sm_auth.c,v 1.11 94/04/17 20:16:53 mor Exp $ */ +/* $Xorg: sm_auth.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/SM/sm_client.c b/lib/SM/sm_client.c index 3cfd50b8b..028262e27 100644 --- a/lib/SM/sm_client.c +++ b/lib/SM/sm_client.c @@ -1,15 +1,14 @@ -/* $XConsortium: sm_client.c,v 1.30 94/04/17 20:16:54 mor Exp $ */ +/* $Xorg: sm_client.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/SM/sm_error.c b/lib/SM/sm_error.c index eeda88063..8cd7989a0 100644 --- a/lib/SM/sm_error.c +++ b/lib/SM/sm_error.c @@ -1,10 +1,14 @@ -/* $Xorg: sm_error.c,v 1.3 2000/08/17 19:44:29 cpqbld Exp $ */ +/* $Xorg: sm_error.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/SM/sm_error.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/lib/SM/sm_genid.c b/lib/SM/sm_genid.c index 4dbe30c50..43dce4b83 100644 --- a/lib/SM/sm_genid.c +++ b/lib/SM/sm_genid.c @@ -1,10 +1,14 @@ -/* $Xorg: sm_genid.c,v 1.3 2000/08/17 19:44:29 cpqbld Exp $ */ +/* $Xorg: sm_genid.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_genid.c,v 3.13 2001/10/28 03:32:29 tsi Exp $ */ +/* $XFree86: xc/lib/SM/sm_genid.c,v 3.14 2001/11/19 20:44:15 tsi Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/lib/SM/sm_manager.c b/lib/SM/sm_manager.c index 105571652..2f62b1566 100644 --- a/lib/SM/sm_manager.c +++ b/lib/SM/sm_manager.c @@ -1,15 +1,14 @@ -/* $XConsortium: sm_manager.c,v 1.22 94/04/17 20:16:56 mor Exp $ */ +/* $Xorg: sm_manager.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ @@ -109,6 +108,20 @@ char **failureReasonRet; unsigned long mask; Status status; + /* + * vendor/release are undefined for ProtocolSetup in XSMP. + */ + + if (vendor) + free (vendor); + if (release) + free (release); + + + /* + * Allocate new SmsConn. + */ + if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL) { char *str = "Memory allocation failed"; @@ -156,26 +169,7 @@ SmsClientHostName (smsConn) SmsConn smsConn; { - int family, peer_addrlen; - Xtransaddr *peer_addr; - char *networkId; - - char *hostname; - - - if (_IceTransGetPeerAddr (smsConn->iceConn->trans_conn, - &family, &peer_addrlen, &peer_addr) < 0) - { - return (NULL); - } - else - { - hostname = _IceTransGetPeerNetworkId (family, peer_addrlen, peer_addr); - - free ((char *) peer_addr); - - return (hostname); - } + return (_IceTransGetPeerNetworkId (smsConn->iceConn->trans_conn)); } diff --git a/lib/SM/sm_misc.c b/lib/SM/sm_misc.c index 6f58e5308..9fc3e9058 100644 --- a/lib/SM/sm_misc.c +++ b/lib/SM/sm_misc.c @@ -1,15 +1,14 @@ -/* $XConsortium: sm_misc.c,v 1.7 94/04/17 20:16:57 mor Exp $ */ +/* $Xorg: sm_misc.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/SM/sm_process.c b/lib/SM/sm_process.c index 332092d17..cb15ebc6c 100644 --- a/lib/SM/sm_process.c +++ b/lib/SM/sm_process.c @@ -1,15 +1,14 @@ -/* $XConsortium: sm_process.c,v 1.28 94/04/17 20:16:57 mor Exp $ */ +/* $Xorg: sm_process.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ @@ -110,6 +109,12 @@ Bool *replyReadyRet; return; } + if (swap) + { + pMsg->errorClass = lswaps (pMsg->errorClass); + pMsg->offendingSequenceNum = lswapl (pMsg->offendingSequenceNum); + } + if (replyWait && replyWait->minor_opcode_of_request == SM_RegisterClient && pMsg->errorClass == IceBadValue && @@ -450,6 +455,12 @@ Bool swap; return; } + if (swap) + { + pMsg->errorClass = lswaps (pMsg->errorClass); + pMsg->offendingSequenceNum = lswapl (pMsg->offendingSequenceNum); + } + (*_SmsErrorHandler) (smsConn, swap, pMsg->offendingMinorOpcode, pMsg->offendingSequenceNum, diff --git a/lib/X11/AllCells.c b/lib/X11/AllCells.c index 19cdacc22..495d9a36d 100644 --- a/lib/X11/AllCells.c +++ b/lib/X11/AllCells.c @@ -1,14 +1,13 @@ -/* $XConsortium: AllCells.c,v 11.20 94/04/17 20:18:31 rws Exp $ */ +/* $Xorg: AllCells.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/AllPlanes.c b/lib/X11/AllPlanes.c index 3c0f19f55..5f7e6bcc7 100644 --- a/lib/X11/AllPlanes.c +++ b/lib/X11/AllPlanes.c @@ -1,9 +1,13 @@ -/* $Xorg: AllPlanes.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: AllPlanes.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/AllPlanes.c,v 1.2 2000/09/26 15:56:51 tsi Exp $ */ +/* $XFree86: xc/lib/X11/AllPlanes.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/AllowEv.c b/lib/X11/AllowEv.c index 3f986c349..b87d3becc 100644 --- a/lib/X11/AllowEv.c +++ b/lib/X11/AllowEv.c @@ -1,9 +1,13 @@ -/* $Xorg: AllowEv.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: AllowEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/AllowEv.c,v 1.2 1999/05/09 10:48:55 dawes Exp $ */ +/* $XFree86: xc/lib/X11/AllowEv.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/AutoRep.c b/lib/X11/AutoRep.c index 71398f201..eb6a3073f 100644 --- a/lib/X11/AutoRep.c +++ b/lib/X11/AutoRep.c @@ -1,9 +1,13 @@ -/* $Xorg: AutoRep.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: AutoRep.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/AutoRep.c,v 1.2 1999/05/09 10:48:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/AutoRep.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Backgnd.c b/lib/X11/Backgnd.c index 31a84ac1d..76ebb13f4 100644 --- a/lib/X11/Backgnd.c +++ b/lib/X11/Backgnd.c @@ -1,9 +1,13 @@ -/* $Xorg: Backgnd.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: Backgnd.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Backgnd.c,v 1.2 1999/05/09 10:48:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Backgnd.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/BdrWidth.c b/lib/X11/BdrWidth.c index 27b9f840e..5178032fa 100644 --- a/lib/X11/BdrWidth.c +++ b/lib/X11/BdrWidth.c @@ -1,10 +1,14 @@ -/* $Xorg: BdrWidth.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: BdrWidth.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Bell.c b/lib/X11/Bell.c index 1ec2825e3..53b77c818 100644 --- a/lib/X11/Bell.c +++ b/lib/X11/Bell.c @@ -1,9 +1,13 @@ -/* $Xorg: Bell.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: Bell.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Bell.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Bell.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Border.c b/lib/X11/Border.c index 80f7e3312..29f555556 100644 --- a/lib/X11/Border.c +++ b/lib/X11/Border.c @@ -1,9 +1,13 @@ -/* $Xorg: Border.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: Border.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Border.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Border.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CCC.c b/lib/X11/CCC.c index 855ca6752..c068b49f5 100644 --- a/lib/X11/CCC.c +++ b/lib/X11/CCC.c @@ -1,4 +1,4 @@ -/* $Xorg: CCC.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: CCC.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. @@ -33,13 +33,17 @@ * * */ -/* $XFree86: xc/lib/X11/CCC.c,v 1.2 1999/05/09 10:48:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CCC.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/X11/ChAccCon.c b/lib/X11/ChAccCon.c index d5eb7d95e..4d9281dbc 100644 --- a/lib/X11/ChAccCon.c +++ b/lib/X11/ChAccCon.c @@ -1,9 +1,13 @@ -/* $Xorg: ChAccCon.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: ChAccCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChAccCon.c,v 1.2 1999/05/09 10:48:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChAccCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChActPGb.c b/lib/X11/ChActPGb.c index 27bc458a8..e1df3431b 100644 --- a/lib/X11/ChActPGb.c +++ b/lib/X11/ChActPGb.c @@ -1,9 +1,13 @@ -/* $Xorg: ChActPGb.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: ChActPGb.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChActPGb.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChActPGb.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChClMode.c b/lib/X11/ChClMode.c index d63ff34aa..4faa37f5f 100644 --- a/lib/X11/ChClMode.c +++ b/lib/X11/ChClMode.c @@ -1,9 +1,13 @@ -/* $Xorg: ChClMode.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: ChClMode.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChClMode.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChClMode.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChCmap.c b/lib/X11/ChCmap.c index 1c98d9c80..f3c02ded3 100644 --- a/lib/X11/ChCmap.c +++ b/lib/X11/ChCmap.c @@ -1,9 +1,13 @@ -/* $Xorg: ChCmap.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: ChCmap.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChCmap.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChCmap.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChGC.c b/lib/X11/ChGC.c index 712e59995..0d8390a8e 100644 --- a/lib/X11/ChGC.c +++ b/lib/X11/ChGC.c @@ -1,9 +1,13 @@ -/* $Xorg: ChGC.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: ChGC.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChGC.c,v 1.2 1999/05/09 10:49:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChGC.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChKeyCon.c b/lib/X11/ChKeyCon.c index 186998f04..bc5419f4f 100644 --- a/lib/X11/ChKeyCon.c +++ b/lib/X11/ChKeyCon.c @@ -1,9 +1,13 @@ -/* $Xorg: ChKeyCon.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: ChKeyCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.2 1999/05/09 10:49:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChPntCon.c b/lib/X11/ChPntCon.c index 67dac81a1..0a0fd6f05 100644 --- a/lib/X11/ChPntCon.c +++ b/lib/X11/ChPntCon.c @@ -1,9 +1,13 @@ -/* $Xorg: ChPntCon.c,v 1.3 2000/08/17 19:44:30 cpqbld Exp $ */ +/* $Xorg: ChPntCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChPntCon.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChPntCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChProp.c b/lib/X11/ChProp.c index 8ab7fe06d..5b43a8b18 100644 --- a/lib/X11/ChProp.c +++ b/lib/X11/ChProp.c @@ -1,9 +1,13 @@ -/* $Xorg: ChProp.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChProp.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChProp.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChProp.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChSaveSet.c b/lib/X11/ChSaveSet.c index e2c53b60b..a048b7bbf 100644 --- a/lib/X11/ChSaveSet.c +++ b/lib/X11/ChSaveSet.c @@ -1,9 +1,13 @@ -/* $Xorg: ChSaveSet.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChSaveSet.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChWAttrs.c b/lib/X11/ChWAttrs.c index 550aaf4fb..e0d02dfcf 100644 --- a/lib/X11/ChWAttrs.c +++ b/lib/X11/ChWAttrs.c @@ -1,9 +1,13 @@ -/* $Xorg: ChWAttrs.c,v 1.4 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChWAttrs.c,v 1.5 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.2 1999/05/09 10:49:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChWindow.c b/lib/X11/ChWindow.c index a39573980..41af3bed7 100644 --- a/lib/X11/ChWindow.c +++ b/lib/X11/ChWindow.c @@ -1,9 +1,13 @@ -/* $Xorg: ChWindow.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChWindow.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChWindow.c,v 1.4 1999/05/09 10:49:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChWindow.c,v 1.5 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ChkIfEv.c b/lib/X11/ChkIfEv.c index 6a19f2b1f..24539e829 100644 --- a/lib/X11/ChkIfEv.c +++ b/lib/X11/ChkIfEv.c @@ -1,14 +1,13 @@ -/* $XConsortium: ChkIfEv.c,v 11.13 94/04/17 20:18:45 gildea Exp $ */ +/* $Xorg: ChkIfEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* -Copyright (c) 1985, 1987 X Consortium +Copyright 1985, 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/ChkMaskEv.c b/lib/X11/ChkMaskEv.c index 6963a00fd..961dce699 100644 --- a/lib/X11/ChkMaskEv.c +++ b/lib/X11/ChkMaskEv.c @@ -1,9 +1,13 @@ -/* $Xorg: ChkMaskEv.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChkMaskEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChkMaskEv.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ +/* $XFree86: xc/lib/X11/ChkMaskEv.c,v 3.5 2001/10/28 03:32:29 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/ChkTypEv.c b/lib/X11/ChkTypEv.c index 7b3a7db6c..c1c36d43d 100644 --- a/lib/X11/ChkTypEv.c +++ b/lib/X11/ChkTypEv.c @@ -1,9 +1,13 @@ -/* $Xorg: ChkTypEv.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChkTypEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/ChkTypEv.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/ChkTypWEv.c b/lib/X11/ChkTypWEv.c index 9772dea63..c15f2bcf2 100644 --- a/lib/X11/ChkTypWEv.c +++ b/lib/X11/ChkTypWEv.c @@ -1,9 +1,13 @@ -/* $Xorg: ChkTypWEv.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChkTypWEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/ChkTypWEv.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/ChkWinEv.c b/lib/X11/ChkWinEv.c index 8a80b9aca..2fd386d21 100644 --- a/lib/X11/ChkWinEv.c +++ b/lib/X11/ChkWinEv.c @@ -1,9 +1,13 @@ -/* $Xorg: ChkWinEv.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ChkWinEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChkWinEv.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ +/* $XFree86: xc/lib/X11/ChkWinEv.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/CirWin.c b/lib/X11/CirWin.c index 7f20b3ff9..53c704407 100644 --- a/lib/X11/CirWin.c +++ b/lib/X11/CirWin.c @@ -1,9 +1,13 @@ -/* $Xorg: CirWin.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: CirWin.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CirWin.c,v 1.2 1999/05/09 10:49:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CirWin.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CirWinDn.c b/lib/X11/CirWinDn.c index 9a7183484..b790f2d77 100644 --- a/lib/X11/CirWinDn.c +++ b/lib/X11/CirWinDn.c @@ -1,9 +1,13 @@ -/* $Xorg: CirWinDn.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: CirWinDn.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CirWinDn.c,v 1.2 1999/05/09 10:49:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CirWinDn.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CirWinUp.c b/lib/X11/CirWinUp.c index c37817f87..12756cd36 100644 --- a/lib/X11/CirWinUp.c +++ b/lib/X11/CirWinUp.c @@ -1,9 +1,13 @@ -/* $Xorg: CirWinUp.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: CirWinUp.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CirWinUp.c,v 1.2 1999/05/09 10:49:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CirWinUp.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ClDisplay.c b/lib/X11/ClDisplay.c index f4b80ad62..e2ffd3773 100644 --- a/lib/X11/ClDisplay.c +++ b/lib/X11/ClDisplay.c @@ -1,10 +1,14 @@ -/* $Xorg: ClDisplay.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ClDisplay.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.2 1999/05/09 10:49:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Clear.c b/lib/X11/Clear.c index 2829f22f7..403943bc6 100644 --- a/lib/X11/Clear.c +++ b/lib/X11/Clear.c @@ -1,9 +1,13 @@ -/* $Xorg: Clear.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: Clear.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Clear.c,v 1.2 1999/05/09 10:49:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Clear.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ClearArea.c b/lib/X11/ClearArea.c index 0296517b9..a85eb6ba7 100644 --- a/lib/X11/ClearArea.c +++ b/lib/X11/ClearArea.c @@ -1,9 +1,13 @@ -/* $Xorg: ClearArea.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ClearArea.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ClearArea.c,v 1.2 1999/05/09 10:49:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ClearArea.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ConfWind.c b/lib/X11/ConfWind.c index f3d2ddf94..1c5813f55 100644 --- a/lib/X11/ConfWind.c +++ b/lib/X11/ConfWind.c @@ -1,9 +1,13 @@ -/* $Xorg: ConfWind.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ConfWind.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ConfWind.c,v 1.2 1999/05/09 10:49:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ConfWind.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ConnDis.c b/lib/X11/ConnDis.c index 178e86fb7..ad9c4f22f 100644 --- a/lib/X11/ConnDis.c +++ b/lib/X11/ConnDis.c @@ -1,9 +1,13 @@ -/* $Xorg: ConnDis.c,v 1.7 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ConnDis.c,v 3.22 2001/10/28 03:32:30 tsi Exp $ */ +/* $XFree86: xc/lib/X11/ConnDis.c,v 3.23 2001/10/30 17:41:46 tsi Exp $ */ /* * This file contains operating system dependencies. diff --git a/lib/X11/Context.c b/lib/X11/Context.c index 15a66b1b3..5f3e2338f 100644 --- a/lib/X11/Context.c +++ b/lib/X11/Context.c @@ -1,4 +1,4 @@ -/* $Xorg: Context.c,v 1.4 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: Context.c,v 1.5 2001/02/09 02:03:31 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard, @@ -27,7 +27,11 @@ SOFTWARE. Copyright 1987, 1988, 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Context.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Context.c,v 1.4 2001/10/28 03:32:30 tsi Exp $ */ /* This module implements a simple sparse array. diff --git a/lib/X11/ConvSel.c b/lib/X11/ConvSel.c index 8cf1daf34..24d4f83b9 100644 --- a/lib/X11/ConvSel.c +++ b/lib/X11/ConvSel.c @@ -1,9 +1,13 @@ -/* $Xorg: ConvSel.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: ConvSel.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ConvSel.c,v 1.2 1999/05/09 10:49:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ConvSel.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CopyArea.c b/lib/X11/CopyArea.c index db1bbf93d..a2a92a8d9 100644 --- a/lib/X11/CopyArea.c +++ b/lib/X11/CopyArea.c @@ -1,9 +1,13 @@ -/* $Xorg: CopyArea.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: CopyArea.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyArea.c,v 1.2 1999/05/09 10:49:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyArea.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CopyCmap.c b/lib/X11/CopyCmap.c index 1035f0f05..9c7abcec4 100644 --- a/lib/X11/CopyCmap.c +++ b/lib/X11/CopyCmap.c @@ -1,9 +1,13 @@ -/* $Xorg: CopyCmap.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: CopyCmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyCmap.c,v 1.2 1999/05/09 10:49:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyCmap.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/lib/X11/CopyGC.c b/lib/X11/CopyGC.c index d38864763..121bf5b82 100644 --- a/lib/X11/CopyGC.c +++ b/lib/X11/CopyGC.c @@ -1,9 +1,13 @@ -/* $Xorg: CopyGC.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: CopyGC.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyGC.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyGC.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CopyPlane.c b/lib/X11/CopyPlane.c index 375655d7f..7adae39f8 100644 --- a/lib/X11/CopyPlane.c +++ b/lib/X11/CopyPlane.c @@ -1,9 +1,13 @@ -/* $Xorg: CopyPlane.c,v 1.3 2000/08/17 19:44:31 cpqbld Exp $ */ +/* $Xorg: CopyPlane.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyPlane.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyPlane.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CrBFData.c b/lib/X11/CrBFData.c index 97d37ac0b..70060a965 100644 --- a/lib/X11/CrBFData.c +++ b/lib/X11/CrBFData.c @@ -1,14 +1,13 @@ -/* $XConsortium: CrBFData.c,v 1.12 94/04/17 20:18:58 rws Exp $ */ +/* $Xorg: CrBFData.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/CrCmap.c b/lib/X11/CrCmap.c index 0abecec8b..aed219125 100644 --- a/lib/X11/CrCmap.c +++ b/lib/X11/CrCmap.c @@ -1,9 +1,13 @@ -/* $Xorg: CrCmap.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrCmap.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrCmap.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/lib/X11/CrCursor.c b/lib/X11/CrCursor.c index bf49993af..93c7a006e 100644 --- a/lib/X11/CrCursor.c +++ b/lib/X11/CrCursor.c @@ -1,14 +1,13 @@ -/* $XConsortium: CrCursor.c,v 11.9 94/04/17 20:18:59 rws Exp $ */ +/* $Xorg: CrCursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/CrGC.c b/lib/X11/CrGC.c index 46e325f40..46032aa89 100644 --- a/lib/X11/CrGC.c +++ b/lib/X11/CrGC.c @@ -1,9 +1,13 @@ -/* $Xorg: CrGC.c,v 1.4 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: CrGC.c,v 1.5 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrGC.c,v 3.4 2001/01/17 19:41:33 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrGC.c,v 3.5 2001/07/25 15:04:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CrGlCur.c b/lib/X11/CrGlCur.c index ac9072749..435c07ecd 100644 --- a/lib/X11/CrGlCur.c +++ b/lib/X11/CrGlCur.c @@ -1,9 +1,13 @@ -/* $Xorg: CrGlCur.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: CrGlCur.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.2 2000/01/29 18:58:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/CrPFBData.c b/lib/X11/CrPFBData.c index a6d0a82ba..f28aabbbd 100644 --- a/lib/X11/CrPFBData.c +++ b/lib/X11/CrPFBData.c @@ -1,14 +1,13 @@ -/* $XConsortium: CrPFBData.c,v 1.8 94/04/17 20:19:01 rws Exp $ */ +/* $Xorg: CrPFBData.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/CrPixmap.c b/lib/X11/CrPixmap.c index f6c3aad02..2505f48ae 100644 --- a/lib/X11/CrPixmap.c +++ b/lib/X11/CrPixmap.c @@ -1,14 +1,13 @@ -/* $XConsortium: CrPixmap.c,v 11.8 94/04/17 20:19:01 rws Exp $ */ +/* $Xorg: CrPixmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/CrWindow.c b/lib/X11/CrWindow.c index 0a075a6ed..418f9867e 100644 --- a/lib/X11/CrWindow.c +++ b/lib/X11/CrWindow.c @@ -1,14 +1,13 @@ -/* $XConsortium: CrWindow.c,v 11.15 94/04/17 20:19:02 rws Exp $ */ +/* $Xorg: CrWindow.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/Cursor.c b/lib/X11/Cursor.c index a736c20a5..82242eeb8 100644 --- a/lib/X11/Cursor.c +++ b/lib/X11/Cursor.c @@ -1,9 +1,13 @@ -/* $Xorg: Cursor.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: Cursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Cursor.c,v 1.2 2000/01/29 18:58:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Cursor.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ diff --git a/lib/X11/DefCursor.c b/lib/X11/DefCursor.c index a4043f984..f8e479add 100644 --- a/lib/X11/DefCursor.c +++ b/lib/X11/DefCursor.c @@ -1,9 +1,13 @@ -/* $Xorg: DefCursor.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DefCursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DefCursor.c,v 1.2 1999/05/09 10:49:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DefCursor.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DelProp.c b/lib/X11/DelProp.c index 7c855f98b..4b2171aa7 100644 --- a/lib/X11/DelProp.c +++ b/lib/X11/DelProp.c @@ -1,9 +1,13 @@ -/* $Xorg: DelProp.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DelProp.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DelProp.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DelProp.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Depths.c b/lib/X11/Depths.c index 948bf6c92..34756e714 100644 --- a/lib/X11/Depths.c +++ b/lib/X11/Depths.c @@ -1,14 +1,13 @@ -/* $XConsortium: Depths.c,v 1.7 94/04/17 20:19:05 gildea Exp $ */ +/* $Xorg: Depths.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/DestSubs.c b/lib/X11/DestSubs.c index 52d7ccf40..465fc05d5 100644 --- a/lib/X11/DestSubs.c +++ b/lib/X11/DestSubs.c @@ -1,9 +1,13 @@ -/* $Xorg: DestSubs.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DestSubs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DestSubs.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DestSubs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DestWind.c b/lib/X11/DestWind.c index fa008c6e6..c218bc084 100644 --- a/lib/X11/DestWind.c +++ b/lib/X11/DestWind.c @@ -1,9 +1,13 @@ -/* $Xorg: DestWind.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DestWind.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DestWind.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DestWind.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DisName.c b/lib/X11/DisName.c index 989a5b13a..17ebf3562 100644 --- a/lib/X11/DisName.c +++ b/lib/X11/DisName.c @@ -1,16 +1,14 @@ -/* $XConsortium: DisName.c,v 11.7 94/04/17 20:19:06 gildea Exp $ */ +/* $Xorg: DisName.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1994 X Consortium +Copyright 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/DrArc.c b/lib/X11/DrArc.c index 0e574b3b9..8b416dd31 100644 --- a/lib/X11/DrArc.c +++ b/lib/X11/DrArc.c @@ -1,9 +1,13 @@ -/* $Xorg: DrArc.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DrArc.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrArc.c,v 1.2 1999/05/09 10:49:13 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrArc.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ /* Note to future maintainers: XDrawArc does NOT batch successive PolyArc requests into a single request like XDrawLine, XDrawPoint, etc. diff --git a/lib/X11/DrArcs.c b/lib/X11/DrArcs.c index 2dc11f593..f798b748b 100644 --- a/lib/X11/DrArcs.c +++ b/lib/X11/DrArcs.c @@ -1,9 +1,13 @@ -/* $Xorg: DrArcs.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DrArcs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrArcs.c,v 1.2 1999/05/09 10:49:13 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrArcs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DrLine.c b/lib/X11/DrLine.c index 77c3cff8f..8d9dca217 100644 --- a/lib/X11/DrLine.c +++ b/lib/X11/DrLine.c @@ -1,9 +1,13 @@ -/* $Xorg: DrLine.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DrLine.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrLine.c,v 1.2 1999/05/09 10:49:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrLine.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DrLines.c b/lib/X11/DrLines.c index 6461e228f..198aae5c0 100644 --- a/lib/X11/DrLines.c +++ b/lib/X11/DrLines.c @@ -1,9 +1,13 @@ -/* $Xorg: DrLines.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DrLines.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrLines.c,v 1.2 1999/05/09 10:49:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrLines.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DrPoint.c b/lib/X11/DrPoint.c index 4c6eac4bf..c07942e36 100644 --- a/lib/X11/DrPoint.c +++ b/lib/X11/DrPoint.c @@ -1,9 +1,13 @@ -/* $Xorg: DrPoint.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DrPoint.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrPoint.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrPoint.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DrPoints.c b/lib/X11/DrPoints.c index 4c8527ddd..33d3b7427 100644 --- a/lib/X11/DrPoints.c +++ b/lib/X11/DrPoints.c @@ -1,9 +1,13 @@ -/* $Xorg: DrPoints.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DrPoints.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrPoints.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrPoints.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DrRect.c b/lib/X11/DrRect.c index 7bb9e6352..2fa0e466d 100644 --- a/lib/X11/DrRect.c +++ b/lib/X11/DrRect.c @@ -1,9 +1,13 @@ -/* $Xorg: DrRect.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ +/* $Xorg: DrRect.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrRect.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrRect.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DrRects.c b/lib/X11/DrRects.c index c4ad06d43..ff674e934 100644 --- a/lib/X11/DrRects.c +++ b/lib/X11/DrRects.c @@ -1,9 +1,13 @@ -/* $Xorg: DrRects.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: DrRects.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrRects.c,v 1.2 1999/05/09 10:49:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrRects.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/DrSegs.c b/lib/X11/DrSegs.c index 4f3c1d756..dde949da4 100644 --- a/lib/X11/DrSegs.c +++ b/lib/X11/DrSegs.c @@ -1,9 +1,13 @@ -/* $Xorg: DrSegs.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: DrSegs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrSegs.c,v 1.2 1999/05/09 10:49:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrSegs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ErrDes.c b/lib/X11/ErrDes.c index cdfa26e65..978a04c13 100644 --- a/lib/X11/ErrDes.c +++ b/lib/X11/ErrDes.c @@ -1,12 +1,16 @@ /* - * $Xorg: ErrDes.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ + * $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/ErrDes.c,v 3.8 2001/01/17 19:41:34 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ErrDes.c,v 3.9 2001/07/25 15:04:43 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xos.h> diff --git a/lib/X11/ErrHndlr.c b/lib/X11/ErrHndlr.c index 17390aa7d..744f114cf 100644 --- a/lib/X11/ErrHndlr.c +++ b/lib/X11/ErrHndlr.c @@ -1,9 +1,13 @@ -/* $Xorg: ErrHndlr.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: ErrHndlr.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.3 1999/03/02 11:49:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.4 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/EvToWire.c b/lib/X11/EvToWire.c index 6b6c313e0..2a84c3225 100644 --- a/lib/X11/EvToWire.c +++ b/lib/X11/EvToWire.c @@ -1,10 +1,14 @@ -/* $Xorg: EvToWire.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: EvToWire.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/EvToWire.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +/* $XFree86: xc/lib/X11/EvToWire.c,v 1.4 2001/08/18 02:41:28 dawes Exp $ */ /* * XEvToWire.c - Internal support routines for the C subroutine diff --git a/lib/X11/FSSaver.c b/lib/X11/FSSaver.c index 286883c67..0699257a6 100644 --- a/lib/X11/FSSaver.c +++ b/lib/X11/FSSaver.c @@ -1,9 +1,13 @@ -/* $Xorg: FSSaver.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FSSaver.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FSSaver.c,v 1.2 1999/05/09 10:49:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FSSaver.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FSWrap.c b/lib/X11/FSWrap.c index a595e89e2..0add6a9e3 100644 --- a/lib/X11/FSWrap.c +++ b/lib/X11/FSWrap.c @@ -1,4 +1,4 @@ -/* $Xorg: FSWrap.c,v 1.4 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FSWrap.c,v 1.5 2001/02/09 02:03:32 xorgcvs Exp $ */ /* * Copyright 1991 by the Open Software Foundation @@ -32,7 +32,11 @@ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -52,7 +56,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/FSWrap.c,v 1.4 1999/05/09 10:49:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FSWrap.c,v 1.5 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/lib/X11/FetchName.c b/lib/X11/FetchName.c index 9049bc4f1..1317fa865 100644 --- a/lib/X11/FetchName.c +++ b/lib/X11/FetchName.c @@ -1,14 +1,13 @@ -/* $XConsortium: FetchName.c,v 11.26 94/04/17 20:19:17 gildea Exp $ */ +/* $Xorg: FetchName.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/FillArc.c b/lib/X11/FillArc.c index 6ff89327b..3866a891a 100644 --- a/lib/X11/FillArc.c +++ b/lib/X11/FillArc.c @@ -1,9 +1,13 @@ -/* $Xorg: FillArc.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FillArc.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillArc.c,v 1.2 1999/05/09 10:49:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillArc.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FillArcs.c b/lib/X11/FillArcs.c index 06615b0c1..c644f306e 100644 --- a/lib/X11/FillArcs.c +++ b/lib/X11/FillArcs.c @@ -1,9 +1,13 @@ -/* $Xorg: FillArcs.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FillArcs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillArcs.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillArcs.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FillPoly.c b/lib/X11/FillPoly.c index e7f7d0fab..a363247fd 100644 --- a/lib/X11/FillPoly.c +++ b/lib/X11/FillPoly.c @@ -1,9 +1,13 @@ -/* $Xorg: FillPoly.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FillPoly.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillPoly.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillPoly.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FillRct.c b/lib/X11/FillRct.c index 73f86d2f3..79da709f2 100644 --- a/lib/X11/FillRct.c +++ b/lib/X11/FillRct.c @@ -1,9 +1,13 @@ -/* $Xorg: FillRct.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FillRct.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillRct.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillRct.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FillRcts.c b/lib/X11/FillRcts.c index 936ff6bd4..017cd0c3f 100644 --- a/lib/X11/FillRcts.c +++ b/lib/X11/FillRcts.c @@ -1,9 +1,13 @@ -/* $Xorg: FillRcts.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FillRcts.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillRcts.c,v 1.2 1999/05/09 10:49:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillRcts.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FilterEv.c b/lib/X11/FilterEv.c index fe60625da..afc7b4442 100644 --- a/lib/X11/FilterEv.c +++ b/lib/X11/FilterEv.c @@ -1,4 +1,4 @@ -/* $Xorg: FilterEv.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FilterEv.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* * Copyright 1990, 1991 by OMRON Corporation @@ -30,7 +30,11 @@ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,7 +53,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/FilterEv.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/Flush.c b/lib/X11/Flush.c index 1fff25bbe..58eb4e6df 100644 --- a/lib/X11/Flush.c +++ b/lib/X11/Flush.c @@ -1,9 +1,13 @@ -/* $Xorg: Flush.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: Flush.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Flush.c,v 1.2 1999/05/09 10:49:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Flush.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Font.c b/lib/X11/Font.c index 0635da7aa..5ca7d72f7 100644 --- a/lib/X11/Font.c +++ b/lib/X11/Font.c @@ -1,15 +1,14 @@ -/* $Xorg: Font.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: Font.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group Copyright (c) 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 "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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -28,7 +27,7 @@ sale, use or other dealings in this Software without prior written authorization from the X Consortium and the XFree86 Project. */ -/* $XFree86: xc/lib/X11/Font.c,v 1.12 2001/01/17 19:41:35 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Font.c,v 1.14 2001/10/01 13:43:56 eich Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/FontInfo.c b/lib/X11/FontInfo.c index d86c4295a..0aab64e84 100644 --- a/lib/X11/FontInfo.c +++ b/lib/X11/FontInfo.c @@ -1,9 +1,13 @@ -/* $Xorg: FontInfo.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FontInfo.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FontInfo.c,v 1.4 2000/09/26 15:56:51 tsi Exp $ */ +/* $XFree86: xc/lib/X11/FontInfo.c,v 1.5 2001/01/17 19:41:35 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/FontNames.c b/lib/X11/FontNames.c index f74a20624..a923ceade 100644 --- a/lib/X11/FontNames.c +++ b/lib/X11/FontNames.c @@ -1,9 +1,13 @@ -/* $Xorg: FontNames.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FontNames.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FontNames.c,v 1.4 1999/05/09 10:49:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FontNames.c,v 1.5 2001/01/17 19:41:35 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/FreeCmap.c b/lib/X11/FreeCmap.c index f898ee466..b280afd3e 100644 --- a/lib/X11/FreeCmap.c +++ b/lib/X11/FreeCmap.c @@ -1,9 +1,13 @@ -/* $Xorg: FreeCmap.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FreeCmap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeCmap.c,v 1.2 1999/05/09 10:49:22 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeCmap.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FreeCols.c b/lib/X11/FreeCols.c index db92badb0..d9516bad6 100644 --- a/lib/X11/FreeCols.c +++ b/lib/X11/FreeCols.c @@ -1,9 +1,13 @@ -/* $Xorg: FreeCols.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FreeCols.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeCols.c,v 1.2 1999/05/09 10:49:22 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeCols.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FreeCurs.c b/lib/X11/FreeCurs.c index 38cfaf56c..8fff916a7 100644 --- a/lib/X11/FreeCurs.c +++ b/lib/X11/FreeCurs.c @@ -1,9 +1,13 @@ -/* $Xorg: FreeCurs.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FreeCurs.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeCurs.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeCurs.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FreeEData.c b/lib/X11/FreeEData.c index 9a04c2db6..d3555d548 100644 --- a/lib/X11/FreeEData.c +++ b/lib/X11/FreeEData.c @@ -1,9 +1,13 @@ -/* $Xorg: FreeEData.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FreeEData.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeEData.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeEData.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FreeGC.c b/lib/X11/FreeGC.c index f0b092249..96e61de3e 100644 --- a/lib/X11/FreeGC.c +++ b/lib/X11/FreeGC.c @@ -1,9 +1,13 @@ -/* $Xorg: FreeGC.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FreeGC.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeGC.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeGC.c,v 1.4 2001/08/18 02:41:28 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/FreePix.c b/lib/X11/FreePix.c index 610d49d75..40ad42f39 100644 --- a/lib/X11/FreePix.c +++ b/lib/X11/FreePix.c @@ -1,9 +1,13 @@ -/* $Xorg: FreePix.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: FreePix.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreePix.c,v 1.2 1999/05/09 10:49:24 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreePix.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/GCMisc.c b/lib/X11/GCMisc.c index 8c77107c7..62f4af00d 100644 --- a/lib/X11/GCMisc.c +++ b/lib/X11/GCMisc.c @@ -1,9 +1,13 @@ -/* $Xorg: GCMisc.c,v 1.3 2000/08/17 19:44:33 cpqbld Exp $ */ +/* $Xorg: GCMisc.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GCMisc.c,v 1.2 1999/05/09 10:49:24 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GCMisc.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Geom.c b/lib/X11/Geom.c index a77ab24a2..2699231d7 100644 --- a/lib/X11/Geom.c +++ b/lib/X11/Geom.c @@ -1,16 +1,14 @@ -/* $XConsortium: Geom.c,v 1.9 94/04/17 20:19:29 rws Exp $ */ +/* $Xorg: Geom.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1985 X Consortium +Copyright 1985, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/GetAtomNm.c b/lib/X11/GetAtomNm.c index 982a8cd4a..495fb4267 100644 --- a/lib/X11/GetAtomNm.c +++ b/lib/X11/GetAtomNm.c @@ -1,9 +1,13 @@ -/* $Xorg: GetAtomNm.c,v 1.4 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetAtomNm.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.3 2001/01/17 19:41:36 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.4 2001/08/18 02:41:28 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetColor.c b/lib/X11/GetColor.c index db81dbc05..01ad948a4 100644 --- a/lib/X11/GetColor.c +++ b/lib/X11/GetColor.c @@ -1,9 +1,13 @@ -/* $Xorg: GetColor.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetColor.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetColor.c,v 1.2 1999/05/09 10:49:25 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetColor.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES #include <stdio.h> diff --git a/lib/X11/GetDflt.c b/lib/X11/GetDflt.c index f56850d10..178c613b3 100644 --- a/lib/X11/GetDflt.c +++ b/lib/X11/GetDflt.c @@ -1,10 +1,14 @@ -/* $Xorg: GetDflt.c,v 1.5 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetDflt.c,v 1.6 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/GetDflt.c,v 3.17 2001/01/17 19:41:36 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetDflt.c,v 3.18 2001/07/25 15:04:43 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xos.h> diff --git a/lib/X11/GetFPath.c b/lib/X11/GetFPath.c index 494224c15..6db1602ef 100644 --- a/lib/X11/GetFPath.c +++ b/lib/X11/GetFPath.c @@ -1,9 +1,13 @@ -/* $Xorg: GetFPath.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetFPath.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetFPath.c,v 1.2 1999/05/09 10:49:26 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetFPath.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetFProp.c b/lib/X11/GetFProp.c index 5059ef105..f588c2f02 100644 --- a/lib/X11/GetFProp.c +++ b/lib/X11/GetFProp.c @@ -1,14 +1,13 @@ -/* $XConsortium: GetFProp.c,v 11.8 94/04/17 20:19:32 rws Exp $ */ +/* $Xorg: GetFProp.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GetGCVals.c b/lib/X11/GetGCVals.c index 7c2073050..e8875869b 100644 --- a/lib/X11/GetGCVals.c +++ b/lib/X11/GetGCVals.c @@ -1,15 +1,14 @@ -/* $XConsortium: GetGCVals.c,v 1.4 94/04/17 20:19:32 rws Exp $ */ +/* $Xorg: GetGCVals.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/X11/GetGeom.c b/lib/X11/GetGeom.c index 7a559d9e2..367153f4c 100644 --- a/lib/X11/GetGeom.c +++ b/lib/X11/GetGeom.c @@ -1,14 +1,13 @@ -/* $XConsortium: GetGeom.c,v 11.17 94/04/17 20:19:33 rws Exp $ */ +/* $Xorg: GetGeom.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GetHColor.c b/lib/X11/GetHColor.c index 9f4355fef..33e6ad590 100644 --- a/lib/X11/GetHColor.c +++ b/lib/X11/GetHColor.c @@ -1,14 +1,13 @@ -/* $XConsortium: GetHColor.c,v 11.12 94/04/17 20:19:34 rws Exp $ */ +/* $Xorg: GetHColor.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GetHints.c b/lib/X11/GetHints.c index ba635e7e5..d24527003 100644 --- a/lib/X11/GetHints.c +++ b/lib/X11/GetHints.c @@ -1,10 +1,14 @@ -/* $Xorg: GetHints.c,v 1.4 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetHints.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/GetHints.c,v 1.2 1999/05/09 10:49:26 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetHints.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xos.h> diff --git a/lib/X11/GetIFocus.c b/lib/X11/GetIFocus.c index 2c870683a..fe1e80f83 100644 --- a/lib/X11/GetIFocus.c +++ b/lib/X11/GetIFocus.c @@ -1,9 +1,13 @@ -/* $Xorg: GetIFocus.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetIFocus.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetIFocus.c,v 1.2 1999/05/09 10:49:27 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetIFocus.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetImage.c b/lib/X11/GetImage.c index d92f70f6b..eaf58bd93 100644 --- a/lib/X11/GetImage.c +++ b/lib/X11/GetImage.c @@ -1,9 +1,13 @@ -/* $Xorg: GetImage.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetImage.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetImage.c,v 1.2 1999/05/09 10:49:27 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetImage.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetKCnt.c b/lib/X11/GetKCnt.c index 278f6e652..525ea1b98 100644 --- a/lib/X11/GetKCnt.c +++ b/lib/X11/GetKCnt.c @@ -1,9 +1,13 @@ -/* $Xorg: GetKCnt.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetKCnt.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetKCnt.c,v 1.4 1999/05/09 10:49:27 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetKCnt.c,v 1.5 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetMoEv.c b/lib/X11/GetMoEv.c index 288e628ba..1bead38af 100644 --- a/lib/X11/GetMoEv.c +++ b/lib/X11/GetMoEv.c @@ -1,14 +1,13 @@ -/* $XConsortium: GetMoEv.c,v 11.21 94/04/17 20:19:37 rws Exp $ */ +/* $Xorg: GetMoEv.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GetNrmHint.c b/lib/X11/GetNrmHint.c index 426886111..741d15310 100644 --- a/lib/X11/GetNrmHint.c +++ b/lib/X11/GetNrmHint.c @@ -1,4 +1,4 @@ -/* $XConsortium: GetNrmHint.c,v 1.7 94/04/17 20:19:38 gildea Exp $ */ +/* $Xorg: GetNrmHint.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca, Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -25,15 +25,13 @@ PERFORMANCE OF THIS SOFTWARE. /* -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,15 +39,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/GetPCnt.c b/lib/X11/GetPCnt.c index 372493bf8..457dc9bc1 100644 --- a/lib/X11/GetPCnt.c +++ b/lib/X11/GetPCnt.c @@ -1,9 +1,13 @@ -/* $Xorg: GetPCnt.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetPCnt.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetPCnt.c,v 1.2 1999/05/09 10:49:28 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetPCnt.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetPntMap.c b/lib/X11/GetPntMap.c index 3d85cd818..9a46b33e6 100644 --- a/lib/X11/GetPntMap.c +++ b/lib/X11/GetPntMap.c @@ -1,9 +1,13 @@ -/* $Xorg: GetPntMap.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetPntMap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.4 2000/09/26 15:56:51 tsi Exp $ */ +/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.5 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetProp.c b/lib/X11/GetProp.c index 800c8e4ae..3323c7781 100644 --- a/lib/X11/GetProp.c +++ b/lib/X11/GetProp.c @@ -1,9 +1,13 @@ -/* $Xorg: GetProp.c,v 1.4 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetProp.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetProp.c,v 1.4 2001/01/17 19:41:37 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetProp.c,v 1.5 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetRGBCMap.c b/lib/X11/GetRGBCMap.c index 3a9ea09d2..bde36215b 100644 --- a/lib/X11/GetRGBCMap.c +++ b/lib/X11/GetRGBCMap.c @@ -1,16 +1,14 @@ -/* $XConsortium: GetRGBCMap.c,v 1.6 94/04/17 20:19:42 gildea Exp $ */ +/* $Xorg: GetRGBCMap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/GetSOwner.c b/lib/X11/GetSOwner.c index 32942543c..b9bacdfcb 100644 --- a/lib/X11/GetSOwner.c +++ b/lib/X11/GetSOwner.c @@ -1,14 +1,13 @@ -/* $XConsortium: GetSOwner.c,v 11.15 94/04/17 20:19:43 rws Exp $ */ +/* $Xorg: GetSOwner.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GetSSaver.c b/lib/X11/GetSSaver.c index 350b3dfe6..1dc004d92 100644 --- a/lib/X11/GetSSaver.c +++ b/lib/X11/GetSSaver.c @@ -1,9 +1,13 @@ -/* $Xorg: GetSSaver.c,v 1.3 2000/08/17 19:44:34 cpqbld Exp $ */ +/* $Xorg: GetSSaver.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetSSaver.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetSSaver.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/GetStCmap.c b/lib/X11/GetStCmap.c index 998bc1049..0674bcb85 100644 --- a/lib/X11/GetStCmap.c +++ b/lib/X11/GetStCmap.c @@ -1,15 +1,14 @@ -/* $XConsortium: GetStCmap.c,v 1.11 94/04/17 20:19:44 gildea Exp $ */ +/* $Xorg: GetStCmap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/X11/GetTxtProp.c b/lib/X11/GetTxtProp.c index 7d92b0404..bbd628516 100644 --- a/lib/X11/GetTxtProp.c +++ b/lib/X11/GetTxtProp.c @@ -1,4 +1,4 @@ -/* $XConsortium: GetTxtProp.c,v 1.7 94/04/17 20:19:44 gildea Exp $ */ +/* $Xorg: GetTxtProp.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca., @@ -23,15 +23,13 @@ SOFTWARE. ******************************************************************/ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,15 +37,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/GetWAttrs.c b/lib/X11/GetWAttrs.c index 5a11fe108..7856b6f05 100644 --- a/lib/X11/GetWAttrs.c +++ b/lib/X11/GetWAttrs.c @@ -1,14 +1,13 @@ -/* $XConsortium: GetWAttrs.c,v 11.26 94/04/17 20:19:45 rws Exp $ */ +/* $Xorg: GetWAttrs.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GetWMCMapW.c b/lib/X11/GetWMCMapW.c index 3ff8bf615..6c56a1364 100644 --- a/lib/X11/GetWMCMapW.c +++ b/lib/X11/GetWMCMapW.c @@ -1,15 +1,14 @@ -/* $XConsortium: GetWMCMapW.c,v 1.6 94/04/17 20:19:46 gildea Exp $ */ +/* $Xorg: GetWMCMapW.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/X11/GetWMProto.c b/lib/X11/GetWMProto.c index 8a220fddc..84e79b60f 100644 --- a/lib/X11/GetWMProto.c +++ b/lib/X11/GetWMProto.c @@ -1,15 +1,14 @@ -/* $XConsortium: GetWMProto.c,v 1.6 94/04/17 20:19:46 gildea Exp $ */ +/* $Xorg: GetWMProto.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/X11/GrButton.c b/lib/X11/GrButton.c index c7b18e919..af642e9af 100644 --- a/lib/X11/GrButton.c +++ b/lib/X11/GrButton.c @@ -1,9 +1,13 @@ -/* $Xorg: GrButton.c,v 1.3 2000/08/17 19:44:35 cpqbld Exp $ */ +/* $Xorg: GrButton.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GrButton.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GrButton.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/GrKey.c b/lib/X11/GrKey.c index 4c54fa7b3..a1d5973f2 100644 --- a/lib/X11/GrKey.c +++ b/lib/X11/GrKey.c @@ -1,9 +1,13 @@ -/* $Xorg: GrKey.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ +/* $Xorg: GrKey.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GrKey.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GrKey.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/GrKeybd.c b/lib/X11/GrKeybd.c index 5424eb675..3f43f7ae2 100644 --- a/lib/X11/GrKeybd.c +++ b/lib/X11/GrKeybd.c @@ -1,14 +1,13 @@ -/* $XConsortium: GrKeybd.c,v 11.17 94/04/17 20:19:48 rws Exp $ */ +/* $Xorg: GrKeybd.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GrPointer.c b/lib/X11/GrPointer.c index c56e6b8af..544337a91 100644 --- a/lib/X11/GrPointer.c +++ b/lib/X11/GrPointer.c @@ -1,14 +1,13 @@ -/* $XConsortium: GrPointer.c,v 11.18 94/04/17 20:19:49 rws Exp $ */ +/* $Xorg: GrPointer.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/GrServer.c b/lib/X11/GrServer.c index a1dc2bbc0..df8cf3f29 100644 --- a/lib/X11/GrServer.c +++ b/lib/X11/GrServer.c @@ -1,9 +1,13 @@ -/* $Xorg: GrServer.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ +/* $Xorg: GrServer.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GrServer.c,v 1.2 1999/05/09 10:49:30 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GrServer.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Host.c b/lib/X11/Host.c index 26762201c..b82878ef2 100644 --- a/lib/X11/Host.c +++ b/lib/X11/Host.c @@ -1,9 +1,13 @@ -/* $Xorg: Host.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */ +/* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Host.c,v 1.2 1999/05/09 10:49:33 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Host.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ /* this might be rightly reguarded an os dependent file */ diff --git a/lib/X11/ICWrap.c b/lib/X11/ICWrap.c index 24aede4e2..d4a87b447 100644 --- a/lib/X11/ICWrap.c +++ b/lib/X11/ICWrap.c @@ -1,5 +1,5 @@ /* - * $Xorg: ICWrap.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ + * $Xorg: ICWrap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* @@ -41,7 +41,11 @@ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -60,7 +64,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ICWrap.c,v 1.5 2001/07/25 15:04:43 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ICWrap.c,v 1.6 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/IMWrap.c b/lib/X11/IMWrap.c index 5f0d549cb..775b39b05 100644 --- a/lib/X11/IMWrap.c +++ b/lib/X11/IMWrap.c @@ -33,7 +33,11 @@ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -53,7 +57,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/IMWrap.c,v 3.6 1998/12/20 11:56:55 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IMWrap.c,v 3.7 2001/01/17 19:41:37 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/lib/X11/Iconify.c b/lib/X11/Iconify.c index 35dc5c999..b67b66027 100644 --- a/lib/X11/Iconify.c +++ b/lib/X11/Iconify.c @@ -1,4 +1,4 @@ -/* $XConsortium: Iconify.c,v 1.8 94/04/17 20:19:56 gildea Exp $ */ +/* $Xorg: Iconify.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca. @@ -24,15 +24,13 @@ SOFTWARE. ******************************************************************/ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,15 +38,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/IfEvent.c b/lib/X11/IfEvent.c index 6bbcf3b2f..4313e8187 100644 --- a/lib/X11/IfEvent.c +++ b/lib/X11/IfEvent.c @@ -1,9 +1,13 @@ -/* $Xorg: IfEvent.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: IfEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/IfEvent.c,v 1.2 1999/05/09 10:49:35 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IfEvent.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/ImText.c b/lib/X11/ImText.c index 20431bfb3..af5663372 100644 --- a/lib/X11/ImText.c +++ b/lib/X11/ImText.c @@ -1,9 +1,13 @@ -/* $Xorg: ImText.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: ImText.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ImText.c,v 1.2 1999/05/09 10:49:36 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImText.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/ImText16.c b/lib/X11/ImText16.c index 34e2f3c0a..4df8bb057 100644 --- a/lib/X11/ImText16.c +++ b/lib/X11/ImText16.c @@ -1,9 +1,13 @@ -/* $Xorg: ImText16.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: ImText16.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ImText16.c,v 1.2 1999/05/09 10:49:36 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImText16.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/ImUtil.c b/lib/X11/ImUtil.c index f45a58dea..e4c19adab 100644 --- a/lib/X11/ImUtil.c +++ b/lib/X11/ImUtil.c @@ -1,9 +1,13 @@ -/* $Xorg: ImUtil.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: ImUtil.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ImUtil.c,v 3.8 2001/07/25 15:04:43 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImUtil.c,v 3.9 2001/08/09 19:14:06 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xutil.h> diff --git a/lib/X11/InitExt.c b/lib/X11/InitExt.c index e69336046..fe11594a2 100644 --- a/lib/X11/InitExt.c +++ b/lib/X11/InitExt.c @@ -1,9 +1,13 @@ -/* $Xorg: InitExt.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: InitExt.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/InitExt.c,v 1.5 2001/01/17 19:41:38 dawes Exp $ */ +/* $XFree86: xc/lib/X11/InitExt.c,v 1.6 2001/08/18 02:41:28 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xos.h> diff --git a/lib/X11/InsCmap.c b/lib/X11/InsCmap.c index 5bd38d812..df0dc9f7f 100644 --- a/lib/X11/InsCmap.c +++ b/lib/X11/InsCmap.c @@ -1,9 +1,13 @@ -/* $Xorg: InsCmap.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: InsCmap.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/InsCmap.c,v 1.2 1999/05/09 10:49:37 dawes Exp $ */ +/* $XFree86: xc/lib/X11/InsCmap.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/IntAtom.c b/lib/X11/IntAtom.c index 4b604a488..029122d68 100644 --- a/lib/X11/IntAtom.c +++ b/lib/X11/IntAtom.c @@ -1,9 +1,13 @@ -/* $Xorg: IntAtom.c,v 1.4 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: IntAtom.c,v 1.5 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/IntAtom.c,v 1.4 2001/08/18 02:41:28 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IntAtom.c,v 1.5 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/KeyBind.c b/lib/X11/KeyBind.c index 3cbf7f534..979b11942 100644 --- a/lib/X11/KeyBind.c +++ b/lib/X11/KeyBind.c @@ -1,9 +1,13 @@ -/* $Xorg: KeyBind.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ +/* $Xorg: KeyBind.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/KeyBind.c,v 1.3 2000/01/31 14:40:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/KeyBind.c,v 1.4 2001/01/17 19:41:38 dawes Exp $ */ /* Beware, here be monsters (still under construction... - JG */ diff --git a/lib/X11/KeysymStr.c b/lib/X11/KeysymStr.c index b076dc63b..b1527fccd 100644 --- a/lib/X11/KeysymStr.c +++ b/lib/X11/KeysymStr.c @@ -1,10 +1,14 @@ -/* $Xorg: KeysymStr.c,v 1.4 2000/08/17 19:44:39 cpqbld Exp $ */ +/* $Xorg: KeysymStr.c,v 1.5 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.6 2001/01/17 19:41:38 dawes Exp $ */ +/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.7 2001/07/25 15:04:44 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xresource.h> diff --git a/lib/X11/KillCl.c b/lib/X11/KillCl.c index d03e3c217..6f05057c9 100644 --- a/lib/X11/KillCl.c +++ b/lib/X11/KillCl.c @@ -1,9 +1,13 @@ -/* $Xorg: KillCl.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */ +/* $Xorg: KillCl.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/KillCl.c,v 1.2 1999/05/09 10:49:39 dawes Exp $ */ +/* $XFree86: xc/lib/X11/KillCl.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/LiHosts.c b/lib/X11/LiHosts.c index 188c40003..2f22d71de 100644 --- a/lib/X11/LiHosts.c +++ b/lib/X11/LiHosts.c @@ -1,9 +1,13 @@ -/* $Xorg: LiHosts.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ +/* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/X11/LiICmaps.c b/lib/X11/LiICmaps.c index 9dee35e36..93a450257 100644 --- a/lib/X11/LiICmaps.c +++ b/lib/X11/LiICmaps.c @@ -1,9 +1,13 @@ -/* $Xorg: LiICmaps.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ +/* $Xorg: LiICmaps.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LiICmaps.c,v 1.2 2000/09/26 15:56:51 tsi Exp $ */ +/* $XFree86: xc/lib/X11/LiICmaps.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/LiProps.c b/lib/X11/LiProps.c index 4d145148c..346b8cac4 100644 --- a/lib/X11/LiProps.c +++ b/lib/X11/LiProps.c @@ -1,9 +1,13 @@ -/* $Xorg: LiProps.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ +/* $Xorg: LiProps.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LiProps.c,v 1.2 2000/09/26 15:56:51 tsi Exp $ */ +/* $XFree86: xc/lib/X11/LiProps.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/ListExt.c b/lib/X11/ListExt.c index 0e1909fa2..e0a35c20b 100644 --- a/lib/X11/ListExt.c +++ b/lib/X11/ListExt.c @@ -1,9 +1,13 @@ -/* $Xorg: ListExt.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ +/* $Xorg: ListExt.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ListExt.c,v 1.2 1999/05/09 10:49:43 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ListExt.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/LoadFont.c b/lib/X11/LoadFont.c index fed23767a..942420e85 100644 --- a/lib/X11/LoadFont.c +++ b/lib/X11/LoadFont.c @@ -1,9 +1,13 @@ -/* $Xorg: LoadFont.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ +/* $Xorg: LoadFont.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/LoadFont.c,v 1.3 2001/10/28 03:32:30 tsi Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/LockDis.c b/lib/X11/LockDis.c index 376542f2e..917667911 100644 --- a/lib/X11/LockDis.c +++ b/lib/X11/LockDis.c @@ -1,15 +1,14 @@ -/* $XConsortium: LockDis.c,v 1.10 94/04/17 20:20:09 gildea Exp $ */ +/* $Xorg: LockDis.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/X11/LookupCol.c b/lib/X11/LookupCol.c index b957c48aa..7b561bbf4 100644 --- a/lib/X11/LookupCol.c +++ b/lib/X11/LookupCol.c @@ -1,9 +1,13 @@ -/* $Xorg: LookupCol.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ +/* $Xorg: LookupCol.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LookupCol.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LookupCol.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #define NEED_REPLIES #include <stdio.h> diff --git a/lib/X11/LowerWin.c b/lib/X11/LowerWin.c index 8eafeafb9..1a639debd 100644 --- a/lib/X11/LowerWin.c +++ b/lib/X11/LowerWin.c @@ -1,9 +1,13 @@ -/* $Xorg: LowerWin.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ +/* $Xorg: LowerWin.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LowerWin.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LowerWin.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Macros.c b/lib/X11/Macros.c index ac06901e8..db83f9cd8 100644 --- a/lib/X11/Macros.c +++ b/lib/X11/Macros.c @@ -1,9 +1,13 @@ -/* $Xorg: Macros.c,v 1.3 2000/08/17 19:44:45 cpqbld Exp $ */ +/* $Xorg: Macros.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Macros.c,v 1.2 1999/05/09 10:49:47 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Macros.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #include "Xlibint.h" /* diff --git a/lib/X11/MapRaised.c b/lib/X11/MapRaised.c index 8012278b4..fc98179da 100644 --- a/lib/X11/MapRaised.c +++ b/lib/X11/MapRaised.c @@ -1,9 +1,13 @@ -/* $Xorg: MapRaised.c,v 1.3 2000/08/17 19:44:46 cpqbld Exp $ */ +/* $Xorg: MapRaised.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MapRaised.c,v 1.2 1999/05/09 10:49:48 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MapRaised.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/MapSubs.c b/lib/X11/MapSubs.c index 89fb83f1a..8c07b7d57 100644 --- a/lib/X11/MapSubs.c +++ b/lib/X11/MapSubs.c @@ -1,9 +1,13 @@ -/* $Xorg: MapSubs.c,v 1.3 2000/08/17 19:44:46 cpqbld Exp $ */ +/* $Xorg: MapSubs.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MapSubs.c,v 1.2 1999/05/09 10:49:48 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MapSubs.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/MapWindow.c b/lib/X11/MapWindow.c index a78c874a8..5258fd910 100644 --- a/lib/X11/MapWindow.c +++ b/lib/X11/MapWindow.c @@ -1,9 +1,13 @@ -/* $Xorg: MapWindow.c,v 1.3 2000/08/17 19:44:46 cpqbld Exp $ */ +/* $Xorg: MapWindow.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MapWindow.c,v 1.2 1999/05/09 10:49:49 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MapWindow.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/MaskEvent.c b/lib/X11/MaskEvent.c index 330294f21..94db3ae28 100644 --- a/lib/X11/MaskEvent.c +++ b/lib/X11/MaskEvent.c @@ -1,9 +1,13 @@ -/* $Xorg: MaskEvent.c,v 1.3 2000/08/17 19:44:46 cpqbld Exp $ */ +/* $Xorg: MaskEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MaskEvent.c,v 3.4 2001/07/25 15:04:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MaskEvent.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/Misc.c b/lib/X11/Misc.c index cfd8c8a25..bd017badf 100644 --- a/lib/X11/Misc.c +++ b/lib/X11/Misc.c @@ -1,9 +1,13 @@ -/* $Xorg: Misc.c,v 1.3 2000/08/17 19:44:46 cpqbld Exp $ */ +/* $Xorg: Misc.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Misc.c,v 1.2 1999/05/09 10:49:49 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Misc.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ModMap.c b/lib/X11/ModMap.c index a6d263eaa..988ad705d 100644 --- a/lib/X11/ModMap.c +++ b/lib/X11/ModMap.c @@ -1,9 +1,13 @@ -/* $Xorg: ModMap.c,v 1.3 2000/08/17 19:44:46 cpqbld Exp $ */ +/* $Xorg: ModMap.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ModMap.c,v 1.2 1999/05/09 10:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ModMap.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/MoveWin.c b/lib/X11/MoveWin.c index 496dbe7cd..c693065b5 100644 --- a/lib/X11/MoveWin.c +++ b/lib/X11/MoveWin.c @@ -1,9 +1,13 @@ -/* $Xorg: MoveWin.c,v 1.3 2000/08/17 19:44:46 cpqbld Exp $ */ +/* $Xorg: MoveWin.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MoveWin.c,v 1.2 1999/05/09 10:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MoveWin.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/NextEvent.c b/lib/X11/NextEvent.c index 5915a0607..82805b57c 100644 --- a/lib/X11/NextEvent.c +++ b/lib/X11/NextEvent.c @@ -1,9 +1,13 @@ -/* $Xorg: NextEvent.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */ +/* $Xorg: NextEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/NextEvent.c,v 1.2 1999/05/09 10:49:51 dawes Exp $ */ +/* $XFree86: xc/lib/X11/NextEvent.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/OpenDis.c b/lib/X11/OpenDis.c index 754d9538c..5d01e6240 100644 --- a/lib/X11/OpenDis.c +++ b/lib/X11/OpenDis.c @@ -1,9 +1,13 @@ -/* $Xorg: OpenDis.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */ +/* $Xorg: OpenDis.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/OpenDis.c,v 3.10 2001/07/25 15:04:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/OpenDis.c,v 3.11 2001/08/18 02:41:28 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/lib/X11/ParseCmd.c b/lib/X11/ParseCmd.c index ff05c0f2f..330cb426d 100644 --- a/lib/X11/ParseCmd.c +++ b/lib/X11/ParseCmd.c @@ -1,10 +1,14 @@ -/* $Xorg: ParseCmd.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */ +/* $Xorg: ParseCmd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.4 2001/10/28 03:32:30 tsi Exp $ */ /* XrmParseCommand() diff --git a/lib/X11/ParseCol.c b/lib/X11/ParseCol.c index efff66a11..e2be81792 100644 --- a/lib/X11/ParseCol.c +++ b/lib/X11/ParseCol.c @@ -1,9 +1,13 @@ -/* $Xorg: ParseCol.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */ +/* $Xorg: ParseCol.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ParseCol.c,v 1.2 1999/05/09 10:49:52 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ParseCol.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ #define NEED_REPLIES #include <stdio.h> diff --git a/lib/X11/ParseGeom.c b/lib/X11/ParseGeom.c index 03434b3f0..49495c13f 100644 --- a/lib/X11/ParseGeom.c +++ b/lib/X11/ParseGeom.c @@ -1,10 +1,14 @@ -/* $Xorg: ParseGeom.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */ +/* $Xorg: ParseGeom.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/ParseGeom.c,v 1.2 2001/10/28 03:32:30 tsi Exp $ */ #include "Xlibint.h" #include "Xutil.h" diff --git a/lib/X11/PeekEvent.c b/lib/X11/PeekEvent.c index cd8d1e596..4e2a61df7 100644 --- a/lib/X11/PeekEvent.c +++ b/lib/X11/PeekEvent.c @@ -1,9 +1,13 @@ -/* $Xorg: PeekEvent.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */ +/* $Xorg: PeekEvent.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PeekEvent.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PeekEvent.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/PeekIfEv.c b/lib/X11/PeekIfEv.c index 167b29296..72fb7586c 100644 --- a/lib/X11/PeekIfEv.c +++ b/lib/X11/PeekIfEv.c @@ -1,9 +1,13 @@ -/* $Xorg: PeekIfEv.c,v 1.3 2000/08/17 19:44:48 cpqbld Exp $ */ +/* $Xorg: PeekIfEv.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/Pending.c b/lib/X11/Pending.c index 0c4029de5..55e5e71ba 100644 --- a/lib/X11/Pending.c +++ b/lib/X11/Pending.c @@ -1,14 +1,13 @@ -/* $XConsortium: Pending.c,v 11.15 94/04/17 20:20:25 rws Exp $ */ +/* $Xorg: Pending.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/PixFormats.c b/lib/X11/PixFormats.c index bd4717009..a8b74b1ef 100644 --- a/lib/X11/PixFormats.c +++ b/lib/X11/PixFormats.c @@ -1,14 +1,13 @@ -/* $XConsortium: PixFormats.c,v 1.6 94/04/17 20:20:26 gildea Exp $ */ +/* $Xorg: PixFormats.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/PmapBgnd.c b/lib/X11/PmapBgnd.c index 7f703880a..189319494 100644 --- a/lib/X11/PmapBgnd.c +++ b/lib/X11/PmapBgnd.c @@ -1,9 +1,13 @@ -/* $Xorg: PmapBgnd.c,v 1.3 2000/08/17 19:44:48 cpqbld Exp $ */ +/* $Xorg: PmapBgnd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/PmapBord.c b/lib/X11/PmapBord.c index 8473fcecd..cd5fc6c94 100644 --- a/lib/X11/PmapBord.c +++ b/lib/X11/PmapBord.c @@ -1,9 +1,13 @@ -/* $Xorg: PmapBord.c,v 1.3 2000/08/17 19:44:48 cpqbld Exp $ */ +/* $Xorg: PmapBord.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PmapBord.c,v 1.2 1999/05/09 10:49:54 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PmapBord.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/PolyReg.c b/lib/X11/PolyReg.c index a6b6f2ac7..7d6e50175 100644 --- a/lib/X11/PolyReg.c +++ b/lib/X11/PolyReg.c @@ -1,9 +1,13 @@ -/* $Xorg: PolyReg.c,v 1.4 2000/08/17 19:44:48 cpqbld Exp $ */ +/* $Xorg: PolyReg.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /************************************************************************ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************/ -/* $XFree86: xc/lib/X11/PolyReg.c,v 1.4 1998/10/03 08:41:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyReg.c,v 1.5 2001/01/17 19:41:41 dawes Exp $ */ #define LARGE_COORDINATE 1000000 #define SMALL_COORDINATE -LARGE_COORDINATE diff --git a/lib/X11/PolyTxt.c b/lib/X11/PolyTxt.c index c52ffd0d1..bd8852665 100644 --- a/lib/X11/PolyTxt.c +++ b/lib/X11/PolyTxt.c @@ -1,9 +1,13 @@ -/* $Xorg: PolyTxt.c,v 1.3 2000/08/17 19:44:48 cpqbld Exp $ */ +/* $Xorg: PolyTxt.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.4 2001/01/17 19:41:41 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/PolyTxt16.c b/lib/X11/PolyTxt16.c index 0b7cf0725..c7dce5093 100644 --- a/lib/X11/PolyTxt16.c +++ b/lib/X11/PolyTxt16.c @@ -1,9 +1,13 @@ -/* $Xorg: PolyTxt16.c,v 1.3 2000/08/17 19:44:48 cpqbld Exp $ */ +/* $Xorg: PolyTxt16.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.4 2001/10/28 03:32:31 tsi Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/PropAlloc.c b/lib/X11/PropAlloc.c index 5f992c8b5..96c92bbf6 100644 --- a/lib/X11/PropAlloc.c +++ b/lib/X11/PropAlloc.c @@ -1,9 +1,13 @@ -/* $Xorg: PropAlloc.c,v 1.4 2000/08/17 19:44:48 cpqbld Exp $ */ +/* $Xorg: PropAlloc.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PropAlloc.c,v 1.2 1999/05/09 10:49:55 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PropAlloc.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ #include "Xlibint.h" #include "Xutil.h" diff --git a/lib/X11/PutBEvent.c b/lib/X11/PutBEvent.c index a3d39b8f9..2260359f6 100644 --- a/lib/X11/PutBEvent.c +++ b/lib/X11/PutBEvent.c @@ -1,9 +1,13 @@ -/* $Xorg: PutBEvent.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */ +/* $Xorg: PutBEvent.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.2 1999/05/09 10:49:55 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ /* XPutBackEvent puts an event back at the head of the queue. */ #define NEED_EVENTS diff --git a/lib/X11/PutImage.c b/lib/X11/PutImage.c index c2e1137e6..9a8ada578 100644 --- a/lib/X11/PutImage.c +++ b/lib/X11/PutImage.c @@ -1,9 +1,13 @@ -/* $Xorg: PutImage.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */ +/* $Xorg: PutImage.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PutImage.c,v 3.7 2001/07/25 15:04:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PutImage.c,v 3.8 2001/10/28 03:32:31 tsi Exp $ */ #include "Xlibint.h" #include "Xutil.h" diff --git a/lib/X11/QuBest.c b/lib/X11/QuBest.c index 4ae67114c..ac857af40 100644 --- a/lib/X11/QuBest.c +++ b/lib/X11/QuBest.c @@ -1,14 +1,13 @@ -/* $XConsortium: QuBest.c,v 1.9 94/04/17 20:20:33 rws Exp $ */ +/* $Xorg: QuBest.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/QuColor.c b/lib/X11/QuColor.c index 7ffcbd634..d7da47e84 100644 --- a/lib/X11/QuColor.c +++ b/lib/X11/QuColor.c @@ -1,9 +1,13 @@ -/* $Xorg: QuColor.c,v 1.3 2000/08/17 19:44:50 cpqbld Exp $ */ +/* $Xorg: QuColor.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuColor.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuColor.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/QuColors.c b/lib/X11/QuColors.c index 0619296e8..1603a56f5 100644 --- a/lib/X11/QuColors.c +++ b/lib/X11/QuColors.c @@ -1,9 +1,13 @@ -/* $Xorg: QuColors.c,v 1.4 2000/08/17 19:44:50 cpqbld Exp $ */ +/* $Xorg: QuColors.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuColors.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuColors.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/QuCurShp.c b/lib/X11/QuCurShp.c index e0b08700f..3dd42be14 100644 --- a/lib/X11/QuCurShp.c +++ b/lib/X11/QuCurShp.c @@ -1,14 +1,13 @@ -/* $XConsortium: QuCurShp.c,v 11.12 94/04/17 20:20:35 rws Exp $ */ +/* $Xorg: QuCurShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/QuExt.c b/lib/X11/QuExt.c index d36e55a6a..5d49da077 100644 --- a/lib/X11/QuExt.c +++ b/lib/X11/QuExt.c @@ -1,14 +1,13 @@ -/* $XConsortium: QuExt.c,v 11.19 94/04/17 20:20:36 rws Exp $ */ +/* $Xorg: QuExt.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/QuKeybd.c b/lib/X11/QuKeybd.c index a002207e2..4a7b8fba3 100644 --- a/lib/X11/QuKeybd.c +++ b/lib/X11/QuKeybd.c @@ -1,9 +1,13 @@ -/* $Xorg: QuKeybd.c,v 1.3 2000/08/17 19:44:50 cpqbld Exp $ */ +/* $Xorg: QuKeybd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuKeybd.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuKeybd.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/QuPntr.c b/lib/X11/QuPntr.c index b0ef87bb1..d0b04c1b6 100644 --- a/lib/X11/QuPntr.c +++ b/lib/X11/QuPntr.c @@ -1,14 +1,13 @@ -/* $XConsortium: QuPntr.c,v 11.16 94/04/17 20:20:37 rws Exp $ */ +/* $Xorg: QuPntr.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/QuStipShp.c b/lib/X11/QuStipShp.c index 68c309075..81996fc4f 100644 --- a/lib/X11/QuStipShp.c +++ b/lib/X11/QuStipShp.c @@ -1,14 +1,13 @@ -/* $XConsortium: QuStipShp.c,v 11.12 94/04/17 20:20:37 rws Exp $ */ +/* $Xorg: QuStipShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/QuTextE16.c b/lib/X11/QuTextE16.c index d2828c425..c64de9261 100644 --- a/lib/X11/QuTextE16.c +++ b/lib/X11/QuTextE16.c @@ -1,9 +1,13 @@ -/* $Xorg: QuTextE16.c,v 1.4 2000/08/17 19:44:51 cpqbld Exp $ */ +/* $Xorg: QuTextE16.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuTextE16.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuTextE16.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/QuTextExt.c b/lib/X11/QuTextExt.c index edafbcd4e..ab90e2ae6 100644 --- a/lib/X11/QuTextExt.c +++ b/lib/X11/QuTextExt.c @@ -1,9 +1,13 @@ -/* $Xorg: QuTextExt.c,v 1.4 2000/08/17 19:44:51 cpqbld Exp $ */ +/* $Xorg: QuTextExt.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuTextExt.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuTextExt.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/QuTileShp.c b/lib/X11/QuTileShp.c index aa3d33715..1c15d17ba 100644 --- a/lib/X11/QuTileShp.c +++ b/lib/X11/QuTileShp.c @@ -1,14 +1,13 @@ -/* $XConsortium: QuTileShp.c,v 11.12 94/04/17 20:20:39 rws Exp $ */ +/* $Xorg: QuTileShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/QuTree.c b/lib/X11/QuTree.c index 3461c6ca0..bb7307a11 100644 --- a/lib/X11/QuTree.c +++ b/lib/X11/QuTree.c @@ -1,9 +1,13 @@ -/* $Xorg: QuTree.c,v 1.3 2000/08/17 19:44:51 cpqbld Exp $ */ +/* $Xorg: QuTree.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuTree.c,v 1.4 2000/09/26 15:56:51 tsi Exp $ */ +/* $XFree86: xc/lib/X11/QuTree.c,v 1.5 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/X11/Quarks.c b/lib/X11/Quarks.c index a2c032a18..5bd9e52cc 100644 --- a/lib/X11/Quarks.c +++ b/lib/X11/Quarks.c @@ -1,4 +1,4 @@ -/* $Xorg: Quarks.c,v 1.4 2000/08/17 19:44:51 cpqbld Exp $ */ +/* $Xorg: Quarks.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard, @@ -26,7 +26,11 @@ SOFTWARE. Copyright 1987, 1988, 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Quarks.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Quarks.c,v 1.4 2001/10/28 03:32:31 tsi Exp $ */ #include "Xlibint.h" #include <X11/Xresource.h> diff --git a/lib/X11/RaiseWin.c b/lib/X11/RaiseWin.c index 08d4c1eef..a11aed8bb 100644 --- a/lib/X11/RaiseWin.c +++ b/lib/X11/RaiseWin.c @@ -1,9 +1,13 @@ -/* $Xorg: RaiseWin.c,v 1.3 2000/08/17 19:44:51 cpqbld Exp $ */ +/* $Xorg: RaiseWin.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RaiseWin.c,v 1.2 1999/05/09 10:49:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RaiseWin.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/RdBitF.c b/lib/X11/RdBitF.c index 8fe61b5fa..45651dd76 100644 --- a/lib/X11/RdBitF.c +++ b/lib/X11/RdBitF.c @@ -1,9 +1,13 @@ -/* $Xorg: RdBitF.c,v 1.4 2000/08/17 19:44:51 cpqbld Exp $ */ +/* $Xorg: RdBitF.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RdBitF.c,v 3.2 1999/05/09 10:50:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RdBitF.c,v 3.3 2001/01/17 19:41:42 dawes Exp $ */ /* * Code to read bitmaps from disk files. Interprets diff --git a/lib/X11/RecolorC.c b/lib/X11/RecolorC.c index bc3b22f9f..3066d1ad6 100644 --- a/lib/X11/RecolorC.c +++ b/lib/X11/RecolorC.c @@ -1,9 +1,13 @@ -/* $Xorg: RecolorC.c,v 1.3 2000/08/17 19:44:51 cpqbld Exp $ */ +/* $Xorg: RecolorC.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RecolorC.c,v 1.2 1999/05/09 10:50:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RecolorC.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ReconfWM.c b/lib/X11/ReconfWM.c index b82031b03..c1a6cfb6e 100644 --- a/lib/X11/ReconfWM.c +++ b/lib/X11/ReconfWM.c @@ -1,15 +1,13 @@ -/* $XConsortium: ReconfWM.c,v 1.9 94/04/17 20:20:45 rws Exp $ */ +/* $Xorg: ReconfWM.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/ReconfWin.c b/lib/X11/ReconfWin.c index 4c88cf97d..ef536ff31 100644 --- a/lib/X11/ReconfWin.c +++ b/lib/X11/ReconfWin.c @@ -1,9 +1,13 @@ -/* $Xorg: ReconfWin.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: ReconfWin.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ReconfWin.c,v 1.2 1999/05/09 10:50:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ReconfWin.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Region.c b/lib/X11/Region.c index f17e63a47..fdeac2130 100644 --- a/lib/X11/Region.c +++ b/lib/X11/Region.c @@ -1,9 +1,13 @@ -/* $Xorg: Region.c,v 1.5 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: Region.c,v 1.6 2001/02/09 02:03:35 xorgcvs Exp $ */ /************************************************************************ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************/ -/* $XFree86: xc/lib/X11/Region.c,v 1.6 2001/01/17 19:41:42 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Region.c,v 1.7 2001/10/28 03:32:32 tsi Exp $ */ /* * The functions in this file implement the Region abstraction, similar to one * used in the X11 sample server. A Region is simply an area, as the name diff --git a/lib/X11/RegstFlt.c b/lib/X11/RegstFlt.c index 9452c4b5e..c3186bf23 100644 --- a/lib/X11/RegstFlt.c +++ b/lib/X11/RegstFlt.c @@ -1,4 +1,4 @@ -/* $Xorg: RegstFlt.c,v 1.4 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: RegstFlt.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* * Copyright 1990, 1991 by OMRON Corporation @@ -29,7 +29,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -48,7 +52,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.2 1999/05/09 10:50:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/lib/X11/RepWindow.c b/lib/X11/RepWindow.c index 19e54e406..2193220dc 100644 --- a/lib/X11/RepWindow.c +++ b/lib/X11/RepWindow.c @@ -1,9 +1,13 @@ -/* $Xorg: RepWindow.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: RepWindow.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RepWindow.c,v 1.2 1999/05/09 10:50:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RepWindow.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/RestackWs.c b/lib/X11/RestackWs.c index 018b9f221..8060f17af 100644 --- a/lib/X11/RestackWs.c +++ b/lib/X11/RestackWs.c @@ -1,9 +1,13 @@ -/* $Xorg: RestackWs.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: RestackWs.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RestackWs.c,v 1.2 1999/05/09 10:50:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RestackWs.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/RotProp.c b/lib/X11/RotProp.c index 1c4a1de11..4020606f7 100644 --- a/lib/X11/RotProp.c +++ b/lib/X11/RotProp.c @@ -1,9 +1,13 @@ -/* $Xorg: RotProp.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: RotProp.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RotProp.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RotProp.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/ScrResStr.c b/lib/X11/ScrResStr.c index cbcef1c80..bd9968716 100644 --- a/lib/X11/ScrResStr.c +++ b/lib/X11/ScrResStr.c @@ -1,14 +1,13 @@ -/* $XConsortium: ScrResStr.c,v 1.3 94/04/17 20:20:50 rws Exp $ */ +/* $Xorg: ScrResStr.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* -Copyright (c) 1991 X Consortium +Copyright 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/SelInput.c b/lib/X11/SelInput.c index dc184a49f..5a8870e4e 100644 --- a/lib/X11/SelInput.c +++ b/lib/X11/SelInput.c @@ -1,9 +1,13 @@ -/* $Xorg: SelInput.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: SelInput.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SelInput.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SelInput.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SendEvent.c b/lib/X11/SendEvent.c index 8c38c6994..4f20b9d89 100644 --- a/lib/X11/SendEvent.c +++ b/lib/X11/SendEvent.c @@ -1,9 +1,13 @@ -/* $Xorg: SendEvent.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: SendEvent.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/SendEvent.c,v 1.3 2001/08/18 11:55:48 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/SetBack.c b/lib/X11/SetBack.c index 572264d6a..6c207f7d0 100644 --- a/lib/X11/SetBack.c +++ b/lib/X11/SetBack.c @@ -1,9 +1,13 @@ -/* $Xorg: SetBack.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ +/* $Xorg: SetBack.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetBack.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetBack.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetCRects.c b/lib/X11/SetCRects.c index 20d91596e..45ed6e4dd 100644 --- a/lib/X11/SetCRects.c +++ b/lib/X11/SetCRects.c @@ -1,9 +1,13 @@ -/* $Xorg: SetCRects.c,v 1.3 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetCRects.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetCRects.c,v 1.2 1999/05/09 10:50:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetCRects.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetClMask.c b/lib/X11/SetClMask.c index 15efd134e..2503aef55 100644 --- a/lib/X11/SetClMask.c +++ b/lib/X11/SetClMask.c @@ -1,9 +1,13 @@ -/* $Xorg: SetClMask.c,v 1.3 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetClMask.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetClMask.c,v 1.2 1999/05/09 10:50:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetClMask.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetClOrig.c b/lib/X11/SetClOrig.c index b601ae193..659c9a8a3 100644 --- a/lib/X11/SetClOrig.c +++ b/lib/X11/SetClOrig.c @@ -1,9 +1,13 @@ -/* $Xorg: SetClOrig.c,v 1.3 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetClOrig.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetClOrig.c,v 1.2 1999/05/09 10:50:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetClOrig.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetDashes.c b/lib/X11/SetDashes.c index a938d0e68..90e7e4374 100644 --- a/lib/X11/SetDashes.c +++ b/lib/X11/SetDashes.c @@ -1,9 +1,13 @@ -/* $Xorg: SetDashes.c,v 1.3 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetDashes.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetDashes.c,v 1.2 1999/05/09 10:50:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetDashes.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetFPath.c b/lib/X11/SetFPath.c index fddf5f437..09441df04 100644 --- a/lib/X11/SetFPath.c +++ b/lib/X11/SetFPath.c @@ -1,9 +1,13 @@ -/* $Xorg: SetFPath.c,v 1.4 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetFPath.c,v 1.5 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFPath.c,v 1.4 1999/05/09 10:50:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFPath.c,v 1.5 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetFont.c b/lib/X11/SetFont.c index ae443f0da..9a8e67db8 100644 --- a/lib/X11/SetFont.c +++ b/lib/X11/SetFont.c @@ -1,9 +1,13 @@ -/* $Xorg: SetFont.c,v 1.3 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetFont.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFont.c,v 1.2 1999/05/09 10:50:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFont.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetFore.c b/lib/X11/SetFore.c index 89c9a3d06..e938d8fac 100644 --- a/lib/X11/SetFore.c +++ b/lib/X11/SetFore.c @@ -1,9 +1,13 @@ -/* $Xorg: SetFore.c,v 1.3 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetFore.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFore.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFore.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetFunc.c b/lib/X11/SetFunc.c index 150b0d3c6..c00413171 100644 --- a/lib/X11/SetFunc.c +++ b/lib/X11/SetFunc.c @@ -1,9 +1,13 @@ -/* $Xorg: SetFunc.c,v 1.3 2000/08/17 19:44:53 cpqbld Exp $ */ +/* $Xorg: SetFunc.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFunc.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFunc.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetHints.c b/lib/X11/SetHints.c index d74255428..5a5059aa4 100644 --- a/lib/X11/SetHints.c +++ b/lib/X11/SetHints.c @@ -1,10 +1,14 @@ -/* $Xorg: SetHints.c,v 1.4 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetHints.c,v 1.5 2001/02/09 02:03:36 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/SetHints.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetHints.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xutil.h> diff --git a/lib/X11/SetIFocus.c b/lib/X11/SetIFocus.c index 5783104f2..2e0eb1d97 100644 --- a/lib/X11/SetIFocus.c +++ b/lib/X11/SetIFocus.c @@ -1,9 +1,13 @@ -/* $Xorg: SetIFocus.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetIFocus.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetIFocus.c,v 1.2 1999/05/09 10:50:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetIFocus.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetLStyle.c b/lib/X11/SetLStyle.c index dfed382d7..9f0c8c5e4 100644 --- a/lib/X11/SetLStyle.c +++ b/lib/X11/SetLStyle.c @@ -1,9 +1,13 @@ -/* $Xorg: SetLStyle.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetLStyle.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetLStyle.c,v 1.2 1999/05/09 10:50:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetLStyle.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetLocale.c b/lib/X11/SetLocale.c index 0d6501daf..7a364303e 100644 --- a/lib/X11/SetLocale.c +++ b/lib/X11/SetLocale.c @@ -1,4 +1,4 @@ -/* $Xorg: SetLocale.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, @@ -32,7 +32,11 @@ Copyright 1987,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -51,7 +55,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetLocale.c,v 3.14 2001/07/25 15:04:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetLocale.c,v 3.15 2001/10/28 03:32:32 tsi Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/lib/X11/SetNrmHint.c b/lib/X11/SetNrmHint.c index 3fe05ed53..d8511a6ff 100644 --- a/lib/X11/SetNrmHint.c +++ b/lib/X11/SetNrmHint.c @@ -1,4 +1,4 @@ -/* $XConsortium: SetNrmHint.c,v 1.4 94/04/17 20:21:00 gildea Exp $ */ +/* $Xorg: SetNrmHint.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca, @@ -25,15 +25,13 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,15 +39,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/SetPMask.c b/lib/X11/SetPMask.c index 181515418..6c4b826cb 100644 --- a/lib/X11/SetPMask.c +++ b/lib/X11/SetPMask.c @@ -1,9 +1,13 @@ -/* $Xorg: SetPMask.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetPMask.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetPMask.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetPMask.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetPntMap.c b/lib/X11/SetPntMap.c index 556094361..dab74a824 100644 --- a/lib/X11/SetPntMap.c +++ b/lib/X11/SetPntMap.c @@ -1,9 +1,13 @@ -/* $Xorg: SetPntMap.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetPntMap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetPntMap.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetPntMap.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #define NEED_REPLIES diff --git a/lib/X11/SetRGBCMap.c b/lib/X11/SetRGBCMap.c index 23269cc81..0523f0ba4 100644 --- a/lib/X11/SetRGBCMap.c +++ b/lib/X11/SetRGBCMap.c @@ -1,15 +1,13 @@ -/* $XConsortium: SetRGBCMap.c,v 1.5 94/04/17 20:21:02 gildea Exp $ */ +/* $Xorg: SetRGBCMap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/SetSOwner.c b/lib/X11/SetSOwner.c index bf9f85d44..40481ded0 100644 --- a/lib/X11/SetSOwner.c +++ b/lib/X11/SetSOwner.c @@ -1,9 +1,13 @@ -/* $Xorg: SetSOwner.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetSOwner.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetSOwner.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetSOwner.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetSSaver.c b/lib/X11/SetSSaver.c index 9105512fa..cea64f255 100644 --- a/lib/X11/SetSSaver.c +++ b/lib/X11/SetSSaver.c @@ -1,9 +1,13 @@ -/* $Xorg: SetSSaver.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetSSaver.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetSSaver.c,v 1.2 1999/05/09 10:50:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetSSaver.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetStCmap.c b/lib/X11/SetStCmap.c index 64e6c3375..86ff4c8ec 100644 --- a/lib/X11/SetStCmap.c +++ b/lib/X11/SetStCmap.c @@ -1,15 +1,14 @@ -/* $XConsortium: SetStCmap.c,v 1.8 94/04/17 20:21:04 gildea Exp $ */ +/* $Xorg: SetStCmap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/X11/SetState.c b/lib/X11/SetState.c index dc61865ff..ecd519016 100644 --- a/lib/X11/SetState.c +++ b/lib/X11/SetState.c @@ -1,9 +1,13 @@ -/* $Xorg: SetState.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ +/* $Xorg: SetState.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetState.c,v 1.2 1999/05/09 10:50:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetState.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetStip.c b/lib/X11/SetStip.c index 84ecd8b0d..cb2ed9998 100644 --- a/lib/X11/SetStip.c +++ b/lib/X11/SetStip.c @@ -1,9 +1,13 @@ -/* $Xorg: SetStip.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */ +/* $Xorg: SetStip.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetStip.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetStip.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetTSOrig.c b/lib/X11/SetTSOrig.c index d8af54d80..d72e5caee 100644 --- a/lib/X11/SetTSOrig.c +++ b/lib/X11/SetTSOrig.c @@ -1,9 +1,13 @@ -/* $Xorg: SetTSOrig.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */ +/* $Xorg: SetTSOrig.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetTile.c b/lib/X11/SetTile.c index 78b307710..58ba8d903 100644 --- a/lib/X11/SetTile.c +++ b/lib/X11/SetTile.c @@ -1,9 +1,13 @@ -/* $Xorg: SetTile.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */ +/* $Xorg: SetTile.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetTile.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetTile.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/SetTxtProp.c b/lib/X11/SetTxtProp.c index 08963428b..73bee7e13 100644 --- a/lib/X11/SetTxtProp.c +++ b/lib/X11/SetTxtProp.c @@ -1,4 +1,4 @@ -/* $XConsortium: SetTxtProp.c,v 1.6 94/04/17 20:21:07 gildea Exp $ */ +/* $Xorg: SetTxtProp.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca. @@ -23,15 +23,13 @@ SOFTWARE. ******************************************************************/ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,15 +37,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/SetWMCMapW.c b/lib/X11/SetWMCMapW.c index 4a9f12f18..bf56a023f 100644 --- a/lib/X11/SetWMCMapW.c +++ b/lib/X11/SetWMCMapW.c @@ -1,15 +1,14 @@ -/* $XConsortium: SetWMCMapW.c,v 1.5 94/04/17 20:21:08 rws Exp $ */ +/* $Xorg: SetWMCMapW.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/X11/SetWMProto.c b/lib/X11/SetWMProto.c index f2a0b9ada..15ebd76a8 100644 --- a/lib/X11/SetWMProto.c +++ b/lib/X11/SetWMProto.c @@ -1,15 +1,14 @@ -/* $XConsortium: SetWMProto.c,v 1.5 94/04/17 20:21:08 rws Exp $ */ +/* $Xorg: SetWMProto.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/X11/StBytes.c b/lib/X11/StBytes.c index 8368a7654..bae11770a 100644 --- a/lib/X11/StBytes.c +++ b/lib/X11/StBytes.c @@ -1,9 +1,13 @@ -/* $Xorg: StBytes.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */ +/* $Xorg: StBytes.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StBytes.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StBytes.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/lib/X11/StColor.c b/lib/X11/StColor.c index 2ae8d9e66..103878733 100644 --- a/lib/X11/StColor.c +++ b/lib/X11/StColor.c @@ -1,9 +1,13 @@ -/* $Xorg: StColor.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */ +/* $Xorg: StColor.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StColor.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StColor.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/StColors.c b/lib/X11/StColors.c index add142e6d..3ad030fa1 100644 --- a/lib/X11/StColors.c +++ b/lib/X11/StColors.c @@ -1,9 +1,13 @@ -/* $Xorg: StColors.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */ +/* $Xorg: StColors.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StColors.c,v 1.2 1999/05/09 10:50:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StColors.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/StNColor.c b/lib/X11/StNColor.c index d7437579a..8dc1c735c 100644 --- a/lib/X11/StNColor.c +++ b/lib/X11/StNColor.c @@ -1,9 +1,13 @@ -/* $Xorg: StNColor.c,v 1.3 2000/08/17 19:44:56 cpqbld Exp $ */ +/* $Xorg: StNColor.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StNColor.c,v 1.2 1999/05/09 10:50:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StNColor.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include <stdio.h> #include "Xlibint.h" diff --git a/lib/X11/StName.c b/lib/X11/StName.c index 5fc4c6300..8e28a1fa5 100644 --- a/lib/X11/StName.c +++ b/lib/X11/StName.c @@ -1,9 +1,13 @@ -/* $Xorg: StName.c,v 1.3 2000/08/17 19:44:56 cpqbld Exp $ */ +/* $Xorg: StName.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StName.c,v 1.2 1999/05/09 10:50:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StName.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/lib/X11/StrKeysym.c b/lib/X11/StrKeysym.c index 40d4c7da2..0016a63e8 100644 --- a/lib/X11/StrKeysym.c +++ b/lib/X11/StrKeysym.c @@ -1,9 +1,13 @@ -/* $Xorg: StrKeysym.c,v 1.4 2000/08/17 19:44:56 cpqbld Exp $ */ +/* $Xorg: StrKeysym.c,v 1.5 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.4 2001/01/17 19:41:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.5 2001/07/25 15:04:44 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xresource.h> diff --git a/lib/X11/StrToText.c b/lib/X11/StrToText.c index 94d4f4880..c84c0714d 100644 --- a/lib/X11/StrToText.c +++ b/lib/X11/StrToText.c @@ -1,14 +1,13 @@ -/* $XConsortium: StrToText.c,v 1.5 94/04/17 20:21:13 gildea Exp $ */ +/* $Xorg: StrToText.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/Sync.c b/lib/X11/Sync.c index 6d90703b2..ae423d098 100644 --- a/lib/X11/Sync.c +++ b/lib/X11/Sync.c @@ -1,9 +1,13 @@ -/* $Xorg: Sync.c,v 1.3 2000/08/17 19:44:56 cpqbld Exp $ */ +/* $Xorg: Sync.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Sync.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Sync.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/lib/X11/Synchro.c b/lib/X11/Synchro.c index d09a2cb61..9e9d50ada 100644 --- a/lib/X11/Synchro.c +++ b/lib/X11/Synchro.c @@ -1,14 +1,13 @@ -/* $XConsortium: Synchro.c,v 11.14 94/04/17 20:21:16 rws Exp $ */ +/* $Xorg: Synchro.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/Text.c b/lib/X11/Text.c index 4ae14f17e..bf79d5a97 100644 --- a/lib/X11/Text.c +++ b/lib/X11/Text.c @@ -1,9 +1,13 @@ -/* $Xorg: Text.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: Text.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Text.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Text.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Text16.c b/lib/X11/Text16.c index 9c7d81d43..9374da4b3 100644 --- a/lib/X11/Text16.c +++ b/lib/X11/Text16.c @@ -1,9 +1,13 @@ -/* $Xorg: Text16.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: Text16.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Text16.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Text16.c,v 1.4 2001/01/21 22:58:08 keithp Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/TextExt.c b/lib/X11/TextExt.c index f6d9cea7d..1425927f6 100644 --- a/lib/X11/TextExt.c +++ b/lib/X11/TextExt.c @@ -1,9 +1,13 @@ -/* $Xorg: TextExt.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: TextExt.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/TextExt.c,v 1.2 1999/05/09 10:50:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextExt.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint diff --git a/lib/X11/TextExt16.c b/lib/X11/TextExt16.c index 67cb1eb32..07cdd337c 100644 --- a/lib/X11/TextExt16.c +++ b/lib/X11/TextExt16.c @@ -1,9 +1,13 @@ -/* $Xorg: TextExt16.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: TextExt16.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/TextExt16.c,v 1.2 1999/05/09 10:50:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextExt16.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint diff --git a/lib/X11/TextToStr.c b/lib/X11/TextToStr.c index 3ef21fef0..c775fa6e0 100644 --- a/lib/X11/TextToStr.c +++ b/lib/X11/TextToStr.c @@ -1,9 +1,13 @@ -/* $Xorg: TextToStr.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: TextToStr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/TextToStr.c,v 1.3 1998/10/03 08:41:23 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextToStr.c,v 1.4 2001/01/17 19:41:45 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/lib/X11/TrCoords.c b/lib/X11/TrCoords.c index 71f7e2683..2363248d7 100644 --- a/lib/X11/TrCoords.c +++ b/lib/X11/TrCoords.c @@ -1,14 +1,13 @@ -/* $XConsortium: TrCoords.c,v 11.15 94/04/17 20:21:20 rws Exp $ */ +/* $Xorg: TrCoords.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/UndefCurs.c b/lib/X11/UndefCurs.c index f27f28906..ced351871 100644 --- a/lib/X11/UndefCurs.c +++ b/lib/X11/UndefCurs.c @@ -1,9 +1,13 @@ -/* $Xorg: UndefCurs.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: UndefCurs.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UndefCurs.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UndefCurs.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UngrabBut.c b/lib/X11/UngrabBut.c index f7961e1dd..4f1e12d0f 100644 --- a/lib/X11/UngrabBut.c +++ b/lib/X11/UngrabBut.c @@ -1,9 +1,13 @@ -/* $Xorg: UngrabBut.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: UngrabBut.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabBut.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabBut.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UngrabKbd.c b/lib/X11/UngrabKbd.c index 0b5388688..b4720a497 100644 --- a/lib/X11/UngrabKbd.c +++ b/lib/X11/UngrabKbd.c @@ -1,9 +1,13 @@ -/* $Xorg: UngrabKbd.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ +/* $Xorg: UngrabKbd.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UngrabKey.c b/lib/X11/UngrabKey.c index 867eedf67..4f001d2ea 100644 --- a/lib/X11/UngrabKey.c +++ b/lib/X11/UngrabKey.c @@ -1,9 +1,13 @@ -/* $Xorg: UngrabKey.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: UngrabKey.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabKey.c,v 1.2 1999/05/09 10:50:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabKey.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UngrabPtr.c b/lib/X11/UngrabPtr.c index a6751f68d..1d6a02ea2 100644 --- a/lib/X11/UngrabPtr.c +++ b/lib/X11/UngrabPtr.c @@ -1,9 +1,13 @@ -/* $Xorg: UngrabPtr.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: UngrabPtr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.2 1999/05/09 10:50:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UngrabSvr.c b/lib/X11/UngrabSvr.c index 3ee586579..6ec8ccef8 100644 --- a/lib/X11/UngrabSvr.c +++ b/lib/X11/UngrabSvr.c @@ -1,9 +1,13 @@ -/* $Xorg: UngrabSvr.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: UngrabSvr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UninsCmap.c b/lib/X11/UninsCmap.c index 3f1556f51..cd9af166e 100644 --- a/lib/X11/UninsCmap.c +++ b/lib/X11/UninsCmap.c @@ -1,9 +1,13 @@ -/* $Xorg: UninsCmap.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: UninsCmap.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UninsCmap.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UninsCmap.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UnldFont.c b/lib/X11/UnldFont.c index 90e5da6a1..4d335d3b4 100644 --- a/lib/X11/UnldFont.c +++ b/lib/X11/UnldFont.c @@ -1,9 +1,13 @@ - /* $Xorg: UnldFont.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: UnldFont.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UnldFont.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UnldFont.c,v 1.4 2001/06/20 19:02:33 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UnmapSubs.c b/lib/X11/UnmapSubs.c index 1d90990e6..56e30b7e3 100644 --- a/lib/X11/UnmapSubs.c +++ b/lib/X11/UnmapSubs.c @@ -1,9 +1,13 @@ -/* $Xorg: UnmapSubs.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: UnmapSubs.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.2 1999/05/09 10:50:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/UnmapWin.c b/lib/X11/UnmapWin.c index e485aa8e7..da0e895c9 100644 --- a/lib/X11/UnmapWin.c +++ b/lib/X11/UnmapWin.c @@ -1,9 +1,13 @@ -/* $Xorg: UnmapWin.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: UnmapWin.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UnmapWin.c,v 1.2 1999/05/09 10:50:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UnmapWin.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/VisUtil.c b/lib/X11/VisUtil.c index afce01e76..92cdd93f4 100644 --- a/lib/X11/VisUtil.c +++ b/lib/X11/VisUtil.c @@ -1,14 +1,13 @@ -/* $XConsortium: VisUtil.c,v 11.17 94/04/17 20:21:27 rws Exp $ */ +/* $Xorg: VisUtil.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* -Copyright (c) 1986 X Consortium +Copyright 1986, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/WMGeom.c b/lib/X11/WMGeom.c index f1a036465..96b9b5362 100644 --- a/lib/X11/WMGeom.c +++ b/lib/X11/WMGeom.c @@ -1,14 +1,13 @@ -/* $XConsortium: WMGeom.c,v 1.5 94/04/17 20:21:28 rws Exp $ */ +/* $Xorg: WMGeom.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/X11/WMProps.c b/lib/X11/WMProps.c index e49e5c959..85db35325 100644 --- a/lib/X11/WMProps.c +++ b/lib/X11/WMProps.c @@ -1,9 +1,13 @@ -/* $Xorg: WMProps.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: WMProps.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WMProps.c,v 3.4 2001/01/17 19:41:46 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WMProps.c,v 3.5 2001/07/25 15:04:44 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca., diff --git a/lib/X11/WarpPtr.c b/lib/X11/WarpPtr.c index a91f7ca5a..e83a7e2ac 100644 --- a/lib/X11/WarpPtr.c +++ b/lib/X11/WarpPtr.c @@ -1,9 +1,13 @@ -/* $Xorg: WarpPtr.c,v 1.3 2000/08/17 19:44:58 cpqbld Exp $ */ +/* $Xorg: WarpPtr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WarpPtr.c,v 1.2 1999/05/09 10:50:22 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WarpPtr.c,v 1.3 2001/01/17 19:41:47 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/WinEvent.c b/lib/X11/WinEvent.c index 0408b3c84..d69a6671d 100644 --- a/lib/X11/WinEvent.c +++ b/lib/X11/WinEvent.c @@ -1,9 +1,13 @@ -/* $Xorg: WinEvent.c,v 1.3 2000/08/17 19:44:59 cpqbld Exp $ */ +/* $Xorg: WinEvent.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WinEvent.c,v 3.4 2001/07/25 15:04:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WinEvent.c,v 3.5 2001/10/28 03:32:32 tsi Exp $ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/lib/X11/Window.c b/lib/X11/Window.c index 0070ea727..997a8fb82 100644 --- a/lib/X11/Window.c +++ b/lib/X11/Window.c @@ -1,9 +1,13 @@ -/* $Xorg: Window.c,v 1.4 2000/08/17 19:44:59 cpqbld Exp $ */ +/* $Xorg: Window.c,v 1.5 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Window.c,v 1.2 1999/05/09 10:50:22 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Window.c,v 1.3 2001/01/17 19:41:47 dawes Exp $ */ #include "Xlibint.h" diff --git a/lib/X11/Withdraw.c b/lib/X11/Withdraw.c index d333d82ce..e9735a9ba 100644 --- a/lib/X11/Withdraw.c +++ b/lib/X11/Withdraw.c @@ -1,4 +1,4 @@ -/* $XConsortium: Withdraw.c,v 1.6 94/04/17 20:21:31 gildea Exp $ */ +/* $Xorg: Withdraw.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca., @@ -24,15 +24,13 @@ SOFTWARE. ******************************************************************/ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,15 +38,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/WrBitF.c b/lib/X11/WrBitF.c index 05e5de914..5321e409d 100644 --- a/lib/X11/WrBitF.c +++ b/lib/X11/WrBitF.c @@ -1,9 +1,13 @@ -/* $Xorg: WrBitF.c,v 1.3 2000/08/17 19:44:59 cpqbld Exp $ */ +/* $Xorg: WrBitF.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WrBitF.c,v 3.2 1998/10/03 08:41:24 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WrBitF.c,v 3.3 2001/01/17 19:41:47 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xos.h> diff --git a/lib/X11/XErrorDB b/lib/X11/XErrorDB index 88e6a77ed..27fabc31e 100644 --- a/lib/X11/XErrorDB +++ b/lib/X11/XErrorDB @@ -1,7 +1,11 @@ ! $Xorg: XErrorDB,v 1.3 2000/08/17 19:44:59 cpqbld Exp $ ! Copyright 1993, 1995, 1998 The Open Group -! All Rights Reserved. +! Permission to use, copy, modify, distribute, and sell this software and its +! documentation for any purpose is hereby granted without fee, provided that +! the above copyright notice appear in all copies and that both that +! copyright notice and this permission notice appear in supporting +! documentation. ! ! The above copyright notice and this permission notice shall be ! included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ ! other dealings in this Software without prior written authorization ! from The Open Group. ! -! $XFree86: xc/lib/X11/XErrorDB,v 3.34 2001/01/17 19:41:47 dawes Exp $ +! $XFree86: xc/lib/X11/XErrorDB,v 3.35 2001/05/18 23:35:28 dawes Exp $ ! ! these are used in XGetErrorMessage. XlibMessage.XError: X Error of failed request diff --git a/lib/X11/XKBBind.c b/lib/X11/XKBBind.c index db69637a8..6232c1942 100644 --- a/lib/X11/XKBBind.c +++ b/lib/X11/XKBBind.c @@ -1,9 +1,13 @@ -/* $Xorg: XKBBind.c,v 1.3 2000/08/17 19:45:00 cpqbld Exp $ */ +/* $Xorg: XKBBind.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/XKBBind.c,v 3.12 2000/08/26 15:11:23 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBBind.c,v 3.13 2001/01/17 19:41:48 dawes Exp $ */ /* the new monsters ate the old ones */ diff --git a/lib/X11/XKBCvt.c b/lib/X11/XKBCvt.c index 1e3bdc133..3d46b26ac 100644 --- a/lib/X11/XKBCvt.c +++ b/lib/X11/XKBCvt.c @@ -1,9 +1,13 @@ -/* $Xorg: XKBCvt.c,v 1.4 2000/08/17 19:45:00 cpqbld Exp $ */ +/* $Xorg: XKBCvt.c,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1988, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.30 2001/02/09 00:02:53 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.31 2001/07/25 15:04:44 dawes Exp $ */ #include <stdio.h> #include <sys/types.h> diff --git a/lib/X11/Xatomtype.h b/lib/X11/Xatomtype.h index 672b6ebdd..7ab7e5a04 100644 --- a/lib/X11/Xatomtype.h +++ b/lib/X11/Xatomtype.h @@ -1,15 +1,14 @@ -/* $XConsortium: Xatomtype.h,v 11.15 94/04/17 20:21:38 jim Exp $ */ +/* $Xorg: Xatomtype.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/X11/XimThai.h b/lib/X11/XimThai.h index ecf79f9e0..6bfbab206 100644 --- a/lib/X11/XimThai.h +++ b/lib/X11/XimThai.h @@ -1,9 +1,13 @@ -/* $Xorg: XimThai.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ +/* $Xorg: XimThai.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/XimThai.h,v 1.3 2001/10/28 03:32:33 tsi Exp $ */ +/* $XFree86: xc/lib/X11/XimThai.h,v 1.4 2001/10/31 22:50:25 tsi Exp $ */ /* **++ diff --git a/lib/X11/Xlcint.h b/lib/X11/Xlcint.h index a884edf38..13121978d 100644 --- a/lib/X11/Xlcint.h +++ b/lib/X11/Xlcint.h @@ -3,7 +3,11 @@ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlcint.h,v 3.11 2001/11/16 00:52:27 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xlcint.h,v 3.12 2001/11/19 15:33:38 tsi Exp $ */ /* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, diff --git a/lib/X11/Xlib.h b/lib/X11/Xlib.h index e4f2c0d43..6fac5cd50 100644 --- a/lib/X11/Xlib.h +++ b/lib/X11/Xlib.h @@ -1,9 +1,13 @@ -/* $Xorg: Xlib.h,v 1.5 2000/08/17 19:45:06 cpqbld Exp $ */ +/* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlib.h,v 3.20 2001/07/19 02:22:45 tsi Exp $ */ +/* $XFree86: xc/lib/X11/Xlib.h,v 3.21 2001/08/17 22:08:09 tsi Exp $ */ /* diff --git a/lib/X11/XlibAsync.c b/lib/X11/XlibAsync.c index b3fa07b25..066e12e7b 100644 --- a/lib/X11/XlibAsync.c +++ b/lib/X11/XlibAsync.c @@ -1,15 +1,13 @@ -/* $XConsortium: XlibAsync.c,v 1.6 94/04/17 20:21:45 rws Exp $ */ +/* $Xorg: XlibAsync.c,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ /* -Copyright (c) 1992 X Consortium +Copyright 1992, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ @@ -63,7 +61,7 @@ _XAsyncErrorHandler(dpy, rep, buf, len, data) return False; } -_XDeqAsyncHandler(dpy, handler) +void _XDeqAsyncHandler(dpy, handler) Display *dpy; register _XAsyncHandler *handler; { @@ -81,12 +79,12 @@ _XDeqAsyncHandler(dpy, handler) char * _XGetAsyncReply(dpy, replbuf, rep, buf, len, extra, discard) register Display *dpy; - register char *replbuf; - register xReply *rep; - char *buf; - int len; - int extra; - Bool discard; + register char *replbuf; /* data is read into this buffer */ + register xReply *rep; /* value passed to calling handler */ + char *buf; /* value passed to calling handler */ + int len; /* value passed to calling handler */ + int extra; /* extra words to read, ala _XReply */ + Bool discard; /* discard after extra?, ala _XReply */ { if (extra == 0) { if (discard && (rep->generic.length << 2) > len) @@ -128,12 +126,13 @@ _XGetAsyncReply(dpy, replbuf, rep, buf, len, extra, discard) void _XGetAsyncData(dpy, data, buf, len, skip, datalen, discardtotal) Display *dpy; - char *data; - char *buf; - int len; - int skip; - int datalen; - int discardtotal; + char *data; /* data is read into this buffer */ + char *buf; /* value passed to calling handler */ + int len; /* value passed to calling handler */ + int skip; /* number of bytes already read in previous + _XGetAsyncReply or _XGetAsyncData calls */ + int datalen; /* size of data buffer in bytes */ + int discardtotal; /* min. bytes to consume (after skip) */ { buf += skip; len -= skip; diff --git a/lib/X11/XlibInt.c b/lib/X11/XlibInt.c index cfa7b9c62..71f6d14b6 100644 --- a/lib/X11/XlibInt.c +++ b/lib/X11/XlibInt.c @@ -1,9 +1,13 @@ -/* $Xorg: XlibInt.c,v 1.7 2000/08/17 19:45:07 cpqbld Exp $ */ +/* $Xorg: XlibInt.c,v 1.8 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/XlibInt.c,v 3.28 2001/10/28 03:32:33 tsi Exp $ */ +/* $XFree86: xc/lib/X11/XlibInt.c,v 3.29 2001/11/09 09:26:51 alanh Exp $ */ /* * XlibInt.c - Internal support routines for the C subroutine diff --git a/lib/X11/Xlibint.h b/lib/X11/Xlibint.h index a1070757f..979bc9a24 100644 --- a/lib/X11/Xlibint.h +++ b/lib/X11/Xlibint.h @@ -1,10 +1,14 @@ -/* $Xorg: Xlibint.h,v 1.4 2000/08/17 19:45:07 cpqbld Exp $ */ +/* $Xorg: Xlibint.h,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1984, 1985, 1987, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlibint.h,v 3.20 2001/10/01 13:43:57 eich Exp $ */ +/* $XFree86: xc/lib/X11/Xlibint.h,v 3.21 2001/10/28 03:32:33 tsi Exp $ */ #ifndef _XLIBINT_H_ #define _XLIBINT_H_ 1 diff --git a/lib/X11/Xlocale.h b/lib/X11/Xlocale.h index 158c5bf85..9e4944cef 100644 --- a/lib/X11/Xlocale.h +++ b/lib/X11/Xlocale.h @@ -1,9 +1,13 @@ -/* $Xorg: Xlocale.h,v 1.3 2000/08/17 19:45:07 cpqbld Exp $ */ +/* $Xorg: Xlocale.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/Xlocale.h,v 1.3 2001/07/29 05:01:11 tsi Exp $ */ #ifndef _XLOCALE_H_ #define _XLOCALE_H_ diff --git a/lib/X11/Xresource.h b/lib/X11/Xresource.h index 80b37898f..76c6ddf2c 100644 --- a/lib/X11/Xresource.h +++ b/lib/X11/Xresource.h @@ -1,10 +1,14 @@ -/* $Xorg: Xresource.h,v 1.6 2000/08/17 19:45:08 cpqbld Exp $ */ +/* $Xorg: Xresource.h,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/Xresource.h,v 3.6 2001/01/17 19:41:50 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xresource.h,v 3.7 2001/08/01 00:44:38 tsi Exp $ */ #ifndef _XRESOURCE_H_ #define _XRESOURCE_H_ diff --git a/lib/X11/Xrm.c b/lib/X11/Xrm.c index 55b4af87b..3aa14e0c8 100644 --- a/lib/X11/Xrm.c +++ b/lib/X11/Xrm.c @@ -1,4 +1,4 @@ -/* $Xorg: Xrm.c,v 1.6 2000/08/17 19:45:08 cpqbld Exp $ */ +/* $Xorg: Xrm.c,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard @@ -26,7 +26,11 @@ SOFTWARE. Copyright 1987, 1988, 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xrm.c,v 3.17 2001/08/01 00:44:38 tsi Exp $ */ +/* $XFree86: xc/lib/X11/Xrm.c,v 3.18 2001/10/28 03:32:34 tsi Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/lib/X11/XrmI.h b/lib/X11/XrmI.h index f274988f6..949bcd6f3 100644 --- a/lib/X11/XrmI.h +++ b/lib/X11/XrmI.h @@ -1,9 +1,13 @@ -/* $Xorg: XrmI.h,v 1.3 2000/08/17 19:45:08 cpqbld Exp $ */ +/* $Xorg: XrmI.h,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/X11/Xutil.h b/lib/X11/Xutil.h index 83fed5d78..2e3224586 100644 --- a/lib/X11/Xutil.h +++ b/lib/X11/Xutil.h @@ -1,10 +1,14 @@ -/* $Xorg: Xutil.h,v 1.7 2000/08/17 19:45:08 cpqbld Exp $ */ +/* $Xorg: Xutil.h,v 1.8 2001/02/09 02:03:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/Xutil.h,v 3.2 2000/11/28 18:49:29 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xutil.h,v 3.3 2001/01/17 19:41:50 dawes Exp $ */ #ifndef _XUTIL_H_ #define _XUTIL_H_ diff --git a/lib/X11/cmsMath.c b/lib/X11/cmsMath.c index 58c66b462..04c0aea72 100644 --- a/lib/X11/cmsMath.c +++ b/lib/X11/cmsMath.c @@ -1,10 +1,14 @@ -/* $Xorg: cmsMath.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ +/* $Xorg: cmsMath.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/cmsMath.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ /* * Stephen Gildea, MIT X Consortium, January 1991 diff --git a/lib/X11/cursorfont.h b/lib/X11/cursorfont.h index 9143efc70..c6204f1c5 100644 --- a/lib/X11/cursorfont.h +++ b/lib/X11/cursorfont.h @@ -1,15 +1,13 @@ -/* $XConsortium: cursorfont.h,v 1.4 94/04/17 20:22:00 rws Exp $ */ +/* $Xorg: cursorfont.h,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/X11/evtomask.c b/lib/X11/evtomask.c index 59a5875c4..1ce018cd3 100644 --- a/lib/X11/evtomask.c +++ b/lib/X11/evtomask.c @@ -1,9 +1,13 @@ -/* $Xorg: evtomask.c,v 1.3 2000/08/17 19:45:10 cpqbld Exp $ */ +/* $Xorg: evtomask.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/evtomask.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ #include <X11/X.h> diff --git a/lib/X11/globals.c b/lib/X11/globals.c index 28d52e13f..0fa860dca 100644 --- a/lib/X11/globals.c +++ b/lib/X11/globals.c @@ -1,9 +1,13 @@ -/* $Xorg: globals.c,v 1.3 2000/08/17 19:45:10 cpqbld Exp $ */ +/* $Xorg: globals.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/X11/globals.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ /* * diff --git a/lib/X11/imThaiFlt.c b/lib/X11/imThaiFlt.c index f69648e4f..5f5ee5c5d 100644 --- a/lib/X11/imThaiFlt.c +++ b/lib/X11/imThaiFlt.c @@ -1,9 +1,13 @@ -/* $Xorg: imThaiFlt.c,v 1.4 2000/08/17 19:45:15 cpqbld Exp $ */ +/* $Xorg: imThaiFlt.c,v 1.5 2001/02/09 02:03:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.9 2001/10/28 03:32:34 tsi Exp $ */ +/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.10 2001/10/31 22:50:25 tsi Exp $ */ /* **++ diff --git a/lib/X11/util/makekeys.c b/lib/X11/util/makekeys.c index 19f812bf9..768f5e8b4 100644 --- a/lib/X11/util/makekeys.c +++ b/lib/X11/util/makekeys.c @@ -1,9 +1,13 @@ -/* $Xorg: makekeys.c,v 1.4 2000/08/17 19:45:24 cpqbld Exp $ */ +/* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.5 2001/01/17 19:42:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.6 2001/07/25 15:04:48 dawes Exp $ */ /* Constructs hash tables for XStringToKeysym and XKeysymToString. */ diff --git a/lib/XIE/XIElib.h b/lib/XIE/XIElib.h index 3f1ce364f..8d71b4f8c 100644 --- a/lib/XIE/XIElib.h +++ b/lib/XIE/XIElib.h @@ -1,10 +1,14 @@ -/* $Xorg: XIElib.h,v 1.5 2000/08/17 19:45:25 cpqbld Exp $ */ +/* $Xorg: XIElib.h,v 1.6 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/XIE/XIElibint.h b/lib/XIE/XIElibint.h index f51ae6146..56e62d859 100644 --- a/lib/XIE/XIElibint.h +++ b/lib/XIE/XIElibint.h @@ -1,9 +1,13 @@ -/* $Xorg: XIElibint.h,v 1.4 2000/08/17 19:45:25 cpqbld Exp $ */ +/* $Xorg: XIElibint.h,v 1.5 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/XIElibint.h,v 3.4 2001/01/17 19:42:21 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/XIElibint.h,v 3.5 2001/07/25 15:04:48 dawes Exp $ */ #ifndef _XIELIBINT_H_ #define _XIELIBINT_H_ diff --git a/lib/XIE/abort.c b/lib/XIE/abort.c index f6d9f38d9..1e8f53087 100644 --- a/lib/XIE/abort.c +++ b/lib/XIE/abort.c @@ -1,10 +1,14 @@ -/* $Xorg: abort.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */ +/* $Xorg: abort.c,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/abort.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/abort.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" diff --git a/lib/XIE/await.c b/lib/XIE/await.c index 4ca939693..edc8623c7 100644 --- a/lib/XIE/await.c +++ b/lib/XIE/await.c @@ -1,10 +1,14 @@ -/* $Xorg: await.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */ +/* $Xorg: await.c,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/await.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/await.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" diff --git a/lib/XIE/clientdata.c b/lib/XIE/clientdata.c index 9fe077b8d..4a540183a 100644 --- a/lib/XIE/clientdata.c +++ b/lib/XIE/clientdata.c @@ -1,10 +1,14 @@ -/* $Xorg: clientdata.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */ +/* $Xorg: clientdata.c,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/clientdata.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/clientdata.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" diff --git a/lib/XIE/colorlist.c b/lib/XIE/colorlist.c index c460b9da5..907db77e2 100644 --- a/lib/XIE/colorlist.c +++ b/lib/XIE/colorlist.c @@ -1,10 +1,14 @@ -/* $Xorg: colorlist.c,v 1.3 2000/08/17 19:45:25 cpqbld Exp $ */ +/* $Xorg: colorlist.c,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/colorlist.c,v 1.4 2000/09/26 15:56:53 tsi Exp $ */ +/* $XFree86: xc/lib/XIE/colorlist.c,v 1.5 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" diff --git a/lib/XIE/conven.c b/lib/XIE/conven.c index fe0334e37..34391df90 100644 --- a/lib/XIE/conven.c +++ b/lib/XIE/conven.c @@ -1,10 +1,14 @@ -/* $Xorg: conven.c,v 1.5 2000/08/17 19:45:25 cpqbld Exp $ */ +/* $Xorg: conven.c,v 1.6 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/conven.c,v 1.3 1999/06/13 16:18:08 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/conven.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" diff --git a/lib/XIE/elements.c b/lib/XIE/elements.c index 8a30749b4..9cee8fbf2 100644 --- a/lib/XIE/elements.c +++ b/lib/XIE/elements.c @@ -1,10 +1,14 @@ -/* $Xorg: elements.c,v 1.5 2000/08/17 19:45:26 cpqbld Exp $ */ +/* $Xorg: elements.c,v 1.6 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/elements.c,v 1.3 1999/06/13 16:18:08 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/elements.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" #include "elements.h" diff --git a/lib/XIE/elements.h b/lib/XIE/elements.h index 0f03666c0..7a2884d54 100644 --- a/lib/XIE/elements.h +++ b/lib/XIE/elements.h @@ -1,10 +1,14 @@ -/* $Xorg: elements.h,v 1.3 2000/08/17 19:45:26 cpqbld Exp $ */ +/* $Xorg: elements.h,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/XIE/elements.h,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ #ifndef _ELEMENTS_H_ #define _ELEMENTS_H_ diff --git a/lib/XIE/errors.c b/lib/XIE/errors.c index 9e1f75f57..57ec8af24 100644 --- a/lib/XIE/errors.c +++ b/lib/XIE/errors.c @@ -1,10 +1,14 @@ -/* $Xorg: errors.c,v 1.5 2000/08/17 19:45:26 cpqbld Exp $ */ +/* $Xorg: errors.c,v 1.6 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/errors.c,v 3.3 1999/06/13 16:18:09 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/errors.c,v 3.4 2001/01/17 19:42:21 dawes Exp $ */ #define NEED_EVENTS /* so XErrorEvent will get pulled in */ diff --git a/lib/XIE/events.c b/lib/XIE/events.c index 8ba75c5ab..f68f520fd 100644 --- a/lib/XIE/events.c +++ b/lib/XIE/events.c @@ -1,10 +1,14 @@ -/* $Xorg: events.c,v 1.3 2000/08/17 19:45:26 cpqbld Exp $ */ +/* $Xorg: events.c,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/events.c,v 1.3 1999/06/13 16:18:09 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/events.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #define NEED_EVENTS /* so xEvent will get pulled in */ #include "XIElibint.h" diff --git a/lib/XIE/free.c b/lib/XIE/free.c index 14b1539f0..c39108d60 100644 --- a/lib/XIE/free.c +++ b/lib/XIE/free.c @@ -1,10 +1,14 @@ -/* $Xorg: free.c,v 1.3 2000/08/17 19:45:26 cpqbld Exp $ */ +/* $Xorg: free.c,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/free.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/free.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" diff --git a/lib/XIE/globals.h b/lib/XIE/globals.h index 688d6e7dd..189004209 100644 --- a/lib/XIE/globals.h +++ b/lib/XIE/globals.h @@ -1,10 +1,14 @@ -/* $Xorg: globals.h,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */ +/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/globals.h,v 1.3 1999/06/13 13:47:01 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/globals.h,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ extern void _XieElemImportClientLUT (char **, XiePhotoElement *); extern void _XieElemImportClientPhoto (char **, XiePhotoElement *); diff --git a/lib/XIE/ieee.c b/lib/XIE/ieee.c index 43b25216d..7b835a0ac 100644 --- a/lib/XIE/ieee.c +++ b/lib/XIE/ieee.c @@ -1,4 +1,4 @@ -/* $Xorg: ieee.c,v 1.3 2000/08/17 19:45:27 cpqbld Exp $ */ +/* $Xorg: ieee.c,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /****************************************************************************** NOTICE @@ -45,7 +45,11 @@ Logic, Inc. Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -64,7 +68,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/ieee.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/ieee.c,v 1.4 2001/01/17 19:42:21 dawes Exp $ */ #include "XIElibint.h" #include <math.h> diff --git a/lib/XIE/init.c b/lib/XIE/init.c index 4885abf63..5c1e5dc41 100644 --- a/lib/XIE/init.c +++ b/lib/XIE/init.c @@ -1,10 +1,14 @@ -/* $Xorg: init.c,v 1.5 2000/08/17 19:45:27 cpqbld Exp $ */ +/* $Xorg: init.c,v 1.6 2001/02/09 02:03:41 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/init.c,v 3.4 2000/09/26 15:56:53 tsi Exp $ */ +/* $XFree86: xc/lib/XIE/init.c,v 3.5 2001/01/17 19:42:21 dawes Exp $ */ #define NEED_EVENTS /* so XErrorEvent will get pulled in */ diff --git a/lib/XIE/init.h b/lib/XIE/init.h index 8da2115e4..7f58c5f9e 100644 --- a/lib/XIE/init.h +++ b/lib/XIE/init.h @@ -1,16 +1,14 @@ -/* $XConsortium: init.h,v 1.3 94/04/17 20:18:25 mor Exp $ */ +/* $Xorg: init.h,v 1.4 2001/02/09 02:03:41 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/Xau/AuDispose.c b/lib/Xau/AuDispose.c index 1e9d98bb4..c3d9a35e4 100644 --- a/lib/Xau/AuDispose.c +++ b/lib/Xau/AuDispose.c @@ -1,10 +1,14 @@ -/* $Xorg: AuDispose.c,v 1.3 2000/08/17 19:45:28 cpqbld Exp $ */ +/* $Xorg: AuDispose.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.3 2001/01/17 19:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.4 2001/07/25 15:04:48 dawes Exp $ */ #include <X11/Xauth.h> #include <stdlib.h> diff --git a/lib/Xau/AuFileName.c b/lib/Xau/AuFileName.c index d917b88df..d1057faa0 100644 --- a/lib/Xau/AuFileName.c +++ b/lib/Xau/AuFileName.c @@ -1,10 +1,14 @@ -/* $Xorg: AuFileName.c,v 1.4 2000/08/17 19:45:28 cpqbld Exp $ */ +/* $Xorg: AuFileName.c,v 1.5 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.5 2001/01/17 19:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.6 2001/07/25 15:04:48 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/lib/Xau/AuGetAddr.c b/lib/Xau/AuGetAddr.c index 0d2b859e6..eb98da278 100644 --- a/lib/Xau/AuGetAddr.c +++ b/lib/Xau/AuGetAddr.c @@ -1,10 +1,14 @@ -/* $Xorg: AuGetAddr.c,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ */ +/* $Xorg: AuGetAddr.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.3 2000/06/14 00:16:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.4 2001/01/17 19:42:23 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/lib/Xau/AuGetBest.c b/lib/Xau/AuGetBest.c index 2270f420d..48a52e30c 100644 --- a/lib/Xau/AuGetBest.c +++ b/lib/Xau/AuGetBest.c @@ -1,10 +1,14 @@ -/* $Xorg: AuGetBest.c,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ */ +/* $Xorg: AuGetBest.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.5 2001/11/19 20:44:15 tsi Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.6 2001/11/21 20:52:54 tsi Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/lib/Xau/AuLock.c b/lib/Xau/AuLock.c index 7d8c24f1c..3a66dc78a 100644 --- a/lib/Xau/AuLock.c +++ b/lib/Xau/AuLock.c @@ -1,10 +1,14 @@ -/* $Xorg: AuLock.c,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ */ +/* $Xorg: AuLock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuLock.c,v 3.3 2001/01/17 19:42:24 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuLock.c,v 3.4 2001/07/25 15:04:48 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/lib/Xau/AuRead.c b/lib/Xau/AuRead.c index ea83f9393..984d00fdd 100644 --- a/lib/Xau/AuRead.c +++ b/lib/Xau/AuRead.c @@ -1,10 +1,14 @@ -/* $Xorg: AuRead.c,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ */ +/* $Xorg: AuRead.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuRead.c,v 1.4 2001/01/17 19:42:24 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuRead.c,v 1.5 2001/07/25 15:04:48 dawes Exp $ */ #include <X11/Xauth.h> #include <stdlib.h> diff --git a/lib/Xau/AuUnlock.c b/lib/Xau/AuUnlock.c index f75330b7f..6da41de5c 100644 --- a/lib/Xau/AuUnlock.c +++ b/lib/Xau/AuUnlock.c @@ -1,10 +1,14 @@ -/* $Xorg: AuUnlock.c,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ */ +/* $Xorg: AuUnlock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.2 1999/05/09 10:51:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.3 2001/01/17 19:42:24 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/lib/Xau/AuWrite.c b/lib/Xau/AuWrite.c index bcc422510..b4cd57cb0 100644 --- a/lib/Xau/AuWrite.c +++ b/lib/Xau/AuWrite.c @@ -1,10 +1,14 @@ -/* $Xorg: AuWrite.c,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ */ +/* $Xorg: AuWrite.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.2 1999/05/09 10:51:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.3 2001/01/17 19:42:24 dawes Exp $ */ #include <X11/Xauth.h> diff --git a/lib/Xau/Autest.c b/lib/Xau/Autest.c index d45dbf671..faf0b0adb 100644 --- a/lib/Xau/Autest.c +++ b/lib/Xau/Autest.c @@ -1,15 +1,14 @@ -/* $XConsortium: Autest.c,v 1.4 94/04/17 20:15:46 dpw Exp $ */ +/* $Xorg: Autest.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/Xau/Xauth.h b/lib/Xau/Xauth.h index ba4c0bdef..4818e2186 100644 --- a/lib/Xau/Xauth.h +++ b/lib/Xau/Xauth.h @@ -1,10 +1,14 @@ -/* $Xorg: Xauth.h,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ */ +/* $Xorg: Xauth.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/Xauth.h,v 1.3 1998/10/11 11:23:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/Xauth.h,v 1.4 2001/01/17 19:42:24 dawes Exp $ */ #ifndef _Xauth_h #define _Xauth_h diff --git a/lib/Xau/k5encode.c b/lib/Xau/k5encode.c index 0107f2be1..18d31ffb4 100644 --- a/lib/Xau/k5encode.c +++ b/lib/Xau/k5encode.c @@ -1,15 +1,14 @@ -/* $XConsortium: k5encode.c,v 1.5 94/04/17 20:15:47 gildea Exp $ */ +/* $Xorg: k5encode.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ @@ -108,7 +107,8 @@ XauKrb5Encode(princ, outbuf) /* * XauKrb5Decode * - * this function essentially reverses what XauKrb5Encode does + * This function essentially reverses what XauKrb5Encode does. + * return value: 0 if okay, -1 if malloc fails, -2 if inbuf format bad */ int XauKrb5Decode(inbuf, princ) @@ -120,8 +120,7 @@ XauKrb5Decode(inbuf, princ) if (inbuf.length < 4) { - krb5_free_principal(*princ); - return -1; + return -2; } *princ = (krb5_principal)malloc(sizeof (krb5_principal_data)); if (*princ == NULL) @@ -133,7 +132,7 @@ XauKrb5Decode(inbuf, princ) if (inbuf.length < 4 + (int)rlen + 2) { krb5_free_principal(*princ); - return -1; + return -2; } krb5_princ_realm(*princ)->data = (char *)malloc(rlen); if (krb5_princ_realm(*princ)->data == NULL) @@ -148,20 +147,25 @@ XauKrb5Decode(inbuf, princ) numparts |= *cp++; krb5_princ_name(*princ) = (krb5_data *)malloc(numparts * sizeof (krb5_data)); + if (krb5_princ_name(*princ) == NULL) + { + krb5_free_principal(*princ); + return -1; + } krb5_princ_size(*princ) = 0; for (i = 0; i < numparts; i++) { if (cp + 2 > (CARD8 *)inbuf.data + inbuf.length) { krb5_free_principal(*princ); - return -1; + return -2; } plen = *cp++ << 8; plen |= *cp++; if (cp + plen > (CARD8 *)inbuf.data + inbuf.length) { krb5_free_principal(*princ); - return -1; + return -2; } pdata = (CARD8 *)malloc(plen); if (pdata == NULL) diff --git a/lib/Xaw/AllWidgets.c b/lib/Xaw/AllWidgets.c index f112afdec..9833b09b2 100644 --- a/lib/Xaw/AllWidgets.c +++ b/lib/Xaw/AllWidgets.c @@ -1,10 +1,14 @@ -/* $Xorg: AllWidgets.c,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ +/* $Xorg: AllWidgets.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright (c) 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xaw/AllWidgets.c,v 1.3 2001/08/23 21:49:51 tsi Exp $ */ #include <X11/IntrinsicP.h> #include <X11/Xmu/WidgetNode.h> diff --git a/lib/Xaw/AllWidgets.h b/lib/Xaw/AllWidgets.h index c71aa91a0..0200ac4cc 100644 --- a/lib/Xaw/AllWidgets.h +++ b/lib/Xaw/AllWidgets.h @@ -1,14 +1,13 @@ /* - * $XConsortium: AllWidgets.h,v 1.3 94/04/17 20:11:40 jim Exp $ + * $Xorg: AllWidgets.h,v 1.5 2001/02/09 02:03:42 xorgcvs Exp $ * -Copyright (c) 1990 X Consortium +Copyright 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,18 +15,20 @@ 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. -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. */ #ifndef _XawAllWidgets_h #define _XawAllWidgets_h +#include <X11/Xmu/WidgetNode.h> + /* * This file matches the generated AllWidgets.c */ diff --git a/lib/Xaw/AsciiSink.c b/lib/Xaw/AsciiSink.c index 397ae8472..51b96dffc 100644 --- a/lib/Xaw/AsciiSink.c +++ b/lib/Xaw/AsciiSink.c @@ -1,10 +1,14 @@ -/* $Xorg: AsciiSink.c,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ +/* $Xorg: AsciiSink.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.24 2001/08/01 00:44:39 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.25 2001/08/23 00:03:19 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/lib/Xaw/AsciiSink.h b/lib/Xaw/AsciiSink.h index f0581226b..234927493 100644 --- a/lib/Xaw/AsciiSink.h +++ b/lib/Xaw/AsciiSink.h @@ -1,12 +1,16 @@ /* - * $Xorg: AsciiSink.h,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ + * $Xorg: AsciiSink.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.4 1998/10/03 08:41:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.5 2001/01/17 19:42:25 dawes Exp $ */ #ifndef _XawAsciiSink_h #define _XawAsciiSink_h diff --git a/lib/Xaw/AsciiSinkP.h b/lib/Xaw/AsciiSinkP.h index 724b7e40a..b160092f3 100644 --- a/lib/Xaw/AsciiSinkP.h +++ b/lib/Xaw/AsciiSinkP.h @@ -1,5 +1,5 @@ /* -* $Xorg: AsciiSinkP.h,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ +* $Xorg: AsciiSinkP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.8 1999/06/20 08:40:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.9 2001/01/17 19:42:25 dawes Exp $ */ #ifndef _XawAsciiSinkP_h #define _XawAsciiSinkP_h diff --git a/lib/Xaw/AsciiSrc.c b/lib/Xaw/AsciiSrc.c index a12924268..81508b9eb 100644 --- a/lib/Xaw/AsciiSrc.c +++ b/lib/Xaw/AsciiSrc.c @@ -1,10 +1,14 @@ -/* $Xorg: AsciiSrc.c,v 1.3 2000/08/17 19:45:30 cpqbld Exp $ */ +/* $Xorg: AsciiSrc.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.28 2001/06/08 18:47:42 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.29 2001/07/25 15:04:48 dawes Exp $ */ /* * AsciiSrc.c - AsciiSrc object. (For use with the text widget). diff --git a/lib/Xaw/AsciiSrc.h b/lib/Xaw/AsciiSrc.h index ef47b285d..8728dd9ea 100644 --- a/lib/Xaw/AsciiSrc.h +++ b/lib/Xaw/AsciiSrc.h @@ -1,10 +1,14 @@ -/* $Xorg: AsciiSrc.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ +/* $Xorg: AsciiSrc.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.6 1999/05/09 10:51:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */ /* diff --git a/lib/Xaw/AsciiSrcP.h b/lib/Xaw/AsciiSrcP.h index 911351efd..22d30082a 100644 --- a/lib/Xaw/AsciiSrcP.h +++ b/lib/Xaw/AsciiSrcP.h @@ -1,5 +1,5 @@ /* -* $Xorg: AsciiSrcP.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ +* $Xorg: AsciiSrcP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.7 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.8 2001/01/17 19:42:25 dawes Exp $ */ /* * AsciiSrcP.h - Private Header for Ascii Text Source. diff --git a/lib/Xaw/AsciiText.c b/lib/Xaw/AsciiText.c index 8250b5e2b..897b3fece 100644 --- a/lib/Xaw/AsciiText.c +++ b/lib/Xaw/AsciiText.c @@ -1,10 +1,14 @@ -/* $Xorg: AsciiText.c,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ +/* $Xorg: AsciiText.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.8 1999/06/13 13:47:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.9 2001/01/17 19:42:25 dawes Exp $ */ /* * AsciiText.c - Source code for AsciiText Widget diff --git a/lib/Xaw/AsciiText.h b/lib/Xaw/AsciiText.h index 8662a96b2..e6b4bc863 100644 --- a/lib/Xaw/AsciiText.h +++ b/lib/Xaw/AsciiText.h @@ -1,12 +1,16 @@ /* - * $Xorg: AsciiText.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ + * $Xorg: AsciiText.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.4 1998/10/03 08:42:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.5 2001/01/17 19:42:25 dawes Exp $ */ /* * AsciiText.h - Public header file for AsciiText Widget diff --git a/lib/Xaw/AsciiTextP.h b/lib/Xaw/AsciiTextP.h index 818d96378..25e3eeeab 100644 --- a/lib/Xaw/AsciiTextP.h +++ b/lib/Xaw/AsciiTextP.h @@ -1,12 +1,16 @@ /* - * $Xorg: AsciiTextP.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ + * $Xorg: AsciiTextP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.7 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.8 2001/01/17 19:42:25 dawes Exp $ */ /* * AsciiText.c - Private header file for AsciiText Widget. diff --git a/lib/Xaw/Box.c b/lib/Xaw/Box.c index 3a641a490..833db25c7 100644 --- a/lib/Xaw/Box.c +++ b/lib/Xaw/Box.c @@ -1,10 +1,14 @@ -/* $Xorg: Box.c,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ */ +/* $Xorg: Box.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.c,v 1.13 1999/06/06 08:47:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.c,v 1.14 2001/01/17 19:42:25 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Box.h b/lib/Xaw/Box.h index 20d9f3a38..17db281d6 100644 --- a/lib/Xaw/Box.h +++ b/lib/Xaw/Box.h @@ -1,5 +1,5 @@ /* -* $Xorg: Box.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ +* $Xorg: Box.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.h,v 1.6 1999/06/06 08:47:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */ #ifndef _XawBox_h #define _XawBox_h diff --git a/lib/Xaw/BoxP.h b/lib/Xaw/BoxP.h index 22c9f46ad..a64142e7d 100644 --- a/lib/Xaw/BoxP.h +++ b/lib/Xaw/BoxP.h @@ -1,5 +1,5 @@ /* -* $Xorg: BoxP.h,v 1.3 2000/08/17 19:45:31 cpqbld Exp $ +* $Xorg: BoxP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.9 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.10 2001/01/17 19:42:25 dawes Exp $ */ #ifndef _XawBoxP_h #define _XawBoxP_h diff --git a/lib/Xaw/Cardinals.h b/lib/Xaw/Cardinals.h index 716483f4f..a8b3dfc41 100644 --- a/lib/Xaw/Cardinals.h +++ b/lib/Xaw/Cardinals.h @@ -1,14 +1,13 @@ -/* $XConsortium: Cardinals.h,v 1.6 94/04/17 20:11:57 jim Exp $ */ +/* $Xorg: Cardinals.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /* -Copyright (c) 1985, 1986, 1987 X Consortium +Copyright 1985, 1986, 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/Xaw/Command.c b/lib/Xaw/Command.c index 0c6e205aa..a1f4d1bc5 100644 --- a/lib/Xaw/Command.c +++ b/lib/Xaw/Command.c @@ -1,10 +1,14 @@ -/* $Xorg: Command.c,v 1.4 2000/08/17 19:45:31 cpqbld Exp $ */ +/* $Xorg: Command.c,v 1.5 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.c,v 1.11 1999/06/13 13:47:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.c,v 1.12 2001/01/17 19:42:26 dawes Exp $ */ /* * Command.c - Command button widget diff --git a/lib/Xaw/Command.h b/lib/Xaw/Command.h index 1c2dec18b..49eb99122 100644 --- a/lib/Xaw/Command.h +++ b/lib/Xaw/Command.h @@ -1,10 +1,14 @@ -/* $Xorg: Command.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ +/* $Xorg: Command.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.h,v 1.4 1998/10/03 08:42:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.h,v 1.5 2001/01/17 19:42:26 dawes Exp $ */ #ifndef _XawCommand_h #define _XawCommand_h diff --git a/lib/Xaw/CommandP.h b/lib/Xaw/CommandP.h index 94c3d44e7..bc639f825 100644 --- a/lib/Xaw/CommandP.h +++ b/lib/Xaw/CommandP.h @@ -1,5 +1,5 @@ /* -* $Xorg: CommandP.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ +* $Xorg: CommandP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.6 1999/06/20 08:40:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.7 2001/01/17 19:42:26 dawes Exp $ */ #ifndef _XawCommandP_h #define _XawCommandP_h diff --git a/lib/Xaw/Dialog.c b/lib/Xaw/Dialog.c index d1a3dc9d5..638ac1ad4 100644 --- a/lib/Xaw/Dialog.c +++ b/lib/Xaw/Dialog.c @@ -1,10 +1,14 @@ -/* $Xorg: Dialog.c,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ +/* $Xorg: Dialog.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.6 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.7 2001/01/17 19:42:26 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Dialog.h b/lib/Xaw/Dialog.h index a7a528a5d..96fd36d38 100644 --- a/lib/Xaw/Dialog.h +++ b/lib/Xaw/Dialog.h @@ -1,10 +1,14 @@ -/* $Xorg: Dialog.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ +/* $Xorg: Dialog.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.4 1998/10/03 08:42:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.5 2001/01/17 19:42:26 dawes Exp $ */ #ifndef _XawDialog_h #define _XawDialog_h diff --git a/lib/Xaw/DialogP.h b/lib/Xaw/DialogP.h index 63d11e001..fcc2240d7 100644 --- a/lib/Xaw/DialogP.h +++ b/lib/Xaw/DialogP.h @@ -1,11 +1,15 @@ -/* $Xorg: DialogP.h,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ +/* $Xorg: DialogP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.7 1999/06/20 08:40:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.8 2001/01/17 19:42:26 dawes Exp $ */ #ifndef _DialogP_h #define _DialogP_h diff --git a/lib/Xaw/Form.c b/lib/Xaw/Form.c index ae22b7688..8d80e3df3 100644 --- a/lib/Xaw/Form.c +++ b/lib/Xaw/Form.c @@ -1,10 +1,14 @@ -/* $Xorg: Form.c,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ +/* $Xorg: Form.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.c,v 1.19 2001/01/17 19:42:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.c,v 1.20 2001/02/05 22:38:04 paulo Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Form.h b/lib/Xaw/Form.h index 220ba7d1b..9eb1ad7d6 100644 --- a/lib/Xaw/Form.h +++ b/lib/Xaw/Form.h @@ -1,11 +1,15 @@ -/* $Xorg: Form.h,v 1.4 2000/08/17 19:45:32 cpqbld Exp $ */ +/* $Xorg: Form.h,v 1.5 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.h,v 1.7 1999/06/06 08:47:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.h,v 1.8 2001/01/17 19:42:26 dawes Exp $ */ #ifndef _XawForm_h #define _XawForm_h diff --git a/lib/Xaw/FormP.h b/lib/Xaw/FormP.h index 4db24ae35..a13a74b02 100644 --- a/lib/Xaw/FormP.h +++ b/lib/Xaw/FormP.h @@ -1,10 +1,14 @@ -/* $Xorg: FormP.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ +/* $Xorg: FormP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/FormP.h,v 1.11 1999/06/20 08:41:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/FormP.h,v 1.12 2001/01/17 19:42:26 dawes Exp $ */ /* Form widget private definitions */ diff --git a/lib/Xaw/Grip.c b/lib/Xaw/Grip.c index 7291c91f0..e36cd30a8 100644 --- a/lib/Xaw/Grip.c +++ b/lib/Xaw/Grip.c @@ -1,10 +1,14 @@ -/* $Xorg: Grip.c,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ +/* $Xorg: Grip.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.c,v 1.6 1999/06/06 08:47:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.c,v 1.7 2001/01/17 19:42:26 dawes Exp $ */ /* * Grip.c - Grip Widget (Used by Paned Widget) diff --git a/lib/Xaw/Grip.h b/lib/Xaw/Grip.h index 24fbf223a..1c19f6043 100644 --- a/lib/Xaw/Grip.h +++ b/lib/Xaw/Grip.h @@ -1,10 +1,14 @@ -/* $Xorg: Grip.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ +/* $Xorg: Grip.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.h,v 1.5 1999/06/06 08:47:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.h,v 1.6 2001/01/17 19:42:26 dawes Exp $ */ /* * Grip.h - Public Definitions for Grip widget (used by VPane Widget) diff --git a/lib/Xaw/GripP.h b/lib/Xaw/GripP.h index 730fe5f7b..f40a8d1e7 100644 --- a/lib/Xaw/GripP.h +++ b/lib/Xaw/GripP.h @@ -1,5 +1,5 @@ /* -* $Xorg: GripP.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ +* $Xorg: GripP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/GripP.h,v 1.6 1999/06/20 08:41:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/GripP.h,v 1.7 2001/01/17 19:42:26 dawes Exp $ */ #ifndef _XawGripP_h #define _XawGripP_h diff --git a/lib/Xaw/Label.c b/lib/Xaw/Label.c index 513bfacd1..9e4019d8c 100644 --- a/lib/Xaw/Label.c +++ b/lib/Xaw/Label.c @@ -1,10 +1,14 @@ -/* $Xorg: Label.c,v 1.4 2000/08/17 19:45:33 cpqbld Exp $ */ +/* $Xorg: Label.c,v 1.5 2001/02/09 02:03:43 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.c,v 1.11 1999/06/27 14:07:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.c,v 1.12 2001/01/17 19:42:27 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/lib/Xaw/Label.h b/lib/Xaw/Label.h index b939fe823..fc3942b01 100644 --- a/lib/Xaw/Label.h +++ b/lib/Xaw/Label.h @@ -1,10 +1,14 @@ -/* $Xorg: Label.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ +/* $Xorg: Label.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.h,v 1.5 1998/10/03 08:42:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.h,v 1.6 2001/01/17 19:42:27 dawes Exp $ */ #ifndef _XawLabel_h #define _XawLabel_h diff --git a/lib/Xaw/LabelP.h b/lib/Xaw/LabelP.h index c59929319..9f49fdd4f 100644 --- a/lib/Xaw/LabelP.h +++ b/lib/Xaw/LabelP.h @@ -1,5 +1,5 @@ /* -* $Xorg: LabelP.h,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ +* $Xorg: LabelP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.7 2001/01/17 19:42:27 dawes Exp $ */ #ifndef _XawLabelP_h #define _XawLabelP_h diff --git a/lib/Xaw/List.c b/lib/Xaw/List.c index 9fc38751c..e298f3a9f 100644 --- a/lib/Xaw/List.c +++ b/lib/Xaw/List.c @@ -1,9 +1,13 @@ -/* $Xorg: List.c,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ */ +/* $Xorg: List.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/List.c,v 1.15 2000/04/04 22:36:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/List.c,v 1.16 2001/01/17 19:42:27 dawes Exp $ */ /* * List.c - List widget diff --git a/lib/Xaw/List.h b/lib/Xaw/List.h index 99bdc0d28..2115eefd4 100644 --- a/lib/Xaw/List.h +++ b/lib/Xaw/List.h @@ -1,9 +1,13 @@ -/* $Xorg: List.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ +/* $Xorg: List.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/List.h,v 1.6 2000/02/25 18:27:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/List.h,v 1.7 2001/01/17 19:42:27 dawes Exp $ */ /* This is the List widget, it is useful to display a list, without the * overhead of having a widget for each item in the list. It allows diff --git a/lib/Xaw/ListP.h b/lib/Xaw/ListP.h index 798e07932..2b8fc4639 100644 --- a/lib/Xaw/ListP.h +++ b/lib/Xaw/ListP.h @@ -1,9 +1,13 @@ -/* $Xorg: ListP.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ +/* $Xorg: ListP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/ListP.h,v 1.7 2000/02/25 18:27:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ListP.h,v 1.8 2001/01/17 19:42:27 dawes Exp $ */ /* diff --git a/lib/Xaw/MenuButtoP.h b/lib/Xaw/MenuButtoP.h index eecd4087f..416fdf9b5 100644 --- a/lib/Xaw/MenuButtoP.h +++ b/lib/Xaw/MenuButtoP.h @@ -1,8 +1,12 @@ -/* $Xorg: MenuButtoP.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ +/* $Xorg: MenuButtoP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ * Copyright 1989,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,7 +22,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/MenuButtoP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButtoP.h,v 1.7 2001/01/17 19:42:27 dawes Exp $ */ /* * MenuButtonP.h - Private Header file for MenuButton widget. diff --git a/lib/Xaw/MenuButton.c b/lib/Xaw/MenuButton.c index 561c3c321..a30be1a29 100644 --- a/lib/Xaw/MenuButton.c +++ b/lib/Xaw/MenuButton.c @@ -1,9 +1,13 @@ -/* $Xorg: MenuButton.c,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ +/* $Xorg: MenuButton.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.7 1999/06/06 08:47:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.9 2001/10/11 21:17:00 paulo Exp $ */ /* * MenuButton.c - Source code for MenuButton widget. diff --git a/lib/Xaw/MenuButton.h b/lib/Xaw/MenuButton.h index 418f5cc62..59744c26c 100644 --- a/lib/Xaw/MenuButton.h +++ b/lib/Xaw/MenuButton.h @@ -1,9 +1,13 @@ /* - * $Xorg: MenuButton.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ + * $Xorg: MenuButton.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.4 1998/10/03 08:42:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.5 2001/01/17 19:42:27 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xaw/MultiSink.c b/lib/Xaw/MultiSink.c index f40286fde..513e0f016 100644 --- a/lib/Xaw/MultiSink.c +++ b/lib/Xaw/MultiSink.c @@ -1,4 +1,4 @@ -/* $Xorg: MultiSink.c,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ +/* $Xorg: MultiSink.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -28,7 +28,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.18 2000/09/26 15:56:54 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.19 2001/01/17 19:42:27 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/MultiSink.h b/lib/Xaw/MultiSink.h index bcd0fe228..49ef1df2e 100644 --- a/lib/Xaw/MultiSink.h +++ b/lib/Xaw/MultiSink.h @@ -1,4 +1,4 @@ -/* $Xorg: MultiSink.h,v 1.3 2000/08/17 19:45:34 cpqbld Exp $ */ +/* $Xorg: MultiSink.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -28,7 +28,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.4 1998/10/03 08:42:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.5 2001/01/17 19:42:27 dawes Exp $ */ #ifndef _XawMultiSink_h #define _XawMultiSink_h diff --git a/lib/Xaw/MultiSinkP.h b/lib/Xaw/MultiSinkP.h index 5976d2c68..537e0b12a 100644 --- a/lib/Xaw/MultiSinkP.h +++ b/lib/Xaw/MultiSinkP.h @@ -1,4 +1,4 @@ -/* $Xorg: MultiSinkP.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ +/* $Xorg: MultiSinkP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -29,7 +29,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.7 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.8 2001/01/17 19:42:28 dawes Exp $ */ #ifndef _XawMultiSinkP_h #define _XawMultiSinkP_h diff --git a/lib/Xaw/MultiSrc.c b/lib/Xaw/MultiSrc.c index 476e6477e..7648e5322 100644 --- a/lib/Xaw/MultiSrc.c +++ b/lib/Xaw/MultiSrc.c @@ -1,4 +1,4 @@ -/* $Xorg: MultiSrc.c,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ +/* $Xorg: MultiSrc.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -27,13 +27,17 @@ * * Much code taken from X11R3 String and Disk Sources. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.22 2001/07/25 15:04:49 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.23 2001/08/23 00:03:19 dawes Exp $ */ /* Copyright 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xaw/MultiSrc.h b/lib/Xaw/MultiSrc.h index 29bc729b7..00c27f6c7 100644 --- a/lib/Xaw/MultiSrc.h +++ b/lib/Xaw/MultiSrc.h @@ -1,4 +1,4 @@ -/* $Xorg: MultiSrc.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ +/* $Xorg: MultiSrc.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -28,7 +28,11 @@ Copyright 1989, 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.5 1999/05/09 10:51:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.6 2001/01/17 19:42:28 dawes Exp $ */ /* * This file was modified from AsciiSrc.h. diff --git a/lib/Xaw/MultiSrcP.h b/lib/Xaw/MultiSrcP.h index 62e8414f0..49f7abc3a 100644 --- a/lib/Xaw/MultiSrcP.h +++ b/lib/Xaw/MultiSrcP.h @@ -1,4 +1,4 @@ -/* $Xorg: MultiSrcP.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ +/* $Xorg: MultiSrcP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -29,7 +29,11 @@ Copyright 1987, 1988, 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.7 1999/06/20 08:41:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.8 2001/01/17 19:42:28 dawes Exp $ */ /* * MultiSrcP.h - Private Header for Multi Text Source. diff --git a/lib/Xaw/Paned.c b/lib/Xaw/Paned.c index 3dac8ef00..b45f2a342 100644 --- a/lib/Xaw/Paned.c +++ b/lib/Xaw/Paned.c @@ -1,10 +1,14 @@ -/* $Xorg: Paned.c,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ */ +/* $Xorg: Paned.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.c,v 1.10 2001/01/17 19:42:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.c,v 1.11 2001/08/23 00:03:19 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/lib/Xaw/Paned.h b/lib/Xaw/Paned.h index 49a915ade..aaa532030 100644 --- a/lib/Xaw/Paned.h +++ b/lib/Xaw/Paned.h @@ -1,5 +1,5 @@ /* -* $Xorg: Paned.h,v 1.4 2000/08/17 19:45:35 cpqbld Exp $ +* $Xorg: Paned.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.h,v 1.5 1999/05/03 12:15:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.h,v 1.6 2001/01/17 19:42:28 dawes Exp $ */ /* * Paned.h - Paned Composite Widget's public header file. diff --git a/lib/Xaw/PanedP.h b/lib/Xaw/PanedP.h index 822745bf7..a94b0f34d 100644 --- a/lib/Xaw/PanedP.h +++ b/lib/Xaw/PanedP.h @@ -1,11 +1,15 @@ /*********************************************************** - $Xorg: PanedP.h,v 1.3 2000/08/17 19:45:35 cpqbld Exp $ + $Xorg: PanedP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.7 2001/01/17 19:42:28 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/lib/Xaw/Panner.c b/lib/Xaw/Panner.c index 6daea6542..629d3ce57 100644 --- a/lib/Xaw/Panner.c +++ b/lib/Xaw/Panner.c @@ -1,9 +1,13 @@ /* - * $Xorg: Panner.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: Panner.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.c,v 3.7 2001/07/04 16:45:56 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.c,v 3.8 2001/07/25 15:04:49 dawes Exp $ */ #include <ctype.h> #include <math.h> diff --git a/lib/Xaw/Panner.h b/lib/Xaw/Panner.h index 8464e6d07..594e2eb47 100644 --- a/lib/Xaw/Panner.h +++ b/lib/Xaw/Panner.h @@ -1,9 +1,13 @@ /* - * $Xorg: Panner.h,v 1.4 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: Panner.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.h,v 1.4 1998/10/03 08:42:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.h,v 1.5 2001/01/17 19:42:28 dawes Exp $ */ #ifndef _XawPanner_h #define _XawPanner_h diff --git a/lib/Xaw/PannerP.h b/lib/Xaw/PannerP.h index e01cfb638..aacf2e26c 100644 --- a/lib/Xaw/PannerP.h +++ b/lib/Xaw/PannerP.h @@ -1,9 +1,13 @@ /* - * $Xorg: PannerP.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: PannerP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */ #ifndef _XawPannerP_h #define _XawPannerP_h diff --git a/lib/Xaw/Porthole.c b/lib/Xaw/Porthole.c index e2bb91dc9..ac86d6237 100644 --- a/lib/Xaw/Porthole.c +++ b/lib/Xaw/Porthole.c @@ -1,9 +1,13 @@ /* - * $Xorg: Porthole.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: Porthole.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * This widget is a trivial clipping widget. It is typically used with a * panner or scrollbar to navigate. */ -/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.5 1999/06/06 08:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.6 2001/01/17 19:42:29 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Porthole.h b/lib/Xaw/Porthole.h index 8b03cd3f8..68274d886 100644 --- a/lib/Xaw/Porthole.h +++ b/lib/Xaw/Porthole.h @@ -1,9 +1,13 @@ /* - * $Xorg: Porthole.h,v 1.4 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: Porthole.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.4 1998/10/03 08:42:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.5 2001/01/17 19:42:29 dawes Exp $ */ #ifndef _XawPorthole_h #define _XawPorthole_h diff --git a/lib/Xaw/PortholeP.h b/lib/Xaw/PortholeP.h index 670d849ad..39dcbdc53 100644 --- a/lib/Xaw/PortholeP.h +++ b/lib/Xaw/PortholeP.h @@ -1,9 +1,13 @@ /* - * $Xorg: PortholeP.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: PortholeP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */ #ifndef _XawPortholeP_h #define _XawPortholeP_h diff --git a/lib/Xaw/Repeater.c b/lib/Xaw/Repeater.c index 3d43dad78..c6169eede 100644 --- a/lib/Xaw/Repeater.c +++ b/lib/Xaw/Repeater.c @@ -1,9 +1,13 @@ /* - * $Xorg: Repeater.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: Repeater.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * * This widget is used for press-and-hold style buttons. */ -/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.5 1999/06/06 08:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.6 2001/01/17 19:42:29 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Repeater.h b/lib/Xaw/Repeater.h index 6e5dfe4a1..cfb2c5313 100644 --- a/lib/Xaw/Repeater.h +++ b/lib/Xaw/Repeater.h @@ -1,9 +1,13 @@ /* - * $Xorg: Repeater.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: Repeater.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.4 1998/10/03 08:42:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.5 2001/01/17 19:42:29 dawes Exp $ */ #ifndef _XawRepeater_h #define _XawRepeater_h diff --git a/lib/Xaw/RepeaterP.h b/lib/Xaw/RepeaterP.h index 03e6b1e80..3ce0a498c 100644 --- a/lib/Xaw/RepeaterP.h +++ b/lib/Xaw/RepeaterP.h @@ -1,9 +1,13 @@ /* - * $Xorg: RepeaterP.h,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ + * $Xorg: RepeaterP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.6 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */ #ifndef _XawRepeaterP_h #define _XawRepeaterP_h diff --git a/lib/Xaw/Reports.h b/lib/Xaw/Reports.h index 0b193c9db..33f18d187 100644 --- a/lib/Xaw/Reports.h +++ b/lib/Xaw/Reports.h @@ -1,14 +1,13 @@ /* - * $XConsortium: Reports.h,v 1.4 94/04/17 20:12:39 jim Exp $ + * $Xorg: Reports.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * -Copyright (c) 1990 X Consortium +Copyright 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,18 +15,20 @@ 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. -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. */ #ifndef _Xaw_Reports_h #define _Xaw_Reports_h +#include <X11/Intrinsic.h> + /* * XawPannerReport - this structure is used by the reportCallback of the * Panner, Porthole, Viewport, and Scrollbar widgets to report its position. diff --git a/lib/Xaw/Scrollbar.c b/lib/Xaw/Scrollbar.c index 1aae30b82..2d5592216 100644 --- a/lib/Xaw/Scrollbar.c +++ b/lib/Xaw/Scrollbar.c @@ -1,10 +1,14 @@ -/* $Xorg: Scrollbar.c,v 1.3 2000/08/17 19:45:36 cpqbld Exp $ */ +/* $Xorg: Scrollbar.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.c,v 1.11 2000/09/26 15:56:54 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/Scrollbar.c,v 1.12 2001/01/17 19:42:29 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Scrollbar.h b/lib/Xaw/Scrollbar.h index 9672059d7..c776d41e2 100644 --- a/lib/Xaw/Scrollbar.h +++ b/lib/Xaw/Scrollbar.h @@ -1,11 +1,15 @@ -/* $Xorg: Scrollbar.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ +/* $Xorg: Scrollbar.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.5 1999/05/03 12:15:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.6 2001/01/17 19:42:29 dawes Exp $ */ #ifndef _Scrollbar_h #define _Scrollbar_h diff --git a/lib/Xaw/ScrollbarP.h b/lib/Xaw/ScrollbarP.h index 695b8cd79..ec3af46f8 100644 --- a/lib/Xaw/ScrollbarP.h +++ b/lib/Xaw/ScrollbarP.h @@ -1,5 +1,5 @@ /* - * $Xorg: ScrollbarP.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ + * $Xorg: ScrollbarP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.6 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.7 2001/01/17 19:42:29 dawes Exp $ */ #ifndef _ScrollbarP_h #define _ScrollbarP_h diff --git a/lib/Xaw/Simple.c b/lib/Xaw/Simple.c index 7fc18fdcb..db1fc8852 100644 --- a/lib/Xaw/Simple.c +++ b/lib/Xaw/Simple.c @@ -1,10 +1,14 @@ -/* $Xorg: Simple.c,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ +/* $Xorg: Simple.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.c,v 1.14 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.c,v 1.16 2001/09/29 04:36:02 paulo Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/lib/Xaw/Simple.h b/lib/Xaw/Simple.h index b1bb347a9..7ba9354b9 100644 --- a/lib/Xaw/Simple.h +++ b/lib/Xaw/Simple.h @@ -1,10 +1,14 @@ -/* $Xorg: Simple.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ +/* $Xorg: Simple.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.h,v 1.7 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.h,v 1.8 2001/01/17 19:42:30 dawes Exp $ */ #ifndef _Simple_h #define _Simple_h diff --git a/lib/Xaw/SimpleMenP.h b/lib/Xaw/SimpleMenP.h index ebea6d1c3..46102059e 100644 --- a/lib/Xaw/SimpleMenP.h +++ b/lib/Xaw/SimpleMenP.h @@ -1,9 +1,13 @@ /* - * $Xorg: SimpleMenP.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ + * $Xorg: SimpleMenP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/SimpleMenP.h,v 1.11 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenP.h,v 1.12 2001/01/17 19:42:30 dawes Exp $ */ /* * SimpleMenuP.h - Private Header file for SimpleMenu widget. diff --git a/lib/Xaw/SimpleMenu.c b/lib/Xaw/SimpleMenu.c index fe7a6ef08..8f61c7493 100644 --- a/lib/Xaw/SimpleMenu.c +++ b/lib/Xaw/SimpleMenu.c @@ -1,9 +1,13 @@ -/* $Xorg: SimpleMenu.c,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ */ +/* $Xorg: SimpleMenu.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.20 2001/01/17 19:42:30 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.21 2001/03/23 23:59:15 paulo Exp $ */ /* * SimpleMenu.c - Source code file for SimpleMenu widget. diff --git a/lib/Xaw/SimpleMenu.h b/lib/Xaw/SimpleMenu.h index 1fb2911b6..0ee689683 100644 --- a/lib/Xaw/SimpleMenu.h +++ b/lib/Xaw/SimpleMenu.h @@ -1,9 +1,13 @@ /* - * $Xorg: SimpleMenu.h,v 1.3 2000/08/17 19:45:37 cpqbld Exp $ + * $Xorg: SimpleMenu.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.6 1999/06/13 13:47:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.7 2001/01/17 19:42:30 dawes Exp $ */ /* * SimpleMenu.h - Public Header file for SimpleMenu widget. diff --git a/lib/Xaw/SimpleP.h b/lib/Xaw/SimpleP.h index f75015f64..444726a15 100644 --- a/lib/Xaw/SimpleP.h +++ b/lib/Xaw/SimpleP.h @@ -1,11 +1,15 @@ /*********************************************************** - $Xorg: SimpleP.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ + $Xorg: SimpleP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.10 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.11 2001/01/17 19:42:30 dawes Exp $ */ #ifndef _SimpleP_h #define _SimpleP_h diff --git a/lib/Xaw/Sme.c b/lib/Xaw/Sme.c index ad374966e..7e0baeddf 100644 --- a/lib/Xaw/Sme.c +++ b/lib/Xaw/Sme.c @@ -1,9 +1,13 @@ -/* $Xorg: Sme.c,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ */ +/* $Xorg: Sme.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/Sme.c,v 1.5 1999/06/06 08:48:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.c,v 1.6 2001/01/17 19:42:31 dawes Exp $ */ /* * Date: September 26, 1989 diff --git a/lib/Xaw/Sme.h b/lib/Xaw/Sme.h index 97d398216..fb87b0073 100644 --- a/lib/Xaw/Sme.h +++ b/lib/Xaw/Sme.h @@ -1,9 +1,13 @@ /* - * $Xorg: Sme.h,v 1.4 2000/08/17 19:45:38 cpqbld Exp $ + * $Xorg: Sme.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/Sme.h,v 1.4 1998/10/03 08:42:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.h,v 1.5 2001/01/17 19:42:31 dawes Exp $ */ /* * This is the public header file for the Athena Sme object. diff --git a/lib/Xaw/SmeBSB.c b/lib/Xaw/SmeBSB.c index 0c5327890..e360c3fd0 100644 --- a/lib/Xaw/SmeBSB.c +++ b/lib/Xaw/SmeBSB.c @@ -1,9 +1,13 @@ -/* $Xorg: SmeBSB.c,v 1.4 2000/08/17 19:45:38 cpqbld Exp $ */ +/* $Xorg: SmeBSB.c,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.10 1999/06/06 08:48:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.11 2001/01/17 19:42:31 dawes Exp $ */ /* * SmeBSB.c - Source code file for BSB Menu Entry object. diff --git a/lib/Xaw/SmeBSB.h b/lib/Xaw/SmeBSB.h index 5fb0a13d1..094b558c3 100644 --- a/lib/Xaw/SmeBSB.h +++ b/lib/Xaw/SmeBSB.h @@ -1,9 +1,13 @@ /* - * $Xorg: SmeBSB.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ + * $Xorg: SmeBSB.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/SmeBSB.h,v 1.5 1999/04/25 10:01:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.h,v 1.6 2001/01/17 19:42:31 dawes Exp $ */ /* * SmeBSB.h - Public Header file for SmeBSB object. diff --git a/lib/Xaw/SmeBSBP.h b/lib/Xaw/SmeBSBP.h index 7bf0f921d..6b263e7a8 100644 --- a/lib/Xaw/SmeBSBP.h +++ b/lib/Xaw/SmeBSBP.h @@ -1,9 +1,13 @@ /* - * $Xorg: SmeBSBP.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ + * $Xorg: SmeBSBP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.7 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.8 2001/01/17 19:42:31 dawes Exp $ */ #ifndef _XawSmeBSBP_h #define _XawSmeBSBP_h diff --git a/lib/Xaw/SmeLine.c b/lib/Xaw/SmeLine.c index d733384fc..c3b39c832 100644 --- a/lib/Xaw/SmeLine.c +++ b/lib/Xaw/SmeLine.c @@ -1,9 +1,13 @@ -/* $Xorg: SmeLine.c,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ */ +/* $Xorg: SmeLine.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.6 1999/06/06 08:48:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.7 2001/01/17 19:42:31 dawes Exp $ */ /* * Sme.c - Source code for the generic menu entry diff --git a/lib/Xaw/SmeLine.h b/lib/Xaw/SmeLine.h index df9834c73..7c9d4e41a 100644 --- a/lib/Xaw/SmeLine.h +++ b/lib/Xaw/SmeLine.h @@ -1,9 +1,13 @@ /* - * $Xorg: SmeLine.h,v 1.3 2000/08/17 19:45:38 cpqbld Exp $ + * $Xorg: SmeLine.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/SmeLine.h,v 1.4 1998/10/03 08:42:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.h,v 1.5 2001/01/17 19:42:31 dawes Exp $ */ /* * This is the public header file for the Athena SmeLine object. diff --git a/lib/Xaw/SmeLineP.h b/lib/Xaw/SmeLineP.h index 6564d31a5..7102d03f9 100644 --- a/lib/Xaw/SmeLineP.h +++ b/lib/Xaw/SmeLineP.h @@ -1,9 +1,13 @@ /* - * $Xorg: SmeLineP.h,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ + * $Xorg: SmeLineP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.6 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.7 2001/01/17 19:42:31 dawes Exp $ */ #ifndef _XawSmeLineP_h #define _XawSmeLineP_h diff --git a/lib/Xaw/SmeP.h b/lib/Xaw/SmeP.h index 84dff5f4b..b2dbd67a7 100644 --- a/lib/Xaw/SmeP.h +++ b/lib/Xaw/SmeP.h @@ -1,9 +1,13 @@ /* - * $Xorg: SmeP.h,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ + * $Xorg: SmeP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.6 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.7 2001/01/17 19:42:32 dawes Exp $ */ /* * This is the private header file for the Athena Sme object. diff --git a/lib/Xaw/StripCharP.h b/lib/Xaw/StripCharP.h index 182317541..50ed74c98 100644 --- a/lib/Xaw/StripCharP.h +++ b/lib/Xaw/StripCharP.h @@ -1,5 +1,5 @@ /* -* $Xorg: StripCharP.h,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ +* $Xorg: StripCharP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.6 1999/06/20 08:41:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.7 2001/01/17 19:42:32 dawes Exp $ */ #ifndef _XawStripChartP_h #define _XawStripChartP_h diff --git a/lib/Xaw/StripChart.c b/lib/Xaw/StripChart.c index c1dea6b1b..25a84d7c5 100644 --- a/lib/Xaw/StripChart.c +++ b/lib/Xaw/StripChart.c @@ -1,10 +1,14 @@ -/* $Xorg: StripChart.c,v 1.3 2000/08/17 19:45:39 cpqbld Exp $ */ +/* $Xorg: StripChart.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.6 1999/06/06 08:48:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.7 2001/01/17 19:42:32 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/lib/Xaw/StripChart.h b/lib/Xaw/StripChart.h index 6532b5cb8..b6c6f212a 100644 --- a/lib/Xaw/StripChart.h +++ b/lib/Xaw/StripChart.h @@ -1,10 +1,14 @@ -/* $Xorg: StripChart.h,v 1.4 2000/08/17 19:45:39 cpqbld Exp $ */ +/* $Xorg: StripChart.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.4 1998/10/03 08:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.5 2001/01/17 19:42:32 dawes Exp $ */ #ifndef _XawStripChart_h #define _XawStripChart_h diff --git a/lib/Xaw/Template.c b/lib/Xaw/Template.c index a6eecd798..f1e1db12f 100644 --- a/lib/Xaw/Template.c +++ b/lib/Xaw/Template.c @@ -1,10 +1,14 @@ -/* $Xorg: Template.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ +/* $Xorg: Template.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Template.c,v 1.7 2001/01/17 19:42:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.c,v 1.8 2001/08/01 00:44:39 tsi Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Template.h b/lib/Xaw/Template.h index eb23a90a2..5ec0974cf 100644 --- a/lib/Xaw/Template.h +++ b/lib/Xaw/Template.h @@ -1,10 +1,14 @@ -/* $Xorg: Template.h,v 1.4 2000/08/17 19:45:40 cpqbld Exp $ */ +/* $Xorg: Template.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Template.h,v 1.4 1998/10/03 08:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.h,v 1.5 2001/01/17 19:42:32 dawes Exp $ */ #ifndef _Template_h #define _Template_h diff --git a/lib/Xaw/TemplateP.h b/lib/Xaw/TemplateP.h index b55a1fb62..f3e3d67d5 100644 --- a/lib/Xaw/TemplateP.h +++ b/lib/Xaw/TemplateP.h @@ -1,10 +1,14 @@ -/* $Xorg: TemplateP.h,v 1.4 2000/08/17 19:45:40 cpqbld Exp $ */ +/* $Xorg: TemplateP.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.5 1999/06/06 08:48:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.6 2001/01/17 19:42:32 dawes Exp $ */ #ifndef _TemplateP_h #define _TemplateP_h diff --git a/lib/Xaw/Text.c b/lib/Xaw/Text.c index 2f35fd1c8..b46f35b03 100644 --- a/lib/Xaw/Text.c +++ b/lib/Xaw/Text.c @@ -1,10 +1,14 @@ -/* $Xorg: Text.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ +/* $Xorg: Text.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -70,7 +74,7 @@ SOFTWARE. * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Text.c,v 3.47 2001/11/03 16:07:22 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.c,v 3.48 2001/11/06 06:43:23 paulo Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/lib/Xaw/Text.h b/lib/Xaw/Text.h index a7b6901ff..af80ffcdb 100644 --- a/lib/Xaw/Text.h +++ b/lib/Xaw/Text.h @@ -1,10 +1,14 @@ -/* $Xorg: Text.h,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ +/* $Xorg: Text.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Text.h,v 1.13 1999/08/15 13:00:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.h,v 1.14 2001/01/17 19:42:34 dawes Exp $ */ #ifndef _XawText_h #define _XawText_h diff --git a/lib/Xaw/TextAction.c b/lib/Xaw/TextAction.c index c7bad4d6e..c250f5f7f 100644 --- a/lib/Xaw/TextAction.c +++ b/lib/Xaw/TextAction.c @@ -1,10 +1,14 @@ -/* $Xorg: TextAction.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ +/* $Xorg: TextAction.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.40 2001/02/23 19:14:41 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.42 2001/12/03 13:38:10 paulo Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/lib/Xaw/TextP.h b/lib/Xaw/TextP.h index a7135b390..e60541259 100644 --- a/lib/Xaw/TextP.h +++ b/lib/Xaw/TextP.h @@ -1,5 +1,5 @@ /* -* $Xorg: TextP.h,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ +* $Xorg: TextP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextP.h,v 3.19 2001/01/17 19:42:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextP.h,v 3.20 2001/08/01 00:44:39 tsi Exp $ */ #ifndef _XawTextP_h #define _XawTextP_h diff --git a/lib/Xaw/TextPop.c b/lib/Xaw/TextPop.c index aaad68c00..0044a154c 100644 --- a/lib/Xaw/TextPop.c +++ b/lib/Xaw/TextPop.c @@ -1,10 +1,14 @@ -/* $Xorg: TextPop.c,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ */ +/* $Xorg: TextPop.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.18 2001/02/05 22:38:05 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.19 2001/07/25 15:04:49 dawes Exp $ */ /* * This file is broken up into three sections one dealing with diff --git a/lib/Xaw/TextSink.c b/lib/Xaw/TextSink.c index 36c3668c6..243fe27c6 100644 --- a/lib/Xaw/TextSink.c +++ b/lib/Xaw/TextSink.c @@ -1,9 +1,13 @@ -/* $Xorg: TextSink.c,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ */ +/* $Xorg: TextSink.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.18 2001/01/17 19:42:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.19 2001/08/23 00:03:20 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/lib/Xaw/TextSink.h b/lib/Xaw/TextSink.h index 878de4b0f..291b9600d 100644 --- a/lib/Xaw/TextSink.h +++ b/lib/Xaw/TextSink.h @@ -1,12 +1,16 @@ /* - * $Xorg: TextSink.h,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ + * $Xorg: TextSink.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.8 1999/08/15 13:00:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.9 2001/01/17 19:42:35 dawes Exp $ */ #ifndef _XawTextSink_h #define _XawTextSink_h diff --git a/lib/Xaw/TextSinkP.h b/lib/Xaw/TextSinkP.h index 4188f8bd2..6cc873328 100644 --- a/lib/Xaw/TextSinkP.h +++ b/lib/Xaw/TextSinkP.h @@ -1,5 +1,5 @@ /* -* $Xorg: TextSinkP.h,v 1.3 2000/08/17 19:45:41 cpqbld Exp $ +* $Xorg: TextSinkP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.10 1999/09/06 13:02:17 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.11 2001/01/17 19:42:35 dawes Exp $ */ #ifndef _XawTextSinkP_h #define _XawTextSinkP_h diff --git a/lib/Xaw/TextSrc.c b/lib/Xaw/TextSrc.c index cc4de6b36..1453d9ced 100644 --- a/lib/Xaw/TextSrc.c +++ b/lib/Xaw/TextSrc.c @@ -1,9 +1,13 @@ -/* $Xorg: TextSrc.c,v 1.4 2000/08/17 19:45:41 cpqbld Exp $ */ +/* $Xorg: TextSrc.c,v 1.5 2001/02/09 02:03:47 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.26 2001/01/17 19:42:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.29 2001/12/02 15:02:30 paulo Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/lib/Xaw/TextSrc.h b/lib/Xaw/TextSrc.h index a1ad872f5..817132d48 100644 --- a/lib/Xaw/TextSrc.h +++ b/lib/Xaw/TextSrc.h @@ -1,12 +1,16 @@ /* - * $Xorg: TextSrc.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ + * $Xorg: TextSrc.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.10 1999/08/15 13:00:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.11 2001/01/17 19:42:35 dawes Exp $ */ #ifndef _XawTextSrc_h #define _XawTextSrc_h diff --git a/lib/Xaw/TextSrcP.h b/lib/Xaw/TextSrcP.h index 59cdb76c3..3131b9620 100644 --- a/lib/Xaw/TextSrcP.h +++ b/lib/Xaw/TextSrcP.h @@ -1,5 +1,5 @@ /* -* $Xorg: TextSrcP.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ +* $Xorg: TextSrcP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.12 1999/09/27 06:29:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.13 2001/01/17 19:42:35 dawes Exp $ */ #ifndef _XawTextSrcP_h #define _XawTextSrcP_h diff --git a/lib/Xaw/TextTr.c b/lib/Xaw/TextTr.c index 78426521a..c918ee6db 100644 --- a/lib/Xaw/TextTr.c +++ b/lib/Xaw/TextTr.c @@ -1,10 +1,14 @@ -/* $Xorg: TextTr.c,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ +/* $Xorg: TextTr.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /* Copyright 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.14 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.15 2001/01/17 19:42:35 dawes Exp $ */ /* INTERNATIONALIZATION: diff --git a/lib/Xaw/Toggle.c b/lib/Xaw/Toggle.c index fbddfd495..2ec2b113a 100644 --- a/lib/Xaw/Toggle.c +++ b/lib/Xaw/Toggle.c @@ -1,10 +1,14 @@ -/* $Xorg: Toggle.c,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ +/* $Xorg: Toggle.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.7 2001/01/17 19:42:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.8 2001/08/23 00:03:20 dawes Exp $ */ /* * Author: Chris D. Peterson diff --git a/lib/Xaw/Toggle.h b/lib/Xaw/Toggle.h index ec33dbc78..4858961f2 100644 --- a/lib/Xaw/Toggle.h +++ b/lib/Xaw/Toggle.h @@ -1,9 +1,13 @@ /* - * $Xorg: Toggle.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ + * $Xorg: Toggle.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/Toggle.h,v 1.4 1998/10/03 08:42:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.h,v 1.5 2001/01/17 19:42:35 dawes Exp $ */ /* * ToggleP.h - Private definitions for Toggle widget diff --git a/lib/Xaw/ToggleP.h b/lib/Xaw/ToggleP.h index a6a146619..c1477379d 100644 --- a/lib/Xaw/ToggleP.h +++ b/lib/Xaw/ToggleP.h @@ -1,10 +1,14 @@ -/* $Xorg: ToggleP.h,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ */ +/* $Xorg: ToggleP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.6 1999/06/20 08:41:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.7 2001/01/17 19:42:35 dawes Exp $ */ /* * Author: Chris D. Peterson diff --git a/lib/Xaw/Tree.c b/lib/Xaw/Tree.c index 0e9aa9921..2d40f8f38 100644 --- a/lib/Xaw/Tree.c +++ b/lib/Xaw/Tree.c @@ -1,10 +1,14 @@ /* - * $Xorg: Tree.c,v 1.3 2000/08/17 19:45:42 cpqbld Exp $ + * $Xorg: Tree.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.c,v 1.8 1999/07/04 06:38:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.c,v 1.9 2001/01/17 19:42:35 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Tree.h b/lib/Xaw/Tree.h index 77e9e22c6..ae0990aa5 100644 --- a/lib/Xaw/Tree.h +++ b/lib/Xaw/Tree.h @@ -1,10 +1,14 @@ /* - * $Xorg: Tree.h,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ + * $Xorg: Tree.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.h,v 1.5 1999/06/06 08:48:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.h,v 1.6 2001/01/17 19:42:35 dawes Exp $ */ #ifndef _XawTree_h diff --git a/lib/Xaw/TreeP.h b/lib/Xaw/TreeP.h index abfaec60b..00e59c0a4 100644 --- a/lib/Xaw/TreeP.h +++ b/lib/Xaw/TreeP.h @@ -1,10 +1,14 @@ /* - * $Xorg: TreeP.h,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ + * $Xorg: TreeP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.5 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.6 2001/01/17 19:42:35 dawes Exp $ */ #ifndef _XawTreeP_h diff --git a/lib/Xaw/Vendor.c b/lib/Xaw/Vendor.c index 6647e79a6..9c3f677ea 100644 --- a/lib/Xaw/Vendor.c +++ b/lib/Xaw/Vendor.c @@ -1,10 +1,14 @@ -/* $Xorg: Vendor.c,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ */ +/* $Xorg: Vendor.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.6 1999/03/21 07:34:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.7 2001/01/17 19:42:35 dawes Exp $ */ /* * This is a copy of Xt/Vendor.c with an additional ClassInitialize diff --git a/lib/Xaw/VendorEP.h b/lib/Xaw/VendorEP.h index 39cf5c380..dc85b3644 100644 --- a/lib/Xaw/VendorEP.h +++ b/lib/Xaw/VendorEP.h @@ -1,4 +1,4 @@ -/* $Xorg: VendorEP.h,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ */ +/* $Xorg: VendorEP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -30,7 +30,11 @@ Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -47,7 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.4 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.5 2001/01/17 19:42:36 dawes Exp $ */ #ifndef _VendorEP_h #define _VendorEP_h diff --git a/lib/Xaw/Viewport.c b/lib/Xaw/Viewport.c index e8e10c1a0..5cdb8a53f 100644 --- a/lib/Xaw/Viewport.c +++ b/lib/Xaw/Viewport.c @@ -1,10 +1,14 @@ -/* $Xorg: Viewport.c,v 1.3 2000/08/17 19:45:43 cpqbld Exp $ */ +/* $Xorg: Viewport.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.9 2001/01/17 19:42:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.10 2001/08/23 00:03:20 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/Viewport.h b/lib/Xaw/Viewport.h index 161289aab..a4b678c83 100644 --- a/lib/Xaw/Viewport.h +++ b/lib/Xaw/Viewport.h @@ -1,10 +1,14 @@ -/* $Xorg: Viewport.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ +/* $Xorg: Viewport.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.5 1999/05/03 12:15:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.6 2001/01/17 19:42:36 dawes Exp $ */ #ifndef _XawViewport_h #define _XawViewport_h diff --git a/lib/Xaw/ViewportP.h b/lib/Xaw/ViewportP.h index 679547bfd..9de6eaed8 100644 --- a/lib/Xaw/ViewportP.h +++ b/lib/Xaw/ViewportP.h @@ -1,5 +1,5 @@ /* - * $Xorg: ViewportP.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ + * $Xorg: ViewportP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Private declarations for ViewportWidgetClass */ @@ -7,7 +7,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.6 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.7 2001/01/17 19:42:36 dawes Exp $ */ #ifndef _ViewportP_h #define _ViewportP_h diff --git a/lib/Xaw/XawI18n.c b/lib/Xaw/XawI18n.c index ae36cded8..0657fbb97 100644 --- a/lib/Xaw/XawI18n.c +++ b/lib/Xaw/XawI18n.c @@ -1,4 +1,4 @@ -/* $Xorg: XawI18n.c,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ +/* $Xorg: XawI18n.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /* Copyright 1991 NCR Corporation - Dayton, Ohio, USA */ @@ -32,7 +32,11 @@ Copyright 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,7 +53,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.6 1999/07/19 13:36:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.7 2001/01/17 19:42:36 dawes Exp $ */ #include <X11/IntrinsicP.h> #include "XawI18n.h" diff --git a/lib/Xaw/XawI18n.h b/lib/Xaw/XawI18n.h index 53f9bd054..2e4d773e9 100644 --- a/lib/Xaw/XawI18n.h +++ b/lib/Xaw/XawI18n.h @@ -1,10 +1,14 @@ -/* $Xorg: XawI18n.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ +/* $Xorg: XawI18n.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /************************************************************ Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.12 2001/07/25 15:04:49 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.13 2001/11/16 16:47:52 dawes Exp $ */ #ifdef HAS_WCTYPE_H #include <wctype.h> diff --git a/lib/Xaw/XawIm.c b/lib/Xaw/XawIm.c index d8af0d65a..ec36f1faa 100644 --- a/lib/Xaw/XawIm.c +++ b/lib/Xaw/XawIm.c @@ -1,4 +1,4 @@ -/* $Xorg: XawIm.c,v 1.4 2000/08/17 19:45:44 cpqbld Exp $ */ +/* $Xorg: XawIm.c,v 1.6 2001/02/09 02:03:47 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -31,7 +31,11 @@ Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -48,7 +52,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.12 2001/01/17 19:42:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.13 2001/07/25 15:04:49 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/lib/Xaw/XawImP.h b/lib/Xaw/XawImP.h index 5c39cf3c5..e36f5050f 100644 --- a/lib/Xaw/XawImP.h +++ b/lib/Xaw/XawImP.h @@ -1,4 +1,4 @@ -/* $Xorg: XawImP.h,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ +/* $Xorg: XawImP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -30,7 +30,11 @@ Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -47,7 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.7 1999/03/14 11:17:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.8 2001/01/17 19:42:36 dawes Exp $ */ #ifndef _XawImP_h #define _XawImP_h diff --git a/lib/Xaw/XawInit.c b/lib/Xaw/XawInit.c index b027e62aa..4d9e1f508 100644 --- a/lib/Xaw/XawInit.c +++ b/lib/Xaw/XawInit.c @@ -1,9 +1,13 @@ /* - * $Xorg: XawInit.c,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ + * $Xorg: XawInit.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -28,7 +32,7 @@ in this Software without prior written authorization from The Open Group. * call this routine from their ClassInitialize procs (this routine may be * used as the class init proc). */ -/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.8 1999/06/06 08:48:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.9 2001/01/17 19:42:36 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Vendor.h> diff --git a/lib/Xaw/XawInit.h b/lib/Xaw/XawInit.h index 49d5cbaa1..da9d44625 100644 --- a/lib/Xaw/XawInit.h +++ b/lib/Xaw/XawInit.h @@ -1,8 +1,12 @@ -/* $Xorg: XawInit.h,v 1.4 2000/08/17 19:45:44 cpqbld Exp $ +/* $Xorg: XawInit.h,v 1.5 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,7 +22,7 @@ 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 Open Group. */ -/* $XFree86: xc/lib/Xaw/XawInit.h,v 1.11 1999/08/28 09:00:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.h,v 1.12 2001/01/17 19:42:36 dawes Exp $ */ #ifndef _XawInit_h #define _XawInit_h diff --git a/lib/Xbsd/Berklib.c b/lib/Xbsd/Berklib.c index df640a8a6..b70aa0273 100644 --- a/lib/Xbsd/Berklib.c +++ b/lib/Xbsd/Berklib.c @@ -1,9 +1,13 @@ -/* $Xorg: Berklib.c,v 1.3 2000/08/17 19:45:46 cpqbld Exp $ */ +/* $Xorg: Berklib.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.7 2001/01/17 19:42:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.8 2001/07/25 15:04:49 dawes Exp $ */ /* diff --git a/lib/Xdmcp/A8Eq.c b/lib/Xdmcp/A8Eq.c index 3b948d100..dbb33c83f 100644 --- a/lib/Xdmcp/A8Eq.c +++ b/lib/Xdmcp/A8Eq.c @@ -1,15 +1,14 @@ /* - * $XConsortium: A8Eq.c,v 1.4 94/04/17 20:16:28 gildea Exp $ + * $Xorg: A8Eq.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/AA16.c b/lib/Xdmcp/AA16.c index 92ad086df..95978abd3 100644 --- a/lib/Xdmcp/AA16.c +++ b/lib/Xdmcp/AA16.c @@ -1,10 +1,14 @@ /* - * $Xorg: AA16.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ + * $Xorg: AA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.2 1998/10/10 15:25:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/AA32.c b/lib/Xdmcp/AA32.c index 771468b12..21e69a627 100644 --- a/lib/Xdmcp/AA32.c +++ b/lib/Xdmcp/AA32.c @@ -1,10 +1,14 @@ /* - * $Xorg: AA32.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ + * $Xorg: AA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.2 1998/10/10 15:25:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/AA8.c b/lib/Xdmcp/AA8.c index 4e7dc259b..bdd61e49c 100644 --- a/lib/Xdmcp/AA8.c +++ b/lib/Xdmcp/AA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: AA8.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ + * $Xorg: AA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.2 1998/10/10 15:25:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/Alloc.c b/lib/Xdmcp/Alloc.c index d84972c84..9db8fc5a6 100644 --- a/lib/Xdmcp/Alloc.c +++ b/lib/Xdmcp/Alloc.c @@ -1,10 +1,14 @@ /* - * $Xorg: Alloc.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ + * $Xorg: Alloc.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.3 2001/01/17 19:42:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */ diff --git a/lib/Xdmcp/AofA8.c b/lib/Xdmcp/AofA8.c index 1d1628643..541993475 100644 --- a/lib/Xdmcp/AofA8.c +++ b/lib/Xdmcp/AofA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: AofA8.c,v 1.3 2000/08/17 19:45:47 cpqbld Exp $ + * $Xorg: AofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.2 1998/10/10 15:25:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/CA8.c b/lib/Xdmcp/CA8.c index 9cfcec80d..627e8242a 100644 --- a/lib/Xdmcp/CA8.c +++ b/lib/Xdmcp/CA8.c @@ -1,15 +1,14 @@ /* - * $XConsortium: CA8.c,v 1.5 94/04/17 20:16:31 rws Exp $ + * $Xorg: CA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/CmpKey.c b/lib/Xdmcp/CmpKey.c index d3c37d154..bfffd8264 100644 --- a/lib/Xdmcp/CmpKey.c +++ b/lib/Xdmcp/CmpKey.c @@ -1,10 +1,14 @@ /* - * $Xorg: CmpKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: CmpKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.2 1998/10/10 15:25:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/DA16.c b/lib/Xdmcp/DA16.c index bf8dacf32..692d1f37d 100644 --- a/lib/Xdmcp/DA16.c +++ b/lib/Xdmcp/DA16.c @@ -1,10 +1,14 @@ /* - * $Xorg: DA16.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: DA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.4 1998/10/10 15:25:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.5 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/DA32.c b/lib/Xdmcp/DA32.c index 2758c40db..e27842b1b 100644 --- a/lib/Xdmcp/DA32.c +++ b/lib/Xdmcp/DA32.c @@ -1,10 +1,14 @@ /* - * $Xorg: DA32.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: DA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xdmcp/DA8.c b/lib/Xdmcp/DA8.c index be0bb5750..a808d9a09 100644 --- a/lib/Xdmcp/DA8.c +++ b/lib/Xdmcp/DA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: DA8.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: DA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xdmcp/DAofA8.c b/lib/Xdmcp/DAofA8.c index b0e853d2d..0e818a3e9 100644 --- a/lib/Xdmcp/DAofA8.c +++ b/lib/Xdmcp/DAofA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: DAofA8.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: DAofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xdmcp/DecKey.c b/lib/Xdmcp/DecKey.c index e678e7727..e2893f356 100644 --- a/lib/Xdmcp/DecKey.c +++ b/lib/Xdmcp/DecKey.c @@ -1,10 +1,14 @@ /* - * $Xorg: DecKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: DecKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.2 1998/10/10 15:25:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/Fill.c b/lib/Xdmcp/Fill.c index 71da95341..111c3868f 100644 --- a/lib/Xdmcp/Fill.c +++ b/lib/Xdmcp/Fill.c @@ -1,10 +1,14 @@ /* - * $Xorg: Fill.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: Fill.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.7 2001/01/17 19:42:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.8 2001/07/23 13:15:42 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/lib/Xdmcp/Flush.c b/lib/Xdmcp/Flush.c index 5782b710d..8be9790cd 100644 --- a/lib/Xdmcp/Flush.c +++ b/lib/Xdmcp/Flush.c @@ -1,10 +1,14 @@ /* - * $Xorg: Flush.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: Flush.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.6 2001/01/17 19:42:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.7 2001/07/23 13:15:42 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/lib/Xdmcp/GenKey.c b/lib/Xdmcp/GenKey.c index 7a142a581..d3724247a 100644 --- a/lib/Xdmcp/GenKey.c +++ b/lib/Xdmcp/GenKey.c @@ -1,10 +1,14 @@ /* - * $Xorg: GenKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: GenKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.6 2001/01/17 19:42:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/IncKey.c b/lib/Xdmcp/IncKey.c index 155fdf35a..cdd08dc6e 100644 --- a/lib/Xdmcp/IncKey.c +++ b/lib/Xdmcp/IncKey.c @@ -1,10 +1,14 @@ /* - * $Xorg: IncKey.c,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: IncKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.2 1998/10/10 15:25:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.3 2001/01/17 19:42:43 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/RA16.c b/lib/Xdmcp/RA16.c index 76fafa6bb..3453ce451 100644 --- a/lib/Xdmcp/RA16.c +++ b/lib/Xdmcp/RA16.c @@ -1,10 +1,14 @@ /* - * $Xorg: RA16.c,v 1.4 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: RA16.c,v 1.5 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xdmcp/RA32.c b/lib/Xdmcp/RA32.c index e16d1d118..21c078c10 100644 --- a/lib/Xdmcp/RA32.c +++ b/lib/Xdmcp/RA32.c @@ -1,10 +1,14 @@ /* - * $Xorg: RA32.c,v 1.4 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: RA32.c,v 1.5 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xdmcp/RA8.c b/lib/Xdmcp/RA8.c index a69f6212e..50a6d23aa 100644 --- a/lib/Xdmcp/RA8.c +++ b/lib/Xdmcp/RA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: RA8.c,v 1.4 2000/08/17 19:45:48 cpqbld Exp $ + * $Xorg: RA8.c,v 1.5 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xdmcp/RAofA8.c b/lib/Xdmcp/RAofA8.c index 33280ec7f..b4b2ceaf2 100644 --- a/lib/Xdmcp/RAofA8.c +++ b/lib/Xdmcp/RAofA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: RAofA8.c,v 1.5 2000/08/17 19:45:49 cpqbld Exp $ + * $Xorg: RAofA8.c,v 1.6 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xdmcp/RC16.c b/lib/Xdmcp/RC16.c index ca4d404f2..ff2604dcd 100644 --- a/lib/Xdmcp/RC16.c +++ b/lib/Xdmcp/RC16.c @@ -1,15 +1,14 @@ /* - * $XConsortium: RC16.c,v 1.3 94/04/17 20:16:39 gildea Exp $ + * $Xorg: RC16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/RC32.c b/lib/Xdmcp/RC32.c index 6494008c6..a86556346 100644 --- a/lib/Xdmcp/RC32.c +++ b/lib/Xdmcp/RC32.c @@ -1,15 +1,14 @@ /* - * $XConsortium: RC32.c,v 1.3 94/04/17 20:16:39 gildea Exp $ + * $Xorg: RC32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/RC8.c b/lib/Xdmcp/RC8.c index c543e8f60..7c3d11aba 100644 --- a/lib/Xdmcp/RC8.c +++ b/lib/Xdmcp/RC8.c @@ -1,15 +1,14 @@ /* - * $XConsortium: RC8.c,v 1.4 94/04/17 20:16:40 gildea Exp $ + * $Xorg: RC8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/RHead.c b/lib/Xdmcp/RHead.c index 3676bb13b..b0af982ef 100644 --- a/lib/Xdmcp/RHead.c +++ b/lib/Xdmcp/RHead.c @@ -1,15 +1,14 @@ /* - * $XConsortium: RHead.c,v 1.3 94/04/17 20:16:40 gildea Exp $ + * $Xorg: RHead.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/RR.c b/lib/Xdmcp/RR.c index babfe6e10..1fa1dca32 100644 --- a/lib/Xdmcp/RR.c +++ b/lib/Xdmcp/RR.c @@ -1,15 +1,14 @@ /* - * $XConsortium: RR.c,v 1.3 94/04/17 20:16:41 gildea Exp $ + * $Xorg: RR.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/RaA16.c b/lib/Xdmcp/RaA16.c index 0fc67c249..525a2a193 100644 --- a/lib/Xdmcp/RaA16.c +++ b/lib/Xdmcp/RaA16.c @@ -1,10 +1,14 @@ /* - * $Xorg: RaA16.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ + * $Xorg: RaA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.2 1998/10/10 15:25:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/RaA32.c b/lib/Xdmcp/RaA32.c index 906c0ee68..ef1ab6eea 100644 --- a/lib/Xdmcp/RaA32.c +++ b/lib/Xdmcp/RaA32.c @@ -1,10 +1,14 @@ /* - * $Xorg: RaA32.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ + * $Xorg: RaA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/RaA8.c b/lib/Xdmcp/RaA8.c index ff260a2e9..7d671d8e7 100644 --- a/lib/Xdmcp/RaA8.c +++ b/lib/Xdmcp/RaA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: RaA8.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ + * $Xorg: RaA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/RaAoA8.c b/lib/Xdmcp/RaAoA8.c index 5199cfd37..0dd5243b5 100644 --- a/lib/Xdmcp/RaAoA8.c +++ b/lib/Xdmcp/RaAoA8.c @@ -1,10 +1,14 @@ /* - * $Xorg: RaAoA8.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ + * $Xorg: RaAoA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/Unwrap.c b/lib/Xdmcp/Unwrap.c index f9b8627f1..8a5c9eb09 100644 --- a/lib/Xdmcp/Unwrap.c +++ b/lib/Xdmcp/Unwrap.c @@ -1,10 +1,14 @@ /* - * $Xorg: Unwrap.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ + * $Xorg: Unwrap.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/WA16.c b/lib/Xdmcp/WA16.c index d1724503c..4f625b7ad 100644 --- a/lib/Xdmcp/WA16.c +++ b/lib/Xdmcp/WA16.c @@ -1,15 +1,14 @@ /* - * $XConsortium: WA16.c,v 1.4 94/04/17 20:16:44 gildea Exp $ + * $Xorg: WA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/WA32.c b/lib/Xdmcp/WA32.c index 2b2734294..140c750cc 100644 --- a/lib/Xdmcp/WA32.c +++ b/lib/Xdmcp/WA32.c @@ -1,15 +1,14 @@ /* - * $XConsortium: WA32.c,v 1.4 94/04/17 20:16:44 gildea Exp $ + * $Xorg: WA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/WA8.c b/lib/Xdmcp/WA8.c index 0a76663cc..3bd738a68 100644 --- a/lib/Xdmcp/WA8.c +++ b/lib/Xdmcp/WA8.c @@ -1,15 +1,14 @@ /* - * $XConsortium: WA8.c,v 1.4 94/04/17 20:16:45 gildea Exp $ + * $Xorg: WA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/WAofA8.c b/lib/Xdmcp/WAofA8.c index 961817925..84ba454d8 100644 --- a/lib/Xdmcp/WAofA8.c +++ b/lib/Xdmcp/WAofA8.c @@ -1,15 +1,14 @@ /* - * $XConsortium: WAofA8.c,v 1.5 94/04/17 20:16:45 gildea Exp $ + * $Xorg: WAofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. * * * Author: Keith Packard, MIT X Consortium */ diff --git a/lib/Xdmcp/WC16.c b/lib/Xdmcp/WC16.c index e64825f9f..1c86c90d8 100644 --- a/lib/Xdmcp/WC16.c +++ b/lib/Xdmcp/WC16.c @@ -1,10 +1,14 @@ /* - * $Xorg: WC16.c,v 1.3 2000/08/17 19:45:49 cpqbld Exp $ + * $Xorg: WC16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.3 1998/10/25 07:11:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/WC32.c b/lib/Xdmcp/WC32.c index db93c352e..963456711 100644 --- a/lib/Xdmcp/WC32.c +++ b/lib/Xdmcp/WC32.c @@ -1,10 +1,14 @@ /* - * $Xorg: WC32.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ + * $Xorg: WC32.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.3 1998/10/25 12:47:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/WC8.c b/lib/Xdmcp/WC8.c index 82f2acf92..c7f70128c 100644 --- a/lib/Xdmcp/WC8.c +++ b/lib/Xdmcp/WC8.c @@ -1,10 +1,14 @@ /* - * $Xorg: WC8.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ + * $Xorg: WC8.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.3 1998/10/25 07:11:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.4 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/Whead.c b/lib/Xdmcp/Whead.c index 8673dfbf2..4b991d852 100644 --- a/lib/Xdmcp/Whead.c +++ b/lib/Xdmcp/Whead.c @@ -1,10 +1,14 @@ /* - * $Xorg: Whead.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ + * $Xorg: Whead.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.2 1998/10/10 15:25:17 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xdmcp/Wrap.c b/lib/Xdmcp/Wrap.c index 90df705a9..2811cbd82 100644 --- a/lib/Xdmcp/Wrap.c +++ b/lib/Xdmcp/Wrap.c @@ -1,10 +1,14 @@ /* - * $Xorg: Wrap.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ + * $Xorg: Wrap.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.2 1998/10/10 15:25:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.3 2001/01/17 19:42:44 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/lib/Xi/XAllowDv.c b/lib/Xi/XAllowDv.c index 210d0d9c0..7201cddee 100644 --- a/lib/Xi/XAllowDv.c +++ b/lib/Xi/XAllowDv.c @@ -1,10 +1,14 @@ -/* $Xorg: XAllowDv.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XAllowDv.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.1 1998/10/03 09:06:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.2 2001/01/17 19:42:47 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XChgDCtl.c b/lib/Xi/XChgDCtl.c index 6821a8583..58095d901 100644 --- a/lib/Xi/XChgDCtl.c +++ b/lib/Xi/XChgDCtl.c @@ -1,10 +1,14 @@ -/* $Xorg: XChgDCtl.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XChgDCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.1 1998/10/03 09:06:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.2 2001/01/17 19:42:47 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XChgFCtl.c b/lib/Xi/XChgFCtl.c index 2607e0e32..f02697504 100644 --- a/lib/Xi/XChgFCtl.c +++ b/lib/Xi/XChgFCtl.c @@ -1,10 +1,14 @@ -/* $Xorg: XChgFCtl.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XChgFCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.2 2001/01/17 19:42:47 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XChgKMap.c b/lib/Xi/XChgKMap.c index ea29fe5e8..d83f66d68 100644 --- a/lib/Xi/XChgKMap.c +++ b/lib/Xi/XChgKMap.c @@ -1,10 +1,14 @@ -/* $Xorg: XChgKMap.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XChgKMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.2 2001/01/17 19:42:47 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XChgKbd.c b/lib/Xi/XChgKbd.c index f8f9b806d..2edeeab60 100644 --- a/lib/Xi/XChgKbd.c +++ b/lib/Xi/XChgKbd.c @@ -1,10 +1,14 @@ -/* $Xorg: XChgKbd.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XChgKbd.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.2 2001/01/17 19:42:47 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XChgPnt.c b/lib/Xi/XChgPnt.c index 19c6afcfc..be6276ec1 100644 --- a/lib/Xi/XChgPnt.c +++ b/lib/Xi/XChgPnt.c @@ -1,10 +1,14 @@ -/* $Xorg: XChgPnt.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XChgPnt.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.2 2001/01/17 19:42:47 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XChgProp.c b/lib/Xi/XChgProp.c index 26b4896bd..a1d4820ef 100644 --- a/lib/Xi/XChgProp.c +++ b/lib/Xi/XChgProp.c @@ -1,10 +1,14 @@ -/* $Xorg: XChgProp.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XChgProp.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.1 1998/10/03 09:06:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.2 2001/01/17 19:42:47 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XCloseDev.c b/lib/Xi/XCloseDev.c index 360376c1e..eb676ae40 100644 --- a/lib/Xi/XCloseDev.c +++ b/lib/Xi/XCloseDev.c @@ -1,10 +1,14 @@ -/* $Xorg: XCloseDev.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XCloseDev.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.1 1998/10/03 09:06:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.2 2001/01/17 19:42:48 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XDevBell.c b/lib/Xi/XDevBell.c index de294fcd5..405b32f12 100644 --- a/lib/Xi/XDevBell.c +++ b/lib/Xi/XDevBell.c @@ -1,10 +1,14 @@ -/* $Xorg: XDevBell.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XDevBell.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.1 1998/10/03 09:06:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.2 2001/01/17 19:42:48 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XExtInt.c b/lib/Xi/XExtInt.c index 63b453532..237f3cbe8 100644 --- a/lib/Xi/XExtInt.c +++ b/lib/Xi/XExtInt.c @@ -1,10 +1,14 @@ -/* $Xorg: XExtInt.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XExtInt.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.4 2001/01/17 19:42:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.5 2001/08/01 00:44:39 tsi Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XExtToWire.c b/lib/Xi/XExtToWire.c index 2c1bde4a7..99d321d9b 100644 --- a/lib/Xi/XExtToWire.c +++ b/lib/Xi/XExtToWire.c @@ -1,10 +1,14 @@ -/* $Xorg: XExtToWire.c,v 1.3 2000/08/17 19:45:54 cpqbld Exp $ */ +/* $Xorg: XExtToWire.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XExtToWire.c,v 3.2 2001/01/17 19:42:49 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XExtToWire.c,v 3.3 2001/08/01 00:44:39 tsi Exp $ */ /**************************************************************** * diff --git a/lib/Xi/XFreeLst.c b/lib/Xi/XFreeLst.c index 1917a9c43..63a59469c 100644 --- a/lib/Xi/XFreeLst.c +++ b/lib/Xi/XFreeLst.c @@ -1,15 +1,14 @@ -/* $XConsortium: XFreeLst.c,v 1.3 94/04/17 20:18:01 gms Exp $ */ +/* $Xorg: XFreeLst.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California. +Copyright 1989 by Hewlett-Packard Company, Palo Alto, California. All Rights Reserved diff --git a/lib/Xi/XGMotion.c b/lib/Xi/XGMotion.c index 96c4a8a5b..9e3643b2c 100644 --- a/lib/Xi/XGMotion.c +++ b/lib/Xi/XGMotion.c @@ -1,10 +1,14 @@ -/* $Xorg: XGMotion.c,v 1.3 2000/08/17 19:45:55 cpqbld Exp $ */ +/* $Xorg: XGMotion.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.1 1998/10/03 09:06:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.2 2001/01/17 19:42:49 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGetBMap.c b/lib/Xi/XGetBMap.c index decd7161a..36dcd13bb 100644 --- a/lib/Xi/XGetBMap.c +++ b/lib/Xi/XGetBMap.c @@ -1,10 +1,14 @@ -/* $Xorg: XGetBMap.c,v 1.3 2000/08/17 19:45:55 cpqbld Exp $ */ +/* $Xorg: XGetBMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.1 1998/10/03 09:06:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.2 2001/01/17 19:42:49 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGetDCtl.c b/lib/Xi/XGetDCtl.c index 6151e5d43..32909844d 100644 --- a/lib/Xi/XGetDCtl.c +++ b/lib/Xi/XGetDCtl.c @@ -1,10 +1,14 @@ -/* $Xorg: XGetDCtl.c,v 1.3 2000/08/17 19:45:55 cpqbld Exp $ */ +/* $Xorg: XGetDCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.1 1998/10/03 09:06:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.2 2001/01/17 19:42:49 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGetFCtl.c b/lib/Xi/XGetFCtl.c index 41736a04b..3abdf8f0c 100644 --- a/lib/Xi/XGetFCtl.c +++ b/lib/Xi/XGetFCtl.c @@ -1,10 +1,14 @@ -/* $Xorg: XGetFCtl.c,v 1.3 2000/08/17 19:45:55 cpqbld Exp $ */ +/* $Xorg: XGetFCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.1 1998/10/03 09:06:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.2 2001/01/17 19:42:49 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGetKMap.c b/lib/Xi/XGetKMap.c index a2503247f..b07f02d3e 100644 --- a/lib/Xi/XGetKMap.c +++ b/lib/Xi/XGetKMap.c @@ -1,10 +1,14 @@ -/* $Xorg: XGetKMap.c,v 1.3 2000/08/17 19:45:55 cpqbld Exp $ */ +/* $Xorg: XGetKMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.1 1998/10/03 09:06:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.2 2001/01/17 19:42:49 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGetMMap.c b/lib/Xi/XGetMMap.c index 6db51b0d4..ea52981f6 100644 --- a/lib/Xi/XGetMMap.c +++ b/lib/Xi/XGetMMap.c @@ -1,10 +1,14 @@ -/* $Xorg: XGetMMap.c,v 1.3 2000/08/17 19:45:55 cpqbld Exp $ */ +/* $Xorg: XGetMMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.1 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGetProp.c b/lib/Xi/XGetProp.c index 4e2f80266..ab39bf824 100644 --- a/lib/Xi/XGetProp.c +++ b/lib/Xi/XGetProp.c @@ -1,10 +1,14 @@ -/* $Xorg: XGetProp.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XGetProp.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.1 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGetVers.c b/lib/Xi/XGetVers.c index f7ff465c3..fdf69ffd8 100644 --- a/lib/Xi/XGetVers.c +++ b/lib/Xi/XGetVers.c @@ -1,10 +1,14 @@ -/* $Xorg: XGetVers.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XGetVers.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.1 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGrDvBut.c b/lib/Xi/XGrDvBut.c index f0b3b4c6a..b5517ff92 100644 --- a/lib/Xi/XGrDvBut.c +++ b/lib/Xi/XGrDvBut.c @@ -1,10 +1,14 @@ -/* $Xorg: XGrDvBut.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XGrDvBut.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.2 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.3 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGrDvKey.c b/lib/Xi/XGrDvKey.c index a870b7c1e..aa823b1f3 100644 --- a/lib/Xi/XGrDvKey.c +++ b/lib/Xi/XGrDvKey.c @@ -1,10 +1,14 @@ -/* $Xorg: XGrDvKey.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XGrDvKey.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.1 1998/10/03 09:06:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGrabDev.c b/lib/Xi/XGrabDev.c index 735899ca8..99d3545db 100644 --- a/lib/Xi/XGrabDev.c +++ b/lib/Xi/XGrabDev.c @@ -1,10 +1,14 @@ -/* $Xorg: XGrabDev.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XGrabDev.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.1 1998/10/03 09:06:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGtFocus.c b/lib/Xi/XGtFocus.c index b4c7336a5..227ef2718 100644 --- a/lib/Xi/XGtFocus.c +++ b/lib/Xi/XGtFocus.c @@ -1,10 +1,14 @@ -/* $Xorg: XGtFocus.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XGtFocus.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.1 1998/10/03 09:06:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XGtSelect.c b/lib/Xi/XGtSelect.c index d7bb29038..f82a83fb8 100644 --- a/lib/Xi/XGtSelect.c +++ b/lib/Xi/XGtSelect.c @@ -1,10 +1,14 @@ -/* $Xorg: XGtSelect.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XGtSelect.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.1 1998/10/03 09:06:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XListDev.c b/lib/Xi/XListDev.c index c40fed7b2..24d2e3d22 100644 --- a/lib/Xi/XListDev.c +++ b/lib/Xi/XListDev.c @@ -1,10 +1,14 @@ -/* $Xorg: XListDev.c,v 1.4 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XListDev.c,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XListDev.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XListDev.c,v 3.3 2001/10/28 03:32:39 tsi Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XOpenDev.c b/lib/Xi/XOpenDev.c index 5388656ea..2eaf51c7d 100644 --- a/lib/Xi/XOpenDev.c +++ b/lib/Xi/XOpenDev.c @@ -1,10 +1,14 @@ -/* $Xorg: XOpenDev.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XOpenDev.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.1 1998/10/03 09:06:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XQueryDv.c b/lib/Xi/XQueryDv.c index 95ab34ed3..215d5eaef 100644 --- a/lib/Xi/XQueryDv.c +++ b/lib/Xi/XQueryDv.c @@ -1,10 +1,14 @@ -/* $Xorg: XQueryDv.c,v 1.3 2000/08/17 19:45:56 cpqbld Exp $ */ +/* $Xorg: XQueryDv.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.1 1998/10/03 09:06:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XSelect.c b/lib/Xi/XSelect.c index 143016eb8..2ae0ca606 100644 --- a/lib/Xi/XSelect.c +++ b/lib/Xi/XSelect.c @@ -1,10 +1,14 @@ -/* $Xorg: XSelect.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XSelect.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSelect.c,v 3.1 1998/10/03 09:06:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSelect.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XSetBMap.c b/lib/Xi/XSetBMap.c index 404c4eb02..6838808ff 100644 --- a/lib/Xi/XSetBMap.c +++ b/lib/Xi/XSetBMap.c @@ -1,10 +1,14 @@ -/* $Xorg: XSetBMap.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XSetBMap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.1 1998/10/03 09:06:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XSetDVal.c b/lib/Xi/XSetDVal.c index b078b9a38..67463ee1b 100644 --- a/lib/Xi/XSetDVal.c +++ b/lib/Xi/XSetDVal.c @@ -1,10 +1,14 @@ -/* $Xorg: XSetDVal.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XSetDVal.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.2 2001/01/17 19:42:50 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XSetMMap.c b/lib/Xi/XSetMMap.c index adaaca0d3..8913f56bf 100644 --- a/lib/Xi/XSetMMap.c +++ b/lib/Xi/XSetMMap.c @@ -1,10 +1,14 @@ -/* $Xorg: XSetMMap.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XSetMMap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.2 2001/01/17 19:42:51 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XSetMode.c b/lib/Xi/XSetMode.c index 14568c26d..4c3c9674d 100644 --- a/lib/Xi/XSetMode.c +++ b/lib/Xi/XSetMode.c @@ -1,10 +1,14 @@ -/* $Xorg: XSetMode.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XSetMode.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.2 2001/01/17 19:42:51 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XSndExEv.c b/lib/Xi/XSndExEv.c index b3ea2cd9d..00cac7549 100644 --- a/lib/Xi/XSndExEv.c +++ b/lib/Xi/XSndExEv.c @@ -1,10 +1,14 @@ -/* $Xorg: XSndExEv.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XSndExEv.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSndExEv.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSndExEv.c,v 3.2 2001/01/17 19:42:51 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XStFocus.c b/lib/Xi/XStFocus.c index 4c073a275..d73d09ada 100644 --- a/lib/Xi/XStFocus.c +++ b/lib/Xi/XStFocus.c @@ -1,10 +1,14 @@ -/* $Xorg: XStFocus.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XStFocus.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.1 1998/10/03 09:06:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.2 2001/01/17 19:42:51 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XUngrDev.c b/lib/Xi/XUngrDev.c index e2fa615ea..2fa1897ba 100644 --- a/lib/Xi/XUngrDev.c +++ b/lib/Xi/XUngrDev.c @@ -1,10 +1,14 @@ -/* $Xorg: XUngrDev.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XUngrDev.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.1 1998/10/03 09:06:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.2 2001/01/17 19:42:51 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XUngrDvB.c b/lib/Xi/XUngrDvB.c index 11d75228d..f9d8391f5 100644 --- a/lib/Xi/XUngrDvB.c +++ b/lib/Xi/XUngrDvB.c @@ -1,10 +1,14 @@ -/* $Xorg: XUngrDvB.c,v 1.3 2000/08/17 19:45:57 cpqbld Exp $ */ +/* $Xorg: XUngrDvB.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.1 1998/10/03 09:06:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.2 2001/01/17 19:42:51 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xi/XUngrDvK.c b/lib/Xi/XUngrDvK.c index e4b00dc57..176506729 100644 --- a/lib/Xi/XUngrDvK.c +++ b/lib/Xi/XUngrDvK.c @@ -1,10 +1,14 @@ -/* $Xorg: XUngrDvK.c,v 1.3 2000/08/17 19:45:58 cpqbld Exp $ */ +/* $Xorg: XUngrDvK.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.1 1998/10/03 09:06:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.2 2001/01/17 19:42:51 dawes Exp $ */ /*********************************************************************** * diff --git a/lib/Xmu/AllCmap.c b/lib/Xmu/AllCmap.c index e4207c909..4315df092 100644 --- a/lib/Xmu/AllCmap.c +++ b/lib/Xmu/AllCmap.c @@ -1,10 +1,14 @@ -/* $Xorg: AllCmap.c,v 1.3 2000/08/17 19:45:58 cpqbld Exp $ */ +/* $Xorg: AllCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.6 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.7 2001/01/17 19:42:53 dawes Exp $ */ #include <stdio.h> #include <X11/Xlib.h> diff --git a/lib/Xmu/Atoms.c b/lib/Xmu/Atoms.c index 154f25cda..7a8cdd260 100644 --- a/lib/Xmu/Atoms.c +++ b/lib/Xmu/Atoms.c @@ -1,10 +1,14 @@ -/* $Xorg: Atoms.c,v 1.3 2000/08/17 19:45:58 cpqbld Exp $ */ +/* $Xorg: Atoms.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.6 2001/01/17 19:42:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * This file contains routines to cache atoms, avoiding multiple diff --git a/lib/Xmu/Atoms.h b/lib/Xmu/Atoms.h index 1288f6131..f7b4c8f7e 100644 --- a/lib/Xmu/Atoms.h +++ b/lib/Xmu/Atoms.h @@ -1,10 +1,14 @@ -/* $Xorg: Atoms.h,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: Atoms.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.5 2000/11/28 18:50:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/CharSet.h b/lib/Xmu/CharSet.h index d386dcba0..32cebfeda 100644 --- a/lib/Xmu/CharSet.h +++ b/lib/Xmu/CharSet.h @@ -1,10 +1,14 @@ -/* $Xorg: CharSet.h,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CharSet.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.6 1998/10/03 09:06:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.7 2001/01/17 19:42:53 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/ClientWin.c b/lib/Xmu/ClientWin.c index 87aff7eaf..07714b36c 100644 --- a/lib/Xmu/ClientWin.c +++ b/lib/Xmu/ClientWin.c @@ -1,10 +1,14 @@ -/* $Xorg: ClientWin.c,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: ClientWin.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.5 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xatom.h> diff --git a/lib/Xmu/CloseHook.c b/lib/Xmu/CloseHook.c index c1632a345..2b1bf60e1 100644 --- a/lib/Xmu/CloseHook.c +++ b/lib/Xmu/CloseHook.c @@ -1,9 +1,13 @@ -/* $Xorg: CloseHook.c,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CloseHook.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.4 2001/01/17 19:42:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * CloseDisplayHook package - provide callback on XCloseDisplay diff --git a/lib/Xmu/CloseHook.h b/lib/Xmu/CloseHook.h index bdea42c5c..1940a793b 100644 --- a/lib/Xmu/CloseHook.h +++ b/lib/Xmu/CloseHook.h @@ -1,10 +1,14 @@ -/* $Xorg: CloseHook.h,v 1.4 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CloseHook.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.5 1998/10/03 09:06:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/CmapAlloc.c b/lib/Xmu/CmapAlloc.c index b2b9f218b..38f3a4c1e 100644 --- a/lib/Xmu/CmapAlloc.c +++ b/lib/Xmu/CmapAlloc.c @@ -1,10 +1,14 @@ -/* $Xorg: CmapAlloc.c,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CmapAlloc.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.5 1998/10/03 09:06:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/Xmu/Converters.h b/lib/Xmu/Converters.h index 6f7ee7059..11055d950 100644 --- a/lib/Xmu/Converters.h +++ b/lib/Xmu/Converters.h @@ -1,10 +1,14 @@ -/* $Xorg: Converters.h,v 1.4 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: Converters.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Converters.h,v 1.4 1998/10/03 09:06:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Converters.h,v 1.5 2001/01/17 19:42:53 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/CrCmap.c b/lib/Xmu/CrCmap.c index d54f50272..7ed8b8197 100644 --- a/lib/Xmu/CrCmap.c +++ b/lib/Xmu/CrCmap.c @@ -1,10 +1,14 @@ -/* $Xorg: CrCmap.c,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.5 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/Xmu/CrPixFBit.c b/lib/Xmu/CrPixFBit.c index 144bb70fc..9d3bef68e 100644 --- a/lib/Xmu/CrPixFBit.c +++ b/lib/Xmu/CrPixFBit.c @@ -1,10 +1,14 @@ -/* $Xorg: CrPixFBit.c,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CrPixFBit.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.5 1998/10/03 09:06:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/lib/Xmu/CurUtil.h b/lib/Xmu/CurUtil.h index 880bf707d..27ab18848 100644 --- a/lib/Xmu/CurUtil.h +++ b/lib/Xmu/CurUtil.h @@ -1,10 +1,14 @@ -/* $Xorg: CurUtil.h,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CurUtil.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.4 1998/10/03 09:06:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/CursorName.c b/lib/Xmu/CursorName.c index a0c4dfc1b..1490903fa 100644 --- a/lib/Xmu/CursorName.c +++ b/lib/Xmu/CursorName.c @@ -1,10 +1,14 @@ -/* $Xorg: CursorName.c,v 1.3 2000/08/17 19:45:59 cpqbld Exp $ */ +/* $Xorg: CursorName.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.5 2001/01/17 19:42:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.6 2001/03/30 02:15:19 keithp Exp $ */ #include <X11/Xmu/CharSet.h> #include <X11/Xmu/CurUtil.h> diff --git a/lib/Xmu/CvtCache.c b/lib/Xmu/CvtCache.c index 0a386a366..807502060 100644 --- a/lib/Xmu/CvtCache.c +++ b/lib/Xmu/CvtCache.c @@ -1,10 +1,14 @@ -/* $Xorg: CvtCache.c,v 1.4 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: CvtCache.c,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.6 2001/08/23 00:03:21 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/CvtCache.h b/lib/Xmu/CvtCache.h index 6863f8f6c..d9b967ab7 100644 --- a/lib/Xmu/CvtCache.h +++ b/lib/Xmu/CvtCache.h @@ -1,10 +1,14 @@ -/* $Xorg: CvtCache.h,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: CvtCache.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.5 1999/03/21 07:34:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * Public Interfaces diff --git a/lib/Xmu/CvtStdSel.c b/lib/Xmu/CvtStdSel.c index cbe8e763f..f9018fe8f 100644 --- a/lib/Xmu/CvtStdSel.c +++ b/lib/Xmu/CvtStdSel.c @@ -1,10 +1,14 @@ -/* $Xorg: CvtStdSel.c,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: CvtStdSel.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.18 2001/11/19 20:44:15 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.19 2001/11/21 16:22:59 tsi Exp $ */ /* * This file contains routines to handle common selection targets. diff --git a/lib/Xmu/DefErrMsg.c b/lib/Xmu/DefErrMsg.c index e481450ec..cbc445091 100644 --- a/lib/Xmu/DefErrMsg.c +++ b/lib/Xmu/DefErrMsg.c @@ -1,10 +1,14 @@ -/* $Xorg: DefErrMsg.c,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: DefErrMsg.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.6 1998/10/03 09:06:25 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS diff --git a/lib/Xmu/DelCmap.c b/lib/Xmu/DelCmap.c index 8f84696b8..588878d7c 100644 --- a/lib/Xmu/DelCmap.c +++ b/lib/Xmu/DelCmap.c @@ -1,10 +1,14 @@ -/* $Xorg: DelCmap.c,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: DelCmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.5 1998/10/03 09:06:25 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/Xmu/DisplayQue.c b/lib/Xmu/DisplayQue.c index 7fb5a4e52..93c3a13f9 100644 --- a/lib/Xmu/DisplayQue.c +++ b/lib/Xmu/DisplayQue.c @@ -1,10 +1,14 @@ -/* $Xorg: DisplayQue.c,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: DisplayQue.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.3 2001/01/17 19:42:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/DisplayQue.h b/lib/Xmu/DisplayQue.h index 475fb78cd..9f9013c1e 100644 --- a/lib/Xmu/DisplayQue.h +++ b/lib/Xmu/DisplayQue.h @@ -1,10 +1,14 @@ -/* $Xorg: DisplayQue.h,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: DisplayQue.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.4 1998/10/03 09:06:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */ #ifndef _XMU_DISPLAYQUE_H_ #define _XMU_DISPLAYQUE_H_ diff --git a/lib/Xmu/Distinct.c b/lib/Xmu/Distinct.c index ade451746..20aea9c8c 100644 --- a/lib/Xmu/Distinct.c +++ b/lib/Xmu/Distinct.c @@ -1,10 +1,14 @@ -/* $Xorg: Distinct.c,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: Distinct.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.4 2001/01/17 19:42:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/Xmu/DrRndRect.c b/lib/Xmu/DrRndRect.c index 04597921b..6e98be6bc 100644 --- a/lib/Xmu/DrRndRect.c +++ b/lib/Xmu/DrRndRect.c @@ -1,10 +1,14 @@ -/* $Xorg: DrRndRect.c,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: DrRndRect.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.5 1998/10/03 09:06:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * XmuDrawRoundedRectangle, XmuFillRoundedRectangle diff --git a/lib/Xmu/DrawLogo.c b/lib/Xmu/DrawLogo.c index 1d32518b3..8488af93b 100644 --- a/lib/Xmu/DrawLogo.c +++ b/lib/Xmu/DrawLogo.c @@ -1,10 +1,14 @@ -/* $Xorg: DrawLogo.c,v 1.3 2000/08/17 19:46:00 cpqbld Exp $ */ +/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.6 1998/10/03 09:06:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xmu/Drawing.h> diff --git a/lib/Xmu/Drawing.h b/lib/Xmu/Drawing.h index 8082a5a57..331ff6550 100644 --- a/lib/Xmu/Drawing.h +++ b/lib/Xmu/Drawing.h @@ -1,10 +1,14 @@ -/* $Xorg: Drawing.h,v 1.4 2000/08/17 19:46:01 cpqbld Exp $ */ +/* $Xorg: Drawing.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.4 1998/10/03 09:06:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/Editres.h b/lib/Xmu/Editres.h index 6dc458ff9..2a3f3e250 100644 --- a/lib/Xmu/Editres.h +++ b/lib/Xmu/Editres.h @@ -1,10 +1,14 @@ -/* $Xorg: Editres.h,v 1.3 2000/08/17 19:46:01 cpqbld Exp $ */ +/* $Xorg: Editres.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Editres.h,v 1.4 1998/10/03 09:06:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Editres.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Xfuncproto.h> diff --git a/lib/Xmu/EditresCom.c b/lib/Xmu/EditresCom.c index 4bde0c18b..67f871a0e 100644 --- a/lib/Xmu/EditresCom.c +++ b/lib/Xmu/EditresCom.c @@ -1,10 +1,14 @@ -/* $Xorg: EditresCom.c,v 1.3 2000/08/17 19:46:01 cpqbld Exp $ */ +/* $Xorg: EditresCom.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.14 2000/10/02 02:32:13 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.15 2001/01/17 19:42:55 dawes Exp $ */ /* * Author: Chris D. Peterson, Dave Sternlicht, MIT X Consortium diff --git a/lib/Xmu/EditresP.h b/lib/Xmu/EditresP.h index 22815c360..886205bf2 100644 --- a/lib/Xmu/EditresP.h +++ b/lib/Xmu/EditresP.h @@ -1,10 +1,14 @@ -/* $Xorg: EditresP.h,v 1.3 2000/08/17 19:46:01 cpqbld Exp $ */ +/* $Xorg: EditresP.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.4 1998/10/03 09:06:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ /* * Author: Chris D. Peterson, MIT X Consortium diff --git a/lib/Xmu/Error.h b/lib/Xmu/Error.h index de88a358a..f992930ec 100644 --- a/lib/Xmu/Error.h +++ b/lib/Xmu/Error.h @@ -1,10 +1,14 @@ -/* $Xorg: Error.h,v 1.4 2000/08/17 19:46:01 cpqbld Exp $ */ +/* $Xorg: Error.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Error.h,v 1.4 1998/10/03 09:06:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Error.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/ExtAgent.c b/lib/Xmu/ExtAgent.c index 9bb6d635c..2be5cc4b6 100644 --- a/lib/Xmu/ExtAgent.c +++ b/lib/Xmu/ExtAgent.c @@ -1,10 +1,14 @@ -/* $Xorg: ExtAgent.c,v 1.3 2000/08/17 19:46:01 cpqbld Exp $ */ +/* $Xorg: ExtAgent.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.5 1998/10/03 09:06:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/ExtAgent.h> diff --git a/lib/Xmu/ExtAgent.h b/lib/Xmu/ExtAgent.h index cdae7e9d1..b0caf3699 100644 --- a/lib/Xmu/ExtAgent.h +++ b/lib/Xmu/ExtAgent.h @@ -1,10 +1,14 @@ -/* $Xorg: ExtAgent.h,v 1.4 2000/08/17 19:46:01 cpqbld Exp $ */ +/* $Xorg: ExtAgent.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1994,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.4 1998/10/03 09:06:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xfuncproto.h> diff --git a/lib/Xmu/FToCback.c b/lib/Xmu/FToCback.c index 4fd5c41d2..4b4ffd229 100644 --- a/lib/Xmu/FToCback.c +++ b/lib/Xmu/FToCback.c @@ -1,10 +1,14 @@ -/* $Xorg: FToCback.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: FToCback.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.5 1998/10/03 09:06:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/Converters.h> diff --git a/lib/Xmu/GetHost.c b/lib/Xmu/GetHost.c index 052ce63b8..2940c3695 100644 --- a/lib/Xmu/GetHost.c +++ b/lib/Xmu/GetHost.c @@ -1,10 +1,14 @@ -/* $Xorg: GetHost.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: GetHost.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.6 2001/01/17 19:42:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/GrayPixmap.c b/lib/Xmu/GrayPixmap.c index 3a4863f8d..3c687494e 100644 --- a/lib/Xmu/GrayPixmap.c +++ b/lib/Xmu/GrayPixmap.c @@ -1,10 +1,14 @@ -/* $Xorg: GrayPixmap.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: GrayPixmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.4 1998/10/03 09:06:30 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/lib/Xmu/Initer.c b/lib/Xmu/Initer.c index 05a108eec..da926889a 100644 --- a/lib/Xmu/Initer.c +++ b/lib/Xmu/Initer.c @@ -1,10 +1,14 @@ -/* $Xorg: Initer.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: Initer.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Initer.c,v 1.5 1999/03/21 07:34:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Initer.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* Created By: Chris D. Peterson * MIT X Consortium diff --git a/lib/Xmu/Initer.h b/lib/Xmu/Initer.h index 5cc664259..5e870af8c 100644 --- a/lib/Xmu/Initer.h +++ b/lib/Xmu/Initer.h @@ -1,10 +1,14 @@ -/* $Xorg: Initer.h,v 1.4 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: Initer.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Initer.h,v 1.4 1998/10/03 09:06:30 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Initer.h,v 1.5 2001/01/17 19:42:56 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/LocBitmap.c b/lib/Xmu/LocBitmap.c index e2dd51859..6a8149d4e 100644 --- a/lib/Xmu/LocBitmap.c +++ b/lib/Xmu/LocBitmap.c @@ -1,10 +1,14 @@ -/* $Xorg: LocBitmap.c,v 1.6 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: LocBitmap.c,v 1.7 2001/02/09 02:03:52 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.8 2001/08/23 00:03:21 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/Lookup.c b/lib/Xmu/Lookup.c index 8cccd284f..ff1177a8c 100644 --- a/lib/Xmu/Lookup.c +++ b/lib/Xmu/Lookup.c @@ -1,10 +1,14 @@ -/* $Xorg: Lookup.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: Lookup.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.6 1999/03/21 07:34:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.7 2001/01/17 19:42:56 dawes Exp $ */ #include <X11/Xmu/Lookup.h> diff --git a/lib/Xmu/LookupCmap.c b/lib/Xmu/LookupCmap.c index fd5a26b48..559831d0a 100644 --- a/lib/Xmu/LookupCmap.c +++ b/lib/Xmu/LookupCmap.c @@ -1,10 +1,14 @@ -/* $Xorg: LookupCmap.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: LookupCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/Xmu/Lower.c b/lib/Xmu/Lower.c index a2978ed8c..315ee04da 100644 --- a/lib/Xmu/Lower.c +++ b/lib/Xmu/Lower.c @@ -1,10 +1,14 @@ -/* $Xorg: Lower.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: Lower.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lower.c,v 1.10 2001/01/17 19:42:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Lower.c,v 1.11 2001/07/25 15:04:50 dawes Exp $ */ #define XK_LATIN1 #include <X11/keysymdef.h> diff --git a/lib/Xmu/Misc.h b/lib/Xmu/Misc.h index 4e01cc9eb..b47fbba4b 100644 --- a/lib/Xmu/Misc.h +++ b/lib/Xmu/Misc.h @@ -1,15 +1,14 @@ -/* $XConsortium: Misc.h,v 1.2 94/04/17 20:16:12 jim Exp $ */ +/* $Xorg: Misc.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/Xmu/RdBitF.c b/lib/Xmu/RdBitF.c index 0dc8dfb75..82a8ae342 100644 --- a/lib/Xmu/RdBitF.c +++ b/lib/Xmu/RdBitF.c @@ -1,10 +1,14 @@ -/* $Xorg: RdBitF.c,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ */ +/* $Xorg: RdBitF.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.10 1999/01/31 12:21:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.11 2001/01/17 19:42:56 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/lib/Xmu/ScrOfWin.c b/lib/Xmu/ScrOfWin.c index bcb9f30ae..8a90caa3f 100644 --- a/lib/Xmu/ScrOfWin.c +++ b/lib/Xmu/ScrOfWin.c @@ -1,10 +1,14 @@ -/* $Xorg: ScrOfWin.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: ScrOfWin.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.5 1998/10/03 09:06:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/ShapeWidg.c b/lib/Xmu/ShapeWidg.c index d08964a82..d011b5909 100644 --- a/lib/Xmu/ShapeWidg.c +++ b/lib/Xmu/ShapeWidg.c @@ -1,10 +1,14 @@ -/* $Xorg: ShapeWidg.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: ShapeWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.6 1998/10/03 09:06:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.7 2001/01/17 19:42:56 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/extensions/shape.h> diff --git a/lib/Xmu/StdCmap.c b/lib/Xmu/StdCmap.c index 1833a7312..164f2f0c2 100644 --- a/lib/Xmu/StdCmap.c +++ b/lib/Xmu/StdCmap.c @@ -1,10 +1,14 @@ -/* $Xorg: StdCmap.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StdCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.4 1998/10/03 09:06:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.5 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/Xmu/StdCmap.h b/lib/Xmu/StdCmap.h index e71c5656d..b268d073c 100644 --- a/lib/Xmu/StdCmap.h +++ b/lib/Xmu/StdCmap.h @@ -1,10 +1,14 @@ -/* $Xorg: StdCmap.h,v 1.4 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StdCmap.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.7 2001/01/17 19:42:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.8 2001/01/23 17:38:14 keithp Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/StdSel.h b/lib/Xmu/StdSel.h index 0e0932c69..f7c9452de 100644 --- a/lib/Xmu/StdSel.h +++ b/lib/Xmu/StdSel.h @@ -1,10 +1,14 @@ -/* $Xorg: StdSel.h,v 1.4 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StdSel.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdSel.h,v 1.6 1999/06/06 08:48:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdSel.h,v 1.7 2001/01/17 19:42:56 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/StrToBS.c b/lib/Xmu/StrToBS.c index e4cd63bed..899421e52 100644 --- a/lib/Xmu/StrToBS.c +++ b/lib/Xmu/StrToBS.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToBS.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StrToBS.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.5 1998/10/03 09:06:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ #include <X11/Intrinsic.h> #include "Converters.h" diff --git a/lib/Xmu/StrToBmap.c b/lib/Xmu/StrToBmap.c index adc03e328..1691fb4e5 100644 --- a/lib/Xmu/StrToBmap.c +++ b/lib/Xmu/StrToBmap.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToBmap.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StrToBmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.4 1998/10/03 09:06:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.5 2001/01/17 19:42:57 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/lib/Xmu/StrToCurs.c b/lib/Xmu/StrToCurs.c index 1584f2246..27f059637 100644 --- a/lib/Xmu/StrToCurs.c +++ b/lib/Xmu/StrToCurs.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToCurs.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StrToCurs.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.7 2001/01/17 19:42:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.8 2001/08/23 00:03:21 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/lib/Xmu/StrToGrav.c b/lib/Xmu/StrToGrav.c index d5bc3b2bc..31e46309d 100644 --- a/lib/Xmu/StrToGrav.c +++ b/lib/Xmu/StrToGrav.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToGrav.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StrToGrav.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.5 1998/10/03 09:06:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/Converters.h> diff --git a/lib/Xmu/StrToJust.c b/lib/Xmu/StrToJust.c index 24e9562e0..ba5893798 100644 --- a/lib/Xmu/StrToJust.c +++ b/lib/Xmu/StrToJust.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToJust.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StrToJust.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.5 1998/10/03 09:06:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <string.h> #include <X11/Intrinsic.h> diff --git a/lib/Xmu/StrToLong.c b/lib/Xmu/StrToLong.c index 013cbcf02..361dba111 100644 --- a/lib/Xmu/StrToLong.c +++ b/lib/Xmu/StrToLong.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToLong.c,v 1.3 2000/08/17 19:46:03 cpqbld Exp $ */ +/* $Xorg: StrToLong.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.7 2001/01/17 19:42:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.8 2001/08/23 00:03:21 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/lib/Xmu/StrToOrnt.c b/lib/Xmu/StrToOrnt.c index a7cf57fa8..70593b44a 100644 --- a/lib/Xmu/StrToOrnt.c +++ b/lib/Xmu/StrToOrnt.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToOrnt.c,v 1.3 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: StrToOrnt.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.5 1998/10/03 09:06:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/lib/Xmu/StrToShap.c b/lib/Xmu/StrToShap.c index b4ef341ae..963d162a9 100644 --- a/lib/Xmu/StrToShap.c +++ b/lib/Xmu/StrToShap.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToShap.c,v 1.4 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: StrToShap.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.5 1998/10/03 09:06:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #include <string.h> #include <X11/Intrinsic.h> diff --git a/lib/Xmu/StrToWidg.c b/lib/Xmu/StrToWidg.c index 0f1992321..dc368b7b3 100644 --- a/lib/Xmu/StrToWidg.c +++ b/lib/Xmu/StrToWidg.c @@ -1,10 +1,14 @@ -/* $Xorg: StrToWidg.c,v 1.3 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: StrToWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.5 1998/10/03 09:06:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * XmuCvtStringToWidget diff --git a/lib/Xmu/SysUtil.h b/lib/Xmu/SysUtil.h index 153a1fb70..00cbb9ac4 100644 --- a/lib/Xmu/SysUtil.h +++ b/lib/Xmu/SysUtil.h @@ -1,10 +1,14 @@ -/* $Xorg: SysUtil.h,v 1.3 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: SysUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/SysUtil.h,v 1.7 2001/01/17 19:42:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/SysUtil.h,v 1.8 2001/08/23 00:03:21 dawes Exp $ */ #ifndef _SYSUTIL_H_ #define _SYSUTIL_H_ diff --git a/lib/Xmu/UpdMapHint.c b/lib/Xmu/UpdMapHint.c index e3fa87e98..bd111aa60 100644 --- a/lib/Xmu/UpdMapHint.c +++ b/lib/Xmu/UpdMapHint.c @@ -1,10 +1,14 @@ -/* $Xorg: UpdMapHint.c,v 1.3 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: UpdMapHint.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.5 1998/10/03 09:06:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/VisCmap.c b/lib/Xmu/VisCmap.c index 877905459..9de4b858d 100644 --- a/lib/Xmu/VisCmap.c +++ b/lib/Xmu/VisCmap.c @@ -1,10 +1,14 @@ -/* $Xorg: VisCmap.c,v 1.3 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: VisCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.5 1998/10/03 09:06:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/lib/Xmu/WhitePoint.h b/lib/Xmu/WhitePoint.h index 2d2995071..a05bddd4a 100644 --- a/lib/Xmu/WhitePoint.h +++ b/lib/Xmu/WhitePoint.h @@ -1,15 +1,14 @@ -/* $XConsortium: WhitePoint.h,v 1.4 94/04/17 20:16:23 dpw Exp $ */ +/* $Xorg: WhitePoint.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* -Copyright (c) 1991, 1994 X Consortium +Copyright 1991, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/Xmu/WidgetNode.c b/lib/Xmu/WidgetNode.c index 366679a07..19b34e7d5 100644 --- a/lib/Xmu/WidgetNode.c +++ b/lib/Xmu/WidgetNode.c @@ -1,10 +1,14 @@ -/* $Xorg: WidgetNode.c,v 1.4 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: WidgetNode.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.8 2001/01/17 19:42:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.9 2001/04/01 14:00:01 tsi Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/WidgetNode.h b/lib/Xmu/WidgetNode.h index b5beaff15..75050d253 100644 --- a/lib/Xmu/WidgetNode.h +++ b/lib/Xmu/WidgetNode.h @@ -1,10 +1,14 @@ -/* $Xorg: WidgetNode.h,v 1.4 2000/08/17 19:46:04 cpqbld Exp $ */ +/* $Xorg: WidgetNode.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.h,v 1.4 1998/10/03 09:06:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/WidgetNode.h,v 1.5 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/lib/Xmu/WinUtil.h b/lib/Xmu/WinUtil.h index 6e847fbd7..0445bcfa8 100644 --- a/lib/Xmu/WinUtil.h +++ b/lib/Xmu/WinUtil.h @@ -1,10 +1,14 @@ -/* $Xorg: WinUtil.h,v 1.3 2000/08/17 19:46:05 cpqbld Exp $ */ +/* $Xorg: WinUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WinUtil.h,v 1.5 1998/10/03 09:06:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/WinUtil.h,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/Xct.c b/lib/Xmu/Xct.c index 071a76af8..cfd9e299f 100644 --- a/lib/Xmu/Xct.c +++ b/lib/Xmu/Xct.c @@ -1,10 +1,14 @@ -/* $Xorg: Xct.c,v 1.3 2000/08/17 19:46:05 cpqbld Exp $ */ +/* $Xorg: Xct.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xct.c,v 1.7 2001/01/17 19:42:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xct.c,v 1.8 2001/07/25 15:04:50 dawes Exp $ */ #include <X11/Xfuncs.h> #include "Xct.h" diff --git a/lib/Xmu/Xct.h b/lib/Xmu/Xct.h index b9cec404e..b06644ae0 100644 --- a/lib/Xmu/Xct.h +++ b/lib/Xmu/Xct.h @@ -1,10 +1,14 @@ -/* $Xorg: Xct.h,v 1.3 2000/08/17 19:46:05 cpqbld Exp $ */ +/* $Xorg: Xct.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xct.h,v 1.5 1999/03/21 07:34:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xct.h,v 1.6 2001/01/17 19:42:58 dawes Exp $ */ #ifndef _Xct_h #define _Xct_h diff --git a/lib/Xmu/Xmu.h b/lib/Xmu/Xmu.h index 963a29843..4cc47bbdc 100644 --- a/lib/Xmu/Xmu.h +++ b/lib/Xmu/Xmu.h @@ -1,10 +1,14 @@ -/* $Xorg: Xmu.h,v 1.3 2000/08/17 19:46:05 cpqbld Exp $ */ +/* $Xorg: Xmu.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xmu.h,v 1.7 2001/08/01 00:44:39 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/Xmu.h,v 1.8 2001/08/23 00:03:21 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/lib/Xmu/sharedlib.c b/lib/Xmu/sharedlib.c index 0ed65ab37..05e891e59 100644 --- a/lib/Xmu/sharedlib.c +++ b/lib/Xmu/sharedlib.c @@ -1,10 +1,14 @@ -/* $Xorg: sharedlib.c,v 1.3 2000/08/17 19:46:05 cpqbld Exp $ */ +/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.3 2001/01/17 19:42:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.4 2001/07/25 15:04:51 dawes Exp $ */ #if defined(SUNSHLIB) && !defined(SHAREDCODE) diff --git a/lib/Xt/ActionHook.c b/lib/Xt/ActionHook.c index d5f122ef7..32aca9c7b 100644 --- a/lib/Xt/ActionHook.c +++ b/lib/Xt/ActionHook.c @@ -1,4 +1,4 @@ -/* $Xorg: ActionHook.c,v 1.3 2000/08/17 19:46:08 cpqbld Exp $ */ +/* $Xorg: ActionHook.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /*LINTLIBRARY*/ @@ -39,7 +39,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -56,7 +60,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/ActionHook.c,v 1.2 2001/08/22 22:52:17 dawes Exp $ */ /* * Contains XtAppAddActionHook, XtRemoveActionHook diff --git a/lib/Xt/Alloc.c b/lib/Xt/Alloc.c index f23e97ea6..64de54ebc 100644 --- a/lib/Xt/Alloc.c +++ b/lib/Xt/Alloc.c @@ -1,4 +1,4 @@ -/* $Xorg: Alloc.c,v 1.3 2000/08/17 19:46:08 cpqbld Exp $ */ +/* $Xorg: Alloc.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Alloc.c,v 1.7 2001/07/29 05:01:12 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/Alloc.c,v 1.8 2001/08/22 22:52:17 dawes Exp $ */ /* * X Toolkit Memory Allocation Routines diff --git a/lib/Xt/ArgList.c b/lib/Xt/ArgList.c index b916e47e8..5b3e720c5 100644 --- a/lib/Xt/ArgList.c +++ b/lib/Xt/ArgList.c @@ -1,10 +1,14 @@ -/* $Xorg: ArgList.c,v 1.3 2000/08/17 19:46:08 cpqbld Exp $ */ +/* $Xorg: ArgList.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Callback.c b/lib/Xt/Callback.c index 945c9b2cc..d100c2ef6 100644 --- a/lib/Xt/Callback.c +++ b/lib/Xt/Callback.c @@ -1,4 +1,4 @@ -/* $Xorg: Callback.c,v 1.3 2000/08/17 19:46:08 cpqbld Exp $ */ +/* $Xorg: Callback.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Callback.c,v 1.6 2001/01/17 19:43:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Callback.c,v 1.7 2001/08/22 22:52:17 dawes Exp $ */ #include "IntrinsicI.h" diff --git a/lib/Xt/CallbackI.h b/lib/Xt/CallbackI.h index 69eb89d95..9d4db988f 100644 --- a/lib/Xt/CallbackI.h +++ b/lib/Xt/CallbackI.h @@ -1,14 +1,13 @@ -/* $XConsortium: CallbackI.h,v 1.18 94/04/17 20:13:39 converse Exp $ */ +/* $Xorg: CallbackI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/ClickTime.c b/lib/Xt/ClickTime.c index 1b8bccce8..807134f16 100644 --- a/lib/Xt/ClickTime.c +++ b/lib/Xt/ClickTime.c @@ -1,4 +1,4 @@ -/* $XConsortium: ClickTime.c,v 1.5 94/04/17 20:13:40 kaleb Exp $ */ +/* $Xorg: ClickTime.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -35,14 +35,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -50,13 +49,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. -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. */ diff --git a/lib/Xt/Composite.c b/lib/Xt/Composite.c index 529a40be3..a2e43f4c0 100644 --- a/lib/Xt/Composite.c +++ b/lib/Xt/Composite.c @@ -1,4 +1,4 @@ -/* $Xorg: Composite.c,v 1.3 2000/08/17 19:46:09 cpqbld Exp $ */ +/* $Xorg: Composite.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/Composite.c,v 1.5 2001/08/22 22:52:17 dawes Exp $ */ #define COMPOSITE #include "IntrinsicI.h" diff --git a/lib/Xt/Composite.h b/lib/Xt/Composite.h index 4c9151dd2..4c1e02947 100644 --- a/lib/Xt/Composite.h +++ b/lib/Xt/Composite.h @@ -1,15 +1,14 @@ -/* $XConsortium: Composite.h,v 1.16 94/04/17 20:13:42 converse Exp $ */ +/* $Xorg: Composite.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/CompositeP.h b/lib/Xt/CompositeP.h index 52f2b10b6..ed055b21f 100644 --- a/lib/Xt/CompositeP.h +++ b/lib/Xt/CompositeP.h @@ -1,15 +1,14 @@ -/* $XConsortium: CompositeP.h,v 1.17 94/04/17 20:13:43 converse Exp $ */ +/* $Xorg: CompositeP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/ConstrainP.h b/lib/Xt/ConstrainP.h index 3a60b2a5a..a90d19ac6 100644 --- a/lib/Xt/ConstrainP.h +++ b/lib/Xt/ConstrainP.h @@ -1,15 +1,14 @@ -/* $XConsortium: ConstrainP.h,v 1.15 94/04/17 20:13:45 swick Exp $ */ +/* $Xorg: ConstrainP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /* $oHeader: ConstrainP.h,v 1.2 88/08/18 15:54:15 asente Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/Constraint.c b/lib/Xt/Constraint.c index ccf6d5aa6..459e078e7 100644 --- a/lib/Xt/Constraint.c +++ b/lib/Xt/Constraint.c @@ -1,4 +1,4 @@ -/* $Xorg: Constraint.c,v 1.3 2000/08/17 19:46:09 cpqbld Exp $ */ +/* $Xorg: Constraint.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/Constraint.c,v 1.2 2001/08/22 22:52:17 dawes Exp $ */ #define CONSTRAINT #include "IntrinsicI.h" diff --git a/lib/Xt/Constraint.h b/lib/Xt/Constraint.h index a78b89c4e..9bb962e0d 100644 --- a/lib/Xt/Constraint.h +++ b/lib/Xt/Constraint.h @@ -1,15 +1,14 @@ -/* $XConsortium: Constraint.h,v 1.10 94/04/17 20:13:46 jim Exp $ */ +/* $Xorg: Constraint.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /* $oHeader: Constraint.h,v 1.2 88/08/18 15:54:18 asente Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/Convert.c b/lib/Xt/Convert.c index 766e653dd..1c486d183 100644 --- a/lib/Xt/Convert.c +++ b/lib/Xt/Convert.c @@ -1,4 +1,4 @@ -/* $Xorg: Convert.c,v 1.4 2000/08/17 19:46:09 cpqbld Exp $ */ +/* $Xorg: Convert.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Convert.c,v 3.5 2001/01/17 19:43:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Convert.c,v 3.6 2001/07/25 15:04:51 dawes Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/ConvertI.h b/lib/Xt/ConvertI.h index d62a45f0a..55b597306 100644 --- a/lib/Xt/ConvertI.h +++ b/lib/Xt/ConvertI.h @@ -1,10 +1,14 @@ -/* $Xorg: ConvertI.h,v 1.3 2000/08/17 19:46:09 cpqbld Exp $ */ +/* $Xorg: ConvertI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.2 2001/08/22 22:52:17 dawes Exp $ */ /* Representation types */ diff --git a/lib/Xt/Converters.c b/lib/Xt/Converters.c index 9896a932d..67fef52bd 100644 --- a/lib/Xt/Converters.c +++ b/lib/Xt/Converters.c @@ -1,4 +1,4 @@ -/* $Xorg: Converters.c,v 1.4 2000/08/17 19:46:09 cpqbld Exp $ */ +/* $Xorg: Converters.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Converters.c,v 3.8 2001/01/17 19:43:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Converters.c,v 3.10 2001/10/01 13:43:58 eich Exp $ */ /* Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Core.c b/lib/Xt/Core.c index 6ce0df2d7..343204b85 100644 --- a/lib/Xt/Core.c +++ b/lib/Xt/Core.c @@ -1,4 +1,4 @@ -/* $XConsortium: Core.c,v 1.62 94/04/17 20:13:52 kaleb Exp $ */ +/* $Xorg: Core.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -35,14 +35,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -50,13 +49,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. -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. */ diff --git a/lib/Xt/Core.h b/lib/Xt/Core.h index 3f208f5e1..ff6cb7535 100644 --- a/lib/Xt/Core.h +++ b/lib/Xt/Core.h @@ -1,18 +1,17 @@ /* -* $XConsortium: Core.h,v 1.11 94/04/17 20:13:53 swick Exp $ +* $Xorg: Core.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ * $oHeader: Core.h,v 1.2 88/08/18 15:54:32 asente Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,13 +19,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/CoreP.h b/lib/Xt/CoreP.h index 82b8cd8e3..e07f085e6 100644 --- a/lib/Xt/CoreP.h +++ b/lib/Xt/CoreP.h @@ -1,18 +1,17 @@ /* -* $XConsortium: CoreP.h,v 1.17 94/04/17 20:13:53 swick Exp $ +* $Xorg: CoreP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ * $oHeader: CoreP.h,v 1.2 88/08/18 15:54:37 asente Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,13 +19,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/Create.c b/lib/Xt/Create.c index da02b3206..30c30400b 100644 --- a/lib/Xt/Create.c +++ b/lib/Xt/Create.c @@ -1,4 +1,4 @@ -/* $Xorg: Create.c,v 1.3 2000/08/17 19:46:10 cpqbld Exp $ */ +/* $Xorg: Create.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Create.c,v 3.7 2001/01/17 19:43:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Create.c,v 3.8 2001/08/22 22:52:17 dawes Exp $ */ /* Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Destroy.c b/lib/Xt/Destroy.c index 58722d4a5..8fc072bc4 100644 --- a/lib/Xt/Destroy.c +++ b/lib/Xt/Destroy.c @@ -1,4 +1,4 @@ -/* $Xorg: Destroy.c,v 1.3 2000/08/17 19:46:10 cpqbld Exp $ */ +/* $Xorg: Destroy.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/Destroy.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */ #include "IntrinsicI.h" diff --git a/lib/Xt/Display.c b/lib/Xt/Display.c index 39be765af..4ad607e85 100644 --- a/lib/Xt/Display.c +++ b/lib/Xt/Display.c @@ -1,4 +1,4 @@ -/* $Xorg: Display.c,v 1.4 2000/08/17 19:46:10 cpqbld Exp $ */ +/* $Xorg: Display.c,v 1.6 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Display.c,v 3.11 2001/07/25 15:04:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Display.c,v 3.12 2001/08/22 22:52:18 dawes Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Error.c b/lib/Xt/Error.c index 999f973e1..c46963d33 100644 --- a/lib/Xt/Error.c +++ b/lib/Xt/Error.c @@ -1,4 +1,4 @@ -/* $Xorg: Error.c,v 1.4 2000/08/17 19:46:11 cpqbld Exp $ */ +/* $Xorg: Error.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Error.c,v 3.10 2001/01/17 19:43:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Error.c,v 3.11 2001/04/01 14:00:02 tsi Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Event.c b/lib/Xt/Event.c index 2f053600e..b27686009 100644 --- a/lib/Xt/Event.c +++ b/lib/Xt/Event.c @@ -1,4 +1,4 @@ -/* $Xorg: Event.c,v 1.4 2000/08/17 19:46:11 cpqbld Exp $ */ +/* $Xorg: Event.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Event.c,v 3.8 2001/07/29 05:01:12 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/Event.c,v 3.9 2001/08/22 22:52:18 dawes Exp $ */ #include "IntrinsicI.h" #include "Shell.h" diff --git a/lib/Xt/EventI.h b/lib/Xt/EventI.h index cd6ba2c51..6b1fcbfb7 100644 --- a/lib/Xt/EventI.h +++ b/lib/Xt/EventI.h @@ -1,11 +1,15 @@ -/* $Xorg: EventI.h,v 1.3 2000/08/17 19:46:11 cpqbld Exp $ */ +/* $Xorg: EventI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /* $oHeader: EventI.h,v 1.3 88/08/24 09:21:11 asente Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/EventI.h,v 1.2 2001/08/22 22:52:18 dawes Exp $ */ /* * Event.h - exported types and functions for toolkit event handler diff --git a/lib/Xt/EventUtil.c b/lib/Xt/EventUtil.c index 16ae747b3..b57ae34d2 100644 --- a/lib/Xt/EventUtil.c +++ b/lib/Xt/EventUtil.c @@ -1,4 +1,4 @@ -/* $Xorg: EventUtil.c,v 1.3 2000/08/17 19:46:11 cpqbld Exp $ */ +/* $Xorg: EventUtil.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /******************************************************** @@ -38,7 +38,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -55,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.5 2001/08/22 22:52:18 dawes Exp $ */ #include "IntrinsicI.h" #include "PassivGraI.h" diff --git a/lib/Xt/Functions.c b/lib/Xt/Functions.c index 9890662ce..3fc4d1871 100644 --- a/lib/Xt/Functions.c +++ b/lib/Xt/Functions.c @@ -1,4 +1,4 @@ -/* $Xorg: Functions.c,v 1.3 2000/08/17 19:46:11 cpqbld Exp $ */ +/* $Xorg: Functions.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /* @@ -27,7 +27,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1985, 1986, 1987, 1988, 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/GCManager.c b/lib/Xt/GCManager.c index e3b8729bb..dd765c5a0 100644 --- a/lib/Xt/GCManager.c +++ b/lib/Xt/GCManager.c @@ -1,4 +1,4 @@ -/* $Xorg: GCManager.c,v 1.4 2000/08/17 19:46:11 cpqbld Exp $ */ +/* $Xorg: GCManager.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard, Massachusetts @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/GCManager.c,v 1.5 2001/08/22 22:52:18 dawes Exp $ */ #include "IntrinsicI.h" diff --git a/lib/Xt/Geometry.c b/lib/Xt/Geometry.c index a75cbf07c..1cb7570d3 100644 --- a/lib/Xt/Geometry.c +++ b/lib/Xt/Geometry.c @@ -1,4 +1,4 @@ -/* $Xorg: Geometry.c,v 1.4 2000/08/17 19:46:11 cpqbld Exp $ */ +/* $Xorg: Geometry.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Geometry.c,v 1.10 2001/08/18 02:41:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Geometry.c,v 1.11 2001/08/22 22:52:18 dawes Exp $ */ #include "IntrinsicI.h" #include "ShellP.h" diff --git a/lib/Xt/GetActKey.c b/lib/Xt/GetActKey.c index 5398ec5a5..7e08a92d8 100644 --- a/lib/Xt/GetActKey.c +++ b/lib/Xt/GetActKey.c @@ -1,4 +1,4 @@ -/* $XConsortium: GetActKey.c,v 1.7 94/04/17 20:14:08 kaleb Exp $ */ +/* $Xorg: GetActKey.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*LINTLIBRARY*/ @@ -37,14 +37,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -52,13 +51,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. -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. */ diff --git a/lib/Xt/GetResList.c b/lib/Xt/GetResList.c index 98c91a089..b84160caa 100644 --- a/lib/Xt/GetResList.c +++ b/lib/Xt/GetResList.c @@ -1,4 +1,4 @@ -/* $Xorg: GetResList.c,v 1.3 2000/08/17 19:46:12 cpqbld Exp $ */ +/* $Xorg: GetResList.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/GetResList.c,v 3.4 2001/01/17 19:43:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/GetResList.c,v 3.5 2001/08/22 22:52:18 dawes Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/GetValues.c b/lib/Xt/GetValues.c index 8a90f5095..bb09a2748 100644 --- a/lib/Xt/GetValues.c +++ b/lib/Xt/GetValues.c @@ -1,4 +1,4 @@ -/* $Xorg: GetValues.c,v 1.3 2000/08/17 19:46:12 cpqbld Exp $ */ +/* $Xorg: GetValues.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*LINTLIBRARY*/ /*********************************************************** @@ -38,7 +38,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -55,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/GetValues.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" diff --git a/lib/Xt/HookObj.c b/lib/Xt/HookObj.c index 27fc6a166..697974a79 100644 --- a/lib/Xt/HookObj.c +++ b/lib/Xt/HookObj.c @@ -1,10 +1,14 @@ -/* $Xorg: HookObj.c,v 1.3 2000/08/17 19:46:12 cpqbld Exp $ */ +/* $Xorg: HookObj.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/HookObj.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" diff --git a/lib/Xt/HookObjI.h b/lib/Xt/HookObjI.h index 9be200514..c9a22a256 100644 --- a/lib/Xt/HookObjI.h +++ b/lib/Xt/HookObjI.h @@ -1,15 +1,14 @@ -/* $XConsortium: HookObjI.h,v 1.2 94/04/12 13:45:51 kaleb Exp $ */ +/* $Xorg: HookObjI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /* -Copyright (c) 1994 X Consortium +Copyright 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/Xt/Hooks.c b/lib/Xt/Hooks.c index 48d5a01d5..bbb701563 100644 --- a/lib/Xt/Hooks.c +++ b/lib/Xt/Hooks.c @@ -1,10 +1,14 @@ -/* $Xorg: Hooks.c,v 1.3 2000/08/17 19:46:12 cpqbld Exp $ */ +/* $Xorg: Hooks.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/Hooks.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */ /*LINTLIBRARY*/ diff --git a/lib/Xt/InitialI.h b/lib/Xt/InitialI.h index eaf3766d6..4d9871e0a 100644 --- a/lib/Xt/InitialI.h +++ b/lib/Xt/InitialI.h @@ -1,10 +1,14 @@ -/* $Xorg: InitialI.h,v 1.3 2000/08/17 19:46:12 cpqbld Exp $ */ +/* $Xorg: InitialI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/InitialI.h,v 3.8 2001/08/22 22:52:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/InitialI.h,v 3.9 2001/08/24 06:56:08 herrb Exp $ */ #ifndef _XtinitialI_h #define _XtinitialI_h diff --git a/lib/Xt/Initialize.c b/lib/Xt/Initialize.c index 1521ff679..e58e42dc4 100644 --- a/lib/Xt/Initialize.c +++ b/lib/Xt/Initialize.c @@ -1,4 +1,4 @@ -/* $Xorg: Initialize.c,v 1.7 2000/08/17 19:46:12 cpqbld Exp $ */ +/* $Xorg: Initialize.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Initialize.c,v 3.17 2001/07/25 15:04:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Initialize.c,v 3.18 2001/08/22 22:52:18 dawes Exp $ */ /* Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Intrinsic.c b/lib/Xt/Intrinsic.c index 7569adced..8c6854785 100644 --- a/lib/Xt/Intrinsic.c +++ b/lib/Xt/Intrinsic.c @@ -1,4 +1,4 @@ -/* $Xorg: Intrinsic.c,v 1.3 2000/08/17 19:46:13 cpqbld Exp $ */ +/* $Xorg: Intrinsic.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.18 2001/07/25 15:04:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.19 2001/08/22 22:52:18 dawes Exp $ */ /* Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Intrinsic.h b/lib/Xt/Intrinsic.h index 1105d042c..4647d4481 100644 --- a/lib/Xt/Intrinsic.h +++ b/lib/Xt/Intrinsic.h @@ -1,4 +1,4 @@ -/* $Xorg: Intrinsic.h,v 1.3 2000/08/17 19:46:13 cpqbld Exp $ */ +/* $Xorg: Intrinsic.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -27,7 +27,11 @@ SOFTWARE. Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.6 2001/01/17 19:43:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.7 2001/07/25 15:04:52 dawes Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h diff --git a/lib/Xt/IntrinsicI.h b/lib/Xt/IntrinsicI.h index c0a710adb..a0f0628b4 100644 --- a/lib/Xt/IntrinsicI.h +++ b/lib/Xt/IntrinsicI.h @@ -1,10 +1,14 @@ -/* $Xorg: IntrinsicI.h,v 1.3 2000/08/17 19:46:13 cpqbld Exp $ */ +/* $Xorg: IntrinsicI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.6 2001/07/25 15:04:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.7 2001/08/22 22:52:19 dawes Exp $ */ #ifndef _XtintrinsicI_h #define _XtintrinsicI_h diff --git a/lib/Xt/IntrinsicP.h b/lib/Xt/IntrinsicP.h index a9c23e0c1..255ef4c7c 100644 --- a/lib/Xt/IntrinsicP.h +++ b/lib/Xt/IntrinsicP.h @@ -1,15 +1,14 @@ -/* $XConsortium: IntrinsicP.h,v 1.66 94/04/17 20:14:25 converse Exp $ */ +/* $Xorg: IntrinsicP.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988, 1994 X Consortium +Copyright 1987, 1988, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/Keyboard.c b/lib/Xt/Keyboard.c index 01decea99..2f3db03e0 100644 --- a/lib/Xt/Keyboard.c +++ b/lib/Xt/Keyboard.c @@ -1,4 +1,4 @@ -/* $Xorg: Keyboard.c,v 1.4 2000/08/17 19:46:13 cpqbld Exp $ */ +/* $Xorg: Keyboard.c,v 1.5 2001/02/09 02:03:55 xorgcvs Exp $ */ /******************************************************** @@ -38,7 +38,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -55,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/Keyboard.c,v 3.3 2001/08/22 22:52:19 dawes Exp $ */ #include "IntrinsicI.h" diff --git a/lib/Xt/Manage.c b/lib/Xt/Manage.c index 4e8e24c1c..b6e9f235c 100644 --- a/lib/Xt/Manage.c +++ b/lib/Xt/Manage.c @@ -1,4 +1,4 @@ -/* $Xorg: Manage.c,v 1.3 2000/08/17 19:46:13 cpqbld Exp $ */ +/* $Xorg: Manage.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -32,13 +32,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Manage.c,v 3.6 2001/01/17 19:43:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Manage.c,v 3.7 2001/08/22 22:52:19 dawes Exp $ */ /* Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/NextEvent.c b/lib/Xt/NextEvent.c index 37e3d22d2..2c7127270 100644 --- a/lib/Xt/NextEvent.c +++ b/lib/Xt/NextEvent.c @@ -1,4 +1,4 @@ -/* $Xorg: NextEvent.c,v 1.6 2000/08/17 19:46:14 cpqbld Exp $ */ +/* $Xorg: NextEvent.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.21 2001/10/28 03:32:40 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.22 2001/10/31 22:50:26 tsi Exp $ */ #include "IntrinsicI.h" #include <stdio.h> diff --git a/lib/Xt/Object.c b/lib/Xt/Object.c index a3f3b5e5b..b680b2c08 100644 --- a/lib/Xt/Object.c +++ b/lib/Xt/Object.c @@ -1,4 +1,4 @@ -/* $Xorg: Object.c,v 1.3 2000/08/17 19:46:15 cpqbld Exp $ */ +/* $Xorg: Object.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -37,7 +37,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -54,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Object.c,v 1.4 1998/12/20 11:57:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Object.c,v 1.5 2001/01/17 19:43:06 dawes Exp $ */ #define OBJECT #include "IntrinsicI.h" diff --git a/lib/Xt/Object.h b/lib/Xt/Object.h index 0c67880e4..96723b16e 100644 --- a/lib/Xt/Object.h +++ b/lib/Xt/Object.h @@ -1,15 +1,14 @@ -/* $XConsortium: Object.h,v 1.9 94/04/17 20:14:31 swick Exp $ */ +/* $Xorg: Object.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /* $oHeader: Object.h,v 1.2 88/08/18 15:55:32 asente Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/ObjectP.h b/lib/Xt/ObjectP.h index 5e8d28b35..a24564ef2 100644 --- a/lib/Xt/ObjectP.h +++ b/lib/Xt/ObjectP.h @@ -1,15 +1,14 @@ -/* $XConsortium: ObjectP.h,v 1.14 94/04/17 20:14:32 converse Exp $ */ +/* $Xorg: ObjectP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988, 1994 X Consortium +Copyright 1987, 1988, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/PassivGraI.h b/lib/Xt/PassivGraI.h index ac7b44d90..83873a62f 100644 --- a/lib/Xt/PassivGraI.h +++ b/lib/Xt/PassivGraI.h @@ -1,5 +1,5 @@ /* -* $Xorg: PassivGraI.h,v 1.3 2000/08/17 19:46:15 cpqbld Exp $ +* $Xorg: PassivGraI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /******************************************************** @@ -30,7 +30,11 @@ SOFTWARE. Copyright 1987, 1988, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -47,7 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.2 2001/08/01 00:44:40 tsi Exp $ */ #ifndef _PDI_h_ #define _PDI_h_ diff --git a/lib/Xt/PassivGrab.c b/lib/Xt/PassivGrab.c index 753c75ebf..4242ea6ad 100644 --- a/lib/Xt/PassivGrab.c +++ b/lib/Xt/PassivGrab.c @@ -1,4 +1,4 @@ -/* $Xorg: PassivGrab.c,v 1.4 2000/08/17 19:46:15 cpqbld Exp $ */ +/* $Xorg: PassivGrab.c,v 1.5 2001/02/09 02:03:56 xorgcvs Exp $ */ /******************************************************** @@ -38,7 +38,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1988, 1989, 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/Xt/Pointer.c b/lib/Xt/Pointer.c index 8d40dae5c..1c981d287 100644 --- a/lib/Xt/Pointer.c +++ b/lib/Xt/Pointer.c @@ -1,4 +1,4 @@ -/* $XConsortium: Pointer.c,v 1.5 94/04/17 20:14:34 converse Exp $ */ +/* $Xorg: Pointer.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /******************************************************** @@ -26,14 +26,13 @@ SOFTWARE. /* -Copyright (c) 1987, 1988, 1989 X Consortium +Copyright 1987, 1988, 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,13 +40,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. -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. */ diff --git a/lib/Xt/Popup.c b/lib/Xt/Popup.c index b59e1c419..1549a6882 100644 --- a/lib/Xt/Popup.c +++ b/lib/Xt/Popup.c @@ -1,15 +1,14 @@ -/* $XConsortium: Popup.c,v 1.35 94/04/17 20:14:35 kaleb Exp $ */ +/* $Xorg: Popup.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988, 1994 X Consortium +Copyright 1987, 1988, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -160,6 +159,7 @@ void XtPopdown(widget) /* Unmap a shell widget if it is mapped, and remove from grab list */ Widget hookobj; ShellWidget shell_widget = (ShellWidget) widget; + XtGrabKind grab_kind; if (! XtIsShell(widget)) { XtAppErrorMsg(XtWidgetToApplicationContext(widget), @@ -168,16 +168,18 @@ void XtPopdown(widget) (String *)NULL, (Cardinal *)NULL); } - if (shell_widget->shell.popped_up) { - XtGrabKind grab_kind = shell_widget->shell.grab_kind; - XWithdrawWindow(XtDisplay(widget), XtWindow(widget), - XScreenNumberOfScreen(XtScreen(widget))); - if (grab_kind != XtGrabNone) { - XtRemoveGrab(widget); - } - shell_widget->shell.popped_up = FALSE; - XtCallCallbacks(widget, XtNpopdownCallback, (XtPointer)&grab_kind); - } +#ifndef X_NO_XT_POPDOWN_CONFORMANCE + if (!shell_widget->shell.popped_up) + return; +#endif + + grab_kind = shell_widget->shell.grab_kind; + XWithdrawWindow(XtDisplay(widget), XtWindow(widget), + XScreenNumberOfScreen(XtScreen(widget))); + if (grab_kind != XtGrabNone) + XtRemoveGrab(widget); + shell_widget->shell.popped_up = FALSE; + XtCallCallbacks(widget, XtNpopdownCallback, (XtPointer)&grab_kind); hookobj = XtHooksOfDisplay(XtDisplay(widget)); if (XtHasCallbacks(hookobj, XtNchangeHook) == XtCallbackHasSome) { diff --git a/lib/Xt/PopupCB.c b/lib/Xt/PopupCB.c index d26330017..25ea17db6 100644 --- a/lib/Xt/PopupCB.c +++ b/lib/Xt/PopupCB.c @@ -1,15 +1,14 @@ -/* $XConsortium: PopupCB.c,v 1.3 94/04/17 20:14:36 rws Exp $ */ +/* $Xorg: PopupCB.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/RectObj.c b/lib/Xt/RectObj.c index 7dd6f5aaa..1bb13a250 100644 --- a/lib/Xt/RectObj.c +++ b/lib/Xt/RectObj.c @@ -1,10 +1,14 @@ -/* $Xorg: RectObj.c,v 1.3 2000/08/17 19:46:15 cpqbld Exp $ */ +/* $Xorg: RectObj.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/lib/Xt/RectObj.c,v 1.2 2001/08/22 22:52:19 dawes Exp $ */ #define RECTOBJ #include "IntrinsicI.h" diff --git a/lib/Xt/RectObj.h b/lib/Xt/RectObj.h index 123941697..07615fab7 100644 --- a/lib/Xt/RectObj.h +++ b/lib/Xt/RectObj.h @@ -1,15 +1,14 @@ -/* $XConsortium: RectObj.h,v 1.9 94/04/17 20:14:37 swick Exp $ */ +/* $Xorg: RectObj.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /* $oHeader: RectObj.h,v 1.2 88/08/18 17:39:17 asente Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xt/RectObjP.h b/lib/Xt/RectObjP.h index 5c22568e0..ca3b8ade7 100644 --- a/lib/Xt/RectObjP.h +++ b/lib/Xt/RectObjP.h @@ -1,15 +1,14 @@ -/* $XConsortium: RectObjP.h,v 1.13 94/04/17 20:14:38 converse Exp $ */ +/* $Xorg: RectObjP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ /* $oHeader: RectObjP.h,v 1.2 88/08/18 15:55:52 asente Exp $ */ /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/lib/Xtst/XRecord.c b/lib/Xtst/XRecord.c index 422fcf480..651e037b2 100644 --- a/lib/Xtst/XRecord.c +++ b/lib/Xtst/XRecord.c @@ -1,11 +1,15 @@ /* -$Xorg: XRecord.c,v 1.3 2000/08/17 19:46:23 cpqbld Exp $ +$Xorg: XRecord.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ XRecord.c - client-side library for RECORD extension Copyright 1995, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ from The Open Group. /* * By Stephen Gildea, X Consortium, and Martha Zimet, NCD. */ -/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.2 2001/08/17 22:08:10 tsi Exp $ */ +/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.3 2001/10/28 03:32:41 tsi Exp $ */ #include <stdio.h> #include <assert.h> diff --git a/lib/Xtst/XTest.c b/lib/Xtst/XTest.c index f8950576f..a6131bc1d 100644 --- a/lib/Xtst/XTest.c +++ b/lib/Xtst/XTest.c @@ -1,4 +1,4 @@ -/* $Xorg: XTest.c,v 1.4 2000/08/17 19:46:23 cpqbld Exp $ */ +/* $Xorg: XTest.c,v 1.5 2001/02/09 02:04:00 xorgcvs Exp $ */ /* Copyright 1990, 1991 by UniSoft Group Limited */ @@ -7,7 +7,11 @@ Copyright 1990, 1991 by UniSoft Group Limited Copyright 1992, 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xtst/XTest.c,v 1.3 2001/01/17 19:43:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xtst/XTest.c,v 1.4 2001/08/01 00:44:41 tsi Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/lib/font/Speedo/bics-iso.h b/lib/font/Speedo/bics-iso.h index f837cb815..4964fa34e 100644 --- a/lib/font/Speedo/bics-iso.h +++ b/lib/font/Speedo/bics-iso.h @@ -1,9 +1,13 @@ -/* $Xorg: bics-iso.h,v 1.3 2000/08/17 19:46:24 cpqbld Exp $ */ +/* $Xorg: bics-iso.h,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.5 1999/01/31 04:59:25 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.6 2001/01/17 19:43:17 dawes Exp $ */ int sp_bics_map[] = { 32, 0, diff --git a/lib/font/Speedo/spencode.c b/lib/font/Speedo/spencode.c index f8dbc2274..b06798c84 100644 --- a/lib/font/Speedo/spencode.c +++ b/lib/font/Speedo/spencode.c @@ -1,4 +1,4 @@ -/* $Xorg: spencode.c,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ +/* $Xorg: spencode.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +24,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.5 1999/01/31 04:59:26 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.6 2001/01/17 19:43:18 dawes Exp $ */ #include "spint.h" diff --git a/lib/font/Speedo/sperr.c b/lib/font/Speedo/sperr.c index c971d772b..7e2ba9160 100644 --- a/lib/font/Speedo/sperr.c +++ b/lib/font/Speedo/sperr.c @@ -1,4 +1,4 @@ -/* $Xorg: sperr.c,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ +/* $Xorg: sperr.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -29,7 +29,11 @@ Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -48,7 +52,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.4 2001/01/17 19:43:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.5 2001/08/01 00:44:42 tsi Exp $ */ #include "spint.h" diff --git a/lib/font/Speedo/spfile.c b/lib/font/Speedo/spfile.c index 555120716..ef2a76455 100644 --- a/lib/font/Speedo/spfile.c +++ b/lib/font/Speedo/spfile.c @@ -1,4 +1,4 @@ -/* $Xorg: spfile.c,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ +/* $Xorg: spfile.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -26,7 +26,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.12 2001/01/17 19:43:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.13 2001/08/13 21:46:47 dawes Exp $ */ #include "fntfilst.h" #include "fontenc.h" diff --git a/lib/font/Speedo/spfont.c b/lib/font/Speedo/spfont.c index 326f41d29..5b80edb33 100644 --- a/lib/font/Speedo/spfont.c +++ b/lib/font/Speedo/spfont.c @@ -1,4 +1,4 @@ -/* $Xorg: spfont.c,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ +/* $Xorg: spfont.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -21,13 +21,17 @@ * * Author: Dave Lemke, Network Computing Devices Inc */ -/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.10 2001/01/17 19:43:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.11 2001/08/27 19:49:50 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/font/Speedo/spfuncs.c b/lib/font/Speedo/spfuncs.c index 94b48b92e..75f779bae 100644 --- a/lib/font/Speedo/spfuncs.c +++ b/lib/font/Speedo/spfuncs.c @@ -1,4 +1,4 @@ -/* $Xorg: spfuncs.c,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ +/* $Xorg: spfuncs.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -26,7 +26,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.6 2001/01/17 19:43:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.7 2001/08/27 19:49:51 dawes Exp $ */ #ifndef FONTMODULE #include <X11/Xos.h> diff --git a/lib/font/Speedo/spglyph.c b/lib/font/Speedo/spglyph.c index f97e633e4..979a47288 100644 --- a/lib/font/Speedo/spglyph.c +++ b/lib/font/Speedo/spglyph.c @@ -1,4 +1,4 @@ -/* $Xorg: spglyph.c,v 1.3 2000/08/17 19:46:28 cpqbld Exp $ */ +/* $Xorg: spglyph.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -26,7 +26,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.5 1999/03/14 11:17:43 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.6 2001/01/17 19:43:20 dawes Exp $ */ #include <X11/X.h> /* for bit order #defines */ #include "spint.h" diff --git a/lib/font/Speedo/spinfo.c b/lib/font/Speedo/spinfo.c index a72daacdc..db5278d64 100644 --- a/lib/font/Speedo/spinfo.c +++ b/lib/font/Speedo/spinfo.c @@ -1,4 +1,4 @@ -/* $Xorg: spinfo.c,v 1.3 2000/08/17 19:46:28 cpqbld Exp $ */ +/* $Xorg: spinfo.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -26,7 +26,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.10 2001/01/17 19:43:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.11 2001/08/27 19:49:51 dawes Exp $ */ #include "fntfilst.h" #include "fontutil.h" diff --git a/lib/font/Speedo/spint.h b/lib/font/Speedo/spint.h index 0dbea6376..18e5203d2 100644 --- a/lib/font/Speedo/spint.h +++ b/lib/font/Speedo/spint.h @@ -1,4 +1,4 @@ -/* $Xorg: spint.h,v 1.3 2000/08/17 19:46:28 cpqbld Exp $ */ +/* $Xorg: spint.h,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +24,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.8 1999/02/07 06:18:21 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.9 2001/01/17 19:43:20 dawes Exp $ */ #ifndef _SPINT_H_ #define _SPINT_H_ diff --git a/lib/font/Speedo/sptobdf.c b/lib/font/Speedo/sptobdf.c index bc52badd5..ca3caa515 100644 --- a/lib/font/Speedo/sptobdf.c +++ b/lib/font/Speedo/sptobdf.c @@ -1,4 +1,4 @@ -/* $XConsortium: sptobdf.c,v 1.5 94/04/17 20:17:51 dpw Exp $ */ +/* $Xorg: sptobdf.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -27,15 +27,13 @@ /* -Copyright (c) 1987, 1994 X Consortium +Copyright 1987, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,15 +41,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/font/Speedo/useropt.h b/lib/font/Speedo/useropt.h index 33b404f01..e879aae96 100644 --- a/lib/font/Speedo/useropt.h +++ b/lib/font/Speedo/useropt.h @@ -1,15 +1,13 @@ -/* $XConsortium: useropt.h,v 1.4 94/04/17 20:17:52 gildea Exp $ */ +/* $Xorg: useropt.h,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/font/Type1/minimain.c b/lib/font/Type1/minimain.c index c128b1532..4aa826dc1 100644 --- a/lib/font/Type1/minimain.c +++ b/lib/font/Type1/minimain.c @@ -1,16 +1,14 @@ -/* $XConsortium: minimain.c,v 1.4 94/04/17 20:17:20 gildea Exp $ */ +/* $Xorg: minimain.c,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */ /* -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/lib/font/Type1/t1funcs.c b/lib/font/Type1/t1funcs.c index 96a2aed63..808ea822e 100644 --- a/lib/font/Type1/t1funcs.c +++ b/lib/font/Type1/t1funcs.c @@ -1,4 +1,4 @@ -/* $Xorg: t1funcs.c,v 1.4 2000/08/17 19:46:33 cpqbld Exp $ */ +/* $Xorg: t1funcs.c,v 1.5 2001/02/09 02:04:01 xorgcvs Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -71,13 +71,17 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.24 2001/08/13 21:46:47 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.25 2001/08/27 19:49:53 dawes Exp $ */ /* Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/lib/font/Type1/t1info.c b/lib/font/Type1/t1info.c index ee5898265..4b177f0f8 100644 --- a/lib/font/Type1/t1info.c +++ b/lib/font/Type1/t1info.c @@ -1,4 +1,4 @@ -/* $Xorg: t1info.c,v 1.3 2000/08/17 19:46:33 cpqbld Exp $ */ +/* $Xorg: t1info.c,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -59,7 +59,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -95,7 +99,7 @@ from The Open Group. * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.15 2001/01/17 19:43:23 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.16 2001/08/27 19:49:54 dawes Exp $ */ #include "fntfilst.h" #include "fontutil.h" diff --git a/lib/font/bitmap/bdfint.h b/lib/font/bitmap/bdfint.h index fc060cd0e..d41c4a556 100644 --- a/lib/font/bitmap/bdfint.h +++ b/lib/font/bitmap/bdfint.h @@ -1,10 +1,14 @@ -/* $Xorg: bdfint.h,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ +/* $Xorg: bdfint.h,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.3 1999/07/17 08:55:10 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */ #ifndef BDFINT_H #define BDFINT_H diff --git a/lib/font/bitmap/bdfread.c b/lib/font/bitmap/bdfread.c index 44685139e..346ab903b 100644 --- a/lib/font/bitmap/bdfread.c +++ b/lib/font/bitmap/bdfread.c @@ -1,4 +1,4 @@ -/* $Xorg: bdfread.c,v 1.4 2000/10/30 09:19:38 pookie Exp $ */ +/* $Xorg: bdfread.c,v 1.5 2001/02/09 02:04:01 xorgcvs Exp $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -27,7 +27,11 @@ SOFTWARE. Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.9 2001/01/17 19:43:26 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.10 2001/11/06 16:11:36 alanh Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/lib/font/bitmap/bdfutils.c b/lib/font/bitmap/bdfutils.c index 7759cef43..f46e4e543 100644 --- a/lib/font/bitmap/bdfutils.c +++ b/lib/font/bitmap/bdfutils.c @@ -1,4 +1,4 @@ -/* $Xorg: bdfutils.c,v 1.4 2000/10/30 09:24:26 pookie Exp $ */ +/* $Xorg: bdfutils.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +26,11 @@ SOFTWARE. Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.8 2001/07/25 15:04:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.9 2001/11/06 16:11:36 alanh Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/lib/font/bitmap/bitmap.c b/lib/font/bitmap/bitmap.c index 3f5df95ee..8c37f6934 100644 --- a/lib/font/bitmap/bitmap.c +++ b/lib/font/bitmap/bitmap.c @@ -1,10 +1,14 @@ -/* $Xorg: bitmap.c,v 1.3 2000/08/17 19:46:35 cpqbld Exp $ */ +/* $Xorg: bitmap.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.5 1999/08/01 07:56:54 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/bitmap/bitmapfunc.c b/lib/font/bitmap/bitmapfunc.c index e331013fc..0106b856b 100644 --- a/lib/font/bitmap/bitmapfunc.c +++ b/lib/font/bitmap/bitmapfunc.c @@ -1,10 +1,14 @@ -/* $Xorg: bitmapfunc.c,v 1.4 2000/10/30 09:26:21 pookie Exp $ */ +/* $Xorg: bitmapfunc.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.12 2001/04/04 00:34:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.13 2001/11/06 16:11:36 alanh Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/bitmap/bitmaputil.c b/lib/font/bitmap/bitmaputil.c index e0f9e0f69..9ffcc0b08 100644 --- a/lib/font/bitmap/bitmaputil.c +++ b/lib/font/bitmap/bitmaputil.c @@ -1,10 +1,14 @@ -/* $Xorg: bitmaputil.c,v 1.4 2000/02/04 02:04:02 xorgcvs Exp $ */ +/* $Xorg: bitmaputil.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.5 2001/01/17 19:43:27 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.6 2001/11/06 16:11:36 alanh Exp $ */ #include "fntfilst.h" #include "bitmap.h" diff --git a/lib/font/bitmap/bitscale.c b/lib/font/bitmap/bitscale.c index d96d56c34..283717c5a 100644 --- a/lib/font/bitmap/bitscale.c +++ b/lib/font/bitmap/bitscale.c @@ -1,10 +1,13 @@ /* $Xorg: bitscale.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ - /* Copyright 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.20 2001/11/06 16:11:36 alanh Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.21 2001/11/06 17:18:41 alanh Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/bitmap/fontink.c b/lib/font/bitmap/fontink.c index bfd39ed4f..c3f5e8c98 100644 --- a/lib/font/bitmap/fontink.c +++ b/lib/font/bitmap/fontink.c @@ -1,10 +1,14 @@ -/* $Xorg: fontink.c,v 1.3 2000/08/17 19:46:35 cpqbld Exp $ */ +/* $Xorg: fontink.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.5 1999/11/19 13:53:29 hohndel Exp $ */ +/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/bitmap/pcf.h b/lib/font/bitmap/pcf.h index dff01b8ec..2faf316e4 100644 --- a/lib/font/bitmap/pcf.h +++ b/lib/font/bitmap/pcf.h @@ -1,10 +1,14 @@ -/* $Xorg: pcf.h,v 1.3 2000/08/17 19:46:35 cpqbld Exp $ */ +/* $Xorg: pcf.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.2 1999/07/17 05:30:32 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.3 2001/01/17 19:43:27 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/bitmap/pcfread.c b/lib/font/bitmap/pcfread.c index 933267fec..b88ba3479 100644 --- a/lib/font/bitmap/pcfread.c +++ b/lib/font/bitmap/pcfread.c @@ -1,10 +1,13 @@ -/* $Xorg: pcfread.c,v 1.4 2000/10/30 09:55:54 pookie Exp $ */ - +/* $Xorg: pcfread.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.16 2001/04/04 00:34:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.17 2001/11/06 16:11:36 alanh Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/bitmap/pcfwrite.c b/lib/font/bitmap/pcfwrite.c index d2e09ce4b..127fab678 100644 --- a/lib/font/bitmap/pcfwrite.c +++ b/lib/font/bitmap/pcfwrite.c @@ -1,10 +1,13 @@ -/* $Xorg: pcfwrite.c,v 1.4 2001/10/30 09:58:43 pookie Exp $ */ - +/* $Xorg: pcfwrite.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.6 2001/04/05 17:42:27 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.7 2001/11/06 16:11:36 alanh Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/bitmap/snfread.c b/lib/font/bitmap/snfread.c index 9c4737f28..e360ff5ab 100644 --- a/lib/font/bitmap/snfread.c +++ b/lib/font/bitmap/snfread.c @@ -1,4 +1,4 @@ -/* $Xorg: snfread.c,v 1.4 2000/10/30 10:02:21 pookie Exp $ */ +/* $Xorg: snfread.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +26,11 @@ SOFTWARE. Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.8 2001/01/17 19:43:27 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.9 2001/11/06 16:11:36 alanh Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/lib/font/bitmap/snfstr.h b/lib/font/bitmap/snfstr.h index dac73c61b..6d5b6d986 100644 --- a/lib/font/bitmap/snfstr.h +++ b/lib/font/bitmap/snfstr.h @@ -1,4 +1,4 @@ -/* $Xorg: snfstr.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ +/* $Xorg: snfstr.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +26,11 @@ SOFTWARE. Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.3 2001/01/17 19:43:27 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.4 2001/08/01 00:44:43 tsi Exp $ */ #ifndef SNFSTR_H #define SNFSTR_H 1 diff --git a/lib/font/fc/fserve.c b/lib/font/fc/fserve.c index 5b0d6cd8d..29ba4091b 100644 --- a/lib/font/fc/fserve.c +++ b/lib/font/fc/fserve.c @@ -1,9 +1,13 @@ -/* $Xorg: fserve.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ +/* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fserve.c,v 3.19 2001/04/05 17:42:27 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.c,v 3.20 2001/07/25 15:04:56 dawes Exp $ */ /* * Copyright 1990 Network Computing Devices diff --git a/lib/font/fc/fslibos.h b/lib/font/fc/fslibos.h index 021535ba1..ac8182129 100644 --- a/lib/font/fc/fslibos.h +++ b/lib/font/fc/fslibos.h @@ -1,4 +1,4 @@ -/* $Xorg: fslibos.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ +/* $Xorg: fslibos.h,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -8,7 +8,11 @@ Copyright 1987, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -27,7 +31,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.4 1998/10/03 09:07:25 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.5 2001/01/17 19:43:29 dawes Exp $ */ /* * FSlib networking & os include file diff --git a/lib/font/fontfile/bitsource.c b/lib/font/fontfile/bitsource.c index fcd0f27d5..b487ce450 100644 --- a/lib/font/fontfile/bitsource.c +++ b/lib/font/fontfile/bitsource.c @@ -1,10 +1,14 @@ -/* $Xorg: bitsource.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ +/* $Xorg: bitsource.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.2 1999/07/17 05:30:39 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.3 2001/01/17 19:43:29 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/bufio.c b/lib/font/fontfile/bufio.c index 52c6be0ea..95d79832f 100644 --- a/lib/font/fontfile/bufio.c +++ b/lib/font/fontfile/bufio.c @@ -1,10 +1,14 @@ -/* $Xorg: bufio.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: bufio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.7 2001/01/17 19:43:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.8 2001/07/25 15:04:56 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/decompress.c b/lib/font/fontfile/decompress.c index d28f44e2f..d35f5a6e6 100644 --- a/lib/font/fontfile/decompress.c +++ b/lib/font/fontfile/decompress.c @@ -1,4 +1,4 @@ -/* $Xorg: decompress.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: decompress.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* * Copyright 1985, 1986 The Regents of the University of California. * All rights reserved. @@ -24,7 +24,11 @@ Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.3 2000/09/19 12:46:08 eich Exp $ */ +/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.4 2001/01/17 19:43:29 dawes Exp $ */ /* * decompress - cat a compressed file */ diff --git a/lib/font/fontfile/defaults.c b/lib/font/fontfile/defaults.c index 397c7af67..fb9dc8149 100644 --- a/lib/font/fontfile/defaults.c +++ b/lib/font/fontfile/defaults.c @@ -1,10 +1,14 @@ -/* $Xorg: defaults.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: defaults.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.6 1999/08/21 13:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.7 2001/01/17 19:43:29 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/dirfile.c b/lib/font/fontfile/dirfile.c index 188a18935..52a0fce6a 100644 --- a/lib/font/fontfile/dirfile.c +++ b/lib/font/fontfile/dirfile.c @@ -1,10 +1,14 @@ -/* $Xorg: dirfile.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: dirfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.12 2001/07/25 15:04:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.13 2001/08/27 19:49:54 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/ffcheck.c b/lib/font/fontfile/ffcheck.c index 135f3f9f1..04cc7cd99 100644 --- a/lib/font/fontfile/ffcheck.c +++ b/lib/font/fontfile/ffcheck.c @@ -1,10 +1,14 @@ -/* $Xorg: ffcheck.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: ffcheck.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.13 2000/02/13 06:15:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.14 2001/01/17 19:43:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/fileio.c b/lib/font/fontfile/fileio.c index 89a0eb417..fe471b8c6 100644 --- a/lib/font/fontfile/fileio.c +++ b/lib/font/fontfile/fileio.c @@ -1,10 +1,14 @@ -/* $Xorg: fileio.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: fileio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.7 1999/08/21 13:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.8 2001/01/17 19:43:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/filewr.c b/lib/font/fontfile/filewr.c index ad1b137f4..2a956a256 100644 --- a/lib/font/fontfile/filewr.c +++ b/lib/font/fontfile/filewr.c @@ -1,10 +1,14 @@ -/* $Xorg: filewr.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: filewr.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.4 2000/08/09 23:40:15 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.5 2001/01/17 19:43:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/fontdir.c b/lib/font/fontfile/fontdir.c index d9394b017..9459f2d8c 100644 --- a/lib/font/fontfile/fontdir.c +++ b/lib/font/fontfile/fontdir.c @@ -1,10 +1,14 @@ -/* $Xorg: fontdir.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.16 2001/05/02 20:44:41 keithp Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.17 2001/05/15 00:05:32 keithp Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/fontfile.c b/lib/font/fontfile/fontfile.c index 9309ceff7..059b2c295 100644 --- a/lib/font/fontfile/fontfile.c +++ b/lib/font/fontfile/fontfile.c @@ -1,10 +1,14 @@ -/* $Xorg: fontfile.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.13 1999/08/21 13:48:03 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.14 2001/01/17 19:43:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/fontscale.c b/lib/font/fontfile/fontscale.c index 88ee6e3b9..3b7443f7d 100644 --- a/lib/font/fontfile/fontscale.c +++ b/lib/font/fontfile/fontscale.c @@ -1,10 +1,14 @@ -/* $Xorg: fontscale.c,v 1.4 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: fontscale.c,v 1.5 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.8 2001/01/17 19:43:30 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/printerfont.c b/lib/font/fontfile/printerfont.c index cda96d2b6..9e0f8dc5f 100644 --- a/lib/font/fontfile/printerfont.c +++ b/lib/font/fontfile/printerfont.c @@ -1,10 +1,14 @@ -/* $Xorg: printerfont.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: printerfont.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.3 1999/08/21 13:48:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.4 2001/01/17 19:43:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/fontfile/register.c b/lib/font/fontfile/register.c index 3ff6c27ee..4bc7b8a91 100644 --- a/lib/font/fontfile/register.c +++ b/lib/font/fontfile/register.c @@ -1,10 +1,14 @@ -/* $Xorg: register.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: register.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/register.c,v 1.13 2000/02/13 06:15:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/register.c,v 1.14 2001/01/17 19:43:30 dawes Exp $ */ /* * This is in a separate source file so that small programs diff --git a/lib/font/fontfile/renderers.c b/lib/font/fontfile/renderers.c index df7cf8dc8..17661e082 100644 --- a/lib/font/fontfile/renderers.c +++ b/lib/font/fontfile/renderers.c @@ -1,10 +1,14 @@ -/* $Xorg: renderers.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ +/* $Xorg: renderers.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/renderers.c,v 1.2 1999/07/17 05:30:43 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/renderers.c,v 1.3 2001/01/17 19:43:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/include/bitmap.h b/lib/font/include/bitmap.h index 8e43cdd5b..b5df9647b 100644 --- a/lib/font/include/bitmap.h +++ b/lib/font/include/bitmap.h @@ -1,10 +1,14 @@ -/* $Xorg: bitmap.h,v 1.3 2000/08/17 19:46:38 cpqbld Exp $ */ +/* $Xorg: bitmap.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/bitmap.h,v 1.8 2000/10/24 22:45:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/include/bufio.h b/lib/font/include/bufio.h index 32ba8964c..da90064a2 100644 --- a/lib/font/include/bufio.h +++ b/lib/font/include/bufio.h @@ -1,10 +1,14 @@ -/* $Xorg: bufio.h,v 1.3 2000/08/17 19:46:38 cpqbld Exp $ */ +/* $Xorg: bufio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/bufio.h,v 1.5 2001/01/17 19:43:31 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Exp $ */ #ifndef ___BUFIO_H___ #define ___BUFIO_H___ 1 diff --git a/lib/font/include/fntfil.h b/lib/font/include/fntfil.h index 1ee46b61a..32c2ac2ce 100644 --- a/lib/font/include/fntfil.h +++ b/lib/font/include/fntfil.h @@ -1,10 +1,14 @@ -/* $Xorg: fntfil.h,v 1.3 2000/08/17 19:46:38 cpqbld Exp $ */ +/* $Xorg: fntfil.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfil.h,v 1.7 2001/04/05 17:42:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfil.h,v 1.8 2001/08/01 00:44:43 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/include/fntfilio.h b/lib/font/include/fntfilio.h index 3f5f54384..30a95c52c 100644 --- a/lib/font/include/fntfilio.h +++ b/lib/font/include/fntfilio.h @@ -1,10 +1,14 @@ -/* $Xorg: fntfilio.h,v 1.3 2000/08/17 19:46:38 cpqbld Exp $ */ +/* $Xorg: fntfilio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.5 2001/08/01 00:44:43 tsi Exp $ */ +/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.6 2001/10/31 22:50:26 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/include/fntfilst.h b/lib/font/include/fntfilst.h index 42bf6ae59..b58eee36d 100644 --- a/lib/font/include/fntfilst.h +++ b/lib/font/include/fntfilst.h @@ -1,10 +1,14 @@ -/* $Xorg: fntfilst.h,v 1.4 2000/08/17 19:46:38 cpqbld Exp $ */ +/* $Xorg: fntfilst.h,v 1.5 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.5 1999/07/17 05:30:47 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.6 2001/01/17 19:43:32 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/include/fontmisc.h b/lib/font/include/fontmisc.h index 900d74048..56b8ee129 100644 --- a/lib/font/include/fontmisc.h +++ b/lib/font/include/fontmisc.h @@ -1,10 +1,14 @@ -/* $Xorg: fontmisc.h,v 1.3 2000/08/17 19:46:38 cpqbld Exp $ */ +/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.14 2001/07/25 15:04:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.15 2001/08/27 19:49:55 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/include/fontshow.h b/lib/font/include/fontshow.h index b050dfb8e..5bb48fe18 100644 --- a/lib/font/include/fontshow.h +++ b/lib/font/include/fontshow.h @@ -1,15 +1,14 @@ -/* $XConsortium: fontshow.h,v 1.2 94/04/17 20:17:30 rws Exp $ */ +/* $Xorg: fontshow.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* -Copyright (c) 1990 X Consortium +Copyright 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. */ diff --git a/lib/font/include/fontxlfd.h b/lib/font/include/fontxlfd.h index 9ae1cb369..e9a12d28f 100644 --- a/lib/font/include/fontxlfd.h +++ b/lib/font/include/fontxlfd.h @@ -1,10 +1,14 @@ -/* $Xorg: fontxlfd.h,v 1.3 2000/08/17 19:46:38 cpqbld Exp $ */ +/* $Xorg: fontxlfd.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.4 1999/07/17 05:30:48 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.5 2001/01/17 19:43:32 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/atom.c b/lib/font/util/atom.c index 8193226b5..383370e5f 100644 --- a/lib/font/util/atom.c +++ b/lib/font/util/atom.c @@ -1,10 +1,14 @@ -/* $Xorg: atom.c,v 1.4 2000/10/30 09:03:02 pookie Exp $ */ +/* $Xorg: atom.c,v 1.5 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/atom.c,v 1.5 2001/10/28 03:32:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/atom.c,v 1.6 2001/11/06 16:11:37 alanh Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/fontaccel.c b/lib/font/util/fontaccel.c index 1a53a7bb3..3dd2492a5 100644 --- a/lib/font/util/fontaccel.c +++ b/lib/font/util/fontaccel.c @@ -1,10 +1,14 @@ -/* $Xorg: fontaccel.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: fontaccel.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.5 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.6 2001/01/17 19:43:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/fontnames.c b/lib/font/util/fontnames.c index e7281ea7a..130589fe9 100644 --- a/lib/font/util/fontnames.c +++ b/lib/font/util/fontnames.c @@ -1,10 +1,14 @@ -/* $Xorg: fontnames.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: fontnames.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontnames.c,v 1.3 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontnames.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/fontutil.c b/lib/font/util/fontutil.c index 100f45e04..daf65e49a 100644 --- a/lib/font/util/fontutil.c +++ b/lib/font/util/fontutil.c @@ -1,10 +1,14 @@ -/* $Xorg: fontutil.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: fontutil.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontutil.c,v 3.5 2001/01/17 19:43:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontutil.c,v 3.6 2001/10/28 03:32:46 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/fontxlfd.c b/lib/font/util/fontxlfd.c index e74df0349..389078a61 100644 --- a/lib/font/util/fontxlfd.c +++ b/lib/font/util/fontxlfd.c @@ -1,10 +1,14 @@ -/* $Xorg: fontxlfd.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: fontxlfd.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.11 2001/07/25 15:04:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.12 2001/11/01 23:35:26 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/format.c b/lib/font/util/format.c index c20777293..596e6eb22 100644 --- a/lib/font/util/format.c +++ b/lib/font/util/format.c @@ -1,4 +1,4 @@ -/* $Xorg: format.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: format.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -27,7 +27,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/format.c,v 1.3 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */ #include "FSproto.h" #include "font.h" diff --git a/lib/font/util/miscutil.c b/lib/font/util/miscutil.c index 2de84b79a..2d4e9734a 100644 --- a/lib/font/util/miscutil.c +++ b/lib/font/util/miscutil.c @@ -1,10 +1,14 @@ -/* $Xorg: miscutil.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: miscutil.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/miscutil.c,v 1.6 2001/01/17 19:43:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/miscutil.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */ #include <X11/Xosdefs.h> #include <stdlib.h> diff --git a/lib/font/util/patcache.c b/lib/font/util/patcache.c index 30087bf50..37d0281c3 100644 --- a/lib/font/util/patcache.c +++ b/lib/font/util/patcache.c @@ -1,10 +1,14 @@ -/* $Xorg: patcache.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: patcache.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/patcache.c,v 3.3 1999/08/21 13:48:10 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/patcache.c,v 3.4 2001/01/17 19:43:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/private.c b/lib/font/util/private.c index 82ff01f2d..3a2430f61 100644 --- a/lib/font/util/private.c +++ b/lib/font/util/private.c @@ -1,10 +1,14 @@ -/* $Xorg: private.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: private.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/private.c,v 1.6 1999/10/13 05:27:10 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/private.c,v 1.7 2001/01/17 19:43:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/font/util/utilbitmap.c b/lib/font/util/utilbitmap.c index e8f558edc..bd7c2cdc7 100644 --- a/lib/font/util/utilbitmap.c +++ b/lib/font/util/utilbitmap.c @@ -1,10 +1,14 @@ -/* $Xorg: utilbitmap.c,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ */ +/* $Xorg: utilbitmap.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ /* Copyright 1990, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.3 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/lib/lbxutil/lbx_zlib/lbx_zlib.c b/lib/lbxutil/lbx_zlib/lbx_zlib.c index 9c0ad51e1..3ffb7e9a4 100644 --- a/lib/lbxutil/lbx_zlib/lbx_zlib.c +++ b/lib/lbxutil/lbx_zlib/lbx_zlib.c @@ -1,10 +1,14 @@ -/* $Xorg: lbx_zlib.c,v 1.5 2000/08/17 19:46:41 cpqbld Exp $ */ +/* $Xorg: lbx_zlib.c,v 1.6 2001/02/09 02:04:05 xorgcvs Exp $ */ /* Copyright 1995, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.8 2001/07/25 15:04:57 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.9 2001/08/27 19:01:07 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/lib/lbxutil/lbx_zlib/lbx_zlib.h b/lib/lbxutil/lbx_zlib/lbx_zlib.h index 90a466778..22e901a67 100644 --- a/lib/lbxutil/lbx_zlib/lbx_zlib.h +++ b/lib/lbxutil/lbx_zlib/lbx_zlib.h @@ -1,10 +1,14 @@ -/* $Xorg: lbx_zlib.h,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ +/* $Xorg: lbx_zlib.h,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* Copyright 1996 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.8 2001/01/17 19:43:36 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.9 2001/08/27 19:01:07 dawes Exp $ */ #include "zlib.h" #include "Xfuncproto.h" diff --git a/lib/lbxutil/lbx_zlib/reqstats.c b/lib/lbxutil/lbx_zlib/reqstats.c index bd249757e..50545b8f6 100644 --- a/lib/lbxutil/lbx_zlib/reqstats.c +++ b/lib/lbxutil/lbx_zlib/reqstats.c @@ -1,10 +1,14 @@ -/* $Xorg: reqstats.c,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ +/* $Xorg: reqstats.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* Copyright 1996 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.4 2001/01/17 19:43:36 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.5 2001/08/27 19:01:07 dawes Exp $ */ #include "reqstats.h" diff --git a/lib/lbxutil/lbx_zlib/reqstats.h b/lib/lbxutil/lbx_zlib/reqstats.h index 5938d18a6..eab64e94e 100644 --- a/lib/lbxutil/lbx_zlib/reqstats.h +++ b/lib/lbxutil/lbx_zlib/reqstats.h @@ -1,10 +1,14 @@ -/* $Xorg: reqstats.h,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ +/* $Xorg: reqstats.h,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* Copyright 1996 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.h,v 1.2 2001/08/27 19:01:07 dawes Exp $ */ #ifdef LBXREQSTATS struct ReqStats { diff --git a/lib/oldX/X10.h b/lib/oldX/X10.h index dc024d9f4..afdb80d6b 100644 --- a/lib/oldX/X10.h +++ b/lib/oldX/X10.h @@ -1,14 +1,13 @@ -/* $XConsortium: X10.h,v 11.12 94/04/17 20:11:33 jim Exp $ */ +/* $Xorg: X10.h,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* * -Copyright (c) 1985, 1986, 1987 X Consortium +Copyright 1985, 1986, 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,15 +15,15 @@ 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. -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. * - * The X Window System is a Trademark of X Consortium. + * The X Window System is a Trademark of The Open Group. * */ diff --git a/lib/oldX/XCrAssoc.c b/lib/oldX/XCrAssoc.c index 609b1e23c..9d9a589d1 100644 --- a/lib/oldX/XCrAssoc.c +++ b/lib/oldX/XCrAssoc.c @@ -1,14 +1,13 @@ -/* $XConsortium: XCrAssoc.c,v 10.18 94/04/17 20:11:34 rws Exp $ */ +/* $Xorg: XCrAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* -Copyright (c) 1985 X Consortium +Copyright 1985, 1998 The Open Group. -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/oldX/XDelAssoc.c b/lib/oldX/XDelAssoc.c index 252727812..51db2e176 100644 --- a/lib/oldX/XDelAssoc.c +++ b/lib/oldX/XDelAssoc.c @@ -1,9 +1,13 @@ -/* $Xorg: XDelAssoc.c,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */ +/* $Xorg: XDelAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group. -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.2 1999/05/23 06:33:34 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.3 2001/01/17 19:43:37 dawes Exp $ */ #include "Xlibint.h" #include "X10.h" diff --git a/lib/oldX/XDestAssoc.c b/lib/oldX/XDestAssoc.c index c30fb4315..d476805a3 100644 --- a/lib/oldX/XDestAssoc.c +++ b/lib/oldX/XDestAssoc.c @@ -1,9 +1,13 @@ -/* $Xorg: XDestAssoc.c,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */ +/* $Xorg: XDestAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group. -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.2 1999/05/23 06:33:34 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */ #include "Xlibint.h" #include "X10.h" diff --git a/lib/oldX/XDraw.c b/lib/oldX/XDraw.c index 1d5fee3ce..4d6f69424 100644 --- a/lib/oldX/XDraw.c +++ b/lib/oldX/XDraw.c @@ -1,4 +1,4 @@ -/* $Xorg: XDraw.c,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */ +/* $Xorg: XDraw.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* @@ -26,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XDraw.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XDraw.c,v 1.4 2001/07/25 15:04:57 dawes Exp $ */ #include "Xlibint.h" #include "Xlib.h" @@ -40,7 +40,11 @@ in this Software without prior written authorization from The Open Group. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, diff --git a/lib/oldX/XLookAssoc.c b/lib/oldX/XLookAssoc.c index 7e4c287d7..f6c8b45a6 100644 --- a/lib/oldX/XLookAssoc.c +++ b/lib/oldX/XLookAssoc.c @@ -1,14 +1,13 @@ -/* $XConsortium: XLookAssoc.c,v 10.18 94/04/17 20:11:37 rws Exp $ */ +/* $Xorg: XLookAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* -Copyright (c) 1985 X Consortium +Copyright 1985, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ diff --git a/lib/oldX/XMakeAssoc.c b/lib/oldX/XMakeAssoc.c index 441bbb0f3..162b3e0fd 100644 --- a/lib/oldX/XMakeAssoc.c +++ b/lib/oldX/XMakeAssoc.c @@ -1,9 +1,13 @@ -/* $Xorg: XMakeAssoc.c,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */ +/* $Xorg: XMakeAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group. -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.2 1999/05/23 06:33:35 dawes Exp $ */ +/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */ #include "Xlibint.h" #include "X10.h" diff --git a/lib/xtrans/Xtrans.c b/lib/xtrans/Xtrans.c index 837613546..baabe2990 100644 --- a/lib/xtrans/Xtrans.c +++ b/lib/xtrans/Xtrans.c @@ -1,9 +1,13 @@ -/* $Xorg: Xtrans.c,v 1.3 2000/08/17 19:46:45 cpqbld Exp $ */ +/* $Xorg: Xtrans.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.24 2001/01/17 19:43:45 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.25 2001/07/23 13:15:43 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/Xtrans.h b/lib/xtrans/Xtrans.h index 1f7ad4e3c..ec5711a2c 100644 --- a/lib/xtrans/Xtrans.h +++ b/lib/xtrans/Xtrans.h @@ -1,9 +1,13 @@ -/* $Xorg: Xtrans.h,v 1.3 2000/08/17 19:46:45 cpqbld Exp $ */ +/* $Xorg: Xtrans.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.16 2001/07/23 13:15:43 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.17 2001/07/25 15:04:59 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/Xtransdnet.c b/lib/xtrans/Xtransdnet.c index 9bb8410c1..f0baffcfa 100644 --- a/lib/xtrans/Xtransdnet.c +++ b/lib/xtrans/Xtransdnet.c @@ -1,9 +1,13 @@ -/* $Xorg: Xtransdnet.c,v 1.3 2000/08/17 19:46:45 cpqbld Exp $ */ +/* $Xorg: Xtransdnet.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.4 1999/06/20 08:41:21 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.5 2001/01/17 19:43:46 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/Xtransint.h b/lib/xtrans/Xtransint.h index af8ac0e65..a6f489014 100644 --- a/lib/xtrans/Xtransint.h +++ b/lib/xtrans/Xtransint.h @@ -1,9 +1,13 @@ -/* $Xorg: Xtransint.h,v 1.3 2000/08/17 19:46:46 cpqbld Exp $ */ +/* $Xorg: Xtransint.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.29 2001/07/23 13:15:43 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.30 2001/07/25 15:04:59 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/Xtranslcl.c b/lib/xtrans/Xtranslcl.c index 888062b6c..b941a894e 100644 --- a/lib/xtrans/Xtranslcl.c +++ b/lib/xtrans/Xtranslcl.c @@ -1,9 +1,13 @@ -/* $Xorg: Xtranslcl.c,v 1.3 2000/08/17 19:46:46 cpqbld Exp $ */ +/* $Xorg: Xtranslcl.c,v 1.6 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.35 2001/08/17 22:08:10 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.36 2001/10/28 03:32:48 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/Xtranssock.c b/lib/xtrans/Xtranssock.c index aaa4bf2ce..7189fb817 100644 --- a/lib/xtrans/Xtranssock.c +++ b/lib/xtrans/Xtranssock.c @@ -1,9 +1,13 @@ -/* $Xorg: Xtranssock.c,v 1.8 2000/08/17 19:46:46 cpqbld Exp $ */ +/* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.51 2001/10/28 03:32:49 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.52 2001/11/19 20:44:16 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/Xtranstli.c b/lib/xtrans/Xtranstli.c index 0f6ec2832..4e038af15 100644 --- a/lib/xtrans/Xtranstli.c +++ b/lib/xtrans/Xtranstli.c @@ -1,9 +1,13 @@ -/* $Xorg: Xtranstli.c,v 1.3 2000/08/17 19:46:46 cpqbld Exp $ */ +/* $Xorg: Xtranstli.c,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.8 1999/06/20 08:41:23 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.9 2001/01/17 19:43:48 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/Xtransutil.c b/lib/xtrans/Xtransutil.c index 996b53553..278fc2ed4 100644 --- a/lib/xtrans/Xtransutil.c +++ b/lib/xtrans/Xtransutil.c @@ -1,9 +1,13 @@ -/* $Xorg: Xtransutil.c,v 1.3 2000/08/17 19:46:46 cpqbld Exp $ */ +/* $Xorg: Xtransutil.c,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.19 2001/10/28 03:32:49 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.20 2001/11/19 20:44:16 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/lib/xtrans/transport.c b/lib/xtrans/transport.c index 726b6d5d0..c0c4dc2e0 100644 --- a/lib/xtrans/transport.c +++ b/lib/xtrans/transport.c @@ -1,9 +1,13 @@ -/* $Xorg: transport.c,v 1.3 2000/08/17 19:46:46 cpqbld Exp $ */ +/* $Xorg: transport.c,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/transport.c,v 3.6 2001/07/23 13:15:43 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/transport.c,v 3.7 2001/07/25 15:04:59 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h b/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h index bceb4e7a9..5698c4433 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h @@ -1,15 +1,14 @@ -/* $XConsortium: ddpex2.h,v 5.2 94/04/17 20:36:40 rws Exp $ */ +/* $Xorg: ddpex2.h,v 1.6 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1990, 1991 X Consortium +Copyright 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1990, 1991 by Sun Microsystems, Inc. @@ -191,7 +190,11 @@ typedef struct { } miLightStateStruct; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + ddUSHORT c_operator; +#else ddUSHORT operator; +#endif listofObj *halfspaces; } miMCVolume_Struct; diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miClip.h b/programs/Xserver/PEX5/ddpex/mi/include/miClip.h index c2e646479..2a1b4ecb0 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miClip.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miClip.h @@ -1,15 +1,13 @@ -/* $XConsortium: miClip.h,v 5.3 94/04/17 20:36:40 hersh Exp $ */ +/* $Xorg: miClip.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /* -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miFont.h b/programs/Xserver/PEX5/ddpex/mi/include/miFont.h index c4a5f93d2..87ee635fa 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miFont.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miFont.h @@ -1,10 +1,14 @@ -/* $Xorg: miFont.h,v 1.3 2000/08/17 19:47:03 cpqbld Exp $ */ +/* $Xorg: miFont.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h,v 1.2 1999/01/31 12:21:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h,v 1.3 2001/01/17 22:12:19 dawes Exp $ */ /* * font internal format */ diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h b/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h index 4dbfe7a93..71546ee24 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h @@ -1,15 +1,13 @@ -/* $XConsortium: miInfo.h,v 5.4 94/04/17 20:36:41 hersh Exp $ */ +/* $Xorg: miInfo.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /* -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h b/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h index c09425cb8..3ad512fb7 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h @@ -1,15 +1,14 @@ -/* $XConsortium: miLUT.h,v 5.4 94/04/17 20:36:42 hersh Exp $ */ +/* $Xorg: miLUT.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miLight.h b/programs/Xserver/PEX5/ddpex/mi/include/miLight.h index ab1c771f3..1c60a42b4 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miLight.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miLight.h @@ -1,9 +1,13 @@ -/* $Xorg: miLight.h,v 1.3 2000/08/17 19:47:03 cpqbld Exp $ */ +/* $Xorg: miLight.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h,v 1.4 1998/10/04 09:34:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h,v 1.5 2001/01/17 22:12:20 dawes Exp $ */ #ifndef MI_LIGHT_H #define MI_LIGHT_H diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h b/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h index 8b6c5be4c..3fd53a348 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h @@ -1,15 +1,14 @@ -/* $XConsortium: miLineDash.h,v 5.2 94/04/17 20:36:43 rws Exp $ */ +/* $Xorg: miLineDash.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /***************************************************************** -Copyright (c) 1989,1990, 1991 X Consortium +Copyright 1989,1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. +Copyright 1989,1990, 1991 by Sun Microsystems, Inc. All Rights Reserved @@ -34,7 +33,7 @@ documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun Microsystems, -and the X Consortium, not be used in advertising or publicity +and The Open Group, not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h b/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h index 5241b8093..ff6163347 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h @@ -1,15 +1,13 @@ -/* $XConsortium: miMarkers.h,v 5.2 94/04/17 20:36:44 rws Exp $ */ +/* $Xorg: miMarkers.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /* -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miNS.h b/programs/Xserver/PEX5/ddpex/mi/include/miNS.h index 49fab7a6c..cf66621f4 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miNS.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miNS.h @@ -1,15 +1,14 @@ -/* $XConsortium: miNS.h,v 5.2 94/04/17 20:36:44 rws Exp $ */ +/* $Xorg: miNS.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h b/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h index 613188477..912de23aa 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h @@ -1,15 +1,14 @@ -/* $XConsortium: miNurbs.h,v 5.3 94/04/17 20:36:45 rws Exp $ */ +/* $Xorg: miNurbs.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /***************************************************************** -Copyright (c) 1989,1990, 1991 X Consortium +Copyright 1989,1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. +Copyright 1989,1990, 1991 by Sun Microsystems, Inc. All Rights Reserved @@ -34,7 +33,7 @@ documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun Microsystems, -and the X Consortium, not be used in advertising or publicity +and The Open Group, not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miPick.h b/programs/Xserver/PEX5/ddpex/mi/include/miPick.h index 6bba053d4..07780df7e 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miPick.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miPick.h @@ -1,15 +1,14 @@ -/* $XConsortium: miPick.h,v 5.2 94/04/17 20:36:45 rws Exp $ */ +/* $Xorg: miPick.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miRender.h b/programs/Xserver/PEX5/ddpex/mi/include/miRender.h index 220e8804b..5104c1c2b 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miRender.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miRender.h @@ -1,16 +1,15 @@ -/* $XConsortium: miRender.h,v 5.4 94/04/17 20:36:46 hersh Exp $ */ +/* $Xorg: miRender.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h b/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h index fcb720636..e29bf66ba 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h @@ -1,15 +1,14 @@ -/* $XConsortium: miStrMacro.h,v 5.5 94/04/17 20:36:46 hersh Exp $ */ +/* $Xorg: miStrMacro.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h b/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h index d14d5c3d1..db8429a05 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h @@ -1,11 +1,15 @@ -/* $Xorg: miStruct.h,v 1.3 2000/08/17 19:47:03 cpqbld Exp $ */ +/* $Xorg: miStruct.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h,v 1.5 2001/01/17 22:12:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h,v 1.6 2001/07/24 08:32:57 alanh Exp $ */ #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miText.h b/programs/Xserver/PEX5/ddpex/mi/include/miText.h index 199522cca..566f6ce44 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miText.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miText.h @@ -1,15 +1,14 @@ -/* $XConsortium: miText.h,v 5.2 94/04/17 20:36:47 rws Exp $ */ +/* $Xorg: miText.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989,1990, 1991 X Consortium +Copyright 1989,1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Copyright (c) 1989,1990, 1991 by Sun Microsystems, Inc. +Copyright 1989,1990, 1991 by Sun Microsystems, Inc. All Rights Reserved @@ -34,7 +33,7 @@ documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun Microsystems, -and the X Consortium, not be used in advertising or publicity +and The Open Group, not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/miWks.h b/programs/Xserver/PEX5/ddpex/mi/include/miWks.h index b8c2e35ce..054165243 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/miWks.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/miWks.h @@ -1,15 +1,14 @@ -/* $XConsortium: miWks.h,v 5.4 94/04/17 20:36:48 rws Exp $ */ +/* $Xorg: miWks.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/include/mipex.h b/programs/Xserver/PEX5/ddpex/mi/include/mipex.h index 612beace1..302543510 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/mipex.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/mipex.h @@ -1,10 +1,14 @@ -/* $Xorg: mipex.h,v 1.3 2000/08/17 19:47:03 cpqbld Exp $ */ +/* $Xorg: mipex.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h,v 3.1 1998/10/04 09:34:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h,v 3.2 2001/01/17 22:12:20 dawes Exp $ */ #ifndef MI_H #define MI_H diff --git a/programs/Xserver/PEX5/ddpex/mi/include/mixform.h b/programs/Xserver/PEX5/ddpex/mi/include/mixform.h index b7e33b761..d4a56964c 100644 --- a/programs/Xserver/PEX5/ddpex/mi/include/mixform.h +++ b/programs/Xserver/PEX5/ddpex/mi/include/mixform.h @@ -1,15 +1,14 @@ -/* $XConsortium: mixform.h,v 5.2 94/04/17 20:36:49 rws Exp $ */ +/* $Xorg: mixform.h,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/level0/README b/programs/Xserver/PEX5/ddpex/mi/level0/README index 731a1b758..d5f7b721c 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level0/README +++ b/programs/Xserver/PEX5/ddpex/mi/level0/README @@ -1,16 +1,15 @@ -/* $XConsortium: README,v 5.2 94/04/17 20:36:50 rws Exp $ */ +/* $Xorg: README,v 1.4 2001/02/09 02:04:08 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c b/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c index 5225fd694..f27bff93d 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c @@ -1,10 +1,14 @@ -/* $Xorg: mi52stubs.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: mi52stubs.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /*********************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c b/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c index 14e594c7e..cbff2d9d8 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c @@ -1,9 +1,13 @@ -/* $Xorg: miDDCtoGC.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miDDCtoGC.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c,v 3.6 1998/10/04 09:34:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c,v 3.7 2001/01/17 22:12:20 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c b/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c index dec03a0d4..a8d3560f2 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c @@ -1,9 +1,13 @@ -/* $Xorg: miLevel1.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miLevel1.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c b/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c index ef6ebf3bb..ecc5b8ed6 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c @@ -1,9 +1,13 @@ -/* $Xorg: miListUtil.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miListUtil.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c,v 3.5 1998/10/04 09:34:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c,v 3.6 2001/01/17 22:12:21 dawes Exp $ */ #include "miRender.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c b/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c index 4311533c3..7e65177a3 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c @@ -1,10 +1,14 @@ -/* $Xorg: miLvl1Tab.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miLvl1Tab.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c b/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c index 81d7bc3e6..e93709b81 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c @@ -1,9 +1,13 @@ -/* $Xorg: miPck1Prim.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miPck1Prim.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c b/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c index 1b1cec876..aa9b12d37 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c @@ -1,9 +1,13 @@ -/* $Xorg: miRndFArea.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miRndFArea.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c b/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c index 6d39c9dc8..0bc52e148 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c @@ -1,9 +1,13 @@ -/* $Xorg: miRndMarkr.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miRndMarkr.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c,v 3.6 1998/10/04 09:34:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c,v 3.7 2001/01/17 22:12:21 dawes Exp $ */ #define NEED_EVENTS #include "miRender.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c b/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c index 60ea282be..8f0b9154d 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c @@ -1,9 +1,13 @@ -/* $Xorg: miRndPLine.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miRndPLine.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c b/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c index a52b8bff0..321f4577e 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c @@ -1,9 +1,13 @@ -/* $Xorg: miRndTStrip.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miRndTStrip.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c b/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c index ec3b5b605..362e29e07 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c +++ b/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c @@ -1,9 +1,13 @@ -/* $Xorg: miRndText.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miRndText.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c,v 3.5 1998/10/04 09:34:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c,v 3.6 2001/01/17 22:12:21 dawes Exp $ */ #define NEED_EVENTS #include "miRender.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c b/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c index 468aeadf4..c9d7d25c2 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c @@ -1,9 +1,13 @@ -/* $Xorg: ddContext.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: ddContext.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c,v 3.5 1998/10/04 09:34:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c,v 3.6 2001/01/17 22:12:22 dawes Exp $ */ #include "miWks.h" #include "miStruct.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c b/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c index 0356275cf..78290d937 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c @@ -1,9 +1,13 @@ -/* $Xorg: miBldXform.c,v 1.3 2000/08/17 19:47:04 cpqbld Exp $ */ +/* $Xorg: miBldXform.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c,v 3.5 1998/10/04 09:34:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c,v 3.6 2001/01/17 22:12:22 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c b/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c index b0b0cdeec..696929419 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c @@ -1,9 +1,13 @@ -/* $Xorg: miCellArray.c,v 1.3 2000/08/17 19:47:05 cpqbld Exp $ */ +/* $Xorg: miCellArray.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c,v 3.6 1998/10/04 09:34:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c,v 3.7 2001/01/17 22:12:22 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c b/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c index 8d02dbe29..2326b35cd 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c @@ -1,9 +1,13 @@ -/* $Xorg: miClip.c,v 1.3 2000/08/17 19:47:05 cpqbld Exp $ */ +/* $Xorg: miClip.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c,v 3.5 1998/10/04 09:34:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c,v 3.6 2001/01/17 22:12:22 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c b/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c index 4fec1e1ca..c1babac8a 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c @@ -1,9 +1,13 @@ -/* $Xorg: miConvert.c,v 1.3 2000/08/17 19:47:05 cpqbld Exp $ */ +/* $Xorg: miConvert.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c,v 1.7 1998/10/04 09:34:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c,v 1.8 2001/01/17 22:12:22 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c b/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c index c83d245f6..779edbb52 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c @@ -1,10 +1,14 @@ -/* $Xorg: miCopy.c,v 1.3 2000/08/17 19:47:05 cpqbld Exp $ */ +/* $Xorg: miCopy.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c,v 3.6 1998/10/04 09:34:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c,v 3.7 2001/01/17 22:12:23 dawes Exp $ */ #include "ddpex.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c b/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c index 670fbbaac..fc3fb824a 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c @@ -1,10 +1,14 @@ -/* $Xorg: miDestroy.c,v 1.3 2000/08/17 19:47:05 cpqbld Exp $ */ +/* $Xorg: miDestroy.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /*********************************************************** Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c b/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c index ee8dddad0..23f377b9a 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c @@ -1,9 +1,13 @@ -/* $Xorg: miFillArea.c,v 1.3 2000/08/17 19:47:05 cpqbld Exp $ */ +/* $Xorg: miFillArea.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c,v 3.5 1998/10/04 09:34:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c,v 3.6 2001/01/17 22:12:23 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c b/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c index 945a08411..cfa878840 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c @@ -1,10 +1,14 @@ -/* $Xorg: miInquire.c,v 1.5 2000/08/17 19:47:06 cpqbld Exp $ */ +/* $Xorg: miInquire.c,v 1.6 2001/02/09 02:04:09 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c,v 3.6 1998/10/04 09:34:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c,v 3.7 2001/01/17 22:12:23 dawes Exp $ */ #include "ddpex.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c b/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c index f54430e88..c87c08466 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c @@ -1,9 +1,13 @@ -/* $Xorg: miLight.c,v 1.3 2000/08/17 19:47:06 cpqbld Exp $ */ +/* $Xorg: miLight.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c,v 1.7 1998/10/04 09:34:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c,v 1.8 2001/01/17 22:12:23 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c b/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c index fbd890073..354848857 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c @@ -1,9 +1,13 @@ -/* $Xorg: miLvl2Tab.c,v 1.3 2000/08/17 19:47:06 cpqbld Exp $ */ +/* $Xorg: miLvl2Tab.c,v 1.4 2001/02/09 02:04:09 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c b/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c index 419920d62..ac59f4d0b 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c @@ -1,9 +1,13 @@ -/* $Xorg: miMarkers.c,v 1.3 2000/08/17 19:47:06 cpqbld Exp $ */ +/* $Xorg: miMarkers.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c,v 3.5 1998/10/04 09:34:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c,v 3.6 2001/01/17 22:12:23 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c b/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c index 2238df225..df5905a38 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c @@ -1,9 +1,13 @@ -/* $Xorg: miNCurve.c,v 1.3 2000/08/17 19:47:06 cpqbld Exp $ */ +/* $Xorg: miNCurve.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c,v 3.6 1998/10/04 09:34:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c,v 3.7 2001/01/17 22:12:23 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c b/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c index 8fc9c8175..8fe3fc477 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c @@ -1,9 +1,13 @@ -/* $Xorg: miNSTrim.c,v 1.3 2000/08/17 19:47:06 cpqbld Exp $ */ +/* $Xorg: miNSTrim.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c,v 3.5 1998/10/04 09:34:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c,v 3.6 2001/01/17 22:12:23 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c b/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c index 8fa10a6af..5a9c0e7ab 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c @@ -1,9 +1,13 @@ -/* $Xorg: miNSurf.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miNSurf.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c,v 3.7 2000/04/05 18:13:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c,v 3.8 2001/01/17 22:12:23 dawes Exp $ */ #define TRIMING 1 diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c b/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c index 5dd191f02..c42963cd3 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c @@ -1,9 +1,13 @@ -/* $Xorg: miNurbs.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miNurbs.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c,v 3.6 1999/01/31 12:21:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c,v 3.7 2001/01/17 22:12:24 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c b/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c index 920eeca0e..0754a4d55 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c @@ -1,9 +1,13 @@ -/* $Xorg: miOCs.c,v 1.5 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miOCs.c,v 1.6 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c,v 3.5 1998/10/04 09:34:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c,v 3.6 2001/01/17 22:12:24 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c b/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c index 704d782ce..f247fe307 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c @@ -1,9 +1,13 @@ -/* $Xorg: miPickPrim.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miPickPrim.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c,v 3.6 1998/10/04 09:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c,v 3.7 2001/01/17 22:12:24 dawes Exp $ */ #include "miWks.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c b/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c index 3de0cc2e6..6e68f3dfa 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c @@ -1,9 +1,13 @@ -/* $Xorg: miPolyLine.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miPolyLine.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c,v 3.5 1998/10/04 09:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c,v 3.6 2001/01/17 22:12:24 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c b/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c index d8b6a83e2..31658cf77 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c @@ -1,9 +1,13 @@ -/* $Xorg: miQuadMesh.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miQuadMesh.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c,v 3.6 1998/10/04 09:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c,v 3.7 2001/01/17 22:12:24 dawes Exp $ */ #include "miLUT.h" #include "ddpex2.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c b/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c index 4ea801ac5..472e8ea00 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c @@ -1,10 +1,14 @@ -/* $Xorg: miReplace.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miReplace.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c,v 3.6 1998/10/04 09:34:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c,v 3.7 2001/01/17 22:12:24 dawes Exp $ */ #include "ddpex2.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c b/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c index bee2e2443..c9edbe824 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c @@ -1,9 +1,13 @@ -/* $Xorg: miSOFAS.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miSOFAS.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c,v 3.6 1998/10/04 09:34:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c,v 3.7 2001/01/17 22:12:24 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c b/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c index 0e1ef4ef6..e159f19fb 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c @@ -1,9 +1,13 @@ -/* $Xorg: miSearch.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miSearch.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c,v 3.5 1998/10/04 09:34:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c,v 3.6 2001/01/17 22:12:24 dawes Exp $ */ #include "miWks.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c b/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c index 9c166bfbd..928848581 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c @@ -1,9 +1,13 @@ -/* $Xorg: miTestOCs.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miTestOCs.c,v 1.4 2001/02/09 02:04:10 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miText.c b/programs/Xserver/PEX5/ddpex/mi/level2/miText.c index ebf1d078c..3620000cb 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miText.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miText.c @@ -1,9 +1,13 @@ -/* $Xorg: miText.c,v 1.3 2000/08/17 19:47:07 cpqbld Exp $ */ +/* $Xorg: miText.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c,v 3.6 1998/10/04 09:34:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c,v 3.7 2001/01/17 22:12:24 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c b/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c index 79f85c973..62f185785 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c @@ -1,9 +1,13 @@ -/* $Xorg: miTrans.c,v 1.3 2000/08/17 19:47:08 cpqbld Exp $ */ +/* $Xorg: miTrans.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c,v 1.7 1998/10/04 09:34:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c,v 1.8 2001/01/17 22:12:25 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c b/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c index cfd87429b..1bcabea48 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c @@ -1,9 +1,13 @@ -/* $Xorg: miTriStrip.c,v 1.3 2000/08/17 19:47:08 cpqbld Exp $ */ +/* $Xorg: miTriStrip.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c,v 3.5 1998/10/04 09:34:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c,v 3.6 2001/01/17 22:12:25 dawes Exp $ */ #include "miClip.h" #include "misc.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c b/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c index b69758ef7..f0f2ebb14 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c +++ b/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c @@ -1,10 +1,14 @@ -/* $Xorg: pexOCParse.c,v 1.5 2000/08/17 19:47:08 cpqbld Exp $ */ +/* $Xorg: pexOCParse.c,v 1.6 2001/02/09 02:04:11 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c,v 3.6 1998/10/04 09:34:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c,v 3.7 2001/01/17 22:12:25 dawes Exp $ */ #include "miStruct.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c b/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c index 09942c048..4b6fe2baa 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c +++ b/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c @@ -1,9 +1,13 @@ -/* $Xorg: miRender.c,v 1.3 2000/08/17 19:47:08 cpqbld Exp $ */ +/* $Xorg: miRender.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c,v 3.5 1998/10/04 09:34:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c,v 3.6 2001/01/17 22:12:27 dawes Exp $ */ #include "miLUT.h" #include "dipex.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c b/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c index d04012796..621987cc7 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c +++ b/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c @@ -1,10 +1,14 @@ -/* $Xorg: miRndrPick.c,v 1.3 2000/08/17 19:47:09 cpqbld Exp $ */ +/* $Xorg: miRndrPick.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /************************************************************ Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c,v 1.8 1999/12/27 00:39:31 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c,v 1.9 2001/01/17 22:12:28 dawes Exp $ */ #include "miLUT.h" #include "ddpex3.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c b/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c index 3dcdc8419..2fd55b370 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c @@ -1,9 +1,13 @@ -/* $Xorg: css_ex_str.c,v 1.3 2000/08/17 19:47:09 cpqbld Exp $ */ +/* $Xorg: css_ex_str.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c,v 1.8 1999/01/31 12:21:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c,v 1.9 2001/01/17 22:12:29 dawes Exp $ */ /* * this file contains the element handling procedures for * the execute structure element. It is stored in PEX format diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c b/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c index d7550a90f..78e236e70 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c @@ -1,9 +1,13 @@ -/* $Xorg: css_plain.c,v 1.3 2000/08/17 19:47:09 cpqbld Exp $ */ +/* $Xorg: css_plain.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c,v 1.8 1999/01/31 12:21:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c,v 1.9 2001/01/17 22:12:29 dawes Exp $ */ /* * this file contains the element handling procedures for elements * which are stored in the format they are received. This includes diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c b/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c index a4d71b9ae..991e30bfb 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c @@ -1,9 +1,13 @@ -/* $Xorg: css_tbls.c,v 1.3 2000/08/17 19:47:09 cpqbld Exp $ */ +/* $Xorg: css_tbls.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c b/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c index 2740c82bb..8d2160195 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c @@ -1,9 +1,13 @@ -/* $Xorg: miDynamics.c,v 1.3 2000/08/17 19:47:10 cpqbld Exp $ */ +/* $Xorg: miDynamics.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c b/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c index 0bd91a2a0..0a6dced44 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c @@ -1,9 +1,13 @@ -/* $Xorg: miPick.c,v 1.3 2000/08/17 19:47:10 cpqbld Exp $ */ +/* $Xorg: miPick.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c,v 1.7 1998/10/04 09:34:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c,v 1.8 2001/01/17 22:12:29 dawes Exp $ */ #include "miWks.h" /* miPickMeasureStr is defined in here */ #include "miNS.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c b/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c index 450d3ef11..6b4a5ccc6 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c @@ -1,9 +1,13 @@ -/* $Xorg: miSC.c,v 1.3 2000/08/17 19:47:10 cpqbld Exp $ */ +/* $Xorg: miSC.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c,v 1.8 1999/01/31 12:21:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c,v 1.9 2001/01/17 22:12:29 dawes Exp $ */ #include "ddpex4.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c b/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c index af04ce551..c0fadbb35 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c @@ -1,9 +1,13 @@ -/* $Xorg: miStruct.c,v 1.3 2000/08/17 19:47:10 cpqbld Exp $ */ +/* $Xorg: miStruct.c,v 1.4 2001/02/09 02:04:11 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c,v 3.5 1998/10/04 09:34:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c,v 3.6 2001/01/17 22:12:29 dawes Exp $ */ #include "mipex.h" #include "ddpex4.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c b/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c index f8be0b5c3..8ec21c27c 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c @@ -1,9 +1,13 @@ -/* $Xorg: miTraverse.c,v 1.3 2000/08/17 19:47:10 cpqbld Exp $ */ +/* $Xorg: miTraverse.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c,v 1.8 1999/01/31 12:21:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c,v 1.9 2001/01/17 22:12:30 dawes Exp $ */ #include "miWks.h" #include "PEXproto.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c b/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c index 165590f62..caaa20b33 100644 --- a/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c +++ b/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c @@ -1,9 +1,13 @@ -/* $Xorg: miWks.c,v 1.3 2000/08/17 19:47:10 cpqbld Exp $ */ +/* $Xorg: miWks.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c,v 1.8 2000/01/26 22:05:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c,v 1.9 2001/01/17 22:12:30 dawes Exp $ */ #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c index 8eaecac6e..3f8aa7519 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miClrApLUT.c,v 1.3 2000/08/17 19:47:10 cpqbld Exp $ */ +/* $Xorg: miClrApLUT.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c,v 1.7 1998/10/04 09:34:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c,v 1.8 2001/01/17 22:12:32 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c index 7535eda56..19f587ce2 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miColrLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miColrLUT.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c,v 1.7 1998/10/04 09:34:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c,v 1.8 2001/01/17 22:12:32 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c index 737124f4e..ea93bbd2a 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miDCueLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miDCueLUT.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c,v 1.7 1998/10/04 09:34:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c,v 1.8 2001/01/17 22:12:32 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c index 2049c0f30..348b4b93c 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miEdgeLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miEdgeLUT.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c,v 1.7 1998/10/04 09:34:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c,v 1.8 2001/01/17 22:12:32 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c b/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c index eabef4ef6..3e097ffdd 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c @@ -1,9 +1,13 @@ -/* $Xorg: miFont.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miFont.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c,v 3.5 1998/10/04 09:34:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c,v 3.6 2001/01/17 22:12:33 dawes Exp $ */ #include "miFont.h" #include "miLUT.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c index e0c03e7cc..91b26bd77 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miFontLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miFontLUT.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c,v 1.7 1998/10/04 09:34:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c,v 1.8 2001/01/17 22:12:33 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c index d0a79dc7d..09615c9b8 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miIntLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miIntLUT.c,v 1.4 2001/02/09 02:04:12 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c,v 1.7 1998/10/04 09:34:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c,v 1.8 2001/01/17 22:12:33 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c index 36f58e62f..834a8071c 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miLUT.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c,v 1.9 1999/07/18 08:34:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c,v 1.10 2001/01/17 22:12:33 dawes Exp $ */ #include "miLUT.h" #include "pexUtils.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci b/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci index 36ee3f8ec..c33f3626b 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci @@ -1,15 +1,13 @@ -/* $XConsortium: miLUTProcs.ci,v 5.6 94/04/17 20:37:42 hersh Exp $ */ +/* $Xorg: miLUTProcs.ci,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* -Copyright (c) 1990, 1991 X Consortium +Copyright 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,18 +15,18 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. -Copyright (c) 1990, 1991 by Sun Microsystems, Inc. +Copyright 1990, 1991 by Sun Microsystems, Inc. All Rights Reserved Permission to use, copy, modify, and distribute this software and its diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c index 85e07aa00..98eadbacf 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miLightLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miLightLUT.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c,v 1.7 1998/10/04 09:34:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c,v 1.8 2001/01/17 22:12:33 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c index efd878156..3c7f84d99 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miLineLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miLineLUT.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c,v 1.7 1998/10/04 09:34:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c,v 1.8 2001/01/17 22:12:33 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c index 140057054..db0a19fbf 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miMarkLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miMarkLUT.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c,v 1.7 1998/10/04 09:34:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c,v 1.8 2001/01/17 22:12:33 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c b/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c index e03416714..02ea4c952 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c @@ -1,9 +1,13 @@ -/* $Xorg: miMisc.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miMisc.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c,v 1.7 1998/10/04 09:34:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c,v 1.8 2001/01/17 22:12:34 dawes Exp $ */ #include "mipex.h" #include "miInfo.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c b/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c index e6a0f271d..fecb0d005 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c @@ -1,9 +1,13 @@ -/* $Xorg: miNS.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miNS.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c,v 1.8 1999/01/31 12:21:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c,v 1.9 2001/01/17 22:12:34 dawes Exp $ */ #include "mipex.h" #include "miNS.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c index 45db3d5b7..c32aa5235 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miPattLUT.c,v 1.3 2000/08/17 19:47:11 cpqbld Exp $ */ +/* $Xorg: miPattLUT.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c,v 1.7 1998/10/04 09:34:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c,v 1.8 2001/01/17 22:12:34 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c index e5e9766cb..74f86301f 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c @@ -1,10 +1,14 @@ -/* $Xorg: miTextLUT.c,v 1.3 2000/08/17 19:47:12 cpqbld Exp $ */ +/* $Xorg: miTextLUT.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c,v 1.7 1998/10/04 09:34:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c,v 1.8 2001/01/17 22:12:34 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c b/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c index 60ba2ff17..86650ba85 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c @@ -1,9 +1,13 @@ -/* $Xorg: miUtils.c,v 1.3 2000/08/17 19:47:12 cpqbld Exp $ */ +/* $Xorg: miUtils.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c,v 1.7 1998/10/04 09:34:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c,v 1.8 2001/01/17 22:12:34 dawes Exp $ */ #include "mipex.h" #include "PEX.h" diff --git a/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c b/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c index 39558b878..c13bdac59 100644 --- a/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c +++ b/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c @@ -1,9 +1,13 @@ -/* $Xorg: miViewLUT.c,v 1.3 2000/08/17 19:47:12 cpqbld Exp $ */ +/* $Xorg: miViewLUT.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c,v 1.7 1998/10/04 09:34:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c,v 1.8 2001/01/17 22:12:34 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c b/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c index fae18cc4a..91b1d1c03 100644 --- a/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c +++ b/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c @@ -1,10 +1,14 @@ -/* $Xorg: dipexBuf.c,v 1.3 2000/08/17 19:47:12 cpqbld Exp $ */ +/* $Xorg: dipexBuf.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c b/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c index 6c95ecc8c..59173c60d 100644 --- a/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c +++ b/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c @@ -1,10 +1,14 @@ -/* $Xorg: dipexExt.c,v 1.3 2000/08/17 19:47:12 cpqbld Exp $ */ +/* $Xorg: dipexExt.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c,v 3.20 2001/02/16 13:24:06 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c,v 3.21 2001/08/06 20:51:02 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c b/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c index cc59dadc4..718c42a4f 100644 --- a/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c +++ b/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c @@ -1,10 +1,14 @@ -/* $Xorg: dipexParse.c,v 1.3 2000/08/17 19:47:12 cpqbld Exp $ */ +/* $Xorg: dipexParse.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/dispatch/pexDump.c b/programs/Xserver/PEX5/dipex/dispatch/pexDump.c index 8073ed52d..7f55eee25 100644 --- a/programs/Xserver/PEX5/dipex/dispatch/pexDump.c +++ b/programs/Xserver/PEX5/dipex/dispatch/pexDump.c @@ -1,10 +1,14 @@ -/* $Xorg: pexDump.c,v 1.3 2000/08/17 19:47:12 cpqbld Exp $ */ +/* $Xorg: pexDump.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/dispatch/pexError.c b/programs/Xserver/PEX5/dipex/dispatch/pexError.c index 67bbefdb2..24e72241d 100644 --- a/programs/Xserver/PEX5/dipex/dispatch/pexError.c +++ b/programs/Xserver/PEX5/dipex/dispatch/pexError.c @@ -1,15 +1,14 @@ -/* $XConsortium: pexError.c,v 5.3 94/04/17 20:36:05 dpw Exp $ */ +/* $Xorg: pexError.c,v 1.4 2001/02/09 02:04:13 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c b/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c index 4d048cbc9..7e3bfbfcd 100644 --- a/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c +++ b/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c @@ -1,9 +1,13 @@ -/* $Xorg: pexUtils.c,v 1.3 2000/08/17 19:47:13 cpqbld Exp $ */ +/* $Xorg: pexUtils.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c,v 3.6 1998/10/04 09:34:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c,v 3.7 2001/01/17 22:12:36 dawes Exp $ */ #include "ddpex.h" #include "pexUtils.h" diff --git a/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c b/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c index 54454a090..5fa5f7896 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c +++ b/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c @@ -1,9 +1,13 @@ -/* $Xorg: pexAccBuf.c,v 1.3 2000/08/17 19:47:13 cpqbld Exp $ */ +/* $Xorg: pexAccBuf.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/objects/pexFont.c b/programs/Xserver/PEX5/dipex/objects/pexFont.c index 496840e92..626c01819 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexFont.c +++ b/programs/Xserver/PEX5/dipex/objects/pexFont.c @@ -1,10 +1,14 @@ -/* $Xorg: pexFont.c,v 1.3 2000/08/17 19:47:13 cpqbld Exp $ */ +/* $Xorg: pexFont.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexFont.c,v 3.7 1998/10/04 09:35:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexFont.c,v 3.8 2001/01/17 22:12:37 dawes Exp $ */ /*++ pexFont.c diff --git a/programs/Xserver/PEX5/dipex/objects/pexInfo.c b/programs/Xserver/PEX5/dipex/objects/pexInfo.c index 484f9972a..699333089 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexInfo.c +++ b/programs/Xserver/PEX5/dipex/objects/pexInfo.c @@ -1,10 +1,14 @@ -/* $Xorg: pexInfo.c,v 1.3 2000/08/17 19:47:13 cpqbld Exp $ */ +/* $Xorg: pexInfo.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c,v 1.7 1998/10/04 09:35:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c,v 1.8 2001/01/17 22:12:37 dawes Exp $ */ /*++ pexInfo.c diff --git a/programs/Xserver/PEX5/dipex/objects/pexLut.c b/programs/Xserver/PEX5/dipex/objects/pexLut.c index d2ff5cd4d..3f204b1dc 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexLut.c +++ b/programs/Xserver/PEX5/dipex/objects/pexLut.c @@ -1,9 +1,13 @@ -/* $Xorg: pexLut.c,v 1.3 2000/08/17 19:47:13 cpqbld Exp $ */ +/* $Xorg: pexLut.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexLut.c,v 3.7 1999/01/31 12:21:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexLut.c,v 3.8 2001/01/17 22:12:37 dawes Exp $ */ /*++ diff --git a/programs/Xserver/PEX5/dipex/objects/pexNs.c b/programs/Xserver/PEX5/dipex/objects/pexNs.c index 751f1b5de..c3cd81fef 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexNs.c +++ b/programs/Xserver/PEX5/dipex/objects/pexNs.c @@ -1,9 +1,13 @@ -/* $Xorg: pexNs.c,v 1.3 2000/08/17 19:47:13 cpqbld Exp $ */ +/* $Xorg: pexNs.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexNs.c,v 3.6 1999/01/31 12:21:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexNs.c,v 3.7 2001/01/17 22:12:37 dawes Exp $ */ #include "X.h" diff --git a/programs/Xserver/PEX5/dipex/objects/pexPc.c b/programs/Xserver/PEX5/dipex/objects/pexPc.c index 5c2af3573..c073df9a4 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexPc.c +++ b/programs/Xserver/PEX5/dipex/objects/pexPc.c @@ -1,10 +1,14 @@ -/* $Xorg: pexPc.c,v 1.3 2000/08/17 19:47:14 cpqbld Exp $ */ +/* $Xorg: pexPc.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPc.c,v 3.5 1998/10/04 09:35:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPc.c,v 3.6 2001/01/17 22:12:37 dawes Exp $ */ /*++ diff --git a/programs/Xserver/PEX5/dipex/objects/pexPhigs.c b/programs/Xserver/PEX5/dipex/objects/pexPhigs.c index e76b8d59f..aed6d14ce 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexPhigs.c +++ b/programs/Xserver/PEX5/dipex/objects/pexPhigs.c @@ -1,10 +1,14 @@ -/* $Xorg: pexPhigs.c,v 1.3 2000/08/17 19:47:14 cpqbld Exp $ */ +/* $Xorg: pexPhigs.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c,v 3.6 1999/01/31 12:21:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c,v 3.7 2001/01/17 22:12:38 dawes Exp $ */ /*++ diff --git a/programs/Xserver/PEX5/dipex/objects/pexPick.c b/programs/Xserver/PEX5/dipex/objects/pexPick.c index 8b3ba45c3..7cd7a55b1 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexPick.c +++ b/programs/Xserver/PEX5/dipex/objects/pexPick.c @@ -1,9 +1,13 @@ -/* $Xorg: pexPick.c,v 1.3 2000/08/17 19:47:14 cpqbld Exp $ */ +/* $Xorg: pexPick.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPick.c,v 3.6 1999/01/31 12:21:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPick.c,v 3.7 2001/01/17 22:12:38 dawes Exp $ */ /*++ diff --git a/programs/Xserver/PEX5/dipex/objects/pexRndr.c b/programs/Xserver/PEX5/dipex/objects/pexRndr.c index aa9f4ef29..b091ac6ed 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexRndr.c +++ b/programs/Xserver/PEX5/dipex/objects/pexRndr.c @@ -1,10 +1,14 @@ -/* $Xorg: pexRndr.c,v 1.3 2000/08/17 19:47:14 cpqbld Exp $ */ +/* $Xorg: pexRndr.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c,v 3.6 1998/10/04 09:35:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c,v 3.7 2001/01/17 22:12:38 dawes Exp $ */ /*++ * PEXCreateRenderer diff --git a/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c b/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c index 0e8e7bb57..f005e9cc0 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c +++ b/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c @@ -1,10 +1,14 @@ -/* $Xorg: pexRndrPick.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: pexRndrPick.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /************************************************************ Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/objects/pexSc.c b/programs/Xserver/PEX5/dipex/objects/pexSc.c index a8eca24ac..99cca108d 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexSc.c +++ b/programs/Xserver/PEX5/dipex/objects/pexSc.c @@ -1,10 +1,14 @@ -/* $Xorg: pexSc.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: pexSc.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexSc.c,v 3.5 1998/10/04 09:35:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexSc.c,v 3.6 2001/01/17 22:12:38 dawes Exp $ */ /*++ diff --git a/programs/Xserver/PEX5/dipex/objects/pexStr.c b/programs/Xserver/PEX5/dipex/objects/pexStr.c index 7d06ad8bb..d45bb505b 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexStr.c +++ b/programs/Xserver/PEX5/dipex/objects/pexStr.c @@ -1,10 +1,14 @@ -/* $Xorg: pexStr.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: pexStr.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/objects/pexTM.c b/programs/Xserver/PEX5/dipex/objects/pexTM.c index b1e76b999..7eea73a79 100644 --- a/programs/Xserver/PEX5/dipex/objects/pexTM.c +++ b/programs/Xserver/PEX5/dipex/objects/pexTM.c @@ -1,9 +1,13 @@ -/* $Xorg: pexTM.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: pexTM.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/ConvName.ci b/programs/Xserver/PEX5/dipex/swap/ConvName.ci index 78924743d..49d8feb8f 100644 --- a/programs/Xserver/PEX5/dipex/swap/ConvName.ci +++ b/programs/Xserver/PEX5/dipex/swap/ConvName.ci @@ -1,15 +1,14 @@ -/* $XConsortium: ConvName.ci,v 5.2 94/04/17 20:36:15 rws Exp $ */ +/* $Xorg: ConvName.ci,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/ConvName.h b/programs/Xserver/PEX5/dipex/swap/ConvName.h index c031de572..1884cc287 100644 --- a/programs/Xserver/PEX5/dipex/swap/ConvName.h +++ b/programs/Xserver/PEX5/dipex/swap/ConvName.h @@ -1,10 +1,14 @@ -/* $Xorg: ConvName.h,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: ConvName.h,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/Convert.c b/programs/Xserver/PEX5/dipex/swap/Convert.c index fe7ecd744..cb933f851 100644 --- a/programs/Xserver/PEX5/dipex/swap/Convert.c +++ b/programs/Xserver/PEX5/dipex/swap/Convert.c @@ -1,10 +1,14 @@ -/* $Xorg: Convert.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: Convert.c,v 1.4 2001/02/09 02:04:14 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/OCTables.c b/programs/Xserver/PEX5/dipex/swap/OCTables.c index bd595cd47..086ab2c11 100644 --- a/programs/Xserver/PEX5/dipex/swap/OCTables.c +++ b/programs/Xserver/PEX5/dipex/swap/OCTables.c @@ -1,10 +1,14 @@ -/* $Xorg: OCTables.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: OCTables.c,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/OCattr.c b/programs/Xserver/PEX5/dipex/swap/OCattr.c index 0a5b7d672..7fca6f237 100644 --- a/programs/Xserver/PEX5/dipex/swap/OCattr.c +++ b/programs/Xserver/PEX5/dipex/swap/OCattr.c @@ -1,10 +1,14 @@ -/* $Xorg: OCattr.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: OCattr.c,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/OCattr.h b/programs/Xserver/PEX5/dipex/swap/OCattr.h index 676eb8b82..cb6dee337 100644 --- a/programs/Xserver/PEX5/dipex/swap/OCattr.h +++ b/programs/Xserver/PEX5/dipex/swap/OCattr.h @@ -1,15 +1,14 @@ -/* $XConsortium: OCattr.h,v 5.3 94/04/17 20:36:18 hersh Exp $ */ +/* $Xorg: OCattr.h,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/OCcolour.c b/programs/Xserver/PEX5/dipex/swap/OCcolour.c index b1a267fc7..4a49bfa26 100644 --- a/programs/Xserver/PEX5/dipex/swap/OCcolour.c +++ b/programs/Xserver/PEX5/dipex/swap/OCcolour.c @@ -1,10 +1,14 @@ -/* $Xorg: OCcolour.c,v 1.3 2000/08/17 19:47:15 cpqbld Exp $ */ +/* $Xorg: OCcolour.c,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/OCcolour.ci b/programs/Xserver/PEX5/dipex/swap/OCcolour.ci index 05da763a4..1ed100f74 100644 --- a/programs/Xserver/PEX5/dipex/swap/OCcolour.ci +++ b/programs/Xserver/PEX5/dipex/swap/OCcolour.ci @@ -1,15 +1,14 @@ -/* $XConsortium: OCcolour.ci,v 5.3 94/04/17 20:36:19 hersh Exp $ */ +/* $Xorg: OCcolour.ci,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/OCcolour.h b/programs/Xserver/PEX5/dipex/swap/OCcolour.h index 58faf122d..f7e5c4798 100644 --- a/programs/Xserver/PEX5/dipex/swap/OCcolour.h +++ b/programs/Xserver/PEX5/dipex/swap/OCcolour.h @@ -1,15 +1,14 @@ -/* $XConsortium: OCcolour.h,v 5.2 94/04/17 20:36:19 rws Exp $ */ +/* $Xorg: OCcolour.h,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/OCprim.h b/programs/Xserver/PEX5/dipex/swap/OCprim.h index 337a39657..10962ad7a 100644 --- a/programs/Xserver/PEX5/dipex/swap/OCprim.h +++ b/programs/Xserver/PEX5/dipex/swap/OCprim.h @@ -1,15 +1,14 @@ -/* $XConsortium: OCprim.h,v 5.4 94/04/17 20:36:20 hersh Exp $ */ +/* $Xorg: OCprim.h,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/RepTables.c b/programs/Xserver/PEX5/dipex/swap/RepTables.c index 2bf0c4b17..798d28ba8 100644 --- a/programs/Xserver/PEX5/dipex/swap/RepTables.c +++ b/programs/Xserver/PEX5/dipex/swap/RepTables.c @@ -1,10 +1,14 @@ -/* $Xorg: RepTables.c,v 1.3 2000/08/17 19:47:16 cpqbld Exp $ */ +/* $Xorg: RepTables.c,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/Replies.ci b/programs/Xserver/PEX5/dipex/swap/Replies.ci index 622167c3d..de73ea026 100644 --- a/programs/Xserver/PEX5/dipex/swap/Replies.ci +++ b/programs/Xserver/PEX5/dipex/swap/Replies.ci @@ -1,15 +1,14 @@ -/* $XConsortium: Replies.ci,v 5.4 94/04/17 20:36:21 hersh Exp $ */ +/* $Xorg: Replies.ci,v 1.4 2001/02/09 02:04:15 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/ReqTables.c b/programs/Xserver/PEX5/dipex/swap/ReqTables.c index 08cba3d99..d94e93a9a 100644 --- a/programs/Xserver/PEX5/dipex/swap/ReqTables.c +++ b/programs/Xserver/PEX5/dipex/swap/ReqTables.c @@ -1,10 +1,14 @@ -/* $Xorg: ReqTables.c,v 1.3 2000/08/17 19:47:16 cpqbld Exp $ */ +/* $Xorg: ReqTables.c,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/Requests.ci b/programs/Xserver/PEX5/dipex/swap/Requests.ci index c7c36c187..b3fa34fdd 100644 --- a/programs/Xserver/PEX5/dipex/swap/Requests.ci +++ b/programs/Xserver/PEX5/dipex/swap/Requests.ci @@ -1,15 +1,14 @@ -/* $XConsortium: Requests.ci,v 5.6 94/04/17 20:36:22 mor Exp $ */ +/* $Xorg: Requests.ci,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /****************************************************************** -Copyright (c) 1990, 1991 X Consortium +Copyright 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/Requests.h b/programs/Xserver/PEX5/dipex/swap/Requests.h index a0dd82bad..f4e593afc 100644 --- a/programs/Xserver/PEX5/dipex/swap/Requests.h +++ b/programs/Xserver/PEX5/dipex/swap/Requests.h @@ -1,15 +1,14 @@ -/* $XConsortium: Requests.h,v 5.4 94/04/17 20:36:22 mor Exp $ */ +/* $Xorg: Requests.h,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /****************************************************************** -Copyright (c) 1990, 1991 X Consortium +Copyright 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/SwapConv.h b/programs/Xserver/PEX5/dipex/swap/SwapConv.h index 805afe2a1..44ce9206d 100644 --- a/programs/Xserver/PEX5/dipex/swap/SwapConv.h +++ b/programs/Xserver/PEX5/dipex/swap/SwapConv.h @@ -1,15 +1,14 @@ -/* $XConsortium: SwapConv.h,v 5.3 94/04/17 20:36:23 hersh Exp $ */ +/* $Xorg: SwapConv.h,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/UconvName.ci b/programs/Xserver/PEX5/dipex/swap/UconvName.ci index 96ca956a6..8b71aa0dd 100644 --- a/programs/Xserver/PEX5/dipex/swap/UconvName.ci +++ b/programs/Xserver/PEX5/dipex/swap/UconvName.ci @@ -1,15 +1,14 @@ -/* $XConsortium: UconvName.ci,v 5.2 94/04/17 20:36:23 rws Exp $ */ +/* $Xorg: UconvName.ci,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/UconvName.h b/programs/Xserver/PEX5/dipex/swap/UconvName.h index c392ba106..5c93c70c2 100644 --- a/programs/Xserver/PEX5/dipex/swap/UconvName.h +++ b/programs/Xserver/PEX5/dipex/swap/UconvName.h @@ -1,10 +1,14 @@ -/* $Xorg: UconvName.h,v 1.3 2000/08/17 19:47:16 cpqbld Exp $ */ +/* $Xorg: UconvName.h,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/cOCTables.ci b/programs/Xserver/PEX5/dipex/swap/cOCTables.ci index c4e9351f7..2a34e5fc2 100644 --- a/programs/Xserver/PEX5/dipex/swap/cOCTables.ci +++ b/programs/Xserver/PEX5/dipex/swap/cOCTables.ci @@ -1,16 +1,15 @@ -/* $XConsortium: cOCTables.ci,v 1.5 94/04/17 20:36:24 hersh Exp $ */ +/* $Xorg: cOCTables.ci,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /* Automatically generated OC table */ /****************************************************************** -Copyright (c) 1990, 1991 X Consortium +Copyright 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. Copyright 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/cOCprim.c b/programs/Xserver/PEX5/dipex/swap/cOCprim.c index b7e6320e6..2611e372b 100644 --- a/programs/Xserver/PEX5/dipex/swap/cOCprim.c +++ b/programs/Xserver/PEX5/dipex/swap/cOCprim.c @@ -1,10 +1,14 @@ -/* $Xorg: cOCprim.c,v 1.3 2000/08/17 19:47:16 cpqbld Exp $ */ +/* $Xorg: cOCprim.c,v 1.4 2001/02/09 02:04:16 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/check.c b/programs/Xserver/PEX5/dipex/swap/check.c index 3b6e5fcd5..bb32f88ab 100644 --- a/programs/Xserver/PEX5/dipex/swap/check.c +++ b/programs/Xserver/PEX5/dipex/swap/check.c @@ -1,10 +1,14 @@ - /* $Xorg: check.c,v 1.4 2000/08/17 19:47:17 cpqbld Exp $ +/* $Xorg: check.c,v 1.7 2001/02/09 02:04:16 xorgcvs Exp $ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/convEv.c b/programs/Xserver/PEX5/dipex/swap/convEv.c index e18741d77..d727c6300 100644 --- a/programs/Xserver/PEX5/dipex/swap/convEv.c +++ b/programs/Xserver/PEX5/dipex/swap/convEv.c @@ -1,10 +1,14 @@ -/* $Xorg: convEv.c,v 1.3 2000/08/17 19:47:17 cpqbld Exp $ */ +/* $Xorg: convEv.c,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /************************************************************ Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/convReq.c b/programs/Xserver/PEX5/dipex/swap/convReq.c index 4c6df2edf..06b9a753c 100644 --- a/programs/Xserver/PEX5/dipex/swap/convReq.c +++ b/programs/Xserver/PEX5/dipex/swap/convReq.c @@ -1,10 +1,14 @@ -/* $Xorg: convReq.c,v 1.3 2000/08/17 19:47:17 cpqbld Exp $ */ +/* $Xorg: convReq.c,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/convReq.h b/programs/Xserver/PEX5/dipex/swap/convReq.h index 20db1e6ff..6b3cca2e8 100644 --- a/programs/Xserver/PEX5/dipex/swap/convReq.h +++ b/programs/Xserver/PEX5/dipex/swap/convReq.h @@ -1,15 +1,14 @@ -/* $XConsortium: convReq.h,v 5.3 94/04/17 20:36:30 hersh Exp $ */ +/* $Xorg: convReq.h,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/convUtil.c b/programs/Xserver/PEX5/dipex/swap/convUtil.c index c27b9aa9a..cf75681e8 100644 --- a/programs/Xserver/PEX5/dipex/swap/convUtil.c +++ b/programs/Xserver/PEX5/dipex/swap/convUtil.c @@ -1,10 +1,14 @@ -/* $Xorg: convUtil.c,v 1.3 2000/08/17 19:47:17 cpqbld Exp $ */ +/* $Xorg: convUtil.c,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/convUtil.h b/programs/Xserver/PEX5/dipex/swap/convUtil.h index 7770efaa9..59cf77b64 100644 --- a/programs/Xserver/PEX5/dipex/swap/convUtil.h +++ b/programs/Xserver/PEX5/dipex/swap/convUtil.h @@ -1,15 +1,14 @@ -/* $XConsortium: convUtil.h,v 5.2 94/04/17 20:36:31 rws Exp $ */ +/* $Xorg: convUtil.h,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/convertStr.h b/programs/Xserver/PEX5/dipex/swap/convertStr.h index d5e8a6b5d..33f48df09 100644 --- a/programs/Xserver/PEX5/dipex/swap/convertStr.h +++ b/programs/Xserver/PEX5/dipex/swap/convertStr.h @@ -1,15 +1,14 @@ -/* $XConsortium: convertStr.h,v 5.4 94/04/17 20:36:31 hersh Exp $ */ +/* $Xorg: convertStr.h,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/floatconv.c b/programs/Xserver/PEX5/dipex/swap/floatconv.c index b27049237..3b626f6d0 100644 --- a/programs/Xserver/PEX5/dipex/swap/floatconv.c +++ b/programs/Xserver/PEX5/dipex/swap/floatconv.c @@ -1,10 +1,14 @@ -/* $Xorg: floatconv.c,v 1.3 2000/08/17 19:47:17 cpqbld Exp $ */ +/* $Xorg: floatconv.c,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/floatconv.h b/programs/Xserver/PEX5/dipex/swap/floatconv.h index 928b3fafc..cacc94fa5 100644 --- a/programs/Xserver/PEX5/dipex/swap/floatconv.h +++ b/programs/Xserver/PEX5/dipex/swap/floatconv.h @@ -1,8 +1,33 @@ -/* $XConsortium: floatconv.h,v 5.5 91/12/30 18:23:15 hersh Exp $ */ +/* $Xorg: floatconv.h,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /* - * Copyright (c) 1988-1991 by Sun Microsystems and the X Consortium. + * Copyright 1988-1991 by Sun Microsystems */ +/* + +Copyright 1988-1991, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +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. + +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 Open Group. + +*/ /* * floatconv.h - Functions and macros to convert between FloatTypes diff --git a/programs/Xserver/PEX5/dipex/swap/uOCTables.ci b/programs/Xserver/PEX5/dipex/swap/uOCTables.ci index 255eb3445..fa20b97e9 100644 --- a/programs/Xserver/PEX5/dipex/swap/uOCTables.ci +++ b/programs/Xserver/PEX5/dipex/swap/uOCTables.ci @@ -1,16 +1,15 @@ -/* $XConsortium: uOCTables.ci,v 5.4 94/04/17 20:36:33 hersh Exp $ */ +/* $Xorg: uOCTables.ci,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /* Automatically generated OC table */ /****************************************************************** -Copyright (c) 1990, 1991 X Consortium +Copyright 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. Copyright 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/uOCprim.c b/programs/Xserver/PEX5/dipex/swap/uOCprim.c index 4b0662f25..d9bbc1cab 100644 --- a/programs/Xserver/PEX5/dipex/swap/uOCprim.c +++ b/programs/Xserver/PEX5/dipex/swap/uOCprim.c @@ -1,10 +1,14 @@ -/* $Xorg: uOCprim.c,v 1.3 2000/08/17 19:47:17 cpqbld Exp $ */ +/* $Xorg: uOCprim.c,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/uconvRep.c b/programs/Xserver/PEX5/dipex/swap/uconvRep.c index 64f31a82f..19965bafa 100644 --- a/programs/Xserver/PEX5/dipex/swap/uconvRep.c +++ b/programs/Xserver/PEX5/dipex/swap/uconvRep.c @@ -1,10 +1,14 @@ -/* $Xorg: uconvRep.c,v 1.3 2000/08/17 19:47:17 cpqbld Exp $ */ +/* $Xorg: uconvRep.c,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/dipex/swap/uconvRep.h b/programs/Xserver/PEX5/dipex/swap/uconvRep.h index c1b1eb711..699811945 100644 --- a/programs/Xserver/PEX5/dipex/swap/uconvRep.h +++ b/programs/Xserver/PEX5/dipex/swap/uconvRep.h @@ -1,15 +1,14 @@ -/* $XConsortium: uconvRep.h,v 5.3 94/04/17 20:36:35 hersh Exp $ */ +/* $Xorg: uconvRep.h,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk b/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk index 5a340c8e5..327392e3e 100644 --- a/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk +++ b/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk @@ -1,8 +1,31 @@ ## -# $XConsortium: OCReduce.awk,v 5.2 94/04/17 20:36:36 rws Exp $ +# $Xorg: OCReduce.awk,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ ## +## +## Copyright 1996, 1998 The Open Group +## +## Permission to use, copy, modify, distribute, and sell this software and its +## documentation for any purpose is hereby granted without fee, provided that +## the above copyright notice appear in all copies and that both that +## copyright notice and this permission notice appear in supporting +## documentation. +## +## 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 +## 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. +## +## 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 Open Group. +## ########################################################################### -## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium. +## Copyright 1990, 1991 by Sun Microsystems, Inc. ## ## All Rights Reserved ## @@ -11,7 +34,7 @@ ## provided that the above copyright notice appear in all copies and that ## both that copyright notice and this permission notice appear in ## supporting documentation, and that the names of Sun Microsystems -## and the X Consortium not be used in advertising or publicity +## and The Open Group not be used in advertising or publicity ## pertaining to distribution of the software without specific, written ## prior permission. ## diff --git a/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed b/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed index 0762e1187..80a47ac6a 100644 --- a/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed +++ b/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed @@ -1,8 +1,29 @@ ## -# $XConsortium: OCReduce.sed,v 5.2 94/04/17 20:36:37 rws Exp $ +# $Xorg: OCReduce.sed,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ +## +## Copyright 1996, 1998 The Open Group +## +## Permission to use, copy, modify, distribute, and sell this software and its +## documentation for any purpose is hereby granted without fee, provided that +## the above copyright notice appear in all copies and that both that +## copyright notice and this permission notice appear in supporting +## documentation. +## +## 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 +## 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. +## +## 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 ## ########################################################################### -## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium. +## Copyright 1990, 1991 by Sun Microsystems, Inc. ## ## All Rights Reserved ## @@ -11,7 +32,7 @@ ## provided that the above copyright notice appear in all copies and that ## both that copyright notice and this permission notice appear in ## supporting documentation, and that the names of Sun Microsystems -## and the X Consortium not be used in advertising or publicity +## and The Open Group not be used in advertising or publicity ## pertaining to distribution of the software without specific, written ## prior permission. ## diff --git a/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk b/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk index 397aff41f..a41436373 100644 --- a/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk +++ b/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk @@ -1,6 +1,28 @@ -# $XConsortium: OCTables.awk,v 5.2 94/04/17 20:36:37 rws Exp $ +# $Xorg: OCTables.awk,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ +## +## Copyright 1996, 1998 The Open Group +## +## Permission to use, copy, modify, distribute, and sell this software and its +## documentation for any purpose is hereby granted without fee, provided that +## the above copyright notice appear in all copies and that both that +## copyright notice and this permission notice appear in supporting +## documentation. +## +## 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 +## 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. +## +## 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 +## ########################################################################### -## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium. +## Copyright 1990, 1991 by Sun Microsystems, Inc. ## ## All Rights Reserved ## @@ -9,7 +31,7 @@ ## provided that the above copyright notice appear in all copies and that ## both that copyright notice and this permission notice appear in ## supporting documentation, and that the names of Sun Microsystems -## and the X Consortium not be used in advertising or publicity +## and The Open Group not be used in advertising or publicity ## pertaining to distribution of the software without specific, written ## prior permission. ## @@ -31,7 +53,7 @@ BEGIN { num=0; i=0; print "/* Automatically generated OC table" print " */" print "/******************************************************************" - print "Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium." + print "Copyright 1990, 1991 by Sun Microsystems, Inc. and The Open Group." print "" print " All Rights Reserved" print "" @@ -40,7 +62,7 @@ BEGIN { num=0; i=0; print "provided that the above copyright notice appear in all copies and that" print "both that copyright notice and this permission notice appear in " print "supporting documentation, and that the names of Sun Microsystems " - print "and the X Consortium not be used in advertising or publicity " + print "and The Open Group not be used in advertising or publicity " print "pertaining to distribution of the software without specific, written " print "prior permission. " print "" diff --git a/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk b/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk index 69569704e..652dca000 100644 --- a/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk +++ b/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk @@ -1,6 +1,28 @@ -# $XConsortium: ReqSame.awk,v 5.3 94/04/17 20:36:38 hersh Exp $ +# $Xorg: ReqSame.awk,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ +## +## Copyright 1996, 1998 The Open Group +## +## Permission to use, copy, modify, distribute, and sell this software and its +## documentation for any purpose is hereby granted without fee, provided that +## the above copyright notice appear in all copies and that both that +## copyright notice and this permission notice appear in supporting +## documentation. +## +## 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 +## 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. +## +## 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 +## ########################################################################### -## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium. +## Copyright 1990, 1991 by Sun Microsystems, Inc. ## ## All Rights Reserved ## @@ -9,7 +31,7 @@ ## provided that the above copyright notice appear in all copies and that ## both that copyright notice and this permission notice appear in ## supporting documentation, and that the names of Sun Microsystems -## and the X Consortium not be used in advertising or publicity +## and The Open Group not be used in advertising or publicity ## pertaining to distribution of the software without specific, written ## prior permission. ## diff --git a/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk b/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk index cf48fbdf6..7739b64af 100644 --- a/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk +++ b/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk @@ -1,6 +1,28 @@ -# $XConsortium: ReqTab.awk,v 5.2 94/04/17 20:36:38 rws Exp $ +# $Xorg: ReqTab.awk,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ +## +## Copyright 1996, 1998 The Open Group +## +## Permission to use, copy, modify, distribute, and sell this software and its +## documentation for any purpose is hereby granted without fee, provided that +## the above copyright notice appear in all copies and that both that +## copyright notice and this permission notice appear in supporting +## documentation. +## +## 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 +## 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. +## +## 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 +## ########################################################################### -## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium. +## Copyright 1990, 1991 by Sun Microsystems, Inc. ## ## All Rights Reserved ## @@ -9,7 +31,7 @@ ## provided that the above copyright notice appear in all copies and that ## both that copyright notice and this permission notice appear in ## supporting documentation, and that the names of Sun Microsystems -## and the X Consortium not be used in advertising or publicity +## and The Open Group not be used in advertising or publicity ## pertaining to distribution of the software without specific, written ## prior permission. ## @@ -29,7 +51,7 @@ BEGIN { num = 0; lend = 0; print "/* Automatically generated Request table" print " */" print "/******************************************************************" - print "Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium." + print "Copyright 1990, 1991 by Sun Microsystems, Inc. and The Open Group." print "" print " All Rights Reserved" print "" @@ -38,7 +60,7 @@ BEGIN { num = 0; lend = 0; print "provided that the above copyright notice appear in all copies and that" print "both that copyright notice and this permission notice appear in " print "supporting documentation, and that the names of Sun Microsystems " - print "and the X Consortium not be used in advertising or publicity " + print "and The Open Group not be used in advertising or publicity " print "pertaining to distribution of the software without specific, written " print "prior permission. " print "" diff --git a/programs/Xserver/PEX5/include/PEX.h b/programs/Xserver/PEX5/include/PEX.h index f9d3bdacd..cfb2b9a9c 100644 --- a/programs/Xserver/PEX5/include/PEX.h +++ b/programs/Xserver/PEX5/include/PEX.h @@ -1,15 +1,14 @@ -/* $XConsortium: PEX.h,v 5.11 94/04/17 20:35:48 hersh Exp $ */ +/* $Xorg: PEX.h,v 1.4 2001/02/09 02:04:17 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. @@ -236,6 +235,133 @@ SOFTWARE. #define PEXColourApproxLUT 12 #define PEXMaxTableType 12 +/* LUT BitMask Values */ +/* Color Table Values */ +#define PEXLUTVColor (1L<<0) + +/* Color Approximation Table Values */ +#define PEXLUTVColorApproxMethod (1L<<0) +#define PEXLUTVColorModel (2L<<0) +#define PEXLUTVMax1 (3L<<0) +#define PEXLUTVMax2 (4L<<0) +#define PEXLUTVMax3 (5L<<0) +#define PEXLUTVDither (6L<<0) +#define PEXLUTVMult1 (7L<<0) +#define PEXLUTVMult2 (8L<<0) +#define PEXLUTVMult3 (9L<<0) +#define PEXLUTVWeight1 (10L<<0) +#define PEXLUTVWeight2 (11L<<0) +#define PEXLUTVWeight3 (12L<<0) +#define PEXLUTVBasePixel (13L<<0) + +/* Data Mapping Table Values */ +#define PEXLUTVDataMapMethod (1L<<0) +#define PEXLUTVSourceSelectors (2L<<0) + +/* Depth Cue Table Values */ +#define PEXLUTVDepthCueMode (1L<<0) +#define PEXLUTVFrontReferencePlane (2L<<0) +#define PEXLUTVBackReferencePlane (3L<<0) +#define PEXLUTVFrontScalePlane (4L<<0) +#define PEXLUTVBackScalePlane (5L<<0) +#define PEXLUTVDepthCueColor (6L<<0) + +/* Edge Bundle Table Values */ +#define PEXLUTVSurfaceEdgeFlag (1L<<0) +#define PEXLUTVSurfaceEdgeType (2L<<0) +#define PEXLUTVSurfaceEdgeWidth (3L<<0) +#define PEXLUTVSurfaceEdgeColor (4L<<0) + +/* Extent Size Table Values */ +#define PEXLUTVExtentSize (1L<<0) + +/* Highlight Table Values */ +#define PEXLUTVHighlightMethod (1L<<0) +#define PEXLUTVHighlightColor (2L<<0) + +/* Interior Bundle Table Values */ +#define PEXLUTVInteriorStyle (1L<<0) +#define PEXLUTVInteriorStyleIndex (2L<<0) +#define PEXLUTVInteriorReflectionModel (3L<<0) +#define PEXLUTVInteriorInterpMethod (4L<<0) +#define PEXLUTVBFInteriorStyle (5L<<0) +#define PEXLUTVBFInteriorStyleIndex (6L<<0) +#define PEXLUTVBFReflectionModel (7L<<0) +#define PEXLUTVBFInterpMethod (8L<<0) +#define PEXLUTVSurfaceApprox (9L<<0) +#define PEXLUTVSurfaceColor (10L<<0) +#define PEXLUTVReflectionAttrs (11L<<0) +#define PEXLUTVBFSurfaceColor (12L<<0) +#define PEXLUTVBFReflectionAttrs (13L<<0) +#define PEXLUTVPSurfChar (14L<<0) + +/* Light Table Values */ +#define PEXLUTVLightType (1L<<0) +#define PEXLUTVLightDirection (2L<<0) +#define PEXLUTVLightPosition (3L<<0) +#define PEXLUTVLightConcentration (4L<<0) +#define PEXLUTVLightSpreadAngle (5L<<0) +#define PEXLUTVLightConstantAttenFactor (6L<<0) +#define PEXLUTVLightLinearAttenFactor (7L<<0) +#define PEXLUTVLightColor (8L<<0) +#define PEXLUTVLightConcClampRegion (9L<<0) +#define PEXLUTVLightQuadraticAttenFactor (10L<<0) + +/* Line Table Values */ +#define PEXLUTVLineType (1L<<0) +#define PEXLUTVLineInterpMethod (2L<<0) +#define PEXLUTVLineCurveApprox (3L<<0) +#define PEXLUTVLineWidth (4L<<0) +#define PEXLUTVLineColor (5L<<0) +#define PEXLUTVLineCapStyle (6L<<0) +#define PEXLUTVLineJoinStyle (7L<<0) + +/* Marker Bundle Table Values */ +#define PEXLUTVMarkerType (1L<<0) +#define PEXLUTVMarkerScaleFactor (2L<<0) +#define PEXLUTVMarkerColor (3L<<0) + +/* Marker Glyph Table Values */ +#define PEXLUTVMarkerGlyph (1L<<0) + +/* Pattern Table Values */ +#define PEXLUTVPatternData (1L<<0) + +/* Text Bundle Table Values */ +#define PEXLUTVTextFontIndex (1L<<0) +#define PEXLUTVTextPrecision (2L<<0) +#define PEXLUTVTextCharExpansion (3L<<0) +#define PEXLUTVTextCharSpacing (4L<<0) +#define PEXLUTVTextColor (5L<<0) + +/* Text Font Table Values */ +#define PEXLUTVTextFontGroup (1L<<0) + +/* Texture Mapping Table Values */ +#define PEXLUTVTMTextureMapID (1L<<0) +#define PEXLUTVTMRenderingControl (2L<<0) +#define PEXLUTVTMParamMethod (3L<<0) +#define PEXLUTVTMFPDataIndex (4L<<0) +#define PEXLUTVTMReflectionMatrix (5L<<0) +#define PEXLUTVTMOrientationMatrix (6L<<0) +#define PEXLUTVTMCompositionMethod (7L<<0) +#define PEXLUTVTMChannelNumber (8L<<0) +#define PEXLUTVTMEnvironmentColor (9L<<0) +#define PEXLUTVTMBackgroundColor (10L<<0) +#define PEXLUTVTMSampleMinMag (11L<<0) +#define PEXLUTVTMBoundaryConditions (12L<<0) +#define PEXLUTVTMClampingMethod (13L<<0) +#define PEXLUTVTMClampColor (14L<<0) +#define PEXLUTVTMSamplingHints (15L<<0) + +/* View Table Values */ +#define PEXLUTVViewClipFlags (1L<<0) +#define PEXLUTVViewClipLimits (1L<<0) +#define PEXLUTVViewOrientationMatrix (1L<<0) +#define PEXLUTVViewMappingMatrix (1L<<0) +#define PEXLUTVViewEyepoint (1L<<0) + + /* Status in GetTableEntry */ #define PEXDefaultEntry 0 #define PEXDefinedEntry 1 diff --git a/programs/Xserver/PEX5/include/PEXErr.h b/programs/Xserver/PEX5/include/PEXErr.h index ca2db0215..b8f6c02a8 100644 --- a/programs/Xserver/PEX5/include/PEXErr.h +++ b/programs/Xserver/PEX5/include/PEXErr.h @@ -1,15 +1,14 @@ -/* $XConsortium: PEXErr.h,v 5.2 94/04/17 20:35:49 rws Exp $ */ +/* $Xorg: PEXErr.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1988,1989,1990, 1991 X Consortium +Copyright 1988,1989,1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Copyright (c) 1988,1989,1990, 1991 by Sun Microsystems, Inc. +Copyright 1988,1989,1990, 1991 by Sun Microsystems, Inc. All Rights Reserved @@ -34,7 +33,7 @@ documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun Microsystems, -and the X Consortium, not be used in advertising or publicity +and The Open Group, not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. diff --git a/programs/Xserver/PEX5/include/PEXfuncs.h b/programs/Xserver/PEX5/include/PEXfuncs.h index 8dcdaf4cd..6c8c8cd3b 100644 --- a/programs/Xserver/PEX5/include/PEXfuncs.h +++ b/programs/Xserver/PEX5/include/PEXfuncs.h @@ -1,15 +1,14 @@ -/* $XConsortium: PEXfuncs.h,v 5.3 94/04/17 20:35:50 rws Exp $ */ +/* $Xorg: PEXfuncs.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/PEXmacs.h b/programs/Xserver/PEX5/include/PEXmacs.h index cbb4a7f33..eb03138fc 100644 --- a/programs/Xserver/PEX5/include/PEXmacs.h +++ b/programs/Xserver/PEX5/include/PEXmacs.h @@ -1,15 +1,14 @@ -/* $XConsortium: PEXmacs.h,v 5.3 94/04/17 20:35:50 rws Exp $ */ +/* $Xorg: PEXmacs.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/PEXproto.h b/programs/Xserver/PEX5/include/PEXproto.h index 19433a90c..0259804ca 100644 --- a/programs/Xserver/PEX5/include/PEXproto.h +++ b/programs/Xserver/PEX5/include/PEXproto.h @@ -1,15 +1,14 @@ -/* $XConsortium: PEXproto.h,v 5.7 94/04/17 20:35:51 rws Exp $ */ +/* $Xorg: PEXproto.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. @@ -224,6 +223,18 @@ typedef struct { CARD8 what; /* unused */ CARD16 sequenceNumber B16; CARD32 length B32; /* not 0 */ + CARD16 status B16; + CARD16 tableType B16; + CARD32 numValues B32; + BYTE pad[16]; + /* LISTof TableValues( numValues, tableType ) */ + } pexGetTableValuesReply; + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 what; /* unused */ + CARD16 sequenceNumber B16; + CARD32 length B32; /* not 0 */ BYTE pad[24]; /* SINGLE PipelineContextAttributes( itemMask ) */ } pexGetPipelineContextReply; @@ -242,6 +253,26 @@ typedef struct { BYTE type; /* X_Reply */ CARD8 what; /* unused */ CARD16 sequenceNumber B16; + CARD32 length B32; /* not 0 */ + CARD32 numValues B16; + pexSwitch undefinedValues; + BYTE pad[19]; + /* Z buffer values go here */ +} pexGetZBufferReply; + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 what; /* unused */ + CARD16 sequenceNumber B16; + CARD32 length B32; /* 0 */ + INT32 count B16; + BYTE pad[20]; +} pexNextPassReply; + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 what; /* unused */ + CARD16 sequenceNumber B16; CARD32 length B32; /* 0 */ pexBitmask tables B32; pexBitmask namesets B32; @@ -538,6 +569,19 @@ typedef struct { /* LISTof ExtentInfo() */ } pexQueryTextExtentsReply; +typedef struct { + BYTE type; /* X_Reply */ + CARD8 what; /* unused */ + CARD16 sequenceNumber B16; + CARD32 length B32; /* not 0 */ + CARD8 approxSupported; + CARD8 exhaustiveApprox; + CARD8 unused[2]; + CARD32 numColorApprox; + BYTE pad[16]; + /* List of pexColourApproxEntry */ +} pexQueryColorApproxReply; + /**************************************************************** * REQUESTS * ****************************************************************/ @@ -707,6 +751,29 @@ typedef struct { typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + pexEnumTypeIndex fpFormat B16; + pexTableIndex index B16; + pexLookupTable lut B32; + pexBitmask TableMask; /* Lookup Table specific bitmask */ + /* Lookup Table specific list of values */ +} pexChangeTableValuesReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 5 */ + pexEnumTypeIndex fpFormat B16; + CARD16 valueType B16; + pexLookupTable lut B32; + pexTableIndex index B16; + CARD16 unused; + pexBitmask TableMask; /* Lookup Table specific bitmask */ +} pexGetTableValuesReq; + +typedef struct { CARD8 reqType; CARD8 opcode; CARD16 length B16; /* 3 */ @@ -815,6 +882,127 @@ typedef struct { } pexEndRenderingReq; typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 3 */ + pexRenderer rdr B32; + pexBitmask clearControl B32; +} pexClearRendererReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 3 */ + pexRenderer rdr B32; + pexSwitch flushFlag; + BYTE pad[3]; +} pexFlushRendererReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 2 */ + pexRenderer rdr B32; +} pexInitRendererReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 3 */ + pexRenderer rdr B32; + Drawable pixmap B32; +} pexCopyAlphaToPixmapReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 3 */ + pexRenderer rdr B32; + Drawable pixmap B32; +} pexCopyPixmapToAlphaReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 3 */ + pexRenderer rdr B32; + Drawable pixmap B32; +} pexCopyZBufferToPixmapReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 3 */ + pexRenderer rdr B32; + Drawable pixmap B32; +} pexCopyPixmapToZBufferReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 6 */ + pexRenderer rdr B32; + pexPC pc B32; + pexBitmask itemMask[3]; /* pexBitmask Array */ +} pexCopyPCToPipelineStateReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 6 */ + pexRenderer rdr B32; + pexPC pc B32; + pexBitmask itemMask[3]; /* pexBitmask Array */ +} pexCopyPipelineStateToPCReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 5 */ + pexEnumTypeIndex fpFormat B16; + pexSwitch normalizedValues; + CARD8 unused; + pexRenderer rdr B32; + INT16 x B16; + INT16 y B16; + CARD16 width B16; + CARD16 height B16; +} pexGetZBufferReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + pexEnumTypeIndex fpFormat B16; + CARD16 unused; + CARD32 numValues B32; + pexRenderer rdr B32; + INT16 x B16; + INT16 y B16; + CARD16 width B16; + CARD16 height B16; + pexSwitch normalizedValues; + CARD8 more_unused[3]; + /* Z buffer values go here */ +} pexPutZBufferReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 2 */ + pexRenderer rdr B32; +} pexInitMultipassReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 2 */ + pexRenderer rdr B32; + CARD16 multipass_control; + CARD16 unused; +} pexNextPassReq; + +typedef struct { CARD8 reqType; CARD8 opcode; CARD16 length B16; /* 3 */ @@ -894,6 +1082,15 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 opcode; + CARD16 length B16; /* 3 */ + pexStructure sid B32; + CARD16 permission B16; + CARD16 unused B16; +} pexSetStructurePermissionReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; CARD16 length B16; /* 7 */ pexEnumTypeIndex fpFormat B16; CARD16 unused B16; @@ -961,6 +1158,15 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 opcode; + CARD16 length B16; /* 4 */ + pexStructure sid B32; + INT32 pickId B32; + INT32 offset B32; +} pexSetElementPointerAtPickIDReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; CARD16 length B16; pexStructure sid B32; pexElementPos position; @@ -1455,6 +1661,88 @@ typedef struct { /* pad() */ } pexQueryTextExtentsReq; +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; /* 5 */ + pexEnumTypeIndex fpFormat B16; + CARD16 unused; + Drawable drawable B32; + pexColourApproxEntry ColourApprox; +} pexQueryColorApproxReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + pexEnumTypeIndex fpFormat B16; + pexEnumTypeIndex TMDimension B16; + CARD32 TMid B32; + CARD16 numLevels B16; + pexEnumTypeIndex texelType B16; + /* list of array of Texels goes here */ +} pexCreateColorMipMapTMReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + pexEnumTypeIndex fpFormat B16; + pexEnumTypeIndex TMDimension B16; + CARD32 TMid B32; + CARD16 numLevels B16; + pexEnumTypeIndex texelType B16; + Drawable drawable B32; + CARD16 lumnanceSelector B16; + CARD16 alphaSelector B16; + /* list of texel array counts + list of color resource IDs + list of alpha resource IDs + */ +} pexCreateColorMipMapfromResReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + pexEnumTypeIndex fpFormat B16; + pexEnumTypeIndex unused B16; + Drawable drawable B32; + PEXFLOAT src_weight; + PEXFLOAT dst_weight; +} pexAccumulateBufferReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + Drawable drawable B32; +} pexAllocAccumBufferReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + Drawable drawable B32; +} pexFreeAccumBufferReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + Drawable drawable B32; +} pexLoadAccumBufferReq; + +typedef struct { + CARD8 reqType; + CARD8 opcode; + CARD16 length B16; + pexEnumTypeIndex fpFormat B16; + pexEnumTypeIndex unused B16; + Drawable drawable B32; + PEXFLOAT scale; +} pexReturnAccumBufferReq; + /***************************************************************** * Output Commands *****************************************************************/ diff --git a/programs/Xserver/PEX5/include/PEXprotost.h b/programs/Xserver/PEX5/include/PEXprotost.h index 9a7506c24..9f5bb7de6 100644 --- a/programs/Xserver/PEX5/include/PEXprotost.h +++ b/programs/Xserver/PEX5/include/PEXprotost.h @@ -1,16 +1,15 @@ -/* $XConsortium: PEXprotost.h,v 5.6 94/04/17 20:35:52 hersh Exp $ */ +/* $Xorg: PEXprotost.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/ddpex.h b/programs/Xserver/PEX5/include/ddpex.h index 15a9128e2..9f56a8fe2 100644 --- a/programs/Xserver/PEX5/include/ddpex.h +++ b/programs/Xserver/PEX5/include/ddpex.h @@ -1,15 +1,14 @@ -/* $XConsortium: ddpex.h,v 5.14 94/04/17 20:35:53 rws Exp $ */ +/* $Xorg: ddpex.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Copyright (c) 1989, 1990, 1991 by Sun Microsystems, Inc. +Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. All Rights Reserved @@ -34,7 +33,7 @@ documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun Microsystems, -and the X Consortium, not be used in advertising or publicity +and The Open Group, not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. diff --git a/programs/Xserver/PEX5/include/ddpex3.h b/programs/Xserver/PEX5/include/ddpex3.h index cb8af4c09..a12518b4d 100644 --- a/programs/Xserver/PEX5/include/ddpex3.h +++ b/programs/Xserver/PEX5/include/ddpex3.h @@ -1,15 +1,14 @@ -/* $XConsortium: ddpex3.h,v 5.2 94/04/17 20:35:55 rws Exp $ */ +/* $Xorg: ddpex3.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/ddpex4.h b/programs/Xserver/PEX5/include/ddpex4.h index 312c79fab..20d48a5e9 100644 --- a/programs/Xserver/PEX5/include/ddpex4.h +++ b/programs/Xserver/PEX5/include/ddpex4.h @@ -1,15 +1,14 @@ -/* $XConsortium: ddpex4.h,v 5.2 94/04/17 20:35:56 rws Exp $ */ +/* $Xorg: ddpex4.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +16,15 @@ 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. -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. -Copyright (c) 1989, 1990, 1991 by Sun Microsystems, Inc. +Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. All Rights Reserved @@ -34,7 +33,7 @@ documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun Microsystems, -and the X Consortium, not be used in advertising or publicity +and The Open Group, not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. diff --git a/programs/Xserver/PEX5/include/dipex.h b/programs/Xserver/PEX5/include/dipex.h index 38944185b..376b6351f 100644 --- a/programs/Xserver/PEX5/include/dipex.h +++ b/programs/Xserver/PEX5/include/dipex.h @@ -1,10 +1,14 @@ -/* $Xorg: dipex.h,v 1.3 2000/08/17 19:47:19 cpqbld Exp $ */ +/* $Xorg: dipex.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/PEX5/include/pexError.h b/programs/Xserver/PEX5/include/pexError.h index df218d232..be835efc4 100644 --- a/programs/Xserver/PEX5/include/pexError.h +++ b/programs/Xserver/PEX5/include/pexError.h @@ -1,15 +1,14 @@ -/* $XConsortium: pexError.h,v 5.5 94/04/17 20:35:57 dpw Exp $ */ +/* $Xorg: pexError.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/pexExtract.h b/programs/Xserver/PEX5/include/pexExtract.h index 51ead31ef..f5b5b487e 100644 --- a/programs/Xserver/PEX5/include/pexExtract.h +++ b/programs/Xserver/PEX5/include/pexExtract.h @@ -1,16 +1,15 @@ -/* $XConsortium: pexExtract.h,v 5.9 94/04/17 20:35:58 hersh Exp $ */ +/* $Xorg: pexExtract.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/pexLookup.h b/programs/Xserver/PEX5/include/pexLookup.h index 324309a5b..63fa6f04b 100644 --- a/programs/Xserver/PEX5/include/pexLookup.h +++ b/programs/Xserver/PEX5/include/pexLookup.h @@ -1,15 +1,14 @@ -/* $XConsortium: pexLookup.h,v 5.2 94/04/17 20:35:58 rws Exp $ */ +/* $Xorg: pexLookup.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/pexSwap.h b/programs/Xserver/PEX5/include/pexSwap.h index b8ef292c4..449747556 100644 --- a/programs/Xserver/PEX5/include/pexSwap.h +++ b/programs/Xserver/PEX5/include/pexSwap.h @@ -1,15 +1,14 @@ -/* $XConsortium: pexSwap.h,v 5.7 94/04/17 20:35:59 rws Exp $ */ +/* $Xorg: pexSwap.h,v 1.4 2001/02/09 02:04:18 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/pexUtils.h b/programs/Xserver/PEX5/include/pexUtils.h index ec278629d..62f807ec3 100644 --- a/programs/Xserver/PEX5/include/pexUtils.h +++ b/programs/Xserver/PEX5/include/pexUtils.h @@ -1,15 +1,14 @@ -/* $XConsortium: pexUtils.h,v 5.2 94/04/17 20:35:59 rws Exp $ */ +/* $Xorg: pexUtils.h,v 1.4 2001/02/09 02:04:19 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/include/pex_site.h b/programs/Xserver/PEX5/include/pex_site.h index 7265ce134..835e2e426 100644 --- a/programs/Xserver/PEX5/include/pex_site.h +++ b/programs/Xserver/PEX5/include/pex_site.h @@ -1,15 +1,14 @@ -/* $XConsortium: pex_site.h,v 5.2 94/04/17 20:36:00 rws Exp $ */ +/* $Xorg: pex_site.h,v 1.4 2001/02/09 02:04:19 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1989, 1990, 1991 X Consortium +Copyright 1989, 1990, 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. diff --git a/programs/Xserver/PEX5/ospex/osPexFont.c b/programs/Xserver/PEX5/ospex/osPexFont.c index a9a0ce740..8725f9ef1 100644 --- a/programs/Xserver/PEX5/ospex/osPexFont.c +++ b/programs/Xserver/PEX5/ospex/osPexFont.c @@ -1,10 +1,14 @@ -/* $Xorg: osPexFont.c,v 1.3 2000/08/17 19:47:20 cpqbld Exp $ */ +/* $Xorg: osPexFont.c,v 1.4 2001/02/09 02:04:19 xorgcvs Exp $ */ /* Copyright 1989, 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ospex/osPexFont.c,v 3.16 2000/08/10 17:40:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ospex/osPexFont.c,v 3.17 2001/01/17 22:12:43 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/programs/Xserver/XIE/dixie/export/echist.c b/programs/Xserver/XIE/dixie/export/echist.c index 6283e8458..245fe6835 100644 --- a/programs/Xserver/XIE/dixie/export/echist.c +++ b/programs/Xserver/XIE/dixie/export/echist.c @@ -1,10 +1,14 @@ -/* $Xorg: echist.c,v 1.3 2000/08/17 19:47:23 cpqbld Exp $ */ +/* $Xorg: echist.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module echist.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/echist.c,v 3.3 1998/10/25 07:11:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/echist.c,v 3.4 2001/01/17 22:12:48 dawes Exp $ */ #define _XIEC_ECHIST diff --git a/programs/Xserver/XIE/dixie/export/eclut.c b/programs/Xserver/XIE/dixie/export/eclut.c index ab0deb408..49fb40b87 100644 --- a/programs/Xserver/XIE/dixie/export/eclut.c +++ b/programs/Xserver/XIE/dixie/export/eclut.c @@ -1,10 +1,14 @@ -/* $Xorg: eclut.c,v 1.3 2000/08/17 19:47:23 cpqbld Exp $ */ +/* $Xorg: eclut.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module eclut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eclut.c,v 3.3 1998/10/25 07:11:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eclut.c,v 3.4 2001/01/17 22:12:48 dawes Exp $ */ #define _XIEC_ECLUT diff --git a/programs/Xserver/XIE/dixie/export/ecphoto.c b/programs/Xserver/XIE/dixie/export/ecphoto.c index 4ff55c918..8e723db17 100644 --- a/programs/Xserver/XIE/dixie/export/ecphoto.c +++ b/programs/Xserver/XIE/dixie/export/ecphoto.c @@ -1,11 +1,15 @@ -/* $Xorg: ecphoto.c,v 1.3 2000/08/17 19:47:23 cpqbld Exp $ */ +/* $Xorg: ecphoto.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module ecphoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecphoto.c,v 3.4 1998/10/25 07:11:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecphoto.c,v 3.5 2001/01/17 22:12:48 dawes Exp $ */ #define _XIEC_ECPHOTO diff --git a/programs/Xserver/XIE/dixie/export/ecroi.c b/programs/Xserver/XIE/dixie/export/ecroi.c index e11d4876b..8010c182a 100644 --- a/programs/Xserver/XIE/dixie/export/ecroi.c +++ b/programs/Xserver/XIE/dixie/export/ecroi.c @@ -1,10 +1,14 @@ -/* $Xorg: ecroi.c,v 1.3 2000/08/17 19:47:23 cpqbld Exp $ */ +/* $Xorg: ecroi.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module ecroi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecroi.c,v 3.3 1998/10/25 07:11:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecroi.c,v 3.4 2001/01/17 22:12:48 dawes Exp $ */ #define _XIEC_ECROI diff --git a/programs/Xserver/XIE/dixie/export/edraw.c b/programs/Xserver/XIE/dixie/export/edraw.c index 7f23814e8..ffea4ac10 100644 --- a/programs/Xserver/XIE/dixie/export/edraw.c +++ b/programs/Xserver/XIE/dixie/export/edraw.c @@ -1,10 +1,14 @@ -/* $Xorg: edraw.c,v 1.3 2000/08/17 19:47:23 cpqbld Exp $ */ +/* $Xorg: edraw.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module edraw.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edraw.c,v 3.3 1998/10/25 07:11:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edraw.c,v 3.4 2001/01/17 22:12:49 dawes Exp $ */ #define _XIEC_EDRAW diff --git a/programs/Xserver/XIE/dixie/export/edrawp.c b/programs/Xserver/XIE/dixie/export/edrawp.c index 3c46bc5ba..e3e982d6e 100644 --- a/programs/Xserver/XIE/dixie/export/edrawp.c +++ b/programs/Xserver/XIE/dixie/export/edrawp.c @@ -1,10 +1,14 @@ -/* $Xorg: edrawp.c,v 1.3 2000/08/17 19:47:23 cpqbld Exp $ */ +/* $Xorg: edrawp.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module edrawp.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edrawp.c,v 3.3 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edrawp.c,v 3.4 2001/01/17 22:12:49 dawes Exp $ */ #define _XIEC_EDRAWP diff --git a/programs/Xserver/XIE/dixie/export/elut.c b/programs/Xserver/XIE/dixie/export/elut.c index 3bc00f949..d3adb752d 100644 --- a/programs/Xserver/XIE/dixie/export/elut.c +++ b/programs/Xserver/XIE/dixie/export/elut.c @@ -1,10 +1,14 @@ -/* $Xorg: elut.c,v 1.3 2000/08/17 19:47:23 cpqbld Exp $ */ +/* $Xorg: elut.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module elut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/elut.c,v 3.3 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/elut.c,v 3.4 2001/01/17 22:12:49 dawes Exp $ */ #define _XIEC_ELUT diff --git a/programs/Xserver/XIE/dixie/export/ephoto.c b/programs/Xserver/XIE/dixie/export/ephoto.c index 80de63671..3088d2844 100644 --- a/programs/Xserver/XIE/dixie/export/ephoto.c +++ b/programs/Xserver/XIE/dixie/export/ephoto.c @@ -1,10 +1,14 @@ -/* $Xorg: ephoto.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: ephoto.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module ephoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley && Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ephoto.c,v 3.4 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ephoto.c,v 3.5 2001/01/17 22:12:49 dawes Exp $ */ #define _XIEC_EPHOTO diff --git a/programs/Xserver/XIE/dixie/export/eroi.c b/programs/Xserver/XIE/dixie/export/eroi.c index 99aa874ad..f27d1fd4b 100644 --- a/programs/Xserver/XIE/dixie/export/eroi.c +++ b/programs/Xserver/XIE/dixie/export/eroi.c @@ -1,10 +1,14 @@ -/* $Xorg: eroi.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: eroi.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module eroi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eroi.c,v 3.3 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eroi.c,v 3.4 2001/01/17 22:12:49 dawes Exp $ */ #define _XIEC_EROI diff --git a/programs/Xserver/XIE/dixie/import/iclut.c b/programs/Xserver/XIE/dixie/import/iclut.c index d7565b270..e00ef1ce2 100644 --- a/programs/Xserver/XIE/dixie/import/iclut.c +++ b/programs/Xserver/XIE/dixie/import/iclut.c @@ -1,11 +1,15 @@ -/* $Xorg: iclut.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: iclut.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module iclut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -68,7 +72,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iclut.c,v 3.3 1998/10/25 07:11:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iclut.c,v 3.4 2001/01/17 22:12:50 dawes Exp $ */ #define _XIEC_ICLUT diff --git a/programs/Xserver/XIE/dixie/import/icphoto.c b/programs/Xserver/XIE/dixie/import/icphoto.c index ca5b9ad13..1c8bbd74a 100644 --- a/programs/Xserver/XIE/dixie/import/icphoto.c +++ b/programs/Xserver/XIE/dixie/import/icphoto.c @@ -1,10 +1,14 @@ -/* $Xorg: icphoto.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: icphoto.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module icphoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley, Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icphoto.c,v 3.3 1998/10/25 07:11:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icphoto.c,v 3.4 2001/01/17 22:12:50 dawes Exp $ */ #define _XIEC_ICPHOTO diff --git a/programs/Xserver/XIE/dixie/import/icroi.c b/programs/Xserver/XIE/dixie/import/icroi.c index 65959648a..4bc38b88a 100644 --- a/programs/Xserver/XIE/dixie/import/icroi.c +++ b/programs/Xserver/XIE/dixie/import/icroi.c @@ -1,10 +1,14 @@ -/* $Xorg: icroi.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: icroi.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module icroi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley, Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icroi.c,v 3.3 1998/10/25 07:11:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icroi.c,v 3.4 2001/01/17 22:12:50 dawes Exp $ */ #define _XIEC_ICROI diff --git a/programs/Xserver/XIE/dixie/import/idraw.c b/programs/Xserver/XIE/dixie/import/idraw.c index a60a615d5..32c9ed2a8 100644 --- a/programs/Xserver/XIE/dixie/import/idraw.c +++ b/programs/Xserver/XIE/dixie/import/idraw.c @@ -1,10 +1,14 @@ -/* $Xorg: idraw.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: idraw.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module idraw.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idraw.c,v 3.3 1998/10/25 07:11:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idraw.c,v 3.4 2001/01/17 22:12:50 dawes Exp $ */ #define _XIEC_IDRAW diff --git a/programs/Xserver/XIE/dixie/import/idrawp.c b/programs/Xserver/XIE/dixie/import/idrawp.c index 3237d5db9..5cd9b38a8 100644 --- a/programs/Xserver/XIE/dixie/import/idrawp.c +++ b/programs/Xserver/XIE/dixie/import/idrawp.c @@ -1,10 +1,14 @@ -/* $Xorg: idrawp.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: idrawp.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module idrawp.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idrawp.c,v 3.3 1998/10/25 07:11:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idrawp.c,v 3.4 2001/01/17 22:12:50 dawes Exp $ */ #define _XIEC_IDRAWP diff --git a/programs/Xserver/XIE/dixie/import/ilut.c b/programs/Xserver/XIE/dixie/import/ilut.c index a4b9b26eb..9ac4fd10d 100644 --- a/programs/Xserver/XIE/dixie/import/ilut.c +++ b/programs/Xserver/XIE/dixie/import/ilut.c @@ -1,10 +1,14 @@ -/* $Xorg: ilut.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: ilut.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module ilut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/ilut.c,v 3.3 1998/10/25 07:11:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/ilut.c,v 3.4 2001/01/17 22:12:51 dawes Exp $ */ #define _XIEC_ILUT diff --git a/programs/Xserver/XIE/dixie/import/iphoto.c b/programs/Xserver/XIE/dixie/import/iphoto.c index 2a431ca86..55fbaaf32 100644 --- a/programs/Xserver/XIE/dixie/import/iphoto.c +++ b/programs/Xserver/XIE/dixie/import/iphoto.c @@ -1,10 +1,14 @@ -/* $Xorg: iphoto.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: iphoto.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module iphoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iphoto.c,v 3.3 1998/10/25 07:11:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iphoto.c,v 3.4 2001/01/17 22:12:51 dawes Exp $ */ #define _XIEC_IPHOTO diff --git a/programs/Xserver/XIE/dixie/import/iroi.c b/programs/Xserver/XIE/dixie/import/iroi.c index f92b350dc..68a190898 100644 --- a/programs/Xserver/XIE/dixie/import/iroi.c +++ b/programs/Xserver/XIE/dixie/import/iroi.c @@ -1,10 +1,14 @@ -/* $Xorg: iroi.c,v 1.3 2000/08/17 19:47:24 cpqbld Exp $ */ +/* $Xorg: iroi.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module iroi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iroi.c,v 3.3 1998/10/25 07:11:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iroi.c,v 3.4 2001/01/17 22:12:51 dawes Exp $ */ #define _XIEC_IROI diff --git a/programs/Xserver/XIE/dixie/process/parith.c b/programs/Xserver/XIE/dixie/process/parith.c index d3fc2a2e6..779060a11 100644 --- a/programs/Xserver/XIE/dixie/process/parith.c +++ b/programs/Xserver/XIE/dixie/process/parith.c @@ -1,10 +1,14 @@ -/* $Xorg: parith.c,v 1.5 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: parith.c,v 1.6 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module parith.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/parith.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/parith.c,v 3.4 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PARITH diff --git a/programs/Xserver/XIE/dixie/process/pbandc.c b/programs/Xserver/XIE/dixie/process/pbandc.c index 7afed38ea..5ec7bf089 100644 --- a/programs/Xserver/XIE/dixie/process/pbandc.c +++ b/programs/Xserver/XIE/dixie/process/pbandc.c @@ -1,10 +1,14 @@ -/* $Xorg: pbandc.c,v 1.3 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: pbandc.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module pbandc.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbandc.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbandc.c,v 3.4 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PBANDC diff --git a/programs/Xserver/XIE/dixie/process/pbande.c b/programs/Xserver/XIE/dixie/process/pbande.c index 202e99f96..f8efa8788 100644 --- a/programs/Xserver/XIE/dixie/process/pbande.c +++ b/programs/Xserver/XIE/dixie/process/pbande.c @@ -1,10 +1,14 @@ -/* $Xorg: pbande.c,v 1.3 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: pbande.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module pbande.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbande.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbande.c,v 3.4 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PBANDE diff --git a/programs/Xserver/XIE/dixie/process/pbands.c b/programs/Xserver/XIE/dixie/process/pbands.c index 29b3545e4..426b8a853 100644 --- a/programs/Xserver/XIE/dixie/process/pbands.c +++ b/programs/Xserver/XIE/dixie/process/pbands.c @@ -1,10 +1,14 @@ -/* $Xorg: pbands.c,v 1.3 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: pbands.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module pbands.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. September 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbands.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbands.c,v 3.4 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PBANDS diff --git a/programs/Xserver/XIE/dixie/process/pblend.c b/programs/Xserver/XIE/dixie/process/pblend.c index 05295a0ee..62191bce6 100644 --- a/programs/Xserver/XIE/dixie/process/pblend.c +++ b/programs/Xserver/XIE/dixie/process/pblend.c @@ -1,10 +1,14 @@ -/* $Xorg: pblend.c,v 1.3 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: pblend.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module pblend.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pblend.c,v 3.3 1998/10/25 07:11:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pblend.c,v 3.4 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PBLEND diff --git a/programs/Xserver/XIE/dixie/process/pcfrgb.c b/programs/Xserver/XIE/dixie/process/pcfrgb.c index 60a310781..b7e5f9a23 100644 --- a/programs/Xserver/XIE/dixie/process/pcfrgb.c +++ b/programs/Xserver/XIE/dixie/process/pcfrgb.c @@ -1,10 +1,14 @@ -/* $Xorg: pcfrgb.c,v 1.3 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: pcfrgb.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module pcfrgb.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfrgb.c,v 3.4 1998/10/25 07:11:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfrgb.c,v 3.5 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PCFRGB diff --git a/programs/Xserver/XIE/dixie/process/pcfromi.c b/programs/Xserver/XIE/dixie/process/pcfromi.c index c5de5c306..8cddedb85 100644 --- a/programs/Xserver/XIE/dixie/process/pcfromi.c +++ b/programs/Xserver/XIE/dixie/process/pcfromi.c @@ -1,10 +1,14 @@ -/* $Xorg: pcfromi.c,v 1.3 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: pcfromi.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module pcfromi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfromi.c,v 3.3 1998/10/25 07:11:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfromi.c,v 3.4 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PCFROMI #define _XIEC_PCI diff --git a/programs/Xserver/XIE/dixie/process/pcnst.c b/programs/Xserver/XIE/dixie/process/pcnst.c index 3fcb19273..c5d9386a1 100644 --- a/programs/Xserver/XIE/dixie/process/pcnst.c +++ b/programs/Xserver/XIE/dixie/process/pcnst.c @@ -1,10 +1,14 @@ -/* $Xorg: pcnst.c,v 1.3 2000/08/17 19:47:26 cpqbld Exp $ */ +/* $Xorg: pcnst.c,v 1.4 2001/02/09 02:04:20 xorgcvs Exp $ */ /**** module pcnst.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcnst.c,v 3.4 1998/10/25 07:11:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcnst.c,v 3.5 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PCNST diff --git a/programs/Xserver/XIE/dixie/process/pcomp.c b/programs/Xserver/XIE/dixie/process/pcomp.c index 7f9ee3b43..90706b3f9 100644 --- a/programs/Xserver/XIE/dixie/process/pcomp.c +++ b/programs/Xserver/XIE/dixie/process/pcomp.c @@ -1,10 +1,14 @@ -/* $Xorg: pcomp.c,v 1.5 2000/08/17 19:47:27 cpqbld Exp $ */ +/* $Xorg: pcomp.c,v 1.6 2001/02/09 02:04:21 xorgcvs Exp $ */ /**** module pcomp.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcomp.c,v 3.3 1998/10/25 07:11:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcomp.c,v 3.4 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PCOMP diff --git a/programs/Xserver/XIE/dixie/process/pconv.c b/programs/Xserver/XIE/dixie/process/pconv.c index 60c546b93..fe7f78a25 100644 --- a/programs/Xserver/XIE/dixie/process/pconv.c +++ b/programs/Xserver/XIE/dixie/process/pconv.c @@ -1,10 +1,14 @@ -/* $Xorg: pconv.c,v 1.3 2000/08/17 19:47:27 cpqbld Exp $ */ +/* $Xorg: pconv.c,v 1.4 2001/02/09 02:04:21 xorgcvs Exp $ */ /**** module pconv.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pconv.c,v 3.4 1998/10/25 07:11:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pconv.c,v 3.5 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PCONV diff --git a/programs/Xserver/XIE/dixie/process/pctoi.c b/programs/Xserver/XIE/dixie/process/pctoi.c index 1a28f4195..1485ad5bf 100644 --- a/programs/Xserver/XIE/dixie/process/pctoi.c +++ b/programs/Xserver/XIE/dixie/process/pctoi.c @@ -1,11 +1,15 @@ -/* $Xorg: pctoi.c,v 1.3 2000/08/17 19:47:27 cpqbld Exp $ */ +/* $Xorg: pctoi.c,v 1.4 2001/02/09 02:04:21 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module pctoi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden && Robert NC Shelley -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctoi.c,v 3.4 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctoi.c,v 3.5 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PCTOI #define _XIEC_PCI diff --git a/programs/Xserver/XIE/dixie/process/pctrgb.c b/programs/Xserver/XIE/dixie/process/pctrgb.c index 8a25c6e77..76a446837 100644 --- a/programs/Xserver/XIE/dixie/process/pctrgb.c +++ b/programs/Xserver/XIE/dixie/process/pctrgb.c @@ -1,10 +1,14 @@ -/* $Xorg: pctrgb.c,v 1.3 2000/08/17 19:47:28 cpqbld Exp $ */ +/* $Xorg: pctrgb.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module pctrgb.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctrgb.c,v 3.4 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctrgb.c,v 3.5 2001/01/17 22:12:52 dawes Exp $ */ #define _XIEC_PCTRGB diff --git a/programs/Xserver/XIE/dixie/process/pdither.c b/programs/Xserver/XIE/dixie/process/pdither.c index 839406890..e6a724fe1 100644 --- a/programs/Xserver/XIE/dixie/process/pdither.c +++ b/programs/Xserver/XIE/dixie/process/pdither.c @@ -1,10 +1,14 @@ -/* $Xorg: pdither.c,v 1.3 2000/08/17 19:47:28 cpqbld Exp $ */ +/* $Xorg: pdither.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module pdither.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pdither.c,v 3.3 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pdither.c,v 3.4 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PDITHER diff --git a/programs/Xserver/XIE/dixie/process/pgeom.c b/programs/Xserver/XIE/dixie/process/pgeom.c index a01fb151b..1b6096d29 100644 --- a/programs/Xserver/XIE/dixie/process/pgeom.c +++ b/programs/Xserver/XIE/dixie/process/pgeom.c @@ -1,10 +1,14 @@ -/* $Xorg: pgeom.c,v 1.3 2000/08/17 19:47:28 cpqbld Exp $ */ +/* $Xorg: pgeom.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module pgeom.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pgeom.c,v 3.4 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pgeom.c,v 3.5 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PGEOM diff --git a/programs/Xserver/XIE/dixie/process/phist.c b/programs/Xserver/XIE/dixie/process/phist.c index f27caa48a..ab5761cd4 100644 --- a/programs/Xserver/XIE/dixie/process/phist.c +++ b/programs/Xserver/XIE/dixie/process/phist.c @@ -1,10 +1,14 @@ -/* $Xorg: phist.c,v 1.3 2000/08/17 19:47:28 cpqbld Exp $ */ +/* $Xorg: phist.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module phist.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/phist.c,v 3.4 1998/10/25 07:11:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/phist.c,v 3.5 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PHIST diff --git a/programs/Xserver/XIE/dixie/process/plogic.c b/programs/Xserver/XIE/dixie/process/plogic.c index 75cbea7b7..0a53712fc 100644 --- a/programs/Xserver/XIE/dixie/process/plogic.c +++ b/programs/Xserver/XIE/dixie/process/plogic.c @@ -1,10 +1,14 @@ -/* $Xorg: plogic.c,v 1.5 2000/08/17 19:47:28 cpqbld Exp $ */ +/* $Xorg: plogic.c,v 1.6 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module plogic.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/plogic.c,v 3.3 1998/10/25 07:11:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/plogic.c,v 3.4 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PLOGIC diff --git a/programs/Xserver/XIE/dixie/process/pmath.c b/programs/Xserver/XIE/dixie/process/pmath.c index fb4346a67..67d788d15 100644 --- a/programs/Xserver/XIE/dixie/process/pmath.c +++ b/programs/Xserver/XIE/dixie/process/pmath.c @@ -1,10 +1,14 @@ -/* $Xorg: pmath.c,v 1.5 2000/08/17 19:47:29 cpqbld Exp $ */ +/* $Xorg: pmath.c,v 1.6 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module pmath.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pmath.c,v 3.3 1998/10/25 07:11:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pmath.c,v 3.4 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PMATH diff --git a/programs/Xserver/XIE/dixie/process/ppaste.c b/programs/Xserver/XIE/dixie/process/ppaste.c index 10a873fb6..a0cd1086a 100644 --- a/programs/Xserver/XIE/dixie/process/ppaste.c +++ b/programs/Xserver/XIE/dixie/process/ppaste.c @@ -1,10 +1,14 @@ -/* $Xorg: ppaste.c,v 1.3 2000/08/17 19:47:29 cpqbld Exp $ */ +/* $Xorg: ppaste.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module ppaste.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppaste.c,v 3.3 1998/10/25 07:11:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppaste.c,v 3.4 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PPASTE diff --git a/programs/Xserver/XIE/dixie/process/ppoint.c b/programs/Xserver/XIE/dixie/process/ppoint.c index 5affa1c5c..24be9cab7 100644 --- a/programs/Xserver/XIE/dixie/process/ppoint.c +++ b/programs/Xserver/XIE/dixie/process/ppoint.c @@ -1,10 +1,14 @@ -/* $Xorg: ppoint.c,v 1.3 2000/08/17 19:47:29 cpqbld Exp $ */ +/* $Xorg: ppoint.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module ppoint.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppoint.c,v 3.3 1998/10/25 07:11:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppoint.c,v 3.4 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PPOINT #define _XIEC_POINT diff --git a/programs/Xserver/XIE/dixie/process/puncnst.c b/programs/Xserver/XIE/dixie/process/puncnst.c index 115be9efc..4b8a0850b 100644 --- a/programs/Xserver/XIE/dixie/process/puncnst.c +++ b/programs/Xserver/XIE/dixie/process/puncnst.c @@ -1,10 +1,14 @@ -/* $Xorg: puncnst.c,v 1.3 2000/08/17 19:47:29 cpqbld Exp $ */ +/* $Xorg: puncnst.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module puncnst.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/puncnst.c,v 3.3 1998/10/25 07:11:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/puncnst.c,v 3.4 2001/01/17 22:12:53 dawes Exp $ */ #define _XIEC_PUNCNST diff --git a/programs/Xserver/XIE/dixie/request/colorlst.c b/programs/Xserver/XIE/dixie/request/colorlst.c index 091421d16..e722a80e7 100644 --- a/programs/Xserver/XIE/dixie/request/colorlst.c +++ b/programs/Xserver/XIE/dixie/request/colorlst.c @@ -1,10 +1,14 @@ -/* $Xorg: colorlst.c,v 1.3 2000/08/17 19:47:29 cpqbld Exp $ */ +/* $Xorg: colorlst.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module colorlst.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. March, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/colorlst.c,v 3.3 1998/10/25 07:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/colorlst.c,v 3.4 2001/01/17 22:12:55 dawes Exp $ */ #define _XIEC_COLORLST diff --git a/programs/Xserver/XIE/dixie/request/difloat.c b/programs/Xserver/XIE/dixie/request/difloat.c index f25a4554e..f8a85cffe 100644 --- a/programs/Xserver/XIE/dixie/request/difloat.c +++ b/programs/Xserver/XIE/dixie/request/difloat.c @@ -1,10 +1,14 @@ -/* $Xorg: difloat.c,v 1.3 2000/08/17 19:47:30 cpqbld Exp $ */ +/* $Xorg: difloat.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module difloat.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/difloat.c,v 1.6 1998/10/25 07:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/difloat.c,v 1.7 2001/01/17 22:12:55 dawes Exp $ */ #ifndef XIE_IEEE_IS_NATIVE #define _XIEC_DIFLOAT diff --git a/programs/Xserver/XIE/dixie/request/error.c b/programs/Xserver/XIE/dixie/request/error.c index ba681220b..0ae7a16a7 100644 --- a/programs/Xserver/XIE/dixie/request/error.c +++ b/programs/Xserver/XIE/dixie/request/error.c @@ -1,11 +1,15 @@ -/* $Xorg: error.c,v 1.5 2000/08/17 19:47:30 cpqbld Exp $ */ +/* $Xorg: error.c,v 1.6 2001/02/09 02:04:22 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module error.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -61,7 +65,7 @@ terms and conditions: Title to this software shall at all times remain with AGE Logic, Inc. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/error.c,v 3.3 1998/10/10 15:25:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/error.c,v 3.4 2001/01/17 22:12:55 dawes Exp $ */ /* * Include files diff --git a/programs/Xserver/XIE/dixie/request/event.c b/programs/Xserver/XIE/dixie/request/event.c index da5a975a0..90814767c 100644 --- a/programs/Xserver/XIE/dixie/request/event.c +++ b/programs/Xserver/XIE/dixie/request/event.c @@ -1,10 +1,14 @@ -/* $Xorg: event.c,v 1.3 2000/08/17 19:47:30 cpqbld Exp $ */ +/* $Xorg: event.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module event.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/event.c,v 3.3 1998/10/25 07:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/event.c,v 3.4 2001/01/17 22:12:55 dawes Exp $ */ #define _XIEC_EVENT diff --git a/programs/Xserver/XIE/dixie/request/flo.c b/programs/Xserver/XIE/dixie/request/flo.c index 5096c1c1d..f9f4ab03b 100644 --- a/programs/Xserver/XIE/dixie/request/flo.c +++ b/programs/Xserver/XIE/dixie/request/flo.c @@ -1,10 +1,14 @@ -/* $Xorg: flo.c,v 1.3 2000/08/17 19:47:30 cpqbld Exp $ */ +/* $Xorg: flo.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module flo.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/flo.c,v 3.4 1998/10/25 07:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/flo.c,v 3.5 2001/01/17 22:12:55 dawes Exp $ */ /* * Include files diff --git a/programs/Xserver/XIE/dixie/request/lut.c b/programs/Xserver/XIE/dixie/request/lut.c index deca2f1ae..b043f9442 100644 --- a/programs/Xserver/XIE/dixie/request/lut.c +++ b/programs/Xserver/XIE/dixie/request/lut.c @@ -1,10 +1,14 @@ -/* $Xorg: lut.c,v 1.3 2000/08/17 19:47:31 cpqbld Exp $ */ +/* $Xorg: lut.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module lut.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -60,7 +64,7 @@ terms and conditions: Title to this software shall at all times remain with AGE Logic, Inc. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/lut.c,v 3.3 1998/10/25 07:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/lut.c,v 3.4 2001/01/17 22:12:55 dawes Exp $ */ /* * Include files diff --git a/programs/Xserver/XIE/dixie/request/memory.c b/programs/Xserver/XIE/dixie/request/memory.c index 27a76ea15..ff985ff85 100644 --- a/programs/Xserver/XIE/dixie/request/memory.c +++ b/programs/Xserver/XIE/dixie/request/memory.c @@ -1,11 +1,15 @@ -/* $Xorg: memory.c,v 1.3 2000/08/17 19:47:31 cpqbld Exp $ */ +/* $Xorg: memory.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /* Module memory.c */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden, AGE Logic, Inc., April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/memory.c,v 3.5 1998/10/25 07:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/memory.c,v 3.6 2001/01/17 22:12:55 dawes Exp $ */ #define _XIEC_MEMORY diff --git a/programs/Xserver/XIE/dixie/request/photomap.c b/programs/Xserver/XIE/dixie/request/photomap.c index a249f136e..5647317f2 100644 --- a/programs/Xserver/XIE/dixie/request/photomap.c +++ b/programs/Xserver/XIE/dixie/request/photomap.c @@ -1,10 +1,14 @@ -/* $Xorg: photomap.c,v 1.3 2000/08/17 19:47:31 cpqbld Exp $ */ +/* $Xorg: photomap.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module photomap.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden, Robert NC Shelley AGE Logic, Inc. April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/photomap.c,v 3.3 1998/10/25 07:11:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/photomap.c,v 3.4 2001/01/17 22:12:56 dawes Exp $ */ #define _XIEC_PHOTOMAP diff --git a/programs/Xserver/XIE/dixie/request/protoflo.c b/programs/Xserver/XIE/dixie/request/protoflo.c index b1e1f0c62..a5061ce3f 100644 --- a/programs/Xserver/XIE/dixie/request/protoflo.c +++ b/programs/Xserver/XIE/dixie/request/protoflo.c @@ -1,11 +1,15 @@ -/* $Xorg: protoflo.c,v 1.3 2000/08/17 19:47:31 cpqbld Exp $ */ +/* $Xorg: protoflo.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module protoflo.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Robert NC Shelley, Dean Verheiden -- AGE Logic, Inc., May 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/protoflo.c,v 3.3 1998/10/25 07:11:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/protoflo.c,v 3.4 2001/01/17 22:12:56 dawes Exp $ */ #include <protoflo.h> diff --git a/programs/Xserver/XIE/dixie/request/roi.c b/programs/Xserver/XIE/dixie/request/roi.c index e6d1c8cab..27be336cf 100644 --- a/programs/Xserver/XIE/dixie/request/roi.c +++ b/programs/Xserver/XIE/dixie/request/roi.c @@ -1,10 +1,14 @@ -/* $Xorg: roi.c,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: roi.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** module roi.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden, AGE Logic, Inc., April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/roi.c,v 3.3 1998/10/25 07:11:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/roi.c,v 3.4 2001/01/17 22:12:56 dawes Exp $ */ #define _XIEC_ROI diff --git a/programs/Xserver/XIE/dixie/request/session.c b/programs/Xserver/XIE/dixie/request/session.c index 755bb6d89..358433fa3 100644 --- a/programs/Xserver/XIE/dixie/request/session.c +++ b/programs/Xserver/XIE/dixie/request/session.c @@ -1,10 +1,14 @@ -/* $Xorg: session.c,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: session.c,v 1.4 2001/02/09 02:04:22 xorgcvs Exp $ */ /**** session.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc March, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/session.c,v 3.12 1999/01/31 12:21:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/session.c,v 3.13 2001/01/17 22:12:56 dawes Exp $ */ #define _XIEC_SESSION diff --git a/programs/Xserver/XIE/dixie/request/tables.c b/programs/Xserver/XIE/dixie/request/tables.c index c6695208f..c5479d014 100644 --- a/programs/Xserver/XIE/dixie/request/tables.c +++ b/programs/Xserver/XIE/dixie/request/tables.c @@ -1,10 +1,14 @@ -/* $Xorg: tables.c,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: tables.c,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** tables.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden, AGE Logic, Inc March 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/tables.c,v 3.4 1999/01/31 12:21:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/tables.c,v 3.5 2001/01/17 22:12:56 dawes Exp $ */ #define _XIEC_TABLES diff --git a/programs/Xserver/XIE/dixie/request/technq.c b/programs/Xserver/XIE/dixie/request/technq.c index 92b0ed30e..8822ce189 100644 --- a/programs/Xserver/XIE/dixie/request/technq.c +++ b/programs/Xserver/XIE/dixie/request/technq.c @@ -1,10 +1,14 @@ -/* $Xorg: technq.c,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: technq.c,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module technq.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -64,7 +68,7 @@ terms and conditions: Dean Verheiden AGE Logic, Inc. April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/technq.c,v 3.5 1998/10/25 07:11:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/technq.c,v 3.6 2001/01/17 22:12:56 dawes Exp $ */ #define _XIEC_TECHNQ diff --git a/programs/Xserver/XIE/include/colorlst.h b/programs/Xserver/XIE/include/colorlst.h index 3e89682a3..8a8e24474 100644 --- a/programs/Xserver/XIE/include/colorlst.h +++ b/programs/Xserver/XIE/include/colorlst.h @@ -1,15 +1,14 @@ -/* $XConsortium: colorlst.h,v 1.4 94/04/17 20:34:01 rws Exp $ */ +/* $Xorg: colorlst.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** colorlst.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/include/corex.h b/programs/Xserver/XIE/include/corex.h index a244e13e2..05168ddea 100644 --- a/programs/Xserver/XIE/include/corex.h +++ b/programs/Xserver/XIE/include/corex.h @@ -1,10 +1,14 @@ -/* $Xorg: corex.h,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: corex.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module corex.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April, 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/corex.h,v 1.3 1998/10/25 12:47:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/corex.h,v 1.4 2001/01/17 22:12:57 dawes Exp $ */ #ifndef _XIEH_COREX #define _XIEH_COREX diff --git a/programs/Xserver/XIE/include/difloat.h b/programs/Xserver/XIE/include/difloat.h index 2f9b2c0b4..cd21cee12 100644 --- a/programs/Xserver/XIE/include/difloat.h +++ b/programs/Xserver/XIE/include/difloat.h @@ -1,10 +1,14 @@ -/* $Xorg: difloat.h,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: difloat.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module difloat.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/difloat.h,v 1.3 1998/10/25 12:47:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/difloat.h,v 1.4 2001/01/17 22:12:57 dawes Exp $ */ #ifndef _XIE_DIFLOAT #define _XIE_DIFLOAT diff --git a/programs/Xserver/XIE/include/element.h b/programs/Xserver/XIE/include/element.h index bcea5d037..79f0e1395 100644 --- a/programs/Xserver/XIE/include/element.h +++ b/programs/Xserver/XIE/include/element.h @@ -1,15 +1,15 @@ -/* $XConsortium: element.h,v 1.5 94/04/17 20:34:02 rws Exp $ */ +/* $Xorg: element.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /* module element.h */ /***************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +17,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. -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. NOTICE @@ -279,6 +279,12 @@ typedef struct _pTecConvertToIndexMatchdef { double matchLimit; double grayLimit; } pTecConvertToIndexMatchDefRec, *pConvertToIndexMatchDefPtr; + +typedef struct _ptecctoi { + CARD32 fill; + BOOL defTech; +} pTecCtoIDefRec, *pTecCtoIDefPtr; + #endif /* _XIEC_PCTOI */ #if defined(_XIEC_PCTRGB) diff --git a/programs/Xserver/XIE/include/error.h b/programs/Xserver/XIE/include/error.h index 264baa06f..365fe0eb2 100644 --- a/programs/Xserver/XIE/include/error.h +++ b/programs/Xserver/XIE/include/error.h @@ -1,10 +1,14 @@ -/* $Xorg: error.h,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: error.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module error.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/error.h,v 3.3 1998/10/05 13:22:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/error.h,v 3.4 2001/01/17 22:12:58 dawes Exp $ */ #ifndef _XIEH_ERROR #define _XIEH_ERROR diff --git a/programs/Xserver/XIE/include/flo.h b/programs/Xserver/XIE/include/flo.h index d9fd4360f..50080ca07 100644 --- a/programs/Xserver/XIE/include/flo.h +++ b/programs/Xserver/XIE/include/flo.h @@ -1,10 +1,14 @@ -/* $Xorg: flo.h,v 1.3 2000/08/17 19:47:32 cpqbld Exp $ */ +/* $Xorg: flo.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module flo.h ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/flo.h,v 1.3 1998/10/25 12:47:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/flo.h,v 1.4 2001/01/17 22:12:58 dawes Exp $ */ #ifndef _XIEH_FLO #define _XIEH_FLO diff --git a/programs/Xserver/XIE/include/flodata.h b/programs/Xserver/XIE/include/flodata.h index 431965d90..11e83b40f 100644 --- a/programs/Xserver/XIE/include/flodata.h +++ b/programs/Xserver/XIE/include/flodata.h @@ -1,15 +1,14 @@ -/* $XConsortium: flodata.h,v 1.4 94/04/17 20:34:04 rws Exp $ */ +/* $Xorg: flodata.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module flodata.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/include/flostr.h b/programs/Xserver/XIE/include/flostr.h index 2a55e1dd9..25eaff10b 100644 --- a/programs/Xserver/XIE/include/flostr.h +++ b/programs/Xserver/XIE/include/flostr.h @@ -1,15 +1,14 @@ -/* $XConsortium: flostr.h,v 1.5 94/04/17 20:34:04 rws Exp $ */ +/* $Xorg: flostr.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module flostr.h ****/ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE @@ -168,7 +167,9 @@ typedef struct _pedef { diElemVecPtr diVec; /* DIXIE entry point vector */ ddElemVecRec ddVec; /* DDXIE entry point vector (in-line) */ outFloRec outFlo; /* output attribute/connection info */ -/*inFloRec inFlo[inCnt]; /* array of in-line input connection info */ +#if 0 + inFloRec inFlo[inCnt]; /* array of in-line input connection info */ +#endif } peDefRec, *peDefPtr; /* link-pair for managing a circular doubly linked list of peDefs @@ -208,7 +209,9 @@ typedef struct _flodef { } flags; xieFloEvn event; /* generic event packet */ xieFloErr error; /* generic error packet */ -/*peDefPtr peArray[peCnt];/* array of peDef pointers */ +#if 0 + peDefPtr peArray[peCnt];/* array of peDef pointers */ +#endif } floDefRec, *floDefPtr; /* link-pair for managing a circular doubly linked list of floDefs diff --git a/programs/Xserver/XIE/include/lut.h b/programs/Xserver/XIE/include/lut.h index 18b9dd785..0e632c0e8 100644 --- a/programs/Xserver/XIE/include/lut.h +++ b/programs/Xserver/XIE/include/lut.h @@ -1,15 +1,14 @@ -/* $XConsortium: lut.h,v 1.4 94/04/17 20:34:05 rws Exp $ */ +/* $Xorg: lut.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module lut.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/include/macro.h b/programs/Xserver/XIE/include/macro.h index d7b352441..693b1c8b0 100644 --- a/programs/Xserver/XIE/include/macro.h +++ b/programs/Xserver/XIE/include/macro.h @@ -1,10 +1,14 @@ -/* $Xorg: macro.h,v 1.3 2000/08/17 19:47:33 cpqbld Exp $ */ +/* $Xorg: macro.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module macro.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. March 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/macro.h,v 1.8 1998/10/25 07:11:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/macro.h,v 1.9 2001/01/17 22:12:58 dawes Exp $ */ #ifndef _XIEH_MACRO #define _XIEH_MACRO diff --git a/programs/Xserver/XIE/include/memory.h b/programs/Xserver/XIE/include/memory.h index cd1ad7a6f..7bfcd595f 100644 --- a/programs/Xserver/XIE/include/memory.h +++ b/programs/Xserver/XIE/include/memory.h @@ -1,10 +1,14 @@ -/* $Xorg: memory.h,v 1.3 2000/08/17 19:47:33 cpqbld Exp $ */ +/* $Xorg: memory.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module memory.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/memory.h,v 1.3 1998/10/25 12:47:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/memory.h,v 1.4 2001/01/17 22:12:58 dawes Exp $ */ #ifndef _XIEH_MEMORY #define _XIEH_MEMORY diff --git a/programs/Xserver/XIE/include/photomap.h b/programs/Xserver/XIE/include/photomap.h index 68e13f5bd..5ce2a2bdb 100644 --- a/programs/Xserver/XIE/include/photomap.h +++ b/programs/Xserver/XIE/include/photomap.h @@ -1,15 +1,14 @@ -/* $XConsortium: photomap.h,v 1.5 94/04/17 20:34:06 rws Exp $ */ +/* $Xorg: photomap.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module photomap.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/include/photospc.h b/programs/Xserver/XIE/include/photospc.h index 489c8a7c1..6f4f866be 100644 --- a/programs/Xserver/XIE/include/photospc.h +++ b/programs/Xserver/XIE/include/photospc.h @@ -1,15 +1,14 @@ -/* $XConsortium: photospc.h,v 1.4 94/04/17 20:34:07 rws Exp $ */ +/* $Xorg: photospc.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module photospc.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/include/roi.h b/programs/Xserver/XIE/include/roi.h index 66a7239c5..e2a1b8d01 100644 --- a/programs/Xserver/XIE/include/roi.h +++ b/programs/Xserver/XIE/include/roi.h @@ -1,15 +1,14 @@ -/* $XConsortium: roi.h,v 1.4 94/04/17 20:34:07 rws Exp $ */ +/* $Xorg: roi.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module roi.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/include/tables.h b/programs/Xserver/XIE/include/tables.h index 2d567855f..d0eda8530 100644 --- a/programs/Xserver/XIE/include/tables.h +++ b/programs/Xserver/XIE/include/tables.h @@ -1,10 +1,14 @@ -/* $Xorg: tables.h,v 1.3 2000/08/17 19:47:33 cpqbld Exp $ */ +/* $Xorg: tables.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module tables.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden, Robert NC Shelley -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/tables.h,v 1.3 1998/10/25 12:47:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/tables.h,v 1.4 2001/01/17 22:12:58 dawes Exp $ */ #ifndef _XIEH_TABLES #define _XIEH_TABLES diff --git a/programs/Xserver/XIE/include/technq.h b/programs/Xserver/XIE/include/technq.h index 014a81dfc..93f5897ef 100644 --- a/programs/Xserver/XIE/include/technq.h +++ b/programs/Xserver/XIE/include/technq.h @@ -1,10 +1,14 @@ -/* $Xorg: technq.h,v 1.3 2000/08/17 19:47:33 cpqbld Exp $ */ +/* $Xorg: technq.h,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module technq.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/technq.h,v 1.3 1998/10/25 12:47:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/technq.h,v 1.4 2001/01/17 22:12:58 dawes Exp $ */ #ifndef _XIEH_TECHNQ #define _XIEH_TECHNQ diff --git a/programs/Xserver/XIE/mixie/control/analyze.c b/programs/Xserver/XIE/mixie/control/analyze.c index 460c7da9f..aa1dbeb7e 100644 --- a/programs/Xserver/XIE/mixie/control/analyze.c +++ b/programs/Xserver/XIE/mixie/control/analyze.c @@ -1,10 +1,14 @@ -/* $Xorg: analyze.c,v 1.3 2000/08/17 19:47:34 cpqbld Exp $ */ +/* $Xorg: analyze.c,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module analyze.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/analyze.c,v 1.3 1998/10/06 10:35:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/analyze.c,v 1.4 2001/01/17 22:13:00 dawes Exp $ */ #define _XIEC_ANALYZE diff --git a/programs/Xserver/XIE/mixie/control/domain.c b/programs/Xserver/XIE/mixie/control/domain.c index 2ab300331..ed8c94881 100644 --- a/programs/Xserver/XIE/mixie/control/domain.c +++ b/programs/Xserver/XIE/mixie/control/domain.c @@ -1,9 +1,13 @@ -/* $Xorg: domain.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: domain.c,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module domain.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/domain.c,v 1.3 1998/10/06 10:35:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/domain.c,v 1.4 2001/01/17 22:13:00 dawes Exp $ */ #define _XIEC_DOMAIN diff --git a/programs/Xserver/XIE/mixie/control/floman.c b/programs/Xserver/XIE/mixie/control/floman.c index 3e4e5be76..0d2800c7c 100644 --- a/programs/Xserver/XIE/mixie/control/floman.c +++ b/programs/Xserver/XIE/mixie/control/floman.c @@ -1,10 +1,14 @@ -/* $Xorg: floman.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: floman.c,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module floman.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/floman.c,v 3.3 1998/10/25 07:11:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/floman.c,v 3.4 2001/01/17 22:13:00 dawes Exp $ */ /* * Include files diff --git a/programs/Xserver/XIE/mixie/control/sched.c b/programs/Xserver/XIE/mixie/control/sched.c index 599dcaeea..2ac8ece5a 100644 --- a/programs/Xserver/XIE/mixie/control/sched.c +++ b/programs/Xserver/XIE/mixie/control/sched.c @@ -1,10 +1,14 @@ -/* $Xorg: sched.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: sched.c,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /**** module sched.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden, Robert NC Shelley -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/sched.c,v 1.4 1998/10/25 07:11:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/sched.c,v 1.5 2001/01/17 22:13:00 dawes Exp $ */ /* * Include files diff --git a/programs/Xserver/XIE/mixie/control/strip.c b/programs/Xserver/XIE/mixie/control/strip.c index 7c3001f14..85c493553 100644 --- a/programs/Xserver/XIE/mixie/control/strip.c +++ b/programs/Xserver/XIE/mixie/control/strip.c @@ -1,11 +1,15 @@ -/* $Xorg: strip.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: strip.c,v 1.4 2001/02/09 02:04:23 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module strip.c ****/ /***************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/strip.c,v 3.5 1999/01/31 12:21:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/strip.c,v 3.6 2001/01/17 22:13:00 dawes Exp $ */ /* * Include files diff --git a/programs/Xserver/XIE/mixie/export/mechist.c b/programs/Xserver/XIE/mixie/export/mechist.c index 0e780cd06..2d63579ef 100644 --- a/programs/Xserver/XIE/mixie/export/mechist.c +++ b/programs/Xserver/XIE/mixie/export/mechist.c @@ -1,10 +1,14 @@ -/* $Xorg: mechist.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: mechist.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module mechist.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mechist.c,v 3.4 1998/10/25 07:11:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mechist.c,v 3.5 2001/01/17 22:13:01 dawes Exp $ */ #define _XIEC_MECHIST #define _XIEC_ECHIST diff --git a/programs/Xserver/XIE/mixie/export/meclut.c b/programs/Xserver/XIE/mixie/export/meclut.c index 64cdf4f73..bf0f1e562 100644 --- a/programs/Xserver/XIE/mixie/export/meclut.c +++ b/programs/Xserver/XIE/mixie/export/meclut.c @@ -1,10 +1,14 @@ -/* $Xorg: meclut.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: meclut.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module meclut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meclut.c,v 3.4 1998/10/25 07:11:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meclut.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MECLUT #define _XIEC_ECLUT diff --git a/programs/Xserver/XIE/mixie/export/mecphoto.c b/programs/Xserver/XIE/mixie/export/mecphoto.c index 2e9929a39..f7021f88f 100644 --- a/programs/Xserver/XIE/mixie/export/mecphoto.c +++ b/programs/Xserver/XIE/mixie/export/mecphoto.c @@ -1,10 +1,14 @@ -/* $Xorg: mecphoto.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: mecphoto.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module mecphoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley && Dean Verheiden -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecphoto.c,v 3.4 1998/10/25 07:11:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecphoto.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MECPHOTO #define _XIEC_ECPHOTO #define _XIEC_EPHOTO diff --git a/programs/Xserver/XIE/mixie/export/mecroi.c b/programs/Xserver/XIE/mixie/export/mecroi.c index ccc50f5a2..cfbc30f0b 100644 --- a/programs/Xserver/XIE/mixie/export/mecroi.c +++ b/programs/Xserver/XIE/mixie/export/mecroi.c @@ -1,10 +1,14 @@ -/* $Xorg: mecroi.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: mecroi.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module mecroi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare && Dean Verheiden -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecroi.c,v 3.4 1998/10/25 07:11:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecroi.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MECROI #define _XIEC_ECROI diff --git a/programs/Xserver/XIE/mixie/export/medraw.c b/programs/Xserver/XIE/mixie/export/medraw.c index 96d2b85f4..e2849cdfa 100644 --- a/programs/Xserver/XIE/mixie/export/medraw.c +++ b/programs/Xserver/XIE/mixie/export/medraw.c @@ -1,10 +1,14 @@ -/* $Xorg: medraw.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: medraw.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module medraw.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medraw.c,v 3.4 1998/10/25 07:11:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medraw.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MEDRAW #define _XIEC_EDRAW diff --git a/programs/Xserver/XIE/mixie/export/medrawp.c b/programs/Xserver/XIE/mixie/export/medrawp.c index 540ba3e73..4e708a104 100644 --- a/programs/Xserver/XIE/mixie/export/medrawp.c +++ b/programs/Xserver/XIE/mixie/export/medrawp.c @@ -1,10 +1,14 @@ -/* $Xorg: medrawp.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: medrawp.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module medrawp.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley && Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medrawp.c,v 3.4 1998/10/25 07:11:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medrawp.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MEDRAWP #define _XIEC_EDRAWP diff --git a/programs/Xserver/XIE/mixie/export/mefax.c b/programs/Xserver/XIE/mixie/export/mefax.c index d674eedd6..e913f93df 100644 --- a/programs/Xserver/XIE/mixie/export/mefax.c +++ b/programs/Xserver/XIE/mixie/export/mefax.c @@ -1,10 +1,14 @@ -/* $Xorg: mefax.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: mefax.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module mefax.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. Oct, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mefax.c,v 3.4 1998/10/25 07:11:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mefax.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MEPHOTO #define _XIEC_EPHOTO diff --git a/programs/Xserver/XIE/mixie/export/mejpeg.c b/programs/Xserver/XIE/mixie/export/mejpeg.c index d5c21ffc8..c7b422788 100644 --- a/programs/Xserver/XIE/mixie/export/mejpeg.c +++ b/programs/Xserver/XIE/mixie/export/mejpeg.c @@ -1,10 +1,14 @@ -/* $Xorg: mejpeg.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: mejpeg.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module mejpeg.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. Oct, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mejpeg.c,v 3.6 1999/01/31 12:21:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mejpeg.c,v 3.7 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MEPHOTO #define _XIEC_EPHOTO diff --git a/programs/Xserver/XIE/mixie/export/melut.c b/programs/Xserver/XIE/mixie/export/melut.c index d28127762..59faac111 100644 --- a/programs/Xserver/XIE/mixie/export/melut.c +++ b/programs/Xserver/XIE/mixie/export/melut.c @@ -1,10 +1,14 @@ -/* $Xorg: melut.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: melut.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module melut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/melut.c,v 3.4 1998/10/25 07:11:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/melut.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MELUT #define _XIEC_ELUT diff --git a/programs/Xserver/XIE/mixie/export/mephoto.c b/programs/Xserver/XIE/mixie/export/mephoto.c index 8594bd04b..705e4879e 100644 --- a/programs/Xserver/XIE/mixie/export/mephoto.c +++ b/programs/Xserver/XIE/mixie/export/mephoto.c @@ -1,10 +1,14 @@ -/* $Xorg: mephoto.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: mephoto.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module mephoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean && Ben - various additions to handle different techniques *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mephoto.c,v 3.4 1998/10/25 07:11:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mephoto.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MEPHOTO #define _XIEC_EPHOTO diff --git a/programs/Xserver/XIE/mixie/export/meroi.c b/programs/Xserver/XIE/mixie/export/meroi.c index 614f50cbf..20d3c87d8 100644 --- a/programs/Xserver/XIE/mixie/export/meroi.c +++ b/programs/Xserver/XIE/mixie/export/meroi.c @@ -1,10 +1,14 @@ -/* $Xorg: meroi.c,v 1.3 2000/08/17 19:47:35 cpqbld Exp $ */ +/* $Xorg: meroi.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module meroi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meroi.c,v 3.4 1998/10/25 07:11:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meroi.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MEROI diff --git a/programs/Xserver/XIE/mixie/export/meuncomp.c b/programs/Xserver/XIE/mixie/export/meuncomp.c index a9956f00a..82eeebd4d 100644 --- a/programs/Xserver/XIE/mixie/export/meuncomp.c +++ b/programs/Xserver/XIE/mixie/export/meuncomp.c @@ -1,10 +1,14 @@ -/* $Xorg: meuncomp.c,v 1.3 2000/08/17 19:47:36 cpqbld Exp $ */ +/* $Xorg: meuncomp.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module meuncomp.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. October 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meuncomp.c,v 1.4 1998/10/25 07:11:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meuncomp.c,v 1.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_MEUNCOMP diff --git a/programs/Xserver/XIE/mixie/export/schoice.c b/programs/Xserver/XIE/mixie/export/schoice.c index 0f6a49451..288aabcb7 100644 --- a/programs/Xserver/XIE/mixie/export/schoice.c +++ b/programs/Xserver/XIE/mixie/export/schoice.c @@ -1,10 +1,14 @@ -/* $Xorg: schoice.c,v 1.3 2000/08/17 19:47:36 cpqbld Exp $ */ +/* $Xorg: schoice.c,v 1.4 2001/02/09 02:04:24 xorgcvs Exp $ */ /**** module schoice.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -64,7 +68,7 @@ terms and conditions: Dean Verheiden && Robert NC Shelley AGE Logic, Inc. Jan 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/schoice.c,v 3.4 1998/10/25 07:11:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/schoice.c,v 3.5 2001/01/17 22:13:02 dawes Exp $ */ #define _XIEC_SCHOICE #define _XIEC_IPHOTO diff --git a/programs/Xserver/XIE/mixie/fax/bits.h b/programs/Xserver/XIE/mixie/fax/bits.h index 84f419cd0..121ebf84f 100644 --- a/programs/Xserver/XIE/mixie/fax/bits.h +++ b/programs/Xserver/XIE/mixie/fax/bits.h @@ -1,15 +1,15 @@ -/* $XConsortium: bits.h,v 1.5 94/04/17 20:34:26 rws Exp $ */ +/* $Xorg: bits.h,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module fax/bits.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +17,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. -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. NOTICE @@ -100,6 +100,7 @@ terms and conditions: nbits = _WhiteFaxTable[code].n_bits; \ makeup = _WhiteFaxTable[code].makeup; \ if (rl == BAD_RUN_LENGTH) { \ + length_acc = 0; \ if (!code) { \ /* could just be fill bits, try to recover */ \ goal = FAX_GOAL_RecoverZero; \ @@ -131,6 +132,7 @@ terms and conditions: nbits = _BlackFaxTable[code].n_bits; \ makeup = _BlackFaxTable[code].makeup; \ if (rl == BAD_RUN_LENGTH) { \ + length_acc = 0; \ if (!code) { \ /* could just be fill bits, will try to recover */ \ goal = FAX_GOAL_RecoverZero; \ diff --git a/programs/Xserver/XIE/mixie/fax/dg31d.c b/programs/Xserver/XIE/mixie/fax/dg31d.c index e27c81ebd..930a81acc 100644 --- a/programs/Xserver/XIE/mixie/fax/dg31d.c +++ b/programs/Xserver/XIE/mixie/fax/dg31d.c @@ -1,15 +1,14 @@ -/* $XConsortium: dg31d.c,v 1.5 94/04/17 20:34:26 rws Exp $ */ +/* $Xorg: dg31d.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module fax/dg31d.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/dg32d.c b/programs/Xserver/XIE/mixie/fax/dg32d.c index 83bf6b5e4..3fb0b7e2b 100644 --- a/programs/Xserver/XIE/mixie/fax/dg32d.c +++ b/programs/Xserver/XIE/mixie/fax/dg32d.c @@ -1,15 +1,15 @@ -/* $XConsortium: dg32d.c,v 1.5 94/04/17 20:34:27 rws Exp $ */ +/* $Xorg: dg32d.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module fax/dg32d.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +17,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. -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. NOTICE @@ -269,7 +269,7 @@ int code,nbits; case FAX_GOAL_FoundOneEOL: /* found an EOL. If this is RTC, there will be five more EOL's */ - /* one the way. If this is a normal EOL, next code will not */ + /* on the way. If this is a normal EOL, next code will not */ /* be an EOL, and we should interpret the next bit as tag bit */ @@ -331,21 +331,8 @@ int code,nbits; goal = FAX_GOAL_SeekEOLandTag; break; } - - if (goal == FAX_GOAL_RecoverZero) { - /* it's possible we got here by reading a zero in get_a0a1, */ - /* in which case 'goal' was set to FAX_GOAL_RecoverZero. We */ - /* must assume that the zero is an EOL pre-padded with a */ - /* variable number of zeros, which is legal according to */ - /* the coding spec. So we will record the increment in */ - /* line number and then attempt to recover. */ - FlushLineData(); - goal = FAX_GOAL_SkipPastAnyToEOL; - break; - /* break out of the switch, loop with the while */ - } - - if (rl == EOL_RUN_LENGTH) { +#if defined(lenient_decoder) + if (rl < 0) { FlushLineData(); goal = FAX_GOAL_SeekTagBit; /* if we got a non-zero length, remember the transition */ @@ -359,6 +346,22 @@ int code,nbits; break; /* break out of the switch, loop with the while */ } +#else /* not so lenient */ + if (goal == FAX_GOAL_RecoverZero) { + /* it's possible we got here by reading a zero in get_a0a1, */ + /* in which case 'goal' was set to FAX_GOAL_RecoverZero. We */ + /* must assume that the zero is an EOL pre-padded with a */ + /* variable number of zeros, which is legal according to */ + /* the coding spec. So we will record the increment in */ + /* line number and then attempt to recover. */ + FlushLineData(); + goal = FAX_GOAL_SkipPastAnyToEOL; + break; + } else if(rl == BAD_RUN_LENGTH) { + state->decoder_done = FAX_DECODE_DONE_ErrorBada0a1; + return(lines_found); + } +#endif length_acc=0; goal = FAX_GOAL_AccumulateA1A2; /* in case I run out of data while getting a1-a2 distance */ @@ -375,11 +378,16 @@ int code,nbits; case FAX_GOAL_FinishHoriz: a1a2 = length_acc; - /* XXX - I may regret not checking for a1a2 > 0 later... */ new_trans[n_new_trans] = a0_pos = new_trans[n_new_trans-1]+a1a2; n_new_trans++; - +#if defined(lenient_decoder) + if (rl < 0) { + FlushLineData(); + goal = FAX_GOAL_SeekTagBit; + break; + } +#else /* not so lenient */ /* it's possible we got here by reading a zero in get_a1a2, */ /* in which case 'goal' was set to FAX_GOAL_RecoverZero. We */ /* must assume that the zero is an EOL pre-padded with a */ @@ -391,12 +399,11 @@ int code,nbits; FlushLineData(); goal = FAX_GOAL_SkipPastAnyToEOL; break; + } else if(rl == BAD_RUN_LENGTH) { + state->decoder_done = FAX_DECODE_DONE_ErrorBada1a2; + return(lines_found); } - if (rl == EOL_RUN_LENGTH) { - FlushLineData(); - goal = FAX_GOAL_SeekTagBit; - break; - } +#endif if (a0_pos >= width) { if (a0_pos > width) { #if defined(lenient_decoder) @@ -410,12 +417,14 @@ int code,nbits; FlushLineData(); goal = FAX_GOAL_SeekEOLandTag; break; - } - else { + } else if(a0_pos > 0) { if (g32d_horiz) goal = FAX_GOAL_HandleHoriz; else goal = FAX_GOAL_DetermineMode; + } else { + state->decoder_done = FAX_DECODE_DONE_ErrorBadA0pos; + return(lines_found); } break; @@ -426,14 +435,11 @@ int code,nbits; find_b2pos(a0_pos,a0_color,n_old_trans,old_trans); a0_pos = b2_pos; - if (a0_pos < 0) { + if (a0_pos < 0 || a0_pos >= width) { FlushLineData(); goal = FAX_GOAL_SeekEOLandTag; break; } - if (a0_pos >= width) { - return(-1); - } goal = FAX_GOAL_DetermineMode; break; @@ -453,27 +459,22 @@ int code,nbits; } b1_pos = width; } - /* ok, we are guaranteed that 0 <= b1_pos <= width */ - /* set a0_pos = a1_pos, which is relative to b1_pos */ - a0_pos = b1_pos + (goal-FAX_GOAL_HandleVert0); - a0_color = 1-a0_color; - if (a0_pos >= width) { - FlushLineData(); - goal = FAX_GOAL_SeekEOLandTag; - } - else { - /* not at eol yet */ - goal = FAX_GOAL_DetermineMode; - new_trans[n_new_trans++] = a0_pos; - } - } - else { + } else { /* line above was all white. Since b1 was first non-white */ - /* b1 is imaginary transition off right edge. In other */ - /* words, there are no more transitions! Done with line */ - + /* b1 is imaginary transition off right edge. */ + b1_pos = width; + } + /* ok, we are guaranteed that 0 <= b1_pos <= width */ + /* set a0_pos = a1_pos, which is relative to b1_pos */ + a0_pos = b1_pos + (goal-FAX_GOAL_HandleVert0); + a0_color = 1-a0_color; + new_trans[n_new_trans++] = a0_pos > 0 ? a0_pos : 0; + if (a0_pos < 0 || a0_pos >= width) { FlushLineData(); goal = FAX_GOAL_SeekEOLandTag; + } else { + /* not at eol yet */ + goal = FAX_GOAL_DetermineMode; } break; diff --git a/programs/Xserver/XIE/mixie/fax/dg4.c b/programs/Xserver/XIE/mixie/fax/dg4.c index 573368a5e..9e159257d 100644 --- a/programs/Xserver/XIE/mixie/fax/dg4.c +++ b/programs/Xserver/XIE/mixie/fax/dg4.c @@ -1,15 +1,15 @@ -/* $XConsortium: dg4.c,v 1.4 94/04/17 20:34:28 rws Exp $ */ +/* $Xorg: dg4.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module fax/g4.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994,1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +17,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. -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. NOTICE @@ -256,27 +256,23 @@ int rl; } b1_pos = width; } - /* ok, we are guaranteed that 0 <= b1_pos <= width */ - /* set a0_pos = a1_pos, which is relative to b1_pos */ - a0_pos = b1_pos + (goal-FAX_GOAL_HandleVert0); - a0_color = 1-a0_color; - if (a0_pos >= width) { - FlushLineData(); - goal = FAX_GOAL_StartNewLine; - } - else { - /* not at eol yet */ - goal = FAX_GOAL_DetermineMode; - new_trans[n_new_trans++] = a0_pos; - } - } - else { + } else { /* line above was all white. Since b1 was first non-white */ - /* b1 is imaginary transition off right edge. In other */ - /* words, there are no more transitions! Done with line */ - - FlushLineData(); - goal = FAX_GOAL_StartNewLine; + /* b1 is imaginary transition off right edge. */ + b1_pos = width; + } + /* ok, we are guaranteed that 0 <= b1_pos <= width */ + /* set a0_pos = a1_pos, which is relative to b1_pos */ + a0_pos = b1_pos + (goal-FAX_GOAL_HandleVert0); + a0_color = 1-a0_color; + new_trans[n_new_trans++] = a0_pos > 0 ? a0_pos : 0; + if (a0_pos >= width) { + FlushLineData(); + goal = FAX_GOAL_StartNewLine; + } + else { + /* not at eol yet */ + goal = FAX_GOAL_DetermineMode; } break; diff --git a/programs/Xserver/XIE/mixie/fax/dtiff2.c b/programs/Xserver/XIE/mixie/fax/dtiff2.c index 0423a6d1d..ad2a3e68e 100644 --- a/programs/Xserver/XIE/mixie/fax/dtiff2.c +++ b/programs/Xserver/XIE/mixie/fax/dtiff2.c @@ -1,15 +1,14 @@ -/* $XConsortium: dtiff2.c,v 1.3 94/04/17 20:34:28 rws Exp $ */ +/* $Xorg: dtiff2.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module fax/dtiff2.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/dtiffpb.c b/programs/Xserver/XIE/mixie/fax/dtiffpb.c index f6e51fe5e..f4986e50a 100644 --- a/programs/Xserver/XIE/mixie/fax/dtiffpb.c +++ b/programs/Xserver/XIE/mixie/fax/dtiffpb.c @@ -1,15 +1,15 @@ -/* $XConsortium: dtiffpb.c,v 1.3 94/04/17 20:34:29 rws Exp $ */ +/* $Xorg: dtiffpb.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module fax/tiffpb.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +17,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. -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. NOTICE @@ -87,13 +87,10 @@ terms and conditions: #include "fax.h" #include "faxint.h" #include "bits.h" - -#include <servermd.h> - /* pick up the BITMAP_BIT_ORDER from Core X*/ +#include "xiemd.h" /* by decree of PackBits spec */ - /**********************************************************************/ int decode_tiffpb(state) FaxState *state; @@ -193,14 +190,20 @@ if code && 0x80 => -128 <= code < 0 The positive case is even easier. ***/ + if (byteptr >= endptr) { + state->magic_needs = 1; + state->strip_state = StripStateDone; + save_state_and_return(state); + } if (*byteptr & 0x80) { /* -128 <= code < 0 */ register int foo = 0x7f & *byteptr; if (foo) { length_acc = 129 - foo ; goal = PB_GOAL_GetRepeatByte; } - else + else { length_acc = 0; /* -128 => code = 0 */ + } } else { /* 0 <= code <= 127 */ length_acc = 1 + *byteptr; @@ -213,11 +216,6 @@ The positive case is even easier. state->decoder_done = FAX_DECODE_DONE_ErrorPastWidth; save_state_and_return(state); } - if (byteptr >= endptr) { - state->magic_needs = 1; - state->strip_state = StripStateDone; - save_state_and_return(state); - } break; case PB_GOAL_GetLiteralBytes: @@ -228,26 +226,37 @@ The positive case is even easier. to save state and return. */ a0_in_bytes = a0_pos / 8; - while (length_acc-- > 0) { - a0_color = *byteptr++; - olp[a0_in_bytes++] = a0_color; + while (length_acc > 0) { if (byteptr >= endptr) { a0_pos = a0_in_bytes << 3; state->magic_needs = 1; state->strip_state = StripStateDone; save_state_and_return(state); } + a0_color = *byteptr++; length_acc--; +#if (IMAGE_BYTE_ORDER == MSBFirst) + olp[a0_in_bytes++] = a0_color; +#else + olp[a0_in_bytes++] = _ByteReverseTable[a0_color]; +#endif } a0_pos = a0_in_bytes << 3; + if (a0_pos >= width) { ++lines_found; goal = PB_GOAL_StartNewLine; } else goal = PB_GOAL_GetRunLength; + break; case PB_GOAL_GetRepeatByte: + if (byteptr >= endptr) { + state->magic_needs = 1; + state->strip_state = StripStateDone; + save_state_and_return(state); + } a0_color = *byteptr++; /* Important Note!! we are guaranteed that output line @@ -257,7 +266,11 @@ The positive case is even easier. a0_in_bytes = a0_pos / 8; for (i=0; i<length_acc; ++i) +#if (IMAGE_BYTE_ORDER == MSBFirst) olp[a0_in_bytes+i] = a0_color; +#else + olp[a0_in_bytes+i] = _ByteReverseTable[a0_color]; +#endif a0_pos += 8*length_acc; if (a0_pos >= width) { @@ -267,11 +280,6 @@ The positive case is even easier. else goal = PB_GOAL_GetRunLength; - if (byteptr >= endptr) { - state->magic_needs = 1; - state->strip_state = StripStateDone; - save_state_and_return(state); - } break; default: @@ -280,4 +288,5 @@ The positive case is even easier. } /* end of switch */ } /* end of main decoding loop */ } + /**** module fax/tiffpb.c ****/ diff --git a/programs/Xserver/XIE/mixie/fax/eg31d.c b/programs/Xserver/XIE/mixie/fax/eg31d.c index 0f8110689..6caf289d6 100644 --- a/programs/Xserver/XIE/mixie/fax/eg31d.c +++ b/programs/Xserver/XIE/mixie/fax/eg31d.c @@ -1,15 +1,14 @@ -/* $XConsortium: eg31d.c,v 1.3 94/04/17 20:34:30 rws Exp $ */ +/* $Xorg: eg31d.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module eg31d.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/eg32d.c b/programs/Xserver/XIE/mixie/fax/eg32d.c index b322dbae8..e704caed1 100644 --- a/programs/Xserver/XIE/mixie/fax/eg32d.c +++ b/programs/Xserver/XIE/mixie/fax/eg32d.c @@ -1,15 +1,14 @@ -/* $XConsortium: eg32d.c,v 1.3 94/04/17 20:34:30 rws Exp $ */ +/* $Xorg: eg32d.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module eg32d.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/etiff2.c b/programs/Xserver/XIE/mixie/fax/etiff2.c index c6ca3a8dc..328e3fa45 100644 --- a/programs/Xserver/XIE/mixie/fax/etiff2.c +++ b/programs/Xserver/XIE/mixie/fax/etiff2.c @@ -1,15 +1,14 @@ -/* $XConsortium: etiff2.c,v 1.3 94/04/17 20:34:31 rws Exp $ */ +/* $Xorg: etiff2.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module etiff2.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/etiffpb.c b/programs/Xserver/XIE/mixie/fax/etiffpb.c index 0db6470c2..82b54e255 100644 --- a/programs/Xserver/XIE/mixie/fax/etiffpb.c +++ b/programs/Xserver/XIE/mixie/fax/etiffpb.c @@ -1,15 +1,15 @@ -/* $XConsortium: etiffpb.c,v 1.3 94/04/17 20:34:31 rws Exp $ */ +/* $Xorg: etiffpb.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module etiffpb.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994,1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +17,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. -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. NOTICE @@ -76,6 +76,7 @@ terms and conditions: #include "fax.h" #define _PBits #include "fencode.h" +#include "xiemd.h" /************************************************************************/ encode_tiffpb(state) @@ -163,13 +164,22 @@ register int bytes_out; ibptr = (unsigned char *) state->i_lines[lines_coded]; ebptr = ibptr+(width+7)/8; +#if (IMAGE_BYTE_ORDER == MSBFirst) color0 = *ibptr++; +#else + color0 = _ByteReverseTable[*ibptr++]; +#endif n_reps = 1; nvals = 0; epvt->values[nvals] = color0; while (ibptr < ebptr) { - color1 = *ibptr++; if (color1 == color0) ++n_reps; +#if (IMAGE_BYTE_ORDER == MSBFirst) + color1 = *ibptr++; +#else + color1 = _ByteReverseTable[*ibptr++]; +#endif + if (color1 == color0) ++n_reps; else { epvt->counts[nvals++] = n_reps; color0 = color1; diff --git a/programs/Xserver/XIE/mixie/fax/faxint.h b/programs/Xserver/XIE/mixie/fax/faxint.h index 0a41a9140..d2ed55047 100644 --- a/programs/Xserver/XIE/mixie/fax/faxint.h +++ b/programs/Xserver/XIE/mixie/fax/faxint.h @@ -1,15 +1,14 @@ -/* $XConsortium: faxint.h,v 1.4 94/04/17 20:34:32 rws Exp $ */ +/* $Xorg: faxint.h,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module fax/faxint.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/faxtabs.c b/programs/Xserver/XIE/mixie/fax/faxtabs.c index 3c81d0a7a..d7acf0f6f 100644 --- a/programs/Xserver/XIE/mixie/fax/faxtabs.c +++ b/programs/Xserver/XIE/mixie/fax/faxtabs.c @@ -1,15 +1,14 @@ -/* $XConsortium: faxtabs.c,v 1.5 94/04/17 20:34:32 rws Exp $ */ +/* $Xorg: faxtabs.c,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module fax/faxtabs.c ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/faxtabs.h b/programs/Xserver/XIE/mixie/fax/faxtabs.h index 1d35b0800..efd9c2c1f 100644 --- a/programs/Xserver/XIE/mixie/fax/faxtabs.h +++ b/programs/Xserver/XIE/mixie/fax/faxtabs.h @@ -1,15 +1,14 @@ -/* $XConsortium: faxtabs.h,v 1.4 94/04/17 20:34:37 rws Exp $ */ +/* $Xorg: faxtabs.h,v 1.4 2001/02/09 02:04:25 xorgcvs Exp $ */ /**** module fax/bits.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/fencode.h b/programs/Xserver/XIE/mixie/fax/fencode.h index d654942ac..4d255654e 100644 --- a/programs/Xserver/XIE/mixie/fax/fencode.h +++ b/programs/Xserver/XIE/mixie/fax/fencode.h @@ -1,15 +1,14 @@ -/* $XConsortium: fencode.h,v 1.4 94/04/17 20:34:45 rws Exp $ */ +/* $Xorg: fencode.h,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module fencode.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/fetabs.h b/programs/Xserver/XIE/mixie/fax/fetabs.h index f03c15677..627803c19 100644 --- a/programs/Xserver/XIE/mixie/fax/fetabs.h +++ b/programs/Xserver/XIE/mixie/fax/fetabs.h @@ -1,15 +1,14 @@ -/* $XConsortium: fetabs.h,v 1.3 94/04/17 20:34:46 rws Exp $ */ +/* $Xorg: fetabs.h,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module fetabs.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/gbits.h b/programs/Xserver/XIE/mixie/fax/gbits.h index b3c2f2f26..ec48cc3f1 100644 --- a/programs/Xserver/XIE/mixie/fax/gbits.h +++ b/programs/Xserver/XIE/mixie/fax/gbits.h @@ -1,15 +1,14 @@ -/* $XConsortium: gbits.h,v 1.4 94/04/17 20:34:47 rws Exp $ */ +/* $Xorg: gbits.h,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module fax/gbits.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/fax/zeroeven.c b/programs/Xserver/XIE/mixie/fax/zeroeven.c index 545993836..76c3707a1 100644 --- a/programs/Xserver/XIE/mixie/fax/zeroeven.c +++ b/programs/Xserver/XIE/mixie/fax/zeroeven.c @@ -1,10 +1,14 @@ -/* $Xorg: zeroeven.c,v 1.3 2000/08/17 19:47:44 cpqbld Exp $ */ +/* $Xorg: zeroeven.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module fax/zeroeven.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/XIE/mixie/import/miclut.c b/programs/Xserver/XIE/mixie/import/miclut.c index 26a6a5410..28fe56db2 100644 --- a/programs/Xserver/XIE/mixie/import/miclut.c +++ b/programs/Xserver/XIE/mixie/import/miclut.c @@ -1,10 +1,14 @@ -/* $Xorg: miclut.c,v 1.3 2000/08/17 19:47:44 cpqbld Exp $ */ +/* $Xorg: miclut.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module miclut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miclut.c,v 3.4 1998/10/25 07:11:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miclut.c,v 3.5 2001/01/17 22:13:04 dawes Exp $ */ #define _XIEC_MICLUT #define _XIEC_ICLUT diff --git a/programs/Xserver/XIE/mixie/import/micphoto.c b/programs/Xserver/XIE/mixie/import/micphoto.c index 46144c4cf..335782580 100644 --- a/programs/Xserver/XIE/mixie/import/micphoto.c +++ b/programs/Xserver/XIE/mixie/import/micphoto.c @@ -1,10 +1,14 @@ -/* $Xorg: micphoto.c,v 1.3 2000/08/17 19:47:44 cpqbld Exp $ */ +/* $Xorg: micphoto.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module micphoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -68,7 +72,7 @@ terms and conditions: Fax stuff added by Ben Fahy *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/micphoto.c,v 3.3 1998/10/05 13:22:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/micphoto.c,v 3.4 2001/01/17 22:13:04 dawes Exp $ */ #define _XIEC_MICPHOTO #define _XIEC_ICPHOTO diff --git a/programs/Xserver/XIE/mixie/import/microi.c b/programs/Xserver/XIE/mixie/import/microi.c index 2544fcd00..31a6742a4 100644 --- a/programs/Xserver/XIE/mixie/import/microi.c +++ b/programs/Xserver/XIE/mixie/import/microi.c @@ -1,11 +1,15 @@ -/* $Xorg: microi.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: microi.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module microi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/microi.c,v 3.3 1998/10/05 13:22:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/microi.c,v 3.4 2001/01/17 22:13:04 dawes Exp $ */ #define _XIEC_MICROI diff --git a/programs/Xserver/XIE/mixie/import/midraw.c b/programs/Xserver/XIE/mixie/import/midraw.c index 168899602..cb674c4f7 100644 --- a/programs/Xserver/XIE/mixie/import/midraw.c +++ b/programs/Xserver/XIE/mixie/import/midraw.c @@ -1,10 +1,14 @@ -/* $Xorg: midraw.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: midraw.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module midraw.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/midraw.c,v 3.4 1999/09/25 14:36:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/midraw.c,v 3.5 2001/01/17 22:13:04 dawes Exp $ */ #define _XIEC_IDRAW #define _XIEC_MIDRAW diff --git a/programs/Xserver/XIE/mixie/import/mifax.c b/programs/Xserver/XIE/mixie/import/mifax.c index 8ab18e64f..7bf72d18c 100644 --- a/programs/Xserver/XIE/mixie/import/mifax.c +++ b/programs/Xserver/XIE/mixie/import/mifax.c @@ -1,11 +1,15 @@ -/* $Xorg: mifax.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: mifax.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module mifax.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mifax.c,v 3.3 1998/10/05 13:22:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mifax.c,v 3.4 2001/01/17 22:13:05 dawes Exp $ */ #define _XIEC_MICPHOTO #define _XIEC_ICPHOTO diff --git a/programs/Xserver/XIE/mixie/import/mijpeg.c b/programs/Xserver/XIE/mixie/import/mijpeg.c index 93e31651a..1c50209ed 100644 --- a/programs/Xserver/XIE/mixie/import/mijpeg.c +++ b/programs/Xserver/XIE/mixie/import/mijpeg.c @@ -1,9 +1,13 @@ -/* $Xorg: mijpeg.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: mijpeg.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module mijpeg.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -68,7 +72,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. Oct, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mijpeg.c,v 3.5 1999/01/31 12:21:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mijpeg.c,v 3.6 2001/01/17 22:13:05 dawes Exp $ */ #define _XIEC_MIPHOTO #define _XIEC_IPHOTO diff --git a/programs/Xserver/XIE/mixie/import/milut.c b/programs/Xserver/XIE/mixie/import/milut.c index 1a8465cb4..ea368dda1 100644 --- a/programs/Xserver/XIE/mixie/import/milut.c +++ b/programs/Xserver/XIE/mixie/import/milut.c @@ -1,10 +1,14 @@ -/* $Xorg: milut.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: milut.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module milut.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/milut.c,v 3.3 1998/10/05 13:22:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/milut.c,v 3.4 2001/01/17 22:13:05 dawes Exp $ */ #define _XIEC_ILUT #define _XIEC_MILUT diff --git a/programs/Xserver/XIE/mixie/import/miphoto.c b/programs/Xserver/XIE/mixie/import/miphoto.c index 87c1c338e..2657e5da7 100644 --- a/programs/Xserver/XIE/mixie/import/miphoto.c +++ b/programs/Xserver/XIE/mixie/import/miphoto.c @@ -1,10 +1,14 @@ -/* $Xorg: miphoto.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: miphoto.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module miphoto.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miphoto.c,v 3.3 1998/10/05 13:22:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miphoto.c,v 3.4 2001/01/17 22:13:05 dawes Exp $ */ #define _XIEC_MIPHOTO #define _XIEC_IPHOTO diff --git a/programs/Xserver/XIE/mixie/import/miregion.c b/programs/Xserver/XIE/mixie/import/miregion.c index e1eee775f..3694a2677 100644 --- a/programs/Xserver/XIE/mixie/import/miregion.c +++ b/programs/Xserver/XIE/mixie/import/miregion.c @@ -4,7 +4,11 @@ Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -117,7 +121,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miregion.c,v 3.5 1999/01/31 12:21:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miregion.c,v 3.6 2001/01/17 22:13:05 dawes Exp $ */ #define _XIEC_MIREGION diff --git a/programs/Xserver/XIE/mixie/import/miroi.c b/programs/Xserver/XIE/mixie/import/miroi.c index d3b9aa4f3..334e42453 100644 --- a/programs/Xserver/XIE/mixie/import/miroi.c +++ b/programs/Xserver/XIE/mixie/import/miroi.c @@ -1,10 +1,14 @@ -/* $Xorg: miroi.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: miroi.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module miroi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miroi.c,v 3.3 1998/10/05 13:22:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miroi.c,v 3.4 2001/01/17 22:13:05 dawes Exp $ */ #define _XIEC_MIROI #define _XIEC_IROI diff --git a/programs/Xserver/XIE/mixie/import/miuncomp.c b/programs/Xserver/XIE/mixie/import/miuncomp.c index c558c2816..f4a06e70d 100644 --- a/programs/Xserver/XIE/mixie/import/miuncomp.c +++ b/programs/Xserver/XIE/mixie/import/miuncomp.c @@ -1,10 +1,14 @@ -/* $Xorg: miuncomp.c,v 1.3 2000/08/17 19:47:45 cpqbld Exp $ */ +/* $Xorg: miuncomp.c,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module miuncomp.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. September 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miuncomp.c,v 1.4 1998/10/25 07:11:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miuncomp.c,v 1.5 2001/01/17 22:13:05 dawes Exp $ */ #define _XIEC_MIUNCOMP diff --git a/programs/Xserver/XIE/mixie/include/domain.h b/programs/Xserver/XIE/mixie/include/domain.h index ccc6a71ff..7b958466b 100644 --- a/programs/Xserver/XIE/mixie/include/domain.h +++ b/programs/Xserver/XIE/mixie/include/domain.h @@ -1,10 +1,14 @@ -/* $Xorg: domain.h,v 1.3 2000/08/17 19:47:46 cpqbld Exp $ */ +/* $Xorg: domain.h,v 1.4 2001/02/09 02:04:27 xorgcvs Exp $ */ /**** module domain.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/domain.h,v 1.3 1998/10/25 12:47:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/include/domain.h,v 1.4 2001/01/17 22:13:06 dawes Exp $ */ #ifndef _XIEH_DOMAIN diff --git a/programs/Xserver/XIE/mixie/include/fax.h b/programs/Xserver/XIE/mixie/include/fax.h index 8792c1ac9..9747da2f6 100644 --- a/programs/Xserver/XIE/mixie/include/fax.h +++ b/programs/Xserver/XIE/mixie/include/fax.h @@ -1,10 +1,14 @@ -/* $Xorg: fax.h,v 1.3 2000/08/17 19:47:46 cpqbld Exp $ */ +/* $Xorg: fax.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module fax.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/fax.h,v 1.2 1998/10/05 13:22:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/include/fax.h,v 1.3 2001/01/17 22:13:06 dawes Exp $ */ #ifndef XFree86LOADER #include <stdio.h> diff --git a/programs/Xserver/XIE/mixie/include/floman.h b/programs/Xserver/XIE/mixie/include/floman.h index 3b299a441..512954ff5 100644 --- a/programs/Xserver/XIE/mixie/include/floman.h +++ b/programs/Xserver/XIE/mixie/include/floman.h @@ -1,15 +1,14 @@ -/* $XConsortium: floman.h,v 1.4 94/04/17 20:34:59 rws Exp $ */ +/* $Xorg: floman.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module floman.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/jpeg.h b/programs/Xserver/XIE/mixie/include/jpeg.h index 69d63f6d9..b60bc6a56 100644 --- a/programs/Xserver/XIE/mixie/include/jpeg.h +++ b/programs/Xserver/XIE/mixie/include/jpeg.h @@ -1,14 +1,13 @@ -/* $XConsortium: jpeg.h,v 1.3 94/04/17 20:35:00 rws Exp $ */ +/* $Xorg: jpeg.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/jpegd.h b/programs/Xserver/XIE/mixie/include/jpegd.h index 42d237da7..5ec9322c4 100644 --- a/programs/Xserver/XIE/mixie/include/jpegd.h +++ b/programs/Xserver/XIE/mixie/include/jpegd.h @@ -1,14 +1,13 @@ -/* $XConsortium: jpegd.h,v 1.3 94/04/17 20:35:00 rws Exp $ */ +/* $Xorg: jpegd.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/jpege.h b/programs/Xserver/XIE/mixie/include/jpege.h index 232ab1b7e..b0014184f 100644 --- a/programs/Xserver/XIE/mixie/include/jpege.h +++ b/programs/Xserver/XIE/mixie/include/jpege.h @@ -1,14 +1,13 @@ -/* $XConsortium: jpege.h,v 1.3 94/04/17 20:35:01 rws Exp $ */ +/* $Xorg: jpege.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/meuncomp.h b/programs/Xserver/XIE/mixie/include/meuncomp.h index 3969a76c1..79e975001 100644 --- a/programs/Xserver/XIE/mixie/include/meuncomp.h +++ b/programs/Xserver/XIE/mixie/include/meuncomp.h @@ -1,10 +1,14 @@ -/* $Xorg: meuncomp.h,v 1.3 2000/08/17 19:47:46 cpqbld Exp $ */ +/* $Xorg: meuncomp.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module miuncomp.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. October 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/meuncomp.h,v 1.3 1998/10/25 12:47:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/include/meuncomp.h,v 1.4 2001/01/17 22:13:06 dawes Exp $ */ typedef struct _meuncompdef { void (*action)(); diff --git a/programs/Xserver/XIE/mixie/include/microi.h b/programs/Xserver/XIE/mixie/include/microi.h index 2819bee8d..dca06fe63 100644 --- a/programs/Xserver/XIE/mixie/include/microi.h +++ b/programs/Xserver/XIE/mixie/include/microi.h @@ -1,15 +1,14 @@ -/* $XConsortium: microi.h,v 1.4 94/04/17 20:35:02 rws Exp $ */ +/* $Xorg: microi.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module microi.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/miphoto.h b/programs/Xserver/XIE/mixie/include/miphoto.h index 3bfe11511..49891292c 100644 --- a/programs/Xserver/XIE/mixie/include/miphoto.h +++ b/programs/Xserver/XIE/mixie/include/miphoto.h @@ -1,15 +1,14 @@ -/* $XConsortium: miphoto.h,v 1.4 94/04/17 20:35:02 rws Exp $ */ +/* $Xorg: miphoto.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module miphoto.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/miuncomp.h b/programs/Xserver/XIE/mixie/include/miuncomp.h index 5af64222f..a012fb91b 100644 --- a/programs/Xserver/XIE/mixie/include/miuncomp.h +++ b/programs/Xserver/XIE/mixie/include/miuncomp.h @@ -1,10 +1,14 @@ -/* $Xorg: miuncomp.h,v 1.3 2000/08/17 19:47:46 cpqbld Exp $ */ +/* $Xorg: miuncomp.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module miuncomp.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. September 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/miuncomp.h,v 1.3 1998/10/25 12:47:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/include/miuncomp.h,v 1.4 2001/01/17 22:13:07 dawes Exp $ */ #define MIUNCOMP_BP_ARGS \ BytePixel *src, \ diff --git a/programs/Xserver/XIE/mixie/include/mpgeom.h b/programs/Xserver/XIE/mixie/include/mpgeom.h index 9c3a6184e..b703f87b4 100644 --- a/programs/Xserver/XIE/mixie/include/mpgeom.h +++ b/programs/Xserver/XIE/mixie/include/mpgeom.h @@ -1,15 +1,14 @@ -/* $XConsortium: mpgeom.h,v 1.5 94/04/17 20:35:03 rws Exp $ */ +/* $Xorg: mpgeom.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module mpgeom.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/mppoint.h b/programs/Xserver/XIE/mixie/include/mppoint.h index 6fe25eb16..33e8e13dc 100644 --- a/programs/Xserver/XIE/mixie/include/mppoint.h +++ b/programs/Xserver/XIE/mixie/include/mppoint.h @@ -1,15 +1,14 @@ -/* $XConsortium: mppoint.h,v 1.4 94/04/17 20:35:04 rws Exp $ */ +/* $Xorg: mppoint.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module mppoint.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/sched.h b/programs/Xserver/XIE/mixie/include/sched.h index 3a7bcd8d4..8826defcf 100644 --- a/programs/Xserver/XIE/mixie/include/sched.h +++ b/programs/Xserver/XIE/mixie/include/sched.h @@ -1,10 +1,14 @@ -/* $Xorg: sched.h,v 1.3 2000/08/17 19:47:46 cpqbld Exp $ */ +/* $Xorg: sched.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module sched.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. May 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/sched.h,v 1.3 1998/10/25 12:47:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/include/sched.h,v 1.4 2001/01/17 22:13:07 dawes Exp $ */ #ifndef _XIEH_SCHED #define _XIEH_SCHED diff --git a/programs/Xserver/XIE/mixie/include/strip.h b/programs/Xserver/XIE/mixie/include/strip.h index 95904e109..82f44fb47 100644 --- a/programs/Xserver/XIE/mixie/include/strip.h +++ b/programs/Xserver/XIE/mixie/include/strip.h @@ -1,15 +1,14 @@ -/* $XConsortium: strip.h,v 1.5 94/04/17 20:35:05 rws Exp $ */ +/* $Xorg: strip.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module strip.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/include/tex.h b/programs/Xserver/XIE/mixie/include/tex.h index 4fdebdada..c2466affc 100644 --- a/programs/Xserver/XIE/mixie/include/tex.h +++ b/programs/Xserver/XIE/mixie/include/tex.h @@ -1,10 +1,14 @@ -/* $Xorg: tex.h,v 1.3 2000/08/17 19:47:46 cpqbld Exp $ */ +/* $Xorg: tex.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module tex.h ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/tex.h,v 1.3 1998/10/25 12:47:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/include/tex.h,v 1.4 2001/01/17 22:13:07 dawes Exp $ */ #ifndef _XIEH_TEX #define _XIEH_TEX diff --git a/programs/Xserver/XIE/mixie/include/texstr.h b/programs/Xserver/XIE/mixie/include/texstr.h index 2f39b1e15..ab60c6725 100644 --- a/programs/Xserver/XIE/mixie/include/texstr.h +++ b/programs/Xserver/XIE/mixie/include/texstr.h @@ -1,15 +1,14 @@ -/* $XConsortium: texstr.h,v 1.5 94/04/17 20:35:06 rws Exp $ */ +/* $Xorg: texstr.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /**** module texstr.h ****/ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. NOTICE @@ -142,8 +141,10 @@ typedef struct _petex { INT32 (*roiget)(); /* process domain run length function */ INT32 domXoff; /* processing domain x offset */ INT32 domYoff; /* processing domain y offset */ -/*receptorRec receptor[inCnt]; /* array of in-line input receptors */ -/*void private_info; /* in-line element-private data */ +#if 0 + receptorRec receptor[inCnt]; /* array of in-line input receptors */ + void private_info; /* in-line element-private data */ +#endif } peTexRec, *peTexPtr; #endif /* end _XIEH_TEXSTR */ diff --git a/programs/Xserver/XIE/mixie/include/xiemd.h b/programs/Xserver/XIE/mixie/include/xiemd.h index 0057590dd..599e97e13 100644 --- a/programs/Xserver/XIE/mixie/include/xiemd.h +++ b/programs/Xserver/XIE/mixie/include/xiemd.h @@ -1,15 +1,15 @@ -/* $XConsortium: xiemd.h,v 1.7 94/04/17 20:35:07 rws Exp $ */ +/* $Xorg: xiemd.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module xiemd.h ****/ /****************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +17,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. -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. NOTICE @@ -174,12 +174,7 @@ void bitshrink(); void action_clear(); void action_set(); void action_invert(); - -/* -** We envision a triangular matrix of conversion routines for -** indexing into smaller data quantums, such as to return a byte -** from an array as a short. -*/ +void zero_even(); /* ** Floating Point Considerations. @@ -214,6 +209,18 @@ void action_invert(); ** #define USE_FLOATS */ +/* +** SF_DITHER - use scaled fractions in floyd steinberg dither for byte +** and pair pixels; quad pixel operations are still done with floats. +** If you have software floating point, you will definitely want to turn +** this code on. Machines with an fpu generally perform at least as good +** with the floating point code. +** +** #define SF_DITHER +*/ +#if defined(_AM29K) || defined(__i960__) || defined(_LR33020_) || defined(gsp) +#define SF_DITHER +#endif #endif /* module _XIEH_MD */ diff --git a/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c b/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c index a3fec91f0..62bd92d29 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c +++ b/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c @@ -1,11 +1,15 @@ -/* $Xorg: jcdeflts.c,v 1.3 2000/08/17 19:47:46 cpqbld Exp $ */ +/* $Xorg: jcdeflts.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jcdeflts.c */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c,v 1.3 1998/10/04 09:36:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c,v 1.4 2001/01/17 22:13:07 dawes Exp $ */ /* * jcdeflts.c * diff --git a/programs/Xserver/XIE/mixie/jpeg/jcexpand.c b/programs/Xserver/XIE/mixie/jpeg/jcexpand.c index fafa54ece..3ed1e92a6 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jcexpand.c +++ b/programs/Xserver/XIE/mixie/jpeg/jcexpand.c @@ -1,16 +1,15 @@ -/* $XConsortium: jcexpand.c,v 1.4 94/04/17 20:35:28 rws Exp $ */ +/* $Xorg: jcexpand.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jcexpand.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jchuff.c b/programs/Xserver/XIE/mixie/jpeg/jchuff.c index cea34a4d5..595bfa0f2 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jchuff.c +++ b/programs/Xserver/XIE/mixie/jpeg/jchuff.c @@ -1,11 +1,15 @@ -/* $Xorg: jchuff.c,v 1.3 2000/08/17 19:47:47 cpqbld Exp $ */ +/* $Xorg: jchuff.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jchuff.c */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/XIE/mixie/jpeg/jcmcu.c b/programs/Xserver/XIE/mixie/jpeg/jcmcu.c index c97e92315..7512191c2 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jcmcu.c +++ b/programs/Xserver/XIE/mixie/jpeg/jcmcu.c @@ -1,16 +1,15 @@ -/* $XConsortium: jcmcu.c,v 1.4 94/04/17 20:35:29 rws Exp $ */ +/* $Xorg: jcmcu.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jcmcu.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jconfig.h b/programs/Xserver/XIE/mixie/jpeg/jconfig.h index fe3f52b04..9e223e6ff 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jconfig.h +++ b/programs/Xserver/XIE/mixie/jpeg/jconfig.h @@ -1,11 +1,15 @@ -/* $Xorg: jconfig.h,v 1.3 2000/08/17 19:47:47 cpqbld Exp $ */ +/* $Xorg: jconfig.h,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jconfig.h */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h,v 1.5 2000/09/19 12:46:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h,v 1.6 2001/01/17 22:13:08 dawes Exp $ */ /* * jconfig.h diff --git a/programs/Xserver/XIE/mixie/jpeg/jcsample.c b/programs/Xserver/XIE/mixie/jpeg/jcsample.c index 66a4a6e25..fb02448ac 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jcsample.c +++ b/programs/Xserver/XIE/mixie/jpeg/jcsample.c @@ -1,16 +1,15 @@ -/* $XConsortium: jcsample.c,v 1.4 94/04/17 20:35:31 rws Exp $ */ +/* $Xorg: jcsample.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jcsample.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jcxie.c b/programs/Xserver/XIE/mixie/jpeg/jcxie.c index c4afed0d0..dd4d6e1dc 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jcxie.c +++ b/programs/Xserver/XIE/mixie/jpeg/jcxie.c @@ -1,11 +1,15 @@ -/* $Xorg: jcxie.c,v 1.3 2000/08/17 19:47:47 cpqbld Exp $ */ +/* $Xorg: jcxie.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jcxie.c */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/XIE/mixie/jpeg/jcxief.c b/programs/Xserver/XIE/mixie/jpeg/jcxief.c index 2fcf08d68..6620ef1f1 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jcxief.c +++ b/programs/Xserver/XIE/mixie/jpeg/jcxief.c @@ -1,16 +1,15 @@ -/* $XConsortium: jcxief.c,v 1.4 94/04/17 20:35:32 rws Exp $ */ +/* $Xorg: jcxief.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jcxief.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c b/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c index f0b3c9892..8e9334d66 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c +++ b/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c @@ -1,11 +1,15 @@ -/* $Xorg: jdbuffer.c,v 1.3 2000/08/17 19:47:47 cpqbld Exp $ */ +/* $Xorg: jdbuffer.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /*** jdbuffer.c - transfer data from input strip to decode buffer */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/XIE/mixie/jpeg/jddeflts.c b/programs/Xserver/XIE/mixie/jpeg/jddeflts.c index 1a1a43ddf..40a80ebfc 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jddeflts.c +++ b/programs/Xserver/XIE/mixie/jpeg/jddeflts.c @@ -1,16 +1,16 @@ -/* $XConsortium: jddeflts.c,v 1.4 94/04/17 20:35:34 rws Exp $ */ +/* $Xorg: jddeflts.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /* Module jddeflts.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +18,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. -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. NOTICE @@ -68,7 +68,6 @@ terms and conditions: ***************************************************************************** Gary Rogers, AGE Logic, Inc., October 1993 - Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ @@ -114,8 +113,51 @@ progress_monitor (decompress_info_ptr cinfo, long loopcounter, long looplimit) { /* do nothing */ } +#endif /* XIE_SUPPORTED */ + +/* Default comment-block processing routine. + * This can be overridden by an application that wishes to examine + * COM blocks found in the JPEG file. The default routine does nothing. + * CAUTION: the comment processing routine MUST call JGETC() exactly + * comment_length times to read the comment data, whether it intends + * to do anything with the data or not! + * Keep in mind that (a) there may be more than one COM block in a file; + * (b) there's no guarantee that what's in the block is ASCII data. + */ + +#ifdef XIE_SUPPORTED +METHODDEF int +#if NeedFunctionPrototypes +process_comment (decompress_info_ptr cinfo, long comment_length) +#else +process_comment (cinfo, comment_length) + decompress_info_ptr cinfo; + long comment_length; +#endif /* NeedFunctionPrototypes */ +#else +METHODDEF void +process_comment (decompress_info_ptr cinfo, long comment_length) +#endif /* XIE_SUPPORTED */ +{ +#ifdef XIE_SUPPORTED + int i; +#endif /* XIE_SUPPORTED */ + while (comment_length-- > 0) { +#ifdef XIE_SUPPORTED + if ((i = JGETC(cinfo)) < 0) + return(-1); +#else + (void) JGETC(cinfo); +#endif /* XIE_SUPPORTED */ + } +#ifdef XIE_SUPPORTED + return(0); +#endif /* XIE_SUPPORTED */ +} + +#ifndef XIE_SUPPORTED /* * Reload the input buffer after it's been emptied, and return the next byte. * See the JGETC macro for calling conditions. Note in particular that @@ -246,4 +288,7 @@ j_d_defaults (decompress_info_ptr cinfo, boolean standard_buffering) /* Install default do-nothing progress monitoring method. */ cinfo->methods->progress_monitor = progress_monitor; #endif /* XIE_SUPPORTED */ + + /* Install default comment-block processing method. */ + cinfo->methods->process_comment = process_comment; } diff --git a/programs/Xserver/XIE/mixie/jpeg/jdhuff.c b/programs/Xserver/XIE/mixie/jpeg/jdhuff.c index 116a4bddc..27ca9572b 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jdhuff.c +++ b/programs/Xserver/XIE/mixie/jpeg/jdhuff.c @@ -1,4 +1,4 @@ -/* $Xorg: jdhuff.c,v 1.3 2000/08/17 19:47:47 cpqbld Exp $ */ +/* $Xorg: jdhuff.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /* Module jdhuff.c */ @@ -6,7 +6,11 @@ Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/XIE/mixie/jpeg/jdlossy.c b/programs/Xserver/XIE/mixie/jpeg/jdlossy.c index 17cd810a7..e8313d57e 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jdlossy.c +++ b/programs/Xserver/XIE/mixie/jpeg/jdlossy.c @@ -1,16 +1,15 @@ -/* $XConsortium: jdlossy.c,v 1.4 94/04/17 20:35:35 rws Exp $ */ +/* $Xorg: jdlossy.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jdlossy.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jdmcu.c b/programs/Xserver/XIE/mixie/jpeg/jdmcu.c index c389943f7..1254b4067 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jdmcu.c +++ b/programs/Xserver/XIE/mixie/jpeg/jdmcu.c @@ -1,16 +1,15 @@ -/* $XConsortium: jdmcu.c,v 1.4 94/04/17 20:35:36 rws Exp $ */ +/* $Xorg: jdmcu.c,v 1.4 2001/02/09 02:04:28 xorgcvs Exp $ */ /* Module jdmcu.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jdsample.c b/programs/Xserver/XIE/mixie/jpeg/jdsample.c index 3f81f18d6..12ee32ec1 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jdsample.c +++ b/programs/Xserver/XIE/mixie/jpeg/jdsample.c @@ -1,16 +1,15 @@ -/* $XConsortium: jdsample.c,v 1.4 94/04/17 20:35:36 rws Exp $ */ +/* $Xorg: jdsample.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jdsample.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jdxie.c b/programs/Xserver/XIE/mixie/jpeg/jdxie.c index 8d7b9f641..2606a0e9e 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jdxie.c +++ b/programs/Xserver/XIE/mixie/jpeg/jdxie.c @@ -1,11 +1,15 @@ -/* $Xorg: jdxie.c,v 1.3 2000/08/17 19:47:47 cpqbld Exp $ */ +/* $Xorg: jdxie.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jdxie.c */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/XIE/mixie/jpeg/jdxief.c b/programs/Xserver/XIE/mixie/jpeg/jdxief.c index c74f9ab04..9e79d3362 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jdxief.c +++ b/programs/Xserver/XIE/mixie/jpeg/jdxief.c @@ -1,16 +1,15 @@ -/* $XConsortium: jdxief.c,v 1.4 94/04/17 20:35:39 rws Exp $ */ +/* $Xorg: jdxief.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jdxief.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jelossy.c b/programs/Xserver/XIE/mixie/jpeg/jelossy.c index f41d8bf17..92ca39ed2 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jelossy.c +++ b/programs/Xserver/XIE/mixie/jpeg/jelossy.c @@ -1,16 +1,15 @@ -/* $XConsortium: jelossy.c,v 1.4 94/04/17 20:35:39 rws Exp $ */ +/* $Xorg: jelossy.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jelossy.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jfwddct.c b/programs/Xserver/XIE/mixie/jpeg/jfwddct.c index 74cd2b45d..f1db11c55 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jfwddct.c +++ b/programs/Xserver/XIE/mixie/jpeg/jfwddct.c @@ -1,16 +1,15 @@ -/* $XConsortium: jfwddct.c,v 1.4 94/04/17 20:35:40 rws Exp $ */ +/* $Xorg: jfwddct.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jfwddct.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jinclude.h b/programs/Xserver/XIE/mixie/jpeg/jinclude.h index 3bb3fd3c9..7ca90542e 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jinclude.h +++ b/programs/Xserver/XIE/mixie/jpeg/jinclude.h @@ -1,11 +1,15 @@ -/* $Xorg: jinclude.h,v 1.3 2000/08/17 19:47:48 cpqbld Exp $ */ +/* $Xorg: jinclude.h,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jinclude.h */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h,v 1.6 2001/01/17 22:13:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h,v 1.7 2001/07/25 15:05:00 dawes Exp $ */ /* * jinclude.h diff --git a/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c b/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c index 3f31874c1..29228ee96 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c +++ b/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c @@ -1,16 +1,15 @@ -/* $XConsortium: jmemmgr.c,v 1.4 94/04/17 20:35:41 rws Exp $ */ +/* $Xorg: jmemmgr.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jmemmgr.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jmemsys.c b/programs/Xserver/XIE/mixie/jpeg/jmemsys.c index 4be14d86c..7a8f796de 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jmemsys.c +++ b/programs/Xserver/XIE/mixie/jpeg/jmemsys.c @@ -1,11 +1,15 @@ -/* $Xorg: jmemsys.c,v 1.3 2000/08/17 19:47:48 cpqbld Exp $ */ +/* $Xorg: jmemsys.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jmemsys.c */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c,v 3.2 1998/10/04 09:36:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c,v 3.3 2001/01/17 22:13:09 dawes Exp $ */ /* * jmemnobs.c (jmemsys.c) diff --git a/programs/Xserver/XIE/mixie/jpeg/jmemsys.h b/programs/Xserver/XIE/mixie/jpeg/jmemsys.h index dfe5b4c40..fcec96487 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jmemsys.h +++ b/programs/Xserver/XIE/mixie/jpeg/jmemsys.h @@ -1,16 +1,15 @@ -/* $XConsortium: jmemsys.h,v 1.4 94/04/17 20:35:43 rws Exp $ */ +/* $Xorg: jmemsys.h,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jmemsys.h */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jpegdata.h b/programs/Xserver/XIE/mixie/jpeg/jpegdata.h index 292d34ac8..e424895d6 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jpegdata.h +++ b/programs/Xserver/XIE/mixie/jpeg/jpegdata.h @@ -1,16 +1,16 @@ -/* $XConsortium: jpegdata.h,v 1.4 94/04/17 20:35:43 rws Exp $ */ +/* $Xorg: jpegdata.h,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ +/* AGE Logic - Oct 15 1995 - Larry Hare */ /* Module jpegdata.h */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +18,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. -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. NOTICE @@ -68,7 +68,6 @@ terms and conditions: ***************************************************************************** Gary Rogers, AGE Logic, Inc., October 1993 - Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ @@ -1041,6 +1040,14 @@ struct Compress_methods_struct { struct Decompress_methods_struct { /* Hook for user interface to get control after reading file header */ METHOD(void, d_ui_method_selection, (decompress_info_ptr cinfo)); + /* Hook for user interface to process comment blocks */ +#ifdef XIE_SUPPORTED + METHOD(int, process_comment, (decompress_info_ptr cinfo, + long comment_length)); +#else + METHOD(void, process_comment, (decompress_info_ptr cinfo, + long comment_length)); +#endif /* XIE_SUPPORTED */ /* Hook for user interface to do progress monitoring */ METHOD(void, progress_monitor, (decompress_info_ptr cinfo, long loopcounter, long looplimit)); diff --git a/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c b/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c index d412930c2..5584910be 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c +++ b/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c @@ -1,4 +1,4 @@ -/* $Xorg: jrdjfif.c,v 1.3 2000/08/17 19:47:48 cpqbld Exp $ */ +/* $Xorg: jrdjfif.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /* Module jrdjfif.c */ @@ -6,7 +6,11 @@ Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., October 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c,v 1.3 1998/10/04 09:36:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c,v 1.4 2001/01/17 22:13:09 dawes Exp $ */ /* * jrdjfif.c diff --git a/programs/Xserver/XIE/mixie/jpeg/jrevdct.c b/programs/Xserver/XIE/mixie/jpeg/jrevdct.c index 4ae15e576..35e00243a 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jrevdct.c +++ b/programs/Xserver/XIE/mixie/jpeg/jrevdct.c @@ -1,16 +1,15 @@ -/* $XConsortium: jrevdct.c,v 1.4 94/04/17 20:35:45 rws Exp $ */ +/* $Xorg: jrevdct.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jrevdct.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/jpeg/jutils.c b/programs/Xserver/XIE/mixie/jpeg/jutils.c index d0f7e2670..7aa44a1a5 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jutils.c +++ b/programs/Xserver/XIE/mixie/jpeg/jutils.c @@ -1,11 +1,15 @@ -/* $Xorg: jutils.c,v 1.3 2000/08/17 19:47:49 cpqbld Exp $ */ +/* $Xorg: jutils.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jutils.c */ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c b/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c index d49319217..605fed5f8 100644 --- a/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c +++ b/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c @@ -1,16 +1,15 @@ -/* $XConsortium: jwrjfif.c,v 1.4 94/04/17 20:35:46 rws Exp $ */ +/* $Xorg: jwrjfif.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /* Module jwrjfif.c */ /**************************************************************************** -Copyright (c) 1993, 1994 X Consortium +Copyright 1993, 1994, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. NOTICE diff --git a/programs/Xserver/XIE/mixie/process/bitfun.c b/programs/Xserver/XIE/mixie/process/bitfun.c index 598f748d9..1b31b3ab9 100644 --- a/programs/Xserver/XIE/mixie/process/bitfun.c +++ b/programs/Xserver/XIE/mixie/process/bitfun.c @@ -1,10 +1,14 @@ -/* $Xorg: bitfun.c,v 1.3 2000/08/17 19:47:49 cpqbld Exp $ */ +/* $Xorg: bitfun.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /**** module bitfun.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/bitfun.c,v 1.3 1998/10/06 10:35:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/bitfun.c,v 1.4 2001/01/17 22:13:10 dawes Exp $ */ #define _XIEC_MPBITFUN diff --git a/programs/Xserver/XIE/mixie/process/mparith.c b/programs/Xserver/XIE/mixie/process/mparith.c index 1777119c0..4b4bac9c0 100644 --- a/programs/Xserver/XIE/mixie/process/mparith.c +++ b/programs/Xserver/XIE/mixie/process/mparith.c @@ -1,11 +1,15 @@ -/* $Xorg: mparith.c,v 1.5 2000/08/17 19:47:49 cpqbld Exp $ */ +/* $Xorg: mparith.c,v 1.6 2001/02/09 02:04:29 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module mparith.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mparith.c,v 3.3 1998/10/05 13:22:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mparith.c,v 3.4 2001/01/17 22:13:10 dawes Exp $ */ #define _XIEC_MPARITH diff --git a/programs/Xserver/XIE/mixie/process/mpbandc.c b/programs/Xserver/XIE/mixie/process/mpbandc.c index 9251b91f5..adfceb18a 100644 --- a/programs/Xserver/XIE/mixie/process/mpbandc.c +++ b/programs/Xserver/XIE/mixie/process/mpbandc.c @@ -1,10 +1,14 @@ -/* $Xorg: mpbandc.c,v 1.3 2000/08/17 19:47:49 cpqbld Exp $ */ +/* $Xorg: mpbandc.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /**** module mpbandc.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbandc.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbandc.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPBANDC #define _XIEC_PBANDC diff --git a/programs/Xserver/XIE/mixie/process/mpbande.c b/programs/Xserver/XIE/mixie/process/mpbande.c index 6a8743248..4e3420275 100644 --- a/programs/Xserver/XIE/mixie/process/mpbande.c +++ b/programs/Xserver/XIE/mixie/process/mpbande.c @@ -1,10 +1,14 @@ -/* $Xorg: mpbande.c,v 1.3 2000/08/17 19:47:49 cpqbld Exp $ */ +/* $Xorg: mpbande.c,v 1.4 2001/02/09 02:04:29 xorgcvs Exp $ */ /**** module mpbande.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbande.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbande.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPBANDE #define _XIEC_PBANDE diff --git a/programs/Xserver/XIE/mixie/process/mpbands.c b/programs/Xserver/XIE/mixie/process/mpbands.c index 6802ca563..0776eb6c9 100644 --- a/programs/Xserver/XIE/mixie/process/mpbands.c +++ b/programs/Xserver/XIE/mixie/process/mpbands.c @@ -1,10 +1,14 @@ -/* $Xorg: mpbands.c,v 1.3 2000/08/17 19:47:49 cpqbld Exp $ */ +/* $Xorg: mpbands.c,v 1.4 2001/02/09 02:04:30 xorgcvs Exp $ */ /**** module mpbands.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. September, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbands.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbands.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPBANDS #define _XIEC_PBANDS diff --git a/programs/Xserver/XIE/mixie/process/mpblend.c b/programs/Xserver/XIE/mixie/process/mpblend.c index 0f500e8f9..1c82b29d1 100644 --- a/programs/Xserver/XIE/mixie/process/mpblend.c +++ b/programs/Xserver/XIE/mixie/process/mpblend.c @@ -1,11 +1,15 @@ -/* $Xorg: mpblend.c,v 1.3 2000/08/17 19:47:50 cpqbld Exp $ */ +/* $Xorg: mpblend.c,v 1.4 2001/02/09 02:04:30 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module mpblend.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpblend.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpblend.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPBLEND #define _XIEC_PBLEND diff --git a/programs/Xserver/XIE/mixie/process/mpcfromi.c b/programs/Xserver/XIE/mixie/process/mpcfromi.c index a33f094b7..8c19521b6 100644 --- a/programs/Xserver/XIE/mixie/process/mpcfromi.c +++ b/programs/Xserver/XIE/mixie/process/mpcfromi.c @@ -1,10 +1,14 @@ -/* $Xorg: mpcfromi.c,v 1.3 2000/08/17 19:47:50 cpqbld Exp $ */ +/* $Xorg: mpcfromi.c,v 1.4 2001/02/09 02:04:30 xorgcvs Exp $ */ /**** module mpcfromi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcfromi.c,v 3.3 1998/10/05 13:22:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcfromi.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPCFROMI #define _XIEC_PCFROMI diff --git a/programs/Xserver/XIE/mixie/process/mpcnst.c b/programs/Xserver/XIE/mixie/process/mpcnst.c index 4015d3d05..a4ebbd5cb 100644 --- a/programs/Xserver/XIE/mixie/process/mpcnst.c +++ b/programs/Xserver/XIE/mixie/process/mpcnst.c @@ -1,11 +1,15 @@ -/* $Xorg: mpcnst.c,v 1.3 2000/08/17 19:47:50 cpqbld Exp $ */ +/* $Xorg: mpcnst.c,v 1.4 2001/02/09 02:04:30 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module mpcnst.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden && Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcnst.c,v 3.3 1998/10/05 13:22:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcnst.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPCNST diff --git a/programs/Xserver/XIE/mixie/process/mpcomp.c b/programs/Xserver/XIE/mixie/process/mpcomp.c index ee6a29eeb..5a6e17c42 100644 --- a/programs/Xserver/XIE/mixie/process/mpcomp.c +++ b/programs/Xserver/XIE/mixie/process/mpcomp.c @@ -1,10 +1,14 @@ -/* $Xorg: mpcomp.c,v 1.5 2000/08/17 19:47:51 cpqbld Exp $ */ +/* $Xorg: mpcomp.c,v 1.6 2001/02/09 02:04:30 xorgcvs Exp $ */ /**** module mpcomp.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcomp.c,v 3.3 1998/10/05 13:22:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcomp.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPCOMP diff --git a/programs/Xserver/XIE/mixie/process/mpconv.c b/programs/Xserver/XIE/mixie/process/mpconv.c index b86fefdcc..9dc265a28 100644 --- a/programs/Xserver/XIE/mixie/process/mpconv.c +++ b/programs/Xserver/XIE/mixie/process/mpconv.c @@ -1,11 +1,15 @@ -/* $Xorg: mpconv.c,v 1.3 2000/08/17 19:47:51 cpqbld Exp $ */ +/* $Xorg: mpconv.c,v 1.4 2001/02/09 02:04:30 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module mpconv.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Dean Verheiden && Robert NC Shelley -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpconv.c,v 3.3 1998/10/05 13:22:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpconv.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPCONV diff --git a/programs/Xserver/XIE/mixie/process/mpctoi.c b/programs/Xserver/XIE/mixie/process/mpctoi.c index 24e9a2387..35c7d7f1f 100644 --- a/programs/Xserver/XIE/mixie/process/mpctoi.c +++ b/programs/Xserver/XIE/mixie/process/mpctoi.c @@ -1,11 +1,15 @@ -/* $Xorg: mpctoi.c,v 1.3 2000/08/17 19:47:51 cpqbld Exp $ */ +/* $Xorg: mpctoi.c,v 1.4 2001/02/09 02:04:30 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module mpctoi.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpctoi.c,v 3.4 2000/10/05 21:59:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpctoi.c,v 3.5 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPCTOI #define _XIEC_PCTOI diff --git a/programs/Xserver/XIE/mixie/process/mpdither.c b/programs/Xserver/XIE/mixie/process/mpdither.c index 03a01e4e4..e864565ce 100644 --- a/programs/Xserver/XIE/mixie/process/mpdither.c +++ b/programs/Xserver/XIE/mixie/process/mpdither.c @@ -1,11 +1,15 @@ -/* $Xorg: mpdither.c,v 1.3 2000/08/17 19:47:51 cpqbld Exp $ */ +/* $Xorg: mpdither.c,v 1.4 2001/02/09 02:04:31 xorgcvs Exp $ */ /* AGE Logic - Oct 15 1995 - Larry Hare */ /**** module mpdither.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpdither.c,v 3.3 1998/10/05 13:22:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpdither.c,v 3.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPDITHER diff --git a/programs/Xserver/XIE/mixie/process/mpgeom.c b/programs/Xserver/XIE/mixie/process/mpgeom.c index d7f6b81f6..d1194722f 100644 --- a/programs/Xserver/XIE/mixie/process/mpgeom.c +++ b/programs/Xserver/XIE/mixie/process/mpgeom.c @@ -1,10 +1,14 @@ -/* $Xorg: mpgeom.c,v 1.3 2000/08/17 19:47:52 cpqbld Exp $ */ +/* $Xorg: mpgeom.c,v 1.4 2001/02/09 02:04:31 xorgcvs Exp $ */ /**** module mpgeom.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeom.c,v 1.3 1998/10/06 10:35:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeom.c,v 1.4 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPGEOM diff --git a/programs/Xserver/XIE/mixie/process/mpgeomaa.c b/programs/Xserver/XIE/mixie/process/mpgeomaa.c index 773277992..44a767e29 100644 --- a/programs/Xserver/XIE/mixie/process/mpgeomaa.c +++ b/programs/Xserver/XIE/mixie/process/mpgeomaa.c @@ -1,10 +1,14 @@ -/* $Xorg: mpgeomaa.c,v 1.3 2000/08/17 19:47:52 cpqbld Exp $ */ +/* $Xorg: mpgeomaa.c,v 1.4 2001/02/09 02:04:31 xorgcvs Exp $ */ /**** module mpgeomaa.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Ben Fahy && Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c,v 3.4 1998/10/05 13:22:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c,v 3.5 2001/01/17 22:13:11 dawes Exp $ */ #define _XIEC_MPGEOM diff --git a/programs/Xserver/XIE/mixie/process/mphist.c b/programs/Xserver/XIE/mixie/process/mphist.c index ff605f7fa..31093dd67 100644 --- a/programs/Xserver/XIE/mixie/process/mphist.c +++ b/programs/Xserver/XIE/mixie/process/mphist.c @@ -1,10 +1,14 @@ -/* $Xorg: mphist.c,v 1.3 2000/08/17 19:47:53 cpqbld Exp $ */ +/* $Xorg: mphist.c,v 1.4 2001/02/09 02:04:31 xorgcvs Exp $ */ /**** module mphist.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mphist.c,v 3.3 1998/10/05 13:22:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mphist.c,v 3.4 2001/01/17 22:13:12 dawes Exp $ */ #define _XIEC_MPHIST #define _XIEC_PHIST diff --git a/programs/Xserver/XIE/mixie/process/mplogic.c b/programs/Xserver/XIE/mixie/process/mplogic.c index e1be5f654..f92d1675c 100644 --- a/programs/Xserver/XIE/mixie/process/mplogic.c +++ b/programs/Xserver/XIE/mixie/process/mplogic.c @@ -1,10 +1,14 @@ -/* $Xorg: mplogic.c,v 1.5 2000/08/17 19:47:53 cpqbld Exp $ */ +/* $Xorg: mplogic.c,v 1.6 2001/02/09 02:04:31 xorgcvs Exp $ */ /**** module mplogic.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mplogic.c,v 3.3 1998/10/05 13:22:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mplogic.c,v 3.4 2001/01/17 22:13:12 dawes Exp $ */ #define _XIEC_MPLOGIC diff --git a/programs/Xserver/XIE/mixie/process/mppaste.c b/programs/Xserver/XIE/mixie/process/mppaste.c index 188595f4b..f1c9ea489 100644 --- a/programs/Xserver/XIE/mixie/process/mppaste.c +++ b/programs/Xserver/XIE/mixie/process/mppaste.c @@ -1,10 +1,14 @@ -/* $Xorg: mppaste.c,v 1.3 2000/08/17 19:47:53 cpqbld Exp $ */ +/* $Xorg: mppaste.c,v 1.4 2001/02/09 02:04:31 xorgcvs Exp $ */ /**** module mppaste.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppaste.c,v 3.3 1998/10/05 13:22:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppaste.c,v 3.4 2001/01/17 22:13:12 dawes Exp $ */ #define _XIEC_MPPASTE #define _XIEC_PPASTE diff --git a/programs/Xserver/XIE/mixie/process/mppoint.c b/programs/Xserver/XIE/mixie/process/mppoint.c index ae77b2253..86f4edfb9 100644 --- a/programs/Xserver/XIE/mixie/process/mppoint.c +++ b/programs/Xserver/XIE/mixie/process/mppoint.c @@ -1,10 +1,14 @@ -/* $Xorg: mppoint.c,v 1.3 2000/08/17 19:47:54 cpqbld Exp $ */ +/* $Xorg: mppoint.c,v 1.4 2001/02/09 02:04:31 xorgcvs Exp $ */ /**** module mppoint.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppoint.c,v 3.3 1998/10/05 13:22:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppoint.c,v 3.4 2001/01/17 22:13:12 dawes Exp $ */ #define _XIEC_MPPOINT diff --git a/programs/Xserver/XIE/mixie/process/mprgb.c b/programs/Xserver/XIE/mixie/process/mprgb.c index 0b4a2503d..c4bc2831e 100644 --- a/programs/Xserver/XIE/mixie/process/mprgb.c +++ b/programs/Xserver/XIE/mixie/process/mprgb.c @@ -1,10 +1,14 @@ -/* $Xorg: mprgb.c,v 1.3 2000/08/17 19:47:54 cpqbld Exp $ */ +/* $Xorg: mprgb.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /**** module mprgb.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mprgb.c,v 3.3 1998/10/05 13:22:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mprgb.c,v 3.4 2001/01/17 22:13:12 dawes Exp $ */ #define _XIEC_MPRGB diff --git a/programs/Xserver/XIE/mixie/process/mpuncnst.c b/programs/Xserver/XIE/mixie/process/mpuncnst.c index 036a53443..8dae20fce 100644 --- a/programs/Xserver/XIE/mixie/process/mpuncnst.c +++ b/programs/Xserver/XIE/mixie/process/mpuncnst.c @@ -1,10 +1,14 @@ -/* $Xorg: mpuncnst.c,v 1.3 2000/08/17 19:47:54 cpqbld Exp $ */ +/* $Xorg: mpuncnst.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /**** module mpuncnst.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Dean Verheiden && Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpuncnst.c,v 3.3 1998/10/05 13:22:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpuncnst.c,v 3.4 2001/01/17 22:13:13 dawes Exp $ */ #define _XIEC_MPUNCNST diff --git a/programs/Xserver/Xi/allowev.c b/programs/Xserver/Xi/allowev.c index a80b534bc..cca0caaef 100644 --- a/programs/Xserver/Xi/allowev.c +++ b/programs/Xserver/Xi/allowev.c @@ -1,10 +1,14 @@ -/* $Xorg: allowev.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: allowev.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.2 1998/10/04 09:36:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/chgdctl.c b/programs/Xserver/Xi/chgdctl.c index 21002160d..91761a39d 100644 --- a/programs/Xserver/Xi/chgdctl.c +++ b/programs/Xserver/Xi/chgdctl.c @@ -1,10 +1,14 @@ -/* $Xorg: chgdctl.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: chgdctl.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.2 1998/10/04 09:36:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/chgfctl.c b/programs/Xserver/Xi/chgfctl.c index f38faccf2..d00bf5392 100644 --- a/programs/Xserver/Xi/chgfctl.c +++ b/programs/Xserver/Xi/chgfctl.c @@ -1,10 +1,14 @@ -/* $Xorg: chgfctl.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: chgfctl.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.2 1998/10/04 09:36:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/chgkbd.c b/programs/Xserver/Xi/chgkbd.c index 97539d183..1aef44045 100644 --- a/programs/Xserver/Xi/chgkbd.c +++ b/programs/Xserver/Xi/chgkbd.c @@ -1,10 +1,14 @@ -/* $Xorg: chgkbd.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: chgkbd.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.4 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.5 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/chgkmap.c b/programs/Xserver/Xi/chgkmap.c index 06915c54b..7d411f181 100644 --- a/programs/Xserver/Xi/chgkmap.c +++ b/programs/Xserver/Xi/chgkmap.c @@ -1,10 +1,14 @@ -/* $Xorg: chgkmap.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: chgkmap.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.1 1998/10/04 09:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/chgprop.c b/programs/Xserver/Xi/chgprop.c index fb577d948..7d1e14171 100644 --- a/programs/Xserver/Xi/chgprop.c +++ b/programs/Xserver/Xi/chgprop.c @@ -1,10 +1,14 @@ -/* $Xorg: chgprop.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: chgprop.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.1 1998/10/04 09:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/chgptr.c b/programs/Xserver/Xi/chgptr.c index c22f9b816..0fce98473 100644 --- a/programs/Xserver/Xi/chgptr.c +++ b/programs/Xserver/Xi/chgptr.c @@ -1,10 +1,14 @@ -/* $Xorg: chgptr.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: chgptr.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.5 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.6 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/closedev.c b/programs/Xserver/Xi/closedev.c index d7f17fb8f..71eb04332 100644 --- a/programs/Xserver/Xi/closedev.c +++ b/programs/Xserver/Xi/closedev.c @@ -1,10 +1,14 @@ -/* $Xorg: closedev.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: closedev.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.3 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/devbell.c b/programs/Xserver/Xi/devbell.c index d215aa7d1..6d3fcce53 100644 --- a/programs/Xserver/Xi/devbell.c +++ b/programs/Xserver/Xi/devbell.c @@ -1,10 +1,14 @@ -/* $Xorg: devbell.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: devbell.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.1 1998/10/04 09:37:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/exevents.c b/programs/Xserver/Xi/exevents.c index 32c1785ec..89d708f6d 100644 --- a/programs/Xserver/Xi/exevents.c +++ b/programs/Xserver/Xi/exevents.c @@ -1,9 +1,13 @@ -/* $Xorg: exevents.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: exevents.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.8 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.9 2001/08/23 14:56:19 alanh Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/extinit.c b/programs/Xserver/Xi/extinit.c index 00e7edfb2..ddd5dc5b2 100644 --- a/programs/Xserver/Xi/extinit.c +++ b/programs/Xserver/Xi/extinit.c @@ -1,10 +1,14 @@ -/* $Xorg: extinit.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: extinit.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.4 1998/10/04 09:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.5 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/getbmap.c b/programs/Xserver/Xi/getbmap.c index e3688e770..febfa0293 100644 --- a/programs/Xserver/Xi/getbmap.c +++ b/programs/Xserver/Xi/getbmap.c @@ -1,10 +1,14 @@ -/* $Xorg: getbmap.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: getbmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.1 1998/10/04 09:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/getdctl.c b/programs/Xserver/Xi/getdctl.c index 0c08ed2f0..e7a3a8050 100644 --- a/programs/Xserver/Xi/getdctl.c +++ b/programs/Xserver/Xi/getdctl.c @@ -1,10 +1,14 @@ -/* $Xorg: getdctl.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: getdctl.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.2 1998/10/04 09:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/getfctl.c b/programs/Xserver/Xi/getfctl.c index e9c24372e..94f1bc4a1 100644 --- a/programs/Xserver/Xi/getfctl.c +++ b/programs/Xserver/Xi/getfctl.c @@ -1,10 +1,14 @@ -/* $Xorg: getfctl.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: getfctl.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.2 1998/10/04 09:37:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/getfocus.c b/programs/Xserver/Xi/getfocus.c index 8dd8e20f8..e29b54ad6 100644 --- a/programs/Xserver/Xi/getfocus.c +++ b/programs/Xserver/Xi/getfocus.c @@ -1,10 +1,14 @@ -/* $Xorg: getfocus.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: getfocus.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.1 1998/10/04 09:37:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.2 2001/01/17 22:13:24 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/getkmap.c b/programs/Xserver/Xi/getkmap.c index 21f0eeb0f..cd9d00c43 100644 --- a/programs/Xserver/Xi/getkmap.c +++ b/programs/Xserver/Xi/getkmap.c @@ -1,10 +1,14 @@ -/* $Xorg: getkmap.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: getkmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.2 1998/10/04 09:37:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.3 2001/01/17 22:13:24 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/getmmap.c b/programs/Xserver/Xi/getmmap.c index aa300a2c9..5fe62fcce 100644 --- a/programs/Xserver/Xi/getmmap.c +++ b/programs/Xserver/Xi/getmmap.c @@ -1,10 +1,14 @@ -/* $Xorg: getmmap.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: getmmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.1 1998/10/04 09:37:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/getprop.c b/programs/Xserver/Xi/getprop.c index bf992cde3..88655322f 100644 --- a/programs/Xserver/Xi/getprop.c +++ b/programs/Xserver/Xi/getprop.c @@ -1,10 +1,14 @@ -/* $Xorg: getprop.c,v 1.3 2000/08/17 19:48:00 cpqbld Exp $ */ +/* $Xorg: getprop.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.4 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.5 2001/08/23 14:56:19 alanh Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/getselev.c b/programs/Xserver/Xi/getselev.c index 56cdf80f2..61ee1091d 100644 --- a/programs/Xserver/Xi/getselev.c +++ b/programs/Xserver/Xi/getselev.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.4 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.5 2001/10/28 03:32:53 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ SOFTWARE. ********************************************************/ -/* $Xorg: getselev.c,v 1.3 2000/08/17 19:48:01 cpqbld Exp $ */ +/* $Xorg: getselev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/getvers.c b/programs/Xserver/Xi/getvers.c index 0ac72eb1f..638548e60 100644 --- a/programs/Xserver/Xi/getvers.c +++ b/programs/Xserver/Xi/getvers.c @@ -1,10 +1,14 @@ -/* $Xorg: getvers.c,v 1.3 2000/08/17 19:48:01 cpqbld Exp $ */ +/* $Xorg: getvers.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.1 1998/10/04 09:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/grabdev.c b/programs/Xserver/Xi/grabdev.c index 35f5dbe9e..565d4d19d 100644 --- a/programs/Xserver/Xi/grabdev.c +++ b/programs/Xserver/Xi/grabdev.c @@ -1,10 +1,14 @@ -/* $Xorg: grabdev.c,v 1.3 2000/08/17 19:48:01 cpqbld Exp $ */ +/* $Xorg: grabdev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.1 1998/10/04 09:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/grabdevb.c b/programs/Xserver/Xi/grabdevb.c index aa43a362e..e4a3dfd30 100644 --- a/programs/Xserver/Xi/grabdevb.c +++ b/programs/Xserver/Xi/grabdevb.c @@ -1,10 +1,14 @@ -/* $Xorg: grabdevb.c,v 1.3 2000/08/17 19:48:01 cpqbld Exp $ */ +/* $Xorg: grabdevb.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.1 1998/10/04 09:37:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/grabdevk.c b/programs/Xserver/Xi/grabdevk.c index 6288f6332..6366884ba 100644 --- a/programs/Xserver/Xi/grabdevk.c +++ b/programs/Xserver/Xi/grabdevk.c @@ -1,10 +1,14 @@ -/* $Xorg: grabdevk.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: grabdevk.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.1 1998/10/04 09:37:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/gtmotion.c b/programs/Xserver/Xi/gtmotion.c index 11a0dc685..f22785fd4 100644 --- a/programs/Xserver/Xi/gtmotion.c +++ b/programs/Xserver/Xi/gtmotion.c @@ -1,10 +1,14 @@ -/* $Xorg: gtmotion.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: gtmotion.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.5 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.6 2001/10/28 03:32:53 tsi Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/listdev.c b/programs/Xserver/Xi/listdev.c index ca8ac0681..f95d60d25 100644 --- a/programs/Xserver/Xi/listdev.c +++ b/programs/Xserver/Xi/listdev.c @@ -1,10 +1,14 @@ -/* $Xorg: listdev.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: listdev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.2 1998/10/04 09:37:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.3 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/opendev.c b/programs/Xserver/Xi/opendev.c index fe9dd753b..c2a07aaff 100644 --- a/programs/Xserver/Xi/opendev.c +++ b/programs/Xserver/Xi/opendev.c @@ -1,10 +1,14 @@ -/* $Xorg: opendev.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: opendev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.1 1998/10/04 09:37:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.2 2001/01/17 22:13:25 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/queryst.c b/programs/Xserver/Xi/queryst.c index 1c499b634..240c3a610 100644 --- a/programs/Xserver/Xi/queryst.c +++ b/programs/Xserver/Xi/queryst.c @@ -1,9 +1,13 @@ -/* $Xorg: queryst.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: queryst.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /* Copyright 1998, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.3 1998/10/04 09:37:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.4 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/selectev.c b/programs/Xserver/Xi/selectev.c index fb8cdc356..11f206cc8 100644 --- a/programs/Xserver/Xi/selectev.c +++ b/programs/Xserver/Xi/selectev.c @@ -1,10 +1,14 @@ -/* $Xorg: selectev.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: selectev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.1 1998/10/04 09:37:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/sendexev.c b/programs/Xserver/Xi/sendexev.c index e1651044a..aa9146176 100644 --- a/programs/Xserver/Xi/sendexev.c +++ b/programs/Xserver/Xi/sendexev.c @@ -1,10 +1,14 @@ -/* $Xorg: sendexev.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: sendexev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.1 1998/10/04 09:37:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/setbmap.c b/programs/Xserver/Xi/setbmap.c index 2106c4b34..cc7c0fbb2 100644 --- a/programs/Xserver/Xi/setbmap.c +++ b/programs/Xserver/Xi/setbmap.c @@ -1,10 +1,14 @@ -/* $Xorg: setbmap.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: setbmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.1 1998/10/04 09:37:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/setdval.c b/programs/Xserver/Xi/setdval.c index fc4fe2ebd..2704775ae 100644 --- a/programs/Xserver/Xi/setdval.c +++ b/programs/Xserver/Xi/setdval.c @@ -1,10 +1,14 @@ -/* $Xorg: setdval.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: setdval.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.1 1998/10/04 09:37:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/setfocus.c b/programs/Xserver/Xi/setfocus.c index a39e2b612..6e57ad268 100644 --- a/programs/Xserver/Xi/setfocus.c +++ b/programs/Xserver/Xi/setfocus.c @@ -1,10 +1,14 @@ -/* $Xorg: setfocus.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: setfocus.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.1 1998/10/04 09:37:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/setmmap.c b/programs/Xserver/Xi/setmmap.c index 78b583a8b..7af5e1037 100644 --- a/programs/Xserver/Xi/setmmap.c +++ b/programs/Xserver/Xi/setmmap.c @@ -1,10 +1,14 @@ -/* $Xorg: setmmap.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: setmmap.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.1 1998/10/04 09:37:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /******************************************************************** * diff --git a/programs/Xserver/Xi/setmode.c b/programs/Xserver/Xi/setmode.c index de8feb41e..2eff821e7 100644 --- a/programs/Xserver/Xi/setmode.c +++ b/programs/Xserver/Xi/setmode.c @@ -1,10 +1,14 @@ -/* $Xorg: setmode.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: setmode.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.1 1998/10/04 09:37:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/stubs.c b/programs/Xserver/Xi/stubs.c index 76bbe258e..de89eea41 100644 --- a/programs/Xserver/Xi/stubs.c +++ b/programs/Xserver/Xi/stubs.c @@ -1,10 +1,14 @@ -/* $Xorg: stubs.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: stubs.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.2 1998/10/04 09:37:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.3 2001/01/17 22:13:26 dawes Exp $ */ /* * stubs.c -- stub routines for the X server side of the XINPUT diff --git a/programs/Xserver/Xi/ungrdev.c b/programs/Xserver/Xi/ungrdev.c index 06d7c8140..7a3c680bc 100644 --- a/programs/Xserver/Xi/ungrdev.c +++ b/programs/Xserver/Xi/ungrdev.c @@ -1,10 +1,14 @@ -/* $Xorg: ungrdev.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: ungrdev.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.1 1998/10/04 09:37:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/ungrdevb.c b/programs/Xserver/Xi/ungrdevb.c index 3e347daa9..a03979dcf 100644 --- a/programs/Xserver/Xi/ungrdevb.c +++ b/programs/Xserver/Xi/ungrdevb.c @@ -1,10 +1,14 @@ -/* $Xorg: ungrdevb.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: ungrdevb.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.2 1998/10/04 09:37:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.3 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xi/ungrdevk.c b/programs/Xserver/Xi/ungrdevk.c index 5d6486931..2bf25248c 100644 --- a/programs/Xserver/Xi/ungrdevk.c +++ b/programs/Xserver/Xi/ungrdevk.c @@ -1,10 +1,14 @@ -/* $Xorg: ungrdevk.c,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ */ +/* $Xorg: ungrdevk.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.2 1998/10/04 09:37:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.3 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * diff --git a/programs/Xserver/Xprint/ps/Ps.h b/programs/Xserver/Xprint/ps/Ps.h index 8defbbb52..dfb4e8fcb 100644 --- a/programs/Xserver/Xprint/ps/Ps.h +++ b/programs/Xserver/Xprint/ps/Ps.h @@ -1,9 +1,12 @@ -/* $Xorg: Ps.h,v 1.4 2000/11/08 17:04:21 pookie Exp $ */ +/* $Xorg: Ps.h,v 1.5 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -70,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.10 2001/10/31 22:50:28 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.11 2001/11/21 22:40:33 dawes Exp $ */ #ifndef _PS_H_ #define _PS_H_ diff --git a/programs/Xserver/Xprint/ps/PsArc.c b/programs/Xserver/Xprint/ps/PsArc.c index 5b43416f9..76804bb18 100644 --- a/programs/Xserver/Xprint/ps/PsArc.c +++ b/programs/Xserver/Xprint/ps/PsArc.c @@ -1,4 +1,29 @@ -/* $XConsortium: PsArc.c /main/2 1996/11/16 15:24:33 rws $ */ +/* $Xorg: PsArc.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ +/* + +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +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. + +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 Open Group. + +*/ /* * (c) Copyright 1996 Hewlett-Packard Company * (c) Copyright 1996 International Business Machines Corp. @@ -43,7 +68,7 @@ ** * ** * Created By: Roger Helmendach (Liberty Systems) ** * -** * Copyright: Copyright 1996 X Consortium, Inc. +** * Copyright: Copyright 1996 The Open Group, Inc. ** * ** ********************************************************* ** diff --git a/programs/Xserver/Xprint/ps/PsArea.c b/programs/Xserver/Xprint/ps/PsArea.c index 1d43c303f..290794f68 100644 --- a/programs/Xserver/Xprint/ps/PsArea.c +++ b/programs/Xserver/Xprint/ps/PsArea.c @@ -1,8 +1,33 @@ -/* $XConsortium: PsArea.c /main/2 1996/11/16 15:24:38 rws $ */ +/* $Xorg: PsArea.c,v 1.5 2001/02/09 02:04:35 xorgcvs Exp $ */ +/* + +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +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. + +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 Open Group. + +*/ /* * (c) Copyright 1996 Hewlett-Packard Company * (c) Copyright 1996 International Business Machines Corp. - * (c) Copyright 1996 Sun Microsystems, Inc. + * (c) Copyright 1996, 2000 Sun Microsystems, Inc. * (c) Copyright 1996 Novell, Inc. * (c) Copyright 1996 Digital Equipment Corp. * (c) Copyright 1996 Fujitsu Limited @@ -43,7 +68,7 @@ ** * ** * Created By: Roger Helmendach (Liberty Systems) ** * -** * Copyright: Copyright 1996 X Consortium, Inc. +** * Copyright: Copyright 1996 The Open Group, Inc. ** * ** ********************************************************* ** @@ -204,6 +229,155 @@ error: } void +PsPutScaledImageIM(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, + int w, int h, int leftPad, int format, int imageRes, char *pImage) +{ + if( pDrawable->type==DRAWABLE_PIXMAP ) + { + int size = PixmapBytePad(w, depth)*h; + DisplayElmPtr elm; + PixmapPtr pix = (PixmapPtr)pDrawable; + PsPixmapPrivPtr priv = (PsPixmapPrivPtr)pix->devPrivate.ptr; + DisplayListPtr disp; + GCPtr gc; + + if ((gc = PsCreateAndCopyGC(pDrawable, pGC)) == NULL) return; + + disp = PsGetFreeDisplayBlock(priv); + elm = &disp->elms[disp->nelms]; + elm->type = PutImageCmd; + elm->gc = gc; + elm->c.image.depth = depth; + elm->c.image.x = x; + elm->c.image.y = y; + elm->c.image.w = w; + elm->c.image.h = h; + elm->c.image.leftPad = leftPad; + elm->c.image.format = format; + elm->c.image.res = imageRes; + elm->c.image.pData = (char *)xalloc(size); + memcpy(elm->c.image.pData, pImage, size); + disp->nelms += 1; + } + else + { + int i, j; + int r, c; + int swap; + char *pt; + PsOutPtr psOut; + ColormapPtr cMap; + int pageRes, sw, sh; + + if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) return; + if (!imageRes) { + sw = w; + sh = h; + } else { + pageRes = XpGetResolution(XpGetPrintContext(requestingClient)); + sw = (float)w * (float)pageRes / (float)imageRes + 0.5; + sh = (float)h * (float)pageRes / (float)imageRes + 0.5; + } + PsOut_Offset(psOut, pDrawable->x, pDrawable->y); + pt = (char *)(&i); i = 1; if( pt[0]=='\001' ) swap = 1; else swap = 0; + + if( depth==24 ) + { + PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3); + if( format==XYPixmap ) + { + int rowsiz = PixmapBytePad(w, depth); + char *planes[3]; + planes[0] = pImage; + planes[1] = &pImage[rowsiz*h]; + planes[2] = &pImage[rowsiz*h*2]; + for( r=0 ; r<h ; r++ ) + { + char *pt[3]; + for( i=0 ; i<3 ; i++ ) pt[i] = &planes[i][rowsiz*r]; + for( c=0 ; c<w ; c++ ) + { + for( i=0 ; i<3 ; i++ ) + { PsOut_OutImageBytes(psOut, 1, &pt[i][c]); pt[i]++; } + } + } + } + else if( format==ZPixmap ) + { + int rowsiz = PixmapBytePad(w, depth); + for( r=0 ; r<h ; r++ ) + { + char *pt = &pImage[rowsiz*r]; + for( c=0 ; c<w ; c++,pt+=4 ) + { + if( swap ) + { + char tmp[4]; + tmp[0] = pt[3]; tmp[1] = pt[2]; tmp[2] = pt[1]; tmp[3] = pt[0]; + PsOut_OutImageBytes(psOut, 3, &tmp[1]); + } + else + PsOut_OutImageBytes(psOut, 3, &pt[1]); + } + } + } + else goto error; + PsOut_EndImage(psOut); + } + else if( depth==8 ) + { + int rowsiz = PixmapBytePad(w, depth); + PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3); + for( r=0 ; r<h ; r++ ) + { + char *pt = &pImage[rowsiz*r]; + for( c=0 ; c<w ; c++,pt++ ) + { + int val = PsGetPixelColor(cMap, (int)(*pt)&0xFF); + char *ipt = (char *)&val; + if( swap ) + { + char tmp[4]; + tmp[0] = ipt[3]; tmp[1] = ipt[2]; tmp[2] = ipt[1]; tmp[3] = ipt[0]; + PsOut_OutImageBytes(psOut, 3, &tmp[1]); + } + else + PsOut_OutImageBytes(psOut, 3, &ipt[1]); + } + } + PsOut_EndImage(psOut); + } + else if( depth==1 ) + { + { + int rowsiz = BitmapBytePad(w); + int psrsiz = (w+7)/8; + PsOut_BeginImageIM(psOut, PsGetPixelColor(cMap, pGC->bgPixel), + PsGetPixelColor(cMap, pGC->fgPixel), + x, y, w, h, sw, sh, 1); + for( r=0 ; r<h ; r++ ) + { + char *pt = &pImage[rowsiz*r]; + for( i=0 ; i<psrsiz ; i++ ) + { + int iv_, iv = (int)pt[i]&0xFF; + char c; + if( swap ) + { for( j=0,iv_=0 ; j<8 ; j++ ) iv_ |= (((iv>>j)&1)<<(7-j)); } + else + iv_ = iv; + c = iv_; + PsOut_OutImageBytes(psOut, 1, &c); + } + } + PsOut_EndImage(psOut); + } + } + } +error: + return; +} +void PsPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pImage) { @@ -212,6 +386,15 @@ PsPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, PsPutScaledImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format, pcon->imageRes, pImage); } +void +PsPutImageMask(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, + int w, int h, int leftPad, int format, char *pImage) +{ + XpContextPtr pcon; + if (requestingClient && (pcon = XpGetPrintContext(requestingClient))) + PsPutScaledImageIM(pDrawable, pGC, depth, x, y, w, h, leftPad, format, + pcon->imageRes, pImage); +} RegionPtr PsCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, diff --git a/programs/Xserver/Xprint/ps/PsAttr.c b/programs/Xserver/Xprint/ps/PsAttr.c index 9f0c0f910..f276c180f 100644 --- a/programs/Xserver/Xprint/ps/PsAttr.c +++ b/programs/Xserver/Xprint/ps/PsAttr.c @@ -1,9 +1,13 @@ -/* $Xorg: PsAttr.c,v 1.3 2000/08/17 19:48:09 cpqbld Exp $ */ +/* $Xorg: PsAttr.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -53,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.3 1999/12/16 02:26:28 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ /******************************************************************* ** diff --git a/programs/Xserver/Xprint/ps/PsColor.c b/programs/Xserver/Xprint/ps/PsColor.c index 69cb6658b..6417410ee 100644 --- a/programs/Xserver/Xprint/ps/PsColor.c +++ b/programs/Xserver/Xprint/ps/PsColor.c @@ -1,9 +1,13 @@ -/* $Xorg: PsColor.c,v 1.3 2000/08/17 19:48:09 cpqbld Exp $ */ +/* $Xorg: PsColor.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.2 2001/10/28 03:32:56 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/programs/Xserver/Xprint/ps/PsDef.h b/programs/Xserver/Xprint/ps/PsDef.h index d65e2e367..ec648c442 100644 --- a/programs/Xserver/Xprint/ps/PsDef.h +++ b/programs/Xserver/Xprint/ps/PsDef.h @@ -1,4 +1,29 @@ -/* $XConsortium: PsDef.h /main/2 1996/11/16 15:24:57 rws $ */ +/* $Xorg: PsDef.h,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ +/* + +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +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. + +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 Open Group. + +*/ /* * (c) Copyright 1996 Hewlett-Packard Company * (c) Copyright 1996 International Business Machines Corp. @@ -44,7 +69,7 @@ ** * ** * Created By: Roger Helmendach (Liberty Systems) ** * -** * Copyright: Copyright 1996 X Consortium, Inc. +** * Copyright: Copyright 1996 The Open Group, Inc. ** * ** ********************************************************* ** diff --git a/programs/Xserver/Xprint/ps/PsFonts.c b/programs/Xserver/Xprint/ps/PsFonts.c index 9fef76c6b..dae1735ad 100644 --- a/programs/Xserver/Xprint/ps/PsFonts.c +++ b/programs/Xserver/Xprint/ps/PsFonts.c @@ -1,9 +1,13 @@ -/* $Xorg: PsFonts.c,v 1.4 2000/08/17 19:48:09 cpqbld Exp $ */ +/* $Xorg: PsFonts.c,v 1.5 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -53,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.3 1999/12/16 02:26:28 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ /******************************************************************* ** diff --git a/programs/Xserver/Xprint/ps/PsGC.c b/programs/Xserver/Xprint/ps/PsGC.c index 860eba693..57bce1700 100644 --- a/programs/Xserver/Xprint/ps/PsGC.c +++ b/programs/Xserver/Xprint/ps/PsGC.c @@ -1,9 +1,13 @@ -/* $Xorg: PsGC.c,v 1.3 2000/08/17 19:48:10 cpqbld Exp $ */ +/* $Xorg: PsGC.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -53,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.5 2001/10/28 03:32:56 tsi Exp $ */ /******************************************************************* ** diff --git a/programs/Xserver/Xprint/ps/PsInit.c b/programs/Xserver/Xprint/ps/PsInit.c index 87feed3ff..f719d6de7 100644 --- a/programs/Xserver/Xprint/ps/PsInit.c +++ b/programs/Xserver/Xprint/ps/PsInit.c @@ -1,9 +1,13 @@ -/* $Xorg: PsInit.c,v 1.3 2000/08/17 19:48:10 cpqbld Exp $ */ +/* $Xorg: PsInit.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.10 2001/08/01 00:44:46 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.11 2001/10/28 03:32:56 tsi Exp $ */ #include <stdio.h> #include <string.h> diff --git a/programs/Xserver/Xprint/ps/PsLine.c b/programs/Xserver/Xprint/ps/PsLine.c index 98e95feef..dd01fcb65 100644 --- a/programs/Xserver/Xprint/ps/PsLine.c +++ b/programs/Xserver/Xprint/ps/PsLine.c @@ -1,9 +1,13 @@ -/* $Xorg: PsLine.c,v 1.3 2000/08/17 19:48:10 cpqbld Exp $ */ +/* $Xorg: PsLine.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.4 1998/10/04 09:37:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/programs/Xserver/Xprint/ps/PsMisc.c b/programs/Xserver/Xprint/ps/PsMisc.c index 09100c680..3085888c7 100644 --- a/programs/Xserver/Xprint/ps/PsMisc.c +++ b/programs/Xserver/Xprint/ps/PsMisc.c @@ -1,9 +1,13 @@ -/* $Xorg: PsMisc.c,v 1.3 2000/08/17 19:48:10 cpqbld Exp $ */ +/* $Xorg: PsMisc.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.4 1998/10/04 09:37:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include "Xos.h" /* for SIGCLD on pre-POSIX systems */ #include <stdio.h> diff --git a/programs/Xserver/Xprint/ps/PsPixel.c b/programs/Xserver/Xprint/ps/PsPixel.c index 1aae17e68..303b0d5ec 100644 --- a/programs/Xserver/Xprint/ps/PsPixel.c +++ b/programs/Xserver/Xprint/ps/PsPixel.c @@ -1,9 +1,13 @@ -/* $Xorg: PsPixel.c,v 1.3 2000/08/17 19:48:11 cpqbld Exp $ */ +/* $Xorg: PsPixel.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.4 1998/10/04 09:37:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.5 2001/01/17 22:36:32 dawes Exp $ */ #include <stdio.h> diff --git a/programs/Xserver/Xprint/ps/PsPixmap.c b/programs/Xserver/Xprint/ps/PsPixmap.c index 50ddde5ba..a020aba22 100644 --- a/programs/Xserver/Xprint/ps/PsPixmap.c +++ b/programs/Xserver/Xprint/ps/PsPixmap.c @@ -1,9 +1,13 @@ -/* $Xorg: PsPixmap.c,v 1.3 2000/08/17 19:48:11 cpqbld Exp $ */ +/* $Xorg: PsPixmap.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -53,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.3 1999/12/13 02:13:01 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.4 2001/01/17 22:36:32 dawes Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/programs/Xserver/Xprint/ps/PsPolygon.c b/programs/Xserver/Xprint/ps/PsPolygon.c index 02f7a7ce9..d334c7778 100644 --- a/programs/Xserver/Xprint/ps/PsPolygon.c +++ b/programs/Xserver/Xprint/ps/PsPolygon.c @@ -1,9 +1,13 @@ -/* $Xorg: PsPolygon.c,v 1.3 2000/08/17 19:48:11 cpqbld Exp $ */ +/* $Xorg: PsPolygon.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.5 1999/12/13 02:13:02 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.6 2001/01/17 22:36:32 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/programs/Xserver/Xprint/ps/PsPrint.c b/programs/Xserver/Xprint/ps/PsPrint.c index bb54bfc31..c5ecc19b0 100644 --- a/programs/Xserver/Xprint/ps/PsPrint.c +++ b/programs/Xserver/Xprint/ps/PsPrint.c @@ -1,9 +1,13 @@ -/* $Xorg: PsPrint.c,v 1.5 2000/11/08 17:12:45 pookie Exp $ */ +/* $Xorg: PsPrint.c,v 1.6 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.9 2001/11/21 22:40:33 dawes Exp $ */ #include <stdio.h> #include <string.h> diff --git a/programs/Xserver/Xprint/ps/PsSpans.c b/programs/Xserver/Xprint/ps/PsSpans.c index 641f9e7ff..a7370866e 100644 --- a/programs/Xserver/Xprint/ps/PsSpans.c +++ b/programs/Xserver/Xprint/ps/PsSpans.c @@ -1,9 +1,13 @@ -/* $Xorg: PsSpans.c,v 1.3 2000/08/17 19:48:11 cpqbld Exp $ */ +/* $Xorg: PsSpans.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.7 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/programs/Xserver/Xprint/ps/PsText.c b/programs/Xserver/Xprint/ps/PsText.c index 9c2c358dc..df5dd6ad4 100644 --- a/programs/Xserver/Xprint/ps/PsText.c +++ b/programs/Xserver/Xprint/ps/PsText.c @@ -1,9 +1,13 @@ -/* $Xorg: PsText.c,v 1.6 2000/08/17 19:48:11 cpqbld Exp $ */ +/* $Xorg: PsText.c,v 1.7 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.10 2001/01/19 17:42:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.11 2001/10/28 03:32:56 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/programs/Xserver/Xprint/ps/PsWindow.c b/programs/Xserver/Xprint/ps/PsWindow.c index f6cdbdff7..205a15085 100644 --- a/programs/Xserver/Xprint/ps/PsWindow.c +++ b/programs/Xserver/Xprint/ps/PsWindow.c @@ -1,9 +1,13 @@ -/* $Xorg: PsWindow.c,v 1.3 2000/08/17 19:48:11 cpqbld Exp $ */ +/* $Xorg: PsWindow.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.9 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.10 2001/10/28 03:32:56 tsi Exp $ */ #include <stdio.h> #include <string.h> diff --git a/programs/Xserver/Xprint/ps/psout.c b/programs/Xserver/Xprint/ps/psout.c index e65f6766b..d12e03039 100644 --- a/programs/Xserver/Xprint/ps/psout.c +++ b/programs/Xserver/Xprint/ps/psout.c @@ -1,9 +1,13 @@ -/* $Xorg: psout.c,v 1.6 2000/11/08 17:20:06 pookie Exp $ */ +/* $Xorg: psout.c,v 1.7 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.7 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.8 2001/11/21 22:40:33 dawes Exp $ */ /* * For XFree86 3.3.3: diff --git a/programs/Xserver/Xprint/ps/psout.h b/programs/Xserver/Xprint/ps/psout.h index 51000639d..d8d975e0c 100644 --- a/programs/Xserver/Xprint/ps/psout.h +++ b/programs/Xserver/Xprint/ps/psout.h @@ -1,9 +1,13 @@ -/* $Xorg: psout.h,v 1.5 2000/11/08 17:21:32 pookie Exp $ */ +/* $Xorg: psout.h,v 1.6 2001/02/09 02:04:37 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -53,7 +57,7 @@ in this Software without prior written authorization from The Open Group. * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.2 2001/08/01 00:44:46 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.3 2001/11/21 22:40:33 dawes Exp $ */ /******************************************************************* ** diff --git a/programs/Xserver/Xserver.man b/programs/Xserver/Xserver.man index 3a986ab0e..3f0f94a8d 100644 --- a/programs/Xserver/Xserver.man +++ b/programs/Xserver/Xserver.man @@ -1,7 +1,11 @@ -.\" $Xorg: Xserver.man,v 1.3 2000/08/17 19:47:01 cpqbld Exp $ +.\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -18,7 +22,7 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from The Open Group. -.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.15 2001/01/27 18:20:39 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.16 2001/03/28 14:35:14 dawes Exp $ .TH XSERVER 1 __xorgversion__ .SH NAME Xserver \- X Window System display server diff --git a/programs/Xserver/cfb/cfb8bit.c b/programs/Xserver/cfb/cfb8bit.c index 97961dfbb..3309fb764 100644 --- a/programs/Xserver/cfb/cfb8bit.c +++ b/programs/Xserver/cfb/cfb8bit.c @@ -1,9 +1,13 @@ -/* $Xorg: cfb8bit.c,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ +/* $Xorg: cfb8bit.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.3 2000/02/12 05:43:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.4 2001/01/17 22:36:34 dawes Exp $ */ /* * cfb8bit.c diff --git a/programs/Xserver/cfb/cfb8bit.h b/programs/Xserver/cfb/cfb8bit.h index 6ad9f64d8..555a562c6 100644 --- a/programs/Xserver/cfb/cfb8bit.h +++ b/programs/Xserver/cfb/cfb8bit.h @@ -7,13 +7,17 @@ * are used for depths other than 8. Perhaps the file should be * renamed. dpw */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.5 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.6 2001/10/28 03:33:00 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -30,7 +34,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfb8bit.h,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ +/* $Xorg: cfb8bit.h,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "servermd.h" diff --git a/programs/Xserver/cfb/cfb8line.c b/programs/Xserver/cfb/cfb8line.c index 495977869..3b891d189 100644 --- a/programs/Xserver/cfb/cfb8line.c +++ b/programs/Xserver/cfb/cfb8line.c @@ -1,9 +1,13 @@ /* - * $Xorg: cfb8line.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ + * $Xorg: cfb8line.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium * - * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.15 2001/01/30 22:06:15 tsi Exp $ + * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.16 2001/10/28 03:33:00 tsi Exp $ * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ diff --git a/programs/Xserver/cfb/cfballpriv.c b/programs/Xserver/cfb/cfballpriv.c index e884e0588..8b2468992 100644 --- a/programs/Xserver/cfb/cfballpriv.c +++ b/programs/Xserver/cfb/cfballpriv.c @@ -1,9 +1,13 @@ /* - * $Xorg: cfballpriv.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ + * $Xorg: cfballpriv.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ * Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.10 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbbitblt.c b/programs/Xserver/cfb/cfbbitblt.c index 6028c13c8..213fbd0fc 100644 --- a/programs/Xserver/cfb/cfbbitblt.c +++ b/programs/Xserver/cfb/cfbbitblt.c @@ -2,13 +2,17 @@ * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.12 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.13 2001/10/28 03:33:00 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -27,7 +31,7 @@ in this Software without prior written authorization from The Open Group. Author: Keith Packard */ -/* $Xorg: cfbbitblt.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ +/* $Xorg: cfbbitblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbblt.c b/programs/Xserver/cfb/cfbblt.c index 585d679f4..bc2dc44fd 100644 --- a/programs/Xserver/cfb/cfbblt.c +++ b/programs/Xserver/cfb/cfbblt.c @@ -1,13 +1,17 @@ /* * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.10 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.11 2001/10/28 03:33:00 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ in this Software without prior written authorization from The Open Group. Author: Keith Packard */ -/* $Xorg: cfbblt.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ +/* $Xorg: cfbblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ /* 24-bit bug fixes: Peter Wainwright, 1998/11/28 */ diff --git a/programs/Xserver/cfb/cfbbres.c b/programs/Xserver/cfb/cfbbres.c index eaf3e628d..b306ee80b 100644 --- a/programs/Xserver/cfb/cfbbres.c +++ b/programs/Xserver/cfb/cfbbres.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.3 2000/02/12 03:39:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.4 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbbres.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ +/* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "X.h" #include "misc.h" #include "cfb.h" diff --git a/programs/Xserver/cfb/cfbbresd.c b/programs/Xserver/cfb/cfbbresd.c index dc0c0c049..4f6630ab3 100644 --- a/programs/Xserver/cfb/cfbbresd.c +++ b/programs/Xserver/cfb/cfbbresd.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.4 2000/09/26 15:57:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.5 2001/01/17 22:36:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbbresd.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ +/* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "X.h" #include "misc.h" #include "cfb.h" diff --git a/programs/Xserver/cfb/cfbcppl.c b/programs/Xserver/cfb/cfbcppl.c index e28ca2e48..9e7785c86 100644 --- a/programs/Xserver/cfb/cfbcppl.c +++ b/programs/Xserver/cfb/cfbcppl.c @@ -3,7 +3,11 @@ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.4 2000/02/12 03:39:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.5 2001/10/28 03:33:00 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbfillarc.c b/programs/Xserver/cfb/cfbfillarc.c index c9232ae00..6051b9467 100644 --- a/programs/Xserver/cfb/cfbfillarc.c +++ b/programs/Xserver/cfb/cfbfillarc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.3 2000/02/12 03:39:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.4 2001/01/17 22:36:35 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: cfbfillarc.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbfillarc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" diff --git a/programs/Xserver/cfb/cfbfillrct.c b/programs/Xserver/cfb/cfbfillrct.c index fdbf26d0d..86258ed4f 100644 --- a/programs/Xserver/cfb/cfbfillrct.c +++ b/programs/Xserver/cfb/cfbfillrct.c @@ -1,13 +1,17 @@ /* * Fill rectangles. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.6 2000/02/12 03:39:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.7 2001/01/17 22:36:35 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,7 +28,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbfillrct.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbfillrct.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbfillsp.c b/programs/Xserver/cfb/cfbfillsp.c index 6e42a99f1..6dde5b56f 100644 --- a/programs/Xserver/cfb/cfbfillsp.c +++ b/programs/Xserver/cfb/cfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.5 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.6 2001/10/28 03:33:00 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +32,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -71,7 +75,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbfillsp.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbfillsp.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbgc.c b/programs/Xserver/cfb/cfbgc.c index acfb3b579..b4a9cc484 100644 --- a/programs/Xserver/cfb/cfbgc.c +++ b/programs/Xserver/cfb/cfbgc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.4 2000/02/12 03:39:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.5 2001/01/17 22:36:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbgc.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbgc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbgetsp.c b/programs/Xserver/cfb/cfbgetsp.c index be49b2059..8b60af6c7 100644 --- a/programs/Xserver/cfb/cfbgetsp.c +++ b/programs/Xserver/cfb/cfbgetsp.c @@ -1,9 +1,13 @@ -/* $Xorg: cfbgetsp.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbgetsp.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.7 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.8 2001/10/28 03:33:00 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbglblt8.c b/programs/Xserver/cfb/cfbglblt8.c index e33b37b5b..89d79ed33 100644 --- a/programs/Xserver/cfb/cfbglblt8.c +++ b/programs/Xserver/cfb/cfbglblt8.c @@ -1,9 +1,13 @@ -/* $Xorg: cfbglblt8.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbglblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.4 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.5 2001/10/28 03:33:00 tsi Exp $ */ /* * Poly glyph blt. Accepts an arbitrary font <= 32 bits wide, in Copy mode diff --git a/programs/Xserver/cfb/cfbhrzvert.c b/programs/Xserver/cfb/cfbhrzvert.c index 76bf21564..99221d247 100644 --- a/programs/Xserver/cfb/cfbhrzvert.c +++ b/programs/Xserver/cfb/cfbhrzvert.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.5 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.6 2001/10/28 03:33:00 tsi Exp $ */ /*********************************************************** Copyright 1987,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbhrzvert.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbhrzvert.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #include "X.h" #include "gc.h" diff --git a/programs/Xserver/cfb/cfbigblt8.c b/programs/Xserver/cfb/cfbigblt8.c index 3a8a0b1a4..a40e995be 100644 --- a/programs/Xserver/cfb/cfbigblt8.c +++ b/programs/Xserver/cfb/cfbigblt8.c @@ -1,9 +1,13 @@ /* - * $Xorg: cfbigblt8.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ + * $Xorg: cfbigblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.4 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbimage.c b/programs/Xserver/cfb/cfbimage.c index ff3c1a5c1..68b5cc68d 100644 --- a/programs/Xserver/cfb/cfbimage.c +++ b/programs/Xserver/cfb/cfbimage.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.11 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.12 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbimage.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbimage.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/programs/Xserver/cfb/cfbline.c b/programs/Xserver/cfb/cfbline.c index 58100e4fd..28b0cb8c5 100644 --- a/programs/Xserver/cfb/cfbline.c +++ b/programs/Xserver/cfb/cfbline.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.4 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: cfbline.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbline.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #include "X.h" #include "gcstruct.h" diff --git a/programs/Xserver/cfb/cfbmap.h b/programs/Xserver/cfb/cfbmap.h index fa919c1ec..cfb434ad2 100644 --- a/programs/Xserver/cfb/cfbmap.h +++ b/programs/Xserver/cfb/cfbmap.h @@ -1,9 +1,13 @@ /* - * $Xorg: cfbmap.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ + * $Xorg: cfbmap.h,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.9 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.10 2001/07/25 15:05:01 dawes Exp $ */ /* * Map names around so that multiple depths can be supported simultaneously diff --git a/programs/Xserver/cfb/cfbpixmap.c b/programs/Xserver/cfb/cfbpixmap.c index cf28e7ea0..3502e879c 100644 --- a/programs/Xserver/cfb/cfbpixmap.c +++ b/programs/Xserver/cfb/cfbpixmap.c @@ -1,9 +1,13 @@ -/* $Xorg: cfbpixmap.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbpixmap.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.3 2000/02/12 05:43:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.4 2001/01/17 22:36:36 dawes Exp $ */ /* pixmap management written by drewry, september 1986 diff --git a/programs/Xserver/cfb/cfbply1rct.c b/programs/Xserver/cfb/cfbply1rct.c index aa597a573..58112a324 100644 --- a/programs/Xserver/cfb/cfbply1rct.c +++ b/programs/Xserver/cfb/cfbply1rct.c @@ -1,9 +1,13 @@ /* - * $Xorg: cfbply1rct.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ + * $Xorg: cfbply1rct.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.7 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.8 2001/10/28 03:33:01 tsi Exp $ */ #include "X.h" diff --git a/programs/Xserver/cfb/cfbpntwin.c b/programs/Xserver/cfb/cfbpntwin.c index 7220539f0..71015c7cc 100644 --- a/programs/Xserver/cfb/cfbpntwin.c +++ b/programs/Xserver/cfb/cfbpntwin.c @@ -1,9 +1,13 @@ -/* $Xorg: cfbpntwin.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ +/* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.4 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ #include "X.h" diff --git a/programs/Xserver/cfb/cfbpolypnt.c b/programs/Xserver/cfb/cfbpolypnt.c index 5a332e781..a5886b6ec 100644 --- a/programs/Xserver/cfb/cfbpolypnt.c +++ b/programs/Xserver/cfb/cfbpolypnt.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.4 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: cfbpolypnt.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbpolypnt.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #include "X.h" #include "gcstruct.h" diff --git a/programs/Xserver/cfb/cfbpush8.c b/programs/Xserver/cfb/cfbpush8.c index 76749c26d..3f313b0e3 100644 --- a/programs/Xserver/cfb/cfbpush8.c +++ b/programs/Xserver/cfb/cfbpush8.c @@ -2,13 +2,17 @@ * Push Pixels for 8 bit displays. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.4 2000/02/12 03:39:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.5 2001/01/17 22:36:36 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,7 +28,7 @@ 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 Open Group. */ -/* $Xorg: cfbpush8.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbpush8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #if PSZ == 8 diff --git a/programs/Xserver/cfb/cfbrctstp8.c b/programs/Xserver/cfb/cfbrctstp8.c index e1f97ed87..ba8dd89f2 100644 --- a/programs/Xserver/cfb/cfbrctstp8.c +++ b/programs/Xserver/cfb/cfbrctstp8.c @@ -1,12 +1,16 @@ /* * Fill 32 bit stippled rectangles for 8 bit frame buffers */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.4 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ Author: Keith Packard, MIT X Consortium */ -/* $Xorg: cfbrctstp8.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbrctstp8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #if PSZ == 8 diff --git a/programs/Xserver/cfb/cfbrrop.c b/programs/Xserver/cfb/cfbrrop.c index c249a5dcb..3014b3a5a 100644 --- a/programs/Xserver/cfb/cfbrrop.c +++ b/programs/Xserver/cfb/cfbrrop.c @@ -1,9 +1,13 @@ /* - * $Xorg: cfbrrop.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ + * $Xorg: cfbrrop.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.4 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* cfb reduced rasterop computations */ diff --git a/programs/Xserver/cfb/cfbrrop.h b/programs/Xserver/cfb/cfbrrop.h index fc465b074..c9c03e7c9 100644 --- a/programs/Xserver/cfb/cfbrrop.h +++ b/programs/Xserver/cfb/cfbrrop.h @@ -1,9 +1,13 @@ /* - * $Xorg: cfbrrop.h,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ + * $Xorg: cfbrrop.h,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.8 2001/01/30 22:06:15 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.9 2001/07/25 15:05:01 dawes Exp $ */ #ifndef GXcopy #include "X.h" diff --git a/programs/Xserver/cfb/cfbsetsp.c b/programs/Xserver/cfb/cfbsetsp.c index 04b74a69e..bfae5694e 100644 --- a/programs/Xserver/cfb/cfbsetsp.c +++ b/programs/Xserver/cfb/cfbsetsp.c @@ -1,9 +1,13 @@ -/* $Xorg: cfbsetsp.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbsetsp.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.3 2001/01/17 22:36:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.4 2001/10/28 03:33:02 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbsolid.c b/programs/Xserver/cfb/cfbsolid.c index b2ac20efa..c17d23081 100644 --- a/programs/Xserver/cfb/cfbsolid.c +++ b/programs/Xserver/cfb/cfbsolid.c @@ -1,9 +1,13 @@ /* - * $Xorg: cfbsolid.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ + * $Xorg: cfbsolid.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.5 2001/01/17 22:36:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.6 2001/10/28 03:33:02 tsi Exp $ */ #include "X.h" diff --git a/programs/Xserver/cfb/cfbteblt8.c b/programs/Xserver/cfb/cfbteblt8.c index 2620a177e..9048ec375 100644 --- a/programs/Xserver/cfb/cfbteblt8.c +++ b/programs/Xserver/cfb/cfbteblt8.c @@ -3,12 +3,16 @@ * 8 bit displays, in Copy mode with no clipping. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.4 2001/01/17 22:36:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbteblt8.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbteblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #if PSZ == 8 diff --git a/programs/Xserver/cfb/cfbtegblt.c b/programs/Xserver/cfb/cfbtegblt.c index cebb03c50..8247fb50d 100644 --- a/programs/Xserver/cfb/cfbtegblt.c +++ b/programs/Xserver/cfb/cfbtegblt.c @@ -1,9 +1,13 @@ -/* $Xorg: cfbtegblt.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbtegblt.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.4 2001/01/17 22:36:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.5 2001/10/28 03:33:02 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbtile32.c b/programs/Xserver/cfb/cfbtile32.c index 4ebeb0d1d..33cd07886 100644 --- a/programs/Xserver/cfb/cfbtile32.c +++ b/programs/Xserver/cfb/cfbtile32.c @@ -2,13 +2,17 @@ * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.4 2001/01/17 22:36:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.5 2001/10/28 03:33:02 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbtile32.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbtile32.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbtileodd.c b/programs/Xserver/cfb/cfbtileodd.c index 3cbd363cb..a7a5ff20a 100644 --- a/programs/Xserver/cfb/cfbtileodd.c +++ b/programs/Xserver/cfb/cfbtileodd.c @@ -2,13 +2,17 @@ * Fill odd tiled rectangles and spans. * no depth dependencies. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.4 2001/01/17 22:36:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.5 2001/10/28 03:33:02 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbtileodd.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbtileodd.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/cfb/cfbwindow.c b/programs/Xserver/cfb/cfbwindow.c index bc854a570..244aa412b 100644 --- a/programs/Xserver/cfb/cfbwindow.c +++ b/programs/Xserver/cfb/cfbwindow.c @@ -1,14 +1,13 @@ -/* $XConsortium: cfbwindow.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */ +/* $Xorg: cfbwindow.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/cfb/cfbzerarc.c b/programs/Xserver/cfb/cfbzerarc.c index 245d534e9..4ddaf9f8a 100644 --- a/programs/Xserver/cfb/cfbzerarc.c +++ b/programs/Xserver/cfb/cfbzerarc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.1 1998/10/04 09:37:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.2 2001/01/17 22:36:37 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: cfbzerarc.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +/* $Xorg: cfbzerarc.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" diff --git a/programs/Xserver/cfb/stip68kgnu.h b/programs/Xserver/cfb/stip68kgnu.h index 3bca7dc3f..01bb939e8 100644 --- a/programs/Xserver/cfb/stip68kgnu.h +++ b/programs/Xserver/cfb/stip68kgnu.h @@ -1,9 +1,13 @@ /* - * $Xorg: stip68kgnu.h,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ + * $Xorg: stip68kgnu.h,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.2 1998/10/04 09:37:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.3 2001/01/17 22:36:37 dawes Exp $ */ /* * Stipple stack macro for 68k GCC diff --git a/programs/Xserver/cfb/stipmips.s b/programs/Xserver/cfb/stipmips.s index e67e8c34f..c42d9b5ae 100644 --- a/programs/Xserver/cfb/stipmips.s +++ b/programs/Xserver/cfb/stipmips.s @@ -1,14 +1,13 @@ /* - * $XConsortium: stipmips.s,v 1.10 94/04/17 20:29:08 keith Exp $ + * $Xorg: stipmips.s,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ * -Copyright (c) 1990 X Consortium +Copyright 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. * * Author: Keith Packard, MIT X Consortium */ diff --git a/programs/Xserver/cfb/stipple68k.s b/programs/Xserver/cfb/stipple68k.s index 8fe0247b3..2f892b386 100644 --- a/programs/Xserver/cfb/stipple68k.s +++ b/programs/Xserver/cfb/stipple68k.s @@ -1,9 +1,13 @@ /* - * $Xorg: stipple68k.s,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ + * $Xorg: stipple68k.s,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stipple68k.s,v 3.1 1998/10/04 09:37:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipple68k.s,v 3.2 2001/01/17 22:36:38 dawes Exp $ */ /* * Stipple code for 68k processors diff --git a/programs/Xserver/cfb/stipsparc.s b/programs/Xserver/cfb/stipsparc.s index 89c35471c..a6a40491f 100644 --- a/programs/Xserver/cfb/stipsparc.s +++ b/programs/Xserver/cfb/stipsparc.s @@ -1,9 +1,13 @@ /* - * $Xorg: stipsparc.s,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ + * $Xorg: stipsparc.s,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.3 1999/03/29 13:17:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/programs/Xserver/cfb/stipsprc32.s b/programs/Xserver/cfb/stipsprc32.s index 6fc1974d1..5703c0f1b 100644 --- a/programs/Xserver/cfb/stipsprc32.s +++ b/programs/Xserver/cfb/stipsprc32.s @@ -1,9 +1,13 @@ /* - * $Xorg: stipsprc32.s,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ + * $Xorg: stipsprc32.s,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.3 1999/03/29 13:17:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/programs/Xserver/dix/atom.c b/programs/Xserver/dix/atom.c index b4332fbda..7939b40fb 100644 --- a/programs/Xserver/dix/atom.c +++ b/programs/Xserver/dix/atom.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.1 1998/10/04 09:38:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.2 2001/01/17 22:36:42 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: atom.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ +/* $Xorg: atom.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #include "X.h" #include "Xatom.h" diff --git a/programs/Xserver/dix/colormap.c b/programs/Xserver/dix/colormap.c index 317fdf429..a754541c0 100644 --- a/programs/Xserver/dix/colormap.c +++ b/programs/Xserver/dix/colormap.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.6 2001/08/01 00:44:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.7 2001/10/28 03:33:04 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: colormap.c,v 1.3 2000/08/17 19:48:17 cpqbld Exp $ */ +/* $Xorg: colormap.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/programs/Xserver/dix/cursor.c b/programs/Xserver/dix/cursor.c index 93e10f379..47df5bb4a 100644 --- a/programs/Xserver/dix/cursor.c +++ b/programs/Xserver/dix/cursor.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.3 1998/10/04 09:38:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.4 2001/01/17 22:36:42 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cursor.c,v 1.3 2000/08/17 19:48:17 cpqbld Exp $ */ +/* $Xorg: cursor.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/dix/devices.c b/programs/Xserver/dix/devices.c index 562fee1d4..5f9086a3e 100644 --- a/programs/Xserver/dix/devices.c +++ b/programs/Xserver/dix/devices.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.17 2001/02/16 13:24:06 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.19 2001/09/26 19:26:16 paulo Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ SOFTWARE. ********************************************************/ -/* $Xorg: devices.c,v 1.3 2000/08/17 19:48:17 cpqbld Exp $ */ +/* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ #include "X.h" #include "misc.h" diff --git a/programs/Xserver/dix/dispatch.c b/programs/Xserver/dix/dispatch.c index af1f970dd..b5f9e0d31 100644 --- a/programs/Xserver/dix/dispatch.c +++ b/programs/Xserver/dix/dispatch.c @@ -1,9 +1,13 @@ -/* $Xorg: dispatch.c,v 1.4 2000/08/17 19:48:17 cpqbld Exp $ */ +/* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -64,7 +68,7 @@ SOFTWARE. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.24 2001/08/01 00:44:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.25 2001/10/28 03:33:05 tsi Exp $ */ #ifdef PANORAMIX_DEBUG #include <stdio.h> diff --git a/programs/Xserver/dix/dixutils.c b/programs/Xserver/dix/dixutils.c index 7796d5c61..0132f98f8 100644 --- a/programs/Xserver/dix/dixutils.c +++ b/programs/Xserver/dix/dixutils.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.7 2001/07/25 15:05:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.8 2001/10/28 03:33:06 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -78,7 +82,7 @@ Author: Adobe Systems Incorporated */ -/* $Xorg: dixutils.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: dixutils.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/dix/events.c b/programs/Xserver/dix/events.c index 549cc4e18..4e1581662 100644 --- a/programs/Xserver/dix/events.c +++ b/programs/Xserver/dix/events.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.41 2001/09/04 14:03:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.42 2001/10/28 03:33:06 tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -64,7 +68,7 @@ SOFTWARE. * * *****************************************************************/ -/* $Xorg: events.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include "X.h" #include "misc.h" diff --git a/programs/Xserver/dix/extension.c b/programs/Xserver/dix/extension.c index 3966f36f5..d0bc904d3 100644 --- a/programs/Xserver/dix/extension.c +++ b/programs/Xserver/dix/extension.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.9 2001/01/17 22:36:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.10 2001/08/01 00:44:48 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: extension.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: extension.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/programs/Xserver/dix/ffs.c b/programs/Xserver/dix/ffs.c index 49e28a292..8d0954689 100644 --- a/programs/Xserver/dix/ffs.c +++ b/programs/Xserver/dix/ffs.c @@ -1,15 +1,13 @@ -/* $XConsortium: ffs.c /main/1 1996/12/02 10:20:11 lehors $ */ +/* $Xorg: ffs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/Xserver/dix/gc.c b/programs/Xserver/dix/gc.c index 93eca9ec7..96d663cfb 100644 --- a/programs/Xserver/dix/gc.c +++ b/programs/Xserver/dix/gc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.7 2001/04/23 20:31:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.8 2001/10/28 03:33:06 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: gc.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: gc.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/dix/globals.c b/programs/Xserver/dix/globals.c index a2a8cead5..5ee697189 100644 --- a/programs/Xserver/dix/globals.c +++ b/programs/Xserver/dix/globals.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.7 1999/09/25 14:36:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.8 2001/01/17 22:36:43 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ********************************************************/ -/* $Xorg: globals.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: globals.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/dix/glyphcurs.c b/programs/Xserver/dix/glyphcurs.c index 394f9edad..630e98fa3 100644 --- a/programs/Xserver/dix/glyphcurs.c +++ b/programs/Xserver/dix/glyphcurs.c @@ -1,13 +1,12 @@ /************************************************************************ -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -46,11 +45,8 @@ SOFTWARE. ************************************************************************/ -/* $XConsortium: glyphcurs.c,v 5.15 94/04/17 20:26:38 dpw Exp $ */ +/* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" #include "misc.h" #include "fontstruct.h" #include "dixfontstr.h" @@ -87,7 +83,7 @@ ServerBitsFromGlyph(pfont, ch, cm, ppbits) PixmapPtr ppix; long nby; char *pbits; - pointer gcval[3]; + ChangeGCVal gcval[3]; unsigned char char2b[2]; /* turn glyph index into a protocol-format char2b */ @@ -121,16 +117,17 @@ ServerBitsFromGlyph(pfont, ch, cm, ppbits) rect.height = cm->height; /* fill the pixmap with 0 */ - gcval[0] = (pointer)GXcopy; - gcval[1] = (pointer)0; - gcval[2] = (pointer)pfont; - DoChangeGC(pGC, GCFunction | GCForeground | GCFont, (XID *)gcval, 1); + gcval[0].val = GXcopy; + gcval[1].val = 0; + gcval[2].ptr = (pointer)pfont; + dixChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont, + NULL, gcval); ValidateGC((DrawablePtr)ppix, pGC); (*pGC->ops->PolyFillRect)((DrawablePtr)ppix, pGC, 1, &rect); /* draw the glyph */ - gcval[0] = (pointer)1; - DoChangeGC(pGC, GCForeground, (XID *)gcval, 1); + gcval[0].val = 1; + dixChangeGC(NullClient, pGC, GCForeground, NULL, gcval); ValidateGC((DrawablePtr)ppix, pGC); (*pGC->ops->PolyText16)((DrawablePtr)ppix, pGC, cm->xhot, cm->yhot, 1, (unsigned short *)char2b); diff --git a/programs/Xserver/dix/grabs.c b/programs/Xserver/dix/grabs.c index 662707ddf..fec3b3408 100644 --- a/programs/Xserver/dix/grabs.c +++ b/programs/Xserver/dix/grabs.c @@ -1,9 +1,13 @@ -/* $Xorg: grabs.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: grabs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.1 1998/10/04 09:38:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.2 2001/01/17 22:36:43 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/programs/Xserver/dix/main.c b/programs/Xserver/dix/main.c index 8125ab81e..38b2b51f7 100644 --- a/programs/Xserver/dix/main.c +++ b/programs/Xserver/dix/main.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.36 2001/08/01 00:44:48 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.37 2001/08/06 20:51:05 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: main.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ /**************************************************************** diff --git a/programs/Xserver/dix/pixmap.c b/programs/Xserver/dix/pixmap.c index 5cddb216a..2df5d7374 100644 --- a/programs/Xserver/dix/pixmap.c +++ b/programs/Xserver/dix/pixmap.c @@ -1,9 +1,13 @@ -/* $Xorg: pixmap.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: pixmap.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.3 1998/10/04 09:38:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/programs/Xserver/dix/privates.c b/programs/Xserver/dix/privates.c index c03b0ab80..64d705e24 100644 --- a/programs/Xserver/dix/privates.c +++ b/programs/Xserver/dix/privates.c @@ -1,9 +1,13 @@ -/* $Xorg: privates.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: privates.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.6 1999/12/30 02:37:06 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/programs/Xserver/dix/property.c b/programs/Xserver/dix/property.c index 065e551ff..068f0fc7a 100644 --- a/programs/Xserver/dix/property.c +++ b/programs/Xserver/dix/property.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.9 2001/08/01 00:44:48 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.10 2001/10/28 03:33:07 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: property.c,v 1.3 2000/08/17 19:48:18 cpqbld Exp $ */ +/* $Xorg: property.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include "X.h" #define NEED_REPLIES diff --git a/programs/Xserver/dix/resource.c b/programs/Xserver/dix/resource.c index 572135833..5cda81adf 100644 --- a/programs/Xserver/dix/resource.c +++ b/programs/Xserver/dix/resource.c @@ -2,7 +2,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ SOFTWARE. ********************************************************/ -/* $Xorg: resource.c,v 1.4 2000/08/17 19:48:19 cpqbld Exp $ */ +/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ @@ -68,7 +72,7 @@ SOFTWARE. * 1, and an otherwise arbitrary ID in the low 22 bits, we can create a * resource "owned" by the client. */ -/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.8 2001/02/16 13:24:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.9 2001/10/28 03:33:07 tsi Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/programs/Xserver/dix/swaprep.c b/programs/Xserver/dix/swaprep.c index 11e29a55a..a1316aa5d 100644 --- a/programs/Xserver/dix/swaprep.c +++ b/programs/Xserver/dix/swaprep.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.5 2000/11/03 00:06:35 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.6 2001/01/17 22:36:44 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ********************************************************/ -/* $Xorg: swaprep.c,v 1.3 2000/08/17 19:48:19 cpqbld Exp $ */ +/* $Xorg: swaprep.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #include "X.h" #define NEED_REPLIES diff --git a/programs/Xserver/dix/swapreq.c b/programs/Xserver/dix/swapreq.c index 4a69af73e..0885e9cff 100644 --- a/programs/Xserver/dix/swapreq.c +++ b/programs/Xserver/dix/swapreq.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.2 1998/10/04 09:38:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.3 2001/01/17 22:36:44 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ********************************************************/ -/* $Xorg: swapreq.c,v 1.3 2000/08/17 19:48:19 cpqbld Exp $ */ +/* $Xorg: swapreq.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/programs/Xserver/dix/tables.c b/programs/Xserver/dix/tables.c index 12ea01844..a5ce8f137 100644 --- a/programs/Xserver/dix/tables.c +++ b/programs/Xserver/dix/tables.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.2 1998/10/04 09:38:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.3 2001/01/17 22:36:44 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: tables.c,v 1.3 2000/08/17 19:48:19 cpqbld Exp $ */ +/* $Xorg: tables.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/programs/Xserver/dix/window.c b/programs/Xserver/dix/window.c index 35886d052..6be45db6a 100644 --- a/programs/Xserver/dix/window.c +++ b/programs/Xserver/dix/window.c @@ -1,9 +1,13 @@ -/* $Xorg: window.c,v 1.3 2000/08/17 19:48:19 cpqbld Exp $ */ +/* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ SOFTWARE. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.22 2001/01/17 22:36:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.23 2001/10/28 03:33:07 tsi Exp $ */ #include "misc.h" #include "scrnintstr.h" diff --git a/programs/Xserver/dix/xpstubs.c b/programs/Xserver/dix/xpstubs.c index 6ef67477d..3245e8c33 100644 --- a/programs/Xserver/dix/xpstubs.c +++ b/programs/Xserver/dix/xpstubs.c @@ -1,13 +1,11 @@ /* -Copyright (c) 1996 X Consortium +Copyright 1996, 1998 The Open Group -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 sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,18 +13,18 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ -/* $XConsortium: xpstubs.c /main/1 1996/09/28 17:12:15 rws $ */ +/* $Xorg: xpstubs.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #include "misc.h" #include "font.h" diff --git a/programs/Xserver/hw/dec/ws/Xdec.man b/programs/Xserver/hw/dec/ws/Xdec.man index bff54014f..66a36de9e 100644 --- a/programs/Xserver/hw/dec/ws/Xdec.man +++ b/programs/Xserver/hw/dec/ws/Xdec.man @@ -1,8 +1,12 @@ -.\" $Xorg: Xdec.man,v 1.3 2000/08/17 19:48:20 cpqbld Exp $ +.\" $Xorg: Xdec.man,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ .\" Copyright 1991 Digital Equipment Corporation .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/Xserver/hw/dec/ws/Xdec.man,v 1.6 2001/01/27 18:20:39 dawes Exp $ .\" .\" from The Open Group. .TH XDEC 1 __xorgversion__ diff --git a/programs/Xserver/hw/dec/ws/acc_2da.c b/programs/Xserver/hw/dec/ws/acc_2da.c index 33ea6335e..101da3692 100644 --- a/programs/Xserver/hw/dec/ws/acc_2da.c +++ b/programs/Xserver/hw/dec/ws/acc_2da.c @@ -1,14 +1,13 @@ -/* $XConsortium: acc_2da.c,v 1.3 94/04/17 20:29:52 keith Exp $ */ +/* $Xorg: acc_2da.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1991 X Consortium +Copyright 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/hw/dec/ws/acc_3d.c b/programs/Xserver/hw/dec/ws/acc_3d.c index c9ea4267a..8705f2abd 100644 --- a/programs/Xserver/hw/dec/ws/acc_3d.c +++ b/programs/Xserver/hw/dec/ws/acc_3d.c @@ -1,14 +1,13 @@ -/* $XConsortium: acc_3d.c,v 1.3 94/04/17 20:29:53 keith Exp $ */ +/* $Xorg: acc_3d.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1991 X Consortium +Copyright 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/hw/dec/ws/acc_none.c b/programs/Xserver/hw/dec/ws/acc_none.c index de771e078..a055347e3 100644 --- a/programs/Xserver/hw/dec/ws/acc_none.c +++ b/programs/Xserver/hw/dec/ws/acc_none.c @@ -1,14 +1,13 @@ -/* $XConsortium: acc_none.c,v 1.4 94/04/17 20:29:53 rws Exp $ */ +/* $Xorg: acc_none.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1991 X Consortium +Copyright 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/hw/dec/ws/cfbinit.c b/programs/Xserver/hw/dec/ws/cfbinit.c index 467c8288b..3261e095a 100644 --- a/programs/Xserver/hw/dec/ws/cfbinit.c +++ b/programs/Xserver/hw/dec/ws/cfbinit.c @@ -1,9 +1,13 @@ -/* $Xorg: cfbinit.c,v 1.3 2000/08/17 19:48:20 cpqbld Exp $ */ +/* $Xorg: cfbinit.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /*********************************************************** Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/hw/dec/ws/ext_device.c b/programs/Xserver/hw/dec/ws/ext_device.c index 950716f6f..c438e6f50 100644 --- a/programs/Xserver/hw/dec/ws/ext_device.c +++ b/programs/Xserver/hw/dec/ws/ext_device.c @@ -1,13 +1,12 @@ /*********************************************************** -Copyright (c) 1990 X Consortium +Copyright 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1990 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -53,7 +52,7 @@ SOFTWARE. * */ -/* $XConsortium: ext_device.c,v 1.3 94/04/17 20:29:54 keith Exp $ */ +/* $Xorg: ext_device.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #ifdef XINPUT diff --git a/programs/Xserver/hw/dec/ws/init.c b/programs/Xserver/hw/dec/ws/init.c index db7ed3186..e11135eba 100644 --- a/programs/Xserver/hw/dec/ws/init.c +++ b/programs/Xserver/hw/dec/ws/init.c @@ -1,13 +1,12 @@ /*********************************************************** -Copyright (c) 1991 X Consortium +Copyright 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -46,10 +45,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: init.c,v 1.10 94/04/17 20:29:55 dpw Exp $ */ +/* $Xorg: init.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ #include <stdio.h> #include <sys/types.h> +#include <sys/stat.h> #include <sys/file.h> #include <sys/time.h> #include <sys/tty.h> @@ -64,6 +64,9 @@ SOFTWARE. #include "input.h" /* XXX */ #include <sys/workstation.h> +#ifdef __alpha +#include <machine/hal_sysinfo.h> +#endif #include <sys/inputdevice.h> #include "ws.h" @@ -125,6 +128,7 @@ int forceDepth; int wsScreenPrivateIndex; /* the following filth is forced by a broken dix interface */ +#ifndef PRINT_ONLY_SERVER void InitOutput(screenInfo, argc, argv) ScreenInfo *screenInfo; @@ -134,37 +138,32 @@ InitOutput(screenInfo, argc, argv) int i, j; int si = 0; static int inited = FALSE; - static int ma = 4; - static int mt = 4; - static PtrCtrl ctrl; - static int clicklevel; if (!inited) { - char *clickvolume; - char *mouseAcceleration; - char *mouseThreshold; char *forceD; ws_keyboard_control control; - inited = TRUE; - if ((wsFd = open("/dev/mouse", O_RDWR, 0)) < 0) { - ErrorF("couldn't open device\n"); + struct stat statbuf; + inited = TRUE; + if (!stat("/dev/ws0", &statbuf)) { + if ((wsFd = open("/dev/ws0", O_RDWR, 0)) < 0) { + ErrorF("couldn't open device /dev/ws0\n"); + exit (1); + } + } else { + if ((wsFd = open("/dev/mouse", O_RDWR, 0)) < 0) { + ErrorF("couldn't open device /dev/mouse\n"); exit (1); + } } if (ioctl (wsFd, GET_WORKSTATION_INFO, &wsinfo) != 0) { - ErrorF("GET_WORKSTATION_INFO failed \n"); - exit(1); + FatalError("GET_WORKSTATION_INFO failed, errno %d (%s)\n", + errno, strerror(errno)); } control.device_number = wsinfo.console_keyboard; if (ioctl(wsFd, GET_KEYBOARD_CONTROL, &control) == -1) { - ErrorF("GET_KEYBOARD_CONTROL failed\n"); - exit(1); + FatalError("GET_KEYBOARD_CONTROL failed, errno %d (%s)\n", + errno, strerror(errno)); } - defaultKeyboardControl.click = control.click; - defaultKeyboardControl.bell = control.bell; - defaultKeyboardControl.bell_pitch = control.bell_pitch; - defaultKeyboardControl.bell_duration = control.bell_duration; - defaultKeyboardControl.autoRepeat = control.auto_repeat; - defaultKeyboardControl.leds = control.leds; memmove(defaultKeyboardControl.autoRepeats, control.autorepeats, 32); /* turn off cursors on additional screens initially */ @@ -177,12 +176,6 @@ InitOutput(screenInfo, argc, argv) * opened the device. */ - if (commandLinePairMatch( argc, argv, "c", &clickvolume)) - sscanf( clickvolume, "%d", &clicklevel); - if (commandLinePairMatch( argc, argv, "-a", &mouseAcceleration)) - sscanf( mouseAcceleration, "%d", &ma); - if (commandLinePairMatch( argc, argv, "-t", &mouseThreshold)) - sscanf( mouseThreshold, "%d", &mt); if (commandLinePairMatch( argc, argv, "-forceDepth", &forceD)) sscanf ( forceD, "%d", &forceDepth); } @@ -236,20 +229,21 @@ InitOutput(screenInfo, argc, argv) screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER; screenInfo->numPixmapFormats = NumFormats; - ctrl.num = ma; - ctrl.den = 1; - ctrl.threshold = mt; - wsChangePointerControl( (DevicePtr) NULL, &ctrl); - wsClick(clicklevel); - if (commandLineMatch(argc, argv, "-c")) wsClick(0); wsScreenPrivateIndex = AllocateScreenPrivateIndex(); +#ifdef __alpha + if (getsysinfo(GSI_CPU, (caddr_t)&ws_cpu, sizeof(ws_cpu), 0, 0) == -1) { + fprintf(stderr,"INIT: cannot get cputype.\n"); + exit(1); + } +#else ws_cpu = wsinfo.cpu; +#endif for(i = 0; i < wsinfo.num_screens_exist; i++) { int j, DECaccelerator = FALSE; screenDesc[si].screen = i; if (ioctl(wsFd, GET_SCREEN_INFO, &screenDesc[si]) == -1) { - ErrorF("GET_SCREEN_INFO failed\n"); - exit(1); + FatalError("GET_SCREEN_INFO failed, errno %d (%s)\n", + errno, strerror(errno)); } if (si >= MAXSCREENS) { ErrorF ("Server configured for %d screens, can't configure screen %d\n", MAXSCREENS, si); @@ -306,9 +300,11 @@ InitInput(argc, argv) if (!inited) { inited = TRUE; if (ioctl(wsFd, GET_AND_MAP_EVENT_QUEUE, &queue) == -1) { - ErrorF("GET_AND_MAP_EVENT_QUEUE failed\n"); - exit(1); + FatalError("GET_AND_MAP_EVENT_QUEUE failed, errno %d (%s)\n", + errno, strerror(errno)); } } SetTimeSinceLastInputEvent (); } +#endif /* PRINT_ONLY_SERVER */ + diff --git a/programs/Xserver/hw/dec/ws/keynames.h b/programs/Xserver/hw/dec/ws/keynames.h index 4e2242b9f..744a050b2 100644 --- a/programs/Xserver/hw/dec/ws/keynames.h +++ b/programs/Xserver/hw/dec/ws/keynames.h @@ -1,14 +1,13 @@ -/* $XConsortium: keynames.h,v 1.3 94/04/17 20:29:55 keith Exp $ */ +/* $Xorg: keynames.h,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1991 X Consortium +Copyright 1991, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/hw/dec/ws/mdepthinit.c b/programs/Xserver/hw/dec/ws/mdepthinit.c index 765537c2e..cd8d79184 100644 --- a/programs/Xserver/hw/dec/ws/mdepthinit.c +++ b/programs/Xserver/hw/dec/ws/mdepthinit.c @@ -1,9 +1,13 @@ -/* $Xorg: mdepthinit.c,v 1.3 2000/08/17 19:48:20 cpqbld Exp $ */ +/* $Xorg: mdepthinit.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/dec/ws/mdepthinit.c,v 1.5 1999/01/31 12:21:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/dec/ws/mdepthinit.c,v 1.6 2001/01/17 22:36:46 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/hw/dec/ws/ws.h b/programs/Xserver/hw/dec/ws/ws.h index 35ffbc55b..402311f5c 100644 --- a/programs/Xserver/hw/dec/ws/ws.h +++ b/programs/Xserver/hw/dec/ws/ws.h @@ -1,7 +1,11 @@ /************************************************************************ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: ws.h,v 1.3 2000/08/17 19:48:20 cpqbld Exp $ */ +/* $Xorg: ws.h,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ #ifndef NO_DEC_VALUE_ADDED #define SCREENW6 640 diff --git a/programs/Xserver/hw/dec/ws/ws_color.c b/programs/Xserver/hw/dec/ws/ws_color.c index b6e94781d..c86c4781a 100644 --- a/programs/Xserver/hw/dec/ws/ws_color.c +++ b/programs/Xserver/hw/dec/ws/ws_color.c @@ -2,7 +2,11 @@ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: ws_color.c,v 1.3 2000/08/17 19:48:21 cpqbld Exp $ */ +/* $Xorg: ws_color.c,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* * ws_color.c - device specific color routines, stored in screen diff --git a/programs/Xserver/hw/dec/ws/ws_io.c b/programs/Xserver/hw/dec/ws/ws_io.c index 98c2118d7..8365268c0 100644 --- a/programs/Xserver/hw/dec/ws/ws_io.c +++ b/programs/Xserver/hw/dec/ws/ws_io.c @@ -2,7 +2,11 @@ Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: ws_io.c,v 1.3 2000/08/17 19:48:21 cpqbld Exp $ */ +/* $Xorg: ws_io.c,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ #include <stdio.h> #include <sys/types.h> diff --git a/programs/Xserver/hw/hp/Xhp.man b/programs/Xserver/hw/hp/Xhp.man index 512ac690f..242cfdef4 100644 --- a/programs/Xserver/hw/hp/Xhp.man +++ b/programs/Xserver/hw/hp/Xhp.man @@ -1,8 +1,12 @@ -.\" $Xorg: Xhp.man,v 1.3 2000/08/17 19:48:21 cpqbld Exp $ +.\" $Xorg: Xhp.man,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ .\" Copyright 1994 Hewlett-Packard Company .\" Copyright 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. @@ -27,7 +31,7 @@ .\" consequential damages in connection with the furnishing, performance, or .\" use of this material. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/Xserver/hw/hp/Xhp.man,v 1.6 2001/01/27 18:20:40 dawes Exp $ .\" .TH Xhp 1 __xorgversion__ .SH NAME diff --git a/programs/Xserver/hw/hp/hpCursorUtils.c b/programs/Xserver/hw/hp/hpCursorUtils.c index 3f8520048..0022ed06c 100644 --- a/programs/Xserver/hw/hp/hpCursorUtils.c +++ b/programs/Xserver/hw/hp/hpCursorUtils.c @@ -1,4 +1,4 @@ -/* $XConsortium: hpCursorUtils.c,v 1.2 94/04/17 20:30:05 rws Exp $ */ +/* $Xorg: hpCursorUtils.c,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /************************************************************************* * * (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved. @@ -18,8 +18,8 @@ *************************************************************************/ /*'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -Copyright (c) 1988 by Hewlett-Packard Company -Copyright (c) 1987, 1988 by Digital Equipment Corporation, Maynard, +Copyright 1988 by Hewlett-Packard Company +Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Permission to use, copy, modify, and distribute this software @@ -40,15 +40,13 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -56,15 +54,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''*/ @@ -81,7 +79,6 @@ from the X Consortium. extern int hpActiveScreen; /* Stacked mode, >1 head */ extern WindowPtr *WindowTable; /* Defined by DIX */ -static BoxRec LimitTheCursor; static CursorPtr currentCursors[MAXSCREENS]; void hpBlottoCursors() @@ -91,49 +88,6 @@ void hpBlottoCursors() } /************************************************************ - * hpConstrainCursor - * - * This function simply sets the box to which the cursor - * is limited. - * - * ASSUMPTION: a single BoxRec is used for recording - * the cursor limits, instead of one per screen. This is - * done, in part, because the bogus hpConstrainXY routine - * (see below) is not passed a pScreen pointer. - * - * THEREFORE: Zaphod mode code will have to call this routine - * to establish new limits when the cursor leaves one screen - * for another. - * - ************************************************************/ - -void -hpConstrainCursor (pScreen,pBox) -ScreenPtr pScreen; /* Screen to which it should be constrained */ -BoxPtr pBox; /* Box in which... */ -{ - LimitTheCursor = *pBox; -} - -/************************************************************ - * hpConstrainXY - * - * This function is called directly from x_hil.c - * It adjusts the cursor position to fit within the current - * constraints. - * - ************************************************************/ - -Bool -hpConstrainXY(px,py) - int *px, *py; -{ - *px = max( LimitTheCursor.x1, min( LimitTheCursor.x2,*px)); - *py = max( LimitTheCursor.y1, min( LimitTheCursor.y2,*py)); - return TRUE; -} - -/************************************************************ * hpCursorLimits * Return a box within which the given cursor may move on the given * screen. We assume that the HotBox is actually on the given screen, @@ -156,7 +110,11 @@ BoxPtr pResultBox; /* RETURN: limits for hot spot */ } /************************************************************ + * * hpSetCursorPosition + * + * This routine is called from DIX when the X11 sprite/cursor is warped. + * ************************************************************/ Bool @@ -171,38 +129,16 @@ Bool generateEvent; php = (hpPrivPtr) pScreen->devPrivate; - /* Check to see if we've switched screens: */ + /* Must Update the Input Driver's Variables: */ InDev = GET_HPINPUTDEVICE((DeviceIntPtr)LookupPointerDevice()); - if (pScreen != InDev->pScreen) - { - WindowPtr pRootWindow = WindowTable[InDev->pScreen->myNum]; - - /* - ******************************************************************** - ** Turn old cursor off, blank/unblank screens for stacked mode, - ** let DIX know there is a new screen, set the input driver variable - ** to the new screen number. - ******************************************************************** - */ - - (*((hpPrivPtr)(InDev->pScreen->devPrivate))->CursorOff) - (InDev->pScreen); /* Old cursor off */ - php->ChangeScreen(pScreen); /* Stacked mode switch */ - NewCurrentScreen(pScreen, xhot, yhot);/* Let DIX know */ - hpActiveScreen = pScreen->myNum; /* Input driver global */ - } - - - /* Must Update the Corvallis Input Driver's Variables: */ InDev->pScreen = pScreen; InDev->coords[0] = xhot; InDev->coords[1] = yhot; - if (!generateEvent) - { - (*php->MoveMouse)(pScreen, xhot, yhot, 0); /* Do the move now */ - } - else + /* Do the move now */ + (*php->MoveMouse)(pScreen, xhot, yhot, 0); + + if (generateEvent) { queue_motion_event(InDev); /* Enqueue motion event, in x_hil.c */ isItTimeToYield++; /* Insures client get the event! */ @@ -210,4 +146,4 @@ Bool generateEvent; return(TRUE); -} +} /* hpSetCursorPosition() */ diff --git a/programs/Xserver/hw/hp/include/hppriv.h b/programs/Xserver/hw/hp/include/hppriv.h index 547a19279..171d14db2 100644 --- a/programs/Xserver/hw/hp/include/hppriv.h +++ b/programs/Xserver/hw/hp/include/hppriv.h @@ -1,4 +1,4 @@ -/* $XConsortium: hppriv.h,v 1.2 94/04/17 20:30:06 rws Exp $ */ +/* $Xorg: hppriv.h,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /************************************************************************* * * (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved. @@ -19,15 +19,13 @@ /* -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -35,19 +33,19 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. -Copyright (c) 1988 by Hewlett-Packard Company -Copyright (c) 1987, 1988 by Digital Equipment Corporation, Maynard, +Copyright 1988 by Hewlett-Packard Company +Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Permission to use, copy, modify, and distribute this software diff --git a/programs/Xserver/hw/hp/input/hildef.h b/programs/Xserver/hw/hp/input/hildef.h index b479016ad..67305a79d 100644 --- a/programs/Xserver/hw/hp/input/hildef.h +++ b/programs/Xserver/hw/hp/input/hildef.h @@ -1,17 +1,15 @@ #ifndef HILDEF_H #define HILDEF_H -/* $XConsortium: hildef.h,v 8.34 94/04/17 20:30:12 rws Exp $ */ +/* $Xorg: hildef.h,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* -Copyright (c) 1986, 1987 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,34 +17,34 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. -Copyright (c) 1986, 1987 by Hewlett-Packard Company +Copyright 1988 by Hewlett-Packard Company -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright -notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting -documentation, and that the name of Hewlett-Packard not be used in -advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +Permission to use, copy, modify, and distribute this software +and its documentation for any purpose and without fee is hereby +granted, provided that the above copyright notice appear in all +copies and that both that copyright notice and this permission +notice appear in supporting documentation, and that the name of +Hewlett-Packard not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD -TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. Hewlett-Packard shall not be liable for errors -contained herein or direct, indirect, special, incidental or -consequential damages in connection with the furnishing, +TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. Hewlett-Packard shall not be liable for errors +contained herein or direct, indirect, special, incidental or +consequential damages in connection with the furnishing, performance, or use of this material. This software is not subject to any license of the American @@ -54,7 +52,6 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ - /* ** File: hildefs.h ** @@ -62,6 +59,7 @@ University of California. ** */ +#include "x_serialdrv.h" #include "sys/param.h" #include "X.h" #include "scrnintstr.h" @@ -72,6 +70,7 @@ University of California. /* KEEP THE FOLLOWING IN SYNC WITH THE DIX DEFINITION */ /***************************************************************/ +#define MAXNAMLEN 255 #define READ_SIZ 2000 /* leave room for partial packets*/ #define BUF_SIZ 2048 /* size of static buffer to use */ @@ -132,65 +131,50 @@ University of California. #define NLOCK 3 #define CAPSCODE 0x37 #define KBSIZE 32 /* bytes to hold 256 bits (1 per key/button */ -#define LedOn(dev, d,cd,data) \ -(dev->key->modifierMap[cd] & d->led[0] ? ioctl(d->file_ds,LedCmd[0].on,data) : \ - dev->key->modifierMap[cd] & d->led[1] ? ioctl(d->file_ds,LedCmd[1].on,data) : \ - dev->key->modifierMap[cd] & d->led[2] ? ioctl(d->file_ds,LedCmd[2].on,data) : \ - ioctl(d->file_ds, LedCmd[3].on, data)) -#define LedOff(dev, d,cd,data) \ -(dev->key->modifierMap[cd] & d->led[0] ? ioctl(d->file_ds,LedCmd[0].off,data): \ - dev->key->modifierMap[cd] & d->led[1] ? ioctl(d->file_ds,LedCmd[1].off,data): \ - dev->key->modifierMap[cd] & d->led[2] ? ioctl(d->file_ds,LedCmd[2].off,data): \ - ioctl(d->file_ds, LedCmd[3].off, data)) -#define LatchKey(d,code) (d->kb_latched[code>>3] |= (1<<(code & 7))) -#define LatchButton(d,code) (LatchKey(d,code)) -#define UnlatchKey(d,code) (d->kb_latched[code>>3] &= ~(1<<(code & 7))) -#define UnlatchButton(d,code) (UnlatchKey(d,code)) -#define DeviceHasLeds(d) (d->hil_header.iob & HILIOB_NPA) +#define ExpectUpKey(d,code) (d->kb_exp_up[code>>3] |= (1<<(code & 7))) +#define DontExpectUpKey(d,code) (d->kb_exp_up[code>>3] &= ~(1<<(code & 7))) +#define DeviceHasLeds(d) (d->iob & HILIOB_NPA) #define KeyHasLed(dev,d,cd) ((dev->key->modifierMap[cd] & d->led[0]) || \ (dev->key->modifierMap[cd] & d->led[1]) || \ (dev->key->modifierMap[cd] & d->led[2]) || \ (dev->key->modifierMap[cd] & d->led[3])) -#define KeyIsLatched(d,code) (d->kb_latched[code>>3] & (1<<(code & 7))) +#define UpIsExpected(d,code) (d->kb_exp_up[code>>3] & (1<<(code & 7))) #define KeyIsIgnored(d,code) (d->kb_ignore[code>>3] & (1<<(code & 7))) #define IgnoreKey(d,code) (d->kb_ignore[code>>3] |= (1<<(code & 7))) #define UnignoreKey(d,code) (d->kb_ignore[code>>3] &= ~(1<<(code & 7))) -#define ButtonIsLatched(d,code) (KeyIsLatched(d,code)) -#define ButtonIsIgnored(d,code) (KeyIsIgnored(d,code)) -#define IgnoreButton(d,code) (IgnoreKey(d,code)) -#define UnignoreButton(d,code) (UnignoreKey(d,code)) #define KeyDownEvent(ev) (ev->u.u.type==KeyPress | ev->u.u.type==DeviceKeyPress) #define ButtonDownEvent(ev) (ev->u.u.type==ButtonPress | \ ev->u.u.type==DeviceButtonPress) #define KeyUpEvent(ev) (ev->u.u.type==KeyRelease | \ ev->u.u.type==DeviceKeyRelease) -#define IsLockKey(dev,code) (dev->key->modifierMap[code] & LockMask) + +#define ITF_KATAKANA 0xdd +#define ITF_JAPANESE 0xc2 +#define PS2_HIL_JIS 0xc1 +#define PS2_DIN_JIS "PS2_DIN_JIS" +#define IsLockKey(dev,code) (dev->key->modifierMap[code] & LockMask ? \ + LockMapIndex : 0) +#define IsMod2Key(dev,code) (dev->key->modifierMap[code] & Mod2Mask ? \ + Mod2MapIndex : 0) +#define IsJapaneseEnv(pHP) (pHP->id == ITF_KATAKANA || \ + pHP->id == ITF_JAPANESE || \ + pHP->id == PS2_HIL_JIS || \ + !strcmp(pHP->d.keymap_name, PS2_DIN_JIS)) + +#define IsToggleKey(dev,pHP,code) (IsLockKey(dev,code)) + +/* This is the Kana Lock solution that APPO initially wanted. +#define IsToggleKey(dev,pHP,code) (IsLockKey(dev,code) || \ + (IsJapaneseEnv(pHP) && IsMod2Key(dev,code))) +*/ #define KeyIsDown(dev, code) (dev->key && \ (dev->key->down[code >> 3] & (1 << (code & 7)))) #define KeyIsRepeating(dev, code) (dev->kbdfeed && \ (dev->kbdfeed->ctrl.autoRepeats[code >> 3] & (1 << (code & 7)))) -struct hil_desc_record { - int resx; /* x-axis counts / meter */ - int resy; /* x-axis counts / meter */ - int size_x; /* maximum x value */ - int size_y; /* maximum y value */ - char *keymap_name; /* name of keymap */ - u_char flags; /* device characteristics */ - u_char ax_num; /* number of axes */ - u_short min_kcode; /* minimum keycode */ - u_short max_kcode; /* maximum keycode */ - u_char id; /* device HIL id */ - u_char iob; /* I/O descriptor Byte */ - u_char p_button_count; /* count of physical buttons */ - u_char v_button_count; /* count of virtual buttons */ - u_char num_keys; /* number of keys */ - u_char num_leds; /* number of leds */ -} ; - typedef struct _DeviceClients *DeviceClientsPtr; typedef struct _DeviceClients { @@ -202,13 +186,12 @@ typedef struct _DeviceClients { } DeviceClients; typedef struct _indevices { - struct hil_desc_record hil_header; /* HIL hdr */ + u_char id; /* device HIL id */ + u_char iob; /* I/O descriptor Byte */ float scaleX; /* Tablet scaling */ float scaleY; /* Tablet scaling */ - int file_ds; /* file descriptor */ DeviceClientsPtr clients; /* clients using device */ ScreenPtr pScreen; /* Screen pointer is on */ - int repeat_rate; /* keyboard repeat rate */ int coords[MAX_AXES];/* current coords of device */ Atom x_atom; /* atom for x type */ u_int button_state; /* device button state */ @@ -223,23 +206,22 @@ typedef struct _indevices { u_char ignoremask; /* for button emulation */ u_char savebutton; /* saved button */ char x_type; /* MOUSE or KEYBOARD */ - u_char dev_id; /* device X id */ u_char mode; /* abs or rel movement */ - u_char sndx; /* index of serialproc entry */ - u_char pad1; /* reserved */ + u_char use; /* device use */ u_char pad2; /* reserved */ - char open_cnt; /* # clients accessing device */ - char dev_name[MAX_X_NAMELEN]; - char x_name[MAX_X_NAMELEN]; - u_char bell1[4]; /* arrays for the s300 beeper params */ - u_char bell2[4]; - u_char bell3[4]; u_char hpflags; /* hp-specific feature flags */ u_char led[NLOCK+1]; - u_char kb_latched[KBSIZE]; + u_char kb_exp_up[KBSIZE]; u_char kb_ignore[KBSIZE]; + char entry[MAX_NM]; + char driver_name[MAX_NM]; /* filled in by X server */ + int *dpmotionBuf; + int *dheadmotionBuf; + HPInputDeviceHeader d; + SerialProcs s; } HPInputDevice; + struct dev_info { unsigned int timestamp; unsigned char poll_hdr; diff --git a/programs/Xserver/hw/hp/input/hpKeyMap.c b/programs/Xserver/hw/hp/input/hpKeyMap.c index a67049727..9e52ba983 100644 --- a/programs/Xserver/hw/hp/input/hpKeyMap.c +++ b/programs/Xserver/hw/hp/input/hpKeyMap.c @@ -1,9 +1,13 @@ -/* $Xorg: hpKeyMap.c,v 1.3 2000/08/17 19:48:22 cpqbld Exp $ */ +/* $Xorg: hpKeyMap.c,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* Copyright 1986, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/hw/hp/input/hpkeys.h b/programs/Xserver/hw/hp/input/hpkeys.h index 2262f28e2..09f42cc75 100644 --- a/programs/Xserver/hw/hp/input/hpkeys.h +++ b/programs/Xserver/hw/hp/input/hpkeys.h @@ -1,17 +1,15 @@ #ifndef HPKEYS_H #define HPKEYS_H -/* $XConsortium: hpkeys.h,v 1.2 94/04/17 20:30:14 rws Exp $ */ +/* $Xorg: hpkeys.h,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* -Copyright (c) 1986, 1987 X Consortium +Copyright 1986, 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,18 +17,18 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. -Copyright (c) 1986, 1987 by Hewlett-Packard Company +Copyright 1986, 1987 by Hewlett-Packard Company Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without diff --git a/programs/Xserver/hw/hp/input/screentab.h b/programs/Xserver/hw/hp/input/screentab.h index 3760268ce..cb0f8d9a7 100644 --- a/programs/Xserver/hw/hp/input/screentab.h +++ b/programs/Xserver/hw/hp/input/screentab.h @@ -1,15 +1,13 @@ -/* $XConsortium: screentab.h,v 1.2 94/04/17 20:30:14 rws Exp $ */ +/* $Xorg: screentab.h,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* -Copyright (c) 1986, 1987 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,34 +15,34 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. -Copyright (c) 1986, 1987 by Hewlett-Packard Company +Copyright 1988 by Hewlett-Packard Company -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright -notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting -documentation, and that the name of Hewlett-Packard not be used in -advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +Permission to use, copy, modify, and distribute this software +and its documentation for any purpose and without fee is hereby +granted, provided that the above copyright notice appear in all +copies and that both that copyright notice and this permission +notice appear in supporting documentation, and that the name of +Hewlett-Packard not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD -TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. Hewlett-Packard shall not be liable for errors -contained herein or direct, indirect, special, incidental or -consequential damages in connection with the furnishing, +TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. Hewlett-Packard shall not be liable for errors +contained herein or direct, indirect, special, incidental or +consequential damages in connection with the furnishing, performance, or use of this material. This software is not subject to any license of the American @@ -52,7 +50,6 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ - /* * Header file which declares structures to initialize and close * each type of screen supported by the X server. diff --git a/programs/Xserver/hw/hp/input/x_hil.c b/programs/Xserver/hw/hp/input/x_hil.c index 6e08db343..dc86bcbba 100644 --- a/programs/Xserver/hw/hp/input/x_hil.c +++ b/programs/Xserver/hw/hp/input/x_hil.c @@ -1,4 +1,4 @@ -/* $Xorg: x_hil.c,v 1.3 2000/08/17 19:48:23 cpqbld Exp $ */ +/* $Xorg: x_hil.c,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /******************************************************************* ** @@ -24,13 +24,17 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/hp/input/x_hil.c,v 3.1 1998/10/04 09:38:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/hp/input/x_hil.c,v 3.2 2001/01/17 22:36:47 dawes Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/hw/hp/input/x_hil.h b/programs/Xserver/hw/hp/input/x_hil.h index 7e2df79b9..2e178c4e2 100644 --- a/programs/Xserver/hw/hp/input/x_hil.h +++ b/programs/Xserver/hw/hp/input/x_hil.h @@ -1,17 +1,15 @@ #ifndef X_HIL_H #define X_HIL_H -/* $XConsortium: x_hil.h,v 1.2 94/04/17 20:30:16 rws Exp $ */ +/* $Xorg: x_hil.h,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* -Copyright (c) 1986, 1987 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,34 +17,34 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. -Copyright (c) 1986, 1987 by Hewlett-Packard Company +Copyright 1988 by Hewlett-Packard Company -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright -notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting -documentation, and that the name of Hewlett-Packard not be used in -advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +Permission to use, copy, modify, and distribute this software +and its documentation for any purpose and without fee is hereby +granted, provided that the above copyright notice appear in all +copies and that both that copyright notice and this permission +notice appear in supporting documentation, and that the name of +Hewlett-Packard not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD -TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. Hewlett-Packard shall not be liable for errors -contained herein or direct, indirect, special, incidental or -consequential damages in connection with the furnishing, +TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. Hewlett-Packard shall not be liable for errors +contained herein or direct, indirect, special, incidental or +consequential damages in connection with the furnishing, performance, or use of this material. This software is not subject to any license of the American @@ -54,7 +52,6 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ - #include "hpext.h" /* MAXHILEVENTS is the maximum number of X events that can diff --git a/programs/Xserver/hw/hp/input/x_hilinit.c b/programs/Xserver/hw/hp/input/x_hilinit.c index 5e88a840b..76df9cd91 100644 --- a/programs/Xserver/hw/hp/input/x_hilinit.c +++ b/programs/Xserver/hw/hp/input/x_hilinit.c @@ -1,9 +1,13 @@ -/* $Xorg: x_hilinit.c,v 1.3 2000/08/17 19:48:24 cpqbld Exp $ */ +/* $Xorg: x_hilinit.c,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ -/* $XFree86: xc/programs/Xserver/hw/hp/input/x_hilinit.c,v 3.3 1998/10/04 09:38:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/hp/input/x_hilinit.c,v 3.4 2001/01/17 22:36:47 dawes Exp $ */ #define NEED_EVENTS #define NITEMS(array) (sizeof(array)/sizeof(array[0])) diff --git a/programs/Xserver/hw/hp/input/x_hilinit.h b/programs/Xserver/hw/hp/input/x_hilinit.h index 885519ffd..6eb654192 100644 --- a/programs/Xserver/hw/hp/input/x_hilinit.h +++ b/programs/Xserver/hw/hp/input/x_hilinit.h @@ -1,17 +1,15 @@ #ifndef X_HILINIT_H #define X_HILINIT_H -/* $XConsortium: x_hilinit.h,v 8.29 94/04/17 20:30:18 rws Exp $ */ +/* $Xorg: x_hilinit.h,v 1.4 2001/02/09 02:04:42 xorgcvs Exp $ */ /* -Copyright (c) 1986, 1987 X Consortium +Copyright 1986, 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,18 +17,18 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. -Copyright (c) 1986, 1987 by Hewlett-Packard Company +Copyright 1986, 1987 by Hewlett-Packard Company Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without diff --git a/programs/Xserver/hw/hp/input/xtest1imp.c b/programs/Xserver/hw/hp/input/xtest1imp.c index dedbf9a9b..510c70710 100644 --- a/programs/Xserver/hw/hp/input/xtest1imp.c +++ b/programs/Xserver/hw/hp/input/xtest1imp.c @@ -1,4 +1,4 @@ -/* $XConsortium: xtest1imp.c,v 1.2 94/04/17 20:30:19 rws Exp $ */ +/* $Xorg: xtest1imp.c,v 1.4 2001/02/09 02:04:43 xorgcvs Exp $ */ /* * File: xtest1dd.c * @@ -9,14 +9,13 @@ /* -Copyright (c) 1986, 1987, 1988 X Consortium +Copyright 1986, 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,13 +23,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. -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. Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation @@ -157,7 +156,7 @@ int dev_type; coords[0] = xdiff; coords[1] = jy - hpPointer->coords[1]; process_motion (inputInfo.pointer, hpPointer, hpPointer, coords); - ev = format_ev (MotionNotify, 0, GetTimeInMillis(), hpPointer, NULL); + ev = format_ev (inputInfo.pointer, MotionNotify, 0, GetTimeInMillis(), hpPointer, NULL); ProcessInputEvents(); } @@ -189,6 +188,7 @@ int keystate; int mousex; int mousey; { + DeviceIntPtr dev; HPInputDevice *tmp_ptr; xEvent *format_ev(), *ev; @@ -198,12 +198,14 @@ int mousey; */ if (dev_type == MOUSE) { + dev = inputInfo.pointer; hpPointer->coords[0] = mousex; hpPointer->coords[1] = mousey; tmp_ptr = hpPointer; } else { + dev = inputInfo.keyboard; hpPointer->coords[0] = mousex; hpPointer->coords[1] = mousey; tmp_ptr = hpKeyboard; @@ -245,7 +247,7 @@ int mousey; /* * put a key/button input action into the servers input event queue */ - ev = format_ev (keystate, keycode, GetTimeInMillis(), tmp_ptr, NULL); + ev = format_ev (dev, keystate, keycode, GetTimeInMillis(), tmp_ptr, NULL); /* * Tell the server to process all of the events in its input queue. * This makes sure that key/button event we just put in the queue diff --git a/programs/Xserver/hw/sun/Xsun.man b/programs/Xserver/hw/sun/Xsun.man index 9afe3236d..17c1a9773 100644 --- a/programs/Xserver/hw/sun/Xsun.man +++ b/programs/Xserver/hw/sun/Xsun.man @@ -1,8 +1,12 @@ -.\" $Xorg: Xsun.man,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ +.\" $Xorg: Xsun.man,v 1.4 2001/02/09 02:04:43 xorgcvs Exp $ .\" Copyright 1988 Sun Microsystems, Inc. .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/Xserver/hw/sun/Xsun.man,v 1.7 2001/01/27 18:20:40 dawes Exp $ .\" .TH XSUN 1 __xorgversion__ .SH NAME diff --git a/programs/Xserver/hw/sun/kbd_mode.man b/programs/Xserver/hw/sun/kbd_mode.man index 0c49a8306..367b4fc9a 100644 --- a/programs/Xserver/hw/sun/kbd_mode.man +++ b/programs/Xserver/hw/sun/kbd_mode.man @@ -1,8 +1,12 @@ -.\" $Xorg: kbd_mode.man,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ +.\" $Xorg: kbd_mode.man,v 1.4 2001/02/09 02:04:43 xorgcvs Exp $ .\" Copyright 1987 Sun Microsystems, Inc. .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.6 2001/01/27 18:20:41 dawes Exp $ .\" .TH KBD_MODE 1 __xorgversion__ .SH NAME diff --git a/programs/Xserver/hw/sun/sunCfb.c b/programs/Xserver/hw/sun/sunCfb.c index de63cbe21..8025b5af2 100644 --- a/programs/Xserver/hw/sun/sunCfb.c +++ b/programs/Xserver/hw/sun/sunCfb.c @@ -1,10 +1,14 @@ -/* $Xorg: sunCfb.c,v 1.4 2000/08/17 19:48:29 cpqbld Exp $ */ +/* $Xorg: sunCfb.c,v 1.5 2001/02/09 02:04:43 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -50,7 +54,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.12 2001/01/17 22:36:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.13 2001/07/25 15:05:01 dawes Exp $ */ /* * Copyright 1987 by the Regents of the University of California diff --git a/programs/Xserver/hw/sun/sunCfb24.c b/programs/Xserver/hw/sun/sunCfb24.c index aeccb1fe0..fa3a58e85 100644 --- a/programs/Xserver/hw/sun/sunCfb24.c +++ b/programs/Xserver/hw/sun/sunCfb24.c @@ -1,10 +1,14 @@ -/* $Xorg: sunCfb24.c,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ */ +/* $Xorg: sunCfb24.c,v 1.4 2001/02/09 02:04:43 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunCfb24.c,v 1.2 2001/10/28 03:33:10 tsi Exp $ */ /* * The CG8 is similar to the CG4 in that it has a mono plane, an enable diff --git a/programs/Xserver/hw/sun/sunCursor.c b/programs/Xserver/hw/sun/sunCursor.c index cd36853f0..09d1dc083 100644 --- a/programs/Xserver/hw/sun/sunCursor.c +++ b/programs/Xserver/hw/sun/sunCursor.c @@ -1,10 +1,14 @@ -/* $Xorg: sunCursor.c,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ */ +/* $Xorg: sunCursor.c,v 1.4 2001/02/09 02:04:43 xorgcvs Exp $ */ /* Copyright 1988 Sun Microsystems, Inc. Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/sun/sunCursor.c,v 3.3 2001/08/17 22:08:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunCursor.c,v 3.4 2001/10/28 03:33:10 tsi Exp $ */ /*- * sunCursor.c -- diff --git a/programs/Xserver/hw/sun/sunFbs.c b/programs/Xserver/hw/sun/sunFbs.c index f040de8f1..708038b61 100644 --- a/programs/Xserver/hw/sun/sunFbs.c +++ b/programs/Xserver/hw/sun/sunFbs.c @@ -1,10 +1,14 @@ -/* $Xorg: sunFbs.c,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ */ +/* $Xorg: sunFbs.c,v 1.4 2001/02/09 02:04:43 xorgcvs Exp $ */ /* Copyright 1990, 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -63,7 +67,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/sun/sunFbs.c,v 1.3 1998/10/04 09:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunFbs.c,v 1.4 2001/01/17 22:36:50 dawes Exp $ */ /****************************************************************/ /* Modified from sunCG4C.c for X11R3 by Tom Jarmolowski */ diff --git a/programs/Xserver/hw/sun/sunGX.c b/programs/Xserver/hw/sun/sunGX.c index 5d0c4c452..f4e1a49d3 100644 --- a/programs/Xserver/hw/sun/sunGX.c +++ b/programs/Xserver/hw/sun/sunGX.c @@ -1,10 +1,14 @@ /* -static char *rid="$Xorg: sunGX.c,v 1.4 2000/08/18 11:06:23 xorgcvs Exp $"; +static char *rid="$Xorg: sunGX.c,v 1.5 2001/02/09 02:04:44 xorgcvs Exp $"; */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/hw/sun/sunGX.c,v 1.5 2001/08/17 22:08:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunGX.c,v 1.6 2001/10/28 03:33:10 tsi Exp $ */ #include "sun.h" diff --git a/programs/Xserver/hw/sun/sunGX.h b/programs/Xserver/hw/sun/sunGX.h index 07dcaaafc..ebf1da19f 100644 --- a/programs/Xserver/hw/sun/sunGX.h +++ b/programs/Xserver/hw/sun/sunGX.h @@ -1,9 +1,13 @@ /* - * $Xorg: sunGX.h,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ + * $Xorg: sunGX.h,v 1.4 2001/02/09 02:04:44 xorgcvs Exp $ * Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunGX.h,v 1.3 2001/07/29 05:01:13 tsi Exp $ */ typedef unsigned int Uint; typedef volatile Uint VUint; diff --git a/programs/Xserver/hw/sun/sunMfb.c b/programs/Xserver/hw/sun/sunMfb.c index 4f2ad808e..fa8eb70db 100644 --- a/programs/Xserver/hw/sun/sunMfb.c +++ b/programs/Xserver/hw/sun/sunMfb.c @@ -1,10 +1,14 @@ -/* $Xorg: sunMfb.c,v 1.3 2000/08/17 19:48:32 cpqbld Exp $ */ +/* $Xorg: sunMfb.c,v 1.4 2001/02/09 02:04:44 xorgcvs Exp $ */ /* Copyright 1990, 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/sun/sunMfb.c,v 3.2 1998/10/04 09:38:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunMfb.c,v 3.3 2001/01/17 22:36:51 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/programs/Xserver/hw/sun/sunMultiDepth.c b/programs/Xserver/hw/sun/sunMultiDepth.c index ee3ffd286..204f620d8 100644 --- a/programs/Xserver/hw/sun/sunMultiDepth.c +++ b/programs/Xserver/hw/sun/sunMultiDepth.c @@ -1,9 +1,13 @@ -/* $Xorg: sunMultiDepth.c,v 1.3 2000/08/17 19:48:32 cpqbld Exp $ */ +/* $Xorg: sunMultiDepth.c,v 1.4 2001/02/09 02:04:44 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/sun/sunMultiDepth.c,v 1.4 1998/10/04 09:38:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunMultiDepth.c,v 1.5 2001/01/17 22:36:51 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/hw/vfb/InitInput.c b/programs/Xserver/hw/vfb/InitInput.c index 187d618f1..e37f1ead5 100644 --- a/programs/Xserver/hw/vfb/InitInput.c +++ b/programs/Xserver/hw/vfb/InitInput.c @@ -1,9 +1,13 @@ -/* $Xorg: InitInput.c,v 1.3 2000/08/17 19:48:38 cpqbld Exp $ */ +/* $Xorg: InitInput.c,v 1.4 2001/02/09 02:04:44 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.7 2001/05/16 08:01:09 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.8 2001/06/11 16:59:03 dawes Exp $ */ #include "X11/X.h" #define NEED_EVENTS diff --git a/programs/Xserver/hw/vfb/InitOutput.c b/programs/Xserver/hw/vfb/InitOutput.c index ee343b808..577ca9332 100644 --- a/programs/Xserver/hw/vfb/InitOutput.c +++ b/programs/Xserver/hw/vfb/InitOutput.c @@ -1,9 +1,13 @@ -/* $Xorg: InitOutput.c,v 1.3 2000/08/17 19:48:38 cpqbld Exp $ */ +/* $Xorg: InitOutput.c,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.18 2001/05/16 08:01:09 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.19 2001/05/16 14:06:28 alanh Exp $ */ #if defined(WIN32) #include <X11/Xwinsock.h> diff --git a/programs/Xserver/hw/vfb/Xvfb.man b/programs/Xserver/hw/vfb/Xvfb.man index 1857142e0..0415739e7 100644 --- a/programs/Xserver/hw/vfb/Xvfb.man +++ b/programs/Xserver/hw/vfb/Xvfb.man @@ -1,7 +1,11 @@ -.\" $Xorg: Xvfb.man,v 1.3 2000/08/17 19:48:39 cpqbld Exp $ +.\" $Xorg: Xvfb.man,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.7 2001/01/27 18:20:41 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.8 2001/02/07 23:25:55 dawes Exp $ .\" .TH XVFB 1 __xorgversion__ .SH NAME diff --git a/programs/Xserver/hw/vfb/lk201kbd.h b/programs/Xserver/hw/vfb/lk201kbd.h index cd8aee66b..9b4090ed0 100644 --- a/programs/Xserver/hw/vfb/lk201kbd.h +++ b/programs/Xserver/hw/vfb/lk201kbd.h @@ -1,13 +1,12 @@ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -46,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: lk201kbd.h,v 1.2 94/04/17 20:30:26 dpw Exp $ */ +/* $Xorg: lk201kbd.h,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ */ #define MIN_LK201_KEY 86 #define MAX_LK201_KEY 251 diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index f2fa60b97..440fe9a7a 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,7 +1,11 @@ -XFree86 4.1.99.2 (12 December 2001) +XFree86 4.1.99.3 (xx December 2001) + 568. Fix "The Open Group" copyright notices to reflect the change in + post R6.4 licensing (#5093, Mark Snitily, from X11R6.6). 567. Added debugging helpers (Egbert Eich). 566. Added support for the Trident CyberBladeXPAi1 (Egbert Eich). 565. Fixed Mono8x8Fill problem in S3 Virge and Savage drivers (Egbert Eich). + +XFree86 4.1.99.2 (12 December 2001) 564. Fix XDarwin GetImage bug on screens other than 0 in rootless mode (Gregory Parker). 563. Fix acceleration, hw cursor and console restoration in the "nv" driver @@ -14321,4 +14325,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2086 2001/12/12 18:21:14 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2087 2001/12/13 18:01:48 eich Exp $ diff --git a/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c b/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c index 3c3d16658..e6612b53f 100644 --- a/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c +++ b/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c @@ -2,7 +2,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.8 2000/06/17 00:03:19 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.9 2000/06/25 12:46:00 alanh Exp $ */ #include "X.h" diff --git a/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c b/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c index c383b7ff3..882e8f37b 100644 --- a/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c +++ b/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c,v 1.1 1999/01/23 09:56:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c,v 1.2 1999/08/21 13:48:43 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c b/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c index 1dcf72c02..f55aeb86c 100644 --- a/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.3 2000/02/11 06:33:46 mvojkovi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c b/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c index f694e0d14..f21507573 100644 --- a/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.3 2001/08/01 00:44:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.4 2001/10/28 03:34:09 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/hw/xwin/InitInput.c b/programs/Xserver/hw/xwin/InitInput.c index b0a7fa3e7..db7e3cf8a 100644 --- a/programs/Xserver/hw/xwin/InitInput.c +++ b/programs/Xserver/hw/xwin/InitInput.c @@ -3,7 +3,11 @@ Copyright 1993, 1998 The Open Group - All Rights Reserved. + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.7 2001/11/11 22:45:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.8 2001/11/21 08:51:24 alanh Exp $ */ #include "win.h" diff --git a/programs/Xserver/hw/xwin/InitOutput.c b/programs/Xserver/hw/xwin/InitOutput.c index 5b3ddd96d..c312d7abd 100644 --- a/programs/Xserver/hw/xwin/InitOutput.c +++ b/programs/Xserver/hw/xwin/InitOutput.c @@ -3,7 +3,11 @@ Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.25 2001/11/11 22:45:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.26 2001/11/21 08:51:24 alanh Exp $ */ #include "win.h" diff --git a/programs/Xserver/lbx/lbxcmap.c b/programs/Xserver/lbx/lbxcmap.c index 8829e807b..b1366aa3f 100644 --- a/programs/Xserver/lbx/lbxcmap.c +++ b/programs/Xserver/lbx/lbxcmap.c @@ -1,9 +1,13 @@ -/* $Xorg: lbxcmap.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $Xorg: lbxcmap.c,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.8 2001/02/16 13:24:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.9 2001/08/23 14:46:57 alanh Exp $ */ #include <sys/types.h> #define NEED_REPLIES diff --git a/programs/Xserver/lbx/lbxdix.c b/programs/Xserver/lbx/lbxdix.c index eb43fea2b..c392e6415 100644 --- a/programs/Xserver/lbx/lbxdix.c +++ b/programs/Xserver/lbx/lbxdix.c @@ -1,9 +1,13 @@ -/* $Xorg: lbxdix.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $Xorg: lbxdix.c,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.6 2001/05/15 10:19:43 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.7 2001/08/23 14:46:57 alanh Exp $ */ /* various bits of DIX-level mangling */ diff --git a/programs/Xserver/lbx/lbxmain.c b/programs/Xserver/lbx/lbxmain.c index 7eb5f3615..443bb0414 100644 --- a/programs/Xserver/lbx/lbxmain.c +++ b/programs/Xserver/lbx/lbxmain.c @@ -1,9 +1,13 @@ -/* $Xorg: lbxmain.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $Xorg: lbxmain.c,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.11 2001/08/23 14:46:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.12 2001/10/28 03:34:12 tsi Exp $ */ #include <sys/types.h> #define NEED_REPLIES diff --git a/programs/Xserver/lbx/lbxprop.c b/programs/Xserver/lbx/lbxprop.c index 0c6b03d95..9082250d6 100644 --- a/programs/Xserver/lbx/lbxprop.c +++ b/programs/Xserver/lbx/lbxprop.c @@ -1,9 +1,13 @@ -/* $Xorg: lbxprop.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $Xorg: lbxprop.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.4 2001/05/15 10:19:43 eich Exp $ */ /* various bits of DIX-level mangling */ diff --git a/programs/Xserver/lbx/lbxserve.h b/programs/Xserver/lbx/lbxserve.h index 5aa0e3d42..eeff64804 100644 --- a/programs/Xserver/lbx/lbxserve.h +++ b/programs/Xserver/lbx/lbxserve.h @@ -1,9 +1,13 @@ -/* $Xorg: lbxserve.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $Xorg: lbxserve.h,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ */ #ifndef _LBXSERVE_H_ diff --git a/programs/Xserver/lbx/lbxsquish.c b/programs/Xserver/lbx/lbxsquish.c index 24bf9b12b..f3dc13163 100644 --- a/programs/Xserver/lbx/lbxsquish.c +++ b/programs/Xserver/lbx/lbxsquish.c @@ -1,9 +1,13 @@ -/* $Xorg: lbxsquish.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $Xorg: lbxsquish.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #include "X.h" diff --git a/programs/Xserver/lbx/lbxswap.c b/programs/Xserver/lbx/lbxswap.c index 57c0d7af7..23fdd30f7 100644 --- a/programs/Xserver/lbx/lbxswap.c +++ b/programs/Xserver/lbx/lbxswap.c @@ -1,9 +1,13 @@ -/* $Xorg: lbxswap.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $Xorg: lbxswap.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include <sys/types.h> #define NEED_REPLIES diff --git a/programs/Xserver/lbx/lbxtags.c b/programs/Xserver/lbx/lbxtags.c index 388c3bf67..6fdc4d5a2 100644 --- a/programs/Xserver/lbx/lbxtags.c +++ b/programs/Xserver/lbx/lbxtags.c @@ -1,9 +1,13 @@ -/* $Xorg: lbxtags.c,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ */ +/* $Xorg: lbxtags.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/programs/Xserver/lbx/lbxtags.h b/programs/Xserver/lbx/lbxtags.h index 59d3a02f1..376a4cc27 100644 --- a/programs/Xserver/lbx/lbxtags.h +++ b/programs/Xserver/lbx/lbxtags.h @@ -1,9 +1,13 @@ -/* $Xorg: lbxtags.h,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ */ +/* $Xorg: lbxtags.h,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.2 2000/05/18 23:46:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #ifndef _LBXTAGS_H_ #define _LBXTAGS_H_ diff --git a/programs/Xserver/lbx/lbxzerorep.c b/programs/Xserver/lbx/lbxzerorep.c index bd3f1c3b2..20d58b37b 100644 --- a/programs/Xserver/lbx/lbxzerorep.c +++ b/programs/Xserver/lbx/lbxzerorep.c @@ -1,10 +1,14 @@ -/* $Xorg: lbxzerorep.c,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ */ +/* $Xorg: lbxzerorep.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.2 2000/05/18 23:46:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ /* * This module handles zeroing out unused pad bytes in core X replies. diff --git a/programs/Xserver/mfb/fastblt.h b/programs/Xserver/mfb/fastblt.h index 65adef09d..f25541f55 100644 --- a/programs/Xserver/mfb/fastblt.h +++ b/programs/Xserver/mfb/fastblt.h @@ -1,9 +1,13 @@ -/* $Xorg: fastblt.h,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ */ +/* $Xorg: fastblt.h,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.3 2000/02/12 05:43:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.4 2001/01/17 22:37:01 dawes Exp $ */ /* * Fast bitblt macros for certain hardware. If your machine has an addressing diff --git a/programs/Xserver/mfb/maskbits.c b/programs/Xserver/mfb/maskbits.c index 14f854af0..09f593ec2 100644 --- a/programs/Xserver/mfb/maskbits.c +++ b/programs/Xserver/mfb/maskbits.c @@ -1,10 +1,14 @@ -/* $Xorg: maskbits.c,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ */ +/* $Xorg: maskbits.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.4 2000/02/12 03:39:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.5 2001/01/17 22:37:01 dawes Exp $ */ #include "maskbits.h" #include "servermd.h" diff --git a/programs/Xserver/mfb/mergerop.h b/programs/Xserver/mfb/mergerop.h index 926472ab9..e54e1f906 100644 --- a/programs/Xserver/mfb/mergerop.h +++ b/programs/Xserver/mfb/mergerop.h @@ -1,9 +1,13 @@ /* - * $Xorg: mergerop.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ + * $Xorg: mergerop.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.12 2001/07/25 15:05:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */ #ifndef _MERGEROP_H_ #define _MERGEROP_H_ diff --git a/programs/Xserver/mfb/mfb.h b/programs/Xserver/mfb/mfb.h index e579da126..b801c193c 100644 --- a/programs/Xserver/mfb/mfb.h +++ b/programs/Xserver/mfb/mfb.h @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.16 2000/02/12 03:40:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.17 2001/01/17 22:37:02 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfb.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfb.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #if !defined(_MFB_H_) || defined(MFB_PROTOTYPES_ONLY) #ifndef MFB_PROTOTYPES_ONLY diff --git a/programs/Xserver/mfb/mfbbitblt.c b/programs/Xserver/mfb/mfbbitblt.c index 5dac68296..4b1ae8eda 100644 --- a/programs/Xserver/mfb/mfbbitblt.c +++ b/programs/Xserver/mfb/mfbbitblt.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.5 2001/10/28 03:34:13 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbitblt.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbbitblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" diff --git a/programs/Xserver/mfb/mfbblt.c b/programs/Xserver/mfb/mfbblt.c index bce036d7d..ca240ba99 100644 --- a/programs/Xserver/mfb/mfbblt.c +++ b/programs/Xserver/mfb/mfbblt.c @@ -1,13 +1,17 @@ /* * mfb copy area */ -/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.2 2001/01/17 22:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.3 2001/10/28 03:34:14 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ in this Software without prior written authorization from The Open Group. Author: Keith Packard */ -/* $Xorg: mfbblt.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/mfb/mfbbres.c b/programs/Xserver/mfb/mfbbres.c index 57728443b..b1fad2192 100644 --- a/programs/Xserver/mfb/mfbbres.c +++ b/programs/Xserver/mfb/mfbbres.c @@ -1,10 +1,14 @@ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ -/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.3 2000/02/12 05:43:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbres.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "misc.h" #include "mfb.h" diff --git a/programs/Xserver/mfb/mfbbresd.c b/programs/Xserver/mfb/mfbbresd.c index e279f8288..a7ffdc36c 100644 --- a/programs/Xserver/mfb/mfbbresd.c +++ b/programs/Xserver/mfb/mfbbresd.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.3 2000/02/12 05:43:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbresd.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "misc.h" #include "mfb.h" diff --git a/programs/Xserver/mfb/mfbbstore.c b/programs/Xserver/mfb/mfbbstore.c index 536525de5..661ed0827 100644 --- a/programs/Xserver/mfb/mfbbstore.c +++ b/programs/Xserver/mfb/mfbbstore.c @@ -1,16 +1,14 @@ -/* $XConsortium: mfbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ +/* $Xorg: mfbbstore.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/Xserver/mfb/mfbclip.c b/programs/Xserver/mfb/mfbclip.c index ffcd028a1..1a9a89b2e 100644 --- a/programs/Xserver/mfb/mfbclip.c +++ b/programs/Xserver/mfb/mfbclip.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.3 1999/04/11 13:11:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbclip.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "miscstruct.h" #include "pixmapstr.h" diff --git a/programs/Xserver/mfb/mfbcmap.c b/programs/Xserver/mfb/mfbcmap.c index b57c6a3e1..18ea0b697 100644 --- a/programs/Xserver/mfb/mfbcmap.c +++ b/programs/Xserver/mfb/mfbcmap.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.5 1998/11/22 10:37:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.6 2001/01/17 22:37:02 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbcmap.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbcmap.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "scrnintstr.h" #include "colormapst.h" diff --git a/programs/Xserver/mfb/mfbfillarc.c b/programs/Xserver/mfb/mfbfillarc.c index cde5731aa..a2c1b0959 100644 --- a/programs/Xserver/mfb/mfbfillarc.c +++ b/programs/Xserver/mfb/mfbfillarc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.3 1998/10/04 09:39:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mfbfillarc.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbfillarc.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" diff --git a/programs/Xserver/mfb/mfbfillrct.c b/programs/Xserver/mfb/mfbfillrct.c index df9f76cbc..b0750cf01 100644 --- a/programs/Xserver/mfb/mfbfillrct.c +++ b/programs/Xserver/mfb/mfbfillrct.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.3 1998/10/04 09:39:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbfillrct.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbfillrct.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" #include "pixmapstr.h" diff --git a/programs/Xserver/mfb/mfbfillsp.c b/programs/Xserver/mfb/mfbfillsp.c index 6082a6600..8fd4c0f29 100644 --- a/programs/Xserver/mfb/mfbfillsp.c +++ b/programs/Xserver/mfb/mfbfillsp.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.7 2000/08/23 22:10:17 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.8 2001/01/17 22:37:02 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbfillsp.c,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +/* $Xorg: mfbfillsp.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" #include "gcstruct.h" diff --git a/programs/Xserver/mfb/mfbfont.c b/programs/Xserver/mfb/mfbfont.c index ffa1db508..499dac52a 100644 --- a/programs/Xserver/mfb/mfbfont.c +++ b/programs/Xserver/mfb/mfbfont.c @@ -1,13 +1,12 @@ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -45,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium: mfbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */ +/* $Xorg: mfbfont.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" #include "Xproto.h" diff --git a/programs/Xserver/mfb/mfbgc.c b/programs/Xserver/mfb/mfbgc.c index 71a16b4ab..962582f01 100644 --- a/programs/Xserver/mfb/mfbgc.c +++ b/programs/Xserver/mfb/mfbgc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.5 1999/04/11 13:11:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.6 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbgc.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbgc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" #include "Xproto.h" diff --git a/programs/Xserver/mfb/mfbgetsp.c b/programs/Xserver/mfb/mfbgetsp.c index 8f9191593..8e851925c 100644 --- a/programs/Xserver/mfb/mfbgetsp.c +++ b/programs/Xserver/mfb/mfbgetsp.c @@ -1,10 +1,14 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.2 2001/10/28 03:34:14 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbgetsp.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbgetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/mfb/mfbhrzvert.c b/programs/Xserver/mfb/mfbhrzvert.c index 807b480bb..626ef67fb 100644 --- a/programs/Xserver/mfb/mfbhrzvert.c +++ b/programs/Xserver/mfb/mfbhrzvert.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.3 1999/04/11 15:28:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbhrzvert.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbhrzvert.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "gc.h" diff --git a/programs/Xserver/mfb/mfbimage.c b/programs/Xserver/mfb/mfbimage.c index 8ea60778a..1fb40db5a 100644 --- a/programs/Xserver/mfb/mfbimage.c +++ b/programs/Xserver/mfb/mfbimage.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.4 1999/04/11 13:11:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbimage.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" diff --git a/programs/Xserver/mfb/mfbimggblt.c b/programs/Xserver/mfb/mfbimggblt.c index a26a8f3ab..88d155e3d 100644 --- a/programs/Xserver/mfb/mfbimggblt.c +++ b/programs/Xserver/mfb/mfbimggblt.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.2 1998/10/04 09:39:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.3 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbimggblt.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbimggblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" #include "Xproto.h" diff --git a/programs/Xserver/mfb/mfbline.c b/programs/Xserver/mfb/mfbline.c index e45a858a6..b8e1d3648 100644 --- a/programs/Xserver/mfb/mfbline.c +++ b/programs/Xserver/mfb/mfbline.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.5 2000/02/12 03:40:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.6 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbline.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbline.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "gcstruct.h" diff --git a/programs/Xserver/mfb/mfbmisc.c b/programs/Xserver/mfb/mfbmisc.c index ced94b376..67cbf6fc6 100644 --- a/programs/Xserver/mfb/mfbmisc.c +++ b/programs/Xserver/mfb/mfbmisc.c @@ -1,13 +1,12 @@ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -45,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: mfbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */ +/* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "misc.h" #include "cursor.h" diff --git a/programs/Xserver/mfb/mfbpixmap.c b/programs/Xserver/mfb/mfbpixmap.c index 8feccd180..b6ff40292 100644 --- a/programs/Xserver/mfb/mfbpixmap.c +++ b/programs/Xserver/mfb/mfbpixmap.c @@ -1,13 +1,12 @@ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -45,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: mfbpixmap.c,v 5.13 94/04/17 20:28:28 dpw Exp $ */ +/* $Xorg: mfbpixmap.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* pixmap management written by drewry, september 1986 @@ -63,6 +62,8 @@ SOFTWARE. #include "servermd.h" +#ifndef LOWMEMFTPT + PixmapPtr mfbCreatePixmap (pScreen, width, height, depth) ScreenPtr pScreen; @@ -103,6 +104,8 @@ mfbCreatePixmap (pScreen, width, height, depth) return pPixmap; } +#endif /* ifndef LOWMEMFTPT */ + Bool mfbDestroyPixmap(pPixmap) PixmapPtr pPixmap; diff --git a/programs/Xserver/mfb/mfbply1rct.c b/programs/Xserver/mfb/mfbply1rct.c index f9d65240f..91e7a569b 100644 --- a/programs/Xserver/mfb/mfbply1rct.c +++ b/programs/Xserver/mfb/mfbply1rct.c @@ -1,9 +1,13 @@ /* - * $Xorg: mfbply1rct.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ + * $Xorg: mfbply1rct.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.6 2001/10/28 03:34:14 tsi Exp $ */ #include "X.h" diff --git a/programs/Xserver/mfb/mfbplygblt.c b/programs/Xserver/mfb/mfbplygblt.c index 319034e4c..fc7a8d577 100644 --- a/programs/Xserver/mfb/mfbplygblt.c +++ b/programs/Xserver/mfb/mfbplygblt.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.2 1998/10/04 09:39:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.3 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbplygblt.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbplygblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/mfb/mfbpntarea.c b/programs/Xserver/mfb/mfbpntarea.c index b8122d1c5..6b45d3f48 100644 --- a/programs/Xserver/mfb/mfbpntarea.c +++ b/programs/Xserver/mfb/mfbpntarea.c @@ -1,14 +1,13 @@ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -46,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: mfbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */ +/* $Xorg: mfbpntarea.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/programs/Xserver/mfb/mfbpntwin.c b/programs/Xserver/mfb/mfbpntwin.c index bccadc086..97db3bf79 100644 --- a/programs/Xserver/mfb/mfbpntwin.c +++ b/programs/Xserver/mfb/mfbpntwin.c @@ -1,15 +1,14 @@ -/* $XConsortium: mfbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ +/* $Xorg: mfbpntwin.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/mfb/mfbpolypnt.c b/programs/Xserver/mfb/mfbpolypnt.c index 74155e794..5c99d03de 100644 --- a/programs/Xserver/mfb/mfbpolypnt.c +++ b/programs/Xserver/mfb/mfbpolypnt.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.3 1998/10/04 09:39:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpolypnt.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbpolypnt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" diff --git a/programs/Xserver/mfb/mfbpushpxl.c b/programs/Xserver/mfb/mfbpushpxl.c index bf434df18..8dc5d3a32 100644 --- a/programs/Xserver/mfb/mfbpushpxl.c +++ b/programs/Xserver/mfb/mfbpushpxl.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.3 1998/10/04 09:39:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpushpxl.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbpushpxl.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "gcstruct.h" diff --git a/programs/Xserver/mfb/mfbscrclse.c b/programs/Xserver/mfb/mfbscrclse.c index 3bccf509d..a93e7f07b 100644 --- a/programs/Xserver/mfb/mfbscrclse.c +++ b/programs/Xserver/mfb/mfbscrclse.c @@ -1,14 +1,13 @@ -/* $XConsortium: mfbscrclse.c,v 1.8 94/04/17 20:28:33 rws Exp $ */ +/* $Xorg: mfbscrclse.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/mfb/mfbscrinit.c b/programs/Xserver/mfb/mfbscrinit.c index ab57702b6..ddc701e48 100644 --- a/programs/Xserver/mfb/mfbscrinit.c +++ b/programs/Xserver/mfb/mfbscrinit.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.6 1998/10/04 09:39:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.7 2001/01/17 22:37:03 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbscrinit.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbscrinit.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "Xproto.h" /* for xColorItem */ diff --git a/programs/Xserver/mfb/mfbsetsp.c b/programs/Xserver/mfb/mfbsetsp.c index c07fb86a3..cfa1a952a 100644 --- a/programs/Xserver/mfb/mfbsetsp.c +++ b/programs/Xserver/mfb/mfbsetsp.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.4 1999/04/11 13:11:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mfbsetsp.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbsetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/mfb/mfbtegblt.c b/programs/Xserver/mfb/mfbtegblt.c index e85c17e06..b0e02850c 100644 --- a/programs/Xserver/mfb/mfbtegblt.c +++ b/programs/Xserver/mfb/mfbtegblt.c @@ -1,10 +1,14 @@ -/* $Xorg: mfbtegblt.c,v 1.3 2000/08/17 19:53:35 cpqbld Exp $ */ +/* $Xorg: mfbtegblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.6 2000/02/12 03:40:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/mfb/mfbtile.c b/programs/Xserver/mfb/mfbtile.c index 52cb7a2a2..f716f4487 100644 --- a/programs/Xserver/mfb/mfbtile.c +++ b/programs/Xserver/mfb/mfbtile.c @@ -1,14 +1,13 @@ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -46,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: mfbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */ +/* $Xorg: mfbtile.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/programs/Xserver/mfb/mfbwindow.c b/programs/Xserver/mfb/mfbwindow.c index 3843d362f..8107b9807 100644 --- a/programs/Xserver/mfb/mfbwindow.c +++ b/programs/Xserver/mfb/mfbwindow.c @@ -1,15 +1,14 @@ -/* $XConsortium: mfbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ +/* $Xorg: mfbwindow.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,13 +16,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/mfb/mfbzerarc.c b/programs/Xserver/mfb/mfbzerarc.c index 69cc9d36d..f7f55cfd6 100644 --- a/programs/Xserver/mfb/mfbzerarc.c +++ b/programs/Xserver/mfb/mfbzerarc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.4 2000/02/12 03:40:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.5 2001/01/17 22:37:03 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mfbzerarc.c,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ */ +/* $Xorg: mfbzerarc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" diff --git a/programs/Xserver/mi/cbrt.c b/programs/Xserver/mi/cbrt.c index d944bbcb4..cfc8d84da 100644 --- a/programs/Xserver/mi/cbrt.c +++ b/programs/Xserver/mi/cbrt.c @@ -1,9 +1,13 @@ -/* $Xorg: cbrt.c,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ */ +/* $Xorg: cbrt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.2 2001/01/17 22:37:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.3 2001/05/29 22:24:06 dawes Exp $ */ /* simple cbrt, in case your math library doesn't have a good one */ diff --git a/programs/Xserver/mi/mi.h b/programs/Xserver/mi/mi.h index 6d2340cdb..388a90b27 100644 --- a/programs/Xserver/mi/mi.h +++ b/programs/Xserver/mi/mi.h @@ -1,9 +1,13 @@ -/* $Xorg: mi.h,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ */ +/* $Xorg: mi.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.8 2001/05/25 18:41:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */ #ifndef MI_H #define MI_H diff --git a/programs/Xserver/mi/miarc.c b/programs/Xserver/mi/miarc.c index a563bffcc..598cb295a 100644 --- a/programs/Xserver/mi/miarc.c +++ b/programs/Xserver/mi/miarc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.10 2001/08/06 20:51:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.11 2001/10/28 03:34:14 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miarc.c,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ */ +/* $Xorg: miarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Author: Keith Packard and Bob Scheifler */ /* Warning: this code is toxic, do not dally very long here. */ diff --git a/programs/Xserver/mi/mibitblt.c b/programs/Xserver/mi/mibitblt.c index c73bc2846..82e34cdbe 100644 --- a/programs/Xserver/mi/mibitblt.c +++ b/programs/Xserver/mi/mibitblt.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.9 2001/01/17 22:37:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.10 2001/08/06 20:51:17 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mibitblt.c,v 1.4 2000/08/17 19:53:36 cpqbld Exp $ */ +/* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Author: Todd Newman (aided and abetted by Mr. Drewry) */ #include "X.h" diff --git a/programs/Xserver/mi/mibstore.c b/programs/Xserver/mi/mibstore.c index 679b563d0..c728c3c08 100644 --- a/programs/Xserver/mi/mibstore.c +++ b/programs/Xserver/mi/mibstore.c @@ -1,9 +1,13 @@ -/* $Xorg: mibstore.c,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ */ +/* $Xorg: mibstore.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -38,7 +42,7 @@ implied warranty. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.8 2001/08/22 23:10:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.9 2001/09/04 14:03:28 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/programs/Xserver/mi/mibstorest.h b/programs/Xserver/mi/mibstorest.h index f5eafed6f..fec3c9712 100644 --- a/programs/Xserver/mi/mibstorest.h +++ b/programs/Xserver/mi/mibstorest.h @@ -4,13 +4,17 @@ * internal structure definitions for mi backing store */ -/* $Xorg: mibstorest.h,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: mibstorest.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -27,7 +31,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.3 1998/10/04 09:39:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ #include "mibstore.h" #include "regionstr.h" diff --git a/programs/Xserver/mi/miclipn.c b/programs/Xserver/mi/miclipn.c index 947c269da..456ad08c4 100644 --- a/programs/Xserver/mi/miclipn.c +++ b/programs/Xserver/mi/miclipn.c @@ -1,9 +1,13 @@ -/* $Xorg: miclipn.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: miclipn.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/programs/Xserver/mi/micursor.c b/programs/Xserver/mi/micursor.c index 2f908f2fe..5da44c351 100644 --- a/programs/Xserver/mi/micursor.c +++ b/programs/Xserver/mi/micursor.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: micursor.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: micursor.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #include "scrnintstr.h" #include "cursor.h" #include "misc.h" diff --git a/programs/Xserver/mi/midash.c b/programs/Xserver/mi/midash.c index 087332c0e..e8f0b553b 100644 --- a/programs/Xserver/mi/midash.c +++ b/programs/Xserver/mi/midash.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: midash.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: midash.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #include "miscstruct.h" #include "mistruct.h" #include "mifpoly.h" diff --git a/programs/Xserver/mi/midispcur.c b/programs/Xserver/mi/midispcur.c index bde393908..ed1bd43b4 100644 --- a/programs/Xserver/mi/midispcur.c +++ b/programs/Xserver/mi/midispcur.c @@ -4,13 +4,17 @@ * machine independent cursor display routines */ -/* $Xorg: midispcur.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: midispcur.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.5 2001/09/04 14:03:28 dawes Exp $ */ #define NEED_EVENTS # include "X.h" diff --git a/programs/Xserver/mi/mieq.c b/programs/Xserver/mi/mieq.c index 5a042f57d..a0ed3fdce 100644 --- a/programs/Xserver/mi/mieq.c +++ b/programs/Xserver/mi/mieq.c @@ -1,9 +1,13 @@ /* - * $Xorg: mieq.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ + * $Xorg: mieq.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.2 2001/05/25 18:41:01 dawes Exp $ */ /* * mieq.c diff --git a/programs/Xserver/mi/miexpose.c b/programs/Xserver/mi/miexpose.c index c77f6f3bf..461a98297 100644 --- a/programs/Xserver/mi/miexpose.c +++ b/programs/Xserver/mi/miexpose.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.7 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.8 2001/08/06 20:51:18 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: miexpose.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/programs/Xserver/mi/mifillarc.c b/programs/Xserver/mi/mifillarc.c index 383df5a53..f05d8e871 100644 --- a/programs/Xserver/mi/mifillarc.c +++ b/programs/Xserver/mi/mifillarc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.5 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.6 2001/08/06 20:51:18 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ Author: Bob Scheifler, MIT X Consortium ********************************************************/ -/* $Xorg: mifillarc.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #include <math.h> #include "X.h" diff --git a/programs/Xserver/mi/mifillarc.h b/programs/Xserver/mi/mifillarc.h index 9518148a3..ff39bac1d 100644 --- a/programs/Xserver/mi/mifillarc.h +++ b/programs/Xserver/mi/mifillarc.h @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.5 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.6 2001/10/25 12:03:47 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mifillarc.h,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: mifillarc.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #ifndef __MIFILLARC_H__ #define __MIFILLARC_H__ diff --git a/programs/Xserver/mi/mifillrct.c b/programs/Xserver/mi/mifillrct.c index cf475714c..31219869e 100644 --- a/programs/Xserver/mi/mifillrct.c +++ b/programs/Xserver/mi/mifillrct.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mifillrct.c,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" diff --git a/programs/Xserver/mi/mifpoly.h b/programs/Xserver/mi/mifpoly.h index a262667a2..79f606b4d 100644 --- a/programs/Xserver/mi/mifpoly.h +++ b/programs/Xserver/mi/mifpoly.h @@ -1,9 +1,13 @@ -/* $Xorg: mifpoly.h,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ +/* $Xorg: mifpoly.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.2 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */ #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/programs/Xserver/mi/mifpolycon.c b/programs/Xserver/mi/mifpolycon.c index 890f48722..ae41cf6f6 100644 --- a/programs/Xserver/mi/mifpolycon.c +++ b/programs/Xserver/mi/mifpolycon.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.2 2001/08/06 20:51:18 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mifpolycon.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include <math.h> #include "X.h" #include "gcstruct.h" diff --git a/programs/Xserver/mi/migc.c b/programs/Xserver/mi/migc.c index afca6848f..b5b33852a 100644 --- a/programs/Xserver/mi/migc.c +++ b/programs/Xserver/mi/migc.c @@ -1,9 +1,13 @@ -/* $Xorg: migc.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: migc.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.7 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */ #include "scrnintstr.h" #include "gcstruct.h" diff --git a/programs/Xserver/mi/migc.h b/programs/Xserver/mi/migc.h index 0c6759ab7..d906c6334 100644 --- a/programs/Xserver/mi/migc.h +++ b/programs/Xserver/mi/migc.h @@ -1,9 +1,13 @@ -/* $Xorg: migc.h,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: migc.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.6 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.7 2001/08/06 20:51:18 dawes Exp $ */ extern void miChangeGC( GCPtr /*pGC*/, diff --git a/programs/Xserver/mi/miglblt.c b/programs/Xserver/mi/miglblt.c index 1f9b1e94a..f2a748db6 100644 --- a/programs/Xserver/mi/miglblt.c +++ b/programs/Xserver/mi/miglblt.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.5 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: miglblt.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/programs/Xserver/mi/miinitext.c b/programs/Xserver/mi/miinitext.c index ab20cb951..1190ac07c 100644 --- a/programs/Xserver/mi/miinitext.c +++ b/programs/Xserver/mi/miinitext.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.61 2001/08/27 17:41:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.62 2001/11/02 23:29:33 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miinitext.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: miinitext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "misc.h" #include "extension.h" diff --git a/programs/Xserver/mi/miline.h b/programs/Xserver/mi/miline.h index 2133c4a09..f52a51ebd 100644 --- a/programs/Xserver/mi/miline.h +++ b/programs/Xserver/mi/miline.h @@ -1,10 +1,14 @@ -/* $Xorg: miline.h,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: miline.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.5 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MILINE_H diff --git a/programs/Xserver/mi/mipointer.c b/programs/Xserver/mi/mipointer.c index 819f8751f..2e4ee607b 100644 --- a/programs/Xserver/mi/mipointer.c +++ b/programs/Xserver/mi/mipointer.c @@ -2,13 +2,17 @@ * mipointer.c */ -/* $Xorg: mipointer.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipointer.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,7 +28,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */ # define NEED_EVENTS # include "X.h" diff --git a/programs/Xserver/mi/mipointer.h b/programs/Xserver/mi/mipointer.h index d5c929974..f8e7fd084 100644 --- a/programs/Xserver/mi/mipointer.h +++ b/programs/Xserver/mi/mipointer.h @@ -3,13 +3,17 @@ * */ -/* $Xorg: mipointer.h,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipointer.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.7 2001/03/25 05:32:15 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/programs/Xserver/mi/mipointrst.h b/programs/Xserver/mi/mipointrst.h index 3b81b7788..682f8ac88 100644 --- a/programs/Xserver/mi/mipointrst.h +++ b/programs/Xserver/mi/mipointrst.h @@ -3,13 +3,17 @@ * */ -/* $Xorg: mipointrst.h,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipointrst.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.2 2001/03/25 05:32:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */ #include "mipointer.h" #include "scrnintstr.h" diff --git a/programs/Xserver/mi/mipoly.c b/programs/Xserver/mi/mipoly.c index f7ae592dc..b25ee780f 100644 --- a/programs/Xserver/mi/mipoly.c +++ b/programs/Xserver/mi/mipoly.c @@ -1,13 +1,12 @@ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -45,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: mipoly.c,v 5.1 94/04/17 20:27:41 keith Exp $ */ +/* $Xorg: mipoly.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* * mipoly.c * diff --git a/programs/Xserver/mi/mipoly.h b/programs/Xserver/mi/mipoly.h index 550ddbe96..88a1782de 100644 --- a/programs/Xserver/mi/mipoly.h +++ b/programs/Xserver/mi/mipoly.h @@ -1,9 +1,13 @@ -/* $Xorg: mipoly.h,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipoly.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /* diff --git a/programs/Xserver/mi/mipolycon.c b/programs/Xserver/mi/mipolycon.c index 693cdc2f0..de33045ef 100644 --- a/programs/Xserver/mi/mipolycon.c +++ b/programs/Xserver/mi/mipolycon.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolycon.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "gcstruct.h" #include "pixmap.h" diff --git a/programs/Xserver/mi/mipolygen.c b/programs/Xserver/mi/mipolygen.c index 41ea893a8..484a29798 100644 --- a/programs/Xserver/mi/mipolygen.c +++ b/programs/Xserver/mi/mipolygen.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolygen.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "X.h" #include "gcstruct.h" #include "miscanfill.h" diff --git a/programs/Xserver/mi/mipolypnt.c b/programs/Xserver/mi/mipolypnt.c index 9cadd9e85..f88545cfd 100644 --- a/programs/Xserver/mi/mipolypnt.c +++ b/programs/Xserver/mi/mipolypnt.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolypnt.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" #include "pixmapstr.h" diff --git a/programs/Xserver/mi/mipolyrect.c b/programs/Xserver/mi/mipolyrect.c index 06576964c..fdb412dbc 100644 --- a/programs/Xserver/mi/mipolyrect.c +++ b/programs/Xserver/mi/mipolyrect.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyrect.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" #include "miscstruct.h" diff --git a/programs/Xserver/mi/mipolyseg.c b/programs/Xserver/mi/mipolyseg.c index 637afd96b..2e8ad07e2 100644 --- a/programs/Xserver/mi/mipolyseg.c +++ b/programs/Xserver/mi/mipolyseg.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyseg.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "X.h" #include "Xprotostr.h" #include "miscstruct.h" diff --git a/programs/Xserver/mi/mipolytext.c b/programs/Xserver/mi/mipolytext.c index 0e254acc7..a3f64a086 100644 --- a/programs/Xserver/mi/mipolytext.c +++ b/programs/Xserver/mi/mipolytext.c @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ /******************************************************************* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************/ -/* $Xorg: mipolytext.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipolytext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* * mipolytext.c - text routines * diff --git a/programs/Xserver/mi/mipolyutil.c b/programs/Xserver/mi/mipolyutil.c index 50c5b48d1..09a9fc73d 100644 --- a/programs/Xserver/mi/mipolyutil.c +++ b/programs/Xserver/mi/mipolyutil.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.7 1998/10/04 09:39:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.8 2001/01/17 22:37:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyutil.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipolyutil.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "miscstruct.h" #include "gc.h" #include "miscanfill.h" diff --git a/programs/Xserver/mi/mipushpxl.c b/programs/Xserver/mi/mipushpxl.c index 2a874a3fc..e8688f269 100644 --- a/programs/Xserver/mi/mipushpxl.c +++ b/programs/Xserver/mi/mipushpxl.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.10 2000/02/12 03:40:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.11 2001/01/17 22:37:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mipushpxl.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "X.h" #include "gcstruct.h" #include "scrnintstr.h" diff --git a/programs/Xserver/mi/miregion.c b/programs/Xserver/mi/miregion.c index 310174770..f0d7cfd72 100644 --- a/programs/Xserver/mi/miregion.c +++ b/programs/Xserver/mi/miregion.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.6 2001/01/17 22:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.7 2001/08/06 20:51:19 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miregion.c,v 1.3 2000/08/17 19:53:38 cpqbld Exp $ */ +/* $Xorg: miregion.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ /**************************************************************** diff --git a/programs/Xserver/mi/miscanfill.h b/programs/Xserver/mi/miscanfill.h index bb6a5cad8..06baee399 100644 --- a/programs/Xserver/mi/miscanfill.h +++ b/programs/Xserver/mi/miscanfill.h @@ -1,15 +1,13 @@ -/* $XConsortium: miscanfill.h,v 1.5 94/04/17 20:27:50 dpw Exp $ */ +/* $Xorg: miscanfill.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/Xserver/mi/miscrinit.c b/programs/Xserver/mi/miscrinit.c index 0eef047dd..a41326148 100644 --- a/programs/Xserver/mi/miscrinit.c +++ b/programs/Xserver/mi/miscrinit.c @@ -1,9 +1,13 @@ -/* $Xorg: miscrinit.c,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: miscrinit.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.13 2001/01/17 22:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.14 2001/08/01 00:44:58 tsi Exp $ */ #include "X.h" #include "servermd.h" diff --git a/programs/Xserver/mi/mispans.c b/programs/Xserver/mi/mispans.c index 53b8ed161..84a737525 100644 --- a/programs/Xserver/mi/mispans.c +++ b/programs/Xserver/mi/mispans.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.2 2001/01/17 22:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.3 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mispans.c,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: mispans.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "misc.h" #include "pixmapstr.h" diff --git a/programs/Xserver/mi/mispans.h b/programs/Xserver/mi/mispans.h index edd755dc6..b6e97e2b4 100644 --- a/programs/Xserver/mi/mispans.h +++ b/programs/Xserver/mi/mispans.h @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mispans.h,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: mispans.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ typedef struct { int count; /* number of spans */ diff --git a/programs/Xserver/mi/misprite.c b/programs/Xserver/mi/misprite.c index d6579ff71..327b085f8 100644 --- a/programs/Xserver/mi/misprite.c +++ b/programs/Xserver/mi/misprite.c @@ -4,13 +4,17 @@ * machine independent software sprite routines */ -/* $Xorg: misprite.c,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: misprite.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.8 2001/09/04 14:03:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.9 2001/09/30 19:44:06 alanh Exp $ */ # include "X.h" # include "Xproto.h" diff --git a/programs/Xserver/mi/misprite.h b/programs/Xserver/mi/misprite.h index 57c2271b5..b4cc84ecf 100644 --- a/programs/Xserver/mi/misprite.h +++ b/programs/Xserver/mi/misprite.h @@ -6,13 +6,17 @@ * mi versions of these routines exist. */ -/* $Xorg: misprite.h,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: misprite.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -28,7 +32,7 @@ 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 Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ typedef struct { Bool (*RealizeCursor)( diff --git a/programs/Xserver/mi/mispritest.h b/programs/Xserver/mi/mispritest.h index 8236400c6..e438dd7d2 100644 --- a/programs/Xserver/mi/mispritest.h +++ b/programs/Xserver/mi/mispritest.h @@ -4,13 +4,17 @@ * mi sprite structures */ -/* $Xorg: mispritest.h,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: mispritest.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.3 2000/10/10 14:05:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */ # include "misprite.h" #ifdef RENDER diff --git a/programs/Xserver/mi/mistruct.h b/programs/Xserver/mi/mistruct.h index 87d5e3df1..28994fec5 100644 --- a/programs/Xserver/mi/mistruct.h +++ b/programs/Xserver/mi/mistruct.h @@ -1,14 +1,13 @@ -/* $XConsortium: mistruct.h,v 1.3 94/04/17 20:27:56 jim Exp $ */ +/* $Xorg: mistruct.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /*********************************************************** -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/Xserver/mi/mivalidate.h b/programs/Xserver/mi/mivalidate.h index c2655e29b..cca4a1b7c 100644 --- a/programs/Xserver/mi/mivalidate.h +++ b/programs/Xserver/mi/mivalidate.h @@ -1,15 +1,13 @@ -/* $XConsortium: mivalidate.h,v 1.3 94/04/17 20:27:57 dpw Exp $ */ +/* $Xorg: mivalidate.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/Xserver/mi/mivaltree.c b/programs/Xserver/mi/mivaltree.c index 4487d0984..a7b64b22c 100644 --- a/programs/Xserver/mi/mivaltree.c +++ b/programs/Xserver/mi/mivaltree.c @@ -1,4 +1,4 @@ -/* $Xorg: mivaltree.c,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ in this Software without prior written authorization from The Open Group. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.7 2001/01/17 22:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.8 2001/08/06 20:51:20 dawes Exp $ */ /* * Aug '86: Susan Angebranndt -- original code diff --git a/programs/Xserver/mi/miwideline.c b/programs/Xserver/mi/miwideline.c index 0df184e11..de96545de 100644 --- a/programs/Xserver/mi/miwideline.c +++ b/programs/Xserver/mi/miwideline.c @@ -1,9 +1,13 @@ -/* $Xorg: miwideline.c,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: miwideline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.10 2001/10/28 03:34:15 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.11 2001/11/16 21:10:35 keithp Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/programs/Xserver/mi/miwideline.h b/programs/Xserver/mi/miwideline.h index 1c595236c..96d6aae86 100644 --- a/programs/Xserver/mi/miwideline.h +++ b/programs/Xserver/mi/miwideline.h @@ -1,9 +1,13 @@ -/* $Xorg: miwideline.h,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: miwideline.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.10 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.11 2001/10/25 12:03:47 alanh Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/programs/Xserver/mi/miwindow.c b/programs/Xserver/mi/miwindow.c index 0fd99880c..74dfdd8b3 100644 --- a/programs/Xserver/mi/miwindow.c +++ b/programs/Xserver/mi/miwindow.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.5 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.6 2001/08/22 23:10:09 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: miwindow.c,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ #include "X.h" #include "miscstruct.h" #include "region.h" diff --git a/programs/Xserver/mi/mizerarc.c b/programs/Xserver/mi/mizerarc.c index c3e61dd40..401663614 100644 --- a/programs/Xserver/mi/mizerarc.c +++ b/programs/Xserver/mi/mizerarc.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.4 2001/01/17 22:37:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.5 2001/08/06 20:51:20 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ Author: Bob Scheifler, MIT X Consortium ********************************************************/ -/* $Xorg: mizerarc.c,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: mizerarc.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" diff --git a/programs/Xserver/mi/mizerarc.h b/programs/Xserver/mi/mizerarc.h index 23cd855aa..99062d192 100644 --- a/programs/Xserver/mi/mizerarc.h +++ b/programs/Xserver/mi/mizerarc.h @@ -1,9 +1,13 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mizerarc.h,v 1.3 2000/08/17 19:53:39 cpqbld Exp $ */ +/* $Xorg: mizerarc.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ typedef struct { int x; diff --git a/programs/Xserver/mi/mizerclip.c b/programs/Xserver/mi/mizerclip.c index 4b931cb82..304f525ae 100644 --- a/programs/Xserver/mi/mizerclip.c +++ b/programs/Xserver/mi/mizerclip.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.1 1999/10/13 22:33:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/Xserver/mi/mizerline.c b/programs/Xserver/mi/mizerline.c index b42209538..4672f6bd3 100644 --- a/programs/Xserver/mi/mizerline.c +++ b/programs/Xserver/mi/mizerline.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.5 2001/01/17 22:37:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.6 2001/08/06 20:51:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: mizerline.c,v 1.3 2000/08/17 19:53:40 cpqbld Exp $ */ +/* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ #include "X.h" #include "misc.h" diff --git a/programs/Xserver/os/WaitFor.c b/programs/Xserver/os/WaitFor.c index 796460de3..b88375934 100644 --- a/programs/Xserver/os/WaitFor.c +++ b/programs/Xserver/os/WaitFor.c @@ -1,9 +1,13 @@ -/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.35 2001/10/28 03:34:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.36 2001/11/26 05:41:30 keithp Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: WaitFor.c,v 1.3 2000/08/17 19:53:40 cpqbld Exp $ */ +/* $Xorg: WaitFor.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /***************************************************************** * OS Dependent input routines: diff --git a/programs/Xserver/os/access.c b/programs/Xserver/os/access.c index a4e054b38..9884b2dc3 100644 --- a/programs/Xserver/os/access.c +++ b/programs/Xserver/os/access.c @@ -1,9 +1,13 @@ -/* $Xorg: access.c,v 1.4 2001/01/31 13:25:23 pookie Exp $ */ +/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/access.c,v 3.36 2001/11/16 16:47:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/access.c,v 3.37 2001/11/19 20:44:18 tsi Exp $ */ #ifdef WIN32 #include <X11/Xwinsock.h> diff --git a/programs/Xserver/os/auth.c b/programs/Xserver/os/auth.c index baf73b963..c363d4f71 100644 --- a/programs/Xserver/os/auth.c +++ b/programs/Xserver/os/auth.c @@ -1,9 +1,13 @@ -/* $Xorg: auth.c,v 1.3 2000/08/17 19:53:40 cpqbld Exp $ */ +/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.7 2001/08/27 17:41:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.9 2001/11/30 12:12:04 eich Exp $ */ /* * authorization hooks for the server diff --git a/programs/Xserver/os/connection.c b/programs/Xserver/os/connection.c index c1a8c4ac5..fff8d013f 100644 --- a/programs/Xserver/os/connection.c +++ b/programs/Xserver/os/connection.c @@ -1,9 +1,13 @@ -/* $Xorg: connection.c,v 1.5 2000/08/17 19:53:40 cpqbld Exp $ */ +/* $Xorg: connection.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.52 2001/10/01 21:11:48 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.54 2001/12/08 21:57:39 keithp Exp $ */ /***************************************************************** * Stuff to create connections --- OS dependent * diff --git a/programs/Xserver/os/decompress.c b/programs/Xserver/os/decompress.c index 0a2c49d60..cd54242b8 100644 --- a/programs/Xserver/os/decompress.c +++ b/programs/Xserver/os/decompress.c @@ -1,9 +1,13 @@ -/* $Xorg: decompress.c,v 1.3 2000/08/17 19:53:40 cpqbld Exp $ */ +/* $Xorg: decompress.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/decompress.c,v 1.5 2001/08/01 00:44:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/decompress.c,v 1.6 2001/08/23 15:26:05 alanh Exp $ */ /* * decompress - cat a compressed file diff --git a/programs/Xserver/os/hpsocket.c b/programs/Xserver/os/hpsocket.c index 971ace68e..16a629ea8 100644 --- a/programs/Xserver/os/hpsocket.c +++ b/programs/Xserver/os/hpsocket.c @@ -1,15 +1,13 @@ -/* $XConsortium: hpsocket.c,v 1.3 94/04/17 20:26:58 dpw Exp $ */ +/* $Xorg: hpsocket.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/Xserver/os/io.c b/programs/Xserver/os/io.c index 3ae48c43f..60f3cc90f 100644 --- a/programs/Xserver/os/io.c +++ b/programs/Xserver/os/io.c @@ -2,7 +2,11 @@ Copyright 1987, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: io.c,v 1.5 2001/01/03 16:40:02 coskrey Exp $ */ +/* $Xorg: io.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */ /***************************************************************** * i/o functions * @@ -48,7 +52,7 @@ SOFTWARE. * InsertFakeRequest, ResetCurrentRequest * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/os/io.c,v 3.30 2001/08/23 15:26:05 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/os/io.c,v 3.31 2001/11/23 19:21:36 dawes Exp $ */ #ifdef WIN32 #include <X11/Xwinsock.h> diff --git a/programs/Xserver/os/k5auth.c b/programs/Xserver/os/k5auth.c index 99071f8fd..3726df6ba 100644 --- a/programs/Xserver/os/k5auth.c +++ b/programs/Xserver/os/k5auth.c @@ -1,9 +1,13 @@ -/* $Xorg: k5auth.c,v 1.3 2000/08/17 19:53:41 cpqbld Exp $ */ +/* $Xorg: k5auth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.3 1998/10/04 09:39:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.4 2001/01/17 22:37:10 dawes Exp $ */ /* * Kerberos V5 authentication scheme diff --git a/programs/Xserver/record/record.c b/programs/Xserver/record/record.c index 1a77698fa..902f2d2eb 100644 --- a/programs/Xserver/record/record.c +++ b/programs/Xserver/record/record.c @@ -1,10 +1,14 @@ -/* $Xorg: record.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* Copyright 1995, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -28,7 +32,7 @@ This work benefited from earlier work done by Martha Zimet of NCD and Jim Haggerty of Metheus. */ -/* $XFree86: xc/programs/Xserver/record/record.c,v 1.7 2001/01/17 22:37:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/record.c,v 1.8 2001/10/28 03:34:19 tsi Exp $ */ #define NEED_EVENTS #include "dixstruct.h" diff --git a/programs/Xserver/record/set.c b/programs/Xserver/record/set.c index 09cafffcf..0b6d95da6 100644 --- a/programs/Xserver/record/set.c +++ b/programs/Xserver/record/set.c @@ -1,10 +1,14 @@ -/* $Xorg: set.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $Xorg: set.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* Copyright 1995, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.c,v 1.5 1998/12/20 11:58:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/set.c,v 1.6 2001/01/17 22:37:14 dawes Exp $ */ /* diff --git a/programs/Xserver/record/set.h b/programs/Xserver/record/set.h index 7210a888b..ba4ffccd3 100644 --- a/programs/Xserver/record/set.h +++ b/programs/Xserver/record/set.h @@ -1,16 +1,14 @@ -/* $XConsortium: set.h /main/1 1995/12/08 12:19:23 dpw $ */ +/* $Xorg: set.h,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* -Copyright (c) 1995 X Consortium +Copyright 1995, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/appres/appres.c b/programs/appres/appres.c index 40b4c674a..22da42cd6 100644 --- a/programs/appres/appres.c +++ b/programs/appres/appres.c @@ -1,10 +1,14 @@ /* - * $Xorg: appres.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ + * $Xorg: appres.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/appres/appres.c,v 1.2 1999/02/01 11:56:03 dawes Exp $ */ +/* $XFree86: xc/programs/appres/appres.c,v 1.3 2001/01/17 23:44:49 dawes Exp $ */ #include <X11/Intrinsic.h> #include <stdio.h> diff --git a/programs/appres/appres.man b/programs/appres/appres.man index 1eb338cd1..eae369742 100644 --- a/programs/appres/appres.man +++ b/programs/appres/appres.man @@ -1,7 +1,11 @@ -.\" $Xorg: appres.man,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ +.\" $Xorg: appres.man,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/appres/appres.man,v 1.7 2001/01/27 18:21:00 dawes Exp $ .\" .TH APPRES 1 __xorgversion__ .SH NAME diff --git a/programs/bdftopcf/bdftopcf.c b/programs/bdftopcf/bdftopcf.c index c32f9d32a..1be7ed8bc 100644 --- a/programs/bdftopcf/bdftopcf.c +++ b/programs/bdftopcf/bdftopcf.c @@ -1,9 +1,13 @@ -/* $Xorg: bdftopcf.c,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: bdftopcf.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1991, 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.3 2001/01/17 23:44:49 dawes Exp $ */ +/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.4 2001/08/01 00:45:00 tsi Exp $ */ #include <X11/X.h> #include <X11/Xproto.h> diff --git a/programs/bdftopcf/bdftopcf.man b/programs/bdftopcf/bdftopcf.man index b55066aa0..02846912c 100644 --- a/programs/bdftopcf/bdftopcf.man +++ b/programs/bdftopcf/bdftopcf.man @@ -1,7 +1,11 @@ -.\" $Xorg: bdftopcf.man,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ +.\" $Xorg: bdftopcf.man,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.7 2001/01/27 18:21:00 dawes Exp $ .\" .TH BDFTOPCF 1 __xorgversion__ .SH NAME diff --git a/programs/bitmap/BitEdit.c b/programs/bitmap/BitEdit.c index 1729aed09..e1d956d12 100644 --- a/programs/bitmap/BitEdit.c +++ b/programs/bitmap/BitEdit.c @@ -1,9 +1,13 @@ -/* $Xorg: BitEdit.c,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: BitEdit.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.3 1999/02/01 11:56:05 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.4 2001/01/17 23:44:50 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/Bitmap.c b/programs/bitmap/Bitmap.c index c04c600d7..38bbc92d0 100644 --- a/programs/bitmap/Bitmap.c +++ b/programs/bitmap/Bitmap.c @@ -1,9 +1,13 @@ -/* $Xorg: Bitmap.c,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: Bitmap.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.2 1999/02/01 11:56:05 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.3 2001/01/17 23:44:50 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/Bitmap.h b/programs/bitmap/Bitmap.h index 6e42cef09..c6166d773 100644 --- a/programs/bitmap/Bitmap.h +++ b/programs/bitmap/Bitmap.h @@ -1,9 +1,13 @@ -/* $Xorg: Bitmap.h,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: Bitmap.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Bitmap.h,v 1.3 2001/01/17 23:44:51 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Bitmap.h,v 1.4 2001/06/12 09:45:53 alanh Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/BitmapP.h b/programs/bitmap/BitmapP.h index 9eaffae83..acd3f4a9b 100644 --- a/programs/bitmap/BitmapP.h +++ b/programs/bitmap/BitmapP.h @@ -1,9 +1,13 @@ -/* $Xorg: BitmapP.h,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: BitmapP.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.2 1999/02/01 11:56:06 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.3 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/CutPaste.c b/programs/bitmap/CutPaste.c index 3f5614140..2a4e06c34 100644 --- a/programs/bitmap/CutPaste.c +++ b/programs/bitmap/CutPaste.c @@ -1,9 +1,13 @@ -/* $Xorg: CutPaste.c,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: CutPaste.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/CutPaste.c,v 1.2 1999/02/01 11:56:07 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/CutPaste.c,v 1.3 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/Dialog.c b/programs/bitmap/Dialog.c index 6a5f45868..03979f319 100644 --- a/programs/bitmap/Dialog.c +++ b/programs/bitmap/Dialog.c @@ -1,9 +1,13 @@ -/* $Xorg: Dialog.c,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: Dialog.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Dialog.c,v 1.2 1999/02/01 11:56:07 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Dialog.c,v 1.3 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/Dialog.h b/programs/bitmap/Dialog.h index 766b22e79..ff7078928 100644 --- a/programs/bitmap/Dialog.h +++ b/programs/bitmap/Dialog.h @@ -1,9 +1,13 @@ -/* $Xorg: Dialog.h,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: Dialog.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Dialog.h,v 1.2 1999/02/01 11:56:08 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Dialog.h,v 1.3 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/Graphics.c b/programs/bitmap/Graphics.c index 18c9787df..991c753e1 100644 --- a/programs/bitmap/Graphics.c +++ b/programs/bitmap/Graphics.c @@ -1,9 +1,13 @@ -/* $Xorg: Graphics.c,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ */ +/* $Xorg: Graphics.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Graphics.c,v 1.4 1999/02/01 11:56:08 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Graphics.c,v 1.5 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/Handlers.c b/programs/bitmap/Handlers.c index 93f4e64b5..088d05dba 100644 --- a/programs/bitmap/Handlers.c +++ b/programs/bitmap/Handlers.c @@ -1,9 +1,13 @@ -/* $Xorg: Handlers.c,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ */ +/* $Xorg: Handlers.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Handlers.c,v 1.2 1999/02/01 11:56:08 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Handlers.c,v 1.3 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/ReqMach.c b/programs/bitmap/ReqMach.c index 27667926a..fb685333d 100644 --- a/programs/bitmap/ReqMach.c +++ b/programs/bitmap/ReqMach.c @@ -1,9 +1,13 @@ -/* $Xorg: ReqMach.c,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ */ +/* $Xorg: ReqMach.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/ReqMach.c,v 1.2 1999/02/01 11:56:09 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/ReqMach.c,v 1.3 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/Requests.h b/programs/bitmap/Requests.h index 9e6e297a8..abc671367 100644 --- a/programs/bitmap/Requests.h +++ b/programs/bitmap/Requests.h @@ -1,9 +1,13 @@ -/* $Xorg: Requests.h,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ */ +/* $Xorg: Requests.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Requests.h,v 1.3 1999/02/19 21:27:07 hohndel Exp $ */ +/* $XFree86: xc/programs/bitmap/Requests.h,v 1.4 2001/01/17 23:44:51 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/bitmap/atobm.c b/programs/bitmap/atobm.c index 63a6141b6..f63a95613 100644 --- a/programs/bitmap/atobm.c +++ b/programs/bitmap/atobm.c @@ -1,9 +1,13 @@ -/* $Xorg: atobm.c,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ */ +/* $Xorg: atobm.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1988, 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/atobm.c,v 3.3 2001/01/17 23:44:51 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/atobm.c,v 3.4 2001/07/25 15:05:12 dawes Exp $ */ /* * atobm - ascii to bitmap filter diff --git a/programs/bitmap/bitmap.man b/programs/bitmap/bitmap.man index 6ee7e90b7..44e9f8ed6 100644 --- a/programs/bitmap/bitmap.man +++ b/programs/bitmap/bitmap.man @@ -1,7 +1,11 @@ -.\" $Xorg: bitmap.man,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ +.\" $Xorg: bitmap.man,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/bitmap/bitmap.man,v 1.6 2001/01/27 18:21:01 dawes Exp $ .\" .TH BITMAP 1 __xorgversion__ .SH NAME diff --git a/programs/bitmap/bmtoa.c b/programs/bitmap/bmtoa.c index b779bb686..39dfcf94e 100644 --- a/programs/bitmap/bmtoa.c +++ b/programs/bitmap/bmtoa.c @@ -1,9 +1,13 @@ -/* $Xorg: bmtoa.c,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ */ +/* $Xorg: bmtoa.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1988, 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/bitmap/bmtoa.c,v 3.5 2001/01/17 23:44:51 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/bmtoa.c,v 3.6 2001/07/25 15:05:12 dawes Exp $ */ /* * bmtoa - bitmap to ascii filter diff --git a/programs/editres/actions.c b/programs/editres/actions.c index f2c99f206..576b52c37 100644 --- a/programs/editres/actions.c +++ b/programs/editres/actions.c @@ -1,9 +1,13 @@ /* - * $Xorg: actions.c,v 1.3 2000/08/17 19:53:51 cpqbld Exp $ + * $Xorg: actions.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/editres/actions.c,v 1.4 2001/01/17 23:44:52 dawes Exp $ */ +/* $XFree86: xc/programs/editres/actions.c,v 1.5 2001/04/01 14:00:17 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/editres/comm.c b/programs/editres/comm.c index d28b127d8..52e03b31b 100644 --- a/programs/editres/comm.c +++ b/programs/editres/comm.c @@ -1,9 +1,13 @@ -/* $Xorg: comm.c,v 1.4 2000/08/17 19:53:51 cpqbld Exp $ */ +/* $Xorg: comm.c,v 1.5 2001/02/09 02:05:29 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/comm.c,v 1.3 1999/02/01 12:52:25 dawes Exp $ */ +/* $XFree86: xc/programs/editres/comm.c,v 1.4 2001/01/17 23:44:52 dawes Exp $ */ /* diff --git a/programs/editres/editres.c b/programs/editres/editres.c index 9bd287730..d8d436fc7 100644 --- a/programs/editres/editres.c +++ b/programs/editres/editres.c @@ -1,9 +1,13 @@ /* - * $Xorg: editres.c,v 1.3 2000/08/17 19:53:51 cpqbld Exp $ + * $Xorg: editres.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/editres/editres.c,v 1.5 2001/01/17 23:44:52 dawes Exp $ */ +/* $XFree86: xc/programs/editres/editres.c,v 1.6 2001/04/01 14:00:17 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/editres/editres.man b/programs/editres/editres.man index 73b63931c..80d69163a 100644 --- a/programs/editres/editres.man +++ b/programs/editres/editres.man @@ -1,7 +1,11 @@ -.\" $Xorg: editres.man,v 1.3 2000/08/17 19:53:51 cpqbld Exp $ +.\" $Xorg: editres.man,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/editres/editres.man,v 1.7 2001/01/27 18:21:01 dawes Exp $ .\" .TH EDITRES 1 __xorgversion__ .SH NAME diff --git a/programs/editres/editresP.h b/programs/editres/editresP.h index 208ae5a00..071951123 100644 --- a/programs/editres/editresP.h +++ b/programs/editres/editresP.h @@ -1,10 +1,14 @@ /* - * $Xorg: editresP.h,v 1.3 2000/08/17 19:53:51 cpqbld Exp $ + * $Xorg: editresP.h,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/editresP.h,v 1.5 2001/01/17 23:44:52 dawes Exp $ */ +/* $XFree86: xc/programs/editres/editresP.h,v 1.6 2001/07/25 15:05:13 dawes Exp $ */ #include <X11/Xmu/EditresP.h> #include <X11/Xresource.h> diff --git a/programs/editres/geometry.c b/programs/editres/geometry.c index f385aacf4..ab706a94a 100644 --- a/programs/editres/geometry.c +++ b/programs/editres/geometry.c @@ -1,9 +1,13 @@ /* - * $Xorg: geometry.c,v 1.3 2000/08/17 19:53:51 cpqbld Exp $ + * $Xorg: geometry.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/geometry.c,v 1.3 1999/02/01 12:52:25 dawes Exp $ */ +/* $XFree86: xc/programs/editres/geometry.c,v 1.4 2001/01/17 23:44:52 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/programs/editres/handler.c b/programs/editres/handler.c index 9eb0357f7..9b9339297 100644 --- a/programs/editres/handler.c +++ b/programs/editres/handler.c @@ -1,9 +1,13 @@ /* - * $Xorg: handler.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ + * $Xorg: handler.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/handler.c,v 1.5 2001/01/17 23:44:52 dawes Exp $ */ +/* $XFree86: xc/programs/editres/handler.c,v 1.6 2001/04/01 14:00:17 tsi Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/programs/editres/setvalues.c b/programs/editres/setvalues.c index ae3c79e1c..5c4ac3bce 100644 --- a/programs/editres/setvalues.c +++ b/programs/editres/setvalues.c @@ -1,9 +1,13 @@ /* - * $Xorg: setvalues.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ + * $Xorg: setvalues.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/setvalues.c,v 1.3 1999/02/01 12:52:26 dawes Exp $ */ +/* $XFree86: xc/programs/editres/setvalues.c,v 1.4 2001/01/17 23:44:52 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/programs/editres/svpopup.c b/programs/editres/svpopup.c index ced37240c..8affe88e3 100644 --- a/programs/editres/svpopup.c +++ b/programs/editres/svpopup.c @@ -1,9 +1,13 @@ /* - * $Xorg: svpopup.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ + * $Xorg: svpopup.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/svpopup.c,v 1.4 1999/03/14 03:22:21 dawes Exp $ */ +/* $XFree86: xc/programs/editres/svpopup.c,v 1.5 2001/01/17 23:44:52 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> /* Get standard string definations. */ diff --git a/programs/editres/utils.c b/programs/editres/utils.c index 03c8f2ef3..dd2e8a3d5 100644 --- a/programs/editres/utils.c +++ b/programs/editres/utils.c @@ -1,9 +1,13 @@ /* - * $Xorg: utils.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ + * $Xorg: utils.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/editres/utils.c,v 1.4 2001/01/17 23:44:52 dawes Exp $ */ +/* $XFree86: xc/programs/editres/utils.c,v 1.5 2001/04/01 14:00:17 tsi Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xutil.h> diff --git a/programs/editres/widgets.c b/programs/editres/widgets.c index 492585cde..6688653ae 100644 --- a/programs/editres/widgets.c +++ b/programs/editres/widgets.c @@ -1,9 +1,13 @@ /* - * $Xorg: widgets.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ + * $Xorg: widgets.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/editres/widgets.c,v 1.4 1999/05/09 10:52:01 dawes Exp $ */ +/* $XFree86: xc/programs/editres/widgets.c,v 1.5 2001/01/17 23:44:52 dawes Exp $ */ /* * Code for creating all widgets used by EditRes. diff --git a/programs/editres/wtree.c b/programs/editres/wtree.c index 9b97df972..ec9031634 100644 --- a/programs/editres/wtree.c +++ b/programs/editres/wtree.c @@ -1,9 +1,13 @@ /* - * $Xorg: wtree.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ + * $Xorg: wtree.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/editres/wtree.c,v 1.3 1999/02/01 12:52:27 dawes Exp $ */ +/* $XFree86: xc/programs/editres/wtree.c,v 1.4 2001/01/17 23:44:53 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/programs/fslsfonts/fslsfonts.c b/programs/fslsfonts/fslsfonts.c index c21fe49fa..9760db248 100644 --- a/programs/fslsfonts/fslsfonts.c +++ b/programs/fslsfonts/fslsfonts.c @@ -1,9 +1,13 @@ -/* $Xorg: fslsfonts.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ */ +/* $Xorg: fslsfonts.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.6 2001/07/25 15:05:13 dawes Exp $ */ +/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.7 2001/08/27 17:41:01 dawes Exp $ */ #include <X11/fonts/FSlib.h> #include <stdio.h> diff --git a/programs/fslsfonts/fslsfonts.man b/programs/fslsfonts/fslsfonts.man index 9798bf618..891aa0e5e 100644 --- a/programs/fslsfonts/fslsfonts.man +++ b/programs/fslsfonts/fslsfonts.man @@ -1,8 +1,12 @@ -.\" $Xorg: fslsfonts.man,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ +.\" $Xorg: fslsfonts.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ .\" Copyright 1991, Network Computing Devices, Inc .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.6 2001/01/27 18:21:01 dawes Exp $ .\" .TH FSLSFONTS 1 __xorgversion__ .SH NAME diff --git a/programs/fstobdf/chars.c b/programs/fstobdf/chars.c index 3bb8cf6b9..5e91f2bee 100644 --- a/programs/fstobdf/chars.c +++ b/programs/fstobdf/chars.c @@ -1,9 +1,13 @@ -/* $Xorg: chars.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ */ +/* $Xorg: chars.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/chars.c,v 3.6 2001/01/17 23:44:54 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/chars.c,v 3.7 2001/03/04 00:16:31 tsi Exp $ */ /* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */ diff --git a/programs/fstobdf/fstobdf.c b/programs/fstobdf/fstobdf.c index 2f9dedf16..9ce2cea89 100644 --- a/programs/fstobdf/fstobdf.c +++ b/programs/fstobdf/fstobdf.c @@ -1,9 +1,13 @@ -/* $Xorg: fstobdf.c,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ */ +/* $Xorg: fstobdf.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.4 2001/01/17 23:44:54 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.5 2001/04/01 14:00:18 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/fstobdf/fstobdf.man b/programs/fstobdf/fstobdf.man index d24bd8e4b..f76b009b9 100644 --- a/programs/fstobdf/fstobdf.man +++ b/programs/fstobdf/fstobdf.man @@ -1,8 +1,12 @@ -.\" $Xorg: fstobdf.man,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ +.\" $Xorg: fstobdf.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ .\" Copyright 1990, Network Computing Devices .\" Copyright 1990, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.6 2001/01/27 18:21:02 dawes Exp $ .\" .TH FSTOBDF 1 __xorgversion__ .SH NAME diff --git a/programs/fstobdf/header.c b/programs/fstobdf/header.c index 6f0a2214c..7350b85cd 100644 --- a/programs/fstobdf/header.c +++ b/programs/fstobdf/header.c @@ -1,9 +1,13 @@ -/* $Xorg: header.c,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ */ +/* $Xorg: header.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/header.c,v 3.5 2001/01/17 23:44:54 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/header.c,v 3.6 2001/07/25 15:05:13 dawes Exp $ */ #include <stdio.h> #include <X11/Xosdefs.h> diff --git a/programs/fstobdf/props.c b/programs/fstobdf/props.c index 665d7e5b0..29e32498f 100644 --- a/programs/fstobdf/props.c +++ b/programs/fstobdf/props.c @@ -1,9 +1,13 @@ -/* $Xorg: props.c,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ */ +/* $Xorg: props.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/props.c,v 1.4 1999/02/25 06:01:01 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/props.c,v 1.5 2001/01/17 23:44:54 dawes Exp $ */ #include <stdio.h> #include <string.h> diff --git a/programs/glxinfo/glxinfo.man b/programs/glxinfo/glxinfo.man index ca0e328b9..738c4bb86 100644 --- a/programs/glxinfo/glxinfo.man +++ b/programs/glxinfo/glxinfo.man @@ -1,7 +1,11 @@ .\" $TOG: xdpyinfo.man /main/22 1998/02/09 13:57:10 kaleb $ .\" Copyright 1988, 1989, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/glxinfo/glxinfo.man,v 1.3 2001/04/02 20:58:45 dawes Exp $ +.\" $XFree86: xc/programs/glxinfo/glxinfo.man,v 1.4 2001/04/02 21:22:05 dawes Exp $ .\" .TH GLXINFO 1 __vendorversion__ .SH NAME diff --git a/programs/iceauth/iceauth.c b/programs/iceauth/iceauth.c index 79753e2fa..cd4995206 100644 --- a/programs/iceauth/iceauth.c +++ b/programs/iceauth/iceauth.c @@ -1,12 +1,16 @@ /* - * $Xorg: iceauth.c,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ + * $Xorg: iceauth.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ * * xauth - manipulate authorization file * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Original Author of "xauth" : Jim Fulton, MIT X Consortium * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.c,v 1.3 1999/02/20 15:07:16 hohndel Exp $ */ +/* $XFree86: xc/programs/iceauth/iceauth.c,v 1.4 2001/01/17 23:44:54 dawes Exp $ */ #include "iceauth.h" diff --git a/programs/iceauth/iceauth.h b/programs/iceauth/iceauth.h index c6dc29ef0..1e7764fc0 100644 --- a/programs/iceauth/iceauth.h +++ b/programs/iceauth/iceauth.h @@ -1,10 +1,14 @@ /* - * $Xorg: iceauth.h,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ + * $Xorg: iceauth.h,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.h,v 3.3 2001/01/17 23:44:54 dawes Exp $ */ +/* $XFree86: xc/programs/iceauth/iceauth.h,v 3.4 2001/07/25 15:05:13 dawes Exp $ */ #include <stdio.h> #include <X11/Xos.h> diff --git a/programs/iceauth/iceauth.man b/programs/iceauth/iceauth.man index 3b759e068..ffe643214 100644 --- a/programs/iceauth/iceauth.man +++ b/programs/iceauth/iceauth.man @@ -1,8 +1,12 @@ -.\" $Xorg: iceauth.man,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ +.\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/iceauth/iceauth.man,v 3.6 2001/01/27 18:21:03 dawes Exp $ .\" .TH ICEAUTH 1 __xorgversion__ .SH NAME diff --git a/programs/iceauth/process.c b/programs/iceauth/process.c index 3a33ef52e..621e2d94c 100644 --- a/programs/iceauth/process.c +++ b/programs/iceauth/process.c @@ -1,10 +1,14 @@ /* - * $Xorg: process.c,v 1.4 2000/08/17 19:53:53 cpqbld Exp $ + * $Xorg: process.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/process.c,v 3.5 2001/12/02 14:49:59 herrb Exp $ */ +/* $XFree86: xc/programs/iceauth/process.c,v 3.6 2001/12/02 16:21:33 herrb Exp $ */ #include "iceauth.h" #include <ctype.h> diff --git a/programs/lbxproxy/di/atomcache.c b/programs/lbxproxy/di/atomcache.c index c6c871091..447f9f378 100644 --- a/programs/lbxproxy/di/atomcache.c +++ b/programs/lbxproxy/di/atomcache.c @@ -1,9 +1,13 @@ -/* $Xorg: atomcache.c,v 1.3 2000/08/17 19:53:54 cpqbld Exp $ */ +/* $Xorg: atomcache.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/di/atomcache.c,v 1.5 2001/10/28 03:34:21 tsi Exp $ */ /* * atom cache for LBX diff --git a/programs/lbxproxy/di/cache.c b/programs/lbxproxy/di/cache.c index 67c4c3d69..30bcaeafb 100644 --- a/programs/lbxproxy/di/cache.c +++ b/programs/lbxproxy/di/cache.c @@ -1,8 +1,12 @@ -/* $Xorg: cache.c,v 1.4 2000/08/17 19:53:54 cpqbld Exp $ */ +/* $Xorg: cache.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/di/cache.c,v 1.5 2001/10/28 03:34:21 tsi Exp $ */ #include "misc.h" #include "util.h" #include "cache.h" diff --git a/programs/lbxproxy/di/cmap.c b/programs/lbxproxy/di/cmap.c index 9c73b7fa5..8af2694cb 100644 --- a/programs/lbxproxy/di/cmap.c +++ b/programs/lbxproxy/di/cmap.c @@ -1,9 +1,13 @@ -/* $Xorg: cmap.c,v 1.4 2000/08/17 19:53:54 cpqbld Exp $ */ +/* $Xorg: cmap.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/di/cmap.c,v 1.5 2001/10/28 03:34:21 tsi Exp $ */ #include <stdio.h> #include "assert.h" diff --git a/programs/lbxproxy/di/cmaputil.c b/programs/lbxproxy/di/cmaputil.c index 925bc809c..57dda69bd 100644 --- a/programs/lbxproxy/di/cmaputil.c +++ b/programs/lbxproxy/di/cmaputil.c @@ -1,9 +1,13 @@ -/* $Xorg: cmaputil.c,v 1.4 2000/08/17 19:53:54 cpqbld Exp $ */ +/* $Xorg: cmaputil.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/cmaputil.c,v 1.8 2001/08/01 00:45:00 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/cmaputil.c,v 1.9 2001/10/28 03:34:21 tsi Exp $ */ #include <stdio.h> #include "misc.h" diff --git a/programs/lbxproxy/di/extensions.c b/programs/lbxproxy/di/extensions.c index c43805531..a26edb41f 100644 --- a/programs/lbxproxy/di/extensions.c +++ b/programs/lbxproxy/di/extensions.c @@ -1,9 +1,13 @@ -/* $Xorg: extensions.c,v 1.4 2000/08/17 19:53:55 cpqbld Exp $ */ +/* $Xorg: extensions.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/di/gfx.c b/programs/lbxproxy/di/gfx.c index a505f17c0..ce8ea56a3 100644 --- a/programs/lbxproxy/di/gfx.c +++ b/programs/lbxproxy/di/gfx.c @@ -1,9 +1,13 @@ -/* $Xorg: gfx.c,v 1.3 2000/08/17 19:53:55 cpqbld Exp $ */ +/* $Xorg: gfx.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/di/gfx.c,v 1.5 2001/10/28 03:34:22 tsi Exp $ */ /* * graphics acceleration diff --git a/programs/lbxproxy/di/globals.c b/programs/lbxproxy/di/globals.c index b273f8d57..51843bb6e 100644 --- a/programs/lbxproxy/di/globals.c +++ b/programs/lbxproxy/di/globals.c @@ -1,9 +1,13 @@ -/* $Xorg: globals.c,v 1.3 2000/08/17 19:53:55 cpqbld Exp $ */ +/* $Xorg: globals.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/di/init.c b/programs/lbxproxy/di/init.c index 263abc37a..f4cd67d76 100644 --- a/programs/lbxproxy/di/init.c +++ b/programs/lbxproxy/di/init.c @@ -1,9 +1,13 @@ -/* $Xorg: init.c,v 1.3 2000/08/17 19:53:55 cpqbld Exp $ */ +/* $Xorg: init.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/di/init.c,v 1.5 2001/08/01 00:45:00 tsi Exp $ */ /* * This file is used for anything that needs to dip into Xlib structures diff --git a/programs/lbxproxy/di/main.c b/programs/lbxproxy/di/main.c index c3d32099d..060f1885e 100644 --- a/programs/lbxproxy/di/main.c +++ b/programs/lbxproxy/di/main.c @@ -1,9 +1,13 @@ -/* $Xorg: main.c,v 1.4 2000/08/17 19:53:55 cpqbld Exp $ */ +/* $Xorg: main.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/main.c,v 1.7 2001/01/17 23:44:56 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/main.c,v 1.8 2001/01/21 21:19:39 tsi Exp $ */ #include <stdlib.h> #include "lbx.h" diff --git a/programs/lbxproxy/di/options.c b/programs/lbxproxy/di/options.c index a2b2f5638..faf2a5aa0 100644 --- a/programs/lbxproxy/di/options.c +++ b/programs/lbxproxy/di/options.c @@ -1,9 +1,13 @@ -/* $Xorg: options.c,v 1.3 2000/08/17 19:53:55 cpqbld Exp $ */ +/* $Xorg: options.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.5 2000/06/07 22:03:15 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.6 2001/01/17 23:44:56 dawes Exp $ */ #include <stdio.h> #include "X.h" diff --git a/programs/lbxproxy/di/pm.c b/programs/lbxproxy/di/pm.c index 8bc3f4265..8b7235b9c 100644 --- a/programs/lbxproxy/di/pm.c +++ b/programs/lbxproxy/di/pm.c @@ -1,9 +1,13 @@ -/* $Xorg: pm.c,v 1.4 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: pm.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/lbxproxy/di/pm.c,v 1.6 2001/08/01 00:45:00 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/pm.c,v 1.7 2001/10/18 21:01:25 herrb Exp $ */ #include <ctype.h> #include <stdio.h> diff --git a/programs/lbxproxy/di/props.c b/programs/lbxproxy/di/props.c index a3576e299..8d316e547 100644 --- a/programs/lbxproxy/di/props.c +++ b/programs/lbxproxy/di/props.c @@ -1,9 +1,13 @@ -/* $Xorg: props.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: props.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/di/props.c,v 1.5 2001/10/28 03:34:23 tsi Exp $ */ /* * property handling diff --git a/programs/lbxproxy/di/resource.c b/programs/lbxproxy/di/resource.c index b92823027..2b7811eb7 100644 --- a/programs/lbxproxy/di/resource.c +++ b/programs/lbxproxy/di/resource.c @@ -3,7 +3,11 @@ Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/di/swaprep.c b/programs/lbxproxy/di/swaprep.c index 3621392df..c5fc3720f 100644 --- a/programs/lbxproxy/di/swaprep.c +++ b/programs/lbxproxy/di/swaprep.c @@ -1,9 +1,13 @@ -/* $Xorg: swaprep.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: swaprep.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/di/swapreq.c b/programs/lbxproxy/di/swapreq.c index 470fb21cd..ab35a7b23 100644 --- a/programs/lbxproxy/di/swapreq.c +++ b/programs/lbxproxy/di/swapreq.c @@ -1,9 +1,13 @@ -/* $Xorg: swapreq.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: swapreq.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/di/tags.c b/programs/lbxproxy/di/tags.c index d32282401..0e800f259 100644 --- a/programs/lbxproxy/di/tags.c +++ b/programs/lbxproxy/di/tags.c @@ -1,9 +1,13 @@ -/* $Xorg: tags.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: tags.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/di/unsquish.c b/programs/lbxproxy/di/unsquish.c index 14fc12306..87389797e 100644 --- a/programs/lbxproxy/di/unsquish.c +++ b/programs/lbxproxy/di/unsquish.c @@ -1,9 +1,13 @@ -/* $Xorg: unsquish.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: unsquish.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/di/utils.c b/programs/lbxproxy/di/utils.c index 3e7833c07..b56016526 100644 --- a/programs/lbxproxy/di/utils.c +++ b/programs/lbxproxy/di/utils.c @@ -1,9 +1,13 @@ -/* $Xorg: utils.c,v 1.4 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:32 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/di/utils.c,v 1.11 2001/07/25 15:05:14 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/utils.c,v 1.12 2001/12/02 15:16:36 herrb Exp $ */ #include "lbx.h" #include <stdio.h> diff --git a/programs/lbxproxy/di/wire.c b/programs/lbxproxy/di/wire.c index 5fb6ce850..c8e57a850 100644 --- a/programs/lbxproxy/di/wire.c +++ b/programs/lbxproxy/di/wire.c @@ -1,9 +1,13 @@ -/* $Xorg: wire.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $Xorg: wire.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.10 2001/01/17 23:44:56 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.11 2001/08/01 00:45:00 tsi Exp $ */ #include "lbx.h" #include <stdio.h> diff --git a/programs/lbxproxy/di/zeropad.c b/programs/lbxproxy/di/zeropad.c index c28f79919..e57f5479e 100644 --- a/programs/lbxproxy/di/zeropad.c +++ b/programs/lbxproxy/di/zeropad.c @@ -1,16 +1,14 @@ -/* $XConsortium: zeropad.c /main/2 1996/11/03 18:42:03 rws $ */ +/* $Xorg: zeropad.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* -Copyright (c) 1996 X Consortium +Copyright 1996, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,15 +16,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/lbxproxy/include/atomcache.h b/programs/lbxproxy/include/atomcache.h index 25cdc5ab5..d94228d78 100644 --- a/programs/lbxproxy/include/atomcache.h +++ b/programs/lbxproxy/include/atomcache.h @@ -1,9 +1,13 @@ -/* $Xorg: atomcache.h,v 1.3 2000/08/17 19:53:57 cpqbld Exp $ */ +/* $Xorg: atomcache.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/cache.h b/programs/lbxproxy/include/cache.h index df789a94e..b1abd4f4b 100644 --- a/programs/lbxproxy/include/cache.h +++ b/programs/lbxproxy/include/cache.h @@ -1,8 +1,12 @@ -/* $Xorg: cache.h,v 1.3 2000/08/17 19:53:57 cpqbld Exp $ */ +/* $Xorg: cache.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/colormap.h b/programs/lbxproxy/include/colormap.h index 9797f144c..9043ccd8f 100644 --- a/programs/lbxproxy/include/colormap.h +++ b/programs/lbxproxy/include/colormap.h @@ -1,9 +1,13 @@ -/* $Xorg: colormap.h,v 1.3 2000/08/17 19:53:57 cpqbld Exp $ */ +/* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/include/colormap.h,v 1.5 2001/08/01 00:45:01 tsi Exp $ */ #ifndef COLORMAP_H_ #define COLORMAP_H_ diff --git a/programs/lbxproxy/include/init.h b/programs/lbxproxy/include/init.h index 3ac0c8984..3de79fc5b 100644 --- a/programs/lbxproxy/include/init.h +++ b/programs/lbxproxy/include/init.h @@ -1,7 +1,31 @@ -/* $XConsortium: init.h /main/3 1996/12/03 14:22:04 kaleb $ */ +/* $Xorg: init.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* + +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +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. + +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 Open Group. + +*/ /* * Copyright 1992 Network Computing Devices - * Copyright 1996 X Consortium, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/programs/lbxproxy/include/lbx.h b/programs/lbxproxy/include/lbx.h index e3b1d3588..5ea831603 100644 --- a/programs/lbxproxy/include/lbx.h +++ b/programs/lbxproxy/include/lbx.h @@ -1,9 +1,13 @@ -/* $Xorg: lbx.h,v 1.3 2000/08/17 19:53:57 cpqbld Exp $ */ +/* $Xorg: lbx.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.5 2001/08/01 00:45:01 tsi Exp $ */ #ifndef _LBX_H_ #define _LBX_H_ diff --git a/programs/lbxproxy/include/lbxext.h b/programs/lbxproxy/include/lbxext.h index addac99a7..daefe788e 100644 --- a/programs/lbxproxy/include/lbxext.h +++ b/programs/lbxproxy/include/lbxext.h @@ -1,7 +1,31 @@ -/* $XConsortium: lbxext.h /main/5 1996/11/22 11:02:36 rws $ */ +/* $Xorg: lbxext.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* + +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +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. + +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 Open Group. + +*/ /* * Copyright 1994 Network Computing Devices, Inc. - * Copyright 1996 X Consortium, Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided diff --git a/programs/lbxproxy/include/misc.h b/programs/lbxproxy/include/misc.h index 1ccfef4c6..19c601191 100644 --- a/programs/lbxproxy/include/misc.h +++ b/programs/lbxproxy/include/misc.h @@ -1,10 +1,14 @@ -/* $Xorg: misc.h,v 1.3 2000/08/17 19:53:57 cpqbld Exp $ */ +/* $Xorg: misc.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1995, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/include/misc.h,v 1.6 2001/08/01 00:45:01 tsi Exp $ */ #ifndef MISC_H #define MISC_H 1 diff --git a/programs/lbxproxy/include/os.h b/programs/lbxproxy/include/os.h index fc31ad4f3..fb6dc7701 100644 --- a/programs/lbxproxy/include/os.h +++ b/programs/lbxproxy/include/os.h @@ -1,10 +1,14 @@ -/* $Xorg: os.h,v 1.3 2000/08/17 19:53:57 cpqbld Exp $ */ +/* $Xorg: os.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1995, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/include/os.h,v 1.6 2001/08/01 00:45:01 tsi Exp $ */ #ifndef OS_H #define OS_H diff --git a/programs/lbxproxy/include/pm.h b/programs/lbxproxy/include/pm.h index 2d7fc8e56..313c2e28d 100644 --- a/programs/lbxproxy/include/pm.h +++ b/programs/lbxproxy/include/pm.h @@ -1,9 +1,13 @@ -/* $Xorg: pm.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: pm.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/pmP.h b/programs/lbxproxy/include/pmP.h index 41622a03f..6b9b3ba73 100644 --- a/programs/lbxproxy/include/pmP.h +++ b/programs/lbxproxy/include/pmP.h @@ -1,9 +1,13 @@ -/* $Xorg: pmP.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: pmP.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/proxyopts.h b/programs/lbxproxy/include/proxyopts.h index ded74f171..fe22a6803 100644 --- a/programs/lbxproxy/include/proxyopts.h +++ b/programs/lbxproxy/include/proxyopts.h @@ -1,9 +1,13 @@ -/* $Xorg: proxyopts.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: proxyopts.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/reqtype.h b/programs/lbxproxy/include/reqtype.h index ac99bedba..bfed83a15 100644 --- a/programs/lbxproxy/include/reqtype.h +++ b/programs/lbxproxy/include/reqtype.h @@ -1,9 +1,13 @@ -/* $Xorg: reqtype.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: reqtype.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/resource.h b/programs/lbxproxy/include/resource.h index 65e6e83fd..2fc494e02 100644 --- a/programs/lbxproxy/include/resource.h +++ b/programs/lbxproxy/include/resource.h @@ -1,10 +1,14 @@ -/* $Xorg: resource.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: resource.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1995, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/tags.h b/programs/lbxproxy/include/tags.h index c5b0f6c30..d48be5f37 100644 --- a/programs/lbxproxy/include/tags.h +++ b/programs/lbxproxy/include/tags.h @@ -1,9 +1,13 @@ -/* $Xorg: tags.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: tags.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/lbxproxy/include/util.h b/programs/lbxproxy/include/util.h index f4d89cfb4..0b3d49aee 100644 --- a/programs/lbxproxy/include/util.h +++ b/programs/lbxproxy/include/util.h @@ -1,9 +1,13 @@ -/* $Xorg: util.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: util.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/include/util.h,v 1.6 2001/07/29 14:10:20 tsi Exp $ */ #ifndef _UTIL_H_ #define _UTIL_H_ diff --git a/programs/lbxproxy/include/wire.h b/programs/lbxproxy/include/wire.h index 8d09cc170..35e29c51a 100644 --- a/programs/lbxproxy/include/wire.h +++ b/programs/lbxproxy/include/wire.h @@ -1,9 +1,13 @@ -/* $Xorg: wire.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: wire.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/lbxproxy/include/wire.h,v 1.6 2001/08/01 00:45:01 tsi Exp $ */ #ifdef DEBUG /* Need this here because lbx.h undef's DEBUG */ extern int lbxDebug; diff --git a/programs/lbxproxy/lbxproxy.man b/programs/lbxproxy/lbxproxy.man index 75c3dd9e5..da87d2277 100644 --- a/programs/lbxproxy/lbxproxy.man +++ b/programs/lbxproxy/lbxproxy.man @@ -1,7 +1,11 @@ -.\" $Xorg: lbxproxy.man,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ +.\" $Xorg: lbxproxy.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/lbxproxy/lbxproxy.man,v 1.7 2001/01/27 18:21:03 dawes Exp $ .\" .TH LBXPROXY 1 __xorgversion__ .SH NAME diff --git a/programs/lbxproxy/os/WaitFor.c b/programs/lbxproxy/os/WaitFor.c index 120e0ebcd..af2df1aa7 100644 --- a/programs/lbxproxy/os/WaitFor.c +++ b/programs/lbxproxy/os/WaitFor.c @@ -1,9 +1,13 @@ -/* $Xorg: WaitFor.c,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: WaitFor.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/WaitFor.c,v 1.7 2001/07/25 15:05:14 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/WaitFor.c,v 1.8 2001/10/28 03:34:23 tsi Exp $ */ /***************************************************************** * OS Dependent input routines: diff --git a/programs/lbxproxy/os/connection.c b/programs/lbxproxy/os/connection.c index d7e30e692..d99c21973 100644 --- a/programs/lbxproxy/os/connection.c +++ b/programs/lbxproxy/os/connection.c @@ -1,9 +1,13 @@ -/* $Xorg: connection.c,v 1.4 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: connection.c,v 1.5 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -56,7 +60,7 @@ SOFTWARE. * socket ids aren't small nums (0 - 2^8) * *****************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/connection.c,v 1.14 2001/01/17 23:44:59 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/connection.c,v 1.15 2001/07/25 15:05:14 dawes Exp $ */ #include "misc.h" #include <X11/Xtrans.h> diff --git a/programs/lbxproxy/os/io.c b/programs/lbxproxy/os/io.c index fbc4a86ce..47a08ecb5 100644 --- a/programs/lbxproxy/os/io.c +++ b/programs/lbxproxy/os/io.c @@ -1,9 +1,13 @@ -/* $Xorg: io.c,v 1.5 2000/08/17 19:53:58 cpqbld Exp $ */ +/* $Xorg: io.c,v 1.6 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/io.c,v 1.8 2001/07/25 15:05:14 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/io.c,v 1.9 2001/10/28 03:34:23 tsi Exp $ */ /***************************************************************** * i/o functions * diff --git a/programs/lbxproxy/os/osdep.h b/programs/lbxproxy/os/osdep.h index 1848e6991..b0e69d605 100644 --- a/programs/lbxproxy/os/osdep.h +++ b/programs/lbxproxy/os/osdep.h @@ -1,9 +1,13 @@ -/* $Xorg: osdep.h,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ */ +/* $Xorg: osdep.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -41,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/osdep.h,v 1.8 2001/01/17 23:44:59 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/osdep.h,v 1.9 2001/07/25 15:05:14 dawes Exp $ */ #define BOTIMEOUT 200 /* in milliseconds */ #define BUFSIZE 4096 diff --git a/programs/lbxproxy/os/osinit.c b/programs/lbxproxy/os/osinit.c index 6725755cf..95a98b9c8 100644 --- a/programs/lbxproxy/os/osinit.c +++ b/programs/lbxproxy/os/osinit.c @@ -1,9 +1,13 @@ -/* $Xorg: osinit.c,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ */ +/* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/mkfontdir/mkfontdir.man b/programs/mkfontdir/mkfontdir.man index 75fb3850a..e2eb2513e 100644 --- a/programs/mkfontdir/mkfontdir.man +++ b/programs/mkfontdir/mkfontdir.man @@ -1,7 +1,11 @@ -.\" $Xorg: mkfontdir.man,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ +.\" $Xorg: mkfontdir.man,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.13 2001/08/13 21:46:51 dawes Exp $ +.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.14 2001/11/01 23:35:34 dawes Exp $ .\" .TH MKFONTDIR 1 __xorgversion__ .SH NAME diff --git a/programs/oclock/Clock.c b/programs/oclock/Clock.c index 67d4122f8..66fea36f1 100644 --- a/programs/oclock/Clock.c +++ b/programs/oclock/Clock.c @@ -1,9 +1,13 @@ /* - * $Xorg: Clock.c,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ + * $Xorg: Clock.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/oclock/Clock.c,v 1.5 2001/04/01 14:00:18 tsi Exp $ */ +/* $XFree86: xc/programs/oclock/Clock.c,v 1.6 2001/07/25 15:05:15 dawes Exp $ */ /* * Clock.c diff --git a/programs/oclock/Clock.h b/programs/oclock/Clock.h index 94a243040..48baf5ec9 100644 --- a/programs/oclock/Clock.h +++ b/programs/oclock/Clock.h @@ -1,9 +1,13 @@ -/* $Xorg: Clock.h,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ */ +/* $Xorg: Clock.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/oclock/Clock.h,v 1.3 1999/02/20 15:07:16 hohndel Exp $ */ +/* $XFree86: xc/programs/oclock/Clock.h,v 1.4 2001/01/17 23:45:01 dawes Exp $ */ #ifndef _XtClock_h #define _XtClock_h diff --git a/programs/oclock/ClockP.h b/programs/oclock/ClockP.h index ead2ca19d..cc075a897 100644 --- a/programs/oclock/ClockP.h +++ b/programs/oclock/ClockP.h @@ -1,9 +1,13 @@ -/* $Xorg: ClockP.h,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ */ +/* $Xorg: ClockP.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/oclock/ClockP.h,v 1.3 1999/02/20 15:07:17 hohndel Exp $ */ +/* $XFree86: xc/programs/oclock/ClockP.h,v 1.4 2001/01/17 23:45:01 dawes Exp $ */ #ifndef _ClockP_h diff --git a/programs/oclock/oclock.c b/programs/oclock/oclock.c index 24d745d03..f8307d0b0 100644 --- a/programs/oclock/oclock.c +++ b/programs/oclock/oclock.c @@ -1,9 +1,13 @@ /* - * $Xorg: oclock.c,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ + * $Xorg: oclock.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/oclock/oclock.c,v 1.5 2001/01/17 23:45:01 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/oclock.c,v 1.6 2001/04/01 14:00:18 tsi Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xatom.h> diff --git a/programs/oclock/oclock.man b/programs/oclock/oclock.man index 53f29bbb3..ecdaab733 100644 --- a/programs/oclock/oclock.man +++ b/programs/oclock/oclock.man @@ -1,7 +1,11 @@ -.\" $Xorg: oclock.man,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ +.\" $Xorg: oclock.man,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ .\" Copyright 1989, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/oclock/oclock.man,v 1.7 2001/01/27 18:21:04 dawes Exp $ .\" .TH OCLOCK 1 __xorgversion__ .SH NAME diff --git a/programs/oclock/transform.c b/programs/oclock/transform.c index e3640e4da..2b662d26b 100644 --- a/programs/oclock/transform.c +++ b/programs/oclock/transform.c @@ -1,9 +1,13 @@ -/* $Xorg: transform.c,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ */ +/* $Xorg: transform.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/oclock/transform.c,v 3.3 2001/01/17 23:45:01 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/transform.c,v 3.4 2001/07/25 15:05:15 dawes Exp $ */ /* diff --git a/programs/oclock/transform.h b/programs/oclock/transform.h index 7c253ff61..ae8820085 100644 --- a/programs/oclock/transform.h +++ b/programs/oclock/transform.h @@ -1,9 +1,13 @@ -/* $Xorg: transform.h,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ */ +/* $Xorg: transform.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/oclock/transform.h,v 1.3 1999/02/20 15:07:17 hohndel Exp $ */ +/* $XFree86: xc/programs/oclock/transform.h,v 1.4 2001/01/17 23:45:01 dawes Exp $ */ /* diff --git a/programs/proxymngr/PM.h b/programs/proxymngr/PM.h index be32bc7f9..c96644c5f 100644 --- a/programs/proxymngr/PM.h +++ b/programs/proxymngr/PM.h @@ -1,15 +1,13 @@ -/* $XConsortium: PM.h /main/1 1996/11/30 23:57:44 swick $ */ +/* $Xorg: PM.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* -Copyright (c) 1996 X Consortium +Copyright 1996, 1998 The Open Group -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 sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ /* Proxy Management Protocol */ diff --git a/programs/proxymngr/PMproto.h b/programs/proxymngr/PMproto.h index 08650b44f..754e460c5 100644 --- a/programs/proxymngr/PMproto.h +++ b/programs/proxymngr/PMproto.h @@ -1,15 +1,13 @@ -/* $XConsortium: PMproto.h /main/1 1996/11/30 23:57:48 swick $ */ +/* $Xorg: PMproto.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* -Copyright (c) 1996 X Consortium +Copyright 1996, 1998 The Open Group -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 sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ /* Proxy Management Protocol */ diff --git a/programs/proxymngr/config.c b/programs/proxymngr/config.c index 7463c9f21..89932ce14 100644 --- a/programs/proxymngr/config.c +++ b/programs/proxymngr/config.c @@ -1,9 +1,13 @@ -/* $Xorg: config.c,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ */ +/* $Xorg: config.c,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/config.c,v 1.5 2000/09/26 15:57:23 tsi Exp $ */ +/* $XFree86: xc/programs/proxymngr/config.c,v 1.6 2001/01/17 23:45:02 dawes Exp $ */ #include <stdlib.h> diff --git a/programs/proxymngr/config.h b/programs/proxymngr/config.h index c771686ac..484b2a2c7 100644 --- a/programs/proxymngr/config.h +++ b/programs/proxymngr/config.h @@ -1,15 +1,13 @@ -/* $XConsortium: config.h /main/4 1996/11/04 08:59:19 swick $ */ +/* $Xorg: config.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* -Copyright (c) 1996 X Consortium +Copyright 1996, 1998 The Open Group -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 sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/proxymngr/main.c b/programs/proxymngr/main.c index 485aef5d7..cab70ee9e 100644 --- a/programs/proxymngr/main.c +++ b/programs/proxymngr/main.c @@ -1,9 +1,13 @@ -/* $Xorg: main.c,v 1.4 2000/08/17 19:54:00 cpqbld Exp $ */ +/* $Xorg: main.c,v 1.6 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/main.c,v 1.4 2000/05/11 18:14:40 tsi Exp $ */ +/* $XFree86: xc/programs/proxymngr/main.c,v 1.5 2001/01/17 23:45:02 dawes Exp $ */ #include <stdlib.h> #include "pmint.h" diff --git a/programs/proxymngr/pmdb.c b/programs/proxymngr/pmdb.c index 132bf4d23..d61f0c76e 100644 --- a/programs/proxymngr/pmdb.c +++ b/programs/proxymngr/pmdb.c @@ -1,9 +1,13 @@ -/* $Xorg: pmdb.c,v 1.4 2000/08/17 19:54:00 cpqbld Exp $ */ +/* $Xorg: pmdb.c,v 1.5 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/pmdb.c,v 1.5 2001/01/17 23:45:02 dawes Exp $ */ +/* $XFree86: xc/programs/proxymngr/pmdb.c,v 1.6 2001/08/01 00:45:01 tsi Exp $ */ #include "pmint.h" #include "pmdb.h" diff --git a/programs/proxymngr/pmdb.h b/programs/proxymngr/pmdb.h index e0bb1bfa4..eee5ad3a2 100644 --- a/programs/proxymngr/pmdb.h +++ b/programs/proxymngr/pmdb.h @@ -1,15 +1,13 @@ -/* $XConsortium: pmdb.h /main/9 1996/10/29 10:03:33 swick $ */ +/* $Xorg: pmdb.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* -Copyright (c) 1996 X Consortium +Copyright 1996, 1998 The Open Group -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 sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/proxymngr/pmint.h b/programs/proxymngr/pmint.h index 23d22dcd3..9bdbf5376 100644 --- a/programs/proxymngr/pmint.h +++ b/programs/proxymngr/pmint.h @@ -1,9 +1,13 @@ -/* $Xorg: pmint.h,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ */ +/* $Xorg: pmint.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/pmint.h,v 1.3 1999/02/20 15:07:18 hohndel Exp $ */ +/* $XFree86: xc/programs/proxymngr/pmint.h,v 1.4 2001/01/17 23:45:02 dawes Exp $ */ #include <stdio.h> #include <X11/Xos.h> diff --git a/programs/proxymngr/proxymngr.man b/programs/proxymngr/proxymngr.man index 729521696..bd1d7cc3e 100644 --- a/programs/proxymngr/proxymngr.man +++ b/programs/proxymngr/proxymngr.man @@ -1,7 +1,11 @@ -.\" $Xorg: proxymngr.man,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ +.\" $Xorg: proxymngr.man,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.6 2001/01/27 18:21:04 dawes Exp $ .\" .TH PROXYMNGR 1 __xorgversion__ .SH NAME diff --git a/programs/rgb/rgb.c b/programs/rgb/rgb.c index e22e39008..8742497ef 100644 --- a/programs/rgb/rgb.c +++ b/programs/rgb/rgb.c @@ -1,9 +1,13 @@ -/* $Xorg: rgb.c,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ */ +/* $Xorg: rgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/rgb/rgb.c,v 3.6 2001/07/25 15:05:15 dawes Exp $ */ +/* $XFree86: xc/programs/rgb/rgb.c,v 3.7 2001/10/28 03:34:24 tsi Exp $ */ /* reads from standard input lines of the form: diff --git a/programs/rgb/showrgb.c b/programs/rgb/showrgb.c index f667c8173..8903e8d0b 100644 --- a/programs/rgb/showrgb.c +++ b/programs/rgb/showrgb.c @@ -1,9 +1,13 @@ /* - * $Xorg: showrgb.c,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ + * $Xorg: showrgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/rgb/showrgb.c,v 3.6 2001/01/17 23:45:03 dawes Exp $ */ +/* $XFree86: xc/programs/rgb/showrgb.c,v 3.7 2001/07/25 15:05:15 dawes Exp $ */ #ifndef USE_RGB_TXT #ifdef NDBM diff --git a/programs/rgb/showrgb.man b/programs/rgb/showrgb.man index 33a437e99..38c4d6013 100644 --- a/programs/rgb/showrgb.man +++ b/programs/rgb/showrgb.man @@ -1,7 +1,11 @@ -.\" $Xorg: showrgb.man,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ +.\" $Xorg: showrgb.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.6 2001/01/27 18:21:05 dawes Exp $ .\" .TH SHOWRGB 1 __xorgversion__ .SH NAME diff --git a/programs/scripts/xon.man b/programs/scripts/xon.man index 8e87bad48..e8fa24876 100644 --- a/programs/scripts/xon.man +++ b/programs/scripts/xon.man @@ -1,7 +1,11 @@ -.\" $Xorg: xon.man,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +.\" $Xorg: xon.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/scripts/xon.man,v 1.6 2001/01/27 18:21:05 dawes Exp $ .\" .TH XON 1 __xorgversion__ .SH NAME diff --git a/programs/smproxy/save.c b/programs/smproxy/save.c index e69a65aa1..e7061d7f6 100644 --- a/programs/smproxy/save.c +++ b/programs/smproxy/save.c @@ -1,9 +1,13 @@ -/* $Xorg: save.c,v 1.3 2000/08/17 19:54:05 cpqbld Exp $ */ +/* $Xorg: save.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/save.c,v 1.6 1999/02/25 06:01:01 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/save.c,v 1.7 2001/01/17 23:45:04 dawes Exp $ */ #include "smproxy.h" #ifdef HAS_MKSTEMP diff --git a/programs/smproxy/smproxy.c b/programs/smproxy/smproxy.c index 8b8fd12dc..ab9422282 100644 --- a/programs/smproxy/smproxy.c +++ b/programs/smproxy/smproxy.c @@ -1,9 +1,13 @@ -/* $Xorg: smproxy.c,v 1.5 2000/08/17 19:54:05 cpqbld Exp $ */ +/* $Xorg: smproxy.c,v 1.6 2001/02/09 02:05:35 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.7 2001/08/01 00:45:02 tsi Exp $ */ +/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.8 2001/10/28 03:34:25 tsi Exp $ */ #include "smproxy.h" #include <unistd.h> diff --git a/programs/smproxy/smproxy.h b/programs/smproxy/smproxy.h index 8ec5febbc..90d2bbfd6 100644 --- a/programs/smproxy/smproxy.h +++ b/programs/smproxy/smproxy.h @@ -1,9 +1,13 @@ -/* $Xorg: smproxy.h,v 1.3 2000/08/17 19:54:05 cpqbld Exp $ */ +/* $Xorg: smproxy.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.4 2001/01/17 23:45:05 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.5 2001/07/25 15:05:16 dawes Exp $ */ #include <X11/Xosdefs.h> #include <X11/Xfuncs.h> diff --git a/programs/smproxy/smproxy.man b/programs/smproxy/smproxy.man index 0a6c175a8..543c6cfd6 100644 --- a/programs/smproxy/smproxy.man +++ b/programs/smproxy/smproxy.man @@ -1,7 +1,11 @@ -.\" $Xorg: smproxy.man,v 1.3 2000/08/17 19:54:05 cpqbld Exp $ +.\" $Xorg: smproxy.man,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.6 2001/01/27 18:21:06 dawes Exp $ .\" .TH XSM 1 __xorgversion__ .SH NAME diff --git a/programs/twm/add_window.c b/programs/twm/add_window.c index b16990813..50dc9ac89 100644 --- a/programs/twm/add_window.c +++ b/programs/twm/add_window.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/twm/add_window.c,v 1.8 2001/01/17 23:45:05 dawes Exp $ */ +/* $XFree86: xc/programs/twm/add_window.c,v 1.9 2001/06/21 21:42:39 keithp Exp $ */ /*****************************************************************************/ /* Copyright 1989,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,7 +53,7 @@ in this Software without prior written authorization from The Open Group. /********************************************************************** * - * $Xorg: add_window.c,v 1.4 2000/08/17 19:54:05 cpqbld Exp $ + * $Xorg: add_window.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $ * * Add a new window, put the titlbar and other stuff around * the window diff --git a/programs/twm/add_window.h b/programs/twm/add_window.h index 1cf4a61aa..190c9ff49 100644 --- a/programs/twm/add_window.h +++ b/programs/twm/add_window.h @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/add_window.h,v 1.4 2001/01/17 23:45:05 dawes Exp $ */ +/* $XFree86: xc/programs/twm/add_window.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */ /********************************************************************** * - * $Xorg: add_window.h,v 1.3 2000/08/17 19:54:05 cpqbld Exp $ + * $Xorg: add_window.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * AddWindow include file * diff --git a/programs/twm/cursor.c b/programs/twm/cursor.c index 90d0d5faf..be0c2e61d 100644 --- a/programs/twm/cursor.c +++ b/programs/twm/cursor.c @@ -2,7 +2,11 @@ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,11 +22,11 @@ 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 Open Group. * */ -/* $XFree86: xc/programs/twm/cursor.c,v 1.3 1999/02/20 15:07:22 hohndel Exp $ */ +/* $XFree86: xc/programs/twm/cursor.c,v 1.4 2001/01/17 23:45:05 dawes Exp $ */ /*********************************************************************** * - * $Xorg: cursor.c,v 1.4 2000/08/17 19:54:05 cpqbld Exp $ + * $Xorg: cursor.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $ * * cursor creation code * diff --git a/programs/twm/events.c b/programs/twm/events.c index 228006b19..62e815ff3 100644 --- a/programs/twm/events.c +++ b/programs/twm/events.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/twm/events.c,v 1.10 2001/08/27 21:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/twm/events.c,v 1.11 2001/12/02 15:57:03 herrb Exp $ */ /*****************************************************************************/ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,7 +53,7 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: events.c,v 1.3 2000/08/17 19:54:05 cpqbld Exp $ + * $Xorg: events.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * twm event handling * diff --git a/programs/twm/events.h b/programs/twm/events.h index 088a953a5..6bc941e82 100644 --- a/programs/twm/events.h +++ b/programs/twm/events.h @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/events.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */ +/* $XFree86: xc/programs/twm/events.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */ /*********************************************************************** * - * $Xorg: events.h,v 1.3 2000/08/17 19:54:06 cpqbld Exp $ + * $Xorg: events.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * twm event handler include file * diff --git a/programs/twm/gc.c b/programs/twm/gc.c index 85725cfde..6bc7b87b0 100644 --- a/programs/twm/gc.c +++ b/programs/twm/gc.c @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/gc.c,v 1.4 2000/10/24 22:45:15 dawes Exp $ */ +/* $XFree86: xc/programs/twm/gc.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */ /********************************************************************** * - * $Xorg: gc.c,v 1.3 2000/08/17 19:54:06 cpqbld Exp $ + * $Xorg: gc.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * Open the fonts and create the GCs * diff --git a/programs/twm/gc.h b/programs/twm/gc.h index b22f591a0..c0b9566ac 100644 --- a/programs/twm/gc.h +++ b/programs/twm/gc.h @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/gc.h,v 1.3 1999/02/20 15:07:22 hohndel Exp $ */ +/* $XFree86: xc/programs/twm/gc.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */ /********************************************************************** * - * $Xorg: gc.h,v 1.3 2000/08/17 19:54:06 cpqbld Exp $ + * $Xorg: gc.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * GC related externs * diff --git a/programs/twm/gram.y b/programs/twm/gram.y index a41f93ec4..651ff6ba2 100644 --- a/programs/twm/gram.y +++ b/programs/twm/gram.y @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -48,7 +52,7 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: gram.y,v 1.3 2000/08/17 19:54:06 cpqbld Exp $ + * $Xorg: gram.y,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * .twmrc command grammer * @@ -56,7 +60,7 @@ in this Software without prior written authorization from The Open Group. * 11-Nov-90 Dave Sternlicht Adding SaveColors * 10-Oct-90 David M. Sternlicht Storing saved colors on root * - * $XFree86: xc/programs/twm/gram.y,v 3.4 1999/02/19 21:27:26 hohndel Exp $ + * $XFree86: xc/programs/twm/gram.y,v 3.5 2001/01/17 23:45:06 dawes Exp $ * ***********************************************************************/ diff --git a/programs/twm/iconmgr.c b/programs/twm/iconmgr.c index 3907471b0..edb548942 100644 --- a/programs/twm/iconmgr.c +++ b/programs/twm/iconmgr.c @@ -2,7 +2,11 @@ * Copyright 1989,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,18 +22,18 @@ 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 Open Group. * */ -/* $XFree86: xc/programs/twm/iconmgr.c,v 1.4 2000/11/02 02:51:24 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */ /*********************************************************************** * - * $Xorg: iconmgr.c,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: iconmgr.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * Icon Manager routines * * 09-Mar-89 Tom LaStrange File Created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/iconmgr.c,v 1.4 2000/11/02 02:51:24 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */ #include <stdio.h> #include "twm.h" diff --git a/programs/twm/iconmgr.h b/programs/twm/iconmgr.h index ae825e1f5..eba3dc5e0 100644 --- a/programs/twm/iconmgr.h +++ b/programs/twm/iconmgr.h @@ -2,7 +2,11 @@ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,11 +22,11 @@ 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 Open Group. * */ -/* $XFree86: xc/programs/twm/iconmgr.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */ /*********************************************************************** * - * $Xorg: iconmgr.h,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: iconmgr.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * Icon Manager includes * diff --git a/programs/twm/icons.c b/programs/twm/icons.c index 563b12406..ac1755272 100644 --- a/programs/twm/icons.c +++ b/programs/twm/icons.c @@ -2,7 +2,11 @@ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,11 +22,11 @@ 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 Open Group. * */ -/* $XFree86: xc/programs/twm/icons.c,v 1.4 2000/10/24 22:45:15 dawes Exp $ */ +/* $XFree86: xc/programs/twm/icons.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */ /********************************************************************** * - * $Xorg: icons.c,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: icons.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * Icon releated routines * diff --git a/programs/twm/icons.h b/programs/twm/icons.h index fb06a481e..a59e42c9b 100644 --- a/programs/twm/icons.h +++ b/programs/twm/icons.h @@ -2,7 +2,11 @@ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,11 +22,11 @@ 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 Open Group. * */ -/* $XFree86: xc/programs/twm/icons.h,v 1.3 1999/02/20 15:07:24 hohndel Exp $ */ +/* $XFree86: xc/programs/twm/icons.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */ /********************************************************************** * - * $Xorg: icons.h,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: icons.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * Icon releated definitions * diff --git a/programs/twm/lex.l b/programs/twm/lex.l index 4eb8933c7..6f0f6277a 100644 --- a/programs/twm/lex.l +++ b/programs/twm/lex.l @@ -4,7 +4,11 @@ Copyright 1989,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -48,14 +52,14 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: lex.l,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: lex.l,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * .twmrc lex file * * 12-Nov-87 Thomas E. LaStrange File created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/lex.l,v 3.12 2001/01/17 23:45:06 dawes Exp $ */ +/* $XFree86: xc/programs/twm/lex.l,v 3.13 2001/08/27 21:11:39 dawes Exp $ */ /* #include <stdio.h> */ /* lex already includes stdio.h */ #include "twm.h" diff --git a/programs/twm/list.c b/programs/twm/list.c index 49aec20dd..dac791d7a 100644 --- a/programs/twm/list.c +++ b/programs/twm/list.c @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/list.c,v 1.3 1999/02/20 15:07:24 hohndel Exp $ */ +/* $XFree86: xc/programs/twm/list.c,v 1.4 2001/01/17 23:45:07 dawes Exp $ */ /********************************************************************** * - * $Xorg: list.c,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: list.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * TWM code to deal with the name lists for the NoTitle list and * the AutoRaise list diff --git a/programs/twm/list.h b/programs/twm/list.h index bdeed3aae..35488f57a 100644 --- a/programs/twm/list.h +++ b/programs/twm/list.h @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/list.h,v 1.3 1999/02/20 15:07:24 hohndel Exp $ */ +/* $XFree86: xc/programs/twm/list.h,v 1.4 2001/01/17 23:45:07 dawes Exp $ */ /********************************************************************** * - * $Xorg: list.h,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: list.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ * * TWM list handling external definitions * diff --git a/programs/twm/menus.c b/programs/twm/menus.c index 72b47f81b..6bffa0279 100644 --- a/programs/twm/menus.c +++ b/programs/twm/menus.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/twm/menus.c,v 1.10 2001/08/27 21:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/twm/menus.c,v 1.11 2001/09/30 17:58:19 herrb Exp $ */ /*****************************************************************************/ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,7 +53,7 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: menus.c,v 1.5 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: menus.c,v 1.6 2001/02/09 02:05:36 xorgcvs Exp $ * * twm menu code * diff --git a/programs/twm/menus.h b/programs/twm/menus.h index 27bc3668d..6e8c31f59 100644 --- a/programs/twm/menus.h +++ b/programs/twm/menus.h @@ -3,7 +3,11 @@ Copyright 1989,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/menus.h,v 1.4 2001/01/17 23:45:07 dawes Exp $ */ +/* $XFree86: xc/programs/twm/menus.h,v 1.5 2001/08/27 21:11:40 dawes Exp $ */ /*********************************************************************** * - * $Xorg: menus.h,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: menus.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ * * twm menus include file * diff --git a/programs/twm/parse.c b/programs/twm/parse.c index ee3562829..25824e979 100644 --- a/programs/twm/parse.c +++ b/programs/twm/parse.c @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/twm/parse.c,v 1.10 2001/08/27 21:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/twm/parse.c,v 1.11 2001/09/30 17:58:19 herrb Exp $ */ /*****************************************************************************/ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,7 +53,7 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: parse.c,v 1.4 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: parse.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ * * parse the .twmrc file * diff --git a/programs/twm/parse.h b/programs/twm/parse.h index ae42af4e1..cb63a62e1 100644 --- a/programs/twm/parse.h +++ b/programs/twm/parse.h @@ -1,10 +1,14 @@ -/* $XFree86: xc/programs/twm/parse.h,v 1.9 2001/08/27 21:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/twm/parse.h,v 1.10 2001/09/30 17:58:19 herrb Exp $ */ /*****************************************************************************/ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,7 +53,7 @@ in this Software without prior written authorization from The Open Group. /********************************************************************** * - * $Xorg: parse.h,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: parse.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ * * .twmrc parsing externs * diff --git a/programs/twm/resize.c b/programs/twm/resize.c index b4e0c9354..905dea54a 100644 --- a/programs/twm/resize.c +++ b/programs/twm/resize.c @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -48,7 +52,7 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: resize.c,v 1.4 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: resize.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ * * window resizing borrowed from the "wm" window manager * @@ -56,7 +60,7 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ -/* $XFree86: xc/programs/twm/resize.c,v 1.6 2000/10/24 22:45:15 dawes Exp $ */ +/* $XFree86: xc/programs/twm/resize.c,v 1.7 2001/01/17 23:45:07 dawes Exp $ */ #include <stdio.h> #include "twm.h" diff --git a/programs/twm/resize.h b/programs/twm/resize.h index 37c8c79ee..4cee8f21b 100644 --- a/programs/twm/resize.h +++ b/programs/twm/resize.h @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/resize.h,v 1.3 1999/02/20 15:07:25 hohndel Exp $ */ +/* $XFree86: xc/programs/twm/resize.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */ /********************************************************************** * - * $Xorg: resize.h,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: resize.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ * * resize function externs * diff --git a/programs/twm/screen.h b/programs/twm/screen.h index 5c2e070c5..f65caa152 100644 --- a/programs/twm/screen.h +++ b/programs/twm/screen.h @@ -2,7 +2,11 @@ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,14 +25,14 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: screen.h,v 1.3 2000/08/17 19:54:07 cpqbld Exp $ + * $Xorg: screen.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ * * twm per-screen data include file * * 11-3-88 Dave Payne, Apple Computer File created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/screen.h,v 1.3 1999/03/02 11:49:28 dawes Exp $ */ +/* $XFree86: xc/programs/twm/screen.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */ #ifndef _SCREEN_ #define _SCREEN_ diff --git a/programs/twm/session.c b/programs/twm/session.c index 38fa0ba50..f7f92b37a 100644 --- a/programs/twm/session.c +++ b/programs/twm/session.c @@ -1,9 +1,13 @@ -/* $Xorg: session.c,v 1.4 2000/08/17 19:54:07 cpqbld Exp $ */ +/* $Xorg: session.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/twm/session.c,v 3.6 2001/01/17 23:45:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/session.c,v 3.7 2001/10/28 03:34:25 tsi Exp $ */ #include <X11/Xos.h> diff --git a/programs/twm/twm.c b/programs/twm/twm.c index b65d4a791..dfa8309a2 100644 --- a/programs/twm/twm.c +++ b/programs/twm/twm.c @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -48,14 +52,14 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * $Xorg: twm.c,v 1.4 2000/10/27 09:14:03 pookie Exp $ + * $Xorg: twm.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ * * twm - "Tom's Window Manager" * * 27-Oct-87 Thomas E. LaStrange File created * 10-Oct-90 David M. Sternlicht Storing saved colors on root ***********************************************************************/ -/* $XFree86: xc/programs/twm/twm.c,v 3.10 2001/12/02 15:57:03 herrb Exp $ */ +/* $XFree86: xc/programs/twm/twm.c,v 3.11 2001/12/08 19:31:37 herrb Exp $ */ #include <stdio.h> #include <signal.h> diff --git a/programs/twm/twm.h b/programs/twm/twm.h index c6f0f26d6..c237ade23 100644 --- a/programs/twm/twm.h +++ b/programs/twm/twm.h @@ -26,7 +26,11 @@ Portions Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -49,14 +53,14 @@ from The Open Group. /*********************************************************************** * - * $Xorg: twm.h,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ + * $Xorg: twm.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ * * twm include file * * 28-Oct-87 Thomas E. LaStrange File created * 10-Oct-90 David M. Sternlicht Storeing saved colors on root ***********************************************************************/ -/* $XFree86: xc/programs/twm/twm.h,v 3.10 2001/12/02 15:57:03 herrb Exp $ */ +/* $XFree86: xc/programs/twm/twm.h,v 3.11 2001/12/08 19:31:37 herrb Exp $ */ #ifndef _TWM_ #define _TWM_ diff --git a/programs/twm/twm.man b/programs/twm/twm.man index 1c24532b5..3479553cd 100644 --- a/programs/twm/twm.man +++ b/programs/twm/twm.man @@ -1,9 +1,13 @@ -.\" $Xorg: twm.man,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ +.\" $Xorg: twm.man,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" Portions copyright 1988 Evans & Sutherland Computer Corporation. .\" Portions copyright 1989 Hewlett-Packard Company .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/twm/twm.man,v 1.7 2001/01/27 18:21:06 dawes Exp $ +.\" $XFree86: xc/programs/twm/twm.man,v 1.8 2001/09/30 17:58:19 herrb Exp $ .\" .de EX \"Begin example .ne 5 diff --git a/programs/twm/util.c b/programs/twm/util.c index cacb50e31..61ac7f308 100644 --- a/programs/twm/util.c +++ b/programs/twm/util.c @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/util.c,v 1.7 2001/01/17 23:45:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/util.c,v 1.9 2001/10/01 13:44:16 eich Exp $ */ /*********************************************************************** * - * $Xorg: util.c,v 1.4 2000/08/17 19:54:08 cpqbld Exp $ + * $Xorg: util.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ * * utility routines for twm * diff --git a/programs/twm/util.h b/programs/twm/util.h index 565aa87d1..4cbd0915f 100644 --- a/programs/twm/util.h +++ b/programs/twm/util.h @@ -3,7 +3,11 @@ Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,12 +48,12 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/util.h,v 1.5 2000/10/24 22:45:15 dawes Exp $ */ +/* $XFree86: xc/programs/twm/util.h,v 1.6 2001/01/17 23:45:08 dawes Exp $ */ /*********************************************************************** * - * $Xorg: util.h,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ + * $Xorg: util.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ * * utility routines header file * diff --git a/programs/twm/version.c b/programs/twm/version.c index 09d649adf..9e3e70c8c 100644 --- a/programs/twm/version.c +++ b/programs/twm/version.c @@ -1,14 +1,13 @@ /*****************************************************************************/ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ /** Copyright 1988 by Evans & Sutherland Computer Corporation, **/ @@ -50,6 +49,6 @@ in this Software without prior written authorization from the X Consortium. /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XConsortium: version.c,v 6.9 94/04/17 20:38:27 gildea Exp $ */ -char *Version = "X Consortium, R6"; +/* $Xorg: version.c,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ */ +char *Version = "The Open Group, R6.3"; diff --git a/programs/twm/version.h b/programs/twm/version.h index 9d5adecc8..d23219067 100644 --- a/programs/twm/version.h +++ b/programs/twm/version.h @@ -1,14 +1,13 @@ /*****************************************************************************/ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. */ /** Copyright 1988 by Evans & Sutherland Computer Corporation, **/ @@ -52,7 +51,7 @@ in this Software without prior written authorization from the X Consortium. /********************************************************************** * - * $XConsortium: version.h,v 1.8 94/04/17 20:38:28 jim Exp $ + * $Xorg: version.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ * * TWM version externs * diff --git a/programs/x11perf/x11pcomp.man b/programs/x11perf/x11pcomp.man index ff0108e98..2750412ae 100644 --- a/programs/x11perf/x11pcomp.man +++ b/programs/x11perf/x11pcomp.man @@ -1,7 +1,11 @@ -.\" $Xorg: x11pcomp.man,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ +.\" $Xorg: x11pcomp.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.7 2001/01/27 18:21:07 dawes Exp $ .\" .TH X11PERFCOMP 1 __xorgversion__ .SH NAME diff --git a/programs/x11perf/x11perf.man b/programs/x11perf/x11perf.man index e421714a0..1c130def2 100644 --- a/programs/x11perf/x11perf.man +++ b/programs/x11perf/x11perf.man @@ -1,8 +1,12 @@ -.\" $Xorg: x11perf.man,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ +.\" $Xorg: x11perf.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1988, 1989 Digital Equipment Corporation. .\" Copyright 1989, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.7 2001/01/27 18:21:07 dawes Exp $ .\" .TH X11PERF 1 __xorgversion__ .SH NAME diff --git a/programs/xauth/gethost.c b/programs/xauth/gethost.c index fe2fc740d..d2ac1cb86 100644 --- a/programs/xauth/gethost.c +++ b/programs/xauth/gethost.c @@ -1,10 +1,14 @@ /* - * $Xorg: gethost.c,v 1.4 2000/08/17 19:54:11 cpqbld Exp $ + * $Xorg: gethost.c,v 1.5 2001/02/09 02:05:38 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/gethost.c,v 3.14 2001/07/23 13:15:51 dawes Exp $ */ +/* $XFree86: xc/programs/xauth/gethost.c,v 3.15 2001/07/25 15:05:16 dawes Exp $ */ /* sorry, streams support does not really work yet */ #if defined(STREAMSCONN) && defined(SVR4) diff --git a/programs/xauth/parsedpy.c b/programs/xauth/parsedpy.c index 545975ad8..2c604f125 100644 --- a/programs/xauth/parsedpy.c +++ b/programs/xauth/parsedpy.c @@ -1,12 +1,16 @@ /* - * $Xorg: parsedpy.c,v 1.3 2000/08/17 19:54:11 cpqbld Exp $ + * $Xorg: parsedpy.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ * * parse_displayname - utility routine for splitting up display name strings * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/parsedpy.c,v 3.4 2001/01/17 23:45:14 dawes Exp $ */ +/* $XFree86: xc/programs/xauth/parsedpy.c,v 3.5 2001/07/25 15:05:17 dawes Exp $ */ #include <stdio.h> /* for NULL */ #include <ctype.h> /* for isascii() and isdigit() */ diff --git a/programs/xauth/process.c b/programs/xauth/process.c index 8e4ebde34..48339e1c3 100644 --- a/programs/xauth/process.c +++ b/programs/xauth/process.c @@ -1,9 +1,13 @@ -/* $Xorg: process.c,v 1.5 2000/08/17 19:54:11 cpqbld Exp $ */ +/* $Xorg: process.c,v 1.6 2001/02/09 02:05:38 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xauth/process.c,v 3.10 2001/07/25 15:05:17 dawes Exp $ */ +/* $XFree86: xc/programs/xauth/process.c,v 3.11 2001/12/02 16:10:42 herrb Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/programs/xauth/xauth.c b/programs/xauth/xauth.c index a4eb7f7d1..b15c9ae06 100644 --- a/programs/xauth/xauth.c +++ b/programs/xauth/xauth.c @@ -1,12 +1,16 @@ /* - * $Xorg: xauth.c,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ + * $Xorg: xauth.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ * * xauth - manipulate authorization file * * Copyright 1989,1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/xauth.c,v 1.3 1999/03/02 11:49:35 dawes Exp $ */ +/* $XFree86: xc/programs/xauth/xauth.c,v 1.4 2001/01/17 23:45:16 dawes Exp $ */ #include "xauth.h" diff --git a/programs/xauth/xauth.h b/programs/xauth/xauth.h index 26744f075..b03c9de68 100644 --- a/programs/xauth/xauth.h +++ b/programs/xauth/xauth.h @@ -1,10 +1,14 @@ /* - * $Xorg: xauth.h,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ + * $Xorg: xauth.h,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/xauth.h,v 1.4 2001/01/17 23:45:16 dawes Exp $ */ +/* $XFree86: xc/programs/xauth/xauth.h,v 1.5 2001/07/25 15:05:17 dawes Exp $ */ #include <stdio.h> #include <X11/Xos.h> diff --git a/programs/xauth/xauth.man b/programs/xauth/xauth.man index 92395db06..6a9145da3 100644 --- a/programs/xauth/xauth.man +++ b/programs/xauth/xauth.man @@ -1,7 +1,11 @@ -.\" $Xorg: xauth.man,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ +.\" $Xorg: xauth.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xauth/xauth.man,v 1.6 2001/01/27 18:21:07 dawes Exp $ .\" .TH XAUTH 1 __xorgversion__ .SH NAME diff --git a/programs/xclipboard/xclipboard.c b/programs/xclipboard/xclipboard.c index fdc23b9aa..b01eb08e2 100644 --- a/programs/xclipboard/xclipboard.c +++ b/programs/xclipboard/xclipboard.c @@ -1,10 +1,14 @@ /* - * $Xorg: xclipboard.c,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ + * $Xorg: xclipboard.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -24,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * Updated for R4: Chris D. Peterson, MIT X Consortium. * Reauthored by: Keith Packard, MIT X Consortium. */ -/* $XFree86: xc/programs/xclipboard/xclipboard.c,v 1.6 2001/01/17 23:45:17 dawes Exp $ */ +/* $XFree86: xc/programs/xclipboard/xclipboard.c,v 1.7 2001/07/25 15:05:17 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/programs/xclipboard/xclipboard.man b/programs/xclipboard/xclipboard.man index 27da4c5e8..2537c5f98 100644 --- a/programs/xclipboard/xclipboard.man +++ b/programs/xclipboard/xclipboard.man @@ -1,7 +1,11 @@ -.\" $Xorg: xclipboard.man,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ +.\" $Xorg: xclipboard.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xclipboard/xclipboard.man,v 1.7 2001/01/27 18:21:08 dawes Exp $ .\" .TH XCLIPBOARD 1 __xorgversion__ .SH NAME diff --git a/programs/xclipboard/xcutsel.c b/programs/xclipboard/xcutsel.c index 882bf9b21..b844fca78 100644 --- a/programs/xclipboard/xcutsel.c +++ b/programs/xclipboard/xcutsel.c @@ -1,10 +1,14 @@ /* - * $Xorg: xcutsel.c,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ + * $Xorg: xcutsel.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Ralph Swick, DEC/Project Athena */ -/* $XFree86: xc/programs/xclipboard/xcutsel.c,v 1.6 2001/01/17 23:45:18 dawes Exp $ */ +/* $XFree86: xc/programs/xclipboard/xcutsel.c,v 1.7 2001/04/01 14:00:19 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xclipboard/xcutsel.man b/programs/xclipboard/xcutsel.man index bcd2e3d73..ac8a98353 100644 --- a/programs/xclipboard/xcutsel.man +++ b/programs/xclipboard/xcutsel.man @@ -1,7 +1,11 @@ -.\" $Xorg: xcutsel.man,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ +.\" $Xorg: xcutsel.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xclipboard/xcutsel.man,v 1.7 2001/01/27 18:21:09 dawes Exp $ .\" .TH XCUTSEL 1 __xorgversion__ .SH NAME diff --git a/programs/xclock/Clock.c b/programs/xclock/Clock.c index 3a7194428..2ccba5d6a 100644 --- a/programs/xclock/Clock.c +++ b/programs/xclock/Clock.c @@ -1,10 +1,14 @@ -/* $Xorg: Clock.c,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ */ +/* $Xorg: Clock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/Clock.c,v 3.9 2001/01/17 23:45:18 dawes Exp $ */ +/* $XFree86: xc/programs/xclock/Clock.c,v 3.10 2001/07/25 15:05:17 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/StringDefs.h> diff --git a/programs/xclock/Clock.h b/programs/xclock/Clock.h index d28e93243..31b58f2f2 100644 --- a/programs/xclock/Clock.h +++ b/programs/xclock/Clock.h @@ -1,5 +1,5 @@ /* -* $Xorg: Clock.h,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ +* $Xorg: Clock.h,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/Clock.h,v 1.4 2000/11/02 02:51:24 dawes Exp $ */ +/* $XFree86: xc/programs/xclock/Clock.h,v 1.5 2001/01/17 23:45:18 dawes Exp $ */ #ifndef _XawClock_h #define _XawClock_h diff --git a/programs/xclock/ClockP.h b/programs/xclock/ClockP.h index deb9307c4..bb7fd8248 100644 --- a/programs/xclock/ClockP.h +++ b/programs/xclock/ClockP.h @@ -1,5 +1,5 @@ /* -* $Xorg: ClockP.h,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ +* $Xorg: ClockP.h,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */ @@ -7,7 +7,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/ClockP.h,v 1.4 2000/11/02 02:51:24 dawes Exp $ */ +/* $XFree86: xc/programs/xclock/ClockP.h,v 1.5 2001/01/17 23:45:18 dawes Exp $ */ #ifndef _XawClockP_h #define _XawClockP_h diff --git a/programs/xclock/xclock.c b/programs/xclock/xclock.c index 2a9695757..4d5d0df2a 100644 --- a/programs/xclock/xclock.c +++ b/programs/xclock/xclock.c @@ -1,4 +1,4 @@ -/* $Xorg: xclock.c,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ */ +/* $Xorg: xclock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */ /* * xclock -- Hacked from Tony Della Fera's much hacked clock program. @@ -7,7 +7,11 @@ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ 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 Open Group. */ -/* $XFree86: xc/programs/xclock/xclock.c,v 1.7 2001/04/01 14:00:19 tsi Exp $ */ +/* $XFree86: xc/programs/xclock/xclock.c,v 1.8 2001/07/25 15:05:17 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xclock/xclock.man b/programs/xclock/xclock.man index 4d5059730..940f2b352 100644 --- a/programs/xclock/xclock.man +++ b/programs/xclock/xclock.man @@ -1,7 +1,11 @@ -.\" $Xorg: xclock.man,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ +.\" $Xorg: xclock.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xclock/xclock.man,v 1.8 2001/01/24 00:06:43 dawes Exp $ +.\" $XFree86: xc/programs/xclock/xclock.man,v 1.9 2001/01/27 18:21:09 dawes Exp $ .\" .TH XCLOCK 1 __xorgversion__ .SH NAME diff --git a/programs/xcmsdb/xcmsdb.man b/programs/xcmsdb/xcmsdb.man index cb602ef6d..29c961cb2 100644 --- a/programs/xcmsdb/xcmsdb.man +++ b/programs/xcmsdb/xcmsdb.man @@ -1,8 +1,12 @@ -.\" $Xorg: xcmsdb.man,v 1.3 2000/08/17 19:54:13 cpqbld Exp $ +.\" $Xorg: xcmsdb.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1990, Tektronix Inc. .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xcmsdb/xcmsdb.man,v 1.6 2001/01/27 18:21:09 dawes Exp $ .\" .TH XCMSDB 1 __xorgversion__ .SH NAME diff --git a/programs/xconsole/xconsole.c b/programs/xconsole/xconsole.c index 7b8cbdaf4..c9b0b7dd9 100644 --- a/programs/xconsole/xconsole.c +++ b/programs/xconsole/xconsole.c @@ -1,9 +1,13 @@ /* - * $Xorg: xconsole.c,v 1.4 2000/08/17 19:54:13 cpqbld Exp $ + * $Xorg: xconsole.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.27 2001/07/25 15:05:18 dawes Exp $ */ +/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.28 2001/12/02 18:41:29 herrb Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/programs/xconsole/xconsole.man b/programs/xconsole/xconsole.man index efd6af874..f5a99a16a 100644 --- a/programs/xconsole/xconsole.man +++ b/programs/xconsole/xconsole.man @@ -1,7 +1,11 @@ -.\" $Xorg: xconsole.man,v 1.3 2000/08/17 19:54:13 cpqbld Exp $ +.\" $Xorg: xconsole.man,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xconsole/xconsole.man,v 1.7 2001/01/27 18:21:09 dawes Exp $ .\" .TH XCONSOLE 1 __xorgversion__ .SH NAME diff --git a/programs/xdm/access.c b/programs/xdm/access.c index c14c3ae83..3ee94689b 100644 --- a/programs/xdm/access.c +++ b/programs/xdm/access.c @@ -1,9 +1,13 @@ /* - * $Xorg: access.c,v 1.4 2000/08/17 19:54:14 cpqbld Exp $ + * $Xorg: access.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/access.c,v 3.6 2001/01/17 23:45:20 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/access.c,v 3.7 2001/07/23 13:15:51 dawes Exp $ */ /* * Access control for XDMCP - keep a database of allowable display addresses diff --git a/programs/xdm/auth.c b/programs/xdm/auth.c index 0d1b7ef14..e4e0ee9c0 100644 --- a/programs/xdm/auth.c +++ b/programs/xdm/auth.c @@ -1,9 +1,13 @@ -/* $Xorg: auth.c,v 1.4 2000/08/17 19:54:14 cpqbld Exp $ */ +/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/auth.c,v 3.22 2001/07/23 13:15:51 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/auth.c,v 3.23 2001/07/25 15:05:19 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/choose.c b/programs/xdm/choose.c index 8aad3d3a4..a01a1d538 100644 --- a/programs/xdm/choose.c +++ b/programs/xdm/choose.c @@ -1,9 +1,13 @@ /* - * $Xorg: choose.c,v 1.4 2000/08/17 19:54:14 cpqbld Exp $ + * $Xorg: choose.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/choose.c,v 3.13 2001/07/25 15:05:19 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/choose.c,v 3.14 2001/08/26 16:21:29 herrb Exp $ */ /* * choose.c diff --git a/programs/xdm/chooser.c b/programs/xdm/chooser.c index 638bd7db8..855785081 100644 --- a/programs/xdm/chooser.c +++ b/programs/xdm/chooser.c @@ -1,9 +1,13 @@ /* - * $Xorg: chooser.c,v 1.3 2000/08/17 19:54:14 cpqbld Exp $ + * $Xorg: chooser.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/chooser.c,v 3.22 2001/03/06 17:31:39 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/chooser.c,v 3.23 2001/07/23 13:15:51 dawes Exp $ */ /* * Chooser - display a menu of names and let the user select one diff --git a/programs/xdm/daemon.c b/programs/xdm/daemon.c index 0d2f9e218..1681fb842 100644 --- a/programs/xdm/daemon.c +++ b/programs/xdm/daemon.c @@ -1,9 +1,13 @@ -/* $Xorg: daemon.c,v 1.3 2000/08/17 19:54:14 cpqbld Exp $ */ +/* $Xorg: daemon.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/daemon.c,v 3.15 2001/07/23 13:15:51 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/daemon.c,v 3.16 2001/07/25 15:05:19 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/dm.c b/programs/xdm/dm.c index 81c357e27..a2d3b7d3d 100644 --- a/programs/xdm/dm.c +++ b/programs/xdm/dm.c @@ -1,9 +1,13 @@ -/* $Xorg: dm.c,v 1.4 2000/08/17 19:54:14 cpqbld Exp $ */ +/* $Xorg: dm.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/dm.c,v 3.16 2001/10/28 03:34:27 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/dm.c,v 3.18 2001/12/02 13:35:29 herrb Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/dm.h b/programs/xdm/dm.h index 181e30eeb..0aae7bb1b 100644 --- a/programs/xdm/dm.h +++ b/programs/xdm/dm.h @@ -1,9 +1,13 @@ -/* $Xorg: dm.h,v 1.3 2000/08/17 19:54:14 cpqbld Exp $ */ +/* $Xorg: dm.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/dm.h,v 3.25 2001/07/25 15:05:19 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/dm.h,v 3.26 2001/08/26 16:21:29 herrb Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/dpylist.c b/programs/xdm/dpylist.c index c32bb753b..ad9827579 100644 --- a/programs/xdm/dpylist.c +++ b/programs/xdm/dpylist.c @@ -1,9 +1,13 @@ -/* $Xorg: dpylist.c,v 1.3 2000/08/17 19:54:14 cpqbld Exp $ */ +/* $Xorg: dpylist.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/dpylist.c,v 1.3 2000/04/27 16:26:50 eich Exp $ */ +/* $XFree86: xc/programs/xdm/dpylist.c,v 1.4 2001/01/17 23:45:21 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/error.c b/programs/xdm/error.c index ded6773a0..95aa2d3e9 100644 --- a/programs/xdm/error.c +++ b/programs/xdm/error.c @@ -1,9 +1,13 @@ -/* $Xorg: error.c,v 1.3 2000/08/17 19:54:14 cpqbld Exp $ */ +/* $Xorg: error.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/error.c,v 1.3 2001/01/17 23:45:21 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/error.c,v 1.4 2001/10/28 03:34:27 tsi Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/file.c b/programs/xdm/file.c index c85111b28..a15239f31 100644 --- a/programs/xdm/file.c +++ b/programs/xdm/file.c @@ -1,9 +1,13 @@ -/* $Xorg: file.c,v 1.4 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: file.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/file.c,v 1.4 1998/10/10 15:25:34 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/file.c,v 1.5 2001/01/17 23:45:21 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/genauth.c b/programs/xdm/genauth.c index a14ad01dd..cb2bc34d3 100644 --- a/programs/xdm/genauth.c +++ b/programs/xdm/genauth.c @@ -1,9 +1,13 @@ -/* $Xorg: genauth.c,v 1.4 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: genauth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/genauth.c,v 3.11 2001/01/20 14:11:55 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/genauth.c,v 3.12 2001/07/25 15:05:19 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/greet.h b/programs/xdm/greet.h index 26980fe4e..5df46aa2d 100644 --- a/programs/xdm/greet.h +++ b/programs/xdm/greet.h @@ -1,9 +1,13 @@ -/* $Xorg: greet.h,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: greet.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/greet.h,v 1.6 2000/11/14 21:59:25 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/greet.h,v 1.7 2001/01/17 23:45:21 dawes Exp $ */ /* * greet.h - interface to xdm's dynamically-loadable modular greeter diff --git a/programs/xdm/greeter/Login.c b/programs/xdm/greeter/Login.c index 59be12196..9aa9c7850 100644 --- a/programs/xdm/greeter/Login.c +++ b/programs/xdm/greeter/Login.c @@ -1,9 +1,13 @@ -/* $Xorg: Login.c,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ */ +/* $Xorg: Login.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/Login.c,v 3.12 2001/01/17 23:45:25 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/Login.c,v 3.13 2001/03/06 17:31:39 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/greeter/Login.h b/programs/xdm/greeter/Login.h index d66b37a71..725ff6397 100644 --- a/programs/xdm/greeter/Login.h +++ b/programs/xdm/greeter/Login.h @@ -1,9 +1,13 @@ -/* $Xorg: Login.h,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ */ +/* $Xorg: Login.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/Login.h,v 3.4 2000/06/14 00:16:15 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/Login.h,v 3.5 2001/01/17 23:45:25 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/greeter/LoginP.h b/programs/xdm/greeter/LoginP.h index 9e6119429..9fc2640c5 100644 --- a/programs/xdm/greeter/LoginP.h +++ b/programs/xdm/greeter/LoginP.h @@ -1,9 +1,13 @@ -/* $Xorg: LoginP.h,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ */ +/* $Xorg: LoginP.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/LoginP.h,v 3.6 2000/06/14 00:16:15 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/LoginP.h,v 3.7 2001/01/17 23:45:25 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/greeter/greet.c b/programs/xdm/greeter/greet.c index afe2b1e5e..cb52c9895 100644 --- a/programs/xdm/greeter/greet.c +++ b/programs/xdm/greeter/greet.c @@ -1,9 +1,13 @@ -/* $Xorg: greet.c,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ */ +/* $Xorg: greet.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.13 2001/05/11 09:03:07 alanh Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.14 2001/08/17 22:08:16 tsi Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/greeter/verify.c b/programs/xdm/greeter/verify.c index a8d51f39f..e232a78d1 100644 --- a/programs/xdm/greeter/verify.c +++ b/programs/xdm/greeter/verify.c @@ -1,9 +1,13 @@ -/* $Xorg: verify.c,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ */ +/* $Xorg: verify.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.19 2001/10/28 03:34:28 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.20 2001/10/31 22:50:30 tsi Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/krb5auth.c b/programs/xdm/krb5auth.c index e0acb0502..a2191b809 100644 --- a/programs/xdm/krb5auth.c +++ b/programs/xdm/krb5auth.c @@ -1,9 +1,13 @@ -/* $Xorg: krb5auth.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: krb5auth.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/krb5auth.c,v 1.2 1998/10/10 15:25:35 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/krb5auth.c,v 1.3 2001/01/17 23:45:21 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/mitauth.c b/programs/xdm/mitauth.c index 320823433..8c1667e5f 100644 --- a/programs/xdm/mitauth.c +++ b/programs/xdm/mitauth.c @@ -1,9 +1,13 @@ -/* $Xorg: mitauth.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: mitauth.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/mitauth.c,v 1.2 1998/10/10 15:25:36 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/mitauth.c,v 1.3 2001/01/17 23:45:21 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/netaddr.c b/programs/xdm/netaddr.c index 952bd40a7..eaed9fa57 100644 --- a/programs/xdm/netaddr.c +++ b/programs/xdm/netaddr.c @@ -1,9 +1,13 @@ -/* $Xorg: netaddr.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: netaddr.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/netaddr.c,v 3.4 1998/10/10 15:25:36 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/netaddr.c,v 3.5 2001/01/17 23:45:21 dawes Exp $ */ /* * xdm - X display manager diff --git a/programs/xdm/policy.c b/programs/xdm/policy.c index ab6af8468..e43bdbfac 100644 --- a/programs/xdm/policy.c +++ b/programs/xdm/policy.c @@ -1,9 +1,13 @@ -/* $Xorg: policy.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: policy.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -29,7 +33,7 @@ from The Open Group. * * policy.c. Implement site-dependent policy for XDMCP connections */ -/* $XFree86: xc/programs/xdm/policy.c,v 3.4 1998/12/06 06:08:48 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/policy.c,v 3.5 2001/01/17 23:45:21 dawes Exp $ */ # include "dm.h" # include "dm_auth.h" diff --git a/programs/xdm/protodpy.c b/programs/xdm/protodpy.c index 31ea527b0..d2df1512e 100644 --- a/programs/xdm/protodpy.c +++ b/programs/xdm/protodpy.c @@ -1,9 +1,13 @@ /* - * $Xorg: protodpy.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ + * $Xorg: protodpy.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/protodpy.c,v 1.3 2001/01/17 23:45:21 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/protodpy.c,v 1.4 2001/07/25 15:05:19 dawes Exp $ */ /* * protodpy.c diff --git a/programs/xdm/reset.c b/programs/xdm/reset.c index f61af8331..c28ccb335 100644 --- a/programs/xdm/reset.c +++ b/programs/xdm/reset.c @@ -1,9 +1,13 @@ -/* $Xorg: reset.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: reset.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/reset.c,v 1.2 1998/10/10 15:25:37 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/reset.c,v 1.3 2001/01/17 23:45:21 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/resource.c b/programs/xdm/resource.c index 5e6b1e27d..e24fb7e90 100644 --- a/programs/xdm/resource.c +++ b/programs/xdm/resource.c @@ -1,9 +1,13 @@ -/* $Xorg: resource.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: resource.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/resource.c,v 3.5 1998/12/06 06:08:49 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/resource.c,v 3.6 2001/01/17 23:45:21 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/rpcauth.c b/programs/xdm/rpcauth.c index f5f513122..75e465b16 100644 --- a/programs/xdm/rpcauth.c +++ b/programs/xdm/rpcauth.c @@ -1,9 +1,13 @@ -/* $Xorg: rpcauth.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: rpcauth.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/rpcauth.c,v 1.2 1998/10/10 15:25:38 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/rpcauth.c,v 1.3 2001/01/17 23:45:22 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/server.c b/programs/xdm/server.c index cf32a6961..9e6cd436a 100644 --- a/programs/xdm/server.c +++ b/programs/xdm/server.c @@ -1,9 +1,13 @@ -/* $Xorg: server.c,v 1.4 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: server.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/server.c,v 3.11 2001/07/25 15:05:19 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/server.c,v 3.12 2001/12/02 13:35:30 herrb Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/session.c b/programs/xdm/session.c index a66aff356..91220bba1 100644 --- a/programs/xdm/session.c +++ b/programs/xdm/session.c @@ -1,9 +1,13 @@ -/* $Xorg: session.c,v 1.7 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: session.c,v 1.8 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/session.c,v 3.31 2001/10/28 03:34:27 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/session.c,v 3.32 2001/11/16 16:47:57 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/sessreg.c b/programs/xdm/sessreg.c index 963672c7d..3cddd88fc 100644 --- a/programs/xdm/sessreg.c +++ b/programs/xdm/sessreg.c @@ -3,7 +3,11 @@ * * Copyright 1990, 1998 The Open Group * - * All Rights Reserved. + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation. * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ * by Andreas Stolcke <stolcke@icsi.berkeley.edu> */ -/* $XFree86: xc/programs/xdm/sessreg.c,v 3.16 2001/01/17 23:45:22 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/sessreg.c,v 3.17 2001/07/25 15:05:19 dawes Exp $ */ /* * sessreg diff --git a/programs/xdm/sessreg.man b/programs/xdm/sessreg.man index ed3ed3fb2..ca65fd1ed 100644 --- a/programs/xdm/sessreg.man +++ b/programs/xdm/sessreg.man @@ -1,7 +1,11 @@ -.\" $Xorg: sessreg.man,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ +.\" $Xorg: sessreg.man,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.6 2001/01/27 18:21:10 dawes Exp $ +.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.7 2001/04/23 20:31:09 dawes Exp $ .\" .TH SESSREG 1 __xorgversion__ .SH NAME diff --git a/programs/xdm/socket.c b/programs/xdm/socket.c index f830d1102..c3fb6191e 100644 --- a/programs/xdm/socket.c +++ b/programs/xdm/socket.c @@ -1,9 +1,13 @@ -/* $Xorg: socket.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: socket.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/socket.c,v 3.8 2001/07/23 13:15:52 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/socket.c,v 3.9 2001/07/25 15:05:19 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/streams.c b/programs/xdm/streams.c index 4360857f9..7a606a176 100644 --- a/programs/xdm/streams.c +++ b/programs/xdm/streams.c @@ -1,9 +1,13 @@ -/* $Xorg: streams.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: streams.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/streams.c,v 3.4 1998/12/06 06:08:49 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/streams.c,v 3.5 2001/01/17 23:45:22 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/util.c b/programs/xdm/util.c index d5e1499b6..5846e2a9d 100644 --- a/programs/xdm/util.c +++ b/programs/xdm/util.c @@ -1,9 +1,13 @@ -/* $Xorg: util.c,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ */ +/* $Xorg: util.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/util.c,v 3.17 2001/02/28 18:58:54 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/util.c,v 3.18 2001/07/23 13:15:52 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/xdm.man b/programs/xdm/xdm.man index 315d03c01..4bc52ed2b 100644 --- a/programs/xdm/xdm.man +++ b/programs/xdm/xdm.man @@ -1,7 +1,11 @@ -.\" $Xorg: xdm.man,v 1.3 2000/08/17 19:54:15 cpqbld Exp $ +.\" $Xorg: xdm.man,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdm/xdm.man,v 3.19 2001/02/07 23:25:55 dawes Exp $ +.\" $XFree86: xc/programs/xdm/xdm.man,v 3.20 2001/04/23 20:31:09 dawes Exp $ .\" .TH XDM 1 __xorgversion__ .SH NAME diff --git a/programs/xdm/xdmauth.c b/programs/xdm/xdmauth.c index 475aa9af7..073c681d3 100644 --- a/programs/xdm/xdmauth.c +++ b/programs/xdm/xdmauth.c @@ -1,9 +1,13 @@ -/* $Xorg: xdmauth.c,v 1.3 2000/08/17 19:54:16 cpqbld Exp $ */ +/* $Xorg: xdmauth.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/xdmauth.c,v 1.3 2000/06/07 22:03:16 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/xdmauth.c,v 1.4 2001/01/17 23:45:22 dawes Exp $ */ /* * xdm - display manager daemon * Author: Keith Packard, MIT X Consortium diff --git a/programs/xdm/xdmcp.c b/programs/xdm/xdmcp.c index a8a426ec0..3a3adeb94 100644 --- a/programs/xdm/xdmcp.c +++ b/programs/xdm/xdmcp.c @@ -1,9 +1,13 @@ -/* $Xorg: xdmcp.c,v 1.3 2000/08/17 19:54:16 cpqbld Exp $ */ +/* $Xorg: xdmcp.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.17 2001/08/17 22:08:16 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.18 2001/11/16 16:47:57 dawes Exp $ */ /* * xdm - display manager daemon diff --git a/programs/xdm/xdmshell.c b/programs/xdm/xdmshell.c index 287c31ea0..9c7e14d7c 100644 --- a/programs/xdm/xdmshell.c +++ b/programs/xdm/xdmshell.c @@ -1,11 +1,15 @@ -/* $Xorg: xdmshell.c,v 1.3 2000/08/17 19:54:16 cpqbld Exp $ */ +/* $Xorg: xdmshell.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* * xdmshell - simple program for running xdm from login * * Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -32,7 +36,7 @@ in this Software without prior written authorization from The Open Group. * bring down X when you are finished. */ -/* $XFree86: xc/programs/xdm/xdmshell.c,v 3.5 2001/01/17 23:45:23 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/xdmshell.c,v 3.6 2001/07/25 15:05:19 dawes Exp $ */ #include <stdio.h> #include "dm.h" diff --git a/programs/xdpyinfo/xdpyinfo.c b/programs/xdpyinfo/xdpyinfo.c index 69f918cf0..5074f7a26 100644 --- a/programs/xdpyinfo/xdpyinfo.c +++ b/programs/xdpyinfo/xdpyinfo.c @@ -1,12 +1,16 @@ /* - * $Xorg: xdpyinfo.c,v 1.4 2000/08/17 19:54:18 cpqbld Exp $ + * $Xorg: xdpyinfo.c,v 1.5 2001/02/09 02:05:41 xorgcvs Exp $ * * xdpyinfo - print information about X display connecton * * Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -25,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.23 2001/04/03 22:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.24 2001/08/07 02:56:55 keithp Exp $ */ #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/programs/xdpyinfo/xdpyinfo.man b/programs/xdpyinfo/xdpyinfo.man index 9bc66c44d..ca4326c32 100644 --- a/programs/xdpyinfo/xdpyinfo.man +++ b/programs/xdpyinfo/xdpyinfo.man @@ -1,7 +1,11 @@ -.\" $Xorg: xdpyinfo.man,v 1.3 2000/08/17 19:54:18 cpqbld Exp $ +.\" $Xorg: xdpyinfo.man,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ .\" Copyright 1988, 1989, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.6 2001/01/24 00:06:44 dawes Exp $ +.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.7 2001/01/27 18:21:11 dawes Exp $ .\" .TH XDPYINFO 1 __xorgversion__ .SH NAME diff --git a/programs/xfd/grid.c b/programs/xfd/grid.c index 54604583d..704d3ccde 100644 --- a/programs/xfd/grid.c +++ b/programs/xfd/grid.c @@ -1,10 +1,14 @@ /* - * $Xorg: grid.c,v 1.3 2000/08/17 19:54:18 cpqbld Exp $ + * $Xorg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xfd/grid.c,v 1.3 1999/03/02 11:49:38 dawes Exp $ */ +/* $XFree86: xc/programs/xfd/grid.c,v 1.4 2001/01/17 23:45:26 dawes Exp $ */ #include <X11/IntrinsicP.h> diff --git a/programs/xfd/grid.h b/programs/xfd/grid.h index ce52737ff..8cadafc61 100644 --- a/programs/xfd/grid.h +++ b/programs/xfd/grid.h @@ -1,15 +1,13 @@ -/* $XConsortium: grid.h,v 1.11 94/04/17 20:24:14 gildea Exp $ */ +/* $Xorg: grid.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xfd/gridP.h b/programs/xfd/gridP.h index 5fef3135d..9a4b8cbd4 100644 --- a/programs/xfd/gridP.h +++ b/programs/xfd/gridP.h @@ -1,15 +1,13 @@ -/* $XConsortium: gridP.h,v 1.13 94/04/17 20:24:14 gildea Exp $ */ +/* $Xorg: gridP.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xfd/xfd.c b/programs/xfd/xfd.c index 7e0e498e2..0e6f32af1 100644 --- a/programs/xfd/xfd.c +++ b/programs/xfd/xfd.c @@ -1,10 +1,14 @@ /* - * $Xorg: xfd.c,v 1.3 2000/08/17 19:54:18 cpqbld Exp $ + * $Xorg: xfd.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xfd/xfd.c,v 1.4 2001/01/17 23:45:26 dawes Exp $ */ +/* $XFree86: xc/programs/xfd/xfd.c,v 1.5 2001/04/01 14:00:20 tsi Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/programs/xfd/xfd.man b/programs/xfd/xfd.man index 947e8aec8..056a89f13 100644 --- a/programs/xfd/xfd.man +++ b/programs/xfd/xfd.man @@ -1,7 +1,11 @@ -.\" $Xorg: xfd.man,v 1.3 2000/08/17 19:54:18 cpqbld Exp $ +.\" $Xorg: xfd.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ .\" Copyright 1989, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xfd/xfd.man,v 1.7 2001/01/27 18:21:12 dawes Exp $ .\" .TH XFD 1 __xorgversion__ .SH NAME diff --git a/programs/xfindproxy/xfindproxy.c b/programs/xfindproxy/xfindproxy.c index a20a7a886..7edf5d34d 100644 --- a/programs/xfindproxy/xfindproxy.c +++ b/programs/xfindproxy/xfindproxy.c @@ -1,9 +1,13 @@ -/* $Xorg: xfindproxy.c,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ */ +/* $Xorg: xfindproxy.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.6 2001/07/25 15:05:21 dawes Exp $ */ +/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.7 2001/10/28 03:34:32 tsi Exp $ */ #include <stdio.h> diff --git a/programs/xfindproxy/xfindproxy.h b/programs/xfindproxy/xfindproxy.h index 961863066..b75504356 100644 --- a/programs/xfindproxy/xfindproxy.h +++ b/programs/xfindproxy/xfindproxy.h @@ -1,15 +1,13 @@ -/* $XConsortium: xfindproxy.h /main/1 1996/12/02 10:00:08 swick $ */ +/* $Xorg: xfindproxy.h,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* -Copyright (c) 1996 X Consortium +Copyright 1996, 1998 The Open Group -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 sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xfindproxy/xfindproxy.man b/programs/xfindproxy/xfindproxy.man index 03ef41184..122c6f8f2 100644 --- a/programs/xfindproxy/xfindproxy.man +++ b/programs/xfindproxy/xfindproxy.man @@ -1,7 +1,11 @@ -.\" $Xorg: xfindproxy.man,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ +.\" $Xorg: xfindproxy.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xfindproxy/xfindproxy.man,v 1.6 2001/01/27 18:21:12 dawes Exp $ .\" .TH XFINDPROXY 1 __xorgversion__ .SH NAME diff --git a/programs/xfs/difs/atom.c b/programs/xfs/difs/atom.c index c7504e6e0..484f6c70c 100644 --- a/programs/xfs/difs/atom.c +++ b/programs/xfs/difs/atom.c @@ -1,11 +1,15 @@ -/* $Xorg: atom.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: atom.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * font server atom manipulations */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ in this Software without prior written authorization from The Open Group. * @(#)atom.c 4.1 5/2/91 * */ -/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.2 1999/03/07 11:40:51 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.3 2001/01/17 23:45:28 dawes Exp $ */ #include "misc.h" #include "fsresource.h" diff --git a/programs/xfs/difs/cache.c b/programs/xfs/difs/cache.c index d80a8fd6a..58a44d44f 100644 --- a/programs/xfs/difs/cache.c +++ b/programs/xfs/difs/cache.c @@ -1,8 +1,12 @@ -/* $Xorg: cache.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: cache.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)cache.c 4.2 91/05/02 * */ -/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.4 1999/03/07 11:40:51 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.5 2001/01/17 23:45:28 dawes Exp $ */ #include "cachestr.h" #include "misc.h" diff --git a/programs/xfs/difs/charinfo.c b/programs/xfs/difs/charinfo.c index 98cb3cbec..f6a994271 100644 --- a/programs/xfs/difs/charinfo.c +++ b/programs/xfs/difs/charinfo.c @@ -1,9 +1,13 @@ -/* $Xorg: charinfo.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: charinfo.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -45,7 +49,7 @@ in this Software without prior written authorization from The Open Group. * This file was once on the other side of * the font library interface as util/fsfuncs.c. */ -/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.10 2001/08/01 00:45:04 tsi Exp $ */ +/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.11 2001/10/28 03:34:34 tsi Exp $ */ #include <X11/Xos.h> #include "misc.h" diff --git a/programs/xfs/difs/difsutils.c b/programs/xfs/difs/difsutils.c index f26cd0221..a17dd8174 100644 --- a/programs/xfs/difs/difsutils.c +++ b/programs/xfs/difs/difsutils.c @@ -1,4 +1,4 @@ -/* $Xorg: difsutils.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: difsutils.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * misc utility routines */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.5 1999/08/21 13:48:47 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.6 2001/01/17 23:45:28 dawes Exp $ */ #define XK_LATIN1 diff --git a/programs/xfs/difs/dispatch.c b/programs/xfs/difs/dispatch.c index 5e8953465..67b8813ba 100644 --- a/programs/xfs/difs/dispatch.c +++ b/programs/xfs/difs/dispatch.c @@ -1,4 +1,4 @@ -/* $Xorg: dispatch.c,v 1.5 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: dispatch.c,v 1.6 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * protocol dispatcher */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/dispatch.c,v 3.10 2001/06/25 20:40:17 paulo Exp $ */ +/* $XFree86: xc/programs/xfs/difs/dispatch.c,v 3.11 2001/08/28 23:44:53 paulo Exp $ */ #include <stdlib.h> #include "dispatch.h" diff --git a/programs/xfs/difs/events.c b/programs/xfs/difs/events.c index 7c004ec36..7e2b57cf4 100644 --- a/programs/xfs/difs/events.c +++ b/programs/xfs/difs/events.c @@ -1,4 +1,4 @@ -/* $Xorg: events.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: events.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * event handling stuff */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/events.c,v 3.5 1999/03/07 11:40:52 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/events.c,v 3.6 2001/01/17 23:45:28 dawes Exp $ */ #include <swaprep.h> diff --git a/programs/xfs/difs/extensions.c b/programs/xfs/difs/extensions.c index 2daad098e..0f76a8289 100644 --- a/programs/xfs/difs/extensions.c +++ b/programs/xfs/difs/extensions.c @@ -1,4 +1,4 @@ -/* $Xorg: extensions.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: extensions.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * font server extensions */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/extensions.c,v 1.5 2001/01/17 23:45:29 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/extensions.c,v 1.6 2001/08/01 00:45:04 tsi Exp $ */ #include "FSproto.h" #include "misc.h" diff --git a/programs/xfs/difs/fontinfo.c b/programs/xfs/difs/fontinfo.c index 02558b0bb..d62428026 100644 --- a/programs/xfs/difs/fontinfo.c +++ b/programs/xfs/difs/fontinfo.c @@ -1,4 +1,4 @@ -/* $Xorg: fontinfo.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: fontinfo.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * font data query */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.8 2001/01/17 23:45:29 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.9 2001/08/01 00:45:04 tsi Exp $ */ #include "FS.h" #include "FSproto.h" diff --git a/programs/xfs/difs/fonts.c b/programs/xfs/difs/fonts.c index 492bc77b6..8c8daf375 100644 --- a/programs/xfs/difs/fonts.c +++ b/programs/xfs/difs/fonts.c @@ -1,4 +1,4 @@ -/* $Xorg: fonts.c,v 1.4 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: fonts.c,v 1.5 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * font control */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.11 2001/08/01 00:45:04 tsi Exp $ */ +/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.12 2001/10/28 03:34:34 tsi Exp $ */ #include "FS.h" #include "FSproto.h" diff --git a/programs/xfs/difs/globals.c b/programs/xfs/difs/globals.c index 7220e7390..aac251712 100644 --- a/programs/xfs/difs/globals.c +++ b/programs/xfs/difs/globals.c @@ -1,16 +1,15 @@ -/* $XConsortium: globals.c,v 1.5 94/04/17 19:56:17 dpw Exp $ */ +/* $Xorg: globals.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * various font server globals */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -18,13 +17,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/difs/initfonts.c b/programs/xfs/difs/initfonts.c index 8700f9488..e3a52833b 100644 --- a/programs/xfs/difs/initfonts.c +++ b/programs/xfs/difs/initfonts.c @@ -1,8 +1,12 @@ -/* $Xorg: initfonts.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: initfonts.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * %W% %E% * */ -/* $XFree86: xc/programs/xfs/difs/initfonts.c,v 1.5 2001/01/17 23:45:29 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/initfonts.c,v 1.6 2001/08/01 00:45:04 tsi Exp $ */ #include "font.h" #include "difs.h" diff --git a/programs/xfs/difs/main.c b/programs/xfs/difs/main.c index 057799cde..4655b8efe 100644 --- a/programs/xfs/difs/main.c +++ b/programs/xfs/difs/main.c @@ -1,4 +1,4 @@ -/* $Xorg: main.c,v 1.4 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: main.c,v 1.5 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * Font server main routine */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/main.c,v 3.9 2001/08/01 00:45:04 tsi Exp $ */ +/* $XFree86: xc/programs/xfs/difs/main.c,v 3.10 2001/10/28 03:34:34 tsi Exp $ */ #include <stdlib.h> #include <sys/types.h> diff --git a/programs/xfs/difs/resource.c b/programs/xfs/difs/resource.c index 0bbca875e..f456524e3 100644 --- a/programs/xfs/difs/resource.c +++ b/programs/xfs/difs/resource.c @@ -1,8 +1,12 @@ -/* $Xorg: resource.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: resource.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * %W% %G% * */ -/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.5 2001/01/17 23:45:29 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.6 2001/08/01 00:45:04 tsi Exp $ */ /* * a resource is a 32 bit quantity. the upper 12 bits are client id. * client provides a 19 bit resource id. this is "hashed" by me by diff --git a/programs/xfs/difs/swaprep.c b/programs/xfs/difs/swaprep.c index 64fdb4f91..74d0ca727 100644 --- a/programs/xfs/difs/swaprep.c +++ b/programs/xfs/difs/swaprep.c @@ -1,4 +1,4 @@ -/* $Xorg: swaprep.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: swaprep.c,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* * font server reply swapping */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/swaprep.c,v 1.3 1998/10/25 12:48:00 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/swaprep.c,v 1.4 2001/01/17 23:45:29 dawes Exp $ */ #include <swaprep.h> #include <swapreq.h> diff --git a/programs/xfs/difs/swapreq.c b/programs/xfs/difs/swapreq.c index e782ec196..1c2625276 100644 --- a/programs/xfs/difs/swapreq.c +++ b/programs/xfs/difs/swapreq.c @@ -1,4 +1,4 @@ -/* $Xorg: swapreq.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: swapreq.c,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* * swapped requests */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/swapreq.c,v 1.5 2001/01/17 23:45:29 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/swapreq.c,v 1.6 2001/06/25 20:40:17 paulo Exp $ */ #include <swapreq.h> diff --git a/programs/xfs/difs/tables.c b/programs/xfs/difs/tables.c index 142f7da1d..3a2ab3c9f 100644 --- a/programs/xfs/difs/tables.c +++ b/programs/xfs/difs/tables.c @@ -1,4 +1,4 @@ -/* $Xorg: tables.c,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: tables.c,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* * all the dispatch, error, event and reply vectors */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/tables.c,v 1.4 1999/03/07 11:40:56 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/tables.c,v 1.5 2001/01/17 23:45:29 dawes Exp $ */ #include <dispatch.h> #include <swaprep.h> diff --git a/programs/xfs/include/access.h b/programs/xfs/include/access.h index e6cb569b0..19c774c90 100644 --- a/programs/xfs/include/access.h +++ b/programs/xfs/include/access.h @@ -1,8 +1,12 @@ -/* $Xorg: access.h,v 1.3 2000/08/17 19:54:20 cpqbld Exp $ */ +/* $Xorg: access.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)access.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/access.h,v 1.3 1998/10/25 12:48:01 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/access.h,v 1.4 2001/01/17 23:45:30 dawes Exp $ */ #ifndef _ACCESS_H_ #define _ACCESS_H_ diff --git a/programs/xfs/include/accstr.h b/programs/xfs/include/accstr.h index a6983ebde..50a134dd8 100644 --- a/programs/xfs/include/accstr.h +++ b/programs/xfs/include/accstr.h @@ -1,8 +1,12 @@ -/* $Xorg: accstr.h,v 1.3 2000/08/17 19:54:21 cpqbld Exp $ */ +/* $Xorg: accstr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -44,7 +48,7 @@ in this Software without prior written authorization from The Open Group. * @(#)accstr.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.5 2001/01/17 23:45:31 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.6 2001/06/25 20:40:18 paulo Exp $ */ #ifndef _ACCSTR_H_ #define _ACCSTR_H_ diff --git a/programs/xfs/include/assert.h b/programs/xfs/include/assert.h index 1d29405e7..aa95a6957 100644 --- a/programs/xfs/include/assert.h +++ b/programs/xfs/include/assert.h @@ -1,13 +1,12 @@ -/* $XConsortium: assert.h,v 1.4 94/04/17 19:55:52 dpw Exp $ */ +/* $Xorg: assert.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/include/auth.h b/programs/xfs/include/auth.h index 77f77b5a7..0ea06f0cc 100644 --- a/programs/xfs/include/auth.h +++ b/programs/xfs/include/auth.h @@ -1,8 +1,12 @@ -/* $Xorg: auth.h,v 1.3 2000/08/17 19:54:21 cpqbld Exp $ */ +/* $Xorg: auth.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)auth.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/auth.h,v 1.4 1999/03/07 11:40:58 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/auth.h,v 1.5 2001/01/17 23:45:31 dawes Exp $ */ #ifndef _AUTH_H_ #define _AUTH_H_ diff --git a/programs/xfs/include/authstr.h b/programs/xfs/include/authstr.h index e69064127..de01f4240 100644 --- a/programs/xfs/include/authstr.h +++ b/programs/xfs/include/authstr.h @@ -1,13 +1,12 @@ -/* $XConsortium: authstr.h,v 1.5 94/04/17 19:55:53 dpw Exp $ */ +/* $Xorg: authstr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/include/cache.h b/programs/xfs/include/cache.h index 5e8642808..7e5a2b245 100644 --- a/programs/xfs/include/cache.h +++ b/programs/xfs/include/cache.h @@ -1,8 +1,12 @@ -/* $Xorg: cache.h,v 1.3 2000/08/17 19:54:21 cpqbld Exp $ */ +/* $Xorg: cache.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)cache.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/cache.h,v 1.3 1998/10/25 12:48:02 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/cache.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */ #ifndef _CACHE_H_ #define _CACHE_H_ diff --git a/programs/xfs/include/cachestr.h b/programs/xfs/include/cachestr.h index 85c3c4675..19bdd5aff 100644 --- a/programs/xfs/include/cachestr.h +++ b/programs/xfs/include/cachestr.h @@ -1,13 +1,12 @@ -/* $XConsortium: cachestr.h,v 1.4 94/04/17 19:55:54 dpw Exp $ */ +/* $Xorg: cachestr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/include/client.h b/programs/xfs/include/client.h index 2bdd85361..722959dbb 100644 --- a/programs/xfs/include/client.h +++ b/programs/xfs/include/client.h @@ -1,9 +1,13 @@ -/* $Xorg: client.h,v 1.3 2000/08/17 19:54:21 cpqbld Exp $ */ +/* $Xorg: client.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/client.h,v 1.5 1999/08/21 13:48:50 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/client.h,v 1.6 2001/01/17 23:45:31 dawes Exp $ */ #ifndef _CLIENT_H_ #define _CLIENT_H_ diff --git a/programs/xfs/include/clientstr.h b/programs/xfs/include/clientstr.h index 419077208..4f977ce3b 100644 --- a/programs/xfs/include/clientstr.h +++ b/programs/xfs/include/clientstr.h @@ -1,8 +1,12 @@ -/* $Xorg: clientstr.h,v 1.3 2000/08/17 19:54:21 cpqbld Exp $ */ +/* $Xorg: clientstr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.5 2001/01/17 23:45:31 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.6 2001/08/28 23:44:53 paulo Exp $ */ #ifndef _CLIENTSTR_H_ #define _CLIENTSTR_H_ diff --git a/programs/xfs/include/closestr.h b/programs/xfs/include/closestr.h index 0cbdd4fb9..9d38ff2a8 100644 --- a/programs/xfs/include/closestr.h +++ b/programs/xfs/include/closestr.h @@ -1,13 +1,12 @@ -/* $XConsortium: closestr.h,v 1.6 94/04/17 19:55:55 dpw Exp $ */ +/* $Xorg: closestr.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * @@ -45,7 +44,7 @@ in this Software without prior written authorization from the X Consortium. * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $NCDId: @(#)closestr.h,v 4.1 1991/05/02 04:15:46 lemke Exp $ + * $NCDXorg: @(#)closestr.h,v 4.1 1991/05/02 04:15:46 lemke Exp $ * */ @@ -58,6 +57,9 @@ in this Software without prior written authorization from the X Consortium. #include "font.h" /* closure structures */ + +/* OpenFont */ + typedef struct _OFclosure { ClientPtr client; short current_fpe; @@ -75,6 +77,8 @@ typedef struct _OFclosure { FontPtr non_cachable_font; } OFclosureRec; +/* QueryExtents */ + typedef struct _QEclosure { ClientPtr client; int nranges; @@ -84,6 +88,8 @@ typedef struct _QEclosure { Bool slept; } QEclosureRec; +/* QueryBitmaps */ + typedef struct _QBclosure { ClientPtr client; int nranges; @@ -94,8 +100,11 @@ typedef struct _QBclosure { Bool slept; } QBclosureRec; +/* ListFontsWithInfo */ + +#define XLFDMAXFONTNAMELEN 256 typedef struct _LFWIstate { - char *pattern; + char pattern[XLFDMAXFONTNAMELEN]; /* max len of font name */ int patlen; int current_fpe; int max_names; diff --git a/programs/xfs/include/closure.h b/programs/xfs/include/closure.h index 4e2c6c6d0..ea8e260bc 100644 --- a/programs/xfs/include/closure.h +++ b/programs/xfs/include/closure.h @@ -1,13 +1,12 @@ -/* $XConsortium: closure.h,v 1.4 94/04/17 19:55:55 dpw Exp $ */ +/* $Xorg: closure.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/include/difsfn.h b/programs/xfs/include/difsfn.h index cb268d6c5..a55a9f80f 100644 --- a/programs/xfs/include/difsfn.h +++ b/programs/xfs/include/difsfn.h @@ -1,8 +1,12 @@ -/* $Xorg: difsfn.h,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: difsfn.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.3 1998/10/25 12:48:03 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */ #ifndef _DIFSFONT_H_ #define _DIFSFONT_H_ diff --git a/programs/xfs/include/difsfnst.h b/programs/xfs/include/difsfnst.h index 76d025812..435315519 100644 --- a/programs/xfs/include/difsfnst.h +++ b/programs/xfs/include/difsfnst.h @@ -1,8 +1,12 @@ -/* $Xorg: difsfnst.h,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: difsfnst.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.3 1999/03/07 14:23:32 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.4 2001/01/17 23:45:31 dawes Exp $ */ #ifndef _DIFSFONTST_H_ #define _DIFSFONTST_H_ diff --git a/programs/xfs/include/extentst.h b/programs/xfs/include/extentst.h index 82d241cf7..9bc1b4765 100644 --- a/programs/xfs/include/extentst.h +++ b/programs/xfs/include/extentst.h @@ -1,8 +1,12 @@ -/* $Xorg: extentst.h,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: extentst.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)extentst.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.4 1999/03/07 11:41:00 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.5 2001/01/17 23:45:31 dawes Exp $ */ #ifndef _EXTENTST_H_ #define _EXTENTST_H_ diff --git a/programs/xfs/include/globals.h b/programs/xfs/include/globals.h index f67834e44..9b4d083a8 100644 --- a/programs/xfs/include/globals.h +++ b/programs/xfs/include/globals.h @@ -1,13 +1,12 @@ -/* $XConsortium: globals.h,v 1.5 94/04/17 19:55:58 dpw Exp $ */ +/* $Xorg: globals.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/include/misc.h b/programs/xfs/include/misc.h index 7c0a6aefc..43d87338b 100644 --- a/programs/xfs/include/misc.h +++ b/programs/xfs/include/misc.h @@ -1,9 +1,13 @@ -/* $Xorg: misc.h,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: misc.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/misc.h,v 3.7 2001/06/26 22:18:13 paulo Exp $ */ +/* $XFree86: xc/programs/xfs/include/misc.h,v 3.8 2001/07/25 15:05:21 dawes Exp $ */ #ifndef _MISC_H_ #define _MISC_H_ diff --git a/programs/xfs/include/os.h b/programs/xfs/include/os.h index d7cd5cf7a..4e8666592 100644 --- a/programs/xfs/include/os.h +++ b/programs/xfs/include/os.h @@ -1,8 +1,12 @@ -/* $Xorg: os.h,v 1.4 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: os.h,v 1.5 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * $NCDXorg: @(#)os.h,v 4.2 1991/05/10 07:59:16 lemke Exp $ * */ -/* $XFree86: xc/programs/xfs/include/os.h,v 3.11 2001/06/25 20:40:18 paulo Exp $ */ +/* $XFree86: xc/programs/xfs/include/os.h,v 3.12 2001/08/01 00:45:05 tsi Exp $ */ #ifndef _OS_H_ #define _OS_H_ diff --git a/programs/xfs/include/osstruct.h b/programs/xfs/include/osstruct.h index 37710b023..686f4daa7 100644 --- a/programs/xfs/include/osstruct.h +++ b/programs/xfs/include/osstruct.h @@ -1,8 +1,12 @@ -/* $Xorg: osstruct.h,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: osstruct.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)osstruct.h 4.1 91/05/02 * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xfs/include/osstruct.h,v 1.3 2001/07/29 22:08:16 tsi Exp $ */ #ifndef _OSSTRUCT_H_ #define _OSSTRUCT_H_ diff --git a/programs/xfs/include/servermd.h b/programs/xfs/include/servermd.h index 69b1bc7a5..a12cf0980 100644 --- a/programs/xfs/include/servermd.h +++ b/programs/xfs/include/servermd.h @@ -1,8 +1,12 @@ -/* $Xorg: servermd.h,v 1.4 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: servermd.h,v 1.6 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xfs/include/servermd.h,v 1.3 2001/07/29 22:08:16 tsi Exp $ */ #ifndef _SERVERMD_H_ #define _SERVERMD_H_ diff --git a/programs/xfs/include/site.h b/programs/xfs/include/site.h index 107ad1c8e..41ebc15db 100644 --- a/programs/xfs/include/site.h +++ b/programs/xfs/include/site.h @@ -1,13 +1,12 @@ -/* $XConsortium: site.h,v 1.6 94/04/17 19:56:01 dpw Exp $ */ +/* $Xorg: site.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/os/access.c b/programs/xfs/os/access.c index 88c0e364d..54c86da13 100644 --- a/programs/xfs/os/access.c +++ b/programs/xfs/os/access.c @@ -1,9 +1,13 @@ -/* $Xorg: access.c,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: access.c,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/access.c,v 3.5 2001/06/25 20:40:18 paulo Exp $ */ +/* $XFree86: xc/programs/xfs/os/access.c,v 3.6 2001/07/23 13:15:52 dawes Exp $ */ #include <X11/Xos.h> #ifndef Lynx diff --git a/programs/xfs/os/config.c b/programs/xfs/os/config.c index 08069fcea..64eb9537f 100644 --- a/programs/xfs/os/config.c +++ b/programs/xfs/os/config.c @@ -1,8 +1,12 @@ -/* $Xorg: config.c,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: config.c,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * $NCDXorg: @(#)config.c,v 4.6 1991/07/09 14:08:09 lemke Exp $ * */ -/* $XFree86: xc/programs/xfs/os/config.c,v 3.12 2001/07/25 15:05:21 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/config.c,v 3.13 2001/08/01 00:45:05 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xfs/os/config.h b/programs/xfs/os/config.h index 526396269..ba6db45cb 100644 --- a/programs/xfs/os/config.h +++ b/programs/xfs/os/config.h @@ -1,13 +1,12 @@ -/* $XConsortium: config.h,v 1.4 94/04/17 19:56:03 dpw Exp $ */ +/* $Xorg: config.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* -Copyright (c) 1987 X Consortium +Copyright 1987, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -15,13 +14,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. -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. * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation * diff --git a/programs/xfs/os/configstr.h b/programs/xfs/os/configstr.h index 5b59f7a1f..9c1a8afa1 100644 --- a/programs/xfs/os/configstr.h +++ b/programs/xfs/os/configstr.h @@ -1,8 +1,12 @@ -/* $Xorg: configstr.h,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: configstr.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)configstr.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.3 1999/03/07 14:23:33 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.4 2001/01/17 23:45:32 dawes Exp $ */ #ifndef _CONFIGSTR_H_ #define _CONFIGSTR_H_ #include "config.h" diff --git a/programs/xfs/os/connection.c b/programs/xfs/os/connection.c index ca497b96b..57b3eaa13 100644 --- a/programs/xfs/os/connection.c +++ b/programs/xfs/os/connection.c @@ -1,4 +1,4 @@ -/* $Xorg: connection.c,v 1.4 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: connection.c,v 1.5 2001/02/09 02:05:44 xorgcvs Exp $ */ /* * handles connections */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -63,7 +67,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/connection.c,v 3.21 2001/07/23 13:15:53 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/connection.c,v 3.22 2001/07/25 15:05:22 dawes Exp $ */ #include <X11/Xtrans.h> #include <stdlib.h> diff --git a/programs/xfs/os/error.c b/programs/xfs/os/error.c index 615c2fd3f..c11aa7879 100644 --- a/programs/xfs/os/error.c +++ b/programs/xfs/os/error.c @@ -1,11 +1,15 @@ -/* $Xorg: error.c,v 1.3 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: error.c,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* * error message handling */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -40,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/error.c,v 1.8 2001/04/01 14:00:21 tsi Exp $ */ +/* $XFree86: xc/programs/xfs/os/error.c,v 1.9 2001/07/25 15:05:22 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xfs/os/io.c b/programs/xfs/os/io.c index 313b2cb60..60c937391 100644 --- a/programs/xfs/os/io.c +++ b/programs/xfs/os/io.c @@ -1,4 +1,4 @@ -/* $Xorg: io.c,v 1.4 2000/08/17 19:54:22 cpqbld Exp $ */ +/* $Xorg: io.c,v 1.5 2001/02/09 02:05:44 xorgcvs Exp $ */ /* * i/o functions */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/io.c,v 3.16 2001/08/28 23:44:54 paulo Exp $ */ +/* $XFree86: xc/programs/xfs/os/io.c,v 3.17 2001/08/28 23:53:34 paulo Exp $ */ #include <X11/Xtrans.h> #include <stdio.h> diff --git a/programs/xfs/os/osdep.h b/programs/xfs/os/osdep.h index 31c1ca055..d3034cd57 100644 --- a/programs/xfs/os/osdep.h +++ b/programs/xfs/os/osdep.h @@ -1,8 +1,12 @@ -/* $Xorg: osdep.h,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: osdep.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * @(#)osdep.h 4.1 5/2/91 * */ -/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.9 2001/06/25 20:40:18 paulo Exp $ */ +/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.10 2001/07/25 15:05:22 dawes Exp $ */ #ifndef _OSDEP_H_ #define _OSDEP_H_ diff --git a/programs/xfs/os/osglue.c b/programs/xfs/os/osglue.c index 3cc786f62..7bed75018 100644 --- a/programs/xfs/os/osglue.c +++ b/programs/xfs/os/osglue.c @@ -1,8 +1,12 @@ -/* $Xorg: osglue.c,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: osglue.c,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -43,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * $NCDXorg: @(#)osglue.c,v 4.6 1991/07/09 14:07:30 lemke Exp $ * */ -/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.13 2001/06/26 22:18:14 paulo Exp $ */ +/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.14 2001/07/25 15:05:22 dawes Exp $ */ /* * this is miscellaneous OS specific stuff. diff --git a/programs/xfs/os/osinit.c b/programs/xfs/os/osinit.c index 61e78d259..a12bb002d 100644 --- a/programs/xfs/os/osinit.c +++ b/programs/xfs/os/osinit.c @@ -1,11 +1,15 @@ -/* $Xorg: osinit.c,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* * os init code */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ in this Software without prior written authorization from The Open Group. * @(#)osinit.c 4.3 5/7/91 * */ -/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.3 1999/03/07 14:23:34 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.4 2001/01/17 23:45:33 dawes Exp $ */ #include "os.h" diff --git a/programs/xfs/os/utils.c b/programs/xfs/os/utils.c index b7002a64f..54c2af203 100644 --- a/programs/xfs/os/utils.c +++ b/programs/xfs/os/utils.c @@ -1,4 +1,4 @@ -/* $Xorg: utils.c,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: utils.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* * misc os utilities */ @@ -6,7 +6,11 @@ Copyright 1990, 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/utils.c,v 3.15 2001/07/25 15:05:22 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/utils.c,v 3.16 2001/12/03 21:25:46 herrb Exp $ */ #include <stdio.h> #include <X11/Xos.h> diff --git a/programs/xfs/os/waitfor.c b/programs/xfs/os/waitfor.c index 2902ba15f..fbc49a284 100644 --- a/programs/xfs/os/waitfor.c +++ b/programs/xfs/os/waitfor.c @@ -1,11 +1,15 @@ -/* $Xorg: waitfor.c,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: waitfor.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* * waits for input */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -46,7 +50,7 @@ in this Software without prior written authorization from The Open Group. * $NCDXorg: @(#)waitfor.c,v 4.5 1991/06/24 11:59:20 lemke Exp $ * */ -/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.13 2001/07/23 13:15:53 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.14 2001/07/25 15:05:22 dawes Exp $ */ #include <X11/Xos.h> /* strings, time, etc */ diff --git a/programs/xfs/xfs.man b/programs/xfs/xfs.man index 65b3e6095..50e673420 100644 --- a/programs/xfs/xfs.man +++ b/programs/xfs/xfs.man @@ -1,8 +1,12 @@ -.\" $XFree86: xc/programs/xfs/xfs.man,v 3.14 2001/01/27 18:21:13 dawes Exp $ +.\" $XFree86: xc/programs/xfs/xfs.man,v 3.15 2001/04/18 16:13:22 dawes Exp $ .\" .\" Copyright 1991, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included in .\" all copies or substantial portions of the Software. @@ -32,7 +36,7 @@ .\" no representations about the .\" suitability of this software for any purpose. It is provided "as is" .\" without express or implied warranty. -.\" $Xorg: xfs.man,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ +.\" $Xorg: xfs.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ .TH XFS 1 __xorgversion__ .SH NAME xfs \- X font server diff --git a/programs/xfsinfo/xfsinfo.c b/programs/xfsinfo/xfsinfo.c index baa7f76d3..b78a0841d 100644 --- a/programs/xfsinfo/xfsinfo.c +++ b/programs/xfsinfo/xfsinfo.c @@ -7,7 +7,11 @@ Portions Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -26,7 +30,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.2 2001/04/01 14:00:21 tsi Exp $ */ +/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.3 2001/08/27 17:41:02 dawes Exp $ */ /* * Copyright 1990 Network Computing Devices; diff --git a/programs/xfsinfo/xfsinfo.man b/programs/xfsinfo/xfsinfo.man index d2da70824..7a4e030c8 100644 --- a/programs/xfsinfo/xfsinfo.man +++ b/programs/xfsinfo/xfsinfo.man @@ -2,7 +2,11 @@ .\" Copyright 1991, Network Computing Devices, Inc .\" Copyright 1993, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.3 2001/02/07 22:51:58 tsi Exp $ +.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.4 2001/04/18 16:13:23 dawes Exp $ .\" .TH XFSINFO 1 __xorgversion__ .SH NAME diff --git a/programs/xfwp/io.c b/programs/xfwp/io.c index ca623eea0..5f1e051da 100644 --- a/programs/xfwp/io.c +++ b/programs/xfwp/io.c @@ -1,16 +1,13 @@ -/* $Xorg: io.c,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: io.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* -Copyright "1986-1997 The Open Group All Rights Reserved +Copyright "1986-1997, 1998 The Open Group -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to use the Software without restriction, -including, without limitation, the rights to copy, modify, -merge, publish, distribute and sublicense the Software, to make, -have made, license and distribute derivative works thereof, and -to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: @@ -32,7 +29,7 @@ authorization from The Open Group. X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/io.c,v 1.9 2001/01/17 23:45:34 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/io.c,v 1.10 2001/07/25 15:05:22 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xfwp/io.h b/programs/xfwp/io.h index d29f1e87e..147b10f49 100644 --- a/programs/xfwp/io.h +++ b/programs/xfwp/io.h @@ -1,9 +1,13 @@ -/* $Xorg: io.h,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: io.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright "1986-1997, 1998 The Open Group -All Rights Reserved +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: diff --git a/programs/xfwp/misc.c b/programs/xfwp/misc.c index 9ed73ecbf..cc040ba7c 100644 --- a/programs/xfwp/misc.c +++ b/programs/xfwp/misc.c @@ -1,16 +1,13 @@ -/* $Xorg: misc.c,v 1.5 2000/08/17 19:54:23 cpqbld Exp $ */ +/* $Xorg: misc.c,v 1.6 2001/02/09 02:05:45 xorgcvs Exp $ */ /* -Copyright "1986-1997 The Open Group All Rights Reserved +Copyright "1986-1997, 1998 The Open Group -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to use the Software without restriction, -including, without limitation, the rights to copy, modify, -merge, publish, distribute and sublicense the Software, to make, -have made, license and distribute derivative works thereof, and -to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: @@ -31,7 +28,7 @@ authorization from The Open Group. X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/misc.c,v 1.5 1999/03/02 11:49:39 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/misc.c,v 1.6 2001/01/17 23:45:34 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xfwp/misc.h b/programs/xfwp/misc.h index e1e6815cf..f1e706421 100644 --- a/programs/xfwp/misc.h +++ b/programs/xfwp/misc.h @@ -1,9 +1,13 @@ -/* $Xorg: misc.h,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: misc.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright "1986-1997, 1998 The Open Group -All Rights Reserved +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: diff --git a/programs/xfwp/pm.c b/programs/xfwp/pm.c index 0c32c23bf..aa02f03f6 100644 --- a/programs/xfwp/pm.c +++ b/programs/xfwp/pm.c @@ -1,16 +1,13 @@ -/* $Xorg: pm.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: pm.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* -Copyright "1986-1997 The Open Group All Rights Reserved +Copyright "1986-1997, 1998 The Open Group -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to use the Software without restriction, -including, without limitation, the rights to copy, modify, -merge, publish, distribute and sublicense the Software, to make, -have made, license and distribute derivative works thereof, and -to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: @@ -32,7 +29,7 @@ authorization from The Open Group. X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/pm.c,v 1.5 1999/03/02 11:49:40 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/pm.c,v 1.6 2001/01/17 23:45:34 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xfwp/pm.h b/programs/xfwp/pm.h index 0c10d849d..5214b9d47 100644 --- a/programs/xfwp/pm.h +++ b/programs/xfwp/pm.h @@ -1,16 +1,13 @@ -/* $Xorg: pm.h,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: pm.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* -Copyright "1986-1997 The Open Group All Rights Reserved +Copyright "1986-1997, 1998 The Open Group -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to use the Software without restriction, -including, without limitation, the rights to copy, modify, -merge, publish, distribute and sublicense the Software, to make, -have made, license and distribute derivative works thereof, and -to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: @@ -32,7 +29,7 @@ authorization from The Open Group. X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/pm.h,v 1.3 1999/03/02 11:49:40 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/pm.h,v 1.4 2001/01/17 23:45:34 dawes Exp $ */ #ifndef _PM_H #define _PM_H diff --git a/programs/xfwp/transport.c b/programs/xfwp/transport.c index ef9d3f8fe..e01ea0848 100644 --- a/programs/xfwp/transport.c +++ b/programs/xfwp/transport.c @@ -1,16 +1,13 @@ -/* $Xorg: transport.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: transport.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* -Copyright "1986-1997 The Open Group All Rights Reserved +Copyright "1986-1997, 1998 The Open Group -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to use the Software without restriction, -including, without limitation, the rights to copy, modify, -merge, publish, distribute and sublicense the Software, to make, -have made, license and distribute derivative works thereof, and -to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: @@ -32,7 +29,7 @@ authorization from The Open Group. X Window System is a trademark of The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xfwp/transport.c,v 1.6 2001/07/29 21:23:20 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xfwp/transport.h b/programs/xfwp/transport.h index 094632ab9..99f389262 100644 --- a/programs/xfwp/transport.h +++ b/programs/xfwp/transport.h @@ -1,9 +1,13 @@ -/* $Xorg: transport.h,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: transport.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright "1986-1997, 1998 The Open Group -All Rights Reserved +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and the following permission notice shall be included in all copies of the Software: diff --git a/programs/xfwp/xfwp.c b/programs/xfwp/xfwp.c index 4454968e1..de2f17d0d 100644 --- a/programs/xfwp/xfwp.c +++ b/programs/xfwp/xfwp.c @@ -1,9 +1,13 @@ -/* $Xorg: xfwp.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: xfwp.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xfwp/xfwp.h b/programs/xfwp/xfwp.h index 46489e59d..fa2f2408a 100644 --- a/programs/xfwp/xfwp.h +++ b/programs/xfwp/xfwp.h @@ -1,9 +1,13 @@ -/* $Xorg: xfwp.h,v 1.5 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: xfwp.h,v 1.6 2001/02/09 02:05:46 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfwp/xfwp.h,v 1.8 1999/12/27 00:40:13 robin Exp $ */ +/* $XFree86: xc/programs/xfwp/xfwp.h,v 1.9 2001/01/17 23:45:35 dawes Exp $ */ #ifndef _XFWP_H #define _XFWP_H diff --git a/programs/xfwp/xfwp.man b/programs/xfwp/xfwp.man index 72ab243cc..daee38d24 100644 --- a/programs/xfwp/xfwp.man +++ b/programs/xfwp/xfwp.man @@ -1,7 +1,11 @@ -.\" $Xorg: xfwp.man,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ +.\" $Xorg: xfwp.man,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xfwp/xfwp.man,v 1.6 2001/01/27 18:21:14 dawes Exp $ +.\" $XFree86: xc/programs/xfwp/xfwp.man,v 1.7 2001/02/07 22:35:23 tsi Exp $ .\" .nh .TH XFWP 1 __xorgversion__ diff --git a/programs/xhost/xhost.c b/programs/xhost/xhost.c index 156c96d3d..88948cfff 100644 --- a/programs/xhost/xhost.c +++ b/programs/xhost/xhost.c @@ -1,9 +1,13 @@ -/* $Xorg: xhost.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: xhost.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xhost.c,v 3.18 2001/10/28 03:34:34 tsi Exp $ */ +/* $XFree86: xc/programs/xhost/xhost.c,v 3.19 2001/12/09 15:22:39 herrb Exp $ */ #if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN) #define NEEDSOCKETS diff --git a/programs/xhost/xhost.man b/programs/xhost/xhost.man index d2c36d1f2..68a7de109 100644 --- a/programs/xhost/xhost.man +++ b/programs/xhost/xhost.man @@ -1,7 +1,11 @@ -.\" $Xorg: xhost.man,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ +.\" $Xorg: xhost.man,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xhost/xhost.man,v 1.7 2001/01/27 18:21:15 dawes Exp $ .\" .TH XHOST 1 __xorgversion__ .SH NAME diff --git a/programs/xieperf/abort.c b/programs/xieperf/abort.c index feca4ef0f..769823546 100644 --- a/programs/xieperf/abort.c +++ b/programs/xieperf/abort.c @@ -1,11 +1,15 @@ -/* $Xorg: abort.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: abort.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ /**** module abort.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/abort.c,v 1.5 1999/12/27 00:40:13 robin Exp $ */ +/* $XFree86: xc/programs/xieperf/abort.c,v 1.6 2001/01/17 23:45:36 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/arith.c b/programs/xieperf/arith.c index ca4065698..a91c3a68c 100644 --- a/programs/xieperf/arith.c +++ b/programs/xieperf/arith.c @@ -1,11 +1,15 @@ -/* $Xorg: arith.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: arith.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ /**** module arith.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/arith.c,v 1.4 1999/03/02 11:49:41 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/arith.c,v 1.5 2001/01/17 23:45:36 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/await.c b/programs/xieperf/await.c index 535f9d0a7..c40762725 100644 --- a/programs/xieperf/await.c +++ b/programs/xieperf/await.c @@ -1,11 +1,15 @@ -/* $Xorg: await.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: await.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ /**** module await.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/await.c,v 3.4 2001/01/17 23:45:36 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/await.c,v 3.5 2001/12/03 22:25:18 herrb Exp $ */ #ifdef WIN32 #include <X11/Xthreads.h> diff --git a/programs/xieperf/band.c b/programs/xieperf/band.c index b5e21c116..b66be702b 100644 --- a/programs/xieperf/band.c +++ b/programs/xieperf/band.c @@ -1,10 +1,14 @@ -/* $Xorg: band.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: band.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ /**** module band.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/band.c,v 1.4 1999/03/02 11:49:42 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/band.c,v 1.5 2001/01/17 23:45:36 dawes Exp $ */ #include "xieperf.h" #include <X11/Xlib.h> diff --git a/programs/xieperf/blend.c b/programs/xieperf/blend.c index 18b9a728e..4903fec53 100644 --- a/programs/xieperf/blend.c +++ b/programs/xieperf/blend.c @@ -1,11 +1,15 @@ -/* $Xorg: blend.c,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ */ +/* $Xorg: blend.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module blend.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/blend.c,v 1.4 1999/03/02 11:49:42 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/blend.c,v 1.5 2001/01/17 23:45:36 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/cache.c b/programs/xieperf/cache.c index 6cff80691..457880f92 100644 --- a/programs/xieperf/cache.c +++ b/programs/xieperf/cache.c @@ -1,11 +1,15 @@ -/* $Xorg: cache.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: cache.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module cache.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -68,7 +72,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/cache.c,v 1.4 1999/03/02 11:49:42 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/cache.c,v 1.5 2001/01/17 23:45:36 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/compare.c b/programs/xieperf/compare.c index 2ebcb66d4..177c12026 100644 --- a/programs/xieperf/compare.c +++ b/programs/xieperf/compare.c @@ -1,11 +1,15 @@ -/* $Xorg: compare.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: compare.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module compare.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/compare.c,v 1.4 1999/03/02 11:49:43 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/compare.c,v 1.5 2001/01/17 23:45:36 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/complex.c b/programs/xieperf/complex.c index 6e54d9b3c..86328a5d3 100644 --- a/programs/xieperf/complex.c +++ b/programs/xieperf/complex.c @@ -1,10 +1,14 @@ -/* $Xorg: complex.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: complex.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module complex.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. January 3, 1994 *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/complex.c,v 1.4 1999/03/02 11:49:43 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/complex.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <X11/Xlib.h> diff --git a/programs/xieperf/constrain.c b/programs/xieperf/constrain.c index 21e21479c..9f5b84d40 100644 --- a/programs/xieperf/constrain.c +++ b/programs/xieperf/constrain.c @@ -1,11 +1,15 @@ -/* $Xorg: constrain.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: constrain.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module constrain.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/constrain.c,v 1.4 1999/03/02 11:49:43 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/constrain.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/convolve.c b/programs/xieperf/convolve.c index c90dc504c..671d20e28 100644 --- a/programs/xieperf/convolve.c +++ b/programs/xieperf/convolve.c @@ -1,11 +1,15 @@ -/* $Xorg: convolve.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: convolve.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module convolve.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/convolve.c,v 1.4 1999/03/02 11:49:43 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/convolve.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/creatdstry.c b/programs/xieperf/creatdstry.c index 5b66a201d..bb8529c69 100644 --- a/programs/xieperf/creatdstry.c +++ b/programs/xieperf/creatdstry.c @@ -1,11 +1,15 @@ -/* $Xorg: creatdstry.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: creatdstry.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module creatdstry.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/creatdstry.c,v 1.4 1999/03/02 11:49:44 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/creatdstry.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/cvttoindex.c b/programs/xieperf/cvttoindex.c index e604af581..aafe7afc6 100644 --- a/programs/xieperf/cvttoindex.c +++ b/programs/xieperf/cvttoindex.c @@ -1,11 +1,15 @@ -/* $Xorg: cvttoindex.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: cvttoindex.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module cvttoindex.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/cvttoindex.c,v 1.4 1999/03/02 11:49:44 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/cvttoindex.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <X11/Xlib.h> diff --git a/programs/xieperf/dither.c b/programs/xieperf/dither.c index 623cf212e..4943ba946 100644 --- a/programs/xieperf/dither.c +++ b/programs/xieperf/dither.c @@ -1,11 +1,15 @@ -/* $Xorg: dither.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: dither.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module dither.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/dither.c,v 1.4 1999/03/02 11:49:44 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/dither.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/encode.c b/programs/xieperf/encode.c index 843f1c22f..db58e87af 100644 --- a/programs/xieperf/encode.c +++ b/programs/xieperf/encode.c @@ -1,10 +1,14 @@ -/* $Xorg: encode.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: encode.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module encode.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/encode.c,v 1.4 1999/03/02 11:49:45 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/encode.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <X11/Xlib.h> diff --git a/programs/xieperf/errors.c b/programs/xieperf/errors.c index 78fe6681e..a4c14fc39 100644 --- a/programs/xieperf/errors.c +++ b/programs/xieperf/errors.c @@ -1,10 +1,14 @@ -/* $Xorg: errors.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: errors.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module errors.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/errors.c,v 1.4 1999/03/02 11:49:45 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/errors.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/programs/xieperf/events.c b/programs/xieperf/events.c index 54abfc90f..117a3aa52 100644 --- a/programs/xieperf/events.c +++ b/programs/xieperf/events.c @@ -1,10 +1,14 @@ -/* $Xorg: events.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: events.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module events.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/events.c,v 3.7 2001/01/17 23:45:37 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/events.c,v 3.8 2001/07/23 13:15:53 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/programs/xieperf/exportcl.c b/programs/xieperf/exportcl.c index f75dd34c5..7cdd2bd47 100644 --- a/programs/xieperf/exportcl.c +++ b/programs/xieperf/exportcl.c @@ -1,11 +1,15 @@ -/* $Xorg: exportcl.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: exportcl.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module exportcl.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/exportcl.c,v 1.4 1999/03/02 11:49:45 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/exportcl.c,v 1.5 2001/01/17 23:45:37 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/funcode.c b/programs/xieperf/funcode.c index c436d4d83..39379bbdc 100644 --- a/programs/xieperf/funcode.c +++ b/programs/xieperf/funcode.c @@ -1,11 +1,15 @@ -/* $Xorg: funcode.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: funcode.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module funcode.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -69,7 +73,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/funcode.c,v 1.4 1999/03/02 11:49:46 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/funcode.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/geometry.c b/programs/xieperf/geometry.c index f396a2723..822141a9f 100644 --- a/programs/xieperf/geometry.c +++ b/programs/xieperf/geometry.c @@ -1,11 +1,15 @@ -/* $Xorg: geometry.c,v 1.3 2000/08/17 19:54:25 cpqbld Exp $ */ +/* $Xorg: geometry.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module geometry.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/geometry.c,v 1.4 1999/03/02 11:49:49 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/geometry.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/getnext.c b/programs/xieperf/getnext.c index 5a3b78c77..0751839f2 100644 --- a/programs/xieperf/getnext.c +++ b/programs/xieperf/getnext.c @@ -1,11 +1,15 @@ -/* $Xorg: getnext.c,v 1.3 2000/08/17 19:54:26 cpqbld Exp $ */ +/* $Xorg: getnext.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module getnext.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/getnext.c,v 1.3 1999/03/02 11:49:49 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/getnext.c,v 1.4 2001/01/17 23:45:38 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/programs/xieperf/import.c b/programs/xieperf/import.c index b23b6b69c..a89114439 100644 --- a/programs/xieperf/import.c +++ b/programs/xieperf/import.c @@ -1,11 +1,15 @@ -/* $Xorg: import.c,v 1.3 2000/08/17 19:54:26 cpqbld Exp $ */ +/* $Xorg: import.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module import.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/import.c,v 1.4 1999/03/02 11:49:49 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/import.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/importcl.c b/programs/xieperf/importcl.c index fff96b347..77bc46ff8 100644 --- a/programs/xieperf/importcl.c +++ b/programs/xieperf/importcl.c @@ -1,11 +1,15 @@ -/* $Xorg: importcl.c,v 1.3 2000/08/17 19:54:26 cpqbld Exp $ */ +/* $Xorg: importcl.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module importcl.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/importcl.c,v 1.4 1999/03/02 11:49:50 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/importcl.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/logical.c b/programs/xieperf/logical.c index 102306500..74434d8a2 100644 --- a/programs/xieperf/logical.c +++ b/programs/xieperf/logical.c @@ -1,11 +1,15 @@ -/* $Xorg: logical.c,v 1.3 2000/08/17 19:54:26 cpqbld Exp $ */ +/* $Xorg: logical.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module logical.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/logical.c,v 1.4 1999/03/02 11:49:50 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/logical.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/math.c b/programs/xieperf/math.c index c33fe2370..7316f66fb 100644 --- a/programs/xieperf/math.c +++ b/programs/xieperf/math.c @@ -1,11 +1,15 @@ -/* $Xorg: math.c,v 1.3 2000/08/17 19:54:26 cpqbld Exp $ */ +/* $Xorg: math.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module math.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/math.c,v 1.4 1999/03/02 11:49:50 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/math.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/modify.c b/programs/xieperf/modify.c index 56d044897..d9812ec72 100644 --- a/programs/xieperf/modify.c +++ b/programs/xieperf/modify.c @@ -1,11 +1,15 @@ -/* $Xorg: modify.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: modify.c,v 1.4 2001/02/09 02:05:47 xorgcvs Exp $ */ /**** module modify.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/modify.c,v 3.7 2001/01/17 23:45:38 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/modify.c,v 3.8 2001/07/25 15:05:23 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/mtchhist.c b/programs/xieperf/mtchhist.c index bc393b7e1..02f77671e 100644 --- a/programs/xieperf/mtchhist.c +++ b/programs/xieperf/mtchhist.c @@ -1,11 +1,15 @@ -/* $Xorg: mtchhist.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: mtchhist.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module mtchhist.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/mtchhist.c,v 1.4 1999/03/02 11:49:50 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/mtchhist.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" diff --git a/programs/xieperf/pasteup.c b/programs/xieperf/pasteup.c index f5a861353..17734a958 100644 --- a/programs/xieperf/pasteup.c +++ b/programs/xieperf/pasteup.c @@ -1,11 +1,15 @@ -/* $Xorg: pasteup.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: pasteup.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module pasteup.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/pasteup.c,v 1.4 1999/03/02 11:49:51 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/pasteup.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/point.c b/programs/xieperf/point.c index d8ae0ece5..8d3d781c7 100644 --- a/programs/xieperf/point.c +++ b/programs/xieperf/point.c @@ -1,11 +1,15 @@ -/* $Xorg: point.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: point.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module point.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/point.c,v 1.4 1999/03/02 11:49:51 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/point.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" diff --git a/programs/xieperf/purgecolst.c b/programs/xieperf/purgecolst.c index 9ea1dcd4c..896137a1f 100644 --- a/programs/xieperf/purgecolst.c +++ b/programs/xieperf/purgecolst.c @@ -1,11 +1,15 @@ -/* $Xorg: purgecolst.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: purgecolst.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module purgecolst.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/purgecolst.c,v 1.4 1999/03/02 11:49:51 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/purgecolst.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/query.c b/programs/xieperf/query.c index 819a96479..dcdb7d11f 100644 --- a/programs/xieperf/query.c +++ b/programs/xieperf/query.c @@ -1,11 +1,15 @@ -/* $Xorg: query.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: query.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module query.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/query.c,v 1.4 1999/03/02 11:49:52 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/query.c,v 1.5 2001/01/17 23:45:38 dawes Exp $ */ #include "xieperf.h" diff --git a/programs/xieperf/redefine.c b/programs/xieperf/redefine.c index ddf968888..0f7e87051 100644 --- a/programs/xieperf/redefine.c +++ b/programs/xieperf/redefine.c @@ -1,11 +1,15 @@ -/* $Xorg: redefine.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: redefine.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module redefine.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/redefine.c,v 1.4 1999/03/02 11:49:52 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/redefine.c,v 1.5 2001/01/17 23:45:39 dawes Exp $ */ #include "xieperf.h" #include <stdio.h> diff --git a/programs/xieperf/rgb.c b/programs/xieperf/rgb.c index 8a73d3777..18af20a21 100644 --- a/programs/xieperf/rgb.c +++ b/programs/xieperf/rgb.c @@ -1,11 +1,15 @@ -/* $Xorg: rgb.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: rgb.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module rgb.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/rgb.c,v 1.4 1999/03/02 11:49:52 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/rgb.c,v 1.5 2001/01/17 23:45:39 dawes Exp $ */ #include "xieperf.h" #include <X11/Xlib.h> diff --git a/programs/xieperf/tests.c b/programs/xieperf/tests.c index 4a8f76b29..3062a0feb 100644 --- a/programs/xieperf/tests.c +++ b/programs/xieperf/tests.c @@ -1,11 +1,15 @@ -/* $Xorg: tests.c,v 1.3 2000/08/17 19:54:27 cpqbld Exp $ */ +/* $Xorg: tests.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module tests.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/tests.c,v 1.3 1999/03/02 11:49:53 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/tests.c,v 1.4 2001/01/17 23:45:39 dawes Exp $ */ #include <stdio.h> /* for stderr */ #include "xieperf.h" diff --git a/programs/xieperf/uconstrain.c b/programs/xieperf/uconstrain.c index f02d8e474..aa0c98b58 100644 --- a/programs/xieperf/uconstrain.c +++ b/programs/xieperf/uconstrain.c @@ -1,11 +1,15 @@ -/* $Xorg: uconstrain.c,v 1.3 2000/08/17 19:54:28 cpqbld Exp $ */ +/* $Xorg: uconstrain.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module uconstrain.c ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/uconstrain.c,v 1.4 1999/03/02 11:49:53 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/uconstrain.c,v 1.5 2001/01/17 23:45:39 dawes Exp $ */ #include "xieperf.h" diff --git a/programs/xieperf/xieperf.c b/programs/xieperf/xieperf.c index 3c91f7a32..d38601877 100644 --- a/programs/xieperf/xieperf.c +++ b/programs/xieperf/xieperf.c @@ -1,11 +1,15 @@ -/* $Xorg: xieperf.c,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ */ +/* $Xorg: xieperf.c,v 1.4 2001/02/09 02:05:48 xorgcvs Exp $ */ /**** module xieperf.c ****/ /**************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/xieperf.c,v 3.6 2001/01/23 20:38:30 herrb Exp $ */ +/* $XFree86: xc/programs/xieperf/xieperf.c,v 3.7 2001/07/25 15:05:23 dawes Exp $ */ #include <X11/Xos.h> #include <stdio.h> diff --git a/programs/xieperf/xieperf.h b/programs/xieperf/xieperf.h index b360aa009..13186e32d 100644 --- a/programs/xieperf/xieperf.h +++ b/programs/xieperf/xieperf.h @@ -1,11 +1,15 @@ -/* $Xorg: xieperf.h,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ */ +/* $Xorg: xieperf.h,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ */ /**** module xieperf.h ****/ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -67,7 +71,7 @@ terms and conditions: Syd Logan -- AGE Logic, Inc. *****************************************************************************/ -/* $XFree86: xc/programs/xieperf/xieperf.h,v 1.4 2001/01/17 23:45:40 dawes Exp $ */ +/* $XFree86: xc/programs/xieperf/xieperf.h,v 1.5 2001/07/25 15:05:23 dawes Exp $ */ #include <stdio.h> #ifndef VMS diff --git a/programs/xieperf/xieperf.man b/programs/xieperf/xieperf.man index beecc6601..41fa00163 100644 --- a/programs/xieperf/xieperf.man +++ b/programs/xieperf/xieperf.man @@ -1,7 +1,11 @@ -.\" $Xorg: xieperf.man,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ +.\" $Xorg: xieperf.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -59,7 +63,7 @@ .\" Title to this software shall at all times remain with AGE .\" Logic, Inc. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xieperf/xieperf.man,v 1.7 2001/01/27 18:21:15 dawes Exp $ .\" .TH xieperf 1 __xorgversion__ .SH NAME diff --git a/programs/xinit/startx.man b/programs/xinit/startx.man index b3d804051..e3898de78 100644 --- a/programs/xinit/startx.man +++ b/programs/xinit/startx.man @@ -1,7 +1,11 @@ -.\" $Xorg: startx.man,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ +.\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group -.\" -.\" All Rights Reserved. +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xinit/startx.man,v 1.6 2001/01/27 18:21:16 dawes Exp $ +.\" $XFree86: xc/programs/xinit/startx.man,v 1.7 2001/04/19 15:08:32 dawes Exp $ .\" .TH STARTX 1 __xorgversion__ .SH NAME diff --git a/programs/xinit/xinit.c b/programs/xinit/xinit.c index ac63d0bb8..80f4870d0 100644 --- a/programs/xinit/xinit.c +++ b/programs/xinit/xinit.c @@ -1,10 +1,14 @@ -/* $Xorg: xinit.c,v 1.4 2000/08/17 19:54:30 cpqbld Exp $ */ +/* $Xorg: xinit.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xinit/xinit.c,v 3.29 2001/10/08 17:52:58 alanh Exp $ */ +/* $XFree86: xc/programs/xinit/xinit.c,v 3.30 2001/12/09 15:36:02 herrb Exp $ */ #include <X11/Xlib.h> #include <X11/Xos.h> diff --git a/programs/xinit/xinit.man b/programs/xinit/xinit.man index 59b8d2462..2ff692c29 100644 --- a/programs/xinit/xinit.man +++ b/programs/xinit/xinit.man @@ -1,7 +1,11 @@ -.\" $Xorg: xinit.man,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ +.\" $Xorg: xinit.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xinit/xinit.man,v 3.8 2001/01/27 18:21:16 dawes Exp $ +.\" $XFree86: xc/programs/xinit/xinit.man,v 3.9 2001/02/07 23:25:56 dawes Exp $ .\" .TH XINIT 1 __xorgversion__ .SH NAME diff --git a/programs/xkbcomp/listing.c b/programs/xkbcomp/listing.c index f9e61fdd7..a453c1957 100644 --- a/programs/xkbcomp/listing.c +++ b/programs/xkbcomp/listing.c @@ -1,4 +1,4 @@ -/* $Xorg: listing.c,v 1.4 2000/08/17 19:54:32 cpqbld Exp $ */ +/* $Xorg: listing.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */ /************************************************************ Copyright 1996 by Silicon Graphics Computer Systems, Inc. @@ -28,7 +28,11 @@ Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -66,7 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.7 2001/01/17 23:45:44 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.8 2001/07/25 15:05:24 dawes Exp $ */ #include <stdio.h> diff --git a/programs/xkbcomp/symbols/fujitsu/jp b/programs/xkbcomp/symbols/fujitsu/jp index 5fc84f7bb..bc578ae7b 100644 --- a/programs/xkbcomp/symbols/fujitsu/jp +++ b/programs/xkbcomp/symbols/fujitsu/jp @@ -1,14 +1,12 @@ -// $XConsortium: jp /main/1 1996/06/25 17:35:45 kaleb $ +// $Xorg: jp,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ // -//Copyright (c) 1996 X Consortium +//Copyright 1996, 1998 The Open Group // -//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: +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. // //The above copyright notice and this permission notice shall be //included in all copies or substantial portions of the Software. @@ -16,15 +14,15 @@ //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 +//IN NO EVENT SHALL THE 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. // -//Except as contained in this notice, the name of the X Consortium shall +//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. +//from The Open Group. // // Japanese layout for a Fujitsu 140 key keyboard diff --git a/programs/xkbcomp/symbols/fujitsu/us b/programs/xkbcomp/symbols/fujitsu/us index 12ed7caa8..e81be028d 100644 --- a/programs/xkbcomp/symbols/fujitsu/us +++ b/programs/xkbcomp/symbols/fujitsu/us @@ -1,14 +1,12 @@ -// $XConsortium: us /main/1 1996/06/25 17:35:49 kaleb $ +// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ // -//Copyright (c) 1996 X Consortium +//Copyright 1996, 1998 The Open Group // -//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: +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. // //The above copyright notice and this permission notice shall be //included in all copies or substantial portions of the Software. @@ -16,15 +14,15 @@ //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 +//IN NO EVENT SHALL THE 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. // -//Except as contained in this notice, the name of the X Consortium shall +//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. +//from The Open Group. // // US/ASCII layout for a Fujitsu 138 key keyboard xkb_symbols { diff --git a/programs/xkbcomp/symbols/hp/us b/programs/xkbcomp/symbols/hp/us index 3100b46df..18ce8aeae 100644 --- a/programs/xkbcomp/symbols/hp/us +++ b/programs/xkbcomp/symbols/hp/us @@ -1,8 +1,12 @@ -// $Xorg: us,v 1.3 2000/08/17 19:54:45 cpqbld Exp $ +// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ // //Copyright 1996, 1998 The Open Group // -//All Rights Reserved. +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. // //The above copyright notice and this permission notice shall be //included in all copies or substantial portions of the Software. diff --git a/programs/xkbcomp/symbols/sony/us b/programs/xkbcomp/symbols/sony/us index ae4bd505a..76d41053c 100644 --- a/programs/xkbcomp/symbols/sony/us +++ b/programs/xkbcomp/symbols/sony/us @@ -1,14 +1,12 @@ -// $XConsortium: us /main/1 1996/01/29 17:24:06 kaleb $ +// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ // -//Copyright (c) 1996 X Consortium +//Copyright 1996, 1998 The Open Group // -//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: +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. // //The above copyright notice and this permission notice shall be //included in all copies or substantial portions of the Software. @@ -16,15 +14,15 @@ //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 +//IN NO EVENT SHALL THE 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. // -//Except as contained in this notice, the name of the X Consortium shall +//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. +//from The Open Group. // // US/ASCII layout for a nwp5461 keyboard xkb_symbols "nwp5461" { diff --git a/programs/xkbcomp/symbols/sun/us b/programs/xkbcomp/symbols/sun/us index 83dd05e3a..7b4f55850 100644 --- a/programs/xkbcomp/symbols/sun/us +++ b/programs/xkbcomp/symbols/sun/us @@ -1,8 +1,12 @@ -// $Xorg: us,v 1.3 2000/08/17 19:54:46 cpqbld Exp $ +// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ // //Copyright 1996, 1998 The Open Group // -//All Rights Reserved. +//Permission to use, copy, modify, distribute, and sell this software and its +//documentation for any purpose is hereby granted without fee, provided that +//the above copyright notice appear in all copies and that both that +//copyright notice and this permission notice appear in supporting +//documentation. // //The above copyright notice and this permission notice shall be //included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86$ +// $XFree86: xc/programs/xkbcomp/symbols/sun/us,v 1.5 2001/10/28 03:34:36 tsi Exp $ // // US/ASCII layout for a Type 4 Sun keyboard xkb_symbols "sun4" { diff --git a/programs/xkill/xkill.c b/programs/xkill/xkill.c index c1ab0d56d..f0b335647 100644 --- a/programs/xkill/xkill.c +++ b/programs/xkill/xkill.c @@ -1,9 +1,13 @@ -/* $Xorg: xkill.c,v 1.4 2000/08/17 19:54:51 cpqbld Exp $ */ +/* $Xorg: xkill.c,v 1.5 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xkill/xkill.c,v 1.4 2001/01/17 23:46:15 dawes Exp $ */ +/* $XFree86: xc/programs/xkill/xkill.c,v 1.5 2001/04/01 14:00:22 tsi Exp $ */ /* * xkill - simple program for destroying unwanted clients diff --git a/programs/xkill/xkill.man b/programs/xkill/xkill.man index cf774e7e8..51bbd687a 100644 --- a/programs/xkill/xkill.man +++ b/programs/xkill/xkill.man @@ -1,7 +1,11 @@ -.\" $Xorg: xkill.man,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ +.\" $Xorg: xkill.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xkill/xkill.man,v 1.7 2001/01/27 18:21:17 dawes Exp $ .\" .TH XKILL 1 __xorgversion__ .SH NAME diff --git a/programs/xlogo/Logo.c b/programs/xlogo/Logo.c index 7d261930d..c6c359684 100644 --- a/programs/xlogo/Logo.c +++ b/programs/xlogo/Logo.c @@ -1,9 +1,13 @@ -/* $Xorg: Logo.c,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ */ +/* $Xorg: Logo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xlogo/Logo.c,v 1.3 1999/03/02 11:50:03 dawes Exp $ */ +/* $XFree86: xc/programs/xlogo/Logo.c,v 1.4 2001/01/17 23:46:16 dawes Exp $ */ #include <X11/StringDefs.h> #include <X11/IntrinsicP.h> diff --git a/programs/xlogo/Logo.h b/programs/xlogo/Logo.h index ead423a0c..81b98fc97 100644 --- a/programs/xlogo/Logo.h +++ b/programs/xlogo/Logo.h @@ -1,15 +1,13 @@ -/* *XConsortium: Logo.h,v 1.11 90/10/22 14:45:11 converse Exp $ */ +/* $Xorg: Logo.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* -Copyright (c) 1988, 1990 X Consortium +Copyright 1988, 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xlogo/LogoP.h b/programs/xlogo/LogoP.h index a33ab4d39..0038ee198 100644 --- a/programs/xlogo/LogoP.h +++ b/programs/xlogo/LogoP.h @@ -1,15 +1,13 @@ -/* $XConsortium: LogoP.h,v 1.11 94/04/17 20:24:09 rws Exp $ */ +/* $Xorg: LogoP.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* -Copyright (c) 1988, 1993 X Consortium +Copyright 1988, 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xlogo/xlogo.c b/programs/xlogo/xlogo.c index f4873c569..af077e4a3 100644 --- a/programs/xlogo/xlogo.c +++ b/programs/xlogo/xlogo.c @@ -1,9 +1,13 @@ /* - * $Xorg: xlogo.c,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ + * $Xorg: xlogo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.6 2001/07/23 13:15:54 dawes Exp $ */ +/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.7 2001/07/25 15:05:26 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/programs/xlogo/xlogo.man b/programs/xlogo/xlogo.man index a22601b5f..f2c5fccd3 100644 --- a/programs/xlogo/xlogo.man +++ b/programs/xlogo/xlogo.man @@ -1,7 +1,11 @@ -.\" $Xorg: xlogo.man,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ +.\" $Xorg: xlogo.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.7 2001/01/27 18:21:17 dawes Exp $ .\" .TH XLOGO 1 __xorgversion__ .SH NAME diff --git a/programs/xlsatoms/xlsatoms.c b/programs/xlsatoms/xlsatoms.c index 39bf77639..541161160 100644 --- a/programs/xlsatoms/xlsatoms.c +++ b/programs/xlsatoms/xlsatoms.c @@ -1,9 +1,13 @@ /* - * $Xorg: xlsatoms.c,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ + * $Xorg: xlsatoms.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.4 2001/01/17 23:46:17 dawes Exp $ */ +/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.5 2001/04/01 14:00:23 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xlsatoms/xlsatoms.man b/programs/xlsatoms/xlsatoms.man index 528f7ed46..3c3ebb6fe 100644 --- a/programs/xlsatoms/xlsatoms.man +++ b/programs/xlsatoms/xlsatoms.man @@ -1,7 +1,11 @@ -.\" $Xorg: xlsatoms.man,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ +.\" $Xorg: xlsatoms.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1989, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.7 2001/01/27 18:21:17 dawes Exp $ .\" .TH XLSATOMS 1 __xorgversion__ .SH NAME diff --git a/programs/xlsclients/xlscli.man b/programs/xlsclients/xlscli.man index 18fef1cdd..13e93a1ca 100644 --- a/programs/xlsclients/xlscli.man +++ b/programs/xlsclients/xlscli.man @@ -1,7 +1,11 @@ -.\" $Xorg: xlscli.man,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ +.\" $Xorg: xlscli.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1991, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xlsclients/xlscli.man,v 1.7 2001/01/27 18:21:18 dawes Exp $ .\" .TH XLSCLIENTS 1 __xorgversion__ .SH NAME diff --git a/programs/xlsclients/xlsclients.c b/programs/xlsclients/xlsclients.c index 5edf195c5..3effbf481 100644 --- a/programs/xlsclients/xlsclients.c +++ b/programs/xlsclients/xlsclients.c @@ -1,10 +1,14 @@ /* - * $Xorg: xlsclients.c,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ + * $Xorg: xlsclients.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.4 2001/01/17 23:46:17 dawes Exp $ */ +/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.5 2001/04/01 14:00:23 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xlsfonts/dsimple.c b/programs/xlsfonts/dsimple.c index 1128d844b..48ab5af67 100644 --- a/programs/xlsfonts/dsimple.c +++ b/programs/xlsfonts/dsimple.c @@ -1,9 +1,13 @@ -/* $Xorg: dsimple.c,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ */ +/* $Xorg: dsimple.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.4 2001/01/17 23:46:19 dawes Exp $ */ +/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.5 2001/07/25 15:05:26 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xlib.h> diff --git a/programs/xlsfonts/dsimple.h b/programs/xlsfonts/dsimple.h index 8c1f7e868..1fcf756cc 100644 --- a/programs/xlsfonts/dsimple.h +++ b/programs/xlsfonts/dsimple.h @@ -1,9 +1,13 @@ -/* $Xorg: dsimple.h,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ */ +/* $Xorg: dsimple.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.6 2001/07/29 21:23:21 tsi Exp $ */ /* * Just_display.h: This file contains the definitions needed to use the diff --git a/programs/xlsfonts/xlsfonts.c b/programs/xlsfonts/xlsfonts.c index a251f8b4a..cee935cf3 100644 --- a/programs/xlsfonts/xlsfonts.c +++ b/programs/xlsfonts/xlsfonts.c @@ -1,10 +1,14 @@ /* - * $Xorg: xlsfonts.c,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ + * $Xorg: xlsfonts.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ 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 Open Group. * */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.7 2001/04/27 12:58:28 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/programs/xlsfonts/xlsfonts.man b/programs/xlsfonts/xlsfonts.man index 66efa40cb..c9f4a8fcf 100644 --- a/programs/xlsfonts/xlsfonts.man +++ b/programs/xlsfonts/xlsfonts.man @@ -1,7 +1,11 @@ -.\" $Xorg: xlsfonts.man,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ +.\" $Xorg: xlsfonts.man,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xlsfonts/xlsfonts.man,v 1.7 2001/01/27 18:21:18 dawes Exp $ .\" .TH XLSFONTS 1 __xorgversion__ .SH NAME diff --git a/programs/xmag/CutPaste.c b/programs/xmag/CutPaste.c index 56f23512e..30cd7dda5 100644 --- a/programs/xmag/CutPaste.c +++ b/programs/xmag/CutPaste.c @@ -1,9 +1,13 @@ -/* $Xorg: CutPaste.c,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ */ +/* $Xorg: CutPaste.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmag/CutPaste.c,v 1.4 1999/03/21 07:35:39 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/CutPaste.c,v 1.5 2001/01/17 23:46:19 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium */ diff --git a/programs/xmag/RootWin.c b/programs/xmag/RootWin.c index 7b59bf30f..2cd5f3835 100644 --- a/programs/xmag/RootWin.c +++ b/programs/xmag/RootWin.c @@ -1,9 +1,13 @@ -/* $Xorg: RootWin.c,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ */ +/* $Xorg: RootWin.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmag/RootWin.c,v 1.3 1999/03/07 14:23:36 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/RootWin.c,v 1.4 2001/01/17 23:46:20 dawes Exp $ */ #include <X11/IntrinsicP.h> diff --git a/programs/xmag/RootWin.h b/programs/xmag/RootWin.h index 613a2b0e5..ae6179426 100644 --- a/programs/xmag/RootWin.h +++ b/programs/xmag/RootWin.h @@ -1,15 +1,13 @@ -/* $XConsortium: RootWin.h,v 1.2 94/04/17 20:24:53 dave Exp $ */ +/* $Xorg: RootWin.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* -Copyright (c) 1990 X Consortium +Copyright 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xmag/RootWinP.h b/programs/xmag/RootWinP.h index 880e6acfb..363cdd965 100644 --- a/programs/xmag/RootWinP.h +++ b/programs/xmag/RootWinP.h @@ -1,15 +1,13 @@ -/* $XConsortium: RootWinP.h,v 1.3 94/04/17 20:24:55 rws Exp $ */ +/* $Xorg: RootWinP.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* -Copyright (c) 1990 X Consortium +Copyright 1990, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xmag/Scale.c b/programs/xmag/Scale.c index 5244b7bcc..203d2fd56 100644 --- a/programs/xmag/Scale.c +++ b/programs/xmag/Scale.c @@ -1,9 +1,13 @@ -/* $Xorg: Scale.c,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ */ +/* $Xorg: Scale.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmag/Scale.c,v 3.7 2001/01/17 23:46:20 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/Scale.c,v 3.8 2001/07/25 15:05:26 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium diff --git a/programs/xmag/Scale.h b/programs/xmag/Scale.h index 811ebd32c..2542886fc 100644 --- a/programs/xmag/Scale.h +++ b/programs/xmag/Scale.h @@ -1,9 +1,13 @@ -/* $Xorg: Scale.h,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ */ +/* $Xorg: Scale.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmag/Scale.h,v 1.3 1999/03/07 14:23:36 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/Scale.h,v 1.4 2001/01/17 23:46:20 dawes Exp $ */ #ifndef _XawScale_h #define _XawScale_h diff --git a/programs/xmag/ScaleP.h b/programs/xmag/ScaleP.h index 4f3c42f54..181ae464d 100644 --- a/programs/xmag/ScaleP.h +++ b/programs/xmag/ScaleP.h @@ -1,15 +1,13 @@ -/* $XConsortium: ScaleP.h,v 1.3 94/04/17 20:25:00 dave Exp $ */ +/* $Xorg: ScaleP.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xmag/xmag.c b/programs/xmag/xmag.c index 94716f50e..5920f8b7c 100644 --- a/programs/xmag/xmag.c +++ b/programs/xmag/xmag.c @@ -1,9 +1,13 @@ -/* $Xorg: xmag.c,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ */ +/* $Xorg: xmag.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmag/xmag.c,v 1.8 2001/01/17 23:46:20 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/xmag.c,v 1.9 2001/07/25 15:05:27 dawes Exp $ */ #include <stdlib.h> /* for exit() and abs() */ diff --git a/programs/xmag/xmag.man b/programs/xmag/xmag.man index aaf00c74c..b001df7dc 100644 --- a/programs/xmag/xmag.man +++ b/programs/xmag/xmag.man @@ -1,7 +1,11 @@ -.\" $Xorg: xmag.man,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ +.\" $Xorg: xmag.man,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ .\" Copyright 1991, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xmag/xmag.man,v 1.6 2001/01/27 18:21:18 dawes Exp $ .\" .TH XMAG 1 __xorgversion__ .SH NAME diff --git a/programs/xmodmap/exec.c b/programs/xmodmap/exec.c index fe903ef22..a89f818e6 100644 --- a/programs/xmodmap/exec.c +++ b/programs/xmodmap/exec.c @@ -1,9 +1,13 @@ -/* $Xorg: exec.c,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ */ +/* $Xorg: exec.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -52,7 +56,7 @@ from The Open Group. * Author: Jim Fulton, MIT X Consortium; derived from parts of the * original xmodmap, written by David Rosenthal, of Sun Microsystems. */ -/* $XFree86: xc/programs/xmodmap/exec.c,v 1.3 1999/03/07 14:23:37 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/exec.c,v 1.4 2001/01/17 23:46:20 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xlib.h> diff --git a/programs/xmodmap/handle.c b/programs/xmodmap/handle.c index cbd4ebc51..09f40cb26 100644 --- a/programs/xmodmap/handle.c +++ b/programs/xmodmap/handle.c @@ -1,9 +1,13 @@ -/* $Xorg: handle.c,v 1.5 2000/08/17 19:54:54 cpqbld Exp $ */ +/* $Xorg: handle.c,v 1.6 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/handle.c,v 3.5 2001/04/23 21:41:47 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/handle.c,v 3.6 2001/07/25 15:05:27 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xlib.h> diff --git a/programs/xmodmap/pf.c b/programs/xmodmap/pf.c index 684b725d9..2cacbdc61 100644 --- a/programs/xmodmap/pf.c +++ b/programs/xmodmap/pf.c @@ -1,15 +1,13 @@ -/* $XConsortium: pf.c,v 1.5 94/04/17 20:24:21 rws Exp $ */ +/* $Xorg: pf.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ diff --git a/programs/xmodmap/wq.h b/programs/xmodmap/wq.h index 2ad614b28..3aab10fbf 100644 --- a/programs/xmodmap/wq.h +++ b/programs/xmodmap/wq.h @@ -1,9 +1,13 @@ -/* $Xorg: wq.h,v 1.3 2000/08/17 19:54:55 cpqbld Exp $ */ +/* $Xorg: wq.h,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/wq.h,v 1.3 1999/03/07 14:23:37 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/wq.h,v 1.4 2001/01/17 23:46:21 dawes Exp $ */ #ifndef _WQ_H #define _WQ_H diff --git a/programs/xmodmap/xmodmap.c b/programs/xmodmap/xmodmap.c index 2e0940f8a..ce7bffabf 100644 --- a/programs/xmodmap/xmodmap.c +++ b/programs/xmodmap/xmodmap.c @@ -1,9 +1,13 @@ -/* $Xorg: xmodmap.c,v 1.3 2000/08/17 19:54:55 cpqbld Exp $ */ +/* $Xorg: xmodmap.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.5 2001/01/17 23:46:21 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.6 2001/04/01 14:00:23 tsi Exp $ */ #include <X11/Xos.h> #include <X11/Xlib.h> diff --git a/programs/xmodmap/xmodmap.h b/programs/xmodmap/xmodmap.h index ce1f7e80c..0d2f7797c 100644 --- a/programs/xmodmap/xmodmap.h +++ b/programs/xmodmap/xmodmap.h @@ -1,9 +1,13 @@ -/* $Xorg: xmodmap.h,v 1.3 2000/08/17 19:54:55 cpqbld Exp $ */ +/* $Xorg: xmodmap.h,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.3 1999/03/07 14:23:38 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.4 2001/01/17 23:46:21 dawes Exp $ */ extern char *ProgramName; extern Display *dpy; diff --git a/programs/xmodmap/xmodmap.man b/programs/xmodmap/xmodmap.man index 0ada655ea..69c1e252f 100644 --- a/programs/xmodmap/xmodmap.man +++ b/programs/xmodmap/xmodmap.man @@ -1,8 +1,12 @@ -.\" $Xorg: xmodmap.man,v 1.3 2000/08/17 19:54:55 cpqbld Exp $ +.\" $Xorg: xmodmap.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1989, 1990, 1998 The Open Group .\" Copyright 1987 Sun Microsystems, Inc. .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.8 2001/01/24 00:06:48 dawes Exp $ +.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.9 2001/01/27 18:21:21 dawes Exp $ .\" .de EX \"Begin example .ne 5 diff --git a/programs/xprop/xprop.c b/programs/xprop/xprop.c index eb5493d6f..ad081436d 100644 --- a/programs/xprop/xprop.c +++ b/programs/xprop/xprop.c @@ -1,11 +1,15 @@ -/* $Xorg: xprop.c,v 1.5 2000/08/17 19:54:55 cpqbld Exp $ */ +/* $Xorg: xprop.c,v 1.6 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group Copyright (c) 2000 The XFree86 Project, Inc. -All Rights Reserved. - +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xprop/xprop.c,v 1.9 2001/01/22 21:09:46 dawes Exp $ */ +/* $XFree86: xc/programs/xprop/xprop.c,v 1.10 2001/01/23 20:22:19 dawes Exp $ */ #include <X11/Xlib.h> diff --git a/programs/xprop/xprop.man b/programs/xprop/xprop.man index ea1dfe9ef..f3d943bbc 100644 --- a/programs/xprop/xprop.man +++ b/programs/xprop/xprop.man @@ -1,8 +1,12 @@ -.\" $Xorg: xprop.man,v 1.3 2000/08/17 19:54:55 cpqbld Exp $ +.\" $Xorg: xprop.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" Copyright \(co 2000 The XFree86 Project, Inc. .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xprop/xprop.man,v 1.8 2001/01/27 18:21:21 dawes Exp $ .\" .TH XPROP 1 __vendorversion__ .SH NAME diff --git a/programs/xrdb/xrdb.man b/programs/xrdb/xrdb.man index f1385ca25..f3d6ceb2f 100644 --- a/programs/xrdb/xrdb.man +++ b/programs/xrdb/xrdb.man @@ -1,8 +1,12 @@ -.\" $Xorg: xrdb.man,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ +.\" $Xorg: xrdb.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1991, Digital Equipment Corporation. .\" Copyright 1991, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xrdb/xrdb.man,v 1.7 2001/01/27 18:21:22 dawes Exp $ .\" .TH XRDB 1 __xorgversion__ .SH NAME diff --git a/programs/xrefresh/xrefresh.c b/programs/xrefresh/xrefresh.c index b21e4d052..ae8b7c356 100644 --- a/programs/xrefresh/xrefresh.c +++ b/programs/xrefresh/xrefresh.c @@ -2,7 +2,11 @@ Copyright 1987, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -42,12 +46,12 @@ SOFTWARE. ******************************************************************/ /* - * $Xorg: xrefresh.c,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ + * $Xorg: xrefresh.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ * * Kitchen sink version, useful for clearing small areas and flashing the * screen. */ -/* $XFree86: xc/programs/xrefresh/xrefresh.c,v 3.4 2001/01/17 23:46:22 dawes Exp $ */ +/* $XFree86: xc/programs/xrefresh/xrefresh.c,v 3.5 2001/07/25 15:05:28 dawes Exp $ */ #include <stdio.h> #include <errno.h> diff --git a/programs/xrefresh/xrefresh.man b/programs/xrefresh/xrefresh.man index 6b19bb30c..4030c1e2e 100644 --- a/programs/xrefresh/xrefresh.man +++ b/programs/xrefresh/xrefresh.man @@ -1,7 +1,11 @@ -.\" $Xorg: xrefresh.man,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ +.\" $Xorg: xrefresh.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xrefresh/xrefresh.man,v 1.7 2001/01/27 18:21:22 dawes Exp $ .\" .TH XREFRESH 1 __xorgversion__ .SH NAME diff --git a/programs/xrx/helper/GetUrl.c b/programs/xrx/helper/GetUrl.c index 393a5032a..8d6d83dda 100644 --- a/programs/xrx/helper/GetUrl.c +++ b/programs/xrx/helper/GetUrl.c @@ -1,9 +1,13 @@ -/* $Xorg: GetUrl.c,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ */ +/* $Xorg: GetUrl.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xrx/helper/GetUrl.c,v 1.3 2001/07/29 21:23:21 tsi Exp $ */ /* * This file is really split into two major parts where GetUrl is implemented diff --git a/programs/xrx/helper/GetUrl.h b/programs/xrx/helper/GetUrl.h index a1969e73d..cb80b9ca4 100644 --- a/programs/xrx/helper/GetUrl.h +++ b/programs/xrx/helper/GetUrl.h @@ -1,15 +1,13 @@ -/* $XConsortium: GetUrl.h /main/1 1996/08/14 11:45:11 lehors $ */ +/* $Xorg: GetUrl.h,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/helper/helper.c b/programs/xrx/helper/helper.c index 7347a8aaf..9842623f6 100644 --- a/programs/xrx/helper/helper.c +++ b/programs/xrx/helper/helper.c @@ -1,9 +1,13 @@ -/* $Xorg: helper.c,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ */ +/* $Xorg: helper.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/helper/httptran.c b/programs/xrx/helper/httptran.c index 21ddaa50b..a5c943d16 100644 --- a/programs/xrx/helper/httptran.c +++ b/programs/xrx/helper/httptran.c @@ -1,9 +1,13 @@ -/* $Xorg: httptran.c,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ */ +/* $Xorg: httptran.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/helper/httptran.c,v 1.4 2001/01/17 23:46:23 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/helper/httptran.c,v 1.5 2001/07/25 15:05:28 dawes Exp $ */ #if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _HttpTrans##func diff --git a/programs/xrx/helper/xrx.man b/programs/xrx/helper/xrx.man index 6cd6b8e34..f78fce991 100644 --- a/programs/xrx/helper/xrx.man +++ b/programs/xrx/helper/xrx.man @@ -1,7 +1,11 @@ -.\" $Xorg: xrx.man,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +.\" $Xorg: xrx.man,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xrx/helper/xrx.man,v 1.6 2001/01/27 18:21:22 dawes Exp $ .\" .TH XRX 1 __xorgversion__ .SH NAME diff --git a/programs/xrx/plugin/Global.c b/programs/xrx/plugin/Global.c index 592f2e98f..3372f4877 100644 --- a/programs/xrx/plugin/Global.c +++ b/programs/xrx/plugin/Global.c @@ -1,15 +1,13 @@ -/* $XConsortium: Global.c /main/7 1996/12/07 17:05:40 kaleb $ */ +/* $Xorg: Global.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/plugin/Main.c b/programs/xrx/plugin/Main.c index ae58b3f20..b61f1bcaa 100644 --- a/programs/xrx/plugin/Main.c +++ b/programs/xrx/plugin/Main.c @@ -1,9 +1,13 @@ -/* $Xorg: Main.c,v 1.4 2000/08/17 19:54:59 cpqbld Exp $ */ +/* $Xorg: Main.c,v 1.5 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.7 2001/10/28 03:34:41 tsi Exp $ */ /* * RX plug-in module based on the UnixTemplate file provided by Netcape. diff --git a/programs/xrx/plugin/NewNDest.c b/programs/xrx/plugin/NewNDest.c index c298d3637..bee8bf358 100644 --- a/programs/xrx/plugin/NewNDest.c +++ b/programs/xrx/plugin/NewNDest.c @@ -1,9 +1,13 @@ -/* $Xorg: NewNDest.c,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ */ +/* $Xorg: NewNDest.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/plugin/PProcess.c b/programs/xrx/plugin/PProcess.c index 4b65fbcbb..c2424e204 100644 --- a/programs/xrx/plugin/PProcess.c +++ b/programs/xrx/plugin/PProcess.c @@ -1,9 +1,13 @@ -/* $Xorg: PProcess.c,v 1.5 2000/08/17 19:54:59 cpqbld Exp $ */ +/* $Xorg: PProcess.c,v 1.6 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.5 2001/10/28 03:34:42 tsi Exp $ */ #include "RxPlugin.h" #include "XUrls.h" diff --git a/programs/xrx/plugin/RxPlugin.h b/programs/xrx/plugin/RxPlugin.h index 049d678ea..9b977890f 100644 --- a/programs/xrx/plugin/RxPlugin.h +++ b/programs/xrx/plugin/RxPlugin.h @@ -1,9 +1,13 @@ -/* $Xorg: RxPlugin.h,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ */ +/* $Xorg: RxPlugin.h,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/plugin/SetWin.c b/programs/xrx/plugin/SetWin.c index e8eacce95..3e60f75dd 100644 --- a/programs/xrx/plugin/SetWin.c +++ b/programs/xrx/plugin/SetWin.c @@ -1,9 +1,13 @@ -/* $Xorg: SetWin.c,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ */ +/* $Xorg: SetWin.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/plugin/libxrx.man b/programs/xrx/plugin/libxrx.man index dcf21d4df..4e8cf2acc 100644 --- a/programs/xrx/plugin/libxrx.man +++ b/programs/xrx/plugin/libxrx.man @@ -1,7 +1,11 @@ -.\" $Xorg: libxrx.man,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ +.\" $Xorg: libxrx.man,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -20,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.7 2001/01/27 18:21:22 dawes Exp $ .\" .TH LIBXRX 1 __xorgversion__ .SH NAME diff --git a/programs/xrx/rx/BuildReq.c b/programs/xrx/rx/BuildReq.c index 4d590c862..50ba6b5fe 100644 --- a/programs/xrx/rx/BuildReq.c +++ b/programs/xrx/rx/BuildReq.c @@ -1,15 +1,13 @@ -/* $XConsortium: BuildReq.c /main/4 1996/11/26 10:20:39 lehors $ */ +/* $Xorg: BuildReq.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/PParse.c b/programs/xrx/rx/PParse.c index fbd0b498c..07e360bc4 100644 --- a/programs/xrx/rx/PParse.c +++ b/programs/xrx/rx/PParse.c @@ -1,15 +1,13 @@ -/* $XConsortium: PParse.c /main/5 1996/12/12 15:55:51 lehors $ */ +/* $Xorg: PParse.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/PRead.c b/programs/xrx/rx/PRead.c index ccaf4424a..ce09217aa 100644 --- a/programs/xrx/rx/PRead.c +++ b/programs/xrx/rx/PRead.c @@ -1,15 +1,13 @@ -/* $XConsortium: PRead.c /main/4 1996/11/26 10:15:27 lehors $ */ +/* $Xorg: PRead.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/Prefs.c b/programs/xrx/rx/Prefs.c index 2cc876b6b..55389a4d7 100644 --- a/programs/xrx/rx/Prefs.c +++ b/programs/xrx/rx/Prefs.c @@ -1,9 +1,13 @@ -/* $Xorg: Prefs.c,v 1.4 2000/08/17 19:55:02 cpqbld Exp $ */ +/* $Xorg: Prefs.c,v 1.5 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xrx/rx/Prefs.c,v 1.4 1998/10/04 09:41:53 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/rx/Prefs.c,v 1.5 2001/01/17 23:46:25 dawes Exp $ */ #include "Prefs.h" #include <ctype.h> diff --git a/programs/xrx/rx/Prefs.h b/programs/xrx/rx/Prefs.h index 9fa060ee6..6c7462def 100644 --- a/programs/xrx/rx/Prefs.h +++ b/programs/xrx/rx/Prefs.h @@ -1,15 +1,13 @@ -/* $XConsortium: Prefs.h /main/2 1996/11/27 14:27:04 lehors $ */ +/* $Xorg: Prefs.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/Rx.h b/programs/xrx/rx/Rx.h index f0b162396..2260d489d 100644 --- a/programs/xrx/rx/Rx.h +++ b/programs/xrx/rx/Rx.h @@ -1,15 +1,13 @@ -/* $XConsortium: Rx.h /main/4 1996/09/25 20:23:54 lehors $ */ +/* $Xorg: Rx.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/RxI.h b/programs/xrx/rx/RxI.h index b314b0f87..d652c1443 100644 --- a/programs/xrx/rx/RxI.h +++ b/programs/xrx/rx/RxI.h @@ -1,15 +1,13 @@ -/* $XConsortium: RxI.h /main/7 1996/12/12 15:55:35 lehors $ */ +/* $Xorg: RxI.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/XAuth.c b/programs/xrx/rx/XAuth.c index 3e357a360..89e904bec 100644 --- a/programs/xrx/rx/XAuth.c +++ b/programs/xrx/rx/XAuth.c @@ -1,15 +1,13 @@ -/* $XConsortium: XAuth.c /main/10 1996/11/29 20:43:59 lehors $ */ +/* $Xorg: XAuth.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,22 +15,27 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ #include "RxI.h" +#ifdef XFUNCPROTO_NOT_AVAILABLE +#include <X11/Xfuncproto.h> +#endif #include <X11/Xlib.h> #include <X11/extensions/security.h> +#ifndef XFUNCPROTO_NOT_AVAILABLE #include <X11/Xauth.h> +#endif static void printhexdigit(char *ptr, unsigned int d) diff --git a/programs/xrx/rx/XAuth.h b/programs/xrx/rx/XAuth.h index 25453d8bf..f7c6624a2 100644 --- a/programs/xrx/rx/XAuth.h +++ b/programs/xrx/rx/XAuth.h @@ -1,15 +1,13 @@ -/* $XConsortium: XAuth.h /main/4 1996/11/29 20:44:03 lehors $ */ +/* $Xorg: XAuth.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/XDpyName.c b/programs/xrx/rx/XDpyName.c index 4289fddda..0a5c006f0 100644 --- a/programs/xrx/rx/XDpyName.c +++ b/programs/xrx/rx/XDpyName.c @@ -1,9 +1,13 @@ -/* $Xorg: XDpyName.c,v 1.4 2000/08/17 19:55:02 cpqbld Exp $ */ +/* $Xorg: XDpyName.c,v 1.5 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/rx/XDpyName.h b/programs/xrx/rx/XDpyName.h index c3bd3b044..93f4b1278 100644 --- a/programs/xrx/rx/XDpyName.h +++ b/programs/xrx/rx/XDpyName.h @@ -1,15 +1,13 @@ -/* $XConsortium: XDpyName.h /main/3 1996/11/25 18:01:01 lehors $ */ +/* $Xorg: XDpyName.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xrx/rx/XUrls.c b/programs/xrx/rx/XUrls.c index 155e9149e..b1d4cd102 100644 --- a/programs/xrx/rx/XUrls.c +++ b/programs/xrx/rx/XUrls.c @@ -1,9 +1,13 @@ -/* $Xorg: XUrls.c,v 1.3 2000/08/17 19:55:02 cpqbld Exp $ */ +/* $Xorg: XUrls.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.9 2001/08/01 00:45:07 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.10 2001/10/28 03:34:42 tsi Exp $ */ #include "RxI.h" #include "XUrls.h" diff --git a/programs/xrx/rx/XUrls.h b/programs/xrx/rx/XUrls.h index e7b74afcf..9c54e7714 100644 --- a/programs/xrx/rx/XUrls.h +++ b/programs/xrx/rx/XUrls.h @@ -1,9 +1,13 @@ -/* $Xorg: XUrls.h,v 1.3 2000/08/17 19:55:02 cpqbld Exp $ */ +/* $Xorg: XUrls.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/testplugin/testplugin.c b/programs/xrx/testplugin/testplugin.c index d8607f7da..7132be458 100644 --- a/programs/xrx/testplugin/testplugin.c +++ b/programs/xrx/testplugin/testplugin.c @@ -1,15 +1,13 @@ -/* $XConsortium: testplugin.c /main/6 1996/11/22 19:15:54 lehors $ */ +/* $Xorg: testplugin.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ /* diff --git a/programs/xrx/testplugin/testplugin.man b/programs/xrx/testplugin/testplugin.man index 71acd46a5..8f431e56b 100644 --- a/programs/xrx/testplugin/testplugin.man +++ b/programs/xrx/testplugin/testplugin.man @@ -1,7 +1,11 @@ -.\" $Xorg: testplugin.man,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ +.\" $Xorg: testplugin.man,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xrx/testplugin/testplugin.man,v 1.6 2001/01/27 18:21:22 dawes Exp $ .\" .TH TESTPLUGIN 1 __xorgversion__ .SH NAME diff --git a/programs/xrx/xnest-plugin/NewNDest.c b/programs/xrx/xnest-plugin/NewNDest.c index 4460540f6..52b038c9f 100644 --- a/programs/xrx/xnest-plugin/NewNDest.c +++ b/programs/xrx/xnest-plugin/NewNDest.c @@ -1,9 +1,13 @@ -/* $Xorg: NewNDest.c,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ */ +/* $Xorg: NewNDest.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/xnest-plugin/PProcess.c b/programs/xrx/xnest-plugin/PProcess.c index 4f4852b3b..b90ae6cfb 100644 --- a/programs/xrx/xnest-plugin/PProcess.c +++ b/programs/xrx/xnest-plugin/PProcess.c @@ -1,9 +1,13 @@ -/* $Xorg: PProcess.c,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ */ +/* $Xorg: PProcess.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/xnest-plugin/RxPlugin.h b/programs/xrx/xnest-plugin/RxPlugin.h index cde84b6cd..ce7c4201b 100644 --- a/programs/xrx/xnest-plugin/RxPlugin.h +++ b/programs/xrx/xnest-plugin/RxPlugin.h @@ -1,9 +1,13 @@ -/* $Xorg: RxPlugin.h,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ */ +/* $Xorg: RxPlugin.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/xnest-plugin/SetWin.c b/programs/xrx/xnest-plugin/SetWin.c index 5adc03571..33e80a6f7 100644 --- a/programs/xrx/xnest-plugin/SetWin.c +++ b/programs/xrx/xnest-plugin/SetWin.c @@ -1,9 +1,13 @@ -/* $Xorg: SetWin.c,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ */ +/* $Xorg: SetWin.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xrx/xnest-plugin/XnestDis.c b/programs/xrx/xnest-plugin/XnestDis.c index 77f1fa40e..10dddf0ab 100644 --- a/programs/xrx/xnest-plugin/XnestDis.c +++ b/programs/xrx/xnest-plugin/XnestDis.c @@ -1,15 +1,13 @@ -/* $XConsortium: XnestDis.c /main/1 1996/08/14 14:40:45 lehors $ */ +/* $Xorg: XnestDis.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* -Copyright (C) 1996 X Consortium +Copyright 1996, 1998 The Open Group -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Soft- -ware"), 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 condi- -tions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -17,15 +15,15 @@ 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 MERCHANTABIL- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- ITY, 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 +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. +The Open Group. */ diff --git a/programs/xset/xset.c b/programs/xset/xset.c index a46c988a0..0f1777b95 100644 --- a/programs/xset/xset.c +++ b/programs/xset/xset.c @@ -1,12 +1,16 @@ /* - * $Xorg: xset.c,v 1.5 2000/08/17 19:55:03 cpqbld Exp $ + * $Xorg: xset.c,v 1.6 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xset/xset.c,v 3.23 2001/08/01 00:45:07 tsi Exp $ */ +/* $XFree86: xc/programs/xset/xset.c,v 3.24 2001/08/29 11:09:43 alanh Exp $ */ /* Modified by Stephen so keyboard rate is set using XKB extensions */ #include <stdio.h> diff --git a/programs/xset/xset.man b/programs/xset/xset.man index 5b81e7826..09b637c48 100644 --- a/programs/xset/xset.man +++ b/programs/xset/xset.man @@ -1,7 +1,11 @@ -.\" $Xorg: xset.man,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ +.\" $Xorg: xset.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xset/xset.man,v 3.12 2001/01/24 00:06:49 dawes Exp $ +.\" $XFree86: xc/programs/xset/xset.man,v 3.13 2001/01/27 18:21:23 dawes Exp $ .\" .TH XSET 1 __xorgversion__ .SH NAME diff --git a/programs/xsetroot/xsetroot.c b/programs/xsetroot/xsetroot.c index b62ba3442..c49d7242b 100644 --- a/programs/xsetroot/xsetroot.c +++ b/programs/xsetroot/xsetroot.c @@ -1,9 +1,13 @@ /* - * $Xorg: xsetroot.c,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ + * $Xorg: xsetroot.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ * Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -28,7 +32,7 @@ in this Software without prior written authorization from The Open Group. * Author: Mark Lillibridge, MIT Project Athena * 11-Jun-87 */ -/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.6 2001/01/17 23:46:27 dawes Exp $ */ +/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.7 2001/04/01 14:00:24 tsi Exp $ */ #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/programs/xsetroot/xsetroot.man b/programs/xsetroot/xsetroot.man index 23c67f820..14678695d 100644 --- a/programs/xsetroot/xsetroot.man +++ b/programs/xsetroot/xsetroot.man @@ -1,7 +1,11 @@ -.\" $Xorg: xsetroot.man,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ +.\" $Xorg: xsetroot.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.7 2001/01/27 18:21:23 dawes Exp $ .\" .TH XSETROOT 1 __xorgversion__ .SH NAME diff --git a/programs/xsm/auth.c b/programs/xsm/auth.c index c504fdbe2..67f0eca33 100644 --- a/programs/xsm/auth.c +++ b/programs/xsm/auth.c @@ -1,9 +1,13 @@ -/* $Xorg: auth.c,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ */ +/* $Xorg: auth.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/auth.c,v 1.5 1999/03/07 14:23:38 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/auth.c,v 1.6 2001/01/17 23:46:28 dawes Exp $ */ #include "xsm.h" diff --git a/programs/xsm/auth.h b/programs/xsm/auth.h index bc7d5244a..9e8cec6cd 100644 --- a/programs/xsm/auth.h +++ b/programs/xsm/auth.h @@ -1,9 +1,13 @@ -/* $Xorg: auth.h,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ */ +/* $Xorg: auth.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/auth.h,v 1.4 2001/01/17 23:46:28 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/auth.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _AUTH_H_ #define _AUTH_H_ diff --git a/programs/xsm/choose.c b/programs/xsm/choose.c index 21d16d7bc..66b2e0d5e 100644 --- a/programs/xsm/choose.c +++ b/programs/xsm/choose.c @@ -1,9 +1,13 @@ -/* $Xorg: choose.c,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ */ +/* $Xorg: choose.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/choose.c,v 1.3 1999/03/07 14:23:39 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/choose.c,v 1.4 2001/01/17 23:46:28 dawes Exp $ */ #include "xsm.h" #include "saveutil.h" diff --git a/programs/xsm/choose.h b/programs/xsm/choose.h index f97737c99..520633862 100644 --- a/programs/xsm/choose.h +++ b/programs/xsm/choose.h @@ -1,9 +1,13 @@ -/* $Xorg: choose.h,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ */ +/* $Xorg: choose.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/choose.h,v 1.4 2001/01/17 23:46:28 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/choose.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _CHOOSE_H_ #define _CHOOSE_H_ diff --git a/programs/xsm/globals.c b/programs/xsm/globals.c index a33c77c4f..2d917d908 100644 --- a/programs/xsm/globals.c +++ b/programs/xsm/globals.c @@ -1,9 +1,13 @@ -/* $Xorg: globals.c,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ */ +/* $Xorg: globals.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/globals.c,v 1.4 2001/01/17 23:46:28 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/globals.c,v 1.5 2001/12/08 18:33:45 herrb Exp $ */ #include <X11/ICE/ICEutil.h> diff --git a/programs/xsm/info.c b/programs/xsm/info.c index f5be62982..f6e0b7434 100644 --- a/programs/xsm/info.c +++ b/programs/xsm/info.c @@ -1,9 +1,13 @@ -/* $Xorg: info.c,v 1.4 2000/08/17 19:55:04 cpqbld Exp $ */ +/* $Xorg: info.c,v 1.5 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/info.c,v 1.4 1999/03/07 11:41:22 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/info.c,v 1.5 2001/01/17 23:46:28 dawes Exp $ */ #include "xsm.h" #include "restart.h" diff --git a/programs/xsm/info.h b/programs/xsm/info.h index 560e240c9..c07f40445 100644 --- a/programs/xsm/info.h +++ b/programs/xsm/info.h @@ -1,9 +1,13 @@ -/* $Xorg: info.h,v 1.3 2000/08/17 19:55:05 cpqbld Exp $ */ +/* $Xorg: info.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/info.h,v 3.3 2001/01/17 23:46:28 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/info.h,v 3.4 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _INFO_H_ #define _INFO_H_ diff --git a/programs/xsm/list.c b/programs/xsm/list.c index 43819a6d9..25d2647ca 100644 --- a/programs/xsm/list.c +++ b/programs/xsm/list.c @@ -1,14 +1,13 @@ -/* $XConsortium: list.c,v 1.7 94/12/16 17:27:27 mor Exp $ */ +/* $Xorg: list.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. ******************************************************************************/ #include "xsm.h" diff --git a/programs/xsm/list.h b/programs/xsm/list.h index c18c57dc5..704a57cc3 100644 --- a/programs/xsm/list.h +++ b/programs/xsm/list.h @@ -1,9 +1,13 @@ -/* $Xorg: list.h,v 1.3 2000/08/17 19:55:05 cpqbld Exp $ */ +/* $Xorg: list.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/list.h,v 1.4 2001/01/17 23:46:29 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/list.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _LIST_H_ #define _LIST_H_ diff --git a/programs/xsm/lock.c b/programs/xsm/lock.c index ac70feedf..c9c5abae0 100644 --- a/programs/xsm/lock.c +++ b/programs/xsm/lock.c @@ -1,9 +1,13 @@ -/* $Xorg: lock.c,v 1.3 2000/08/17 19:55:05 cpqbld Exp $ */ +/* $Xorg: lock.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/lock.c,v 3.2 1999/03/07 11:41:23 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/lock.c,v 3.3 2001/01/17 23:46:29 dawes Exp $ */ #include "xsm.h" #include "lock.h" diff --git a/programs/xsm/lock.h b/programs/xsm/lock.h index d5d163eb0..19805ef5f 100644 --- a/programs/xsm/lock.h +++ b/programs/xsm/lock.h @@ -1,9 +1,13 @@ -/* $Xorg: lock.h,v 1.3 2000/08/17 19:55:05 cpqbld Exp $ */ +/* $Xorg: lock.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/lock.h,v 1.4 2001/01/17 23:46:29 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/lock.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _LOCK_H_ #define _LOCK_H_ diff --git a/programs/xsm/log.c b/programs/xsm/log.c index d5875fb52..179f55f91 100644 --- a/programs/xsm/log.c +++ b/programs/xsm/log.c @@ -1,9 +1,13 @@ -/* $Xorg: log.c,v 1.3 2000/08/17 19:55:05 cpqbld Exp $ */ +/* $Xorg: log.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/log.c,v 1.3 1999/03/07 14:23:40 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/log.c,v 1.4 2001/01/17 23:46:29 dawes Exp $ */ #include "xsm.h" #include "save.h" diff --git a/programs/xsm/log.h b/programs/xsm/log.h index eafefdcca..d1f68f96e 100644 --- a/programs/xsm/log.h +++ b/programs/xsm/log.h @@ -1,9 +1,13 @@ -/* $Xorg: log.h,v 1.3 2000/08/17 19:55:05 cpqbld Exp $ */ +/* $Xorg: log.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/log.h,v 1.4 2001/01/17 23:46:29 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/log.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _LOG_H_ #define _LOG_H_ diff --git a/programs/xsm/mainwin.c b/programs/xsm/mainwin.c index 4d459ee46..ef7a96d33 100644 --- a/programs/xsm/mainwin.c +++ b/programs/xsm/mainwin.c @@ -1,9 +1,13 @@ -/* $Xorg: mainwin.c,v 1.3 2000/08/17 19:55:05 cpqbld Exp $ */ +/* $Xorg: mainwin.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/mainwin.c,v 1.3 1999/03/07 14:23:41 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/mainwin.c,v 1.4 2001/01/17 23:46:29 dawes Exp $ */ #include "xsm.h" #include "info.h" diff --git a/programs/xsm/mainwin.h b/programs/xsm/mainwin.h index 8d4473976..361316245 100644 --- a/programs/xsm/mainwin.h +++ b/programs/xsm/mainwin.h @@ -1,9 +1,13 @@ -/* $Xorg: mainwin.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: mainwin.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/mainwin.h,v 1.4 2001/01/17 23:46:29 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/mainwin.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _MAINWIN_H_ #define _MAINWIN_H_ diff --git a/programs/xsm/misc.c b/programs/xsm/misc.c index c635b1177..73649cfe4 100644 --- a/programs/xsm/misc.c +++ b/programs/xsm/misc.c @@ -1,9 +1,13 @@ -/* $Xorg: misc.c,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: misc.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/misc.c,v 1.4 2001/01/17 23:46:29 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/misc.c,v 1.5 2001/07/25 15:05:29 dawes Exp $ */ #include "xsm.h" diff --git a/programs/xsm/popup.c b/programs/xsm/popup.c index 4adaa5446..e03ac8804 100644 --- a/programs/xsm/popup.c +++ b/programs/xsm/popup.c @@ -1,10 +1,14 @@ -/* $Xorg: popup.c,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: popup.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xsm/popup.c,v 1.3 1999/03/07 14:23:41 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/popup.c,v 1.4 2001/01/17 23:46:30 dawes Exp $ */ #include "xsm.h" #include <X11/Shell.h> diff --git a/programs/xsm/popup.h b/programs/xsm/popup.h index e9a840140..5bb8181a8 100644 --- a/programs/xsm/popup.h +++ b/programs/xsm/popup.h @@ -1,10 +1,14 @@ -/* $Xorg: popup.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: popup.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xsm/popup.h,v 1.4 2001/01/17 23:46:30 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/popup.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _POPUP_H_ #define _POPUP_H_ diff --git a/programs/xsm/printhex.c b/programs/xsm/printhex.c index d3553feaf..b411f9ead 100644 --- a/programs/xsm/printhex.c +++ b/programs/xsm/printhex.c @@ -1,14 +1,13 @@ -/* $XConsortium: printhex.c,v 1.2 94/04/17 21:15:17 mor Exp $ */ +/* $Xorg: printhex.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** -Copyright (c) 1993 X Consortium +Copyright 1993, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. ******************************************************************************/ #include <stdio.h> diff --git a/programs/xsm/prop.c b/programs/xsm/prop.c index d61584076..5a84e86cc 100644 --- a/programs/xsm/prop.c +++ b/programs/xsm/prop.c @@ -1,9 +1,13 @@ -/* $Xorg: prop.c,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: prop.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/prop.c,v 1.3 1999/03/07 14:23:42 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/prop.c,v 1.4 2001/01/17 23:46:30 dawes Exp $ */ #include "xsm.h" #include "info.h" diff --git a/programs/xsm/prop.h b/programs/xsm/prop.h index 431575003..6bddc01f5 100644 --- a/programs/xsm/prop.h +++ b/programs/xsm/prop.h @@ -1,9 +1,13 @@ -/* $Xorg: prop.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: prop.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/prop.h,v 1.4 2001/01/17 23:46:30 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/prop.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _PROP_H_ #define _PROP_H_ diff --git a/programs/xsm/remote.c b/programs/xsm/remote.c index 55e0638fd..f161f96f2 100644 --- a/programs/xsm/remote.c +++ b/programs/xsm/remote.c @@ -1,9 +1,13 @@ -/* $Xorg: remote.c,v 1.4 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: remote.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/remote.c,v 1.3 1999/03/07 14:23:42 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/remote.c,v 1.4 2001/01/17 23:46:30 dawes Exp $ */ /* * We use the rstart protocol to restart clients on remote machines. diff --git a/programs/xsm/restart.c b/programs/xsm/restart.c index b35dfa700..896d8d4ee 100644 --- a/programs/xsm/restart.c +++ b/programs/xsm/restart.c @@ -1,9 +1,13 @@ -/* $Xorg: restart.c,v 1.4 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: restart.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/restart.c,v 1.4 1999/03/28 16:27:18 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/restart.c,v 1.5 2001/01/17 23:46:30 dawes Exp $ */ #include "xsm.h" #include "log.h" diff --git a/programs/xsm/restart.h b/programs/xsm/restart.h index 9497c12ff..e2f6b5489 100644 --- a/programs/xsm/restart.h +++ b/programs/xsm/restart.h @@ -1,9 +1,13 @@ -/* $Xorg: restart.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: restart.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/restart.h,v 1.4 2001/01/17 23:46:30 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/restart.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _RESTART_H_ #define _RESTART_H_ diff --git a/programs/xsm/save.c b/programs/xsm/save.c index f7d7a1404..5d06877ad 100644 --- a/programs/xsm/save.c +++ b/programs/xsm/save.c @@ -1,9 +1,13 @@ -/* $Xorg: save.c,v 1.4 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: save.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/save.c,v 3.2 1999/03/07 11:41:29 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/save.c,v 3.3 2001/01/17 23:46:30 dawes Exp $ */ #include "xsm.h" #include "save.h" diff --git a/programs/xsm/save.h b/programs/xsm/save.h index 9b2a9047d..5357d3273 100644 --- a/programs/xsm/save.h +++ b/programs/xsm/save.h @@ -1,9 +1,13 @@ -/* $Xorg: save.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: save.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/save.h,v 1.4 2001/01/17 23:46:31 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/save.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _SAVE_H_ #define _SAVE_H_ diff --git a/programs/xsm/saveutil.c b/programs/xsm/saveutil.c index 67c74d919..0e8178577 100644 --- a/programs/xsm/saveutil.c +++ b/programs/xsm/saveutil.c @@ -1,9 +1,13 @@ -/* $Xorg: saveutil.c,v 1.4 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: saveutil.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/saveutil.c,v 1.4 1999/03/28 15:33:12 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/saveutil.c,v 1.5 2001/01/17 23:46:31 dawes Exp $ */ #include "xsm.h" #include "log.h" diff --git a/programs/xsm/saveutil.h b/programs/xsm/saveutil.h index 8eb13eb56..31af135a7 100644 --- a/programs/xsm/saveutil.h +++ b/programs/xsm/saveutil.h @@ -1,9 +1,13 @@ -/* $Xorg: saveutil.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: saveutil.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/saveutil.h,v 1.5 2001/01/17 23:46:31 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/saveutil.h,v 1.6 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _SAVEUTIL_H_ #define _SAVEUTIL_H_ diff --git a/programs/xsm/signals.c b/programs/xsm/signals.c index 820b4666e..9be9babb1 100644 --- a/programs/xsm/signals.c +++ b/programs/xsm/signals.c @@ -1,9 +1,13 @@ -/* $Xorg: signals.c,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: signals.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/signals.c,v 3.4 2001/08/01 00:45:07 tsi Exp $ */ +/* $XFree86: xc/programs/xsm/signals.c,v 3.5 2001/12/08 18:33:45 herrb Exp $ */ #include <stdlib.h> diff --git a/programs/xsm/xsm.c b/programs/xsm/xsm.c index dcc2b4ec5..fde06e20f 100644 --- a/programs/xsm/xsm.c +++ b/programs/xsm/xsm.c @@ -1,9 +1,13 @@ -/* $Xorg: xsm.c,v 1.6 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: xsm.c,v 1.7 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xsm.c,v 1.7 2001/01/17 23:46:31 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xsm.c,v 1.8 2001/12/08 18:33:45 herrb Exp $ */ /* * X Session Manager. diff --git a/programs/xsm/xsm.h b/programs/xsm/xsm.h index a97e8a4bc..3a25d7b51 100644 --- a/programs/xsm/xsm.h +++ b/programs/xsm/xsm.h @@ -1,9 +1,13 @@ -/* $Xorg: xsm.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: xsm.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xsm.h,v 1.6 2001/08/01 00:45:07 tsi Exp $ */ +/* $XFree86: xc/programs/xsm/xsm.h,v 1.7 2001/12/08 18:33:45 herrb Exp $ */ #ifndef _XSM_H_ #define _XSM_H_ diff --git a/programs/xsm/xsm.man b/programs/xsm/xsm.man index f06d97016..29696aa8e 100644 --- a/programs/xsm/xsm.man +++ b/programs/xsm/xsm.man @@ -1,7 +1,11 @@ -.\" $Xorg: xsm.man,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ +.\" $Xorg: xsm.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ .\" Copyright 1994,1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xsm/xsm.man,v 1.6 2001/01/27 18:21:24 dawes Exp $ .\" .TH XSM 1 __xorgversion__ .SH NAME diff --git a/programs/xsm/xtwatch.c b/programs/xsm/xtwatch.c index d4c68567e..7aa7d190b 100644 --- a/programs/xsm/xtwatch.c +++ b/programs/xsm/xtwatch.c @@ -1,9 +1,13 @@ -/* $Xorg: xtwatch.c,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: xtwatch.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xtwatch.c,v 1.3 1999/03/07 14:23:44 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xtwatch.c,v 1.4 2001/01/17 23:46:31 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include <X11/Intrinsic.h> diff --git a/programs/xsm/xtwatch.h b/programs/xsm/xtwatch.h index b562bdad7..e6a73e291 100644 --- a/programs/xsm/xtwatch.h +++ b/programs/xsm/xtwatch.h @@ -1,9 +1,13 @@ -/* $Xorg: xtwatch.h,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ */ +/* $Xorg: xtwatch.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ 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 Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xtwatch.h,v 1.4 2001/01/17 23:46:31 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xtwatch.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */ #ifndef _XTWATCH_H_ #define _XTWATCH_H_ diff --git a/programs/xstdcmap/xstdcmap.c b/programs/xstdcmap/xstdcmap.c index 515cbfc02..03a76bfcf 100644 --- a/programs/xstdcmap/xstdcmap.c +++ b/programs/xstdcmap/xstdcmap.c @@ -1,10 +1,14 @@ /* - * $Xorg: xstdcmap.c,v 1.4 2000/08/17 19:55:06 cpqbld Exp $ + * $Xorg: xstdcmap.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ * * Copyright 1989, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Donna Converse, MIT X Consortium */ -/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.6 2001/04/01 14:00:24 tsi Exp $ */ +/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.7 2001/07/25 15:05:30 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xstdcmap/xstdcmap.man b/programs/xstdcmap/xstdcmap.man index e5d600b1c..0ce2b9fb5 100644 --- a/programs/xstdcmap/xstdcmap.man +++ b/programs/xstdcmap/xstdcmap.man @@ -1,7 +1,11 @@ -.\" $Xorg: xstdcmap.man,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ +.\" $Xorg: xstdcmap.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ .\" Copyright 1989, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $ .\" .de EX \"Begin example .ne 5 diff --git a/programs/xterm/Tekproc.c b/programs/xterm/Tekproc.c index 9405cfe51..da4421b8c 100644 --- a/programs/xterm/Tekproc.c +++ b/programs/xterm/Tekproc.c @@ -1,21 +1,20 @@ /* - * $Xorg: Tekproc.c,v 1.4 2000/08/17 19:55:07 cpqbld Exp $ + * $Xorg: Tekproc.c,v 1.5 2001/02/09 02:06:02 xorgcvs Exp $ * * Warning, there be crufty dragons here. */ -/* $XFree86: xc/programs/xterm/Tekproc.c,v 3.32 2001/01/17 23:46:34 dawes Exp $ */ +/* $XFree86: xc/programs/xterm/Tekproc.c,v 3.33 2001/04/12 01:02:49 dickey Exp $ */ /* -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -23,13 +22,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. -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. * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/programs/xterm/charproc.c b/programs/xterm/charproc.c index cda79b8fb..c1bdecdee 100644 --- a/programs/xterm/charproc.c +++ b/programs/xterm/charproc.c @@ -1,8 +1,8 @@ /* - * $Xorg: charproc.c,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ + * $Xorg: charproc.c,v 1.6 2001/02/09 02:06:02 xorgcvs Exp $ */ -/* $XFree86: xc/programs/xterm/charproc.c,v 3.124 2001/10/10 19:46:22 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/charproc.c,v 3.125 2001/11/14 01:52:46 dickey Exp $ */ /* @@ -35,14 +35,13 @@ sale, use or other dealings in this Software without prior written authorization. -Copyright (c) 1988 X Consortium +Copyright 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -50,13 +49,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. -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. */ /* diff --git a/programs/xterm/main.c b/programs/xterm/main.c index cac1b5eef..31e1b9cd1 100644 --- a/programs/xterm/main.c +++ b/programs/xterm/main.c @@ -1,5 +1,5 @@ #ifndef lint -static char *rid="$Xorg: main.c,v 1.6 2000/08/18 11:04:49 xorgcvs Exp $"; +static char *rid="$Xorg: main.c,v 1.7 2001/02/09 02:06:02 xorgcvs Exp $"; #endif /* lint */ /* @@ -18,14 +18,13 @@ static char *rid="$Xorg: main.c,v 1.6 2000/08/18 11:04:49 xorgcvs Exp $"; /*********************************************************** -Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -33,13 +32,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. -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. Copyright 1987, 1988 by Digital Equipment Corporation, Maynard. @@ -64,7 +63,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: main.c,v 3.141 2001/11/14 01:52:47 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/main.c,v 3.142 2001/12/02 13:35:29 herrb Exp $ */ /* main.c */ diff --git a/programs/xterm/menu.c b/programs/xterm/menu.c index 845bf5c3e..9421a1794 100644 --- a/programs/xterm/menu.c +++ b/programs/xterm/menu.c @@ -1,4 +1,4 @@ -/* $Xorg: menu.c,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ */ +/* $Xorg: menu.c,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /* Copyright 1999-2001 by Thomas E. Dickey @@ -23,14 +23,13 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -38,16 +37,16 @@ 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. -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. */ -/* $XFree86: xc/programs/xterm/menu.c,v 3.41 2001/01/17 23:46:37 dawes Exp $ */ +/* $XFree86: xc/programs/xterm/menu.c,v 3.42 2001/09/09 01:07:26 dickey Exp $ */ #include <xterm.h> #include <data.h> diff --git a/programs/xterm/menu.h b/programs/xterm/menu.h index 161430a93..433789fef 100644 --- a/programs/xterm/menu.h +++ b/programs/xterm/menu.h @@ -1,4 +1,4 @@ -/* $Xorg: menu.h,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ */ +/* $Xorg: menu.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /* Copyright 1999-2000 by Thomas E. Dickey @@ -23,15 +23,13 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Copyright (c) 1989 X Consortium +Copyright 1989, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -39,18 +37,18 @@ 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 +IN NO EVENT SHALL THE 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. -Except as contained in this notice, the name of the X Consortium shall +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. +from The Open Group. */ -/* $XFree86: xc/programs/xterm/menu.h,v 3.25 2001/01/17 23:46:37 dawes Exp $ */ +/* $XFree86: xc/programs/xterm/menu.h,v 3.26 2001/09/09 01:07:26 dickey Exp $ */ #ifndef included_menu_h #define included_menu_h diff --git a/programs/xterm/xterm.man b/programs/xterm/xterm.man index cac6b496e..f04f91c57 100644 --- a/programs/xterm/xterm.man +++ b/programs/xterm/xterm.man @@ -1,4 +1,4 @@ -.\" $Xorg: xterm.man,v 1.3 2000/08/17 19:55:10 cpqbld Exp $ +.\" $Xorg: xterm.man,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ .\" .\" .\" Copyright 1996,1997,1998,1999,2000,2001 by Thomas E. Dickey @@ -30,33 +30,31 @@ .\" authorization. .\" .\" -.\" Copyright (c) 1989 X Consortium -.\" -.\" 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: -.\" +.\" Copyright 1989, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" .\" 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 +.\" IN NO EVENT SHALL THE 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. -.\" -.\" Except as contained in this notice, the name of the X Consortium shall +.\" +.\" 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. +.\" from The Open Group. .\" -.\" $XFree86: xc/programs/xterm/xterm.man,v 3.78 2001/10/25 00:18:55 dickey Exp $ +.\" $XFree86: xc/programs/xterm/xterm.man,v 3.79 2001/11/06 01:20:11 dickey Exp $ .\" .\" updated by Thomas E. Dickey for XFree86, July 1996. .TH XTERM 1 __vendorversion__ diff --git a/programs/xwd/list.c b/programs/xwd/list.c index 8957b1002..9ab24a269 100644 --- a/programs/xwd/list.c +++ b/programs/xwd/list.c @@ -1,4 +1,4 @@ -/* $Xorg: list.c,v 1.4 2000/08/17 19:55:12 cpqbld Exp $ */ +/* $Xorg: list.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -11,7 +11,11 @@ Copyright 1994 Hewlett-Packard Co. Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -30,7 +34,7 @@ other dealings in this Software without prior written authorization from The Open Group. ----------------------------------------------------------------------- **/ -/* $XFree86: xc/programs/xwd/list.c,v 3.4 2001/01/17 23:46:41 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/list.c,v 3.5 2001/07/25 15:05:31 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/programs/xwd/list.h b/programs/xwd/list.h index a454e2aaf..224d20662 100644 --- a/programs/xwd/list.h +++ b/programs/xwd/list.h @@ -1,4 +1,4 @@ -/* $Xorg: list.h,v 1.3 2000/08/17 19:55:12 cpqbld Exp $ */ +/* $Xorg: list.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -11,7 +11,11 @@ Copyright 1994 Hewlett-Packard Co. Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/programs/xwd/multiVis.c b/programs/xwd/multiVis.c index 237bce8d6..f6877a038 100644 --- a/programs/xwd/multiVis.c +++ b/programs/xwd/multiVis.c @@ -1,4 +1,4 @@ -/* $Xorg: multiVis.c,v 1.4 2000/08/17 19:55:12 cpqbld Exp $ */ +/* $Xorg: multiVis.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains functions to create a list of regions which tile a specified window. Each region contains all visible @@ -11,7 +11,11 @@ Copyright 1994 Hewlett-Packard Co. Copyright 1996, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -30,7 +34,7 @@ other dealings in this Software without prior written authorization from The Open Group. ------------------------------------------------------------------------ **/ -/* $XFree86: xc/programs/xwd/multiVis.c,v 1.5 1999/03/07 14:23:48 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/multiVis.c,v 1.6 2001/01/17 23:46:42 dawes Exp $ */ #include <stdlib.h> #include <X11/Xlib.h> diff --git a/programs/xwd/multiVis.h b/programs/xwd/multiVis.h index 5abca27ab..a11137c24 100644 --- a/programs/xwd/multiVis.h +++ b/programs/xwd/multiVis.h @@ -1,4 +1,4 @@ -/* $XConsortium: multiVis.h /main/3 1995/12/15 15:09:08 converse $ */ +/* $Xorg: multiVis.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -8,17 +8,31 @@ to the current member of the list (used by the first_in_list and next_in_list functions). - (c)Copyright 1994 Hewlett-Packard Co. - - RESTRICTED RIGHTS LEGEND - Use, duplication, or disclosure by the U.S. Government is subject to - restrictions as set forth in sub-paragraph (c)(1)(ii) of the Rights in - Technical Data and Computer Software clause in DFARS 252.227-7013. - Hewlett-Packard Company - 3000 Hanover Street - Palo Alto, CA 94304 U.S.A. - Rights for non-DOD U.S. Government Departments and Agencies are as set - forth in FAR 52.227-19(c)(1,2). +Copyright 1994 Hewlett-Packard Co. +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 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. + +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 Open Group. + ------------------------------------------------------------------------ **/ extern int GetMultiVisualRegions( diff --git a/programs/xwd/wsutils.h b/programs/xwd/wsutils.h index bded696ba..df0381588 100644 --- a/programs/xwd/wsutils.h +++ b/programs/xwd/wsutils.h @@ -1,4 +1,4 @@ -/* $XConsortium: wsutils.h /main/2 1995/12/07 10:36:37 kaleb $ */ +/* $Xorg: wsutils.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -8,17 +8,31 @@ to the current member of the list (used by the first_in_list and next_in_list functions). - (c)Copyright 1994 Hewlett-Packard Co. - - RESTRICTED RIGHTS LEGEND - Use, duplication, or disclosure by the U.S. Government is subject to - restrictions as set forth in sub-paragraph (c)(1)(ii) of the Rights in - Technical Data and Computer Software clause in DFARS 252.227-7013. - Hewlett-Packard Company - 3000 Hanover Street - Palo Alto, CA 94304 U.S.A. - Rights for non-DOD U.S. Government Departments and Agencies are as set - forth in FAR 52.227-19(c)(1,2). +Copyright 1994 Hewlett-Packard Co. +Copyright 1996, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 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. + +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 Open Group. + ------------------------------------------------------------------------ **/ /****************************************************************************** * diff --git a/programs/xwd/xwd.c b/programs/xwd/xwd.c index 1b17a8a25..8e3e1ea43 100644 --- a/programs/xwd/xwd.c +++ b/programs/xwd/xwd.c @@ -1,10 +1,14 @@ -/* $Xorg: xwd.c,v 1.4 2000/08/17 19:55:13 cpqbld Exp $ */ +/* $Xorg: xwd.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -21,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xwd/xwd.c,v 3.8 2001/07/25 15:05:31 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/xwd.c,v 3.9 2001/08/29 11:09:44 alanh Exp $ */ /* * xwd.c MIT Project Athena, X Window system window raster image dumper. diff --git a/programs/xwd/xwd.man b/programs/xwd/xwd.man index afe013698..d325eaeb1 100644 --- a/programs/xwd/xwd.man +++ b/programs/xwd/xwd.man @@ -1,7 +1,11 @@ -.\" $Xorg: xwd.man,v 1.3 2000/08/17 19:55:14 cpqbld Exp $ +.\" $Xorg: xwd.man,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xwd/xwd.man,v 1.7 2001/01/27 18:21:25 dawes Exp $ .\" .TH XWD 1 __xorgversion__ .SH NAME diff --git a/programs/xwininfo/xwininfo.c b/programs/xwininfo/xwininfo.c index 017bb72e0..cf06e16b6 100644 --- a/programs/xwininfo/xwininfo.c +++ b/programs/xwininfo/xwininfo.c @@ -1,9 +1,13 @@ -/* $Xorg: xwininfo.c,v 1.3 2000/08/17 19:55:16 cpqbld Exp $ */ +/* $Xorg: xwininfo.c,v 1.4 2001/02/09 02:06:04 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.6 2001/01/17 23:46:42 dawes Exp $ */ +/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.7 2001/04/01 14:00:25 tsi Exp $ */ /* diff --git a/programs/xwininfo/xwininfo.man b/programs/xwininfo/xwininfo.man index 18bc6f00b..364ef5ff7 100644 --- a/programs/xwininfo/xwininfo.man +++ b/programs/xwininfo/xwininfo.man @@ -1,7 +1,11 @@ -.\" $Xorg: xwininfo.man,v 1.3 2000/08/17 19:55:16 cpqbld Exp $ +.\" $Xorg: xwininfo.man,v 1.4 2001/02/09 02:06:04 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xwininfo/xwininfo.man,v 1.7 2001/01/27 18:21:25 dawes Exp $ .\" .TH XWININFO 1 __xorgversion__ .SH NAME diff --git a/programs/xwud/xwud.c b/programs/xwud/xwud.c index d8cb4e4dc..2b2a962a0 100644 --- a/programs/xwud/xwud.c +++ b/programs/xwud/xwud.c @@ -1,9 +1,13 @@ -/* $Xorg: xwud.c,v 1.4 2000/08/17 19:55:17 cpqbld Exp $ */ +/* $Xorg: xwud.c,v 1.5 2001/02/09 02:06:04 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1988, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xwud/xwud.c,v 3.5 2001/01/17 23:46:43 dawes Exp $ */ +/* $XFree86: xc/programs/xwud/xwud.c,v 3.6 2001/07/25 15:05:31 dawes Exp $ */ /* xwud - marginally useful raster image undumper */ diff --git a/programs/xwud/xwud.man b/programs/xwud/xwud.man index d3781d1c8..ba7d1902e 100644 --- a/programs/xwud/xwud.man +++ b/programs/xwud/xwud.man @@ -1,7 +1,11 @@ -.\" $Xorg: xwud.man,v 1.3 2000/08/17 19:55:18 cpqbld Exp $ +.\" $Xorg: xwud.man,v 1.4 2001/02/09 02:06:04 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" -.\" All Rights Reserved. +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. .\" .\" The above copyright notice and this permission notice shall be included .\" in all copies or substantial portions of the Software. @@ -19,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86$ +.\" $XFree86: xc/programs/xwud/xwud.man,v 1.7 2001/01/27 18:21:26 dawes Exp $ .\" .TH XWUD 1 __xorgversion__ .SH NAME diff --git a/util/memleak/fmalloc.c b/util/memleak/fmalloc.c index 2862b2ac3..e4772c41b 100644 --- a/util/memleak/fmalloc.c +++ b/util/memleak/fmalloc.c @@ -1,9 +1,13 @@ /* - * $Xorg: fmalloc.c,v 1.4 2000/08/17 19:55:20 cpqbld Exp $ + * $Xorg: fmalloc.c,v 1.5 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/util/memleak/fmalloc.c,v 3.10 2000/12/08 21:43:22 keithp Exp $ */ +/* $XFree86: xc/util/memleak/fmalloc.c,v 3.12 2001/02/16 13:24:10 eich Exp $ */ /* diff --git a/util/memleak/ftest.c b/util/memleak/ftest.c index 5c7329ea2..420f42c2f 100644 --- a/util/memleak/ftest.c +++ b/util/memleak/ftest.c @@ -1,9 +1,13 @@ /* - * $Xorg: ftest.c,v 1.3 2000/08/17 19:55:20 cpqbld Exp $ + * $Xorg: ftest.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group -All Rights Reserved. +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/util/memleak/getretmips.c b/util/memleak/getretmips.c index 3c8f9357e..2f9d6ac68 100644 --- a/util/memleak/getretmips.c +++ b/util/memleak/getretmips.c @@ -1,14 +1,13 @@ /* - * $XConsortium: getretmips.c,v 1.4 94/04/17 20:59:44 keith Exp $ + * $Xorg: getretmips.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * -Copyright (c) 1992 X Consortium +Copyright 1992, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. * * Author: Keith Packard, MIT X Consortium */ diff --git a/util/memleak/getretspar.c b/util/memleak/getretspar.c index ab723ee0c..4ed71ce2c 100644 --- a/util/memleak/getretspar.c +++ b/util/memleak/getretspar.c @@ -1,14 +1,13 @@ /* - * $XConsortium: getretspar.c,v 1.2 94/04/17 20:59:45 keith Exp $ + * $Xorg: getretspar.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * -Copyright (c) 1992 X Consortium +Copyright 1992, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. * * Author: Keith Packard, MIT X Consortium */ diff --git a/util/memleak/getrettest.c b/util/memleak/getrettest.c index 3a402fbd2..7f3c88641 100644 --- a/util/memleak/getrettest.c +++ b/util/memleak/getrettest.c @@ -1,14 +1,13 @@ /* - * $XConsortium: getrettest.c,v 1.3 94/04/17 20:59:45 keith Exp $ + * $Xorg: getrettest.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * -Copyright (c) 1992 X Consortium +Copyright 1992, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. * * Author: Keith Packard, MIT X Consortium */ @@ -45,5 +44,5 @@ g () getStackTrace (returnStack, 16); for (i = 0; i < 16 && returnStack[i]; i++) - printf ("%2d: 0x%x\n", i, returnStack[i]); + printf ("%2d: 0x%lx\n", i, returnStack[i]); } diff --git a/util/memleak/mipsstack.s b/util/memleak/mipsstack.s index a35de35a7..bc69ba971 100644 --- a/util/memleak/mipsstack.s +++ b/util/memleak/mipsstack.s @@ -1,14 +1,13 @@ /* - * $XConsortium: mipsstack.s,v 1.3 94/04/17 20:59:45 keith Exp $ + * $Xorg: mipsstack.s,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * -Copyright (c) 1992 X Consortium +Copyright 1992, 1998 The Open Group -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: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -16,13 +15,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. -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. * * Author: Keith Packard, MIT X Consortium */ |