Skip to content

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

Change region implementation names to eliminate the 'mi' prefix

This prepares the file to be moved from mi to dix. This patch was done mechanically with the included scripts 'fix-miregion' run over the entire X server and 'fix-miregion-private' run over include/regionstr.h and mi/miregion.c. v1: Keith Packard <keithp@keithp.com> v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
parent 28813651
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 66 deletions
nx-X11/programs/Xserver/dix/window.c
View file @ b0e69fe3
......@@ -180,7 +180,7 @@ PrintChildren(WindowPtr p1, int indent)
p2 = p1->firstChild;
for (i=0; i<indent; i++) ErrorF( " ");
ErrorF( "%x\n", p1->drawable.id);
miPrintRegion(&p1->clipList);
RegionPrint(&p1->clipList);
PrintChildren(p2, indent+4);
p1 = p1->nextSib;
}
......@@ -195,7 +195,7 @@ PrintWindowTree()
{
ErrorF( "WINDOW %d\n", i);
pWin = WindowTable[i];
miPrintRegion(&pWin->clipList);
RegionPrint(&pWin->clipList);
p1 = pWin->firstChild;
PrintChildren(p1, 4);
}
......
nx-X11/programs/Xserver/fb/fbpixmap.c
View file @ b0e69fe3
......@@ -118,7 +118,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) && \
{ \
if ((reg)->data->numRects == (reg)->data->size) \
{ \
miRectAlloc(reg, 1); \
RegionRectAlloc(reg, 1); \
fr = RegionBoxptr(reg); \
r = fr + (reg)->data->numRects; \
} \
......@@ -314,7 +314,7 @@ fbPixmapToRegion(PixmapPtr pPix)
}
}
#ifdef DEBUG
if (!miValidRegion(pReg))
if (!RegionIsValid(pReg))
FatalError("Assertion failed file %s, line %d: expr\n", __FILE__, __LINE__);
#endif
return(pReg);
......
nx-X11/programs/Xserver/fix-miregion 0 → 100755
View file @ b0e69fe3
#!/bin/sh
sed -i \
-e 's/miRegionCreate\b/RegionCreate/g' \
-e 's/miRegionInit\b/RegionInit/g' \
-e 's/miRegionDestroy\b/RegionDestroy/g' \
-e 's/miRegionUninit\b/RegionUninit/g' \
-e 's/miRegionCopy\b/RegionCopy/g' \
-e 's/miIntersect\b/RegionIntersect/g' \
-e 's/miUnion\b/RegionUnion/g' \
-e 's/miRegionAppend\b/RegionAppend/g' \
-e 's/miRegionValidate\b/RegionValidate/g' \
-e 's/miRectsToRegion\b/RegionFromRects/g' \
-e 's/miSubtract\b/RegionSubtract/g' \
-e 's/miInverse\b/RegionInverse/g' \
-e 's/miRectIn\b/RegionContainsRect/g' \
-e 's/miTranslateRegion\b/RegionTranslate/g' \
-e 's/miRegionReset\b/RegionReset/g' \
-e 's/miRegionBreak\b/RegionBreak/g' \
-e 's/miPointInRegion\b/RegionContainsPoint/g' \
-e 's/miRegionEqual\b/RegionEqual/g' \
-e 's/miRegionNotEmpty\b/RegionNotEmpty/g' \
-e 's/miRegionEmpty\b/RegionEmpty/g' \
-e 's/miRegionExtents\b/RegionExtents/g' \
-e 's/miPrintRegion\b/RegionPrint/g' \
-e 's/miRectAlloc\b/RegionRectAlloc/g' \
-e 's/miValidRegion\b/RegionIsValid/g' \
-e 's/miRegionBroken\b/RegionBroken/g' \
-e 's/miClipSpans\b/RegionClipSpans/g' \
"$@"
nx-X11/programs/Xserver/fix-miregion-private 0 → 100755
View file @ b0e69fe3
#!/bin/sh
sed -i \
-e 's/miEmptyBox\b/RegionEmptyBox/g' \
-e 's/miEmptyData\b/RegionEmptyData/g' \
-e 's/miBrokenData\b/RegionBrokenData/g' \
-e 's/miBrokenRegion\b/RegionBrokenRegion/g' \
-e 's/miCoalesce\b/RegionCoalesce/g' \
-e 's/miAppendNonO\b/RegionAppendNonO/g' \
-e 's/miRegionOp\b/RegionOp/g' \
-e 's/miSetExtents\b/RegionSetExtents/g' \
-e 's/miIntersectO\b/RegionIntersectO/g' \
-e 's/miUnionO\b/RegionUnionO/g' \
-e 's/miSubtractO\b/RegionSubtractO/g' \
"$@"
nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
View file @ b0e69fe3
......@@ -226,7 +226,7 @@ PrintChildren(WindowPtr p1, int indent)
p2 = p1->firstChild;
for (i=0; i<indent; i++) ErrorF( " ");
ErrorF( "%x\n", p1->drawable.id);
miPrintRegion(&p1->clipList);
RegionPrint(&p1->clipList);
PrintChildren(p2, indent+4);
p1 = p1->nextSib;
}
......@@ -241,7 +241,7 @@ PrintWindowTree()
{
ErrorF( "WINDOW %d\n", i);
pWin = WindowTable[i];
miPrintRegion(&pWin->clipList);
RegionPrint(&pWin->clipList);
p1 = pWin->firstChild;
PrintChildren(p1, 4);
}
......
nx-X11/programs/Xserver/include/regionstr.h
View file @ b0e69fe3
......@@ -74,16 +74,16 @@ typedef struct pixman_region16 RegionRec, *RegionPtr;
typedef struct pixman_region16_data RegDataRec, *RegDataPtr;
extern BoxRec miEmptyBox;
extern RegDataRec miEmptyData;
extern RegDataRec miBrokenData;
extern BoxRec RegionEmptyBox;
extern RegDataRec RegionEmptyData;
extern RegDataRec RegionBrokenData;
static inline Bool RegionNil(RegionPtr reg) {
return ((reg)->data && !(reg)->data->numRects);
}
static inline Bool RegionNar(RegionPtr reg) {
return ((reg)->data == &miBrokenData);
return ((reg)->data == &RegionBrokenData);
}
static inline int RegionNumRects(RegionPtr reg) {
......@@ -127,7 +127,7 @@ static inline void RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
}
else
{
(_pReg)->extents = miEmptyBox;
(_pReg)->extents = RegionEmptyBox;
if (((_size) > 1) && ((_pReg)->data =
(RegDataPtr)malloc(RegionSizeof(_size))))
{
......@@ -135,7 +135,7 @@ static inline void RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
(_pReg)->data->numRects = 0;
}
else
(_pReg)->data = &miEmptyData;
(_pReg)->data = &RegionEmptyData;
}
}
......@@ -167,7 +167,7 @@ static inline void RegionEmpty(RegionPtr _pReg)
RegionUninit(_pReg);
(_pReg)->extents.x2 = (_pReg)->extents.x1;
(_pReg)->extents.y2 = (_pReg)->extents.y1;
(_pReg)->data = &miEmptyData;
(_pReg)->data = &RegionEmptyData;
}
static inline BoxPtr RegionExtents(RegionPtr _pReg)
......@@ -177,8 +177,8 @@ static inline BoxPtr RegionExtents(RegionPtr _pReg)
static inline void RegionNull(RegionPtr _pReg)
{
(_pReg)->extents = miEmptyBox;
(_pReg)->data = &miEmptyData;
(_pReg)->extents = RegionEmptyBox;
(_pReg)->data = &RegionEmptyData;
}
static inline Bool
......@@ -285,91 +285,91 @@ RegionEqual(RegionPtr reg1, RegionPtr reg2)
return pixman_region_equal (reg1, reg2);
}
extern RegionPtr miRegionCreate(
extern RegionPtr RegionCreate(
BoxPtr /*rect*/,
int /*size*/);
extern void miRegionInit(
extern void RegionInit(
RegionPtr /*pReg*/,
BoxPtr /*rect*/,
int /*size*/);
extern void miRegionDestroy(
extern void RegionDestroy(
RegionPtr /*pReg*/);
extern void miRegionUninit(
extern void RegionUninit(
RegionPtr /*pReg*/);
extern Bool miRegionCopy(
extern Bool RegionCopy(
RegionPtr /*dst*/,
RegionPtr /*src*/);
extern Bool miIntersect(
extern Bool RegionIntersect(
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
RegionPtr /*reg2*/);
extern Bool miUnion(
extern Bool RegionUnion(
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
RegionPtr /*reg2*/);
extern Bool miRegionAppend(
extern Bool RegionAppend(
RegionPtr /*dstrgn*/,
RegionPtr /*rgn*/);
extern Bool miRegionValidate(
extern Bool RegionValidate(
RegionPtr /*badreg*/,
Bool * /*pOverlap*/);
extern RegionPtr miRectsToRegion(
extern RegionPtr RegionFromRects(
int /*nrects*/,
xRectanglePtr /*prect*/,
int /*ctype*/);
extern Bool miSubtract(
extern Bool RegionSubtract(
RegionPtr /*regD*/,
RegionPtr /*regM*/,
RegionPtr /*regS*/);
extern Bool miInverse(
extern Bool RegionInverse(
RegionPtr /*newReg*/,
RegionPtr /*reg1*/,
BoxPtr /*invRect*/);
extern int miRectIn(
extern int RegionContainsRect(
RegionPtr /*region*/,
BoxPtr /*prect*/);
extern void miTranslateRegion(
extern void RegionTranslate(
RegionPtr /*pReg*/,
int /*x*/,
int /*y*/);
extern void miRegionReset(
extern void RegionReset(
RegionPtr /*pReg*/,
BoxPtr /*pBox*/);
extern Bool miRegionBreak(
extern Bool RegionBreak(
RegionPtr /*pReg*/);
extern Bool miPointInRegion(
extern Bool RegionContainsPoint(
RegionPtr /*pReg*/,
int /*x*/,
int /*y*/,
BoxPtr /*box*/);
extern Bool miRegionEqual(
extern Bool RegionEqual(
RegionPtr /*pReg1*/,
RegionPtr /*pReg2*/);
extern Bool miRegionNotEmpty(
extern Bool RegionNotEmpty(
RegionPtr /*pReg*/);
extern void miRegionEmpty(
extern void RegionEmpty(
RegionPtr /*pReg*/);
extern BoxPtr miRegionExtents(
extern BoxPtr RegionExtents(
RegionPtr /*pReg*/);
#endif /* REGIONSTRUCT_H */
nx-X11/programs/Xserver/mi/mi.h
View file @ b0e69fe3
......@@ -403,16 +403,14 @@ extern void miPushPixels(
int /*yOrg*/
);
/* miregion.c */
/* see also region.h */
extern Bool miRectAlloc(
extern Bool RegionRectAlloc(
RegionPtr /*pRgn*/,
int /*n*/
);
extern void miSetExtents(
extern void RegionSetExtents(
RegionPtr /*pReg*/
);
......@@ -421,13 +419,12 @@ extern int miFindMaxBand(
);
#ifdef DEBUG
extern Bool miValidRegion(
extern Bool RegionIsValid(
RegionPtr /*prgn*/
);
#endif
extern Bool miRegionDataCopy(RegionPtr dst, RegionPtr src);
extern Bool miRegionBroken(RegionPtr pReg);
extern Bool RegionBroken(RegionPtr pReg);
/* miscrinit.c */
......
nx-X11/programs/Xserver/mi/migc.c
View file @ b0e69fe3
......@@ -33,6 +33,7 @@ from The Open Group.
#include <dix-config.h>
#endif
#include "regionstr.h"
#include "scrnintstr.h"
#include "gcstruct.h"
#include "pixmapstr.h"
......
nx-X11/programs/Xserver/mi/miscrinit.c
View file @ b0e69fe3
......@@ -267,31 +267,31 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
/* CreateColormap, DestroyColormap, InstallColormap, UninstallColormap */
/* ListInstalledColormaps, StoreColors, ResolveColor */
#ifdef NEED_SCREEN_REGIONS
pScreen->RegionCreate = miRegionCreate;
pScreen->RegionInit = miRegionInit;
pScreen->RegionCopy = miRegionCopy;
pScreen->RegionDestroy = miRegionDestroy;
pScreen->RegionUninit = miRegionUninit;
pScreen->Intersect = miIntersect;
pScreen->Union = miUnion;
pScreen->Subtract = miSubtract;
pScreen->Inverse = miInverse;
pScreen->RegionReset = miRegionReset;
pScreen->TranslateRegion = miTranslateRegion;
pScreen->RectIn = miRectIn;
pScreen->PointInRegion = miPointInRegion;
pScreen->RegionNotEmpty = miRegionNotEmpty;
pScreen->RegionEqual = miRegionEqual;
pScreen->RegionBroken = miRegionBroken;
pScreen->RegionBreak = miRegionBreak;
pScreen->RegionEmpty = miRegionEmpty;
pScreen->RegionExtents = miRegionExtents;
pScreen->RegionAppend = miRegionAppend;
pScreen->RegionValidate = miRegionValidate;
pScreen->RegionCreate = RegionCreate;
pScreen->RegionInit = RegionInit;
pScreen->RegionCopy = RegionCopy;
pScreen->RegionDestroy = RegionDestroy;
pScreen->RegionUninit = RegionUninit;
pScreen->Intersect = RegionIntersect;
pScreen->Union = RegionUnion;
pScreen->Subtract = RegionSubtract;
pScreen->Inverse = RegionInverse;
pScreen->RegionReset = RegionReset;
pScreen->TranslateRegion = RegionTranslate;
pScreen->RectIn = RegionContainsRect;
pScreen->PointInRegion = RegionContainsPoint;
pScreen->RegionNotEmpty = RegionNotEmpty;
pScreen->RegionEqual = RegionEqual;
pScreen->RegionBroken = RegionBroken;
pScreen->RegionBreak = RegionBreak;
pScreen->RegionEmpty = RegionEmpty;
pScreen->RegionExtents = RegionExtents;
pScreen->RegionAppend = RegionAppend;
pScreen->RegionValidate = RegionValidate;
#endif /* NEED_SCREEN_REGIONS */
/* BitmapToRegion */
#ifdef NEED_SCREEN_REGIONS
pScreen->RectsToRegion = miRectsToRegion;
pScreen->RectsToRegion = RegionFromRects;
#endif /* NEED_SCREEN_REGIONS */
pScreen->SendGraphicsExpose = miSendGraphicsExpose;
pScreen->BlockHandler = (ScreenBlockHandlerProcPtr)NoopDDA;
......
nx-X11/programs/Xserver/mi/mispans.h
View file @ b0e69fe3
......@@ -101,7 +101,7 @@ extern void miDisposeSpanGroup(
SpanGroup * /*spanGroup*/
);
extern int miClipSpans(
extern int RegionClipSpans(
RegionPtr /*prgnDst*/,
DDXPointPtr /*ppt*/,
int * /*pwidth*/,
......
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