diff options
Diffstat (limited to 'hw/xfree86/xaa/xaaCpyWin.c')
-rw-r--r-- | hw/xfree86/xaa/xaaCpyWin.c | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index c3c2690b2..e851f4a37 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -22,10 +22,7 @@ */ void -XAACopyWindow( - WindowPtr pWin, - DDXPointRec ptOldOrg, - RegionPtr prgnSrc ) +XAACopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { DDXPointPtr pptSrc, ppt; RegionRec rgnDst; @@ -33,18 +30,17 @@ XAACopyWindow( int dx, dy, nbox; WindowPtr pwinRoot; ScreenPtr pScreen = pWin->drawable.pScreen; - XAAInfoRecPtr infoRec = - GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable)); + XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE((&pWin->drawable)); - if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt) { - XAA_SCREEN_PROLOGUE (pScreen, CopyWindow); - if(infoRec->pScrn->vtSema && infoRec->NeedToSync) { - (*infoRec->Sync)(infoRec->pScrn); - infoRec->NeedToSync = FALSE; - } + if (!infoRec->pScrn->vtSema || !infoRec->ScreenToScreenBitBlt) { + XAA_SCREEN_PROLOGUE(pScreen, CopyWindow); + if (infoRec->pScrn->vtSema && infoRec->NeedToSync) { + (*infoRec->Sync) (infoRec->pScrn); + infoRec->NeedToSync = FALSE; + } (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc); - XAA_SCREEN_EPILOGUE (pScreen, CopyWindow, XAACopyWindow); - return; + XAA_SCREEN_EPILOGUE(pScreen, CopyWindow, XAACopyWindow); + return; } pwinRoot = pScreen->root; @@ -58,24 +54,24 @@ XAACopyWindow( pbox = RegionRects(&rgnDst); nbox = RegionNumRects(&rgnDst); - if(!nbox || - !(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec)))) { - RegionUninit(&rgnDst); - return; + if (!nbox || !(pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec)))) { + RegionUninit(&rgnDst); + return; } ppt = pptSrc; - while(nbox--) { - ppt->x = pbox->x1 + dx; - ppt->y = pbox->y1 + dy; - ppt++; pbox++; + while (nbox--) { + ppt->x = pbox->x1 + dx; + ppt->y = pbox->y1 + dy; + ppt++; + pbox++; } - + infoRec->ScratchGC.planemask = ~0L; infoRec->ScratchGC.alu = GXcopy; - XAADoBitBlt((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot, - &(infoRec->ScratchGC), &rgnDst, pptSrc); + XAADoBitBlt((DrawablePtr) pwinRoot, (DrawablePtr) pwinRoot, + &(infoRec->ScratchGC), &rgnDst, pptSrc); free(pptSrc); RegionUninit(&rgnDst); |