summaryrefslogtreecommitdiff
path: root/hw/xnest/Window.c
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-06-05 20:55:29 -0700
committerJamey Sharp <jamey@minilop.net>2010-06-05 22:07:21 -0700
commita0fe6987b55b5326157b50e169b8d6b9ae26a1ae (patch)
tree30bd5b4a9fef3d1435059bb2a32d4e8d9916195c /hw/xnest/Window.c
parent424b593c7872a703d3d0c942b7e8acc0770eb023 (diff)
Clean up after removal of screen parameters from region macros.
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/xnest/Window.c')
-rw-r--r--hw/xnest/Window.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 659b13537..9ed69ed74 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -150,10 +150,8 @@ xnestDestroyWindow(WindowPtr pWin)
if (pWin->nextSib)
xnestWindowPriv(pWin->nextSib)->sibling_above =
xnestWindowPriv(pWin)->sibling_above;
- RegionDestroy(
- xnestWindowPriv(pWin)->bounding_shape);
- RegionDestroy(
- xnestWindowPriv(pWin)->clip_shape);
+ RegionDestroy(xnestWindowPriv(pWin)->bounding_shape);
+ RegionDestroy(xnestWindowPriv(pWin)->clip_shape);
XDestroyWindow(xnestDisplay, xnestWindow(pWin));
xnestWindowPriv(pWin)->window = None;
@@ -465,8 +463,7 @@ xnestShapeWindow(WindowPtr pWin)
wBoundingShape(pWin))) {
if (wBoundingShape(pWin)) {
- RegionCopy(
- xnestWindowPriv(pWin)->bounding_shape, wBoundingShape(pWin));
+ RegionCopy(xnestWindowPriv(pWin)->bounding_shape, wBoundingShape(pWin));
reg = XCreateRegion();
pBox = RegionRects(xnestWindowPriv(pWin)->bounding_shape);
@@ -484,8 +481,7 @@ xnestShapeWindow(WindowPtr pWin)
XDestroyRegion(reg);
}
else {
- RegionEmpty(
- xnestWindowPriv(pWin)->bounding_shape);
+ RegionEmpty(xnestWindowPriv(pWin)->bounding_shape);
XShapeCombineMask(xnestDisplay, xnestWindow(pWin),
ShapeBounding, 0, 0, None, ShapeSet);
@@ -496,8 +492,7 @@ xnestShapeWindow(WindowPtr pWin)
wClipShape(pWin))) {
if (wClipShape(pWin)) {
- RegionCopy(
- xnestWindowPriv(pWin)->clip_shape, wClipShape(pWin));
+ RegionCopy(xnestWindowPriv(pWin)->clip_shape, wClipShape(pWin));
reg = XCreateRegion();
pBox = RegionRects(xnestWindowPriv(pWin)->clip_shape);
@@ -515,8 +510,7 @@ xnestShapeWindow(WindowPtr pWin)
XDestroyRegion(reg);
}
else {
- RegionEmpty(
- xnestWindowPriv(pWin)->clip_shape);
+ RegionEmpty(xnestWindowPriv(pWin)->clip_shape);
XShapeCombineMask(xnestDisplay, xnestWindow(pWin),
ShapeClip, 0, 0, None, ShapeSet);