aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi/miregion.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
commit4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch)
treec1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/mi/miregion.c
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/mi/miregion.c')
-rw-r--r--xorg-server/mi/miregion.c167
1 files changed, 55 insertions, 112 deletions
diff --git a/xorg-server/mi/miregion.c b/xorg-server/mi/miregion.c
index 45768a34f..bbeac877b 100644
--- a/xorg-server/mi/miregion.c
+++ b/xorg-server/mi/miregion.c
@@ -88,10 +88,15 @@ Equipment Corporation.
#include <pixman.h>
#undef assert
-#ifdef DEBUG
-#define assert(expr) {if (!(expr)) \
- FatalError("Assertion failed file %s, line %d: expr\n", \
- __FILE__, __LINE__); }
+#ifdef REGION_DEBUG
+#define assert(expr) { \
+ CARD32 *foo = NULL; \
+ if (!(expr)) { \
+ ErrorF("Assertion failed file %s, line %d: %s\n", \
+ __FILE__, __LINE__, #expr); \
+ *foo = 0xdeadbeef; /* to get a backtrace */ \
+ } \
+ }
#else
#define assert(expr)
#endif
@@ -232,9 +237,7 @@ InitRegions (void)
*****************************************************************/
_X_EXPORT RegionPtr
-miRegionCreate(rect, size)
- BoxPtr rect;
- int size;
+miRegionCreate(BoxPtr rect, int size)
{
RegionPtr pReg;
@@ -248,8 +251,7 @@ miRegionCreate(rect, size)
}
_X_EXPORT void
-miRegionDestroy(pReg)
- RegionPtr pReg;
+miRegionDestroy(RegionPtr pReg)
{
pixman_region_fini (pReg);
if (pReg != &miBrokenRegion)
@@ -257,8 +259,7 @@ miRegionDestroy(pReg)
}
_X_EXPORT void
-miPrintRegion(rgn)
- RegionPtr rgn;
+miPrintRegion(RegionPtr rgn)
{
int num, size;
int i;
@@ -267,27 +268,24 @@ miPrintRegion(rgn)
num = REGION_NUM_RECTS(rgn);
size = REGION_SIZE(rgn);
rects = REGION_RECTS(rgn);
- ErrorF("num: %d size: %d\n", num, size);
- ErrorF("extents: %d %d %d %d\n",
+ ErrorF("[mi] num: %d size: %d\n", num, size);
+ ErrorF("[mi] extents: %d %d %d %d\n",
rgn->extents.x1, rgn->extents.y1, rgn->extents.x2, rgn->extents.y2);
for (i = 0; i < num; i++)
- ErrorF("%d %d %d %d \n",
+ ErrorF("[mi] %d %d %d %d \n",
rects[i].x1, rects[i].y1, rects[i].x2, rects[i].y2);
- ErrorF("\n");
+ ErrorF("[mi] \n");
}
_X_EXPORT Bool
-miRegionEqual(reg1, reg2)
- RegionPtr reg1;
- RegionPtr reg2;
+miRegionEqual(RegionPtr reg1, RegionPtr reg2)
{
return pixman_region_equal (reg1, reg2);
}
#ifdef DEBUG
Bool
-miValidRegion(reg)
- RegionPtr reg;
+miValidRegion(RegionPtr reg)
{
int i, numRects;
@@ -338,10 +336,7 @@ miValidRegion(reg)
*****************************************************************/
_X_EXPORT void
-miRegionInit(pReg, rect, size)
- RegionPtr pReg;
- BoxPtr rect;
- int size;
+miRegionInit(RegionPtr pReg, BoxPtr rect, int size)
{
if (rect)
pixman_region_init_with_extents (pReg, rect);
@@ -350,15 +345,13 @@ miRegionInit(pReg, rect, size)
}
_X_EXPORT void
-miRegionUninit(pReg)
- RegionPtr pReg;
+miRegionUninit(RegionPtr pReg)
{
pixman_region_fini (pReg);
}
Bool
-miRegionBreak (pReg)
- RegionPtr pReg;
+miRegionBreak (RegionPtr pReg)
{
xfreeData (pReg);
pReg->extents = miEmptyBox;
@@ -367,9 +360,7 @@ miRegionBreak (pReg)
}
_X_EXPORT Bool
-miRectAlloc(
- RegionPtr pRgn,
- int n)
+miRectAlloc(RegionPtr pRgn, int n)
{
RegDataPtr data;
@@ -408,9 +399,7 @@ miRectAlloc(
}
_X_EXPORT Bool
-miRegionCopy(dst, src)
- RegionPtr dst;
- RegionPtr src;
+miRegionCopy(RegionPtr dst, RegionPtr src)
{
return pixman_region_copy (dst, src);
}
@@ -903,10 +892,11 @@ miSetExtents (RegionPtr pReg)
*/
/*ARGSUSED*/
_X_EXPORT Bool
-miIntersect(newReg, reg1, reg2)
- RegionPtr newReg; /* destination Region */
- RegionPtr reg1;
- RegionPtr reg2; /* source regions */
+miIntersect(
+ RegionPtr newReg, /* destination Region */
+ RegionPtr reg1,
+ RegionPtr reg2 /* source regions */
+ )
{
return pixman_region_intersect (newReg, reg1, reg2);
}
@@ -1005,11 +995,12 @@ miUnionO (
return TRUE;
}
-_X_EXPORT Bool
-miUnion(newReg, reg1, reg2)
- RegionPtr newReg; /* destination Region */
- RegionPtr reg1;
- RegionPtr reg2; /* source regions */
+_X_EXPORT Bool
+miUnion(
+ RegionPtr newReg, /* destination Region */
+ RegionPtr reg1,
+ RegionPtr reg2 /* source regions */
+ )
{
return pixman_region_union (newReg, reg1, reg2);
}
@@ -1036,9 +1027,7 @@ miUnion(newReg, reg1, reg2)
*
*/
_X_EXPORT Bool
-miRegionAppend(dstrgn, rgn)
- RegionPtr dstrgn;
- RegionPtr rgn;
+miRegionAppend(RegionPtr dstrgn, RegionPtr rgn)
{
int numRects, dnumRects, size;
BoxPtr new, old;
@@ -1222,9 +1211,7 @@ QuickSortRects(
*/
_X_EXPORT Bool
-miRegionValidate(badreg, pOverlap)
- RegionPtr badreg;
- Bool *pOverlap;
+miRegionValidate(RegionPtr badreg, Bool *pOverlap)
{
/* Descriptor for regions under construction in Step 2. */
typedef struct {
@@ -1413,10 +1400,7 @@ bail:
}
_X_EXPORT RegionPtr
-miRectsToRegion(nrects, prect, ctype)
- int nrects;
- xRectangle *prect;
- int ctype;
+miRectsToRegion(int nrects, xRectangle *prect, int ctype)
{
RegionPtr pRgn;
@@ -1530,10 +1514,7 @@ miRectsToRegion(nrects, prect, ctype)
*-----------------------------------------------------------------------
*/
_X_EXPORT Bool
-miSubtract(regD, regM, regS)
- RegionPtr regD;
- RegionPtr regM;
- RegionPtr regS;
+miSubtract(RegionPtr regD, RegionPtr regM, RegionPtr regS)
{
return pixman_region_subtract (regD, regM, regS);
}
@@ -1558,17 +1539,16 @@ miSubtract(regD, regM, regS)
*-----------------------------------------------------------------------
*/
_X_EXPORT Bool
-miInverse(newReg, reg1, invRect)
- RegionPtr newReg; /* Destination region */
- RegionPtr reg1; /* Region to invert */
- BoxPtr invRect; /* Bounding box for inversion */
+miInverse(
+ RegionPtr newReg, /* Destination region */
+ RegionPtr reg1, /* Region to invert */
+ BoxPtr invRect /* Bounding box for inversion */
+ )
{
return pixman_region_inverse (newReg, reg1, invRect);
}
_X_EXPORT int
-miRectIn(region, prect)
- RegionPtr region;
- BoxPtr prect;
+miRectIn(RegionPtr region, BoxPtr prect)
{
return pixman_region_contains_rectangle (region, prect);
}
@@ -1578,34 +1558,30 @@ miRectIn(region, prect)
*/
_X_EXPORT void
-miTranslateRegion(pReg, x, y)
- RegionPtr pReg;
- int x;
- int y;
+miTranslateRegion(RegionPtr pReg, int x, int y)
{
pixman_region_translate (pReg, x, y);
}
_X_EXPORT void
-miRegionReset(pReg, pBox)
- RegionPtr pReg;
- BoxPtr pBox;
+miRegionReset(RegionPtr pReg, BoxPtr pBox)
{
pixman_region_reset (pReg, pBox);
}
_X_EXPORT Bool
-miPointInRegion(pReg, x, y, box)
- RegionPtr pReg;
- int x, y;
- BoxPtr box; /* "return" value */
+miPointInRegion(
+ RegionPtr pReg,
+ int x,
+ int y,
+ BoxPtr box /* "return" value */
+ )
{
return pixman_region_contains_point (pReg, x, y, box);
}
_X_EXPORT Bool
-miRegionNotEmpty(pReg)
- RegionPtr pReg;
+miRegionNotEmpty(RegionPtr pReg)
{
return pixman_region_not_empty (pReg);
}
@@ -1618,8 +1594,7 @@ miRegionBroken(RegionPtr pReg)
}
_X_EXPORT void
-miRegionEmpty(pReg)
- RegionPtr pReg;
+miRegionEmpty(RegionPtr pReg)
{
good(pReg);
xfreeData(pReg);
@@ -1629,8 +1604,7 @@ miRegionEmpty(pReg)
}
_X_EXPORT BoxPtr
-miRegionExtents(pReg)
- RegionPtr pReg;
+miRegionExtents(RegionPtr pReg)
{
good(pReg);
return(&pReg->extents);
@@ -1869,34 +1843,3 @@ miClipSpans(
}
return (pwidthNew - pwidthNewStart);
}
-
-/* find the band in a region with the most rectangles */
-_X_EXPORT int
-miFindMaxBand(prgn)
- RegionPtr prgn;
-{
- int nbox;
- BoxPtr pbox;
- int nThisBand;
- int nMaxBand = 0;
- short yThisBand;
-
- good(prgn);
- nbox = REGION_NUM_RECTS(prgn);
- pbox = REGION_RECTS(prgn);
-
- while(nbox > 0)
- {
- yThisBand = pbox->y1;
- nThisBand = 0;
- while((nbox > 0) && (pbox->y1 == yThisBand))
- {
- nbox--;
- pbox++;
- nThisBand++;
- }
- if (nThisBand > nMaxBand)
- nMaxBand = nThisBand;
- }
- return (nMaxBand);
-}