70. Merging in the TM branch (Egbert Eich).

69. Mark PLT table executable on OSes that don't allow to execute data
areas by default (Bugzilla 395, John Dennis).
2004-04-02 21:47:33 +00:00 · 2004-04-02 17:25:21 +00:00 · 2004-03-30 17:35:32 +00:00 · 2004-03-26 16:15:54 +00:00 · 2004-03-25 01:23:14 +00:00 · 2004-03-24 13:36:25 +00:00
1373 changed files with 17890 additions and 3399 deletions
--- a/GL/apple/aglGlx.c
+++ b/GL/apple/aglGlx.c
@ -32,7 +32,7 @@
 * holders shall not be used in advertising or otherwise to promote the sale,
 * use or other dealings in this Software without prior written authorization.
 */
-/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */

 #include "quartzCommon.h"
 #include <AGL/agl.h>
--- a/GL/apple/indirect.c
+++ b/GL/apple/indirect.c
@ -34,7 +34,7 @@
 * holders shall not be used in advertising or otherwise to promote the sale,
 * use or other dealings in this Software without prior written authorization.
 */
-/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */

 #include "dri.h"
 #include "quartz.h"
--- a/GL/glx/g_disptab.c
+++ b/GL/glx/g_disptab.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
--- a/GL/glx/g_disptab.h
+++ b/GL/glx/g_disptab.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_h_
 #define _GLX_g_disptab_h_
--- a/GL/glx/g_disptab_EXT.c
+++ b/GL/glx/g_disptab_EXT.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
--- a/GL/glx/g_disptab_EXT.h
+++ b/GL/glx/g_disptab_EXT.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.6 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_EXT_h_
 #define _GLX_g_disptab_EXT_h_
--- a/GL/glx/g_render.c
+++ b/GL/glx/g_render.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.8 2004/02/03 21:34:36 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
--- a/GL/glx/g_renderswap.c
+++ b/GL/glx/g_renderswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.8 2004/01/28 18:11:50 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/g_single.c
+++ b/GL/glx/g_single.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.6 2003/10/28 22:50:17 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/g_singleswap.c
+++ b/GL/glx/g_singleswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/global.c
+++ b/GL/glx/global.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxbuf.c
+++ b/GL/glx/glxbuf.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.6 2001/03/25 05:32:01 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxbuf.h
+++ b/GL/glx/glxbuf.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
 #ifndef _glxbuf_h_
 #define _glxbuf_h_

--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.13 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.12 2004/01/28 18:11:50 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.11 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.10 2004/01/28 18:11:50 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxcontext.h
+++ b/GL/glx/glxcontext.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.4 2002/02/22 21:45:07 dawes Exp $ */
 #ifndef _GLX_context_h_
 #define _GLX_context_h_

--- a/GL/glx/glxdrawable.h
+++ b/GL/glx/glxdrawable.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _GLX_drawable_h_
 #define _GLX_drawable_h_

--- a/GL/glx/glxerror.h
+++ b/GL/glx/glxerror.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
 #ifndef _GLX_error_h_
 #define _GLX_error_h_

--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.10 2004/01/28 22:36:05 alanh Exp $
+/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
 ** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
--- a/GL/glx/glxext.h
+++ b/GL/glx/glxext.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.8 2004/02/09 23:46:31 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */
 #ifndef _glxext_h_
 #define _glxext_h_

--- a/GL/glx/glxfb.c
+++ b/GL/glx/glxfb.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxfb.h
+++ b/GL/glx/glxfb.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
 #ifndef _glxfb_h_
 #define _glxfb_h_

--- a/GL/glx/glximports.c
+++ b/GL/glx/glximports.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glximports.h
+++ b/GL/glx/glximports.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _glximports_h_
 #define _glximports_h_

--- a/GL/glx/glxmem.c
+++ b/GL/glx/glxmem.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxmem.h
+++ b/GL/glx/glxmem.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
 #ifndef _glxmem_h_
 #define _glxmem_h_

--- a/GL/glx/glxpix.c
+++ b/GL/glx/glxpix.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxpix.h
+++ b/GL/glx/glxpix.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
 #ifndef _glxpix_h_
 #define _glxpix_h_

--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.15 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.14 2004/02/09 23:46:31 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxscreens.h
+++ b/GL/glx/glxscreens.h
@ -1,7 +1,7 @@
 #ifndef _GLX_screens_h_
 #define _GLX_screens_h_

-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.5 2002/02/22 21:45:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.6 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
 #ifndef _GLX_server_h_
 #define _GLX_server_h_

--- a/GL/glx/glxutil.c
+++ b/GL/glx/glxutil.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/glxutil.h
+++ b/GL/glx/glxutil.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 #ifndef _glxcmds_h_
 #define _glxcmds_h_

