svn merge ^/branches/released .

1 files changed, 17 insertions, 18 deletions

diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index 8156671cd..117a04b00 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -135,25 +135,25 @@ winCopyWindowNativeGDI (WindowPtr pWin,
   winScreenPriv(pScreen);

 

   /* Get a pointer to the root window */

-  pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];

+  pwinRoot = pWin->drawable.pScreen->root;

 

   /* Create a region for the destination */

-  prgnDst = REGION_CREATE(pWin->drawable.pScreen, NULL, 1);

+  prgnDst = RegionCreate(NULL, 1);

 

   /* Calculate the shift from the source to the destination */

   dx = ptOldOrg.x - pWin->drawable.x;

   dy = ptOldOrg.y - pWin->drawable.y;

 

   /* Translate the region from the destination to the source? */

-  REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);

-  REGION_INTERSECT(pWin->drawable.pScreen, prgnDst, &pWin->borderClip,

+  RegionTranslate(prgnSrc, -dx, -dy);

+  RegionIntersect(prgnDst, &pWin->borderClip,

 		   prgnSrc);

 

   /* Get a pointer to the first box in the region to be copied */

-  pBox = REGION_RECTS(prgnDst);

+  pBox = RegionRects(prgnDst);

   

   /* Get the number of boxes in the region */

-  nbox = REGION_NUM_RECTS(prgnDst);

+  nbox = RegionNumRects(prgnDst);

 

   /* Allocate source points for each box */

   if(!(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec))))

@@ -170,7 +170,7 @@ winCopyWindowNativeGDI (WindowPtr pWin,
     }

 

   /* Setup loop pointers again */

-  pBoxDst = REGION_RECTS(prgnDst);

+  pBoxDst = RegionRects(prgnDst);

   ppt = pptSrc;

 

   /* BitBlt each source to the destination point */

@@ -186,7 +186,7 @@ winCopyWindowNativeGDI (WindowPtr pWin,
 

   /* Cleanup the regions, etc. */

   free(pptSrc);

-  REGION_DESTROY(pWin->drawable.pScreen, prgnDst);

+  RegionDestroy(prgnDst);

 }

 

 

@@ -413,15 +413,15 @@ winMapWindowRootless (WindowPtr pWin)
 

 

 void

-winSetShapeRootless (WindowPtr pWin)

+winSetShapeRootless (WindowPtr pWin, int kind)

 {

   ScreenPtr		pScreen = pWin->drawable.pScreen;

   winScreenPriv(pScreen);

 

-  winDebug ("winSetShapeRootless (%p)\n", pWin);

+  winDebug ("winSetShapeRootless (%p, %i)\n", pWin, kind);

 

   WIN_UNWRAP(SetShape); 

-  (*pScreen->SetShape)(pWin);

+  (*pScreen->SetShape)(pWin, kind);

   WIN_WRAP(SetShape, winSetShapeRootless);

   

   winReshapeRootless (pWin);

@@ -522,7 +522,6 @@ void
 winReshapeRootless (WindowPtr pWin)

 {

   int		nRects;

-  /* ScreenPtr	pScreen = pWin->drawable.pScreen;*/

   RegionRec	rrNewShape;

   BoxPtr	pShape, pRects, pEnd;

   HRGN		hRgn, hRgnRect;

@@ -549,13 +548,13 @@ winReshapeRootless (WindowPtr pWin)
   if (!wBoundingShape (pWin))

     return;

 

-  REGION_NULL(pScreen, &rrNewShape);

-  REGION_COPY(pScreen, &rrNewShape, wBoundingShape(pWin));

-  REGION_TRANSLATE(pScreen, &rrNewShape, pWin->borderWidth,

+  RegionNull(&rrNewShape);

+  RegionCopy(&rrNewShape, wBoundingShape(pWin));

+  RegionTranslate(&rrNewShape, pWin->borderWidth,

                    pWin->borderWidth);

   

-  nRects = REGION_NUM_RECTS(&rrNewShape);

-  pShape = REGION_RECTS(&rrNewShape);

+  nRects = RegionNumRects(&rrNewShape);

+  pShape = RegionRects(&rrNewShape);

   

   if (nRects > 0)

     {

@@ -587,7 +586,7 @@ winReshapeRootless (WindowPtr pWin)
       pWinPriv->hRgn = hRgn;

     }

 

-  REGION_UNINIT(pScreen, &rrNewShape);

+  RegionUninit(&rrNewShape);

   

   return;

 }