svn merge ^/branches/released .

8 files changed, 117 insertions, 244 deletions

diff --git a/xorg-server/mi/Makefile.am b/xorg-server/mi/Makefile.am
index 8ec45ecd8..daf272814 100644
--- a/xorg-server/mi/Makefile.am
+++ b/xorg-server/mi/Makefile.am
@@ -12,9 +12,7 @@ libmi_la_SOURCES = 	\
 	mi.h		\

 	miarc.c		\

 	mibitblt.c	\

-	mibstore.c	\

 	mibstore.h	\

-	mibstorest.h	\

 	micmap.c	\

 	micmap.h	\

 	micoord.h	\

diff --git a/xorg-server/mi/makefile b/xorg-server/mi/makefile
index c0a986f79..7067c62e8 100644
--- a/xorg-server/mi/makefile
+++ b/xorg-server/mi/makefile
@@ -1,6 +1,5 @@
 CSRCS=miarc.c		\
 	mibitblt.c	\
-	mibstore.c	\
 	micmap.c	\
 	micopy.c	\
 	micursor.c	\
diff --git a/xorg-server/mi/mi.h b/xorg-server/mi/mi.h
index eca65f20e..ea5424823 100644
--- a/xorg-server/mi/mi.h
+++ b/xorg-server/mi/mi.h
@@ -456,10 +456,6 @@ extern _X_EXPORT Bool miScreenInit(
     VisualPtr /*visuals*/

 );

 

-extern _X_EXPORT DevPrivateKey miAllocateGCPrivateIndex(

-    void

-);

-

 /* mivaltree.c */

 

 extern _X_EXPORT int miShapedWindowIn(

diff --git a/xorg-server/mi/mibstore.c b/xorg-server/mi/mibstore.c
index 262b4944d..b791b9dc6 100644
--- a/xorg-server/mi/mibstore.c
+++ b/xorg-server/mi/mibstore.c
@@ -1,49 +1,43 @@
-/*
- * Copyright 2007 Red Hat, 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:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-#include "scrnintstr.h"
-#include "mibstore.h"
-
-/*
- * There is no longer an mi implementation of backing store.  This function
- * is only for source compatibility with old drivers.
- *
- * Note though that you do get backing store for free if your server has
- * Composite enabled, since the automatic redirection mechanism provides
- * essentially the same functionality.  See compChangeWindowAttributes()
- * for the implementation.
- */
-
-void
-miInitializeBackingStore (ScreenPtr pScreen)
-{
-    pScreen->SaveDoomedAreas = NULL;
-    pScreen->RestoreAreas = NULL;
-    pScreen->ExposeCopy = NULL;
-    pScreen->TranslateBackingStore = NULL;
-    pScreen->ClearBackingStore = NULL;
-    pScreen->DrawGuarantee = NULL;
-}
+/*

+ * Copyright 2007 Red Hat, 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:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+#include "scrnintstr.h"

+#include "mibstore.h"

+

+/*

+ * There is no longer an mi implementation of backing store.  This function

+ * is only for source compatibility with old drivers.

+ *

+ * Note though that you do get backing store for free if your server has

+ * Composite enabled, since the automatic redirection mechanism provides

+ * essentially the same functionality.  See compChangeWindowAttributes()

+ * for the implementation.

+ */

+

+void

+miInitializeBackingStore (ScreenPtr pScreen)

+{

+}

diff --git a/xorg-server/mi/mibstore.h b/xorg-server/mi/mibstore.h
index ef7e18790..f40f28819 100644
--- a/xorg-server/mi/mibstore.h
+++ b/xorg-server/mi/mibstore.h
@@ -1,25 +1,23 @@
-/*-
- * mibstore.h --
- *	Header file for users of the MI backing-store scheme.
- *
- * Copyright (c) 1987 by the Regents of the University of California
- *
- * 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.  The University of California
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-#ifndef _MIBSTORE_H
-#define _MIBSTORE_H
-
-#include "screenint.h"
-
-extern _X_EXPORT void miInitializeBackingStore(
-    ScreenPtr /*pScreen*/
-);
-
-#endif /* _MIBSTORE_H */
+/*-

+ * mibstore.h --

+ *	Header file for users of the MI backing-store scheme.

+ *

+ * Copyright (c) 1987 by the Regents of the University of California

+ *

+ * 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.  The University of California

+ * makes no representations about the suitability of this

+ * software for any purpose.  It is provided "as is" without

+ * express or implied warranty.

+ */

+

+#ifndef _MIBSTORE_H

+#define _MIBSTORE_H

+

+#include "screenint.h"

+

+#define miInitializeBackingStore(x) do {} while (0)

+

+#endif /* _MIBSTORE_H */

