summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
Diffstat (limited to 'mi')
-rw-r--r--mi/miarc.c25
-rw-r--r--mi/mibank.c34
-rw-r--r--mi/mibitblt.c48
-rw-r--r--mi/midispcur.c11
-rw-r--r--mi/miexpose.c16
-rw-r--r--mi/mifillarc.c40
-rw-r--r--mi/mifillrct.c12
-rw-r--r--mi/mifpolycon.c18
-rw-r--r--mi/miglblt.c7
-rw-r--r--mi/miinitext.c20
-rw-r--r--mi/mipolycon.c16
-rw-r--r--mi/mipolygen.c6
-rw-r--r--mi/mipolypnt.c4
-rw-r--r--mi/mipolyrect.c4
-rw-r--r--mi/miscrinit.c2
-rw-r--r--mi/mispans.c2
-rw-r--r--mi/miwideline.c20
-rw-r--r--mi/mizerarc.c10
-rw-r--r--mi/mizerline.c8
19 files changed, 154 insertions, 149 deletions
diff --git a/mi/miarc.c b/mi/miarc.c
index 3b77ce74a..5ccd11127 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -925,14 +925,14 @@ miFillWideEllipse(
yorgu = parc->height + pGC->lineWidth;
n = (sizeof(int) * 2) * yorgu;
- widths = (int *)ALLOCATE_LOCAL(n + (sizeof(DDXPointRec) * 2) * yorgu);
+ widths = (int *)xalloc(n + (sizeof(DDXPointRec) * 2) * yorgu);
if (!widths)
return;
points = (DDXPointPtr)((char *)widths + n);
spdata = miComputeWideEllipse((int)pGC->lineWidth, parc, &mustFree);
if (!spdata)
{
- DEALLOCATE_LOCAL(widths);
+ xfree(widths);
return;
}
pts = points;
@@ -1025,7 +1025,7 @@ miFillWideEllipse(
xfree(spdata);
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
- DEALLOCATE_LOCAL(widths);
+ xfree(widths);
}
/*
@@ -1155,7 +1155,8 @@ miPolyArc(pDraw, pGC, narcs, parcs)
/* allocate a 1 bit deep pixmap of the appropriate size, and
* validate it */
pDrawTo = (DrawablePtr)(*pDraw->pScreen->CreatePixmap)
- (pDraw->pScreen, pixmapWidth, pixmapHeight, 1);
+ (pDraw->pScreen, pixmapWidth, pixmapHeight, 1,
+ CREATE_PIXMAP_USAGE_SCRATCH);
if (!pDrawTo)
{
FreeScratchGC(pGCTo);
@@ -1898,13 +1899,13 @@ miComputeArcs (
isDoubleDash = (pGC->lineStyle == LineDoubleDash);
dashOffset = pGC->dashOffset;
- data = (struct arcData *) ALLOCATE_LOCAL (narcs * sizeof (struct arcData));
+ data = (struct arcData *) xalloc (narcs * sizeof (struct arcData));
if (!data)
return (miPolyArcPtr)NULL;
arcs = (miPolyArcPtr) xalloc (sizeof (*arcs) * (isDoubleDash ? 2 : 1));
if (!arcs)
{
- DEALLOCATE_LOCAL(data);
+ xfree(data);
return (miPolyArcPtr)NULL;
}
for (i = 0; i < narcs; i++) {
@@ -2253,11 +2254,11 @@ miComputeArcs (
arcs[iphase].arcs[arcs[iphase].narcs-1].cap =
arcs[iphase].ncaps;
}
- DEALLOCATE_LOCAL(data);
+ xfree(data);
return arcs;
arcfail:
miFreeArcs(arcs, pGC);
- DEALLOCATE_LOCAL(data);
+ xfree(data);
return (miPolyArcPtr)NULL;
}
@@ -3161,8 +3162,8 @@ fillSpans (
if (nspans == 0)
return;
- xSpan = xSpans = (DDXPointPtr) ALLOCATE_LOCAL (nspans * sizeof (DDXPointRec));
- xWidth = xWidths = (int *) ALLOCATE_LOCAL (nspans * sizeof (int));
+ xSpan = xSpans = (DDXPointPtr) xalloc (nspans * sizeof (DDXPointRec));
+ xWidth = xWidths = (int *) xalloc (nspans * sizeof (int));
if (xSpans && xWidths)
{
i = 0;
@@ -3182,9 +3183,9 @@ fillSpans (
}
disposeFinalSpans ();
if (xSpans)
- DEALLOCATE_LOCAL (xSpans);
+ xfree (xSpans);
if (xWidths)
- DEALLOCATE_LOCAL (xWidths);
+ xfree (xWidths);
finalMiny = 0;
finalMaxy = -1;
finalSize = 0;
diff --git a/mi/mibank.c b/mi/mibank.c
index 05813e561..ea79e9d36 100644
--- a/mi/mibank.c
+++ b/mi/mibank.c
@@ -172,8 +172,8 @@ typedef struct _miBankQueue
(*pScreenPriv->BankInfo.SetDestinationBank)(pScreen, (_no)) - \
(pScreenPriv->BankInfo.BankSize * (_no)))
-#define ALLOCATE_LOCAL_ARRAY(atype, ntype) \
- (atype *)ALLOCATE_LOCAL((ntype) * sizeof(atype))
+#define xalloc_ARRAY(atype, ntype) \
+ (atype *)xalloc((ntype) * sizeof(atype))
static DevPrivateKey miBankScreenKey = &miBankScreenKey;
static DevPrivateKey miBankGCKey = &miBankGCKey;
@@ -318,14 +318,14 @@ static unsigned long miBankGeneration = 0;
atype *aarg = pArray, *acopy; \
int i; \
CLIP_SAVE; \
- if ((acopy = ALLOCATE_LOCAL_ARRAY(atype, nArray))) \
+ if ((acopy = xalloc_ARRAY(atype, nArray))) \
aarg = acopy; \
GCOP_TOP_PART; \
if (acopy) \
memcpy(acopy, pArray, nArray * sizeof(atype)); \
(*pGC->ops->aop)(pDrawable, pGC, GCOP_ARGS nArray, aarg); \
GCOP_BOTTOM_PART; \
- DEALLOCATE_LOCAL(acopy); \
+ xfree(acopy); \
CLIP_RESTORE; \
} \
SCREEN_RESTORE; \
@@ -787,7 +787,7 @@ miBankCopy(
fastBlit = pGCPriv->fastCopy;
nQueue = nBox * pScreenPriv->maxRects * 2;
- pQueue = Queue = ALLOCATE_LOCAL_ARRAY(miBankQueue, nQueue);
+ pQueue = Queue = xalloc_ARRAY(miBankQueue, nQueue);
if (Queue)
{
@@ -953,7 +953,7 @@ miBankCopy(
paddedWidth = PixmapBytePad(maxWidth,
pScreenPriv->pScreenPixmap->drawable.depth);
- pImage = (char *)ALLOCATE_LOCAL(paddedWidth * maxHeight);
+ pImage = (char *)xalloc(paddedWidth * maxHeight);
pGC->fExpose = FALSE;
@@ -1031,7 +1031,7 @@ miBankCopy(
pQueue++;
}
- DEALLOCATE_LOCAL(pImage);
+ xfree(pImage);
BANK_RESTORE;
}
@@ -1040,7 +1040,7 @@ miBankCopy(
pGC->fExpose = fExpose;
- DEALLOCATE_LOCAL(Queue);
+ xfree(Queue);
}
SCREEN_RESTORE;
@@ -1605,7 +1605,7 @@ miBankCreateScreenResources(
/* Get shadow pixmap; width & height of 0 means no pixmap data */
pScreenPriv->pBankPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0,
- pScreenPriv->pScreenPixmap->drawable.depth);
+ pScreenPriv->pScreenPixmap->drawable.depth, 0);
if (!pScreenPriv->pBankPixmap)
retval = FALSE;
}
@@ -1748,7 +1748,7 @@ miBankGetImage(
paddedWidth = PixmapBytePad(w,
pScreenPriv->pScreenPixmap->drawable.depth);
- pBankImage = (char *)ALLOCATE_LOCAL(paddedWidth * h);
+ pBankImage = (char *)xalloc(paddedWidth * h);
if (pBankImage)
{
@@ -1768,7 +1768,7 @@ miBankGetImage(
BANK_RESTORE;
- DEALLOCATE_LOCAL(pBankImage);
+ xfree(pBankImage);
}
}
@@ -1809,7 +1809,7 @@ miBankGetSpans(
paddedWidth =
PixmapBytePad(pScreenPriv->pScreenPixmap->drawable.width,
pScreenPriv->pScreenPixmap->drawable.depth);
- pBankImage = (char *)ALLOCATE_LOCAL(paddedWidth);
+ pBankImage = (char *)xalloc(paddedWidth);
if (pBankImage)
{
@@ -1838,7 +1838,7 @@ miBankGetSpans(
BANK_RESTORE;
- DEALLOCATE_LOCAL(pBankImage);
+ xfree(pBankImage);
}
}
@@ -1911,7 +1911,7 @@ miBankCopyWindow(
if (dy < 0)
{
/* Sort boxes from bottom to top */
- pBoxNew1 = ALLOCATE_LOCAL_ARRAY(BoxRec, nBox);
+ pBoxNew1 = xalloc_ARRAY(BoxRec, nBox);
if (pBoxNew1)
{
@@ -1939,7 +1939,7 @@ miBankCopyWindow(
if (dx < 0)
{
/* Sort boxes from right to left */
- pBoxNew2 = ALLOCATE_LOCAL_ARRAY(BoxRec, nBox);
+ pBoxNew2 = xalloc_ARRAY(BoxRec, nBox);
if (pBoxNew2)
{
@@ -1979,8 +1979,8 @@ miBankCopyWindow(
REGION_DESTROY(pScreen, pRgnDst);
- DEALLOCATE_LOCAL(pBoxNew2);
- DEALLOCATE_LOCAL(pBoxNew1);
+ xfree(pBoxNew2);
+ xfree(pBoxNew1);
}
_X_EXPORT Bool
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index e61855a93..14d68e2e1 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -143,21 +143,21 @@ miCopyArea(pSrcDrawable, pDstDrawable,
}
pptFirst = ppt = (DDXPointPtr)
- ALLOCATE_LOCAL(heightSrc * sizeof(DDXPointRec));
+ xalloc(heightSrc * sizeof(DDXPointRec));
pwidthFirst = pwidth = (unsigned int *)
- ALLOCATE_LOCAL(heightSrc * sizeof(unsigned int));
+ xalloc(heightSrc * sizeof(unsigned int));
numRects = REGION_NUM_RECTS(prgnSrcClip);
boxes = REGION_RECTS(prgnSrcClip);
ordering = (unsigned int *)
- ALLOCATE_LOCAL(numRects * sizeof(unsigned int));
+ xalloc(numRects * sizeof(unsigned int));
if(!pptFirst || !pwidthFirst || !ordering)
{
if (ordering)
- DEALLOCATE_LOCAL(ordering);
+ xfree(ordering);
if (pwidthFirst)
- DEALLOCATE_LOCAL(pwidthFirst);
+ xfree(pwidthFirst);
if (pptFirst)
- DEALLOCATE_LOCAL(pptFirst);
+ xfree(pptFirst);
return (RegionPtr)NULL;
}
@@ -264,9 +264,9 @@ miCopyArea(pSrcDrawable, pDstDrawable,
if(realSrcClip)
REGION_DESTROY(pGC->pScreen, prgnSrcClip);
- DEALLOCATE_LOCAL(ordering);
- DEALLOCATE_LOCAL(pwidthFirst);
- DEALLOCATE_LOCAL(pptFirst);
+ xfree(ordering);
+ xfree(pwidthFirst);
+ xfree(pptFirst);
return prgnExposed;
}
@@ -416,7 +416,8 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
RegionPtr prgnSrcClip;
pPixmap = (*pDraw->pScreen->CreatePixmap)
- (pDraw->pScreen, w + srcx, h, 1);
+ (pDraw->pScreen, w + srcx, h, 1,
+ CREATE_PIXMAP_USAGE_SCRATCH);
if (!pPixmap)
return;
@@ -432,12 +433,12 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
dixChangeGC(NullClient, pGCT, GCBackground, NULL, gcv);
ValidateGC((DrawablePtr)pPixmap, pGCT);
miClearDrawable((DrawablePtr)pPixmap, pGCT);
- ppt = pptFirst = (DDXPointPtr)ALLOCATE_LOCAL(h * sizeof(DDXPointRec));
- pwidth = pwidthFirst = (int *)ALLOCATE_LOCAL(h * sizeof(int));
+ ppt = pptFirst = (DDXPointPtr)xalloc(h * sizeof(DDXPointRec));
+ pwidth = pwidthFirst = (int *)xalloc(h * sizeof(int));
if(!pptFirst || !pwidthFirst)
{
- if (pwidthFirst) DEALLOCATE_LOCAL(pwidthFirst);
- if (pptFirst) DEALLOCATE_LOCAL(pptFirst);
+ if (pwidthFirst) xfree(pwidthFirst);
+ if (pptFirst) xfree(pptFirst);
FreeScratchGC(pGCT);
return;
}
@@ -463,8 +464,8 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
(*pGCT->ops->SetSpans)((DrawablePtr)pPixmap, pGCT, (char *)pbits,
pptFirst, pwidthFirst, h, TRUE);
- DEALLOCATE_LOCAL(pwidthFirst);
- DEALLOCATE_LOCAL(pptFirst);
+ xfree(pwidthFirst);
+ xfree(pptFirst);
/* Save current values from the client GC */
@@ -667,7 +668,8 @@ miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst)
if (!pGC)
return;
pPixmap = (*pDraw->pScreen->CreatePixmap)
- (pDraw->pScreen, w, 1, depth);
+ (pDraw->pScreen, w, 1, depth,
+ CREATE_PIXMAP_USAGE_SCRATCH);
if (!pPixmap)
{
FreeScratchGC(pGC);
@@ -806,14 +808,14 @@ miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage)
break;
case ZPixmap:
- ppt = pptFirst = (DDXPointPtr)ALLOCATE_LOCAL(h * sizeof(DDXPointRec));
- pwidth = pwidthFirst = (int *)ALLOCATE_LOCAL(h * sizeof(int));
+ ppt = pptFirst = (DDXPointPtr)xalloc(h * sizeof(DDXPointRec));
+ pwidth = pwidthFirst = (int *)xalloc(h * sizeof(int));
if(!pptFirst || !pwidthFirst)
{
if (pwidthFirst)
- DEALLOCATE_LOCAL(pwidthFirst);
+ xfree(pwidthFirst);
if (pptFirst)
- DEALLOCATE_LOCAL(pptFirst);
+ xfree(pptFirst);
return;
}
if (pGC->miTranslate)
@@ -832,8 +834,8 @@ miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage)
(*pGC->ops->SetSpans)(pDraw, pGC, (char *)pImage, pptFirst,
pwidthFirst, h, TRUE);
- DEALLOCATE_LOCAL(pwidthFirst);
- DEALLOCATE_LOCAL(pptFirst);
+ xfree(pwidthFirst);
+ xfree(pptFirst);
break;
}
}
diff --git a/mi/midispcur.c b/mi/midispcur.c
index f974c0845..1731251fb 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -263,7 +263,8 @@ miDCRealize (
pPriv->sourceBits = 0;
pPriv->maskBits = 0;
pPixmap = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width,
- pCursor->bits->height, 32);
+ pCursor->bits->height, 32,
+ CREATE_PIXMAP_USAGE_SCRATCH);
if (!pPixmap)
{
xfree ((pointer) pPriv);
@@ -295,13 +296,13 @@ miDCRealize (
}
pPriv->pPicture = 0;
#endif
- pPriv->sourceBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1);
+ pPriv->sourceBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1, 0);
if (!pPriv->sourceBits)
{
xfree ((pointer) pPriv);
return (miDCCursorPtr)NULL;
}
- pPriv->maskBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1);
+ pPriv->maskBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1, 0);
if (!pPriv->maskBits)
{
(*pScreen->DestroyPixmap) (pPriv->sourceBits);
@@ -525,7 +526,7 @@ miDCSaveUnderCursor (pScreen, x, y, w, h)
if (pSave)
(*pScreen->DestroyPixmap) (pSave);
pScreenPriv->pSave = pSave =
- (*pScreen->CreatePixmap) (pScreen, w, h, pScreen->rootDepth);
+ (*pScreen->CreatePixmap) (pScreen, w, h, pScreen->rootDepth, 0);
if (!pSave)
return FALSE;
}
@@ -739,7 +740,7 @@ miDCMoveCursor (pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
}
#endif
pScreenPriv->pTemp = pTemp = (*pScreen->CreatePixmap)
- (pScreen, w, h, pScreenPriv->pSave->drawable.depth);
+ (pScreen, w, h, pScreenPriv->pSave->drawable.depth, 0);
if (!pTemp)
return FALSE;
}
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 6ace9f589..2d3b0d510 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -369,7 +369,7 @@ miSendGraphicsExpose (client, pRgn, drawable, major, minor)
numRects = REGION_NUM_RECTS(pRgn);
pBox = REGION_RECTS(pRgn);
- if(!(pEvent = (xEvent *)ALLOCATE_LOCAL(numRects * sizeof(xEvent))))
+ if(!(pEvent = (xEvent *)xalloc(numRects * sizeof(xEvent))))
return;
pe = pEvent;
@@ -387,7 +387,7 @@ miSendGraphicsExpose (client, pRgn, drawable, major, minor)
}
TryClientEvents(client, pEvent, numRects,
(Mask)0, NoEventMask, NullGrab);
- DEALLOCATE_LOCAL(pEvent);
+ xfree(pEvent);
}
else
{
@@ -415,7 +415,7 @@ miSendExposures(pWin, pRgn, dx, dy)
pBox = REGION_RECTS(pRgn);
numRects = REGION_NUM_RECTS(pRgn);
- if(!(pEvent = (xEvent *) ALLOCATE_LOCAL(numRects * sizeof(xEvent))))
+ if(!(pEvent = (xEvent *) xalloc(numRects * sizeof(xEvent))))
return;
for (i=numRects, pe = pEvent; --i >= 0; pe++, pBox++)
@@ -445,7 +445,7 @@ miSendExposures(pWin, pRgn, dx, dy)
win = PanoramiXFindIDByScrnum(XRT_WINDOW,
pWin->drawable.id, scrnum);
if(!win) {
- DEALLOCATE_LOCAL(pEvent);
+ xfree(pEvent);
return;
}
realWin = win->info[0].id;
@@ -462,7 +462,7 @@ miSendExposures(pWin, pRgn, dx, dy)
DeliverEvents(pWin, pEvent, numRects, NullWindow);
- DEALLOCATE_LOCAL(pEvent);
+ xfree(pEvent);
}
_X_EXPORT void
@@ -620,7 +620,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
gcmask |= GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin;
}
- prect = (xRectangle *)ALLOCATE_LOCAL(REGION_NUM_RECTS(prgn) *
+ prect = (xRectangle *)xalloc(REGION_NUM_RECTS(prgn) *
sizeof(xRectangle));
if (!prect)
return;
@@ -628,7 +628,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
pGC = GetScratchGC(drawable->depth, drawable->pScreen);
if (!pGC)
{
- DEALLOCATE_LOCAL(prect);
+ xfree(prect);
return;
}
@@ -646,7 +646,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
}
prect -= numRects;
(*pGC->ops->PolyFillRect)(drawable, pGC, numRects, prect);
- DEALLOCATE_LOCAL(prect);
+ xfree(prect);
FreeScratchGC(pGC);
}
diff --git a/mi/mifillarc.c b/mi/mifillarc.c
index c561b1f5b..f68ddf468 100644
--- a/mi/mifillarc.c
+++ b/mi/mifillarc.c
@@ -551,13 +551,13 @@ miFillEllipseI(
int *widths;
int *wids;
- points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * arc->height);
+ points = (DDXPointPtr)xalloc(sizeof(DDXPointRec) * arc->height);
if (!points)
return;
- widths = (int *)ALLOCATE_LOCAL(sizeof(int) * arc->height);
+ widths = (int *)xalloc(sizeof(int) * arc->height);
if (!widths)
{
- DEALLOCATE_LOCAL(points);
+ xfree(points);
return;
}
miFillArcSetup(arc, &info);
@@ -575,8 +575,8 @@ miFillEllipseI(
ADDSPANS();
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
- DEALLOCATE_LOCAL(widths);
- DEALLOCATE_LOCAL(points);
+ xfree(widths);
+ xfree(points);
}
static void
@@ -594,13 +594,13 @@ miFillEllipseD(
int *widths;
int *wids;
- points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * arc->height);
+ points = (DDXPointPtr)xalloc(sizeof(DDXPointRec) * arc->height);
if (!points)
return;
- widths = (int *)ALLOCATE_LOCAL(sizeof(int) * arc->height);
+ widths = (int *)xalloc(sizeof(int) * arc->height);
if (!widths)
{
- DEALLOCATE_LOCAL(points);
+ xfree(points);
return;
}
miFillArcDSetup(arc, &info);
@@ -618,8 +618,8 @@ miFillEllipseD(
ADDSPANS();
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
- DEALLOCATE_LOCAL(widths);
- DEALLOCATE_LOCAL(points);
+ xfree(widths);
+ xfree(points);
}
#define ADDSPAN(l,r) \
@@ -666,13 +666,13 @@ miFillArcSliceI(
slw = arc->height;
if (slice.flip_top || slice.flip_bot)
slw += (arc->height >> 1) + 1;
- points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * slw);
+ points = (DDXPointPtr)xalloc(sizeof(DDXPointRec) * slw);
if (!points)
return;
- widths = (int *)ALLOCATE_LOCAL(sizeof(int) * slw);
+ widths = (int *)xalloc(sizeof(int) * slw);
if (!widths)
{
- DEALLOCATE_LOCAL(points);
+ xfree(points);
return;
}
if (pGC->miTranslate)
@@ -703,8 +703,8 @@ miFillArcSliceI(
}
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
- DEALLOCATE_LOCAL(widths);
- DEALLOCATE_LOCAL(points);
+ xfree(widths);
+ xfree(points);
}
static void
@@ -730,13 +730,13 @@ miFillArcSliceD(
slw = arc->height;
if (slice.flip_top || slice.flip_bot)
slw += (arc->height >> 1) + 1;
- points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * slw);
+ points = (DDXPointPtr)xalloc(sizeof(DDXPointRec) * slw);
if (!points)
return;
- widths = (int *)ALLOCATE_LOCAL(sizeof(int) * slw);
+ widths = (int *)xalloc(sizeof(int) * slw);
if (!widths)
{
- DEALLOCATE_LOCAL(points);
+ xfree(points);
return;
}
if (pGC->miTranslate)
@@ -767,8 +767,8 @@ miFillArcSliceD(
}
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
- DEALLOCATE_LOCAL(widths);
- DEALLOCATE_LOCAL(points);
+ xfree(widths);
+ xfree(points);
}
/* MIPOLYFILLARC -- The public entry for the PolyFillArc request.
diff --git a/mi/mifillrct.c b/mi/mifillrct.c
index ca7e86445..e7646cf38 100644
--- a/mi/mifillrct.c
+++ b/mi/mifillrct.c
@@ -106,12 +106,12 @@ miPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
maxheight = max(maxheight, prect->height);
}
- pptFirst = (DDXPointPtr) ALLOCATE_LOCAL(maxheight * sizeof(DDXPointRec));
- pwFirst = (int *) ALLOCATE_LOCAL(maxheight * sizeof(int));
+ pptFirst = (DDXPointPtr) xalloc(maxheight * sizeof(DDXPointRec));
+ pwFirst = (int *) xalloc(maxheight * sizeof(int));
if(!pptFirst || !pwFirst)
{
- if (pwFirst) DEALLOCATE_LOCAL(pwFirst);
- if (pptFirst) DEALLOCATE_LOCAL(pptFirst);
+ if (pwFirst) xfree(pwFirst);
+ if (pptFirst) xfree(pptFirst);
return;
}
@@ -137,6 +137,6 @@ miPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
1);
prect++;
}
- DEALLOCATE_LOCAL(pwFirst);
- DEALLOCATE_LOCAL(pptFirst);
+ xfree(pwFirst);
+ xfree(pptFirst);
}
diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c
index f85197157..d19f031d7 100644
--- a/mi/mifpolycon.c
+++ b/mi/mifpolycon.c
@@ -114,15 +114,15 @@ miFillSppPoly(dst, pgc, count, ptsIn, xTrans, yTrans, xFtrans, yFtrans)
y = ymax - ymin + 1;
if ((count < 3) || (y <= 0))
return;
- ptsOut = FirstPoint = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * y);
- width = FirstWidth = (int *) ALLOCATE_LOCAL(sizeof(int) * y);
- Marked = (int *) ALLOCATE_LOCAL(sizeof(int) * count);
+ ptsOut = FirstPoint = (DDXPointPtr)xalloc(sizeof(DDXPointRec) * y);
+ width = FirstWidth = (int *) xalloc(sizeof(int) * y);
+ Marked = (int *) xalloc(sizeof(int) * count);
if(!ptsOut || !width || !Marked)
{
- if (Marked) DEALLOCATE_LOCAL(Marked);
- if (width) DEALLOCATE_LOCAL(width);
- if (ptsOut) DEALLOCATE_LOCAL(ptsOut);
+ if (Marked) xfree(Marked);
+ if (width) xfree(width);
+ if (ptsOut) xfree(ptsOut);
return;
}
@@ -236,9 +236,9 @@ miFillSppPoly(dst, pgc, count, ptsIn, xTrans, yTrans, xFtrans, yFtrans)
/* Finally, fill the spans we've collected */
(*pgc->ops->FillSpans)(dst, pgc,
ptsOut-FirstPoint, FirstPoint, FirstWidth, 1);
- DEALLOCATE_LOCAL(Marked);
- DEALLOCATE_LOCAL(FirstWidth);
- DEALLOCATE_LOCAL(FirstPoint);
+ xfree(Marked);
+ xfree(FirstWidth);
+ xfree(FirstPoint);
}
diff --git a/mi/miglblt.c b/mi/miglblt.c
index 4db3eb62f..0155b5618 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -120,7 +120,8 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
FONTMAXBOUNDS(pfont,descent);
pPixmap = (*pDrawable->pScreen->CreatePixmap)(pDrawable->pScreen,
- width, height, 1);
+ width, height, 1,
+ CREATE_PIXMAP_USAGE_SCRATCH);
if (!pPixmap)
return;
@@ -138,7 +139,7 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
DoChangeGC(pGCtmp, GCFunction|GCForeground|GCBackground, gcvals, 0);
nbyLine = BitmapBytePad(width);
- pbits = (unsigned char *)ALLOCATE_LOCAL(height*nbyLine);
+ pbits = (unsigned char *)xalloc(height*nbyLine);
if (!pbits)
{
(*pDrawable->pScreen->DestroyPixmap)(pPixmap);
@@ -189,7 +190,7 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
x += pci->metrics.characterWidth;
}
(*pDrawable->pScreen->DestroyPixmap)(pPixmap);
- DEALLOCATE_LOCAL(pbits);
+ xfree(pbits);
FreeScratchGC(pGCtmp);
}
diff --git a/mi/miinitext.c b/mi/miinitext.c
index c1ed6e74a..286a857c6 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -635,16 +635,6 @@ InitExtensions(argc, argv)
if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
#endif
#endif
-
-#ifdef GLXEXT
-#ifdef INXDARWINAPP
- DarwinGlxPushProvider(__DarwinglXMesaProvider);
- if (!noGlxExtension) DarwinGlxExtensionInit();
-#else
- GlxPushProvider(&__glXMesaProvider);
- if (!noGlxExtension) GlxExtensionInit();
-#endif // INXDARWINAPP
-#endif // GLXEXT
#ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */
if (!noXFixesExtension) XFixesExtensionInit();
@@ -670,6 +660,16 @@ InitExtensions(argc, argv)
#ifdef DAMAGE
if (!noDamageExtension) DamageExtensionInit();
#endif
+
+#ifdef GLXEXT
+#ifdef INXDARWINAPP
+ DarwinGlxPushProvider(__DarwinglXMesaProvider);
+ if (!noGlxExtension) DarwinGlxExtensionInit();
+#else
+ GlxPushProvider(&__glXMesaProvider);
+ if (!noGlxExtension) GlxExtensionInit();
+#endif
+#endif
}
void
diff --git a/mi/mipolycon.c b/mi/mipolycon.c
index e2d666e51..6aabad675 100644
--- a/mi/mipolycon.c
+++ b/mi/mipolycon.c
@@ -104,12 +104,12 @@ miFillConvexPoly(dst, pgc, count, ptsIn)
dy = ymax - ymin + 1;
if ((count < 3) || (dy < 0))
return(TRUE);
- ptsOut = FirstPoint = (DDXPointPtr )ALLOCATE_LOCAL(sizeof(DDXPointRec)*dy);
- width = FirstWidth = (int *)ALLOCATE_LOCAL(sizeof(int) * dy);
+ ptsOut = FirstPoint = (DDXPointPtr )xalloc(sizeof(DDXPointRec)*dy);
+ width = FirstWidth = (int *)xalloc(sizeof(int) * dy);
if(!FirstPoint || !FirstWidth)
{
- if (FirstWidth) DEALLOCATE_LOCAL(FirstWidth);
- if (FirstPoint) DEALLOCATE_LOCAL(FirstPoint);
+ if (FirstWidth) xfree(FirstWidth);
+ if (FirstPoint) xfree(FirstPoint);
return(FALSE);
}
@@ -174,8 +174,8 @@ miFillConvexPoly(dst, pgc, count, ptsIn)
/* in case we're called with non-convex polygon */
if(i < 0)
{
- DEALLOCATE_LOCAL(FirstWidth);
- DEALLOCATE_LOCAL(FirstPoint);
+ xfree(FirstWidth);
+ xfree(FirstPoint);
return(TRUE);
}
while (i-- > 0)
@@ -209,8 +209,8 @@ miFillConvexPoly(dst, pgc, count, ptsIn)
(*pgc->ops->FillSpans)(dst, pgc,
ptsOut-FirstPoint,FirstPoint,FirstWidth,
1);
- DEALLOCATE_LOCAL(FirstWidth);
- DEALLOCATE_LOCAL(FirstPoint);
+ xfree(FirstWidth);
+ xfree(FirstPoint);
return(TRUE);
}
diff --git a/mi/mipolygen.c b/mi/mipolygen.c
index 0d2ecc430..7623fc40a 100644
--- a/mi/mipolygen.c
+++ b/mi/mipolygen.c
@@ -92,13 +92,13 @@ miFillGeneralPoly(dst, pgc, count, ptsIn)
return(TRUE);
if(!(pETEs = (EdgeTableEntry *)
- ALLOCATE_LOCAL(sizeof(EdgeTableEntry) * count)))
+ xalloc(sizeof(EdgeTableEntry) * count)))
return(FALSE);
ptsOut = FirstPoint;
width = FirstWidth;
if (!miCreateETandAET(count, ptsIn, &ET, &AET, pETEs, &SLLBlock))
{
- DEALLOCATE_LOCAL(pETEs);
+ xfree(pETEs);
return(FALSE);
}
pSLL = ET.scanlines.next;
@@ -224,7 +224,7 @@ miFillGeneralPoly(dst, pgc, count, ptsIn)
* Get any spans that we missed by buffering
*/
(*pgc->ops->FillSpans)(dst, pgc, nPts, FirstPoint, FirstWidth, 1);
- DEALLOCATE_LOCAL(pETEs);
+ xfree(pETEs);
miFreeStorage(SLLBlock.next);
return(TRUE);
}
diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c
index afe3f724a..56026bdbd 100644
--- a/mi/mipolypnt.c
+++ b/mi/mipolypnt.c
@@ -106,7 +106,7 @@ miPolyPoint(pDrawable, pGC, mode, npt, pptInit)
DoChangeGC(pGC, GCFillStyle, &fsNew, 0);
ValidateGC(pDrawable, pGC);
}
- if(!(pwidthInit = (int *)ALLOCATE_LOCAL(npt * sizeof(int))))
+ if(!(pwidthInit = (int *)xalloc(npt * sizeof(int))))
return;
pwidth = pwidthInit;
for(i = 0; i < npt; i++)
@@ -118,6 +118,6 @@ miPolyPoint(pDrawable, pGC, mode, npt, pptInit)
DoChangeGC(pGC, GCFillStyle, &fsOld, 0);
ValidateGC(pDrawable, pGC);
}
- DEALLOCATE_LOCAL(pwidthInit);
+ xfree(pwidthInit);
}
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c
index a9ab90928..788624872 100644
--- a/mi/mipolyrect.c
+++ b/mi/mipolyrect.c
@@ -94,7 +94,7 @@ miPolyRectangle(pDraw, pGC, nrects, pRects)
offset2 = pGC->lineWidth;
offset1 = offset2 >> 1;
offset3 = offset2 - offset1;
- tmp = (xRectangle *) ALLOCATE_LOCAL(ntmp * sizeof (xRectangle));
+ tmp = (xRectangle *) xalloc(ntmp * sizeof (xRectangle));
if (!tmp)
return;
t = tmp;
@@ -162,7 +162,7 @@ miPolyRectangle(pDraw, pGC, nrects, pRects)
}
}
(*pGC->ops->PolyFillRect) (pDraw, pGC, t - tmp, tmp);
- DEALLOCATE_LOCAL ((pointer) tmp);
+ xfree ((pointer) tmp);
}
else
{
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 0dc6a437a..a1fb2e2f6 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -158,7 +158,7 @@ miCreateScreenResources(pScreen)
/* create a pixmap with no data, then redirect it to point to
* the screen
*/
- pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, pScreen->rootDepth);
+ pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, pScreen->rootDepth, 0);
if (!pPixmap)
return FALSE;
diff --git a/mi/mispans.c b/mi/mispans.c
index 530d9dff2..6f30155f5 100644
--- a/mi/mispans.c
+++ b/mi/mispans.c
@@ -528,7 +528,7 @@ void miFillUniqueSpanGroup(pDraw, pGC, spanGroup)
xfree(points);
xfree(widths);
xfree(yspans);
- xfree(ysizes); /* use (DE)ALLOCATE_LOCAL for these? */
+ xfree(ysizes); /* use (DE)xalloc for these? */
}
spanGroup->count = 0;
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 8c6022f6f..f080ca11d 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -95,13 +95,13 @@ miFillPolyHelper (DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel,
if (!spanData)
{
- pptInit = (DDXPointPtr) ALLOCATE_LOCAL (overall_height * sizeof(*ppt));
+ pptInit = (DDXPointPtr) xalloc (overall_height * sizeof(*ppt));
if (!pptInit)
return;
- pwidthInit = (int *) ALLOCATE_LOCAL (overall_height * sizeof(*pwidth));
+ pwidthInit = (int *) xalloc (overall_height * sizeof(*pwidth));
if (!pwidthInit)
{
- DEALLOCATE_LOCAL (pptInit);
+ xfree (pptInit);
return;
}
ppt = pptInit;
@@ -167,8 +167,8 @@ miFillPolyHelper (DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel,
if (!spanData)
{
(*pGC->ops->FillSpans) (pDrawable, pGC, ppt - pptInit, pptInit, pwidthInit, TRUE);
- DEALLOCATE_LOCAL (pwidthInit);
- DEALLOCATE_LOCAL (pptInit);
+ xfree (pwidthInit);
+ xfree (pptInit);
if (pixel != oldPixel)
{
DoChangeGC (pGC, GCForeground, &oldPixel, FALSE);
@@ -1045,13 +1045,13 @@ miLineArc (
}
if (!spanData)
{
- points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * pGC->lineWidth);
+ points = (DDXPointPtr)xalloc(sizeof(DDXPointRec) * pGC->lineWidth);
if (!points)
return;
- widths = (int *)ALLOCATE_LOCAL(sizeof(int) * pGC->lineWidth);
+ widths = (int *)xalloc(sizeof(int) * pGC->lineWidth);
if (!widths)
{
- DEALLOCATE_LOCAL(points);
+ xfree(points);
return;
}
oldPixel = pGC->fgPixel;
@@ -1086,8 +1086,8 @@ miLineArc (
if (!spanData)
{
(*pGC->ops->FillSpans)(pDraw, pGC, n, points, widths, TRUE);
- DEALLOCATE_LOCAL(widths);
- DEALLOCATE_LOCAL(points);
+ xfree(widths);
+ xfree(points);
if (pixel != oldPixel)
{
DoChangeGC(pGC, GCForeground, &oldPixel, FALSE);
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index 9d4715a30..947b85aac 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -744,7 +744,7 @@ miZeroPolyArc(pDraw, pGC, narcs, parcs)
dospans = (pGC->fillStyle != FillSolid);
if (dospans)
{
- widths = (int *)ALLOCATE_LOCAL(sizeof(int) * numPts);
+ widths = (int *)xalloc(sizeof(int) * numPts);
if (!widths)
return;
maxw = 0;
@@ -761,12 +761,12 @@ miZeroPolyArc(pDraw, pGC, narcs, parcs)
(unsigned char *) pGC->dash, (int)pGC->numInDashList,
&dinfo.dashOffsetInit);
}
- points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * numPts);
+ points = (DDXPointPtr)xalloc(sizeof(DDXPointRec) * numPts);
if (!points)
{
if (dospans)
{
- DEALLOCATE_LOCAL(widths);
+ xfree(widths);
}
return;
}
@@ -843,9 +843,9 @@ miZeroPolyArc(pDraw, pGC, narcs, parcs)
}
}
}
- DEALLOCATE_LOCAL(points);
+ xfree(points);
if (dospans)
{
- DEALLOCATE_LOCAL(widths);
+ xfree(widths);
}
}
diff --git a/mi/mizerline.c b/mi/mizerline.c
index 073f1b20f..6604a0923 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -155,8 +155,8 @@ miZeroLine(pDraw, pGC, mode, npt, pptInit)
width = xright - xleft + 1;
height = ybottom - ytop + 1;
list_len = (height >= width) ? height : width;
- pspanInit = (DDXPointPtr)ALLOCATE_LOCAL(list_len * sizeof(DDXPointRec));
- pwidthInit = (int *)ALLOCATE_LOCAL(list_len * sizeof(int));
+ pspanInit = (DDXPointPtr)xalloc(list_len * sizeof(DDXPointRec));
+ pwidthInit = (int *)xalloc(list_len * sizeof(int));
if (!pspanInit || !pwidthInit)
return;
@@ -359,8 +359,8 @@ miZeroLine(pDraw, pGC, mode, npt, pptInit)
(*pGC->ops->FillSpans)(pDraw, pGC, Nspans, pspanInit,
pwidthInit, FALSE);
- DEALLOCATE_LOCAL(pwidthInit);
- DEALLOCATE_LOCAL(pspanInit);
+ xfree(pwidthInit);
+ xfree(pspanInit);
}
_X_EXPORT void
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 19:51:44 +0000