diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-01-20 00:17:42 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-01-20 00:18:02 -0500 |
| commit | 20d2117eb82fb7ce91afd4f01fe1b9d4b1bf0459 (patch) | |
| tree | 3d5b1ba74a198f93ec4182e5d3ef799260e9b291 | |
| parent | e1611d8d55ade35bf8c2e1da7bc2dbf05b011301 (diff) | |
Move CreateUnclippedWinSize to mbuf
It's the only user, so.
| -rw-r--r-- | Xext/mbuf.c | 26 | ||||
| -rw-r--r-- | dix/window.c | 26 | ||||
| -rw-r--r-- | include/window.h | 3 |
3 files changed, 27 insertions, 28 deletions
diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 81b704f2f..827603204 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -1106,6 +1106,32 @@ SClobberNotifyEvent (from, to) to->state = from->state; } +RegionPtr +CreateUnclippedWinSize (WindowPtr pWin) +{ + RegionPtr pRgn; + BoxRec box; + + box.x1 = pWin->drawable.x; + box.y1 = pWin->drawable.y; + box.x2 = pWin->drawable.x + (int) pWin->drawable.width; + box.y2 = pWin->drawable.y + (int) pWin->drawable.height; + pRgn = REGION_CREATE(pWin->drawable.pScreen, &box, 1); + if (wBoundingShape (pWin) || wClipShape (pWin)) { + ScreenPtr pScreen; + pScreen = pWin->drawable.pScreen; + + REGION_TRANSLATE(pScreen, pRgn, - pWin->drawable.x, + - pWin->drawable.y); + if (wBoundingShape (pWin)) + REGION_INTERSECT(pScreen, pRgn, pRgn, wBoundingShape (pWin)); + if (wClipShape (pWin)) + REGION_INTERSECT(pScreen, pRgn, pRgn, wClipShape (pWin)); + REGION_TRANSLATE(pScreen, pRgn, pWin->drawable.x, pWin->drawable.y); + } + return pRgn; +} + static void PerformDisplayRequest (ppMultibuffers, pMultibuffer, nbuf) MultibufferPtr *pMultibuffer; diff --git a/dix/window.c b/dix/window.c index d750b3baa..92c5eff44 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1588,32 +1588,6 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib) return( pFirstChange ); } -RegionPtr -CreateUnclippedWinSize (WindowPtr pWin) -{ - RegionPtr pRgn; - BoxRec box; - - box.x1 = pWin->drawable.x; - box.y1 = pWin->drawable.y; - box.x2 = pWin->drawable.x + (int) pWin->drawable.width; - box.y2 = pWin->drawable.y + (int) pWin->drawable.height; - pRgn = REGION_CREATE(pWin->drawable.pScreen, &box, 1); - if (wBoundingShape (pWin) || wClipShape (pWin)) { - ScreenPtr pScreen; - pScreen = pWin->drawable.pScreen; - - REGION_TRANSLATE(pScreen, pRgn, - pWin->drawable.x, - - pWin->drawable.y); - if (wBoundingShape (pWin)) - REGION_INTERSECT(pScreen, pRgn, pRgn, wBoundingShape (pWin)); - if (wClipShape (pWin)) - REGION_INTERSECT(pScreen, pRgn, pRgn, wClipShape (pWin)); - REGION_TRANSLATE(pScreen, pRgn, pWin->drawable.x, pWin->drawable.y); - } - return pRgn; -} - void SetWinSize (WindowPtr pWin) { diff --git a/include/window.h b/include/window.h index 4353adf33..8c25799f5 100644 --- a/include/window.h +++ b/include/window.h @@ -156,8 +156,7 @@ extern _X_EXPORT void GetWindowAttributes( ClientPtr /*client*/, xGetWindowAttributesReply* /* wa */); -extern _X_EXPORT RegionPtr CreateUnclippedWinSize( - WindowPtr /*pWin*/); +extern RegionPtr CreateUnclippedWinSize(WindowPtr); extern _X_EXPORT void GravityTranslate( int /*x*/, |