From 4c61bf84b11e26e6f22648668c95ea760a379163 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Jun 2010 12:14:52 +0000 Subject: xserver git update 11/6/2010 --- xorg-server/hw/xwin/winwindowswm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'xorg-server/hw/xwin/winwindowswm.c') diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c index 218fddb6a..f6125656d 100644 --- a/xorg-server/hw/xwin/winwindowswm.c +++ b/xorg-server/hw/xwin/winwindowswm.c @@ -425,7 +425,6 @@ ProcWindowsWMFrameDraw (register ClientPtr client) RECT rcNew; int nCmdShow, rc; RegionRec newShape; - ScreenPtr pScreen; REQUEST_SIZE_MATCH (xWindowsWMFrameDrawReq); @@ -491,15 +490,14 @@ ProcWindowsWMFrameDraw (register ClientPtr client) if (wBoundingShape(pWin) != NULL) { - pScreen = pWin->drawable.pScreen; /* wBoundingShape is relative to *inner* origin of window. Translate by borderWidth to get the outside-relative position. */ - REGION_NULL(pScreen, &newShape); - REGION_COPY(pScreen, &newShape, wBoundingShape(pWin)); - REGION_TRANSLATE(pScreen, &newShape, pWin->borderWidth, pWin->borderWidth); + RegionNull(&newShape); + RegionCopy(&newShape, wBoundingShape(pWin)); + RegionTranslate(&newShape, pWin->borderWidth, pWin->borderWidth); winMWExtWMReshapeFrame (pRLWinPriv, &newShape); - REGION_UNINIT(pScreen, &newShape); + RegionUninit(&newShape); } #if CYGMULTIWINDOW_DEBUG ErrorF ("ProcWindowsWMFrameDraw - done\n"); -- cgit v1.2.3