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

Wrap CopyWindow in cw, which fixes scrolling in many apps.

This commit is contained in:
Eric Anholt 2004-08-14 19:51:11 +00:00
parent e61b5d38ab
commit 183c6d0645
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
miext/cw/cw.c
View File

@ -653,6 +653,47 @@ cwPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion, int what)
SCREEN_EPILOGUE(pScreen, PaintWindowBorder, cwPaintWindowBorder); SCREEN_EPILOGUE(pScreen, PaintWindowBorder, cwPaintWindowBorder);
} }
static void
cwCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
SCREEN_PROLOGUE(pScreen, CopyWindow);
if (!cwDrawableIsRedirWindow((DrawablePtr)pWin)) {
(*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);
} else {
GCPtr pGC;
BoxPtr pBox;
int nbox, i, x_off, y_off;
int dx, dy;
DrawablePtr pBackingDrawable;
pBackingDrawable = cwGetBackingDrawable((DrawablePtr)pWin, &x_off,
&y_off);
pGC = GetScratchGC(pBackingDrawable->depth, pScreen);
ValidateGC(pBackingDrawable, pGC);
pBox = REGION_RECTS(prgnSrc);
nbox = REGION_NUM_RECTS(prgnSrc);
dx = ptOldOrg.x - pWin->drawable.x;
dy = ptOldOrg.y - pWin->drawable.y;
for (i = 0; i < nbox; i++, pBox++) {
(*pGC->ops->CopyArea)(pBackingDrawable, pBackingDrawable, pGC,
pBox->x1 + x_off, pBox->y1 + y_off,
pBox->x2 - pBox->x1, pBox->y2 - pBox->y1,
pBox->x1 + x_off + dx, pBox->y1 + y_off + dy);
}
FreeScratchGC(pGC);
}
SCREEN_EPILOGUE(pScreen, CopyWindow, cwCopyWindow);
}
/* Screen initialization/teardown */ /* Screen initialization/teardown */
void void
miInitializeCompositeWrapper(ScreenPtr pScreen) miInitializeCompositeWrapper(ScreenPtr pScreen)
@ -688,6 +729,7 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
SCREEN_EPILOGUE(pScreen, CreateGC, cwCreateGC); SCREEN_EPILOGUE(pScreen, CreateGC, cwCreateGC);
SCREEN_EPILOGUE(pScreen, PaintWindowBackground, cwPaintWindowBackground); SCREEN_EPILOGUE(pScreen, PaintWindowBackground, cwPaintWindowBackground);
SCREEN_EPILOGUE(pScreen, PaintWindowBorder, cwPaintWindowBorder); SCREEN_EPILOGUE(pScreen, PaintWindowBorder, cwPaintWindowBorder);
SCREEN_EPILOGUE(pScreen, CopyWindow, cwCopyWindow);
#ifdef RENDER #ifdef RENDER
if (GetPictureScreen (pScreen)) if (GetPictureScreen (pScreen))
@ -711,6 +753,7 @@ cwCloseScreen (int i, ScreenPtr pScreen)
pScreen->CreateGC = pScreenPriv->CreateGC; pScreen->CreateGC = pScreenPriv->CreateGC;
pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground; pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground;
pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder; pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder;
pScreen->CopyWindow = pScreenPriv->CopyWindow;
#ifdef RENDER #ifdef RENDER
if (ps) if (ps)

1
miext/cw/cw.h
View File

@ -62,6 +62,7 @@ typedef struct {
PaintWindowBackgroundProcPtr PaintWindowBackground; PaintWindowBackgroundProcPtr PaintWindowBackground;
PaintWindowBorderProcPtr PaintWindowBorder; PaintWindowBorderProcPtr PaintWindowBorder;
CopyWindowProcPtr CopyWindow;
#ifdef RENDER #ifdef RENDER
DestroyPictureProcPtr DestroyPicture; DestroyPictureProcPtr DestroyPicture;