--- a/GL/glx/impsize.h
+++ b/GL/glx/impsize.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
 #ifndef _impsize_h_
 #define _impsize_h_

--- a/GL/glx/render2.c
+++ b/GL/glx/render2.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.8 2004/02/03 23:04:08 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/render2swap.c
+++ b/GL/glx/render2swap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.7 2004/02/03 23:04:08 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.6 2002/01/14 22:47:08 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/renderpix.c
+++ b/GL/glx/renderpix.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/renderpixswap.c
+++ b/GL/glx/renderpixswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/rensize.c
+++ b/GL/glx/rensize.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.7 2004/01/28 18:11:53 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/rensizetab.c
+++ b/GL/glx/rensizetab.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.6 2004/02/03 23:04:08 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.5 2004/01/28 18:11:53 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/single2.c
+++ b/GL/glx/single2.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.9 2004/02/11 09:18:15 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.8 2004/02/10 22:54:15 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -344,7 +344,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
 	if ( atof( string ) > atof( GLServerVersion ) ) {
 	    buf = __glXMalloc( __glXStrlen( string ) 
 			       + __glXStrlen( GLServerVersion )
-			       + 3 );
+			       + 4 );
 	    if ( buf == NULL ) {
 		string = GLServerVersion;
 	    }
--- a/GL/glx/single2swap.c
+++ b/GL/glx/single2swap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.8 2004/02/09 23:46:31 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.7 2002/01/14 22:47:08 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/singlepix.c
+++ b/GL/glx/singlepix.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/singlepixswap.c
+++ b/GL/glx/singlepixswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/singlesize.c
+++ b/GL/glx/singlesize.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.8 2004/02/09 19:51:32 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.7tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/glx/singlesize.h
+++ b/GL/glx/singlesize.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 #ifndef _singlesize_h_
 #define _singlesize_h_

--- a/GL/glx/unpack.h
+++ b/GL/glx/unpack.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.5 2002/10/30 12:52:03 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.4 2002/01/14 22:47:08 tsi Exp $ */
 #ifndef __GLX_unpack_h__
 #define __GLX_unpack_h__

--- a/GL/glx/xfont.c
+++ b/GL/glx/xfont.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/include/GL/glx_ansic.h
+++ b/GL/include/GL/glx_ansic.h
@ -1,7 +1,7 @@
 #ifndef _glx_ansic_h_
 #define _glx_ansic_h_

-/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/include/GL/xf86glx.h
+++ b/GL/include/GL/xf86glx.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */
 /**************************************************************************

 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
--- a/XTrap/xtrapddmi.c
+++ b/XTrap/xtrapddmi.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.2 2002/01/23 03:31:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA

--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@ -1,5 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.3.2.2 2004/03/04 17:47:20 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH.
@ -77,7 +77,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/xtrapddmi.h>
 #include <X11/extensions/xtrapproto.h>
 #include "colormapst.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #include "cursor.h"
@ -1559,7 +1559,7 @@ void XETrapStampAndMail(xEvent *x_event)
            /* Copy the event information into our local memory */
            (void)memcpy(&(data.u.event),x_event,sizeof(xEvent));

-#ifdef XINERAMA
+#ifdef PANORAMIX
 	    if (!noPanoramiXExtension &&
                (data.u.event.u.u.type == MotionNotify ||
                data.u.event.u.u.type == ButtonPress ||
--- a/XTrap/xtrapdiswp.c
+++ b/XTrap/xtrapdiswp.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
 /****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991, 1992 by 

--- a/XTrap/xtrapditbl.c
+++ b/XTrap/xtrapditbl.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapditbl.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
 /****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA

--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */

 #include "X.h"
 #include "Xproto.h"
--- a/Xext/EVIstruct.h
+++ b/Xext/EVIstruct.h
@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */

 #ifndef EVI_STRUCT_H
 #define EVI_STRUCT_H
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.10tsi Exp $ */
 /*
 Copyright 1996, 1998, 2001  The Open Group

--- a/Xext/appgroup.h
+++ b/Xext/appgroup.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/appgroup.h,v 1.1 2003/07/16 01:38:28 dawes Exp $ */
+/* $XFree86$ */

 void XagClientStateChange(
    CallbackListPtr* pcbl,
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.

 */
-/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */

 #define NEED_EVENTS
 #include "X.h"
--- a/Xext/cup.c
+++ b/Xext/cup.c
@ -24,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/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.11tsi Exp $ */

 #define NEED_REPLIES
 #define NEED_EVENTS
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@ -33,7 +33,7 @@ Equipment Corporation.
 * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5  (DEC) Date: 1996/03/04 15:27:00
 */

-/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */

 #include "X.h"
 #include "Xproto.h"
@ -189,7 +189,8 @@ ProcDPMSSetTimeouts(client)
    DPMSStandbyTime = stuff->standby * MILLI_PER_SECOND;
    DPMSSuspendTime = stuff->suspend * MILLI_PER_SECOND;
    DPMSOffTime = stuff->off * MILLI_PER_SECOND;
-
+    SetDPMSTimers();
+    
    return(client->noClientException);
 }

--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.4 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */

 /* Prototypes for functions that the DDX must provide */

--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.

 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.4 2001/01/17 22:13:15 dawes Exp $ */

 typedef int Bool;

--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@ -27,7 +27,7 @@
 *
 *	Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $
 */
-/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.7 2003/10/28 23:08:43 tsi Exp $ */

 /* THIS IS NOT AN X CONSORTIUM STANDARD */

--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.15 2003/10/28 23:08:43 tsi Exp $ */
 /************************************************************

 Copyright 1989, 1998  The Open Group
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.5tsi Exp $ */
 /*

 Copyright 1989, 1998  The Open Group
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.3 2001/07/23 13:15:44 dawes Exp $ */
 /************************************************************

 Copyright 1989, 1998  The Open Group
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.6 2003/10/28 23:08:43 tsi Exp $ */
 /************************************************************

 Copyright 1989, 1998  The Open Group
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */

 #define NEED_REPLIES
 #include <stdio.h>
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@ -1,25 +1,34 @@
 /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */
+/* $XdotOrg$ */
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */

 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */

--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */

 #include <stdio.h>
 #include "X.h"
--- a/Xext/panoramiXh.h
+++ b/Xext/panoramiXh.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.2 2003/09/13 21:33:03 dawes Exp $ */

 /*
 *	Server dispatcher function replacements
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@ -26,7 +26,7 @@ Equipment Corporation.

 /* Massively rewritten by Mark Vojkovich <markv@valinux.com> */

-/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */

 #include <stdio.h>
 #include "X.h"
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.9 2001/08/11 21:00:06 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */

 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86$ */

 #include "X.h"
 #include "Xproto.h"
--- a/Xext/saver.c
+++ b/Xext/saver.c
@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */
 /*
 * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
 *
@ -28,7 +28,7 @@ in this Software without prior written authorization from the X Consortium.
 * Author:  Keith Packard, MIT X Consortium
 */

-/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */

 #define NEED_REPLIES
 #define NEED_EVENTS
@ -47,7 +47,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@ -677,7 +677,7 @@ ScreenSaverHandle (pScreen, xstate, force)
 	    ret = TRUE;
 	
    }
-#ifdef XINERAMA
+#ifdef PANORAMIX
    if(noPanoramiXExtension || !pScreen->myNum)
 #endif
       SendScreenSaverNotify (pScreen, state, force);
@ -1195,7 +1195,7 @@ ScreenSaverUnsetAttributes (ClientPtr client)
 static int
 ProcScreenSaverSetAttributes (ClientPtr client)
 {
-#ifdef XINERAMA
+#ifdef PANORAMIX
    if(!noPanoramiXExtension) {
       REQUEST(xScreenSaverSetAttributesReq);
       PanoramiXRes *draw;
@ -1274,7 +1274,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
 static int
 ProcScreenSaverUnsetAttributes (ClientPtr client)
 {
-#ifdef XINERAMA
+#ifdef PANORAMIX
    if(!noPanoramiXExtension) {
       REQUEST(xScreenSaverUnsetAttributesReq);
       PanoramiXRes *draw;
--- a/Xext/security.c
+++ b/Xext/security.c
@ -25,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/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */

 #include "dixstruct.h"
 #include "extnsionst.h"
--- a/Xext/shape.c
+++ b/Xext/shape.c
@ -1,5 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
-/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.4.2.2 2004/03/04 17:47:20 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
 /************************************************************

 Copyright 1989, 1998  The Open Group
@ -113,7 +113,7 @@ static DISPATCH_PROC(SProcShapeQueryVersion);
 static DISPATCH_PROC(SProcShapeRectangles);
 static DISPATCH_PROC(SProcShapeSelectInput);

-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@ -376,9 +376,9 @@ ProcShapeRectangles (client)
 			  stuff->xOff, stuff->yOff, createDefault);
 }

-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeRectangles(
+ProcPanoramiXShapeRectangles(
    register ClientPtr client)
 {
    REQUEST(xShapeRectanglesReq);
@ -465,9 +465,9 @@ ProcShapeMask (client)
 			  stuff->xOff, stuff->yOff, createDefault);
 }

-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeMask(
+ProcPanoramiXShapeMask(
    register ClientPtr client)
 {
    REQUEST(xShapeMaskReq);
@ -580,9 +580,9 @@ ProcShapeCombine (client)
 }


-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeCombine(
+ProcPanoramiXShapeCombine(
    register ClientPtr client)
 {
    REQUEST(xShapeCombineReq);
@ -649,9 +649,9 @@ ProcShapeOffset (client)
 }


-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeOffset(
+ProcPanoramiXShapeOffset(
    register ClientPtr client)
 {
    REQUEST(xShapeOffsetReq);
@ -1065,30 +1065,30 @@ ProcShapeDispatch (client)
    case X_ShapeQueryVersion:
 	return ProcShapeQueryVersion (client);
    case X_ShapeRectangles:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if ( !noPanoramiXExtension )
-	    return ProcXineramaShapeRectangles (client);
+	    return ProcPanoramiXShapeRectangles (client);
        else 
 #endif
 	return ProcShapeRectangles (client);
    case X_ShapeMask:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if ( !noPanoramiXExtension )
-           return ProcXineramaShapeMask (client);
+           return ProcPanoramiXShapeMask (client);
 	else
 #endif
 	return ProcShapeMask (client);
    case X_ShapeCombine:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if ( !noPanoramiXExtension )
-           return ProcXineramaShapeCombine (client);
+           return ProcPanoramiXShapeCombine (client);
 	else
 #endif
 	return ProcShapeCombine (client);
    case X_ShapeOffset:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if ( !noPanoramiXExtension )
-           return ProcXineramaShapeOffset (client);
+           return ProcPanoramiXShapeOffset (client);
 	else
 #endif
 	return ProcShapeOffset (client);
--- a/Xext/shm.c
+++ b/Xext/shm.c
@ -1,5 +1,5 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.4 2003/12/20 00:28:24 kaleb Exp $ */
-/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ *
+/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.5.2.2 2004/03/04 17:47:20 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */
 /************************************************************

 Copyright 1989, 1998  The Open Group
@ -63,7 +63,7 @@ in this Software without prior written authorization from The Open Group.
 #include "xf86_ansic.h"
 #endif

-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@ -561,9 +561,9 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
 }


-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int 
-ProcXineramaShmPutImage(register ClientPtr client)
+ProcPanoramiXShmPutImage(register ClientPtr client)
 {
    int			 j, result = 0, orig_x, orig_y;
    PanoramiXRes	*draw, *gc;
@ -580,8 +580,7 @@ ProcXineramaShmPutImage(register ClientPtr client)
                client, stuff->gc, XRT_GC, SecurityReadAccess)))
        return BadGC;

-    isRoot = (draw->type == XRT_WINDOW) && 
-		(stuff->drawable == WindowTable[0]->drawable.id);
+    isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

    orig_x = stuff->dstX;
    orig_y = stuff->dstY;
@ -602,7 +601,7 @@ ProcXineramaShmPutImage(register ClientPtr client)
 }

 static int 
-ProcXineramaShmGetImage(ClientPtr client)
+ProcPanoramiXShmGetImage(ClientPtr client)
 {
    PanoramiXRes	*draw;
    DrawablePtr 	drawables[MAXSCREENS];
@ -641,8 +640,7 @@ ProcXineramaShmGetImage(ClientPtr client)
    format = stuff->format;
    planemask = stuff->planeMask;

-    isRoot = (draw->type == XRT_WINDOW) &&
-		(stuff->drawable == WindowTable[0]->drawable.id);
+    isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

    if(isRoot) {
      if( /* check for being onscreen */
@ -717,7 +715,7 @@ ProcXineramaShmGetImage(ClientPtr client)
 }

 static int
-ProcXineramaShmCreatePixmap(
+ProcPanoramiXShmCreatePixmap(
    register ClientPtr client)
 {
    ScreenPtr pScreen = NULL;
@ -1083,10 +1081,8 @@ CreatePmap:
 			    shmdesc->addr + stuff->offset);
    if (pMap)
    {
-#ifdef NO_XINERAMA_PORT
 #ifdef PIXPRIV
 	pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
-#endif
 #endif
 	shmdesc->refcnt++;
 	pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
@ -1113,21 +1109,21 @@ ProcShmDispatch (client)
    case X_ShmDetach:
 	return ProcShmDetach(client);
    case X_ShmPutImage:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if ( !noPanoramiXExtension )
-	   return ProcXineramaShmPutImage(client);
+	   return ProcPanoramiXShmPutImage(client);
 #endif
 	return ProcShmPutImage(client);
    case X_ShmGetImage:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if ( !noPanoramiXExtension )
-	   return ProcXineramaShmGetImage(client);
+	   return ProcPanoramiXShmGetImage(client);
 #endif
 	return ProcShmGetImage(client);
    case X_ShmCreatePixmap:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if ( !noPanoramiXExtension )
-	   return ProcXineramaShmCreatePixmap(client);
+	   return ProcPanoramiXShmCreatePixmap(client);
 #endif
 	   return ProcShmCreatePixmap(client);
    default:
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
 *
 * Author:  Keith Packard, MIT X Consortium
 */
-/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.6 2003/07/16 01:38:30 dawes Exp $ */

 /* dixsleep.c - implement millisecond timeouts for X clients */

--- a/Xext/sync.c
+++ b/Xext/sync.c
@ -50,7 +50,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.

 */
-/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.13 2003/09/02 18:19:01 tsi Exp $ */

 #define NEED_REPLIES
 #define NEED_EVENTS
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.

 */
-/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */

 #define NEED_EVENTS
 #define NEED_REPLIES
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.18 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.17 2003/10/28 23:08:43 tsi Exp $ */
 /*
 * BIGFONT extension for sharing font metrics between clients (if possible)
 * and for transmitting font metrics to clients in a compressed form.
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@ -64,7 +64,7 @@ copyright holders.
 **    *********************************************************
 **
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */

 #define _XP_PRINT_SERVER_
 #include "X.h"
--- a/Xext/xres.c
+++ b/Xext/xres.c
@ -1,7 +1,8 @@
 /*
   Copyright (c) 2002  XFree86 Inc
 */
-/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.8 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.1.4.3 2004/03/05 13:39:51 eich Exp $ */

 #define NEED_EVENTS
 #define NEED_REPLIES
@ -52,22 +53,23 @@ ProcXResQueryClients (ClientPtr client)
    /* REQUEST(xXResQueryClientsReq); */
    xXResQueryClientsReply rep;
    int *current_clients;
-    int i;
+    int i, num_clients;

    REQUEST_SIZE_MATCH(xXResQueryClientsReq);

    current_clients = ALLOCATE_LOCAL((currentMaxClients - 1) * sizeof(int));

-    rep.num_clients = 0;
+    num_clients = 0;
    for(i = 1; i < currentMaxClients; i++) {
       if(clients[i]) {
-           current_clients[rep.num_clients] = i;
-           rep.num_clients++;   
+           current_clients[num_clients] = i;
+           num_clients++;   
       }
    }

    rep.type = X_Reply;
    rep.sequenceNumber = client->sequence;
+    rep.num_clients = num_clients;
    rep.length = rep.num_clients * sz_xXResClient >> 2;
    if (client->swapped) {
        int n;
@ -77,10 +79,10 @@ ProcXResQueryClients (ClientPtr client)
    }   
    WriteToClient (client, sizeof (xXResQueryClientsReply), (char *) &rep);

-    if(rep.num_clients) {
+    if(num_clients) {
        xXResClient scratch;

-        for(i = 0; i < rep.num_clients; i++) {
+        for(i = 0; i < num_clients; i++) {
            scratch.resource_base = clients[current_clients[i]]->clientAsMask;
            scratch.resource_mask = RESOURCE_ID_MASK;
        
@ -112,7 +114,7 @@ ProcXResQueryClientResources (ClientPtr client)
 {
    REQUEST(xXResQueryClientResourcesReq);
    xXResQueryClientResourcesReply rep;
-    int i, clientID;
+    int i, clientID, num_types;
    int *counts;

    REQUEST_SIZE_MATCH(xXResQueryClientResourcesReq);
@ -132,14 +134,15 @@ ProcXResQueryClientResources (ClientPtr client)

    FindAllClientResources(clients[clientID], ResFindAllRes, counts);

-    rep.num_types = 0;
+    num_types = 0;

    for(i = 0; i <= lastResourceType; i++) {
-       if(counts[i]) rep.num_types++;
+       if(counts[i]) num_types++;
    }

    rep.type = X_Reply;
    rep.sequenceNumber = client->sequence;
+    rep.num_types = num_types;
    rep.length = rep.num_types * sz_xXResType >> 2;
    if (client->swapped) {
        int n;
@ -149,7 +152,7 @@ ProcXResQueryClientResources (ClientPtr client)
    }   
    WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep);

-    if(rep.num_types) {
+    if(num_types) {
        xXResType scratch;

        for(i = 0; i < lastResourceType; i++) {
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.4 2004/02/25 21:46:33 kaleb Exp $ */
 /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*

@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.

 */
-/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */

 #include "X.h"
 #define NEED_EVENTS
@ -64,7 +64,7 @@ static unsigned char XTestReqCode;
 extern int DeviceValuator;
 #endif /* XINPUT */

-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@ -391,7 +391,7 @@ ProcXTestFakeInput(client)
 	    return BadValue;
 	}

-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if (!noPanoramiXExtension) {
 	    ScreenPtr pScreen = root->drawable.pScreen;
 	    BoxRec    box;
@ -426,7 +426,7 @@ ProcXTestFakeInput(client)
 	else if (ev->u.keyButtonPointer.rootY >= root->drawable.height)
 	    ev->u.keyButtonPointer.rootY = root->drawable.height - 1;

-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if ((!noPanoramiXExtension
 	     && root->drawable.pScreen->myNum != XineramaGetCursorScreen())
 	    || (noPanoramiXExtension && root != GetCurrentRootWindow()))
--- a/Xext/xtest1dd.c
+++ b/Xext/xtest1dd.c
@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
 University of California.

 */
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.6 2003/10/28 23:08:44 tsi Exp $ */

 /***************************************************************
 * include files
--- a/Xext/xtest1dd.h
+++ b/Xext/xtest1dd.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.3 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.2 2001/08/01 00:44:44 tsi Exp $ */
 /************************************************************

 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
--- a/Xext/xtest1di.c
+++ b/Xext/xtest1di.c
@ -53,7 +53,7 @@ Telephone and Telegraph Company or of the Regents of the
 University of California.

 */
-/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.5 2003/09/13 21:33:03 dawes Exp $ */

 /*****************************************************************************
 * include files
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.

 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.27 2003/07/16 01:38:31 dawes Exp $ */

 /*
 ** File: 
@ -73,7 +73,7 @@ SOFTWARE.

 #include "xvdisp.h"

-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"

@ -233,14 +233,14 @@ ProcXvDispatch(ClientPtr client)
    case xv_QueryAdaptors: return(ProcXvQueryAdaptors(client));
    case xv_QueryEncodings: return(ProcXvQueryEncodings(client));
    case xv_PutVideo:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if(!noPanoramiXExtension)
            return(XineramaXvPutVideo(client));
        else
 #endif
            return(ProcXvPutVideo(client));
    case xv_PutStill:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if(!noPanoramiXExtension)
            return(XineramaXvPutStill(client));
        else
@ -253,14 +253,14 @@ ProcXvDispatch(ClientPtr client)
    case xv_SelectVideoNotify: return(ProcXvSelectVideoNotify(client));
    case xv_SelectPortNotify: return(ProcXvSelectPortNotify(client));
    case xv_StopVideo: 
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if(!noPanoramiXExtension)
 	    return(XineramaXvStopVideo(client));
 	else
 #endif
 	    return(ProcXvStopVideo(client));
    case xv_SetPortAttribute: 
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if(!noPanoramiXExtension)
 	    return(XineramaXvSetPortAttribute(client));
 	else
@ -270,7 +270,7 @@ ProcXvDispatch(ClientPtr client)
    case xv_QueryBestSize: return(ProcXvQueryBestSize(client));
    case xv_QueryPortAttributes: return(ProcXvQueryPortAttributes(client));
    case xv_PutImage:
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if(!noPanoramiXExtension)
 	    return(XineramaXvPutImage(client));
 	else
@ -278,7 +278,7 @@ ProcXvDispatch(ClientPtr client)
 	    return(ProcXvPutImage(client));
 #ifdef MITSHM
    case xv_ShmPutImage: 
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if(!noPanoramiXExtension)
 	    return(XineramaXvShmPutImage(client));
 	else
@ -1863,7 +1863,7 @@ SWriteListImageFormatsReply(
 }


-#ifdef XINERAMA
+#ifdef PANORAMIX



@ -1942,8 +1942,7 @@ XineramaXvShmPutImage(ClientPtr client)
                client, stuff->port, XvXRTPort, SecurityReadAccess)))
        return _XvBadPort;
 
-    isRoot = (draw->type == XRT_WINDOW) && 
-		(stuff->drawable == WindowTable[0]->drawable.id);
+    isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

    x = stuff->drw_x;
    y = stuff->drw_y;
@ -1990,8 +1989,7 @@ XineramaXvPutImage(ClientPtr client)
 		client, stuff->port, XvXRTPort, SecurityReadAccess)))
 	return _XvBadPort;
 
-    isRoot = (draw->type == XRT_WINDOW) &&
-		(stuff->drawable == WindowTable[0]->drawable.id);
+    isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

    x = stuff->drw_x;
    y = stuff->drw_y;
@ -2036,8 +2034,7 @@ XineramaXvPutVideo(ClientPtr client)
                client, stuff->port, XvXRTPort, SecurityReadAccess)))
        return _XvBadPort;

-    isRoot = (draw->type == XRT_WINDOW) &&
-		(stuff->drawable == WindowTable[0]->drawable.id);
+    isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

    x = stuff->drw_x;
    y = stuff->drw_y;
@ -2082,8 +2079,7 @@ XineramaXvPutStill(ClientPtr client)
                client, stuff->port, XvXRTPort, SecurityReadAccess)))
        return _XvBadPort;

-    isRoot = (draw->type == XRT_WINDOW) &&
-		(stuff->drawable == WindowTable[0]->drawable.id);
+    isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;

    x = stuff->drw_x;
    y = stuff->drw_y;
--- a/Xext/xvdisp.h
+++ b/Xext/xvdisp.h
@ -1,3 +1,3 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.h,v 1.1 2003/07/16 01:38:31 dawes Exp $ */
+/* $XFree86$ */

 extern void XineramifyXv(void);
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.

 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */

 #ifndef XVDIX_H
 #define XVDIX_H
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.

 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.15tsi Exp $ */

 /*
 ** File: 
@ -99,7 +99,7 @@ SOFTWARE.
 #include "xf86_ansic.h"
 #endif

-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #include "xvdisp.h"
@ -172,7 +172,7 @@ XvExtensionInit()
 	  ErrorF("XvExtensionInit: Unable to allocate screen private index\n");
 	  return;
 	}
-#ifdef XINERAMA
+#ifdef PANORAMIX
        XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
      XvScreenGeneration = serverGeneration;
@ -271,7 +271,7 @@ XvScreenInit(ScreenPtr pScreen)
 	  ErrorF("XvScreenInit: Unable to allocate screen private index\n");
 	  return BadAlloc;
 	}
-#ifdef XINERAMA
+#ifdef PANORAMIX
        XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
      XvScreenGeneration = serverGeneration; 
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */

 #define NEED_REPLIES
 #define NEED_EVENTS
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */

 #ifndef _XVMC_H
 #define _XVMC_H
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@ -45,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.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */

 /***********************************************************************
 *
--- a/Xi/allowev.h
+++ b/Xi/allowev.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */
 /************************************************************

 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@ -45,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.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */

 /********************************************************************
 *
--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */
 /************************************************************

 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@ -45,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.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */

 /********************************************************************
 *
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Egbert Eich	9bbe288d7f	70. Merging in the TM branch (Egbert Eich).	2004-04-02 21:47:33 +00:00
Egbert Eich	0f8d2fd7d0	69. Mark PLT table executable on OSes that don't allow to execute data areas by default (Bugzilla 395, John Dennis).	2004-04-02 17:25:21 +00:00
Egbert Eich	cbf1017a88	68. Fix the GLLibraryVersion string allocation to accomodate for the terminating \0 character which would otherwise corrupt the malloc heap (Bugzilla 385, John Dennis).	2004-03-30 17:35:32 +00:00
Keith Packard	64f5c2feae	64. Patch RenderAddGlyphs to handle multiple glyphs and avoid memory error. Bugzilla #349. (Stephen McCamant, applied by Keith Packard)	2004-03-26 16:15:54 +00:00
Torrey Lyons	19dccd6930	Work around bug in Mac OS X 10.1's AppKit that causes rootless XDarwin to lock up when creating windows.	2004-03-25 01:23:14 +00:00
Egbert Eich	714f8454b8	59. Updated xf86 6PciStdIds.h (Egbert Eich).	2004-03-24 13:36:25 +00:00
Alan Coopersmith	7d1ff31cd3	58. -terminate option crashes Xserver. Bugzilla #367 . (Alan Coopersmith)	2004-03-24 01:09:51 +00:00
Alexander Gottwald	a9507ca8b5	Fix build of os/access.c if IPv6 is disabled. Bug #345 . (Alexander Gottwald)	2004-03-22 11:57:11 +00:00
Kaleb Keithley	0828d64cb7	bug #357 . Fix XDarwin so it builds on Mac OS X 10.2 and earlier. Merged down from -RELEASE-1-TM	2004-03-21 22:53:08 +00:00
Kaleb Keithley	2c84ceeb0c	MFC (merge from -current). Restore edits to the hw/darwin Credits.rtf files that were previously deleted.	2004-03-19 23:21:03 +00:00
Kaleb Keithley	74a18beef7	no bug report. Merge down from -RELEASE-1-TM working left and right Meta, Alt, Ctrl, and Shift keys. A must have for this release IMNSHO. I'm also going to restore the Credits.rtf edits that Egbert deleted in -CURRENT too. RTF isn't any less human readable than SGML, IMO, and it's a bit unkind to delete credits. (Especially mine. :-)	2004-03-19 21:49:11 +00:00
Egbert Eich	d838a30863	50. Protect removeOverlapsWithBrides() from NULL pointer in target (Egbert Eich). - fixed some comments, variable sizes	2004-03-18 10:05:23 +00:00
Alan Coopersmith	0cfa51a94d	49. Merge fixes required to build and run on Solaris x86 with Sun compilers from XORG-CURRENT branch. (Alan Coopersmith)	2004-03-18 02:18:27 +00:00
Egbert Eich	de32041651	45. Readding Monitor information obtained by DDC to the config file in commented out form (Egbert Eich). 44. Making a log message by the mouse driver more meaningful (Egbert Eich).	2004-03-17 19:22:12 +00:00
Alan Coopersmith	55887a9357	43. Incorporate ServerInterpreted address family authentication from IPv6 second public review. (Alan Coopersmith)	2004-03-17 17:39:36 +00:00
Egbert Eich	50d82cdb47	39. Preparing branch for TMc (Egbert Eich).	2004-03-15 16:02:03 +00:00
Egbert Eich	8fc64edc62	38. Backing out patch 27 as it was inappropriate for the RELEASE branch and bogus anyway (see bugzilla #303) (Egbert Eich). 37. backing out 30.: the sleep() exists to bring the log message to the attention of the user which points to a problem elsewhere. Therefore the problem should be fixed where it originates. To be strict we could make the function fail instead of just trying to point the user at the problem (Egbert Eich).	2004-03-15 15:37:39 +00:00
Egbert Eich	62c105bd9b	34. Added a hack to fc-lang and fc-list to prevent installation if define InstallFontconfigLibrary NO (Egbert Eich). 33. Updated Xft to 2.1.5 (Egbert Eich). 32. Make ELF loader work on systems with non-exec stack/heaps (bugzilla #296, John Dennis, Mike Harris). 31. Fix for xdm to work on a non-IPv6 system when built with IPv6 support (bugzilla #287, Peter Breitenlohner) (confirmed by: Alan Coopersmith). 30. Fix Xi XselectExtensionEvent for 64 bit machines (bugzilla #285, Andreas Luik) (confirmed by: Paul Anderson, Alan Coopersmith).	2004-03-12 11:18:23 +00:00
Mike A. Harris	4565ca2a8c	Added initial support for PowerPC 64 (ppc64) architecture. (Mike A. Harris, Elliot Lee, SuSE)	2004-03-11 09:16:51 +00:00
Alan Coopersmith	17bed52563	24. X server crashes when X-Resource has to byte-swap. Sun bug #5007488 . freedesktop.org bugzilla #267. (Alan Coopersmith) [Merged from XORG-CURRENT branch]	2004-03-08 23:40:19 +00:00
Alan Coopersmith	4a1297ca04	22. Update license for Xinerama code from DEC to the version requested by Compaq for X11R6.5.1 that allows redistribution without written permission from DEC. Originally X.org Defect #9263. freedesktop.org bugzilla #283. (Alan Coopersmith)	2004-03-08 00:36:57 +00:00
Egbert Eich	84d94317e7	- removing ': ' from lines which broke the build. These were added by a broken script that automatically removed spurious conflitcs do to CVS tag mismatches. The 'XdotOrg' tag really haunts me!	2004-03-05 12:46:30 +00:00
Kaleb Keithley	05e67c0b4c	no bug report, see prior version. Fix bad edit	2004-03-04 20:17:04 +00:00
Egbert Eich	38f37a3854	18. Merged in XFree86 code up to 4.4.0 including changes to files that had a changed license. There was only one change which happened to be from me (Egbert Eich).	2004-03-04 17:48:46 +00:00
Egbert Eich	1f71928430	reverted some OS2 related glitches that where missed during a merge with XFree86. 17. Fixed Freetype2 compile glitches with different versions of freetype. The build has been tested with Freetyp 2.1.4 and 2.1.7 (Egbert Eich). 16. Changed default font renderer for TrueType that is loaded by the Xserver to freetype (Egbert Eich). 15. Removed dependecy of freetype Xserver module into freetype internals (Keith Packard). 14. Flagged mailing addresses that still need to be decided upon with &&&&& to allow for easy tracking (Egbert Eich). 13. Fixed keyboard rate setting thru ioctls on linux (Egbert Eich).	2004-03-04 11:08:31 +00:00
Harold L Hunt II	789213f2c2	Replace a handful of calls to ErrorF and exit(1) with a single call to FatalError. These direct calls to exit(1) made it impossible to do anything ddx-specific in these cases; note that most of these calls occur during argument processing.	2004-03-02 19:27:34 +00:00
Egbert Eich	a796465315	Removing last bits of kdrive. 10. Made use system supplied Expat and Freetype2 library the default on Linux (documented in the release notes) (Bugzilla #218,#219) (Egbert Eich). 9. Patched __AMD64__ flags to __amd64__ (Egbert Eich). 8. Added RELNOTES.XORG to collect bits for release notes for this release (Egbert Eich). 7. Removed leftovers from libxml2 (Bugzilla #220)(Egbert Eich).	2004-03-02 14:16:10 +00:00
Egbert Eich	1e46a7cef6	5. Reversed Xinerama changes (Egbert Eich). 4. Reversed Xutf8* to XFree86utf8* function name changes for the release (Egbert Eich). 3. Removed sources for patch which were included when patch had a bad bug (Egbert Eich). 2. Removed unnecessary fonts (Egbert Eich). 1. Removed XIE and PEX extension files from release tree. The build environment has been gone already (Egbert Eich).	2004-02-27 21:31:02 +00:00