diff options
Diffstat (limited to 'hw/xnest/Window.c')
| -rw-r--r-- | hw/xnest/Window.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index 11d53694e..fab2f3981 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -135,9 +135,9 @@ xnestCreateWindow(WindowPtr pWin) if (pWin->nextSib) xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin); xnestWindowPriv(pWin)->bounding_shape = - REGION_CREATE(pWin->drawable.pScreen, NULL, 1); + RegionCreate(NULL, 1); xnestWindowPriv(pWin)->clip_shape = - REGION_CREATE(pWin->drawable.pScreen, NULL, 1); + RegionCreate(NULL, 1); if (!pWin->parent) /* only the root window will have the right colormap */ xnestSetInstalledColormapWindows(pWin->drawable.pScreen); @@ -151,9 +151,9 @@ xnestDestroyWindow(WindowPtr pWin) if (pWin->nextSib) xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindowPriv(pWin)->sibling_above; - REGION_DESTROY(pWin->drawable.pScreen, + RegionDestroy( xnestWindowPriv(pWin)->bounding_shape); - REGION_DESTROY(pWin->drawable.pScreen, + RegionDestroy( xnestWindowPriv(pWin)->clip_shape); XDestroyWindow(xnestDisplay, xnestWindow(pWin)); xnestWindowPriv(pWin)->window = None; @@ -415,7 +415,7 @@ xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed) event.xexpose.type = ProcessedExpose; - if (RECT_IN_REGION(pWin->drawable.pScreen, pRgn, &Box) != rgnIN) + if (RegionContainsRect(pRgn, &Box) != rgnIN) XPutBackEvent(xnestDisplay, &event); } @@ -439,11 +439,11 @@ xnestRegionEqual(RegionPtr pReg1, RegionPtr pReg2) if (pReg1 == NullRegion || pReg2 == NullRegion) return False; - pBox1 = REGION_RECTS(pReg1); - n1 = REGION_NUM_RECTS(pReg1); + pBox1 = RegionRects(pReg1); + n1 = RegionNumRects(pReg1); - pBox2 = REGION_RECTS(pReg2); - n2 = REGION_NUM_RECTS(pReg2); + pBox2 = RegionRects(pReg2); + n2 = RegionNumRects(pReg2); if (n1 != n2) return False; @@ -466,13 +466,13 @@ xnestShapeWindow(WindowPtr pWin) wBoundingShape(pWin))) { if (wBoundingShape(pWin)) { - REGION_COPY(pWin->drawable.pScreen, + RegionCopy( xnestWindowPriv(pWin)->bounding_shape, wBoundingShape(pWin)); reg = XCreateRegion(); - pBox = REGION_RECTS(xnestWindowPriv(pWin)->bounding_shape); + pBox = RegionRects(xnestWindowPriv(pWin)->bounding_shape); for (i = 0; - i < REGION_NUM_RECTS(xnestWindowPriv(pWin)->bounding_shape); + i < RegionNumRects(xnestWindowPriv(pWin)->bounding_shape); i++) { rect.x = pBox[i].x1; rect.y = pBox[i].y1; @@ -485,7 +485,7 @@ xnestShapeWindow(WindowPtr pWin) XDestroyRegion(reg); } else { - REGION_EMPTY(pWin->drawable.pScreen, + RegionEmpty( xnestWindowPriv(pWin)->bounding_shape); XShapeCombineMask(xnestDisplay, xnestWindow(pWin), @@ -497,13 +497,13 @@ xnestShapeWindow(WindowPtr pWin) wClipShape(pWin))) { if (wClipShape(pWin)) { - REGION_COPY(pWin->drawable.pScreen, + RegionCopy( xnestWindowPriv(pWin)->clip_shape, wClipShape(pWin)); reg = XCreateRegion(); - pBox = REGION_RECTS(xnestWindowPriv(pWin)->clip_shape); + pBox = RegionRects(xnestWindowPriv(pWin)->clip_shape); for (i = 0; - i < REGION_NUM_RECTS(xnestWindowPriv(pWin)->clip_shape); + i < RegionNumRects(xnestWindowPriv(pWin)->clip_shape); i++) { rect.x = pBox[i].x1; rect.y = pBox[i].y1; @@ -516,7 +516,7 @@ xnestShapeWindow(WindowPtr pWin) XDestroyRegion(reg); } else { - REGION_EMPTY(pWin->drawable.pScreen, + RegionEmpty( xnestWindowPriv(pWin)->clip_shape); XShapeCombineMask(xnestDisplay, xnestWindow(pWin), |