[xorg-commit-diffs] xc/programs/Xserver/mi Imakefile, 1.1.4.5, 1.1.4.6 miexpose.c, 1.1.4.5, 1.1.4.6 miinitext.c, 1.1.4.6, 1.1.4.7 miregion.c, 1.1.4.4, 1.1.4.5 mivaltree.c, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/mi
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/mi

Modified Files:
      Tag: XORG-CURRENT
	Imakefile miexpose.c miinitext.c miregion.c mivaltree.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/Imakefile,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/Imakefile	26 Mar 2004 01:24:55 -0000	1.1.4.5
+++ b/Imakefile	15 Apr 2004 10:17:22 -0000	1.1.4.6
@@ -41,7 +41,7 @@
 	mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \
 	micmap.o mioverlay.o
 
-#ifdef XFree86Version
+#if (defined (XFree86Version) || defined(XorgVersion))
 /* 
  * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o 
  * used by Xnest, Xvfb 

Index: miexpose.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/miexpose.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/miexpose.c	5 Mar 2004 13:41:08 -0000	1.1.4.5
+++ b/miexpose.c	15 Apr 2004 10:17:22 -0000	1.1.4.6
@@ -46,6 +46,33 @@
 SOFTWARE.
 
 ******************************************************************/
+/*****************************************************************
+
+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.
+
+******************************************************************/
 
 /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
 
@@ -68,7 +95,7 @@
 
 #include "globals.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -426,7 +453,7 @@
 	pe->u.expose.count = i;
     }
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(!noPanoramiXExtension) {
 	int scrnum = pWin->drawable.pScreen->myNum;
 	int x = 0, y = 0;

Index: miinitext.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/miinitext.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/miinitext.c	30 Mar 2004 14:14:31 -0000	1.1.4.6
+++ b/miinitext.c	15 Apr 2004 10:17:22 -0000	1.1.4.7
@@ -62,7 +62,7 @@
 #undef GLXEXT
 #endif
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 extern Bool noPanoramiXExtension;
 #endif
 extern Bool noTestExtensions;
@@ -103,7 +103,7 @@
 #define _SECURITY_SERVER
 #include "securstr.h"
 #endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiXproto.h"
 #endif
 #ifdef XF86BIGFONT
@@ -135,7 +135,7 @@
 #ifdef MULTIBUFFER
 extern void MultibufferExtensionInit(INITARGS);
 #endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
 extern void PanoramiXExtensionInit(INITARGS);
 #endif
 #ifdef XINPUT
@@ -247,8 +247,8 @@
     int		argc;
     char	*argv[];
 {
-#ifdef XINERAMA
-# if !defined(PRINT_ONLY_SERVER) && !defined(NO_XINERAMA)
+#ifdef PANORAMIX
+# if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
 # endif
 #endif
@@ -437,7 +437,7 @@
     { NULL, "GLX", NULL, NULL },
     { NULL, "TOG-CUP", NULL, NULL },
     { NULL, "Extended-Visual-Information", NULL, NULL },
-#ifdef XINERAMA
+#ifdef PANORAMIX
     { NULL, "XINERAMA", &noPanoramiXExtension, NULL },
 #else
     { NULL, "NOXINERAMA", NULL, NULL },
@@ -488,7 +488,7 @@
 #ifdef XPRINT
     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
 #endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
     { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL },
 #endif
 #ifdef XF86BIGFONT

Index: miregion.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/miregion.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/miregion.c	7 Mar 2004 23:45:10 -0000	1.1.4.4
+++ b/miregion.c	15 Apr 2004 10:17:22 -0000	1.1.4.5
@@ -76,6 +76,7 @@
 Equipment Corporation.
 
 ******************************************************************/
+
 #include "regionstr.h"
 #include "Xprotostr.h"
 #include "gc.h"

Index: mivaltree.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/mi/mivaltree.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/mivaltree.c	7 Mar 2004 23:45:10 -0000	1.1.4.4
+++ b/mivaltree.c	15 Apr 2004 10:17:22 -0000	1.1.4.5
@@ -1,4 +1,5 @@
 /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
+/* $XdotOrg$ */
 /*
  * mivaltree.c --
  *	Functions for recalculating window clip lists. Main function
@@ -79,6 +80,7 @@
 Equipment Corporation.
 
 ******************************************************************/
+
 /* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.9tsi Exp $ */
 
  /*