Skip to content

N
nx-libs
Commit 12020463 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Add REGION_ macros for source compatibility with existing drivers.

This makes the region code changes source compatible with existing code, although none of them are used within the server source itself. In NX, this patch is not really necessary, but it has been backported with the previous patches for the sake of backporting the complete mi/miregion.c -> dix/region.c change in X.Org. v1: Keith Packard <keithp@keithp.com> v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
parent b0e69fe3
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 0 deletions
nx-X11/programs/Xserver/include/regionstr.h
View file @ 12020463
......@@ -372,4 +372,43 @@ extern void RegionEmpty(
extern BoxPtr RegionExtents(
RegionPtr /*pReg*/);
#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 BitmapToRegion 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) RegionContainsRect(r, b)
#define POINT_IN_REGION(pScreen, r, x, y, b) RegionContainsPoint(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) RegionFromRects(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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment