diff options
Diffstat (limited to 'xorg-server/miext/rootless/rootlessWindow.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index a8f296a39..50cf7708e 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 \ @@ -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, |