svn merge ^/branches/released .

6 files changed, 1 insertions, 170 deletions

diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am
index 21f9358d5..78a25ccd9 100644
--- a/xorg-server/include/Makefile.am
+++ b/xorg-server/include/Makefile.am
@@ -1,8 +1,6 @@
 if XORG

 sdk_HEADERS =		\

 	XIstubs.h	\

-	bstore.h	\

-	bstorestr.h	\

 	callback.h	\

 	closestr.h	\

 	closure.h	\

diff --git a/xorg-server/include/bstore.h b/xorg-server/include/bstore.h
deleted file mode 100644
index 843d6bb35..000000000
--- a/xorg-server/include/bstore.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.
- */
-
-/*
- * Moved here from mi to allow wrapping of lower level backing store functions.
- * -- 1997.10.27  Marc Aurele La France (tsi@xfree86.org)
- */
-
-#ifndef _BSTORE_H_
-#define _BSTORE_H_
-
-#include "bstorestr.h"
-
-#endif /* _BSTORE_H_ */
diff --git a/xorg-server/include/bstorestr.h b/xorg-server/include/bstorestr.h
deleted file mode 100644
index cf7820ba4..000000000
--- a/xorg-server/include/bstorestr.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-/*
- * Moved here from mi to allow wrapping of lower level backing store functions.
- * -- 1997.10.27  Marc Aurele La France (tsi@xfree86.org)
- */
-
-#ifndef _BSTORESTR_H_
-#define _BSTORESTR_H_
-
-#include "gc.h"
-#include "pixmap.h"
-#include "region.h"
-#include "window.h"
-
-typedef    void (* BackingStoreSaveAreasProcPtr)(
-	PixmapPtr /*pBackingPixmap*/,
-	RegionPtr /*pObscured*/,
-	int /*x*/,
-	int /*y*/,
-	WindowPtr /*pWin*/);
-
-typedef    void (* BackingStoreRestoreAreasProcPtr)(
-	PixmapPtr /*pBackingPixmap*/,
-	RegionPtr /*pExposed*/,
-	int /*x*/,
-	int /*y*/,
-	WindowPtr /*pWin*/);
-
-typedef    void (* BackingStoreSetClipmaskRgnProcPtr)(
-	GCPtr /*pBackingGC*/,
-	RegionPtr /*pbackingCompositeClip*/);
-
-typedef    PixmapPtr (* BackingStoreGetImagePixmapProcPtr)(void);
-
-typedef    PixmapPtr (* BackingStoreGetSpansPixmapProcPtr)(void);
-
-typedef struct _BSFuncs {
-	BackingStoreSaveAreasProcPtr SaveAreas;
-	BackingStoreRestoreAreasProcPtr RestoreAreas;
-	BackingStoreSetClipmaskRgnProcPtr SetClipmaskRgn;
-	BackingStoreGetImagePixmapProcPtr GetImagePixmap;
-	BackingStoreGetSpansPixmapProcPtr GetSpansPixmap;
-} BSFuncRec, *BSFuncPtr;
-
-#endif /* _BSTORESTR_H_ */
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 26c999951..334156cbe 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -443,29 +443,6 @@ extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*
 

 extern _X_EXPORT void ddxUseMsg(void);

 

-/* int ReqLen(xReq *req, ClientPtr client)

- * Given a pointer to a *complete* request, return its length in bytes.

- * Note that if the request is a big request (as defined in the Big

- * Requests extension), the macro lies by returning 4 less than the

- * length that it actually occupies in the request buffer.  This is so you

- * can blindly compare the length with the various sz_<request> constants

- * in Xproto.h without having to know/care about big requests.

- */

-#define ReqLen(_pxReq, _client) \

- ((_pxReq->length ? \

-     (_client->swapped ? lswaps(_pxReq->length) : _pxReq->length) \

-  : ((_client->swapped ? \

-	lswapl(((CARD32*)_pxReq)[1]) : ((CARD32*)_pxReq)[1])-1) \

-  ) << 2)

-

-/* otherReqTypePtr CastxReq(xReq *req, otherReqTypePtr)

- * Cast the given request to one of type otherReqTypePtr to access

- * fields beyond the length field.

- */

-#define CastxReq(_pxReq, otherReqTypePtr) \

-    (_pxReq->length ? (otherReqTypePtr)_pxReq \

-		    : (otherReqTypePtr)(((CARD32*)_pxReq)+1))

