frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move CreateUnclippedWinSize to mbuf 

It's the only user, so.
This commit is contained in:
Adam Jackson 2009-01-20 00:17:42 -05:00
parent e1611d8d55
commit 20d2117eb8
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Xext/mbuf.c
View File

@ -1106,6 +1106,32 @@ SClobberNotifyEvent (from, to)
to->state = from->state; 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 static void
PerformDisplayRequest (ppMultibuffers, pMultibuffer, nbuf) PerformDisplayRequest (ppMultibuffers, pMultibuffer, nbuf)
MultibufferPtr *pMultibuffer; MultibufferPtr *pMultibuffer;

26
dix/window.c
View File

@ -1588,32 +1588,6 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
return( pFirstChange ); 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 void
SetWinSize (WindowPtr pWin) SetWinSize (WindowPtr pWin)
{ {

3
include/window.h
View File

@ -156,8 +156,7 @@ extern _X_EXPORT void GetWindowAttributes(
ClientPtr /*client*/, ClientPtr /*client*/,
xGetWindowAttributesReply* /* wa */); xGetWindowAttributesReply* /* wa */);
extern _X_EXPORT RegionPtr CreateUnclippedWinSize( extern RegionPtr CreateUnclippedWinSize(WindowPtr);
WindowPtr /*pWin*/);
extern _X_EXPORT void GravityTranslate( extern _X_EXPORT void GravityTranslate(
int /*x*/, int /*x*/,