diff --git a/xorg-server/mi/mibstorest.h b/xorg-server/mi/mibstorest.h
deleted file mode 100644
index ccf4fb701..000000000
--- a/xorg-server/mi/mibstorest.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * mibstorest.h
- *
- * internal structure definitions for mi backing store
- */
-
-
-/*
-
-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
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR 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.
-*/
-
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "mibstore.h"
-#include "regionstr.h"
-
-/*
- * One of these structures is allocated per GC used with a backing-store
- * drawable.
- */
-
-typedef struct {
-    GCPtr	    pBackingGC;	    /* Copy of the GC but with graphicsExposures
-				     * set FALSE and the clientClip set to
-				     * clip output to the valid regions of the
-				     * backing pixmap. */
-    int		    guarantee;      /* GuaranteeNothing, etc. */
-    unsigned long   serialNumber;   /* clientClip computed time */
-    unsigned long   stateChanges;   /* changes in parent gc since last copy */
-    GCOps	    *wrapOps;	    /* wrapped ops */
-    GCFuncs	    *wrapFuncs;	    /* wrapped funcs */
-} miBSGCRec, *miBSGCPtr;
-
-/*
- * one of these structures is allocated per Window with backing store
- */
-
-typedef struct {
-    PixmapPtr	  pBackingPixmap;   /* Pixmap for saved areas */
-    short	  x;		    /* origin of pixmap relative to window */
-    short	  y;
-    RegionRec	  SavedRegion;	    /* Valid area in pBackingPixmap */
-    char    	  viewable; 	    /* Tracks pWin->viewable so SavedRegion may
-				     * be initialized correctly when the window
-				     * is first mapped */
-    char    	  status;    	    /* StatusNoPixmap, etc. */
-    char	  backgroundState;  /* background type */
-    PixUnion	  background;	    /* background pattern */
-} miBSWindowRec, *miBSWindowPtr;
-
-#define StatusNoPixmap	1	/* pixmap has not been created */
-#define StatusVirtual	2	/* pixmap is virtual, tiled with background */
-#define StatusVDirty	3	/* pixmap is virtual, visiblt has contents */
-#define StatusBadAlloc	4	/* pixmap create failed, do not try again */
-#define StatusContents	5	/* pixmap is created, has valid contents */
-
-typedef struct {
-    /*
-     * screen func wrappers
-     */
-    CloseScreenProcPtr	CloseScreen;
-    GetImageProcPtr	GetImage;
-    GetSpansProcPtr	GetSpans;
-    ChangeWindowAttributesProcPtr ChangeWindowAttributes;
-    CreateGCProcPtr	CreateGC;
-    DestroyWindowProcPtr DestroyWindow;
-} miBSScreenRec, *miBSScreenPtr;
diff --git a/xorg-server/mi/miscrinit.c b/xorg-server/mi/miscrinit.c
index 6ac9090b2..f56083050 100644
--- a/xorg-server/mi/miscrinit.c
+++ b/xorg-server/mi/miscrinit.c
@@ -269,8 +269,6 @@ miScreenInit(
     pScreen->wakeupData = (pointer)0;

     pScreen->MarkWindow = miMarkWindow;

     pScreen->MarkOverlappedWindows = miMarkOverlappedWindows;

-    pScreen->ChangeSaveUnder = NULL;

-    pScreen->PostChangeSaveUnder = NULL;

     pScreen->MoveWindow = miMoveWindow;

     pScreen->ResizeWindow = miSlideAndSizeWindow;

     pScreen->GetLayerWindow = miGetLayerWindow;

@@ -280,29 +278,11 @@ miScreenInit(
     pScreen->SetShape = miSetShape;

     pScreen->MarkUnrealizedWindow = miMarkUnrealizedWindow;

 

-    pScreen->SaveDoomedAreas = 0;

-    pScreen->RestoreAreas = 0;

-    pScreen->ExposeCopy = 0;

-    pScreen->TranslateBackingStore = 0;

-    pScreen->ClearBackingStore = 0;

-    pScreen->DrawGuarantee = 0;

-

     miSetZeroLineBias(pScreen, DEFAULTZEROLINEBIAS);

 

     return miScreenDevPrivateInit(pScreen, width, pbits);

 }

 

-static DevPrivateKeyRec privateKeyRec;

-#define privateKey (&privateKeyRec)

-

-DevPrivateKey

-miAllocateGCPrivateIndex(void)

-{

-    if (!dixRegisterPrivateKey(&privateKeyRec, PRIVATE_GC, 0))

-	return NULL;

-    return privateKey;

-}

-

 DevPrivateKeyRec miZeroLineScreenKeyRec;

 

 void

diff --git a/xorg-server/mi/mivalidate.h b/xorg-server/mi/mivalidate.h
index ef258c0f8..3d4dddaca 100644
--- a/xorg-server/mi/mivalidate.h
+++ b/xorg-server/mi/mivalidate.h
@@ -1,52 +1,51 @@
-/*
-
-Copyright 1993, 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.
-
-*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef MIVALIDATE_H
-#define MIVALIDATE_H
-
-#include "regionstr.h"
-
-typedef union _Validate {
-    struct BeforeValidate {
-	DDXPointRec	oldAbsCorner;	/* old window position */
-	RegionPtr	borderVisible;	/* visible region of border, */
-					/* non-null when size changes */
-	Bool		resized;	/* unclipped winSize has changed - */
-					/* don't call SaveDoomedAreas */
-    } before;
-    struct AfterValidate {
-	RegionRec	exposed;	/* exposed regions, absolute pos */
-	RegionRec	borderExposed;
-    } after;
-} ValidateRec;
-
-#endif /* MIVALIDATE_H */
+/*

+

+Copyright 1993, 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.

+

+*/

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef MIVALIDATE_H

+#define MIVALIDATE_H

+

+#include "regionstr.h"

+

+typedef union _Validate {

+    struct BeforeValidate {

+	DDXPointRec	oldAbsCorner;	/* old window position */

+	RegionPtr	borderVisible;	/* visible region of border, */

+					/* non-null when size changes */

+	Bool		resized;	/* unclipped winSize has changed */

+    } before;

+    struct AfterValidate {

+	RegionRec	exposed;	/* exposed regions, absolute pos */

+	RegionRec	borderExposed;

+    } after;

+} ValidateRec;

+

+#endif /* MIVALIDATE_H */