diff options
Diffstat (limited to 'xorg-server/miext/rootless/rootlessWindow.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 12 | 
1 files changed, 9 insertions, 3 deletions
| diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 20fdaba8d..ef0d42e4c 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 \
 @@ -683,7 +689,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);
      }
 @@ -699,7 +705,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);
 @@ -780,7 +786,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 */
 | 