-

 /* stuff for ReplyCallback */

 extern _X_EXPORT CallbackListPtr ReplyCallback;

 typedef struct {

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 5efe6506c..a65b63a03 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -50,7 +50,6 @@ SOFTWARE.
 

 #include "screenint.h"

 #include "regionstr.h"

-#include "bstore.h"

 #include "colormap.h"

 #include "cursor.h"

 #include "validate.h"

@@ -213,48 +212,6 @@ typedef    PixmapPtr (* CreatePixmapProcPtr)(
 typedef    Bool (* DestroyPixmapProcPtr)(

 	PixmapPtr /*pPixmap*/);

 

-typedef    void (* SaveDoomedAreasProcPtr)(

-	WindowPtr /*pWindow*/,

-	RegionPtr /*prgnSave*/,

-	int /*xorg*/,

-	int /*yorg*/);

-

-typedef    RegionPtr (* RestoreAreasProcPtr)(

-	WindowPtr /*pWindow*/,

-	RegionPtr /*prgnRestore*/);

-

-typedef    void (* ExposeCopyProcPtr)(

-	WindowPtr /*pSrc*/,

-	DrawablePtr /*pDst*/,

-	GCPtr /*pGC*/,

-	RegionPtr /*prgnExposed*/,

-	int /*srcx*/,

-	int /*srcy*/,

-	int /*dstx*/,

-	int /*dsty*/,

-	unsigned long /*plane*/);

-

-typedef    RegionPtr (* TranslateBackingStoreProcPtr)(

-	WindowPtr /*pWindow*/,

-	int /*windx*/,

-	int /*windy*/,

-	RegionPtr /*oldClip*/,

-	int /*oldx*/,

-	int /*oldy*/);

-

-typedef    RegionPtr (* ClearBackingStoreProcPtr)(

-	WindowPtr /*pWindow*/,

-	int /*x*/,

-	int /*y*/,

-	int /*w*/,

-	int /*h*/,

-	Bool /*generateExposures*/);

-

-typedef    void (* DrawGuaranteeProcPtr)(

-	WindowPtr /*pWindow*/,

-	GCPtr /*pGC*/,

-	int /*guarantee*/);

-    

 typedef    Bool (* RealizeFontProcPtr)(

 	ScreenPtr /*pScreen*/,

 	FontPtr /*pFont*/);

@@ -388,14 +345,6 @@ typedef    Bool (* MarkOverlappedWindowsProcPtr)(
 	WindowPtr /*firstChild*/,

 	WindowPtr * /*pLayerWin*/);

 

-typedef    Bool (* ChangeSaveUnderProcPtr)(

-	WindowPtr /*pLayerWin*/,

-	WindowPtr /*firstChild*/);

-

-typedef    void (* PostChangeSaveUnderProcPtr)(

-	WindowPtr /*pLayerWin*/,

-	WindowPtr /*firstChild*/);

-

 typedef    int (* ConfigNotifyProcPtr)(

 	WindowPtr /*pWin*/,

 	int /*x*/,

@@ -515,20 +464,6 @@ typedef struct _Screen {
     CreatePixmapProcPtr		CreatePixmap;

     DestroyPixmapProcPtr	DestroyPixmap;

 

-    /* Backing store procedures */

-

-    SaveDoomedAreasProcPtr	SaveDoomedAreas;

-    RestoreAreasProcPtr		RestoreAreas;

-    ExposeCopyProcPtr		ExposeCopy;

-    TranslateBackingStoreProcPtr TranslateBackingStore;

-    ClearBackingStoreProcPtr	ClearBackingStore;

-    DrawGuaranteeProcPtr	DrawGuarantee;

-    /*

-     * A read/write copy of the lower level backing store vector is needed now

-     * that the functions can be wrapped.

-     */

-    BSFuncRec			BackingStoreFuncs;

-    

     /* Font procedures */

 

     RealizeFontProcPtr		RealizeFont;

@@ -588,8 +523,6 @@ typedef struct _Screen {
 

     MarkWindowProcPtr		MarkWindow;

     MarkOverlappedWindowsProcPtr MarkOverlappedWindows;

-    ChangeSaveUnderProcPtr	ChangeSaveUnder;

-    PostChangeSaveUnderProcPtr	PostChangeSaveUnder;

     ConfigNotifyProcPtr		ConfigNotify;

     MoveWindowProcPtr		MoveWindow;

     ResizeWindowProcPtr		ResizeWindow;

diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index b86b39bc2..79628710d 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -79,8 +79,8 @@ typedef struct _DevCursorNode {
 } DevCursNodeRec, *DevCursNodePtr, *DevCursorList;

 

 typedef struct _WindowOpt {

-    VisualID		visual;		   /* default: same as parent */

     CursorPtr		cursor;		   /* default: window.cursorNone */

+    VisualID		visual;		   /* default: same as parent */

     Colormap		colormap;	   /* default: same as parent */

     Mask		dontPropagateMask; /* default: window.dontPropagate */

     Mask		otherEventMasks;   /* default: 0 */