This makes the region code changes source compatible with existing
code, although none of them are used within the server source itself.

Signed-off-by: Keith Packard <kei...@keithp.com>
---
 include/regionstr.h |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/include/regionstr.h b/include/regionstr.h
index a670370..bc8d88e 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -328,4 +328,43 @@ extern _X_EXPORT int ClipSpans(
     int /*fSorted*/
 );
 
+#define INCLUDE_LEGACY_REGION_DEFINES
+#ifdef INCLUDE_LEGACY_REGION_DEFINES
+
+#define REGION_NIL                             RegionNil
+#define REGION_NAR                             RegionNar
+#define REGION_NUM_RECTS                       RegionNumRects
+#define REGION_SIZE                            RegionSize
+#define REGION_RECTS                           RegionRects
+#define REGION_BOXPTR                          RegionBoxptr
+#define REGION_BOX                             RegionBox
+#define REGION_TOP                             RegionTop
+#define REGION_END                             RegionEnd
+#define REGION_SZOF                            RegionSizeof
+#define BITMAP_TO_REGION                       BitmapToRegion
+#define REGION_CREATE(pScreen, r, s)           RegionCreate(r,s)
+#define REGION_COPY(pScreen, d, r)             RegionCopy(d, r)
+#define REGION_DESTROY(pScreen, r)             RegionDestroy(r)
+#define REGION_INTERSECT(pScreen, res, r1, r2) RegionIntersect(res, r1, r2)
+#define REGION_UNION(pScreen, res, r1, r2)     RegionUnion(res, r1, r2)
+#define REGION_SUBTRACT(pScreen, res, r1, r2)  RegionSubtract(res, r1, r2)
+#define REGION_INVERSE(pScreen, n, r, b)       RegionInverse(n, r, b)
+#define REGION_TRANSLATE(pScreen, r, x, y)     RegionTranslate(r, x, y)
+#define RECT_IN_REGION(pScreen, r, b)          RectInRegion(r, b)
+#define POINT_IN_REGION(pScreen, r, x, y, b)   PointInRegion(r, x, y, b)
+#define REGION_EQUAL(pScreen, r1, r2)          RegionEqual(r1, r2)
+#define REGION_APPEND(pScreen, d, r)           RegionAppend(d, r)
+#define REGION_VALIDATE(pScreen, r, o)         RegionValidate(r, o)
+#define RECTS_TO_REGION(pScreen, n, r, c)      RectsToRegion(n, r, c)
+#define REGION_BREAK(pScreen, r)               RegionBreak(r)
+#define REGION_INIT(pScreen, r, b, s)          RegionInit(r, b, s)
+#define REGION_UNINIT(pScreen, r)              RegionUninit(r)
+#define REGION_RESET(pScreen, r, b)            RegionReset(r, b)
+#define REGION_NOTEMPTY(pScreen, r)            RegionNotEmpty(r)
+#define REGION_BROKEN(pScreen, r)              RegionBroken(r)
+#define REGION_EMPTY(pScreen, r)               RegionEmpty(r)
+#define REGION_EXTENTS(pScreen, r)             RegionExtents(r)
+#define REGION_NULL(pScreen, r)                        RegionNull(r)
+
+#endif /* INCLUDE_LEGACY_REGION_DEFINES */
 #endif /* REGIONSTRUCT_H */
-- 
1.7.1

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to