mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
dix: Remove the backing store leftovers
Reviewed-by: Keith Packard <keithp@keithp.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
if XORG
|
||||
sdk_HEADERS = \
|
||||
XIstubs.h \
|
||||
bstore.h \
|
||||
bstorestr.h \
|
||||
callback.h \
|
||||
closestr.h \
|
||||
closure.h \
|
||||
|
||||
@@ -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_ */
|
||||
@@ -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_ */
|
||||
@@ -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*/);
|
||||
@@ -511,20 +468,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;
|
||||
|
||||
Reference in New Issue
Block a user