diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/hw/xwin/winwindowswm.c | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winwindowswm.c')
| -rw-r--r-- | xorg-server/hw/xwin/winwindowswm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c index c8f2a7073..0d262c1ea 100644 --- a/xorg-server/hw/xwin/winwindowswm.c +++ b/xorg-server/hw/xwin/winwindowswm.c @@ -414,7 +414,6 @@ ProcWindowsWMFrameDraw (register ClientPtr client) RECT rcNew;
int nCmdShow, rc;
RegionRec newShape;
- ScreenPtr pScreen;
REQUEST_SIZE_MATCH (xWindowsWMFrameDrawReq);
@@ -476,15 +475,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);
}
winDebug ("ProcWindowsWMFrameDraw - done\n");
|