frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scrnintstr.h: removed unused PaintWindow function pointers. 

Please note this patch breaks the ABI.

Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Oliver McFadden 2010-05-14 07:49:31 +03:00
parent 71296885b0
commit a4fbc0feda
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/dmx/doc/dmx.sgml
View File

@ -1001,8 +1001,7 @@ default routine is chosen during GC validation.
<p>Note that some pointers to functions that draw to the screen are <p>Note that some pointers to functions that draw to the screen are
stored in the Screen structure. They include GetImage(), GetSpans(), stored in the Screen structure. They include GetImage(), GetSpans(),
PaintWindowBackground(), PaintWindowBorder(), CopyWindow() and CopyWindow() and RestoreAreas().
RestoreAreas().
<sect2>Xnest <sect2>Xnest

1
hw/xquartz/quartz.c
View File

@ -279,7 +279,6 @@ void QuartzUpdateScreens(void) {
pRoot = WindowTable[pScreen->myNum]; pRoot = WindowTable[pScreen->myNum];
AppleWMSetScreenOrigin(pRoot); AppleWMSetScreenOrigin(pRoot);
pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL); pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
//pScreen->PaintWindowBackground (pRoot, &pRoot->borderClip, PW_BACKGROUND);
miPaintWindow(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 /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration

10
include/scrnintstr.h
View File

@ -168,14 +168,6 @@ typedef void (* WindowExposuresProcPtr)(
RegionPtr /*prgn*/, RegionPtr /*prgn*/,
RegionPtr /*other_exposed*/); RegionPtr /*other_exposed*/);
typedef void (* PaintWindowProcPtr)(
WindowPtr /*pWindow*/,
RegionPtr /*pRegion*/,
int /*what*/);
typedef PaintWindowProcPtr PaintWindowBackgroundProcPtr;
typedef PaintWindowProcPtr PaintWindowBorderProcPtr;
typedef void (* CopyWindowProcPtr)( typedef void (* CopyWindowProcPtr)(
WindowPtr /*pWindow*/, WindowPtr /*pWindow*/,
DDXPointRec /*ptOldOrg*/, DDXPointRec /*ptOldOrg*/,
@ -497,8 +489,6 @@ typedef struct _Screen {
ValidateTreeProcPtr ValidateTree; ValidateTreeProcPtr ValidateTree;
PostValidateTreeProcPtr PostValidateTree; PostValidateTreeProcPtr PostValidateTree;
WindowExposuresProcPtr WindowExposures; WindowExposuresProcPtr WindowExposures;
PaintWindowBackgroundProcPtr PaintWindowBackground; /** unused */
PaintWindowBorderProcPtr PaintWindowBorder; /** unused */
CopyWindowProcPtr CopyWindow; CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground; ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify; ClipNotifyProcPtr ClipNotify;

4
mi/miexpose.c
View File

@ -297,7 +297,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
if (extents) if (extents)
{ {
/* PaintWindowBackground doesn't clip, so we have to */ /* miPaintWindow doesn't clip, so we have to */
REGION_INTERSECT(pscr, &rgnExposed, &rgnExposed, &pWin->clipList); REGION_INTERSECT(pscr, &rgnExposed, &rgnExposed, &pWin->clipList);
} }
miPaintWindow((WindowPtr)pDstDrawable, &rgnExposed, PW_BACKGROUND); miPaintWindow((WindowPtr)pDstDrawable, &rgnExposed, PW_BACKGROUND);
@ -497,7 +497,7 @@ miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)
REGION_RESET( pWin->drawable.pScreen, exposures, &box); REGION_RESET( pWin->drawable.pScreen, exposures, &box);
REGION_UNION( pWin->drawable.pScreen, prgn, prgn, exposures); REGION_UNION( pWin->drawable.pScreen, prgn, prgn, exposures);
} }
/* PaintWindowBackground doesn't clip, so we have to */ /* miPaintWindow doesn't clip, so we have to */
REGION_INTERSECT( pWin->drawable.pScreen, prgn, prgn, &pWin->clipList); REGION_INTERSECT( pWin->drawable.pScreen, prgn, prgn, &pWin->clipList);
} }
if (prgn && !REGION_NIL(prgn)) if (prgn && !REGION_NIL(prgn))