aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
-rw-r--r--nx-X11/programs/Xserver/mi/mi.h10
-rw-r--r--nx-X11/programs/Xserver/mi/miarc.c4
-rw-r--r--nx-X11/programs/Xserver/mi/mibank.c24
-rw-r--r--nx-X11/programs/Xserver/mi/mibank.h4
-rw-r--r--nx-X11/programs/Xserver/mi/mibstore.c62
-rw-r--r--nx-X11/programs/Xserver/mi/midispcur.c28
-rw-r--r--nx-X11/programs/Xserver/mi/miexpose.c8
-rw-r--r--nx-X11/programs/Xserver/mi/mifillarc.h2
-rw-r--r--nx-X11/programs/Xserver/mi/migc.c8
-rw-r--r--nx-X11/programs/Xserver/mi/migc.h2
-rw-r--r--nx-X11/programs/Xserver/mi/miglblt.c4
-rw-r--r--nx-X11/programs/Xserver/mi/mioverlay.c6
-rw-r--r--nx-X11/programs/Xserver/mi/mipointer.c10
-rw-r--r--nx-X11/programs/Xserver/mi/mipolyrect.c2
-rw-r--r--nx-X11/programs/Xserver/mi/miscrinit.c20
-rw-r--r--nx-X11/programs/Xserver/mi/misprite.c20
-rw-r--r--nx-X11/programs/Xserver/mi/miwindow.c4
17 files changed, 109 insertions, 109 deletions
diff --git a/nx-X11/programs/Xserver/mi/mi.h b/nx-X11/programs/Xserver/mi/mi.h
index 3c85693dc..0f3f5778f 100644
--- a/nx-X11/programs/Xserver/mi/mi.h
+++ b/nx-X11/programs/Xserver/mi/mi.h
@@ -263,7 +263,7 @@ extern void miPolyGlyphBlt(
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/
+ void * /*pglyphBase*/
);
extern void miImageGlyphBlt(
@@ -273,7 +273,7 @@ extern void miImageGlyphBlt(
int /*y*/,
unsigned int /*nglyph*/,
CharInfoPtr * /*ppci*/,
- pointer /*pglyphBase*/
+ void * /*pglyphBase*/
);
/* mipoly.c */
@@ -438,7 +438,7 @@ extern Bool miModifyPixmapHeader(
int /*depth*/,
int /*bitsPerPixel*/,
int /*devKind*/,
- pointer /*pPixData*/
+ void * /*pPixData*/
);
extern Bool miCloseScreen(
@@ -453,12 +453,12 @@ extern Bool miCreateScreenResources(
extern Bool miScreenDevPrivateInit(
ScreenPtr /*pScreen*/,
int /*width*/,
- pointer /*pbits*/
+ void * /*pbits*/
);
extern Bool miScreenInit(
ScreenPtr /*pScreen*/,
- pointer /*pbits*/,
+ void * /*pbits*/,
int /*xsize*/,
int /*ysize*/,
int /*dpix*/,
diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c
index 08f09b628..f06c4b51d 100644
--- a/nx-X11/programs/Xserver/mi/miarc.c
+++ b/nx-X11/programs/Xserver/mi/miarc.c
@@ -435,7 +435,7 @@ static RESTYPE cacheType;
/*ARGSUSED*/
int
miFreeArcCache (data, id)
- pointer data;
+ void * data;
XID id;
{
int k;
@@ -1691,7 +1691,7 @@ miGetArcPts(
count++;
cdt = 2 * miDcos(dt);
- if (!(poly = (SppPointPtr) xrealloc((pointer)*ppPts,
+ if (!(poly = (SppPointPtr) xrealloc((void *)*ppPts,
(cpt + count) * sizeof(SppPointRec))))
return(0);
*ppPts = poly;
diff --git a/nx-X11/programs/Xserver/mi/mibank.c b/nx-X11/programs/Xserver/mi/mibank.c
index b09f9fd7c..b5da2267f 100644
--- a/nx-X11/programs/Xserver/mi/mibank.c
+++ b/nx-X11/programs/Xserver/mi/mibank.c
@@ -111,7 +111,7 @@ typedef struct _miBankScreen
int nBanks, maxRects;
RegionPtr *pBanks;
- pointer pbits;
+ void *pbits;
/*
* Screen Wrappers
@@ -192,11 +192,11 @@ static unsigned long miBankGeneration = 0;
#define BANK_GCPRIVATE(pGC) ((miBankGCPtr)(BANK_GCPRIVLVAL(pGC)))
#define PIXMAP_STATUS(_pPix) \
- pointer pbits = (_pPix)->devPrivate.ptr
+ void * pbits = (_pPix)->devPrivate.ptr
#define PIXMAP_SAVE(_pPix) \
PIXMAP_STATUS(_pPix); \
- if (pbits == (pointer)pScreenPriv) \
+ if (pbits == (void *)pScreenPriv) \
(_pPix)->devPrivate.ptr = pScreenPriv->pbits
#define PIXMAP_RESTORE(_pPix) \
@@ -247,7 +247,7 @@ static unsigned long miBankGeneration = 0;
(pGC)->funcs = pGCPriv->unwrappedFuncs
#define IS_BANKED(pDrawable) \
- ((pbits == (pointer)pScreenPriv) && \
+ ((pbits == (void *)pScreenPriv) && \
(((DrawablePtr)(pDrawable))->type == DRAWABLE_WINDOW))
#define CLIP_SAVE \
@@ -1267,7 +1267,7 @@ miBankImageGlyphBlt(
int y,
unsigned int nArray,
CharInfoPtr *ppci,
- pointer pglyphBase
+ void *pglyphBase
)
{
GCOP_SIMPLE((*pGC->ops->ImageGlyphBlt)(pDrawable, pGC,
@@ -1282,7 +1282,7 @@ miBankPolyGlyphBlt(
int y,
unsigned int nArray,
CharInfoPtr *ppci,
- pointer pglyphBase
+ void *pglyphBase
)
{
GCOP_SIMPLE((*pGC->ops->PolyGlyphBlt)(pDrawable, pGC,
@@ -1539,7 +1539,7 @@ static void
miBankChangeClip(
GCPtr pGC,
int type,
- pointer pvalue,
+ void * pvalue,
int nrects
)
{
@@ -1608,7 +1608,7 @@ miBankCreateScreenResources(
/* Set screen buffer address to something recognizable */
pScreenPriv->pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen);
pScreenPriv->pbits = pScreenPriv->pScreenPixmap->devPrivate.ptr;
- pScreenPriv->pScreenPixmap->devPrivate.ptr = (pointer)pScreenPriv;
+ pScreenPriv->pScreenPixmap->devPrivate.ptr = (void *)pScreenPriv;
/* Get shadow pixmap; width & height of 0 means no pixmap data */
pScreenPriv->pBankPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0,
@@ -1657,7 +1657,7 @@ miBankModifyPixmapHeader(
int depth,
int bitsPerPixel,
int devKind,
- pointer pPixData
+ void *pPixData
)
{
Bool retval = FALSE;
@@ -1675,7 +1675,7 @@ miBankModifyPixmapHeader(
SCREEN_WRAP(ModifyPixmapHeader, miBankModifyPixmapHeader);
- if (pbits == (pointer)pScreenPriv)
+ if (pbits == (void *)pScreenPriv)
{
pScreenPriv->pbits = pPixmap->devPrivate.ptr;
pPixmap->devPrivate.ptr = pbits;
@@ -2395,7 +2395,7 @@ miInitializeBanking(
pScreen->BackingStoreFuncs.SetClipmaskRgn = miBankSetClipmaskRgn;
?????????????????????????????????????????????????????????????? */
- BANK_SCRPRIVLVAL = (pointer)pScreenPriv;
+ BANK_SCRPRIVLVAL = (void *)pScreenPriv;
return TRUE;
}
@@ -2405,7 +2405,7 @@ miInitializeBanking(
static int
miBankNewSerialNumber(
WindowPtr pWin,
- pointer unused
+ void *unused
)
{
pWin->drawable.serialNumber = NEXT_SERIAL_NUMBER;
diff --git a/nx-X11/programs/Xserver/mi/mibank.h b/nx-X11/programs/Xserver/mi/mibank.h
index cf27d1fae..26b33305a 100644
--- a/nx-X11/programs/Xserver/mi/mibank.h
+++ b/nx-X11/programs/Xserver/mi/mibank.h
@@ -70,8 +70,8 @@ typedef struct _miBankInfo
miBankProcPtr SetDestinationBank; /* Set pBankB bank number */
miBankProcPtr SetSourceAndDestinationBanks; /* Set both bank numbers */
- pointer pBankA; /* First aperture location */
- pointer pBankB; /* First or second aperture location */
+ void * pBankA; /* First aperture location */
+ void * pBankB; /* First or second aperture location */
/*
* BankSize is in units of sizeof(char) and is the size of each bank.
diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c
index 98947217c..f18648f66 100644
--- a/nx-X11/programs/Xserver/mi/mibstore.c
+++ b/nx-X11/programs/Xserver/mi/mibstore.c
@@ -228,7 +228,7 @@ static void miBSValidateGC(GCPtr pGC, unsigned long stateChanges,
static void miBSCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void miBSDestroyGC(GCPtr pGC);
static void miBSChangeGC(GCPtr pGC, unsigned long mask);
-static void miBSChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects);
+static void miBSChangeClip(GCPtr pGC, int type, void * pvalue, int nrects);
static void miBSDestroyClip(GCPtr pGC);
static void miBSCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
@@ -286,10 +286,10 @@ static void miBSImageText16(DrawablePtr pDrawable, GCPtr pGC,
unsigned short *chars);
static void miBSImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr *ppci, pointer pglyphBase);
+ CharInfoPtr *ppci, void * pglyphBase);
static void miBSPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr *ppci, pointer pglyphBase);
+ CharInfoPtr *ppci, void * pglyphBase);
static void miBSPushPixels(GCPtr pGC, PixmapPtr pBitMap,
DrawablePtr pDst, int w, int h,
int x, int y);
@@ -330,7 +330,7 @@ static void miBSCheapValidateGC(GCPtr pGC, unsigned long stateChanges,
static void miBSCheapCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void miBSCheapDestroyGC(GCPtr pGC);
static void miBSCheapChangeGC(GCPtr pGC, unsigned long mask);
-static void miBSCheapChangeClip(GCPtr pGC, int type, pointer pvalue,
+static void miBSCheapChangeClip(GCPtr pGC, int type, void * pvalue,
int nrects);
static void miBSCheapDestroyClip(GCPtr pGC);
static void miBSCheapCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
@@ -398,7 +398,7 @@ miInitializeBackingStore (pScreen)
pScreen->ClearBackingStore = miBSClearBackingStore;
pScreen->DrawGuarantee = miBSDrawGuarantee;
- pScreen->devPrivates[miBSScreenIndex].ptr = (pointer) pScreenPriv;
+ pScreen->devPrivates[miBSScreenIndex].ptr = (void *) pScreenPriv;
}
/*
@@ -433,7 +433,7 @@ miBSCloseScreen (i, pScreen)
pScreen->ChangeWindowAttributes = pScreenPriv->ChangeWindowAttributes;
pScreen->CreateGC = pScreenPriv->CreateGC;
- xfree ((pointer) pScreenPriv);
+ xfree ((void *) pScreenPriv);
return (*pScreen->CloseScreen) (i, pScreen);
}
@@ -765,7 +765,7 @@ miBSCreateGC (pGC)
if ( (ret = (*pScreen->CreateGC) (pGC)) )
{
- pGC->devPrivates[miBSGCIndex].ptr = (pointer) pGC->funcs;
+ pGC->devPrivates[miBSGCIndex].ptr = (void *) pGC->funcs;
pGC->funcs = &miBSCheapGCFuncs;
}
@@ -816,7 +816,7 @@ miBSCheapValidateGC (pGC, stateChanges, pDrawable)
(*pGC->funcs->ValidateGC) (pGC, stateChanges, pDrawable);
/* rewrap funcs as Validate may have changed them */
- pGC->devPrivates[miBSGCIndex].ptr = (pointer) pGC->funcs;
+ pGC->devPrivates[miBSGCIndex].ptr = (void *) pGC->funcs;
CHEAP_FUNC_EPILOGUE (pGC);
}
@@ -861,7 +861,7 @@ static void
miBSCheapChangeClip (pGC, type, pvalue, nrects)
GCPtr pGC;
int type;
- pointer pvalue;
+ void * pvalue;
int nrects;
{
CHEAP_FUNC_PROLOGUE (pGC);
@@ -914,7 +914,7 @@ miBSCreateGCPrivate (pGC)
pPriv->wrapFuncs = pGC->funcs;
pGC->funcs = &miBSGCFuncs;
pGC->ops = &miBSGCOps;
- pGC->devPrivates[miBSGCIndex].ptr = (pointer) pPriv;
+ pGC->devPrivates[miBSGCIndex].ptr = (void *) pPriv;
return TRUE;
}
@@ -926,12 +926,12 @@ miBSDestroyGCPrivate (GCPtr pGC)
pPriv = (miBSGCRec *) pGC->devPrivates[miBSGCIndex].ptr;
if (pPriv)
{
- pGC->devPrivates[miBSGCIndex].ptr = (pointer) pPriv->wrapFuncs;
+ pGC->devPrivates[miBSGCIndex].ptr = (void *) pPriv->wrapFuncs;
pGC->funcs = &miBSCheapGCFuncs;
pGC->ops = pPriv->wrapOps;
if (pPriv->pBackingGC)
FreeGC (pPriv->pBackingGC, (GContext) 0);
- xfree ((pointer) pPriv);
+ xfree ((void *) pPriv);
}
}
@@ -2157,7 +2157,7 @@ miBSImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
int x, y;
unsigned int nglyph;
CharInfoPtr *ppci; /* array of character info */
- pointer pglyphBase; /* start of array of glyphs */
+ void * pglyphBase; /* start of array of glyphs */
{
SETUP_BACKING (pDrawable, pGC);
PROLOGUE(pGC);
@@ -2189,7 +2189,7 @@ miBSPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
int x, y;
unsigned int nglyph;
CharInfoPtr *ppci; /* array of character info */
- pointer pglyphBase; /* start of array of glyphs */
+ void * pglyphBase; /* start of array of glyphs */
{
SETUP_BACKING (pDrawable, pGC);
PROLOGUE(pGC);
@@ -2287,7 +2287,7 @@ miBSClearBackingStore(pWin, x, y, w, h, generateExposures)
GCPtr pGC;
int ts_x_origin,
ts_y_origin;
- pointer gcvalues[4];
+ void *gcvalues[4];
unsigned long gcmask;
xRectangle *rects;
BoxPtr pBox;
@@ -2373,18 +2373,18 @@ miBSClearBackingStore(pWin, x, y, w, h, generateExposures)
if (backgroundState == BackgroundPixel)
{
- gcvalues[0] = (pointer) background.pixel;
- gcvalues[1] = (pointer)FillSolid;
+ gcvalues[0] = (void *) background.pixel;
+ gcvalues[1] = (void *)FillSolid;
gcmask = GCForeground|GCFillStyle;
}
else
{
- gcvalues[0] = (pointer)FillTiled;
- gcvalues[1] = (pointer) background.pixmap;
+ gcvalues[0] = (void *)FillTiled;
+ gcvalues[1] = (void *) background.pixmap;
gcmask = GCFillStyle|GCTile;
}
- gcvalues[2] = (pointer)(long)(ts_x_origin - pBackingStore->x);
- gcvalues[3] = (pointer)(long)(ts_y_origin - pBackingStore->y);
+ gcvalues[2] = (void *)(long)(ts_x_origin - pBackingStore->x);
+ gcvalues[3] = (void *)(long)(ts_y_origin - pBackingStore->y);
gcmask |= GCTileStipXOrigin|GCTileStipYOrigin;
DoChangeGC(pGC, gcmask, (XID *)gcvalues, TRUE);
ValidateGC((DrawablePtr)pBackingStore->pBackingPixmap, pGC);
@@ -2477,7 +2477,7 @@ miBSFillVirtualBits (pDrawable, pGC, pRgn, x, y, state, pixunion, planeMask)
{
int i;
BITS32 gcmask;
- pointer gcval[5];
+ void * gcval[5];
xRectangle *pRect;
BoxPtr pBox;
WindowPtr pWin;
@@ -2498,18 +2498,18 @@ miBSFillVirtualBits (pDrawable, pGC, pRgn, x, y, state, pixunion, planeMask)
}
i = 0;
gcmask = 0;
- gcval[i++] = (pointer)planeMask;
+ gcval[i++] = (void *)planeMask;
gcmask |= GCPlaneMask;
if (state == BackgroundPixel)
{
if (pGC->fgPixel != pixunion.pixel)
{
- gcval[i++] = (pointer)pixunion.pixel;
+ gcval[i++] = (void *)pixunion.pixel;
gcmask |= GCForeground;
}
if (pGC->fillStyle != FillSolid)
{
- gcval[i++] = (pointer)FillSolid;
+ gcval[i++] = (void *)FillSolid;
gcmask |= GCFillStyle;
}
}
@@ -2517,22 +2517,22 @@ miBSFillVirtualBits (pDrawable, pGC, pRgn, x, y, state, pixunion, planeMask)
{
if (pGC->fillStyle != FillTiled)
{
- gcval[i++] = (pointer)FillTiled;
+ gcval[i++] = (void *)FillTiled;
gcmask |= GCFillStyle;
}
if (pGC->tileIsPixel || pGC->tile.pixmap != pixunion.pixmap)
{
- gcval[i++] = (pointer)pixunion.pixmap;
+ gcval[i++] = (void *)pixunion.pixmap;
gcmask |= GCTile;
}
if (pGC->patOrg.x != x)
{
- gcval[i++] = (pointer)(long)x;
+ gcval[i++] = (void *)(long)x;
gcmask |= GCTileStipXOrigin;
}
if (pGC->patOrg.y != y)
{
- gcval[i++] = (pointer)(long)y;
+ gcval[i++] = (void *)(long)y;
gcmask |= GCTileStipYOrigin;
}
}
@@ -2592,7 +2592,7 @@ miBSAllocate(pWin)
pBackingStore->viewable = (char)pWin->viewable;
pBackingStore->status = StatusNoPixmap;
pBackingStore->backgroundState = None;
- pWin->backStorage = (pointer) pBackingStore;
+ pWin->backStorage = (void *) pBackingStore;
}
/*
@@ -3622,7 +3622,7 @@ static void
miBSChangeClip(pGC, type, pvalue, nrects)
GCPtr pGC;
int type;
- pointer pvalue;
+ void * pvalue;
int nrects;
{
miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr;
diff --git a/nx-X11/programs/Xserver/mi/midispcur.c b/nx-X11/programs/Xserver/mi/midispcur.c
index 080ac1c59..d71234ffe 100644
--- a/nx-X11/programs/Xserver/mi/midispcur.c
+++ b/nx-X11/programs/Xserver/mi/midispcur.c
@@ -151,11 +151,11 @@ miDCInitialize (pScreen, screenFuncs)
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = miDCCloseScreen;
- pScreen->devPrivates[miDCScreenIndex].ptr = (pointer) pScreenPriv;
+ pScreen->devPrivates[miDCScreenIndex].ptr = (void *) pScreenPriv;
if (!miSpriteInitialize (pScreen, &miDCFuncs, screenFuncs))
{
- xfree ((pointer) pScreenPriv);
+ xfree ((void *) pScreenPriv);
return FALSE;
}
return TRUE;
@@ -187,7 +187,7 @@ miDCCloseScreen (index, pScreen)
tossPict (pScreenPriv->pRootPicture);
tossPict (pScreenPriv->pTempPicture);
#endif
- xfree ((pointer) pScreenPriv);
+ xfree ((void *) pScreenPriv);
return (*pScreen->CloseScreen) (index, pScreen);
}
@@ -197,7 +197,7 @@ miDCRealizeCursor (pScreen, pCursor)
CursorPtr pCursor;
{
if (pCursor->bits->refcnt <= 1)
- pCursor->bits->devPriv[pScreen->myNum] = (pointer)NULL;
+ pCursor->bits->devPriv[pScreen->myNum] = (void *)NULL;
return TRUE;
}
@@ -263,7 +263,7 @@ miDCRealize (
pFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8);
if (!pFormat)
{
- xfree ((pointer) pPriv);
+ xfree ((void *) pPriv);
return (miDCCursorPtr)NULL;
}
@@ -273,14 +273,14 @@ miDCRealize (
pCursor->bits->height, 32);
if (!pPixmap)
{
- xfree ((pointer) pPriv);
+ xfree ((void *) pPriv);
return (miDCCursorPtr)NULL;
}
pGC = GetScratchGC (32, pScreen);
if (!pGC)
{
(*pScreen->DestroyPixmap) (pPixmap);
- xfree ((pointer) pPriv);
+ xfree ((void *) pPriv);
return (miDCCursorPtr)NULL;
}
ValidateGC (&pPixmap->drawable, pGC);
@@ -294,10 +294,10 @@ miDCRealize (
(*pScreen->DestroyPixmap) (pPixmap);
if (!pPriv->pPicture)
{
- xfree ((pointer) pPriv);
+ xfree ((void *) pPriv);
return (miDCCursorPtr)NULL;
}
- pCursor->bits->devPriv[pScreen->myNum] = (pointer) pPriv;
+ pCursor->bits->devPriv[pScreen->myNum] = (void *) pPriv;
return pPriv;
}
pPriv->pPicture = 0;
@@ -305,17 +305,17 @@ miDCRealize (
pPriv->sourceBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1);
if (!pPriv->sourceBits)
{
- xfree ((pointer) pPriv);
+ xfree ((void *) pPriv);
return (miDCCursorPtr)NULL;
}
pPriv->maskBits = (*pScreen->CreatePixmap) (pScreen, pCursor->bits->width, pCursor->bits->height, 1);
if (!pPriv->maskBits)
{
(*pScreen->DestroyPixmap) (pPriv->sourceBits);
- xfree ((pointer) pPriv);
+ xfree ((void *) pPriv);
return (miDCCursorPtr)NULL;
}
- pCursor->bits->devPriv[pScreen->myNum] = (pointer) pPriv;
+ pCursor->bits->devPriv[pScreen->myNum] = (void *) pPriv;
/* create the two sets of bits, clipping as appropriate */
@@ -372,8 +372,8 @@ miDCUnrealizeCursor (pScreen, pCursor)
if (pPriv->pPicture)
FreePicture (pPriv->pPicture, 0);
#endif
- xfree ((pointer) pPriv);
- pCursor->bits->devPriv[pScreen->myNum] = (pointer)NULL;
+ xfree ((void *) pPriv);
+ pCursor->bits->devPriv[pScreen->myNum] = (void *)NULL;
}
return TRUE;
}
diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c
index 2be6b2264..f3dae5768 100644
--- a/nx-X11/programs/Xserver/mi/miexpose.c
+++ b/nx-X11/programs/Xserver/mi/miexpose.c
@@ -618,7 +618,7 @@ static GCPtr screenContext[MAXSCREENS];
/*ARGSUSED*/
static int
tossGC (
- pointer value,
+ void * value,
XID id)
{
GCPtr pGC = (GCPtr)value;
@@ -684,7 +684,7 @@ int what;
gcmask |= GCForeground | GCFillStyle;
break;
case BackgroundPixmap:
- newValues[TILE].ptr = (pointer)pWin->background.pixmap;
+ newValues[TILE].ptr = (void *)pWin->background.pixmap;
newValues[FILLSTYLE].val = FillTiled;
gcmask |= GCTile | GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin;
break;
@@ -700,7 +700,7 @@ int what;
}
else
{
- newValues[TILE].ptr = (pointer)pWin->border.pixmap;
+ newValues[TILE].ptr = (void *)pWin->border.pixmap;
newValues[FILLSTYLE].val = FillTiled;
gcmask |= GCTile | GCFillStyle | GCTileStipXOrigin | GCTileStipYOrigin;
}
@@ -773,7 +773,7 @@ int what;
return;
numGCs++;
if (!AddResource(FakeClientID(0), ResType,
- (pointer)screenContext[i]))
+ (void *)screenContext[i]))
return;
}
pGC = screenContext[i];
diff --git a/nx-X11/programs/Xserver/mi/mifillarc.h b/nx-X11/programs/Xserver/mi/mifillarc.h
index ff39bac1d..2d6904121 100644
--- a/nx-X11/programs/Xserver/mi/mifillarc.h
+++ b/nx-X11/programs/Xserver/mi/mifillarc.h
@@ -179,7 +179,7 @@ typedef struct _miArcSlice {
((slw > 1) || (ine != inxk)))
extern int miFreeArcCache(
- pointer /*data*/,
+ void * /*data*/,
XID /*id*/
);
diff --git a/nx-X11/programs/Xserver/mi/migc.c b/nx-X11/programs/Xserver/mi/migc.c
index 0cffe98a4..2b38b257d 100644
--- a/nx-X11/programs/Xserver/mi/migc.c
+++ b/nx-X11/programs/Xserver/mi/migc.c
@@ -114,14 +114,14 @@ void
miChangeClip(pGC, type, pvalue, nrects)
GCPtr pGC;
int type;
- pointer pvalue;
+ void *pvalue;
int nrects;
{
(*pGC->funcs->DestroyClip) (pGC);
if (type == CT_PIXMAP)
{
/* convert the pixmap to a region */
- pGC->clientClip = (pointer) BITMAP_TO_REGION(pGC->pScreen,
+ pGC->clientClip = (void *) BITMAP_TO_REGION(pGC->pScreen,
(PixmapPtr) pvalue);
(*pGC->pScreen->DestroyPixmap) (pvalue);
}
@@ -132,7 +132,7 @@ miChangeClip(pGC, type, pvalue, nrects)
}
else if (type != CT_NONE)
{
- pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nrects,
+ pGC->clientClip = (void *) RECTS_TO_REGION(pGC->pScreen, nrects,
(xRectangle *) pvalue,
type);
xfree(pvalue);
@@ -160,7 +160,7 @@ miCopyClip(pgcDst, pgcSrc)
prgnNew = REGION_CREATE(pgcSrc->pScreen, NULL, 1);
REGION_COPY(pgcDst->pScreen, prgnNew,
(RegionPtr) (pgcSrc->clientClip));
- (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (pointer) prgnNew, 0);
+ (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (void *) prgnNew, 0);
break;
}
}
diff --git a/nx-X11/programs/Xserver/mi/migc.h b/nx-X11/programs/Xserver/mi/migc.h
index d906c6334..039448b5f 100644
--- a/nx-X11/programs/Xserver/mi/migc.h
+++ b/nx-X11/programs/Xserver/mi/migc.h
@@ -53,7 +53,7 @@ extern void miDestroyClip(
extern void miChangeClip(
GCPtr /*pGC*/,
int /*type*/,
- pointer /*pvalue*/,
+ void * /*pvalue*/,
int /*nrects*/
);
diff --git a/nx-X11/programs/Xserver/mi/miglblt.c b/nx-X11/programs/Xserver/mi/miglblt.c
index 12d0aa932..3960fc212 100644
--- a/nx-X11/programs/Xserver/mi/miglblt.c
+++ b/nx-X11/programs/Xserver/mi/miglblt.c
@@ -90,7 +90,7 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
int x, y;
unsigned int nglyph;
CharInfoPtr *ppci; /* array of character info */
- pointer pglyphBase; /* start of array of glyphs */
+ void *pglyphBase; /* start of array of glyphs */
{
int width, height;
PixmapPtr pPixmap;
@@ -203,7 +203,7 @@ miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
int x, y;
unsigned int nglyph;
CharInfoPtr *ppci; /* array of character info */
- pointer pglyphBase; /* start of array of glyphs */
+ void *pglyphBase; /* start of array of glyphs */
{
ExtentInfoRec info; /* used by QueryGlyphExtents() */
XID gcvals[3];
diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c
index 545927b53..732e47af0 100644
--- a/nx-X11/programs/Xserver/mi/mioverlay.c
+++ b/nx-X11/programs/Xserver/mi/mioverlay.c
@@ -128,7 +128,7 @@ miInitOverlay(
if(!(pScreenPriv = xalloc(sizeof(miOverlayScreenRec))))
return FALSE;
- pScreen->devPrivates[miOverlayScreenIndex].ptr = (pointer)pScreenPriv;
+ pScreen->devPrivates[miOverlayScreenIndex].ptr = (void *)pScreenPriv;
pScreenPriv->InOverlay = inOverlayFunc;
pScreenPriv->MakeTransparent = transFunc;
@@ -1105,7 +1105,7 @@ typedef struct {
static int
miOverlayRecomputeExposures (
WindowPtr pWin,
- pointer value
+ void * value
){
register ScreenPtr pScreen;
miOverlayTwoRegions *pValid = (miOverlayTwoRegions*)value;
@@ -1503,7 +1503,7 @@ miOverlayResizeWindow(
TwoRegions.under = gravitate2[g];
TraverseTree (pChild, miOverlayRecomputeExposures,
- (pointer)(&TwoRegions));
+ (void *)(&TwoRegions));
}
/*
diff --git a/nx-X11/programs/Xserver/mi/mipointer.c b/nx-X11/programs/Xserver/mi/mipointer.c
index 432cc1606..869e74349 100644
--- a/nx-X11/programs/Xserver/mi/mipointer.c
+++ b/nx-X11/programs/Xserver/mi/mipointer.c
@@ -103,7 +103,7 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
pScreenPriv->showTransparent = FALSE;
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = miPointerCloseScreen;
- pScreen->devPrivates[miPointerScreenIndex].ptr = (pointer) pScreenPriv;
+ pScreen->devPrivates[miPointerScreenIndex].ptr = (void *) pScreenPriv;
/*
* set up screen cursor method table
*/
@@ -145,7 +145,7 @@ miPointerCloseScreen (index, pScreen)
if (pScreen == miPointer.pSpriteScreen)
miPointer.pSpriteScreen = 0;
pScreen->CloseScreen = pScreenPriv->CloseScreen;
- xfree ((pointer) pScreenPriv);
+ xfree ((void *) pScreenPriv);
return (*pScreen->CloseScreen) (index, pScreen);
}
@@ -373,7 +373,7 @@ miPointerUpdate ()
}
/*
- * miPointerDeltaCursor. The pointer has moved dx,dy from it's previous
+ * miPointerDeltaCursor. The void * has moved dx,dy from it's previous
* position.
*/
@@ -406,7 +406,7 @@ miPointerCurrentScreen ()
}
/*
- * miPointerAbsoluteCursor. The pointer has moved to x,y
+ * miPointerAbsoluteCursor. The void * has moved to x,y
*/
void
@@ -465,7 +465,7 @@ miPointerPosition (x, y)
}
/*
- * miPointerMove. The pointer has moved to x,y on current screen
+ * miPointerMove. The void * has moved to x,y on current screen
*/
static void
diff --git a/nx-X11/programs/Xserver/mi/mipolyrect.c b/nx-X11/programs/Xserver/mi/mipolyrect.c
index 6740ea8f6..98e467f9f 100644
--- a/nx-X11/programs/Xserver/mi/mipolyrect.c
+++ b/nx-X11/programs/Xserver/mi/mipolyrect.c
@@ -164,7 +164,7 @@ miPolyRectangle(pDraw, pGC, nrects, pRects)
}
}
(*pGC->ops->PolyFillRect) (pDraw, pGC, t - tmp, tmp);
- DEALLOCATE_LOCAL ((pointer) tmp);
+ DEALLOCATE_LOCAL ((void *) tmp);
}
else
{
diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c
index ae9b6c2ee..78e2af5a4 100644
--- a/nx-X11/programs/Xserver/mi/miscrinit.c
+++ b/nx-X11/programs/Xserver/mi/miscrinit.c
@@ -56,7 +56,7 @@ from The Open Group.
typedef struct
{
- pointer pbits; /* pointer to framebuffer */
+ void * pbits; /* pointer to framebuffer */
int width; /* delta to add to a framebuffer addr to move one row down */
} miScreenInitParmsRec, *miScreenInitParmsPtr;
@@ -71,7 +71,7 @@ miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind,
int depth;
int bitsPerPixel;
int devKind;
- pointer pPixData;
+ void *pPixData;
{
if (!pPixmap)
return FALSE;
@@ -150,7 +150,7 @@ miCreateScreenResources(pScreen)
ScreenPtr pScreen;
{
miScreenInitParmsPtr pScrInitParms;
- pointer value;
+ void * value;
pScrInitParms = (miScreenInitParmsPtr)pScreen->devPrivate;
@@ -174,7 +174,7 @@ miCreateScreenResources(pScreen)
PixmapBytePad(pScrInitParms->width, pScreen->rootDepth),
pScrInitParms->pbits))
return FALSE;
- value = (pointer)pPixmap;
+ value = (void *)pPixmap;
}
else
{
@@ -189,7 +189,7 @@ Bool
miScreenDevPrivateInit(pScreen, width, pbits)
register ScreenPtr pScreen;
int width;
- pointer pbits;
+ void * pbits;
{
miScreenInitParmsPtr pScrInitParms;
@@ -202,7 +202,7 @@ miScreenDevPrivateInit(pScreen, width, pbits)
return FALSE;
pScrInitParms->pbits = pbits;
pScrInitParms->width = width;
- pScreen->devPrivate = (pointer)pScrInitParms;
+ pScreen->devPrivate = (void *)pScrInitParms;
return TRUE;
}
@@ -210,7 +210,7 @@ Bool
miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
rootDepth, numDepths, depths, rootVisual, numVisuals, visuals)
register ScreenPtr pScreen;
- pointer pbits; /* pointer to screen bits */
+ void * pbits; /* pointer to screen bits */
int xsize, ysize; /* in pixels */
int dpix, dpiy; /* dots per inch */
int width; /* pixel width of frame buffer */
@@ -296,8 +296,8 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
pScreen->SendGraphicsExpose = miSendGraphicsExpose;
pScreen->BlockHandler = (ScreenBlockHandlerProcPtr)NoopDDA;
pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr)NoopDDA;
- pScreen->blockData = (pointer)0;
- pScreen->wakeupData = (pointer)0;
+ pScreen->blockData = (void *)0;
+ pScreen->wakeupData = (void *)0;
pScreen->MarkWindow = miMarkWindow;
pScreen->MarkOverlappedWindows = miMarkOverlappedWindows;
pScreen->ChangeSaveUnder = miChangeSaveUnder;
@@ -368,5 +368,5 @@ miSetScreenPixmap(pPix)
PixmapPtr pPix;
{
if (pPix)
- pPix->drawable.pScreen->devPrivate = (pointer)pPix;
+ pPix->drawable.pScreen->devPrivate = (void *)pPix;
}
diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c
index b76542774..0ff6dacd6 100644
--- a/nx-X11/programs/Xserver/mi/misprite.c
+++ b/nx-X11/programs/Xserver/mi/misprite.c
@@ -84,9 +84,9 @@ static void miSpriteSourceValidate(DrawablePtr pDrawable, int x, int y,
static void miSpriteCopyWindow (WindowPtr pWindow,
DDXPointRec ptOldOrg,
RegionPtr prgnSrc);
-static void miSpriteBlockHandler(int i, pointer blockData,
- pointer pTimeout,
- pointer pReadMask);
+static void miSpriteBlockHandler(int i, void * blockData,
+ void * pTimeout,
+ void * pReadMask);
static void miSpriteInstallColormap(ColormapPtr pMap);
static void miSpriteStoreColors(ColormapPtr pMap, int ndef,
xColorItem *pdef);
@@ -104,7 +104,7 @@ static void miSpriteComputeSaved(ScreenPtr pScreen);
((pScreen)->field = wrapper)
/*
- * pointer-sprite method table
+ * void *-sprite method table
*/
static Bool miSpriteRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
@@ -182,7 +182,7 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
if (!miPointerInitialize (pScreen, &miSpritePointerFuncs, screenFuncs,TRUE))
{
- xfree ((pointer) pScreenPriv);
+ xfree ((void *) pScreenPriv);
return FALSE;
}
for (pVisual = pScreen->visuals;
@@ -221,7 +221,7 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
pScreenPriv->colors[MASK_COLOR].red = 0;
pScreenPriv->colors[MASK_COLOR].green = 0;
pScreenPriv->colors[MASK_COLOR].blue = 0;
- pScreen->devPrivates[miSpriteScreenIndex].ptr = (pointer) pScreenPriv;
+ pScreen->devPrivates[miSpriteScreenIndex].ptr = (void *) pScreenPriv;
pScreen->CloseScreen = miSpriteCloseScreen;
pScreen->GetImage = miSpriteGetImage;
@@ -270,7 +270,7 @@ miSpriteCloseScreen (i, pScreen)
miSpriteIsUpFALSE (pScreen, pScreenPriv);
DamageDestroy (pScreenPriv->pDamage);
- xfree ((pointer) pScreenPriv);
+ xfree ((void *) pScreenPriv);
return (*pScreen->CloseScreen) (i, pScreen);
}
@@ -402,9 +402,9 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
static void
miSpriteBlockHandler (i, blockData, pTimeout, pReadmask)
int i;
- pointer blockData;
- pointer pTimeout;
- pointer pReadmask;
+ void * blockData;
+ void * pTimeout;
+ void * pReadmask;
{
ScreenPtr pScreen = screenInfo.screens[i];
miSpriteScreenPtr pPriv;
diff --git a/nx-X11/programs/Xserver/mi/miwindow.c b/nx-X11/programs/Xserver/mi/miwindow.c
index 280d0f8eb..179c6e31e 100644
--- a/nx-X11/programs/Xserver/mi/miwindow.c
+++ b/nx-X11/programs/Xserver/mi/miwindow.c
@@ -579,7 +579,7 @@ miMoveWindow(pWin, x, y, pNextSib, kind)
static int
miRecomputeExposures (
register WindowPtr pWin,
- pointer value) /* must conform to VisitWindowProcPtr */
+ void * value) /* must conform to VisitWindowProcPtr */
{
register ScreenPtr pScreen;
RegionPtr pValid = (RegionPtr)value;
@@ -910,7 +910,7 @@ miSlideAndSizeWindow(pWin, x, y, w, h, pSib)
continue;
REGION_INTERSECT(pScreen, pRegion,
&pChild->borderClip, gravitate[g]);
- TraverseTree (pChild, miRecomputeExposures, (pointer)pRegion);
+ TraverseTree (pChild, miRecomputeExposures, (void *)pRegion);
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 20:49:26 +0000