Skip to content

Commit 9b6f5f5

Browse files
keith-packardkeith-packard
committed
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. Reviewed-by: Jamey Sharp <[email protected]> Signed-off-by: Keith Packard <[email protected]>
1 parent 1768e51 commit 9b6f5f5

10 files changed

+192
-149
lines changed

‎dix/window.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ PrintChildren(WindowPtr p1, int indent)
195195
ErrorF("[dix] ");
196196
for (i=0; i<indent; i++) ErrorF(" ");
197197
ErrorF("%lx\n", p1->drawable.id);
198-
miPrintRegion(&p1->clipList);
198+
RegionPrint(&p1->clipList);
199199
PrintChildren(p2, indent+4);
200200
p1 = p1->nextSib;
201201
}
@@ -211,7 +211,7 @@ PrintWindowTree(void)
211211
{
212212
ErrorF("[dix] WINDOW %d\n", i);
213213
pWin = screenInfo.screens[i]->root;
214-
miPrintRegion(&pWin->clipList);
214+
RegionPrint(&pWin->clipList);
215215
p1 = pWin->firstChild;
216216
PrintChildren(p1, 4);
217217
}

‎exa/exa_accel.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ exaHWCopyNtoN (DrawablePtr pSrcDrawable,
407407
rects[i].height = pbox[i].y2 - pbox[i].y1;
408408
}
409409

