diff options
| author | Keith Packard <keithp@keithp.com> | 2014-10-09 15:05:26 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-10-09 15:05:26 +0200 |
| commit | 6622f0cb1761501f3287ffa8d3cbca3fd30f9f0c (patch) | |
| tree | 26036fe6f885371d324075494a904538daeafe58 /include | |
| parent | f12e7f4980416b74988052a04d0f2487b2c4a7e9 (diff) | |
| parent | 5ecd7866f7587d620f000e802a262c7cd4b9df33 (diff) | |
Merge remote-tracking branch 'ajax/mi-cleanup'
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix.h | 6 | ||||
| -rw-r--r-- | include/scrnintstr.h | 10 | ||||
| -rw-r--r-- | include/windowstr.h | 3 |
3 files changed, 8 insertions, 11 deletions
diff --git a/include/dix.h b/include/dix.h index 61ecc8df2..116da2e2c 100644 --- a/include/dix.h +++ b/include/dix.h @@ -254,6 +254,12 @@ extern _X_EXPORT void ClientWakeup(ClientPtr /*client */ ); extern _X_EXPORT Bool ClientIsAsleep(ClientPtr /*client */ ); +extern _X_EXPORT void SendGraphicsExpose(ClientPtr /*client */ , + RegionPtr /*pRgn */ , + XID /*drawable */ , + int /*major */ , + int /*minor */); + /* atom.c */ extern _X_EXPORT Atom MakeAtom(const char * /*string */ , diff --git a/include/scrnintstr.h b/include/scrnintstr.h index 6955e77fd..269ff5a0c 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -155,8 +155,7 @@ typedef void (*PostValidateTreeProcPtr) (WindowPtr /*pParent */ , VTKind /*kind */ ); typedef void (*WindowExposuresProcPtr) (WindowPtr /*pWindow */ , - RegionPtr /*prgn */ , - RegionPtr /*other_exposed */ ); + RegionPtr /*prgn */); typedef void (*CopyWindowProcPtr) (WindowPtr /*pWindow */ , DDXPointRec /*ptOldOrg */ , @@ -253,12 +252,6 @@ typedef void (*ResolveColorProcPtr) (unsigned short * /*pred */ , typedef RegionPtr (*BitmapToRegionProcPtr) (PixmapPtr /*pPix */ ); -typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ , - RegionPtr /*pRgn */ , - XID /*drawable */ , - int /*major */ , - int /*minor */ ); - typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr pScreen, void *pTimeout, void *pReadmask); @@ -541,7 +534,6 @@ typedef struct _Screen { /* Region procedures */ BitmapToRegionProcPtr BitmapToRegion; - SendGraphicsExposeProcPtr SendGraphicsExpose; /* os layer procedures */ diff --git a/include/windowstr.h b/include/windowstr.h index 6b79bbd2e..740f4a6c0 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -144,14 +144,13 @@ typedef struct _Window { Mask eventMask; /* mask from the creating client */ PixUnion background; PixUnion border; - void *backStorage; /* null when BS disabled */ WindowOptPtr optional; unsigned backgroundState:2; /* None, Relative, Pixel, Pixmap */ unsigned borderIsPixel:1; unsigned cursorIsNone:1; /* else real cursor (might inherit) */ unsigned backingStore:2; + unsigned backStorage:1; /* if bs is allocated */ unsigned saveUnder:1; - unsigned DIXsaveUnder:1; unsigned bitGravity:4; unsigned winGravity:4; unsigned overrideRedirect:1; |