From: Dave Airlie <[email protected]> >From what I can see these functions act the exact same way, that is unless I'm missing something subtle.
Signed-off-by: Dave Airlie <[email protected]> --- fb/fb.h | 13 --------- fb/fbwindow.c | 55 +------------------------------------- fb/wfbrename.h | 1 - miext/rootless/rootlessWindow.c | 10 +++--- 4 files changed, 7 insertions(+), 72 deletions(-) diff --git a/fb/fb.h b/fb/fb.h index 988136f..047452f 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -2033,19 +2033,6 @@ extern _X_EXPORT Bool fbUnmapWindow(WindowPtr pWindow); extern _X_EXPORT void -fbCopyWindowProc (DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - BoxPtr pbox, - int nbox, - int dx, - int dy, - Bool reverse, - Bool upsidedown, - Pixel bitplane, - void *closure); - -extern _X_EXPORT void fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc); diff --git a/fb/fbwindow.c b/fb/fbwindow.c index d01e6d4..d41b783 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -63,57 +63,6 @@ fbUnmapWindow(WindowPtr pWindow) } void -fbCopyWindowProc (DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - BoxPtr pbox, - int nbox, - int dx, - int dy, - Bool reverse, - Bool upsidedown, - Pixel bitplane, - void *closure) -{ - FbBits *src; - FbStride srcStride; - int srcBpp; - int srcXoff, srcYoff; - FbBits *dst; - FbStride dstStride; - int dstBpp; - int dstXoff, dstYoff; - - fbGetDrawable (pSrcDrawable, src, srcStride, srcBpp, srcXoff, srcYoff); - fbGetDrawable (pDstDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff); - - while (nbox--) - { - fbBlt (src + (pbox->y1 + dy + srcYoff) * srcStride, - srcStride, - (pbox->x1 + dx + srcXoff) * srcBpp, - - dst + (pbox->y1 + dstYoff) * dstStride, - dstStride, - (pbox->x1 + dstXoff) * dstBpp, - - (pbox->x2 - pbox->x1) * dstBpp, - (pbox->y2 - pbox->y1), - - GXcopy, - FB_ALLONES, - dstBpp, - - reverse, - upsidedown); - pbox++; - } - - fbFinishAccess (pDstDrawable); - fbFinishAccess (pSrcDrawable); -} - -void fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) @@ -139,8 +88,8 @@ fbCopyWindow(WindowPtr pWin, #endif miCopyRegion (pDrawable, pDrawable, - 0, - &rgnDst, dx, dy, fbCopyWindowProc, 0, 0); + NULL, + &rgnDst, dx, dy, fbCopyNtoN, 0, 0); RegionUninit(&rgnDst); fbValidateDrawable (&pWin->drawable); diff --git a/fb/wfbrename.h b/fb/wfbrename.h index b8d7c41..28c751c 100644 --- a/fb/wfbrename.h +++ b/fb/wfbrename.h @@ -46,7 +46,6 @@ #define fbCopyPlane wfbCopyPlane #define fbCopyRegion wfbCopyRegion #define fbCopyWindow wfbCopyWindow -#define fbCopyWindowProc wfbCopyWindowProc #define fbCreateDefColormap wfbCreateDefColormap #define fbCreateGC wfbCreateGC #define fbCreatePixmap wfbCreatePixmap diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 9550415..37f44af 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -685,7 +685,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, fbCopyRegion(&gResizeDeathPix[0]->drawable, &pScreen->GetWindowPixmap(pWin)->drawable, 0, - &rgnDst, dx, dy, fbCopyWindowProc, 0, 0); + &rgnDst, dx, dy, fbCopyNtoN, 0, 0); } else { int i; @@ -701,7 +701,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, fbCopyRegion(&gResizeDeathPix[i]->drawable, &pScreen->GetWindowPixmap(pWin)->drawable, 0, - &clipped, dx, dy, fbCopyWindowProc, 0, 0); + &clipped, dx, dy, fbCopyNtoN, 0, 0); RegionUninit(&clipped); RegionUninit(&clip); @@ -781,7 +781,7 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) RootlessStartDrawing(pWin); fbCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin, - 0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0); + 0, &rgnDst, dx, dy, fbCopyNtoN, 0, 0); /* prgnSrc has been translated to dst position */ RootlessDamageRegion(pWin, prgnSrc); @@ -1089,8 +1089,8 @@ StartFrameResize(WindowPtr pWin, Bool gravity, ((PixmapPtr) dst)->devPrivate.ptr = winRec->pixelData; SetPixmapBaseToScreen(dst, newX, newY); - fbCopyWindowProc(&src->drawable, &dst->drawable, NULL, - &rect, 1, 0, 0, FALSE, FALSE, 0, 0); + fbCopyNtoN(&src->drawable, &dst->drawable, NULL, + &rect, 1, 0, 0, FALSE, FALSE, 0, 0); ((PixmapPtr) dst)->devPrivate.ptr = winRec->pixelData; SetPixmapBaseToScreen(dst, oldX, oldY); -- 1.7.1 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
