diff options
Diffstat (limited to 'xorg-server/miext/rootless/rootlessWindow.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index cfcb6e558..cf1611c1e 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -51,6 +51,12 @@ extern Bool no_configure_window; #include "rootlessCommon.h" #include "rootlessWindow.h" +#ifdef _MSC_VER +#define inline __inline +#include "xplugin.h" +extern int darwinMainScreenX, darwinMainScreenY; +#endif + #define SCREEN_TO_GLOBAL_X \ (pScreen->x + rootlessGlobalOffsetX) #define SCREEN_TO_GLOBAL_Y \ @@ -684,7 +690,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, if (gResizeDeathCount == 1) { /* Simple case, we only have a single source pixmap. */ - fbCopyRegion(&gResizeDeathPix[0]->drawable, + miCopyRegion(&gResizeDeathPix[0]->drawable, &pScreen->GetWindowPixmap(pWin)->drawable, 0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0); } @@ -700,7 +706,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionNull(&clipped); RegionIntersect(&rgnDst, &clip, &clipped); - fbCopyRegion(&gResizeDeathPix[i]->drawable, + miCopyRegion(&gResizeDeathPix[i]->drawable, &pScreen->GetWindowPixmap(pWin)->drawable, 0, &clipped, dx, dy, fbCopyWindowProc, 0, 0); @@ -778,7 +784,7 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) else { RootlessStartDrawing(pWin); - fbCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin, + miCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin, 0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0); /* prgnSrc has been translated to dst position */ @@ -995,6 +1001,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity, } else if (gravity) { /* The general case. Just copy everything. */ + BoxRec tmpBoxRec={oldX, oldY, oldX2, oldY2}; RootlessStartDrawing(pWin); @@ -1003,8 +1010,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity, memcpy(gResizeDeathBits, winRec->pixelData, winRec->bytesPerRow * winRec->height); - gResizeDeathBounds[0] = (BoxRec) { - oldX, oldY, oldX2, oldY2}; + gResizeDeathBounds[0] = tmpBoxRec; gResizeDeathPix[0] = GetScratchPixmapHeader(pScreen, winRec->width, winRec->height, @@ -1041,8 +1047,8 @@ StartFrameResize(WindowPtr pWin, Bool gravity, window bits. */ if (need_window_source) { - gResizeDeathBounds[0] = (BoxRec) { - oldX, oldY, oldX2, oldY2}; + BoxRec tmpBoxRec={oldX, oldY, oldX2, oldY2}; + gResizeDeathBounds[0] = tmpBoxRec; gResizeDeathPix[0] = GetScratchPixmapHeader(pScreen, oldW, oldH, winRec->win->drawable.depth, |