Please note this patch breaks the ABI.
Signed-off-by: Oliver McFadden <[email protected]>
---
hw/dmx/doc/dmx.sgml | 3 +--
hw/xquartz/quartz.c | 1 -
include/scrnintstr.h | 10 ----------
mi/miexpose.c | 2 --
4 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/hw/dmx/doc/dmx.sgml b/hw/dmx/doc/dmx.sgml
index ef66d11..6aa0ec5 100644
--- a/hw/dmx/doc/dmx.sgml
+++ b/hw/dmx/doc/dmx.sgml
@@ -1001,8 +1001,7 @@ default routine is chosen during GC validation.
<p>Note that some pointers to functions that draw to the screen are
stored in the Screen structure. They include GetImage(), GetSpans(),
-PaintWindowBackground(), PaintWindowBorder(), CopyWindow() and
-RestoreAreas().
+CopyWindow() and RestoreAreas().
<sect2>Xnest
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 462be87..36d18eb 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -279,7 +279,6 @@ void QuartzUpdateScreens(void) {
pRoot = WindowTable[pScreen->myNum];
AppleWMSetScreenOrigin(pRoot);
pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
- //pScreen->PaintWindowBackground (pRoot, &pRoot->borderClip,
PW_BACKGROUND);
miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND);
/* <rdar://problem/7770779> pointer events are clipped to old display
region after display reconfiguration
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index a4ca0c6..3a77e0c 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -168,14 +168,6 @@ typedef void (* WindowExposuresProcPtr)(
RegionPtr /*prgn*/,
RegionPtr /*other_exposed*/);
-typedef void (* PaintWindowProcPtr)(
- WindowPtr /*pWindow*/,
- RegionPtr /*pRegion*/,
- int /*what*/);
-
-typedef PaintWindowProcPtr PaintWindowBackgroundProcPtr;
-typedef PaintWindowProcPtr PaintWindowBorderProcPtr;
-
typedef void (* CopyWindowProcPtr)(
WindowPtr /*pWindow*/,
DDXPointRec /*ptOldOrg*/,
@@ -497,8 +489,6 @@ typedef struct _Screen {
ValidateTreeProcPtr ValidateTree;
PostValidateTreeProcPtr PostValidateTree;
WindowExposuresProcPtr WindowExposures;
- PaintWindowBackgroundProcPtr PaintWindowBackground; /** unused */
- PaintWindowBorderProcPtr PaintWindowBorder; /** unused */
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify;
diff --git a/mi/miexpose.c b/mi/miexpose.c
index a99e530..bf4cfe5 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -297,7 +297,6 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr
pDstDrawable,
if (extents)
{
- /* PaintWindowBackground doesn't clip, so we have to */
REGION_INTERSECT(pscr, &rgnExposed, &rgnExposed, &pWin->clipList);
}
miPaintWindow((WindowPtr)pDstDrawable, &rgnExposed, PW_BACKGROUND);
@@ -497,7 +496,6 @@ miWindowExposures( WindowPtr pWin, RegionPtr prgn,
RegionPtr other_exposed)
REGION_RESET( pWin->drawable.pScreen, exposures, &box);
REGION_UNION( pWin->drawable.pScreen, prgn, prgn, exposures);
}
- /* PaintWindowBackground doesn't clip, so we have to */
REGION_INTERSECT( pWin->drawable.pScreen, prgn, prgn,
&pWin->clipList);
}
if (prgn && !REGION_NIL(prgn))
--
1.6.1
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
