aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/mi')
-rw-r--r--xorg-server/mi/mi.h10
-rw-r--r--xorg-server/mi/miarc.c2
-rw-r--r--xorg-server/mi/micmap.c2
-rw-r--r--xorg-server/mi/midispcur.c6
-rw-r--r--xorg-server/mi/mieq.c4
-rw-r--r--xorg-server/mi/miexpose.c2
-rw-r--r--xorg-server/mi/migc.c8
-rw-r--r--xorg-server/mi/migc.h49
-rw-r--r--xorg-server/mi/miglblt.c4
-rw-r--r--xorg-server/mi/mioverlay.c4
-rw-r--r--xorg-server/mi/mipointer.c5
-rw-r--r--xorg-server/mi/mipolyrect.c2
-rw-r--r--xorg-server/mi/miscrinit.c16
-rw-r--r--xorg-server/mi/misprite.c6
-rw-r--r--xorg-server/mi/miwindow.c4
15 files changed, 57 insertions, 67 deletions
diff --git a/xorg-server/mi/mi.h b/xorg-server/mi/mi.h
index 638fc6bc7..950ee3812 100644
--- a/xorg-server/mi/mi.h
+++ b/xorg-server/mi/mi.h
@@ -271,7 +271,7 @@ extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr /*pDrawable */ ,
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
- pointer /*pglyphBase */
+ void */*pglyphBase */
);
extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ ,
@@ -280,7 +280,7 @@ extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ ,
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
- pointer /*pglyphBase */
+ void */*pglyphBase */
);
/* mipoly.c */
@@ -387,7 +387,7 @@ extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr /*pPixmap */ ,
int /*depth */ ,
int /*bitsPerPixel */ ,
int /*devKind */ ,
- pointer /*pPixData */
+ void */*pPixData */
);
extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
@@ -395,11 +395,11 @@ extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr /*pScreen */ ,
int /*width */ ,
- pointer /*pbits */
+ void */*pbits */
);
extern _X_EXPORT Bool miScreenInit(ScreenPtr /*pScreen */ ,
- pointer /*pbits */ ,
+ void */*pbits */ ,
int /*xsize */ ,
int /*ysize */ ,
int /*dpix */ ,
diff --git a/xorg-server/mi/miarc.c b/xorg-server/mi/miarc.c
index 0f6448bc1..0f56c7db3 100644
--- a/xorg-server/mi/miarc.c
+++ b/xorg-server/mi/miarc.c
@@ -1489,7 +1489,7 @@ miGetArcPts(SppArcPtr parc, /* points to an arc */
count++;
cdt = 2 * miDcos(dt);
- if (!(poly = (SppPointPtr) realloc((pointer) *ppPts,
+ if (!(poly = (SppPointPtr) realloc((void *) *ppPts,
(cpt + count) * sizeof(SppPointRec))))
return 0;
*ppPts = poly;
diff --git a/xorg-server/mi/micmap.c b/xorg-server/mi/micmap.c
index 3ef0c8c70..4648b9a70 100644
--- a/xorg-server/mi/micmap.c
+++ b/xorg-server/mi/micmap.c
@@ -75,7 +75,7 @@ miUninstallColormap(ColormapPtr pmap)
if (pmap == curpmap) {
if (pmap->mid != pmap->pScreen->defColormap) {
- dixLookupResourceByType((pointer *) &curpmap,
+ dixLookupResourceByType((void **) &curpmap,
pmap->pScreen->defColormap,
RT_COLORMAP, serverClient, DixUseAccess);
(*pmap->pScreen->InstallColormap) (curpmap);
diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c
index edca9696f..8cca5fe6e 100644
--- a/xorg-server/mi/midispcur.c
+++ b/xorg-server/mi/midispcur.c
@@ -79,7 +79,7 @@ typedef struct {
(miDCBufferPtr)dixLookupScreenPrivate(&GetMaster(dev, MASTER_POINTER)->devPrivates, miDCDeviceKey, screen))
/*
- * The core pointer buffer will point to the index of the virtual core pointer
+ * The core pointer buffer will point to the index of the virtual pointer
* in the pCursorBuffers array.
*/
typedef struct {
@@ -114,7 +114,7 @@ miDCInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
dixSetPrivate(&pScreen->devPrivates, miDCScreenKey, pScreenPriv);
if (!miSpriteInitialize(pScreen, screenFuncs)) {
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return FALSE;
}
return TRUE;
@@ -152,7 +152,7 @@ miDCCloseScreen(ScreenPtr pScreen)
pScreen->CloseScreen = pScreenPriv->CloseScreen;
miDCSwitchScreenCursor(pScreen, NULL, NULL, NULL, NULL);
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return (*pScreen->CloseScreen) (pScreen);
}
diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c
index 4c0748054..bc7f94523 100644
--- a/xorg-server/mi/mieq.c
+++ b/xorg-server/mi/mieq.c
@@ -585,7 +585,7 @@ mieqProcessInputEvents(void)
if (n_enqueued >= (miEventQueue.nevents - (2 * QUEUE_RESERVED_SIZE)) &&
miEventQueue.nevents < QUEUE_MAXIMUM_SIZE) {
ErrorF("[mi] Increasing EQ size to %lu to prevent dropped events.\n",
- miEventQueue.nevents << 1);
+ (unsigned long) (miEventQueue.nevents << 1));
if (!mieqGrowQueue(&miEventQueue, miEventQueue.nevents << 1)) {
ErrorF("[mi] Increasing the size of EQ failed.\n");
}
@@ -593,7 +593,7 @@ mieqProcessInputEvents(void)
if (miEventQueue.dropped) {
ErrorF("[mi] EQ processing has resumed after %lu dropped events.\n",
- miEventQueue.dropped);
+ (unsigned long) miEventQueue.dropped);
ErrorF
("[mi] This may be caused my a misbehaving driver monopolizing the server's resources.\n");
miEventQueue.dropped = 0;
diff --git a/xorg-server/mi/miexpose.c b/xorg-server/mi/miexpose.c
index 8b7c93fb8..198c4332f 100644
--- a/xorg-server/mi/miexpose.c
+++ b/xorg-server/mi/miexpose.c
@@ -610,7 +610,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
gcmask |= GCPlaneMask;
#endif
gcval[c++].val = FillTiled;
- gcval[c++].ptr = (pointer) fill.pixmap;
+ gcval[c++].ptr = (void *) fill.pixmap;
gcval[c++].val = tile_x_off;
gcval[c++].val = tile_y_off;
gcmask |= GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin;
diff --git a/xorg-server/mi/migc.c b/xorg-server/mi/migc.c
index c9cdd12af..9bbe8846e 100644
--- a/xorg-server/mi/migc.c
+++ b/xorg-server/mi/migc.c
@@ -72,12 +72,12 @@ miDestroyClip(GCPtr pGC)
}
void
-miChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+miChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
(*pGC->funcs->DestroyClip) (pGC);
if (type == CT_PIXMAP) {
/* convert the pixmap to a region */
- pGC->clientClip = (pointer) BitmapToRegion(pGC->pScreen,
+ pGC->clientClip = (void *) BitmapToRegion(pGC->pScreen,
(PixmapPtr) pvalue);
(*pGC->pScreen->DestroyPixmap) (pvalue);
}
@@ -86,7 +86,7 @@ miChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
pGC->clientClip = pvalue;
}
else if (type != CT_NONE) {
- pGC->clientClip = (pointer) RegionFromRects(nrects,
+ pGC->clientClip = (void *) RegionFromRects(nrects,
(xRectangle *) pvalue,
type);
free(pvalue);
@@ -112,7 +112,7 @@ miCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
case CT_REGION:
prgnNew = RegionCreate(NULL, 1);
RegionCopy(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/xorg-server/mi/migc.h b/xorg-server/mi/migc.h
index 8c13b2e53..8d06a6f9f 100644
--- a/xorg-server/mi/migc.h
+++ b/xorg-server/mi/migc.h
@@ -26,31 +26,24 @@ from The Open Group.
*/
-extern _X_EXPORT void miChangeGC(GCPtr /*pGC */ ,
- unsigned long /*mask */
- );
-
-extern _X_EXPORT void miDestroyGC(GCPtr /*pGC */
- );
-
-extern _X_EXPORT void miDestroyClip(GCPtr /*pGC */
- );
-
-extern _X_EXPORT void miChangeClip(GCPtr /*pGC */ ,
- int /*type */ ,
- pointer /*pvalue */ ,
- int /*nrects */
- );
-
-extern _X_EXPORT void miCopyClip(GCPtr /*pgcDst */ ,
- GCPtr /*pgcSrc */
- );
-
-extern _X_EXPORT void miCopyGC(GCPtr /*pGCSrc */ ,
- unsigned long /*changes */ ,
- GCPtr /*pGCDst */
- );
-
-extern _X_EXPORT void miComputeCompositeClip(GCPtr /*pGC */ ,
- DrawablePtr /*pDrawable */
- );
+extern _X_EXPORT void miChangeGC(GCPtr pGC,
+ unsigned long mask);
+
+extern _X_EXPORT void miDestroyGC(GCPtr pGC);
+
+extern _X_EXPORT void miDestroyClip(GCPtr pGC);
+
+extern _X_EXPORT void miChangeClip(GCPtr pGC,
+ int type,
+ void *pvalue,
+ int nrects);
+
+extern _X_EXPORT void miCopyClip(GCPtr pgcDst,
+ GCPtr pgcSrc);
+
+extern _X_EXPORT void miCopyGC(GCPtr pGCSrc,
+ unsigned long changes,
+ GCPtr pGCDst);
+
+extern _X_EXPORT void miComputeCompositeClip(GCPtr pGC,
+ DrawablePtr pDrawable);
diff --git a/xorg-server/mi/miglblt.c b/xorg-server/mi/miglblt.c
index 1a70911fa..b53ab9c0e 100644
--- a/xorg-server/mi/miglblt.c
+++ b/xorg-server/mi/miglblt.c
@@ -81,7 +81,7 @@ with the sample server.
void
miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int 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;
@@ -182,7 +182,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyp
void
miImageGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int 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() */
diff --git a/xorg-server/mi/mioverlay.c b/xorg-server/mi/mioverlay.c
index 2bfd5e401..7f502fa37 100644
--- a/xorg-server/mi/mioverlay.c
+++ b/xorg-server/mi/mioverlay.c
@@ -1050,7 +1050,7 @@ typedef struct {
} miOverlayTwoRegions;
static int
-miOverlayRecomputeExposures(WindowPtr pWin, pointer value)
+miOverlayRecomputeExposures(WindowPtr pWin, void *value)
{
miOverlayTwoRegions *pValid = (miOverlayTwoRegions *) value;
miOverlayTreePtr pTree = MIOVERLAY_GET_WINDOW_TREE(pWin);
@@ -1404,7 +1404,7 @@ miOverlayResizeWindow(WindowPtr pWin,
TwoRegions.under = gravitate2[g];
TraverseTree(pChild, miOverlayRecomputeExposures,
- (pointer) (&TwoRegions));
+ (void *) (&TwoRegions));
}
/*
diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index 5d591a1dc..6fa416d9d 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -152,7 +152,7 @@ miPointerCloseScreen(ScreenPtr pScreen)
SetupScreen(pScreen);
pScreen->CloseScreen = pScreenPriv->CloseScreen;
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
FreeEventList(mipointermove_events, GetMaximumEventsNum());
mipointermove_events = NULL;
return (*pScreen->CloseScreen) (pScreen);
@@ -352,7 +352,6 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
miPointerPtr pPointer;
BOOL changedScreen = FALSE;
- SetupScreen(pScreen);
pPointer = MIPOINTER(pDev);
if (pPointer->pScreen != pScreen) {
@@ -465,14 +464,12 @@ miPointerUpdateSprite(DeviceIntPtr pDev)
void
miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
{
- miPointerScreenPtr pScreenPriv;
ScreenPtr pScreen;
miPointerPtr pPointer;
pPointer = MIPOINTER(pDev);
pScreen = screenInfo.screens[screen_no];
- pScreenPriv = GetScreenPrivate(pScreen);
mieqSwitchScreen(pDev, pScreen, FALSE);
NewCurrentScreen(pDev, pScreen, x, y);
diff --git a/xorg-server/mi/mipolyrect.c b/xorg-server/mi/mipolyrect.c
index a0e88d2f2..e316ae053 100644
--- a/xorg-server/mi/mipolyrect.c
+++ b/xorg-server/mi/mipolyrect.c
@@ -148,7 +148,7 @@ miPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, xRectangle *pRects)
}
}
(*pGC->ops->PolyFillRect) (pDraw, pGC, t - tmp, tmp);
- free((pointer) tmp);
+ free((void *) tmp);
}
else {
diff --git a/xorg-server/mi/miscrinit.c b/xorg-server/mi/miscrinit.c
index 4698b532f..6aed52f51 100644
--- a/xorg-server/mi/miscrinit.c
+++ b/xorg-server/mi/miscrinit.c
@@ -53,14 +53,14 @@ 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;
/* this plugs into pScreen->ModifyPixmapHeader */
Bool
miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
if (!pPixmap)
return FALSE;
@@ -135,7 +135,7 @@ Bool
miCreateScreenResources(ScreenPtr pScreen)
{
miScreenInitParmsPtr pScrInitParms;
- pointer value;
+ void *value;
pScrInitParms = (miScreenInitParmsPtr) pScreen->devPrivate;
@@ -161,7 +161,7 @@ miCreateScreenResources(ScreenPtr pScreen)
pScreen->rootDepth),
pScrInitParms->pbits))
return FALSE;
- value = (pointer) pPixmap;
+ value = (void *) pPixmap;
}
else {
value = pScrInitParms->pbits;
@@ -172,7 +172,7 @@ miCreateScreenResources(ScreenPtr pScreen)
}
Bool
-miScreenDevPrivateInit(ScreenPtr pScreen, int width, pointer pbits)
+miScreenDevPrivateInit(ScreenPtr pScreen, int width, void *pbits)
{
miScreenInitParmsPtr pScrInitParms;
@@ -185,7 +185,7 @@ miScreenDevPrivateInit(ScreenPtr pScreen, int width, pointer pbits)
return FALSE;
pScrInitParms->pbits = pbits;
pScrInitParms->width = width;
- pScreen->devPrivate = (pointer) pScrInitParms;
+ pScreen->devPrivate = (void *) pScrInitParms;
return TRUE;
}
@@ -199,11 +199,11 @@ static void
miSetScreenPixmap(PixmapPtr pPix)
{
if (pPix)
- pPix->drawable.pScreen->devPrivate = (pointer) pPix;
+ pPix->drawable.pScreen->devPrivate = (void *) pPix;
}
Bool
-miScreenInit(ScreenPtr pScreen, pointer pbits, /* pointer to screen bits */
+miScreenInit(ScreenPtr pScreen, void *pbits, /* pointer to screen bits */
int xsize, int ysize, /* in pixels */
int dpix, int dpiy, /* dots per inch */
int width, /* pixel width of frame buffer */
diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c
index 85ca022ed..eea731a15 100644
--- a/xorg-server/mi/misprite.c
+++ b/xorg-server/mi/misprite.c
@@ -199,7 +199,7 @@ static void miSpriteSourceValidate(DrawablePtr pDrawable, int x, int y,
static void miSpriteCopyWindow(WindowPtr pWindow,
DDXPointRec ptOldOrg, RegionPtr prgnSrc);
static void miSpriteBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadMask);
+ void *pTimeout, void *pReadMask);
static void miSpriteInstallColormap(ColormapPtr pMap);
static void miSpriteStoreColors(ColormapPtr pMap, int ndef, xColorItem * pdef);
@@ -512,8 +512,8 @@ miSpriteCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
}
static void
-miSpriteBlockHandler(ScreenPtr pScreen, pointer pTimeout,
- pointer pReadmask)
+miSpriteBlockHandler(ScreenPtr pScreen, void *pTimeout,
+ void *pReadmask)
{
miSpriteScreenPtr pPriv = GetSpriteScreen(pScreen);
DeviceIntPtr pDev;
diff --git a/xorg-server/mi/miwindow.c b/xorg-server/mi/miwindow.c
index 8dd99dbf0..697ffbc26 100644
--- a/xorg-server/mi/miwindow.c
+++ b/xorg-server/mi/miwindow.c
@@ -305,7 +305,7 @@ miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind)
*/
static int
-miRecomputeExposures(WindowPtr pWin, pointer value)
+miRecomputeExposures(WindowPtr pWin, void *value)
{ /* must conform to VisitWindowProcPtr */
RegionPtr pValid = (RegionPtr) value;
@@ -584,7 +584,7 @@ miSlideAndSizeWindow(WindowPtr pWin,
if (pChild->winGravity != g)
continue;
RegionIntersect(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-02 22:46:56 +0000