diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-06-05 20:55:29 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-05 22:07:21 -0700 |
| commit | a0fe6987b55b5326157b50e169b8d6b9ae26a1ae (patch) | |
| tree | 30bd5b4a9fef3d1435059bb2a32d4e8d9916195c /hw/xwin | |
| parent | 424b593c7872a703d3d0c942b7e8acc0770eb023 (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/xwin')
| -rw-r--r-- | hw/xwin/winmultiwindowshape.c | 5 | ||||
| -rw-r--r-- | hw/xwin/winwindow.c | 1 | ||||
| -rwxr-xr-x | hw/xwin/winwindowswm.c | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c index 9b4910b9c..6b7042e09 100644 --- a/hw/xwin/winmultiwindowshape.c +++ b/hw/xwin/winmultiwindowshape.c @@ -119,10 +119,7 @@ winReshapeMultiWindow (WindowPtr pWin) RegionNull(&rrNewShape); RegionCopy(&rrNewShape, wBoundingShape(pWin)); - RegionTranslate( - &rrNewShape, - pWin->borderWidth, - pWin->borderWidth); + RegionTranslate(&rrNewShape, pWin->borderWidth, pWin->borderWidth); nRects = RegionNumRects(&rrNewShape); pShape = RegionRects(&rrNewShape); diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index bc0614dc1..783760f4b 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -564,7 +564,6 @@ void winReshapeRootless (WindowPtr pWin) { int nRects; - /* ScreenPtr pScreen = pWin->drawable.pScreen;*/ RegionRec rrNewShape; BoxPtr pShape, pRects, pEnd; HRGN hRgn, hRgnRect; diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c index 5935ac453..34d7f4b5c 100755 --- a/hw/xwin/winwindowswm.c +++ b/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,7 +490,6 @@ 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. */ |