410-
/* This must match the miRegionCopy() logic for reversing rect order */
410+
/* This must match the RegionCopy() logic for reversing rect order */
411411
if (nbox == 1 || (dx > 0 && dy > 0) ||
412412
(pDstDrawable != pSrcDrawable &&
413413
(pDstDrawable->type != DRAWABLE_WINDOW ||

‎fb/fbpixmap.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) && \
115115
{ \
116116
if ((reg)->data->numRects == (reg)->data->size) \
117117
{ \
118-
miRectAlloc(reg, 1); \
118+
RegionRectAlloc(reg, 1); \
119119
fr = REGION_BOXPTR(reg); \
120120
r = fr + (reg)->data->numRects; \
121121
} \
@@ -315,7 +315,7 @@ fbPixmapToRegion(PixmapPtr pPix)
315315

316316
fbFinishAccess(&pPix->drawable);
317317
#ifdef DEBUG
318-
if (!miValidRegion(pReg))
318+
if (!RegionIsValid(pReg))
319319
FatalError("Assertion failed file %s, line %d: expr\n", __FILE__, __LINE__);
320320
#endif
321321
return(pReg);

‎fix-miregion

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/sh
2+
sed -i \
3+
-e 's/miRegionCreate\b/RegionCreate/g' \
4+
-e 's/miRegionInit\b/RegionInit/g' \
5+
-e 's/miRegionDestroy\b/RegionDestroy/g' \
6+
-e 's/miRegionUninit\b/RegionUninit/g' \
7+
-e 's/miRegionCopy\b/RegionCopy/g' \
8+
-e 's/miIntersect\b/RegionIntersect/g' \
9+
-e 's/miUnion\b/RegionUnion/g' \
10+
-e 's/miRegionAppend\b/RegionAppend/g' \
11+
-e 's/miRegionValidate\b/RegionValidate/g' \
12+
-e 's/miRectsToRegion\b/RegionFromRects/g' \
13+
-e 's/miSubtract\b/RegionSubtract/g' \
14+
-e 's/miInverse\b/RegionInverse/g' \
15+
-e 's/miRectIn\b/RegionContainsRect/g' \
16+
-e 's/miTranslateRegion\b/RegionTranslate/g' \
17+
-e 's/miRegionReset\b/RegionReset/g' \
18+
-e 's/miRegionBreak\b/RegionBreak/g' \
19+
-e 's/miPointInRegion\b/RegionContainsPoint/g' \
20+
-e 's/miRegionEqual\b/RegionEqual/g' \
21+
-e 's/miRegionNotEmpty\b/RegionNotEmpty/g' \
22+
-e 's/miRegionEmpty\b/RegionEmpty/g' \
23+
-e 's/miRegionExtents\b/RegionExtents/g' \
24+
-e 's/miPrintRegion\b/RegionPrint/g' \
25+
-e 's/miRectAlloc\b/RegionRectAlloc/g' \
26+
-e 's/miValidRegion\b/RegionIsValid/g' \
27+
-e 's/miRegionBroken\b/RegionBroken/g' \
28+
-e 's/miClipSpans\b/RegionClipSpans/g' \
29+
"$@"

‎fix-miregion-private

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/sh
2+
sed -i \
3+
-e 's/miEmptyBox\b/RegionEmptyBox/g' \
4+
-e 's/miEmptyData\b/RegionEmptyData/g' \
5+
-e 's/miBrokenData\b/RegionBrokenData/g' \
6+
-e 's/miBrokenRegion\b/RegionBrokenRegion/g' \
7+
-e 's/miCoalesce\b/RegionCoalesce/g' \
8+
-e 's/miAppendNonO\b/RegionAppendNonO/g' \
9+
-e 's/miRegionOp\b/RegionOp/g' \
10+
-e 's/miSetExtents\b/RegionSetExtents/g' \
11+
-e 's/miIntersectO\b/RegionIntersectO/g' \
12+
-e 's/miUnionO\b/RegionUnionO/g' \
13+
-e 's/miSubtractO\b/RegionSubtractO/g' \
14+
"$@"

‎include/regionstr.h

+46-46
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ typedef struct pixman_region16 RegionRec, *RegionPtr;
6666

6767
typedef struct pixman_region16_data RegDataRec, *RegDataPtr;
6868

69-
extern _X_EXPORT BoxRec miEmptyBox;
70-
extern _X_EXPORT RegDataRec miEmptyData;
71-
extern _X_EXPORT RegDataRec miBrokenData;
69+
extern _X_EXPORT BoxRec RegionEmptyBox;
70+
extern _X_EXPORT RegDataRec RegionEmptyData;
71+
extern _X_EXPORT RegDataRec RegionBrokenData;
7272

7373
#define REGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
7474
/* not a region */
75-
#define REGION_NAR(reg) ((reg)->data == &miBrokenData)
75+
#define REGION_NAR(reg) ((reg)->data == &RegionBrokenData)
7676
#define REGION_NUM_RECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
7777
#define REGION_SIZE(reg) ((reg)->data ? (reg)->data->size : 0)
7878
#define REGION_RECTS(reg) ((reg)->data ? (BoxPtr)((reg)->data + 1) \
@@ -84,52 +84,52 @@ extern _X_EXPORT RegDataRec miBrokenData;
8484
#define REGION_SZOF(n) (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)))
8585

8686
#define REGION_CREATE(_pScreen, _rect, _size) \
87-
miRegionCreate(_rect, _size)
87+
RegionCreate(_rect, _size)
8888

8989
#define REGION_COPY(_pScreen, dst, src) \
90-
miRegionCopy(dst, src)
90+
RegionCopy(dst, src)
9191

9292
#define REGION_DESTROY(_pScreen, _pReg) \
93-
miRegionDestroy(_pReg)
93+
RegionDestroy(_pReg)
9494

9595
#define REGION_INTERSECT(_pScreen, newReg, reg1, reg2) \
96-
miIntersect(newReg, reg1, reg2)
96+
RegionIntersect(newReg, reg1, reg2)
9797

9898
#define REGION_UNION(_pScreen, newReg, reg1, reg2) \
99-
miUnion(newReg, reg1, reg2)
99+
RegionUnion(newReg, reg1, reg2)
100100

101101
#define REGION_SUBTRACT(_pScreen, newReg, reg1, reg2) \
102-
miSubtract(newReg, reg1, reg2)
102+
RegionSubtract(newReg, reg1, reg2)
103103

104104
#define REGION_INVERSE(_pScreen, newReg, reg1, invRect) \
105-
miInverse(newReg, reg1, invRect)
105+
RegionInverse(newReg, reg1, invRect)
106106

107107
#define REGION_TRANSLATE(_pScreen, _pReg, _x, _y) \
108-
miTranslateRegion(_pReg, _x, _y)
108+
RegionTranslate(_pReg, _x, _y)
109109

110110
#define RECT_IN_REGION(_pScreen, _pReg, prect) \
111-
miRectIn(_pReg, prect)
111+
RegionContainsRect(_pReg, prect)
112112

113113
#define POINT_IN_REGION(_pScreen, _pReg, _x, _y, prect) \
114-
miPointInRegion(_pReg, _x, _y, prect)
114+
RegionContainsPoint(_pReg, _x, _y, prect)
115115

116116
#define REGION_APPEND(_pScreen, dstrgn, rgn) \
117-
miRegionAppend(dstrgn, rgn)
117+
RegionAppend(dstrgn, rgn)
118118

119119
#define REGION_VALIDATE(_pScreen, badreg, pOverlap) \
120-
miRegionValidate(badreg, pOverlap)
120+
RegionValidate(badreg, pOverlap)
121121

122122
#define BITMAP_TO_REGION(_pScreen, pPix) \
123123
(*(_pScreen)->BitmapToRegion)(pPix) /* no mi version?! */
124124

125125
#define RECTS_TO_REGION(_pScreen, nrects, prect, ctype) \
126-
miRectsToRegion(nrects, prect, ctype)
126+
RegionFromRects(nrects, prect, ctype)
127127

128128
#define REGION_EQUAL(_pScreen, _pReg1, _pReg2) \
129-
miRegionEqual(_pReg1, _pReg2)
129+
RegionEqual(_pReg1, _pReg2)
130130

131131
#define REGION_BREAK(_pScreen, _pReg) \
132-
miRegionBreak(_pReg)
132+
RegionBreak(_pReg)
133133

134134
#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
135135
{ \
@@ -140,15 +140,15 @@ extern _X_EXPORT RegDataRec miBrokenData;
140140
} \
141141
else \
142142
{ \
143-
(_pReg)->extents = miEmptyBox; \
143+
(_pReg)->extents = RegionEmptyBox; \
144144
if (((_size) > 1) && ((_pReg)->data = \
145145
(RegDataPtr)malloc(REGION_SZOF(_size)))) \
146146
{ \
147147
(_pReg)->data->size = (_size); \
148148
(_pReg)->data->numRects = 0; \
149149
} \
150150
else \
151-
(_pReg)->data = &miEmptyData; \
151+
(_pReg)->data = &RegionEmptyData; \
152152
} \
153153
}
154154

@@ -179,16 +179,16 @@ extern _X_EXPORT RegDataRec miBrokenData;
179179
REGION_UNINIT(_pScreen, _pReg); \
180180
(_pReg)->extents.x2 = (_pReg)->extents.x1; \
181181
(_pReg)->extents.y2 = (_pReg)->extents.y1; \
182-
(_pReg)->data = &miEmptyData; \
182+
(_pReg)->data = &RegionEmptyData; \
183183
}
184184

185185
#define REGION_EXTENTS(_pScreen, _pReg) \
186186
(&(_pReg)->extents)
187187

188188
#define REGION_NULL(_pScreen, _pReg) \
189189
{ \
190-
(_pReg)->extents = miEmptyBox; \
191-
(_pReg)->data = &miEmptyData; \
190+
(_pReg)->extents = RegionEmptyBox; \
191+
(_pReg)->data = &RegionEmptyData; \
192192
}
193193

194194
#ifndef REGION_NULL
@@ -200,94 +200,94 @@ extern _X_EXPORT RegDataRec miBrokenData;
200200

201201
extern _X_EXPORT void InitRegions (void);
202202

203-
extern _X_EXPORT RegionPtr miRegionCreate(
203+
extern _X_EXPORT RegionPtr RegionCreate(
204204
BoxPtr /*rect*/,
205205
int /*size*/);
206206

207-
extern _X_EXPORT void miRegionInit(
207+
extern _X_EXPORT void RegionInit(
208208
RegionPtr /*pReg*/,
209209
BoxPtr /*rect*/,
210210
int /*size*/);
211211

212-
extern _X_EXPORT void miRegionDestroy(
212+
extern _X_EXPORT void RegionDestroy(
213213
RegionPtr /*pReg*/);
214214

215-
extern _X_EXPORT void miRegionUninit(
215+
extern _X_EXPORT void RegionUninit(
216216
RegionPtr /*pReg*/);
217217

218-
extern _X_EXPORT Bool miRegionCopy(
218+
extern _X_EXPORT Bool RegionCopy(
219219
RegionPtr /*dst*/,
220220
RegionPtr /*src*/);
221221

222-
extern _X_EXPORT Bool miIntersect(
222+
extern _X_EXPORT Bool RegionIntersect(
223223
RegionPtr /*newReg*/,
224224
RegionPtr /*reg1*/,
225225
RegionPtr /*reg2*/);
226226

227-
extern _X_EXPORT Bool miUnion(
227+
extern _X_EXPORT Bool RegionUnion(
228228
RegionPtr /*newReg*/,
229229
RegionPtr /*reg1*/,
230230
RegionPtr /*reg2*/);
231231

232-
extern _X_EXPORT Bool miRegionAppend(
232+
extern _X_EXPORT Bool RegionAppend(
233233
RegionPtr /*dstrgn*/,
234234
RegionPtr /*rgn*/);
235235

236-
extern _X_EXPORT Bool miRegionValidate(
236+
extern _X_EXPORT Bool RegionValidate(
237237
RegionPtr /*badreg*/,
238238
Bool * /*pOverlap*/);
239239

240-
extern _X_EXPORT RegionPtr miRectsToRegion(
240+
extern _X_EXPORT RegionPtr RegionFromRects(
241241
int /*nrects*/,
242242
xRectanglePtr /*prect*/,
243243
int /*ctype*/);
244244

245-
extern _X_EXPORT Bool miSubtract(
245+
extern _X_EXPORT Bool RegionSubtract(
246246
RegionPtr /*regD*/,
247247
RegionPtr /*regM*/,
248248
RegionPtr /*regS*/);
249249

250-
extern _X_EXPORT Bool miInverse(
250+
extern _X_EXPORT Bool RegionInverse(
251251
RegionPtr /*newReg*/,
252252
RegionPtr /*reg1*/,
253253
BoxPtr /*invRect*/);
254254

255-
extern _X_EXPORT int miRectIn(
255+
extern _X_EXPORT int RegionContainsRect(
256256
RegionPtr /*region*/,
257257
BoxPtr /*prect*/);
258258

259-
extern _X_EXPORT void miTranslateRegion(
259+
extern _X_EXPORT void RegionTranslate(
260260
RegionPtr /*pReg*/,
261261
int /*x*/,
262262
int /*y*/);
263263

264-
extern _X_EXPORT void miRegionReset(
264+
extern _X_EXPORT void RegionReset(
265265
RegionPtr /*pReg*/,
266266
BoxPtr /*pBox*/);
267267

268-
extern _X_EXPORT Bool miRegionBreak(
268+
extern _X_EXPORT Bool RegionBreak(
269269
RegionPtr /*pReg*/);
270270

271-
extern _X_EXPORT Bool miPointInRegion(
271+
extern _X_EXPORT Bool RegionContainsPoint(
272272
RegionPtr /*pReg*/,
273273
int /*x*/,
274274
int /*y*/,
275275
BoxPtr /*box*/);
276276

277-
extern _X_EXPORT Bool miRegionEqual(
277+
extern _X_EXPORT Bool RegionEqual(
278278
RegionPtr /*pReg1*/,
279279
RegionPtr /*pReg2*/);
280280

281-
extern _X_EXPORT Bool miRegionNotEmpty(
281+
extern _X_EXPORT Bool RegionNotEmpty(
282282
RegionPtr /*pReg*/);
283283

284-
extern _X_EXPORT void miRegionEmpty(
284+
extern _X_EXPORT void RegionEmpty(
285285
RegionPtr /*pReg*/);
286286

287-
extern _X_EXPORT BoxPtr miRegionExtents(
287+
extern _X_EXPORT BoxPtr RegionExtents(
288288
RegionPtr /*pReg*/);
289289

290-
extern _X_EXPORT void miPrintRegion(
290+
extern _X_EXPORT void RegionPrint(
291291
RegionPtr /*pReg*/);
292292

293293
#endif /* REGIONSTRUCT_H */

‎mi/mi.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -422,18 +422,18 @@ extern _X_EXPORT void miPushPixels(
422422

423423
/* see also region.h */
424424

425-
extern _X_EXPORT Bool miRectAlloc(
425+
extern _X_EXPORT Bool RegionRectAlloc(
426426
RegionPtr /*pRgn*/,
427427
int /*n*/
428428
);
429429

430430
#ifdef DEBUG
431-
extern _X_EXPORT Bool miValidRegion(
431+
extern _X_EXPORT Bool RegionIsValid(
432432
RegionPtr /*prgn*/
433433
);
434434
#endif
435435

436-
extern _X_EXPORT Bool miRegionBroken(RegionPtr pReg);
436+
extern _X_EXPORT Bool RegionBroken(RegionPtr pReg);
437437

438438
/* miscrinit.c */
439439

0 commit comments

Comments
 (0)