diff options
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
42 files changed, 303 insertions, 303 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index fbe52db9c..3a47e270e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -77,7 +77,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) pVisual = pCmap->pVisual; ncolors = pVisual->ColormapEntries; - pCmap->devPriv = (pointer)xalloc(sizeof(nxagentPrivColormap)); + pCmap->devPriv = (void *)xalloc(sizeof(nxagentPrivColormap)); if (((visual = nxagentVisual(pVisual))) == NULL) { @@ -174,7 +174,7 @@ void nxagentDestroyColormap(ColormapPtr pCmap) #define SEARCH_PREDICATE \ (nxagentWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i]) -static int nxagentCountInstalledColormapWindows(WindowPtr pWin, pointer ptr) +static int nxagentCountInstalledColormapWindows(WindowPtr pWin, void * ptr) { nxagentInstalledColormapWindows *icws = (nxagentInstalledColormapWindows *) ptr; @@ -189,7 +189,7 @@ static int nxagentCountInstalledColormapWindows(WindowPtr pWin, pointer ptr) return WT_WALKCHILDREN; } -static int nxagentGetInstalledColormapWindows(WindowPtr pWin, pointer ptr) +static int nxagentGetInstalledColormapWindows(WindowPtr pWin, void * ptr) { nxagentInstalledColormapWindows *icws = (nxagentInstalledColormapWindows *)ptr; int i; @@ -233,11 +233,11 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) sizeof(Colormap)); icws.numCmapIDs = nxagentListInstalledColormaps(pScreen, icws.cmapIDs); icws.numWindows = 0; - WalkTree(pScreen, nxagentCountInstalledColormapWindows, (pointer)&icws); + WalkTree(pScreen, nxagentCountInstalledColormapWindows, (void *)&icws); if (icws.numWindows) { icws.windows = (Window *)xalloc((icws.numWindows + 1) * sizeof(Window)); icws.index = 0; - WalkTree(pScreen, nxagentGetInstalledColormapWindows, (pointer)&icws); + WalkTree(pScreen, nxagentGetInstalledColormapWindows, (void *)&icws); icws.windows[icws.numWindows] = nxagentDefaultWindows[pScreen->myNum]; numWindows = icws.numWindows + 1; } @@ -388,10 +388,10 @@ void nxagentInstallColormap(ColormapPtr pCmap) /* Uninstall pInstalledMap. Notify all interested parties. */ if(pOldCmap != (ColormapPtr)None) - WalkTree(pCmap->pScreen, TellLostMap, (pointer)&pOldCmap->mid); + WalkTree(pCmap->pScreen, TellLostMap, (void *)&pOldCmap->mid); InstalledMaps[index] = pCmap; - WalkTree(pCmap->pScreen, TellGainedMap, (pointer)&pCmap->mid); + WalkTree(pCmap->pScreen, TellGainedMap, (void *)&pCmap->mid); nxagentSetInstalledColormapWindows(pCmap->pScreen); nxagentDirectInstallColormaps(pCmap->pScreen); @@ -542,7 +542,7 @@ Bool nxagentCreateDefaultColormap(ScreenPtr pScreen) return True; } -static void nxagentReconnectColormap(pointer p0, XID x1, pointer p2) +static void nxagentReconnectColormap(void * p0, XID x1, void * p2) { ColormapPtr pCmap = (ColormapPtr)p0; Bool* pBool = (Bool*)p2; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index 9d48aa134..c0015a831 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -231,7 +231,7 @@ Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) bg_color.green = pCursor->backGreen; bg_color.blue = pCursor->backBlue; - pCursor->devPriv[pScreen->myNum] = (pointer) xalloc(sizeof(nxagentPrivCursor)); + pCursor->devPriv[pScreen->myNum] = (void *) xalloc(sizeof(nxagentPrivCursor)); nxagentCursorPriv(pCursor, pScreen)->cursor = XCreatePixmapCursor(nxagentDisplay, source, mask, &fg_color, @@ -311,7 +311,7 @@ Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y, } } -void nxagentReconnectCursor(pointer p0, XID x1, pointer p2) +void nxagentReconnectCursor(void * p0, XID x1, void * p2) { Bool* pBool = (Bool*)p2; CursorPtr pCursor = (CursorPtr) p0; @@ -433,7 +433,7 @@ Bool nxagentReconnectAllCursor(void *p0) return r; } -void nxagentDisconnectCursor(pointer p0, XID x1, pointer p2) +void nxagentDisconnectCursor(void * p0, XID x1, void * p2) { Bool* pBool = (Bool *) p2; CursorPtr pCursor = (CursorPtr) p0; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h index 88dea2686..38f09cd9c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h @@ -100,8 +100,8 @@ Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y, extern Bool (*nxagentSetCursorPositionW)(ScreenPtr pScreen, int x, int y, Bool generateEvent); -void nxagentDisconnectCursor(pointer p0, XID x1, pointer p2); -void nxagentReconnectCursor(pointer p0, XID x1, pointer p2); +void nxagentDisconnectCursor(void * p0, XID x1, void * p2); +void nxagentReconnectCursor(void * p0, XID x1, void * p2); void nxagentReDisplayCurrentCursor(void); Bool nxagentReconnectAllCursor(void *p0); Bool nxagentDisconnectAllCursor(void); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index f2225996b..34781e816 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -106,7 +106,7 @@ void nxagentExposeBackgroundPredicate(void *p0, XID x1, void *p2); * Imported from NXresource.c */ -extern int nxagentFindClientResource(int, RESTYPE, pointer); +extern int nxagentFindClientResource(int, RESTYPE, void *); unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel); unsigned long nxagentGetDrawableColor(DrawablePtr pDrawable); @@ -2391,7 +2391,7 @@ void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion) } } -int nxagentDestroyCorruptedWindowResource(pointer p, XID id) +int nxagentDestroyCorruptedWindowResource(void * p, XID id) { #ifdef TEST fprintf(stderr, "nxagentDestroyCorruptedWindowResource: Removing corrupted window [%p] from resources.\n", @@ -2403,7 +2403,7 @@ int nxagentDestroyCorruptedWindowResource(pointer p, XID id) return 1; } -int nxagentDestroyCorruptedPixmapResource(pointer p, XID id) +int nxagentDestroyCorruptedPixmapResource(void * p, XID id) { #ifdef TEST fprintf(stderr, "nxagentDestroyCorruptedPixmapResource: Removing corrupted pixmap [%p] from resources.\n", @@ -2415,7 +2415,7 @@ int nxagentDestroyCorruptedPixmapResource(pointer p, XID id) return 1; } -int nxagentDestroyCorruptedBackgroundResource(pointer p, XID id) +int nxagentDestroyCorruptedBackgroundResource(void * p, XID id) { #ifdef TEST fprintf(stderr, "nxagentDestroyCorruptedBackgroundResource: Removing corrupted pixmap background [%p] from resources.\n", @@ -2842,7 +2842,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type) nxagentWindowPriv((WindowPtr) pDrawable) -> corruptedId = FakeClientID(serverClient -> index); AddResource(nxagentWindowPriv((WindowPtr) pDrawable) -> corruptedId, RT_NX_CORR_WINDOW, - (pointer) pDrawable); + (void *) pDrawable); } } else if (type == RT_NX_CORR_BACKGROUND) @@ -2869,7 +2869,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type) nxagentPixmapPriv(pRealPixmap) -> corruptedBackgroundId = FakeClientID(serverClient -> index); AddResource(nxagentPixmapPriv(pRealPixmap) -> corruptedBackgroundId, RT_NX_CORR_BACKGROUND, - (pointer) pRealPixmap); + (void *) pRealPixmap); } } else if (type == RT_NX_CORR_PIXMAP) @@ -2896,7 +2896,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type) nxagentPixmapPriv(pRealPixmap) -> corruptedId = FakeClientID(serverClient -> index); AddResource(nxagentPixmapPriv(pRealPixmap) -> corruptedId, RT_NX_CORR_PIXMAP, - (pointer) pRealPixmap); + (void *) pRealPixmap); } } } @@ -3204,7 +3204,7 @@ void nxagentExposeBackgroundPredicate(void *p0, XID x1, void *p2) * This function is similar to nxagentClipAndSendExpose(). */ -int nxagentClipAndSendClearExpose(WindowPtr pWin, pointer ptr) +int nxagentClipAndSendClearExpose(WindowPtr pWin, void * ptr) { RegionPtr exposeRgn; RegionPtr remoteExposeRgn; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h index c987fa119..4ebbc928e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h @@ -182,9 +182,9 @@ extern void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion); extern void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type); extern void nxagentDestroyCorruptedResource(DrawablePtr pDrawable, RESTYPE type); -extern int nxagentDestroyCorruptedBackgroundResource(pointer p, XID id); -extern int nxagentDestroyCorruptedWindowResource(pointer p, XID id); -extern int nxagentDestroyCorruptedPixmapResource(pointer p, XID id); +extern int nxagentDestroyCorruptedBackgroundResource(void * p, XID id); +extern int nxagentDestroyCorruptedWindowResource(void * p, XID id); +extern int nxagentDestroyCorruptedPixmapResource(void * p, XID id); extern void nxagentCreateDrawableBitmap(DrawablePtr pDrawable); extern void nxagentDestroyDrawableBitmap(DrawablePtr pDrawable); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index be5dd9032..c33564092 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -218,7 +218,7 @@ RegionPtr nxagentRemoteExposeRegion = NULL; static void nxagentForwardRemoteExpose(void); -static int nxagentClipAndSendExpose(WindowPtr pWin, pointer ptr); +static int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr); /* * This is from NXproperty.c. @@ -778,7 +778,7 @@ void nxagentGetEventMask(WindowPtr pWin, Mask *mask_return) *mask_return = mask; } -static int nxagentChangeMapPrivate(WindowPtr pWin, pointer ptr) +static int nxagentChangeMapPrivate(WindowPtr pWin, void * ptr) { if (pWin && nxagentWindowPriv(pWin)) { @@ -788,7 +788,7 @@ static int nxagentChangeMapPrivate(WindowPtr pWin, pointer ptr) return WT_WALKCHILDREN; } -static int nxagentChangeVisibilityPrivate(WindowPtr pWin, pointer ptr) +static int nxagentChangeVisibilityPrivate(WindowPtr pWin, void * ptr) { if (pWin && nxagentWindowPriv(pWin)) { @@ -4276,7 +4276,7 @@ void nxagentAddRectToRemoteExposeRegion(BoxPtr rect) REGION_UNINIT(nxagentDefaultScreen, &exposeRegion); } -int nxagentClipAndSendExpose(WindowPtr pWin, pointer ptr) +int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr) { RegionPtr exposeRgn; RegionPtr remoteExposeRgn; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 5becb2cff..9123f4bbe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -103,7 +103,7 @@ is" without express or implied warranty. static int reconnectFlexibility; static void nxagentCleanCacheAfterReconnect(void); -static void nxagentFontReconnect(FontPtr, XID, pointer); +static void nxagentFontReconnect(FontPtr, XID, void *); static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontPtr pFont); static XFontStruct *nxagentLoadQueryFont(register Display *dpy , char *fontName , FontPtr pFont); int nxagentFreeFont(XFontStruct *fs); @@ -486,7 +486,7 @@ Bool nxagentFontLookUp(const char *name) Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) { - pointer priv; + void * priv; Atom name_atom, value_atom; int nprops; FontPropPtr props; @@ -538,7 +538,7 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) name = origName; } - priv = (pointer)xalloc(sizeof(nxagentPrivFont)); + priv = (void *)xalloc(sizeof(nxagentPrivFont)); FontSetPrivate(pFont, nxagentFontPrivateIndex, priv); nxagentFontPriv(pFont) -> mirrorID = 0; @@ -693,7 +693,7 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) return True; } -int nxagentDestroyNewFontResourceType(pointer p, XID id) +int nxagentDestroyNewFontResourceType(void * p, XID id) { #ifdef TEST fprintf(stderr, "nxagentDestroyNewFontResourceType: Destroying mirror id [%ld] for font at [%p].\n", @@ -858,7 +858,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP return fontStruct; } -static void nxagentFontDisconnect(FontPtr pFont, XID param1, pointer param2) +static void nxagentFontDisconnect(FontPtr pFont, XID param1, void * param2) { nxagentPrivFont *privFont; Bool *pBool = (Bool*)param2; @@ -959,7 +959,7 @@ static void nxagentCollectFailedFont(FontPtr fpt, XID id) nxagentFailedToReconnectFonts.index++; } -static void nxagentFontReconnect(FontPtr pFont, XID param1, pointer param2) +static void nxagentFontReconnect(FontPtr pFont, XID param1, void * param2) { int i; nxagentPrivFont *privFont; @@ -1164,7 +1164,7 @@ Bool nxagentReconnectAllFonts(void *p0) return fontSuccess; } -static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, pointer param2) +static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, void * param2) { int i; nxagentPrivFont *privFont; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.h b/nx-X11/programs/Xserver/hw/nxagent/Font.h index d3ee2b0da..873efba51 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.h @@ -65,7 +65,7 @@ int nxagentFontLookUp(const char *name); Bool nxagentFontFind(const char *name, int *pos); void nxagentListRemoteAddName(const char *name, int status); -int nxagentDestroyNewFontResourceType(pointer p, XID id); +int nxagentDestroyNewFontResourceType(void * p, XID id); Bool nxagentDisconnectAllFonts(void); Bool nxagentReconnectAllFonts(void *p0); diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c index ec51bbedc..808220346 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GC.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c @@ -75,7 +75,7 @@ void nxagentDisconnectGraphicContexts(void); GCPtr nxagentCreateGraphicContext(int depth); static void nxagentReconnectGC(void*, XID, void*); -static void nxagentReconnectClip(GCPtr, int, pointer, int); +static void nxagentReconnectClip(GCPtr, int, void *, int); static int nxagentCompareRegions(RegionPtr, RegionPtr); struct nxagentGCRec @@ -198,7 +198,7 @@ Bool nxagentCreateGC(GCPtr pGC) nxagentGCPriv(pGC) -> pPixmap = NULL; - AddResource(nxagentGCPriv(pGC) -> mid, RT_NX_GC, (pointer) pGC); + AddResource(nxagentGCPriv(pGC) -> mid, RT_NX_GC, (void *) pGC); return True; } @@ -602,7 +602,7 @@ void nxagentDestroyGC(GCPtr pGC) miDestroyGC(pGC); } -void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects) +void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) { int i, size; BoxPtr pBox; @@ -699,7 +699,7 @@ void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects) nxagentPixmap((PixmapPtr)pValue)); } - pGC->clientClip = (pointer) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue); + pGC->clientClip = (void *) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue); nxagentGCPriv(pGC)->pPixmap = (PixmapPtr)pValue; @@ -768,7 +768,7 @@ void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects) * CT_REGION client clips. */ - pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects, + pGC->clientClip = (void *) RECTS_TO_REGION(pGC->pScreen, nRects, (xRectangle *)pValue, type); xfree(pValue); @@ -987,7 +987,7 @@ static void nxagentRestoreGCList() } } -int nxagentDestroyNewGCResourceType(pointer p, XID id) +int nxagentDestroyNewGCResourceType(void * p, XID id) { /* * Address of the destructor is set in Init.c. @@ -1003,7 +1003,7 @@ int nxagentDestroyNewGCResourceType(pointer p, XID id) return 1; } -static void nxagentReconnectGC(void *param0, XID param1, pointer param2) +static void nxagentReconnectGC(void *param0, XID param1, void * param2) { XGCValues values; unsigned long valuemask; @@ -1188,7 +1188,7 @@ Bool nxagentReconnectAllGCs(void *p0) return GCSuccess; } -void nxagentDisconnectGC(pointer p0, XID x1, pointer p2) +void nxagentDisconnectGC(void * p0, XID x1, void * p2) { GCPtr pGC = (GCPtr) p0; Bool* pBool = (Bool*) p2; @@ -1255,7 +1255,7 @@ Bool nxagentDisconnectAllGCs() return success; } -static void nxagentReconnectClip(GCPtr pGC, int type, pointer pValue, int nRects) +static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects) { int i, size; BoxPtr pBox; @@ -1320,7 +1320,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, pointer pValue, int nRects XSetClipOrigin(nxagentDisplay, nxagentGC(pGC), pGC -> clipOrg.x, pGC -> clipOrg.y); - pGC->clientClip = (pointer) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue); + pGC->clientClip = (void *) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue); nxagentGCPriv(pGC)->pPixmap = (PixmapPtr)pValue; @@ -1370,7 +1370,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, pointer pValue, int nRects * CT_PIXMAP and CT_REGION client clips. */ - pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects, + pGC->clientClip = (void *) RECTS_TO_REGION(pGC->pScreen, nRects, (xRectangle *)pValue, type); xfree(pValue); pValue = pGC->clientClip; diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index c489d12c4..25f5fa6d7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -2042,7 +2042,7 @@ void nxagentImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo, - pointer pGlyphBase) + void * pGlyphBase) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { @@ -2061,7 +2061,7 @@ void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, void nxagentPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nGlyphs, CharInfoPtr *pCharInfo, - pointer pGlyphBase) + void * pGlyphBase) { if ((pDrawable)->type == DRAWABLE_PIXMAP) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.h b/nx-X11/programs/Xserver/hw/nxagent/GCOps.h index fa4967aee..725b382c5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.h +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.h @@ -93,10 +93,10 @@ void nxagentImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, unsigned short *string); void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, - unsigned int nGlyphs, CharInfoPtr *pCharInfo, pointer pGlyphBase); + unsigned int nGlyphs, CharInfoPtr *pCharInfo, void * pGlyphBase); void nxagentPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, - unsigned int nGlyphs, CharInfoPtr *pCharInfo, pointer pGlyphBase); + unsigned int nGlyphs, CharInfoPtr *pCharInfo, void * pGlyphBase); void nxagentPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable, int width, int height, int x, int y); diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCs.h b/nx-X11/programs/Xserver/hw/nxagent/GCs.h index f7e13477a..bbd090dcc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCs.h +++ b/nx-X11/programs/Xserver/hw/nxagent/GCs.h @@ -87,17 +87,17 @@ void nxagentValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable); void nxagentChangeGC(GCPtr pGC, unsigned long mask); void nxagentCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst); void nxagentDestroyGC(GCPtr pGC); -void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects); +void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects); void nxagentDestroyClip(GCPtr pGC); void nxagentDestroyClipHelper(GCPtr pGC); void nxagentCopyClip(GCPtr pGCDst, GCPtr pGCSrc); -void nxagentDisconnectGC(pointer p0, XID x1, pointer p2); +void nxagentDisconnectGC(void * p0, XID x1, void * p2); Bool nxagentDisconnectAllGCs(void); Bool nxagentReconnectAllGCs(void *p0); -int nxagentDestroyNewGCResourceType(pointer p, XID id); +int nxagentDestroyNewGCResourceType(void * p, XID id); void nxagentFreeGCList(void); void nxagentInitGCSafeVector(void); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 1fc6bbf8b..0396a458e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -161,7 +161,7 @@ struct _DispatchRec nxagentDispatch = { UNDEFINED, 0, 0, 0 }; extern int nxagentSkipImage; -void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) +void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask) { /* * Zero timeout. @@ -569,7 +569,7 @@ void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) #endif } -void nxagentWakeupHandler(pointer data, int count, pointer mask) +void nxagentWakeupHandler(void * data, int count, void * mask) { #ifdef BLOCKS fprintf(stderr, "[Begin wakeup]\n"); @@ -723,7 +723,7 @@ void nxagentWakeupHandler(pointer data, int count, pointer mask) #endif } -void nxagentShadowBlockHandler(pointer data, struct timeval **timeout, pointer mask) +void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mask) { static struct timeval zero; @@ -851,7 +851,7 @@ FIXME: Must queue multiple writes and handle #endif } -void nxagentShadowWakeupHandler(pointer data, int count, pointer mask) +void nxagentShadowWakeupHandler(void * data, int count, void * mask) { #ifdef BLOCKS fprintf(stderr, "[Begin wakeup]\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.h b/nx-X11/programs/Xserver/hw/nxagent/Handlers.h index 3d3b335c0..0ef8b9ac2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.h @@ -100,8 +100,8 @@ extern struct _TokensRec nxagentTokens; * The agent's block and wakeup handlers. */ -void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask); -void nxagentWakeupHandler(pointer data, int count, pointer mask); +void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask); +void nxagentWakeupHandler(void * data, int count, void * mask); /* * Executed after each request processed. @@ -109,8 +109,8 @@ void nxagentWakeupHandler(pointer data, int count, pointer mask); void nxagentDispatchHandler(ClientPtr client, int in, int out); -void nxagentShadowBlockHandler(pointer data, struct timeval **timeout, pointer mask); -void nxagentShadowWakeupHandler(pointer data, int count, pointer mask); +void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mask); +void nxagentShadowWakeupHandler(void * data, int count, void * mask); extern GCPtr nxagentShadowGCPtr; extern unsigned char nxagentShadowDepth; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 3722800ff..0b25aa57d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -132,8 +132,8 @@ void OsVendorEndRedirectErrorFFunction(); */ -static void nxagentGrabServerCallback(CallbackListPtr *callbacks, pointer data, - pointer args); +static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data, + void *args); void ddxInitGlobals(void) { @@ -398,7 +398,7 @@ void InitInput(argc, argv) int argc; char *argv[]; { - pointer ptr, kbd; + void *ptr, *kbd; ptr = AddInputDevice(nxagentPointerProc, True); kbd = AddInputDevice(nxagentKeyboardProc, True); @@ -530,8 +530,8 @@ int SelectWaitTime = 10000; /* usec */ ServerGrabInfoRec nxagentGrabServerInfo; -static void nxagentGrabServerCallback(CallbackListPtr *callbacks, pointer data, - pointer args) +static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data, + void *args) { ServerGrabInfoRec *grab = (ServerGrabInfoRec*)args; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 9c89b555f..835aebeb6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -571,7 +571,7 @@ static char *nxagentXkbGetRules() return XKB_DFLT_RULES_FILE; } -void nxagentBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls) +void nxagentBell(int volume, DeviceIntPtr pDev, void * ctrl, int cls) { XBell(nxagentDisplay, volume); } @@ -978,7 +978,7 @@ XkbError: #endif XkbSetRulesDflts(rules, model, layout, variants, options); - XkbInitKeyboardDeviceStruct((pointer)pDev, &names, &keySyms, modmap, + XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap, nxagentBell, nxagentChangeKeyboardControl); if (!nxagentKeyboard || @@ -1068,7 +1068,7 @@ XkbError: #endif XkbSetRulesDflts(rules, model, layout, variants, options); - XkbInitKeyboardDeviceStruct((pointer)pDev, &names, &keySyms, modmap, + XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap, nxagentBell, nxagentChangeKeyboardControl); free(nxagentXkbConfigFilePath); @@ -1087,9 +1087,9 @@ XkbError: #endif XkbSetRulesDflts(rules, model, layout, variants, options); - XkbInitKeyboardDeviceStruct((pointer)pDev, &names, &keySyms, modmap, + XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap, nxagentBell, nxagentChangeKeyboardControl); - XkbDDXChangeControls((pointer)pDev, xkb->ctrls, xkb->ctrls); + XkbDDXChangeControls((void *)pDev, xkb->ctrls, xkb->ctrls); XkbEnd: diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h index 12d953d93..036eec57f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h @@ -89,7 +89,7 @@ extern char *nxagentKeyboard; * and utility functions. */ -void nxagentBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls); +void nxagentBell(int volume, DeviceIntPtr pDev, void * ctrl, int cls); int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c index cf5d48ba2..06f2de57c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c @@ -344,7 +344,7 @@ static void damageValidateGC(GCPtr, unsigned long, DrawablePtr); static void damageChangeGC(GCPtr, unsigned long); static void damageCopyGC(GCPtr, unsigned long, GCPtr); static void damageDestroyGC(GCPtr); -static void damageChangeClip(GCPtr, int, pointer, int); +static void damageChangeClip(GCPtr, int, void *, int); static void damageDestroyClip(GCPtr); static void damageCopyClip(GCPtr, GCPtr); @@ -457,7 +457,7 @@ damageCopyGC (GCPtr pGCSrc, static void damageChangeClip (GCPtr pGC, int type, - pointer pvalue, + void *pvalue, int nrects) { DAMAGE_GC_FUNC_PROLOGUE (pGC); @@ -1560,7 +1560,7 @@ damageImageGlyphBlt(DrawablePtr pDrawable, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase) + void *pglyphBase) { DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable); damageDamageChars (pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y, @@ -1577,7 +1577,7 @@ damagePolyGlyphBlt(DrawablePtr pDrawable, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase) + void *pglyphBase) { DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable); damageDamageChars (pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y, @@ -1908,7 +1908,7 @@ DamageSetup (ScreenPtr pScreen) } #endif - pScreen->devPrivates[damageScrPrivateIndex].ptr = (pointer) pScrPriv; + pScreen->devPrivates[damageScrPrivateIndex].ptr = (void *) pScrPriv; return TRUE; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index ea4f59d19..af76ed4c2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -245,7 +245,7 @@ extern WindowPtr nxagentViewportFrameBelow; extern int nxagentMaxAllowedResets; -extern int nxagentFindClientResource(int, RESTYPE, pointer); +extern int nxagentFindClientResource(int, RESTYPE, void *); static ClientPtr grabClient; #define GrabNone 0 @@ -883,7 +883,7 @@ ProcCreateWindow(ClientPtr client) Mask mask = pWin->eventMask; pWin->eventMask = 0; /* subterfuge in case AddResource fails */ - if (!AddResource(stuff->wid, RT_WINDOW, (pointer)pWin)) + if (!AddResource(stuff->wid, RT_WINDOW, (void *)pWin)) return BadAlloc; pWin->eventMask = mask; } @@ -1573,7 +1573,7 @@ ProcGrabServer(register ClientPtr client) ServerGrabInfoRec grabinfo; grabinfo.client = client; grabinfo.grabstate = SERVER_GRABBED; - CallCallbacks(&ServerGrabCallback, (pointer)&grabinfo); + CallCallbacks(&ServerGrabCallback, (void *)&grabinfo); } return(client->noClientException); @@ -1602,7 +1602,7 @@ UngrabServer(ClientPtr client) ServerGrabInfoRec grabinfo; grabinfo.client = client; grabinfo.grabstate = SERVER_UNGRABBED; - CallCallbacks(&ServerGrabCallback, (pointer)&grabinfo); + CallCallbacks(&ServerGrabCallback, (void *)&grabinfo); } } @@ -1966,7 +1966,7 @@ ProcListFontsWithInfo(register ClientPtr client) * \param value must conform to DeleteType */ int -dixDestroyPixmap(pointer value, XID pid) +dixDestroyPixmap(void * value, XID pid) { PixmapPtr pPixmap = (PixmapPtr)value; return (*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap); @@ -2025,7 +2025,7 @@ CreatePmap: { pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.id = stuff->pid; - if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap)) + if (AddResource(stuff->pid, RT_PIXMAP, (void *)pMap)) return(client->noClientException); } return (BadAlloc); @@ -2108,7 +2108,7 @@ ProcCreateGC(register ClientPtr client) (XID *) &stuff[1], &error); if (error != Success) return error; - if (!AddResource(stuff->gc, RT_GC, (pointer)pGC)) + if (!AddResource(stuff->gc, RT_GC, (void *)pGC)) return (BadAlloc); return(client->noClientException); } @@ -2798,7 +2798,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable, nlines, format, planemask, - (pointer) pBuf); + (void *) pBuf); #ifdef XCSECURITY if (pVisibleRegion) SecurityCensorImage(client, pVisibleRegion, widthBytesLine, @@ -2839,7 +2839,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable, nlines, format, plane, - (pointer)pBuf); + (void *)pBuf); #ifdef XCSECURITY if (pVisibleRegion) SecurityCensorImage(client, pVisibleRegion, @@ -3669,7 +3669,7 @@ ProcCreateCursor (register ClientPtr client) /* zeroing the (pad) bits helps some ddx cursor handling */ bzero((char *)srcbits, n); (* src->drawable.pScreen->GetImage)( (DrawablePtr)src, 0, 0, width, height, - XYPixmap, 1, (pointer)srcbits); + XYPixmap, 1, (void *)srcbits); if ( msk == (PixmapPtr)NULL) { register unsigned char *bits = mskbits; @@ -3681,7 +3681,7 @@ ProcCreateCursor (register ClientPtr client) /* zeroing the (pad) bits helps some ddx cursor handling */ bzero((char *)mskbits, n); (* msk->drawable.pScreen->GetImage)( (DrawablePtr)msk, 0, 0, width, - height, XYPixmap, 1, (pointer)mskbits); + height, XYPixmap, 1, (void *)mskbits); } cm.width = width; cm.height = height; @@ -3691,7 +3691,7 @@ ProcCreateCursor (register ClientPtr client) stuff->foreRed, stuff->foreGreen, stuff->foreBlue, stuff->backRed, stuff->backGreen, stuff->backBlue); - if (pCursor && AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) + if (pCursor && AddResource(stuff->cid, RT_CURSOR, (void *)pCursor)) { #ifdef TEST fprintf(stderr, "ProcCreateCursor: Created cursor at [%p].\n", (void *) pCursor); @@ -3721,7 +3721,7 @@ ProcCreateGlyphCursor (register ClientPtr client) &pCursor, client); if (res != Success) return res; - if (AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) + if (AddResource(stuff->cid, RT_CURSOR, (void *)pCursor)) return client->noClientException; return BadAlloc; } @@ -3908,10 +3908,10 @@ ProcChangeHosts(register ClientPtr client) if(stuff->mode == HostInsert) result = AddHost(client, (int)stuff->hostFamily, - stuff->hostLength, (pointer)&stuff[1]); + stuff->hostLength, (void *)&stuff[1]); else if (stuff->mode == HostDelete) result = RemoveHost(client, (int)stuff->hostFamily, - stuff->hostLength, (pointer)&stuff[1]); + stuff->hostLength, (void *)&stuff[1]); else { client->errorValue = stuff->mode; @@ -3927,7 +3927,7 @@ ProcListHosts(register ClientPtr client) { xListHostsReply reply; int len, nHosts, result; - pointer pdata; + void * pdata; /* REQUEST(xListHostsReq); */ REQUEST_SIZE_MATCH(xListHostsReq); @@ -4222,7 +4222,7 @@ CloseDownClient(register ClientPtr client) clientinfo.client = client; clientinfo.prefix = (xConnSetupPrefix *)NULL; clientinfo.setup = (xConnSetup *) NULL; - CallCallbacks((&ClientStateCallback), (pointer)&clientinfo); + CallCallbacks((&ClientStateCallback), (void *)&clientinfo); } } client->clientGone = TRUE; /* so events aren't sent to client */ @@ -4259,7 +4259,7 @@ CloseDownClient(register ClientPtr client) clientinfo.client = client; clientinfo.prefix = (xConnSetupPrefix *)NULL; clientinfo.setup = (xConnSetup *) NULL; - CallCallbacks((&ClientStateCallback), (pointer)&clientinfo); + CallCallbacks((&ClientStateCallback), (void *)&clientinfo); } FreeClientResources(client); if (client->index < nextFreeClientID) @@ -4309,7 +4309,7 @@ CloseDownRetainedResources() } } -void InitClient(ClientPtr client, int i, pointer ospriv) +void InitClient(ClientPtr client, int i, void * ospriv) { client->index = i; client->sequence = 0; @@ -4399,11 +4399,11 @@ InitClientPrivates(ClientPtr client) { if ( (size = *sizes) ) { - ppriv->ptr = (pointer)ptr; + ppriv->ptr = (void *)ptr; ptr += size; } else - ppriv->ptr = (pointer)NULL; + ppriv->ptr = (void *)NULL; } /* @@ -4422,7 +4422,7 @@ InitClientPrivates(ClientPtr client) * Returns NULL if there are no free clients. *************************/ -ClientPtr NextAvailableClient(pointer ospriv) +ClientPtr NextAvailableClient(void * ospriv) { register int i; register ClientPtr client; @@ -4460,7 +4460,7 @@ ClientPtr NextAvailableClient(pointer ospriv) clientinfo.client = client; clientinfo.prefix = (xConnSetupPrefix *)NULL; clientinfo.setup = (xConnSetup *) NULL; - CallCallbacks((&ClientStateCallback), (pointer)&clientinfo); + CallCallbacks((&ClientStateCallback), (void *)&clientinfo); } return(client); } @@ -4595,7 +4595,7 @@ SendConnSetup(register ClientPtr client, char *reason) clientinfo.client = client; clientinfo.prefix = lconnSetupPrefix; clientinfo.setup = (xConnSetup *)lConnectionInfo; - CallCallbacks((&ClientStateCallback), (pointer)&clientinfo); + CallCallbacks((&ClientStateCallback), (void *)&clientinfo); } return (client->noClientException); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index 828b9bf4c..4f41ee228 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -177,7 +177,7 @@ _NXGetFontPathError: #define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics -extern pointer fosNaturalParams; +extern void * fosNaturalParams; extern FontPtr defaultFont; static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0; @@ -291,7 +291,7 @@ RemoveFontWakeup(FontPathElementPtr fpe) } void -FontWakeup(pointer data, int count, pointer LastSelectMask) +FontWakeup(void * data, int count, void * LastSelectMask) { int i; FontPathElementPtr fpe; @@ -381,7 +381,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c) if (c->current_fpe < c->num_fpes) { fpe = c->fpe_list[c->current_fpe]; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); } err = Successful; goto bail; @@ -389,7 +389,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c) while (c->current_fpe < c->num_fpes) { fpe = c->fpe_list[c->current_fpe]; err = (*fpe_functions[fpe->type].open_font) - ((pointer) client, fpe, c->flags, + ((void *) client, fpe, c->flags, c->fontname, c->fnamelen, FontFormat, BitmapFormatMaskByte | BitmapFormatMaskBit | @@ -423,7 +423,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c) if (err == Suspended) { if (!c->slept) { c->slept = TRUE; - ClientSleep(client, (ClientSleepProcPtr)doOpenFont, (pointer) c); + ClientSleep(client, (ClientSleepProcPtr)doOpenFont, (void *) c); #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: doOpenFont: client [%lx] sleeping.\n", client); #endif @@ -469,7 +469,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c) } } } - if (!AddResource(c->fontid, RT_FONT, (pointer) pfont)) { + if (!AddResource(c->fontid, RT_FONT, (void *) pfont)) { err = AllocError; goto bail; } @@ -478,7 +478,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c) extern RESTYPE RT_NX_FONT; nxagentFontPriv(pfont) -> mirrorID = FakeClientID(0); - if (!AddResource(nxagentFontPriv(pfont) -> mirrorID, RT_NX_FONT, (pointer) pfont)) { + if (!AddResource(nxagentFontPriv(pfont) -> mirrorID, RT_NX_FONT, (void *) pfont)) { FreeResource(c->fontid, RT_NONE); err = AllocError; goto bail; @@ -548,7 +548,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna cached = FindCachedFontPattern(patternCache, pfontname, lenfname); if (cached && cached->info.cachable) { - if (!AddResource(fid, RT_FONT, (pointer) cached)) + if (!AddResource(fid, RT_FONT, (void *) cached)) return BadAlloc; cached->refcnt++; return Success; @@ -599,7 +599,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna * \param value must conform to DeleteType */ int -CloseFont(pointer value, XID fid) +CloseFont(void * value, XID fid) { int nscr; ScreenPtr pscr; @@ -730,7 +730,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) if (c->current.current_fpe < c->num_fpes) { fpe = c->fpe_list[c->current.current_fpe]; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); } err = Successful; goto bail; @@ -748,7 +748,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) /* This FPE doesn't support/require list_fonts_and_aliases */ err = (*fpe_functions[fpe->type].list_fonts) - ((pointer) c->client, fpe, c->current.pattern, + ((void *) c->client, fpe, c->current.pattern, c->current.patlen, c->current.max_names - c->names->nnames, c->names); @@ -757,7 +757,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) c->slept = TRUE; ClientSleep(client, (ClientSleepProcPtr)doListFontsAndAliases, - (pointer) c); + (void *) c); #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: doListFont (1): client [%lx] sleeping.\n", client); #endif @@ -780,14 +780,14 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) if (!c->current.list_started) { err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases) - ((pointer) c->client, fpe, c->current.pattern, + ((void *) c->client, fpe, c->current.pattern, c->current.patlen, c->current.max_names - c->names->nnames, &c->current.private); if (err == Suspended) { if (!c->slept) { ClientSleep(client, (ClientSleepProcPtr)doListFontsAndAliases, - (pointer) c); + (void *) c); c->slept = TRUE; } return TRUE; @@ -799,13 +799,13 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) char *tmpname; name = 0; err = (*fpe_functions[fpe->type].list_next_font_or_alias) - ((pointer) c->client, fpe, &name, &namelen, &tmpname, + ((void *) c->client, fpe, &name, &namelen, &tmpname, &resolvedlen, c->current.private); if (err == Suspended) { if (!c->slept) { ClientSleep(client, (ClientSleepProcPtr)doListFontsAndAliases, - (pointer) c); + (void *) c); c->slept = TRUE; #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: doListFont (2): client [%lx] sleeping.\n", client); @@ -859,7 +859,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) tmpname = 0; (void) (*fpe_functions[fpe->type].list_next_font_or_alias) - ((pointer) c->client, fpe, &tmpname, &tmpnamelen, + ((void *) c->client, fpe, &tmpname, &tmpnamelen, &tmpname, &tmpnamelen, c->current.private); if (--aliascount <= 0) { @@ -1070,7 +1070,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) if (c->current.current_fpe < c->num_fpes) { fpe = c->fpe_list[c->current.current_fpe]; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); } err = Successful; goto bail; @@ -1361,7 +1361,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) if (client->clientGone) { fpe = c->pGC->font->fpe; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); if (c->slept) { @@ -1389,7 +1389,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) the FPE code to clean up after client and avoid further rendering while we clean up after ourself. */ fpe = c->pGC->font->fpe; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); c->pDraw = (DrawablePtr)0; } @@ -1558,7 +1558,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) c->slept = TRUE; ClientSleep(client, (ClientSleepProcPtr)doPolyText, - (pointer) c); + (void *) c); #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: doPolyText (1): client [%lx] sleeping.\n", client); #endif @@ -1670,7 +1670,7 @@ doImageText(ClientPtr client, register ITclosurePtr c) if (client->clientGone) { fpe = c->pGC->font->fpe; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); err = Success; goto bail; } @@ -1684,7 +1684,7 @@ doImageText(ClientPtr client, register ITclosurePtr c) /* Our drawable has disappeared. Treat like client died... ask the FPE code to clean up after client. */ fpe = c->pGC->font->fpe; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); err = Success; goto bail; } @@ -1756,7 +1756,7 @@ doImageText(ClientPtr client, register ITclosurePtr c) ValidateGC(c->pDraw, c->pGC); c->slept = TRUE; - ClientSleep(client, (ClientSleepProcPtr)doImageText, (pointer) c); + ClientSleep(client, (ClientSleepProcPtr)doImageText, (void *) c); #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: doImageText (1): client [%lx] sleeping.\n", client); #endif @@ -2115,7 +2115,7 @@ DeleteClientFontStuff(ClientPtr client) { fpe = font_path_elements[i]; if (fpe_functions[fpe->type].client_died) - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); } } @@ -2255,7 +2255,7 @@ GetNewFontClientID() int StoreFontClientFont(FontPtr pfont, Font id) { - return AddResource(id, RT_NONE, (pointer) pfont); + return AddResource(id, RT_NONE, (void *) pfont); } void @@ -2288,7 +2288,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler) #endif if (!RegisterBlockAndWakeupHandlers(block_handler, - FontWakeup, (pointer) 0)) + FontWakeup, (void *) 0)) return AllocError; fs_handlers_installed++; } @@ -2308,7 +2308,7 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bo #endif RemoveBlockAndWakeupHandlers(block_handler, FontWakeup, - (pointer) 0); + (void *) 0); } } RemoveFontWakeup(fpe); @@ -2339,7 +2339,7 @@ dump_char_ascii(CharInfoPtr cip) bpr = GLYPH_SIZE(cip, 4); for (r = 0; r < (cip->metrics.ascent + cip->metrics.descent); r++) { - pointer row = (pointer) cip->bits + r * bpr; + void * row = (void *) cip->bits + r * bpr; byte = 0; for (l = 0; l <= (cip->metrics.rightSideBearing - @@ -2386,7 +2386,7 @@ nxdoListFontsAndAliases(client, fss) if (c->current.current_fpe < c->num_fpes) { fpe = c->fpe_list[c->current.current_fpe]; - (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe); + (*fpe_functions[fpe->type].client_died) ((void *) client, fpe); } err = Successful; goto bail; @@ -2404,7 +2404,7 @@ nxdoListFontsAndAliases(client, fss) /* This FPE doesn't support/require list_fonts_and_aliases */ err = (*fpe_functions[fpe->type].list_fonts) - ((pointer) c->client, fpe, c->current.pattern, + ((void *) c->client, fpe, c->current.pattern, c->current.patlen, c->current.max_names - c->names->nnames, c->names); @@ -2413,7 +2413,7 @@ nxdoListFontsAndAliases(client, fss) c->slept = TRUE; ClientSleep(client, (ClientSleepProcPtr)nxdoListFontsAndAliases, - (pointer) fss); + (void *) fss); #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: nxdoListFont (1): client [%lx] sleeping.\n", client); #endif @@ -2436,14 +2436,14 @@ nxdoListFontsAndAliases(client, fss) if (!c->current.list_started) { err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases) - ((pointer) c->client, fpe, c->current.pattern, + ((void *) c->client, fpe, c->current.pattern, c->current.patlen, c->current.max_names - c->names->nnames, &c->current.private); if (err == Suspended) { if (!c->slept) { ClientSleep(client, (ClientSleepProcPtr)nxdoListFontsAndAliases, - (pointer) fss); + (void *) fss); c->slept = TRUE; #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: nxdoListFont (2): client [%lx] sleeping.\n", client); @@ -2458,13 +2458,13 @@ nxdoListFontsAndAliases(client, fss) char *tmpname; name = 0; err = (*fpe_functions[fpe->type].list_next_font_or_alias) - ((pointer) c->client, fpe, &name, &namelen, &tmpname, + ((void *) c->client, fpe, &name, &namelen, &tmpname, &resolvedlen, c->current.private); if (err == Suspended) { if (!c->slept) { ClientSleep(client, (ClientSleepProcPtr)nxdoListFontsAndAliases, - (pointer) fss); + (void *) fss); c->slept = TRUE; #ifdef NXAGENT_DEBUG fprintf(stderr, " NXdixfonts: nxdoListFont (3): client [%lx] sleeping.\n", client); @@ -2529,7 +2529,7 @@ nxdoListFontsAndAliases(client, fss) tmpname = 0; (void) (*fpe_functions[fpe->type].list_next_font_or_alias) - ((pointer) c->client, fpe, &tmpname, &tmpnamelen, + ((void *) c->client, fpe, &tmpname, &tmpnamelen, &tmpname, &tmpnamelen, c->current.private); if (--aliascount <= 0) { @@ -2694,7 +2694,7 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) cached = FindCachedFontPattern(patternCache, pfontname, lenfname); if (cached && cached->info.cachable) { - if (!AddResource(fid, RT_FONT, (pointer) cached)) + if (!AddResource(fid, RT_FONT, (void *) cached)) return BadAlloc; cached->refcnt++; return Success; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index 872a02ce5..5940fe7d1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -1112,7 +1112,7 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count) WindowTable[sprite.hotPhys.pScreen->myNum]->drawable.id; eventinfo.events = xE; eventinfo.count = count; - CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo); + CallCallbacks(&DeviceEventCallback, (void *)&eventinfo); } if (xE->u.u.type == MotionNotify) { @@ -2783,7 +2783,7 @@ CheckPassiveGrabsOnWindow( a passive grab to be activated. If the event is a keyboard event, the ancestors of the focus window are traced down and tried to see if they have any passive grabs to be activated. If the focus window itself is reached and -it's descendants contain they pointer, the ancestors of the window that the +its descendants contain the pointer, the ancestors of the window that the pointer is in are then traced down starting at the focus window, otherwise no grabs are activated. If the event is a pointer event, the ancestors of the window that the pointer is in are traced down starting at the root until @@ -3008,7 +3008,7 @@ drawable.id:0; DeviceEventInfoRec eventinfo; eventinfo.events = xE; eventinfo.count = count; - CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo); + CallCallbacks(&DeviceEventCallback, (void *)&eventinfo); } } #ifdef XEVIE @@ -3212,7 +3212,7 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count WindowTable[sprite.hotPhys.pScreen->myNum]->drawable.id; eventinfo.events = xE; eventinfo.count = count; - CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo); + CallCallbacks(&DeviceEventCallback, (void *)&eventinfo); } } if (xE->u.u.type != MotionNotify) @@ -3402,7 +3402,7 @@ RecalculateDeliverableEvents(pWin) * \param value must conform to DeleteType */ int -OtherClientGone(pointer value, XID id) +OtherClientGone(void * value, XID id) { register OtherClientsPtr other, prev; register WindowPtr pWin = (WindowPtr)value; @@ -3497,7 +3497,7 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma others->resource = FakeClientID(client->index); others->next = pWin->optional->otherClients; pWin->optional->otherClients = others; - if (!AddResource(others->resource, RT_OTHERCLIENT, (pointer)pWin)) + if (!AddResource(others->resource, RT_OTHERCLIENT, (void *)pWin)) return BadAlloc; } maskSet: @@ -5029,7 +5029,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events) eventinfo.client = pClient; eventinfo.events = events; eventinfo.count = count; - CallCallbacks(&EventCallback, (pointer)&eventinfo); + CallCallbacks(&EventCallback, (void *)&eventinfo); } if(pClient->swapped) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c index 51c547984..4b9ac9a67 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglxext.c @@ -442,7 +442,7 @@ static int __glXDispatch(ClientPtr client) ** with the client so we will be notified when the client dies. */ XID xid = FakeClientID(client->index); - if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) { + if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) { return BadAlloc; } ResetClientState(client->index); @@ -520,7 +520,7 @@ static int __glXSwapDispatch(ClientPtr client) ** with the client so we will be notified when the client dies. */ XID xid = FakeClientID(client->index); - if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) { + if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) { return BadAlloc; } ResetClientState(client->index); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c index cd65fdc0e..47db919ef 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyph.c @@ -147,30 +147,30 @@ ResetGlyphSetPrivateIndex (void) } Bool -_GlyphSetSetNewPrivate (GlyphSetPtr glyphSet, int n, pointer ptr) +_GlyphSetSetNewPrivate (GlyphSetPtr glyphSet, int n, void * ptr) { - pointer *new; + void **new; if (n > glyphSet->maxPrivate) { if (glyphSet->devPrivates && - glyphSet->devPrivates != (pointer)(&glyphSet[1])) { - new = (pointer *) xrealloc (glyphSet->devPrivates, - (n + 1) * sizeof (pointer)); + glyphSet->devPrivates != (void *)(&glyphSet[1])) { + new = (void **) xrealloc (glyphSet->devPrivates, + (n + 1) * sizeof (void *)); if (!new) return FALSE; } else { - new = (pointer *) xalloc ((n + 1) * sizeof (pointer)); + new = (void **) xalloc ((n + 1) * sizeof (void *)); if (!new) return FALSE; if (glyphSet->devPrivates) memcpy (new, glyphSet->devPrivates, - (glyphSet->maxPrivate + 1) * sizeof (pointer)); + (glyphSet->maxPrivate + 1) * sizeof (void *)); } glyphSet->devPrivates = new; /* Zero out new, uninitialize privates */ while (++glyphSet->maxPrivate < n) - glyphSet->devPrivates[glyphSet->maxPrivate] = (pointer)0; + glyphSet->devPrivates[glyphSet->maxPrivate] = (void *)0; } glyphSet->devPrivates[n] = ptr; return TRUE; @@ -522,14 +522,14 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format) } size = (sizeof (GlyphSetRec) + - (sizeof (pointer) * _GlyphSetPrivateAllocateIndex)); + (sizeof (void *) * _GlyphSetPrivateAllocateIndex)); glyphSet = xalloc (size); if (!glyphSet) return FALSE; bzero((char *)glyphSet, size); glyphSet->maxPrivate = _GlyphSetPrivateAllocateIndex - 1; if (_GlyphSetPrivateAllocateIndex) - glyphSet->devPrivates = (pointer)(&glyphSet[1]); + glyphSet->devPrivates = (void *)(&glyphSet[1]); if (!AllocateGlyphHash (&glyphSet->hash, &glyphHashSets[0])) { @@ -543,7 +543,7 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format) } int -FreeGlyphSet (pointer value, +FreeGlyphSet (void * value, XID gid) { GlyphSetPtr glyphSet = (GlyphSetPtr) value; @@ -571,7 +571,7 @@ FreeGlyphSet (pointer value, xfree (table); if (glyphSet->devPrivates && - glyphSet->devPrivates != (pointer)(&glyphSet[1])) + glyphSet->devPrivates != (void *)(&glyphSet[1])) xfree(glyphSet->devPrivates); xfree (glyphSet); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h index fa6b5fb02..e7bb2d841 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h @@ -94,13 +94,13 @@ typedef struct _GlyphSet { int fdepth; GlyphHashRec hash; int maxPrivate; - pointer *devPrivates; + void **devPrivates; CARD32 remoteID; } GlyphSetRec, *GlyphSetPtr; #define GlyphSetGetPrivate(pGlyphSet,n) \ ((n) > (pGlyphSet)->maxPrivate ? \ - (pointer) 0 : \ + (void *) 0 : \ (pGlyphSet)->devPrivates[n]) #define GlyphSetSetPrivate(pGlyphSet,n,ptr) \ @@ -127,7 +127,7 @@ void ResetGlyphSetPrivateIndex (void); Bool -_GlyphSetSetNewPrivate (GlyphSetPtr glyphSet, int n, pointer ptr); +_GlyphSetSetNewPrivate (GlyphSetPtr glyphSet, int n, void * ptr); Bool GlyphInit (ScreenPtr pScreen); @@ -166,7 +166,7 @@ GlyphSetPtr AllocateGlyphSet (int fdepth, PictFormatPtr format); int -FreeGlyphSet (pointer value, +FreeGlyphSet (void *value, XID gid); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c index 125f1b1c4..e1c6b6d8c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c @@ -672,7 +672,7 @@ static GCPtr screenContext[MAXSCREENS]; /*ARGSUSED*/ static int tossGC ( - pointer value, + void * value, XID id) { GCPtr pGC = (GCPtr)value; @@ -757,7 +757,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; @@ -773,7 +773,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; } @@ -846,7 +846,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/hw/nxagent/NXmiglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c index 5f32334ae..f86c81de6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c @@ -225,7 +225,7 @@ miGlyphs (CARD8 op, pPixmap = GetScratchPixmapHeader (pScreen, glyph->info.width, glyph->info.height, list->format->depth, list->format->depth, - 0, (pointer) (glyph + 1)); + 0, (void *) (glyph + 1)); if (!pPixmap) return; component_alpha = NeedsComponent(list->format->format); @@ -240,7 +240,7 @@ miGlyphs (CARD8 op, } (*pScreen->ModifyPixmapHeader) (pPixmap, glyph->info.width, glyph->info.height, - 0, 0, -1, (pointer) (glyph + 1)); + 0, 0, -1, (void *) (glyph + 1)); #ifdef NXAGENT_SERVER @@ -292,7 +292,7 @@ miGlyphs (CARD8 op, if (pPicture) { FreeScratchPixmapHeader (pPixmap); - FreePicture ((pointer) pPicture, 0); + FreePicture ((void *) pPicture, 0); pPicture = 0; pPixmap = 0; } @@ -311,7 +311,7 @@ miGlyphs (CARD8 op, x, y, width, height); - FreePicture ((pointer) pMask, (XID) 0); + FreePicture ((void *) pMask, (XID) 0); (*pScreen->DestroyPixmap) (pMaskPixmap); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c index 190294979..8132e9dd0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c @@ -596,7 +596,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; @@ -927,7 +927,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); } /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c index 4b342ebcf..9c438394a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c @@ -152,7 +152,7 @@ PictureDestroyWindow (WindowPtr pWindow) SetPictureWindow(pWindow, pPicture->pNext); if (pPicture->id) FreeResource (pPicture->id, PictureType); - FreePicture ((pointer) pPicture, pPicture->id); + FreePicture ((void *) pPicture, pPicture->id); } pScreen->DestroyWindow = ps->DestroyWindow; ret = (*pScreen->DestroyWindow) (pWindow); @@ -731,7 +731,7 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) } for (n = 0; n < nformats; n++) { - if (!AddResource (formats[n].id, PictFormatType, (pointer) (formats+n))) + if (!AddResource (formats[n].id, PictFormatType, (void *) (formats+n))) { xfree (formats); return FALSE; @@ -867,11 +867,11 @@ AllocatePicture (ScreenPtr pScreen) { if ( (size = *sizes) ) { - ppriv->ptr = (pointer)ptr; + ppriv->ptr = (void *)ptr; ptr += size; } else - ppriv->ptr = (pointer)NULL; + ppriv->ptr = (void *)NULL; } nxagentPicturePriv(pPicture) -> picture = 0; @@ -1103,7 +1103,7 @@ static PicturePtr createSourcePicture(void) privPictureRecAddr = (char *) &ppriv[picturePrivateCount]; - ppriv[nxagentPicturePrivateIndex].ptr = (pointer) privPictureRecAddr; + ppriv[nxagentPicturePrivateIndex].ptr = (void *) privPictureRecAddr; pPicture -> devPrivates = ppriv; @@ -1364,7 +1364,7 @@ ChangePicture (PicturePtr pPicture, if (pAlpha && pAlpha->pDrawable->type == DRAWABLE_PIXMAP) pAlpha->refcnt++; if (pPicture->alphaMap) - FreePicture ((pointer) pPicture->alphaMap, (XID) 0); + FreePicture ((void *) pPicture->alphaMap, (XID) 0); pPicture->alphaMap = pAlpha; } } @@ -1442,7 +1442,7 @@ ChangePicture (PicturePtr pPicture, #endif error = (*ps->ChangePictureClip)(pPicture, clipType, - (pointer)pPixmap, 0); + (void *)pPixmap, 0); break; } case CPGraphicsExposure: @@ -1542,7 +1542,7 @@ SetPictureClipRects (PicturePtr pPicture, if (!clientClip) return BadAlloc; result =(*ps->ChangePictureClip) (pPicture, CT_REGION, - (pointer) clientClip, 0); + (void *) clientClip, 0); if (result == Success) { pPicture->clipOrigin.x = xOrigin; @@ -1586,7 +1586,7 @@ SetPictureClipRegion (PicturePtr pPicture, } result =(*ps->ChangePictureClip) (pPicture, type, - (pointer) clientClip, 0); + (void *) clientClip, 0); if (result == Success) { pPicture->clipOrigin.x = xOrigin; @@ -1658,7 +1658,7 @@ CopyPicture (PicturePtr pSrc, if (pSrc->alphaMap && pSrc->alphaMap->pDrawable->type == DRAWABLE_PIXMAP) pSrc->alphaMap->refcnt++; if (pDst->alphaMap) - FreePicture ((pointer) pDst->alphaMap, (XID) 0); + FreePicture ((void *) pDst->alphaMap, (XID) 0); pDst->alphaMap = pSrc->alphaMap; break; case CPAlphaXOrigin: @@ -1740,7 +1740,7 @@ ValidatePicture(PicturePtr pPicture) } int -FreePicture (pointer value, +FreePicture (void * value, XID pid) { PicturePtr pPicture = (PicturePtr) value; @@ -1764,7 +1764,7 @@ FreePicture (pointer value, PictureScreenPtr ps = GetPictureScreen(pScreen); if (pPicture->alphaMap) - FreePicture ((pointer) pPicture->alphaMap, (XID) 0); + FreePicture ((void *) pPicture->alphaMap, (XID) 0); (*ps->DestroyPicture) (pPicture); (*ps->DestroyPictureClip) (pPicture); if (pPicture->pDrawable->type == DRAWABLE_WINDOW) @@ -1794,7 +1794,7 @@ FreePicture (pointer value, } int -FreePictFormat (pointer pPictFormat, +FreePictFormat (void * pPictFormat, XID pid) { return Success; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h b/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h index b2679257c..9f9c32c35 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h @@ -174,7 +174,7 @@ typedef struct _Picture { DDXPointRec alphaOrigin; DDXPointRec clipOrigin; - pointer clientClip; + void * clientClip; Atom dither; @@ -220,7 +220,7 @@ typedef int (*CreatePictureProcPtr) (PicturePtr pPicture); typedef void (*DestroyPictureProcPtr) (PicturePtr pPicture); typedef int (*ChangePictureClipProcPtr) (PicturePtr pPicture, int clipType, - pointer value, + void *value, int n); typedef void (*DestroyPictureClipProcPtr)(PicturePtr pPicture); @@ -393,9 +393,9 @@ extern RESTYPE GlyphSetType; #define GetPictureScreen(s) ((PictureScreenPtr) ((s)->devPrivates[PictureScreenPrivateIndex].ptr)) #define GetPictureScreenIfSet(s) ((PictureScreenPrivateIndex != -1) ? GetPictureScreen(s) : NULL) -#define SetPictureScreen(s,p) ((s)->devPrivates[PictureScreenPrivateIndex].ptr = (pointer) (p)) +#define SetPictureScreen(s,p) ((s)->devPrivates[PictureScreenPrivateIndex].ptr = (void *) (p)) #define GetPictureWindow(w) ((PicturePtr) ((w)->devPrivates[PictureWindowPrivateIndex].ptr)) -#define SetPictureWindow(w,p) ((w)->devPrivates[PictureWindowPrivateIndex].ptr = (pointer) (p)) +#define SetPictureWindow(w,p) ((w)->devPrivates[PictureWindowPrivateIndex].ptr = (void *) (p)) #define VERIFY_PICTURE(pPicture, pid, client, mode, err) {\ pPicture = SecurityLookupIDByType(client, pid, PictureType, mode);\ @@ -535,11 +535,11 @@ void ValidatePicture(PicturePtr pPicture); int -FreePicture (pointer pPicture, +FreePicture (void * pPicture, XID pid); int -FreePictFormat (pointer pPictFormat, +FreePictFormat (void * pPictFormat, XID pid); void diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index ee2d6da94..a2d4a8e52 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -317,10 +317,10 @@ ProcChangeProperty(ClientPtr client) #ifdef LBX err = LbxChangeWindowProperty(client, pWin, stuff->property, stuff->type, - (int)format, (int)mode, len, TRUE, (pointer)&stuff[1], TRUE, NULL); + (int)format, (int)mode, len, TRUE, (void *)&stuff[1], TRUE, NULL); #else err = ChangeWindowProperty(pWin, stuff->property, stuff->type, (int)format, - (int)mode, len, (pointer)&stuff[1], TRUE); + (int)mode, len, (void *)&stuff[1], TRUE); #endif if (err != Success) return err; @@ -329,7 +329,7 @@ ProcChangeProperty(ClientPtr client) if (nxagentOption(Rootless) == 1) { nxagentExportProperty(pWin, stuff->property, stuff->type, (int) format, - (int) mode, len, (pointer) &stuff[1]); + (int) mode, len, (void *) &stuff[1]); } nxagentGuessClientHint(client, stuff->property, (char *) &stuff[1]); @@ -346,7 +346,7 @@ ProcChangeProperty(ClientPtr client) int ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, - int mode, unsigned long len, pointer value, + int mode, unsigned long len, void * value, Bool sendevent) { #ifdef LBX @@ -358,7 +358,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, xEvent event; int sizeInBytes; int totalSize; - pointer data; + void * data; int copySize; sizeInBytes = format>>3; @@ -392,7 +392,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, pProp = (PropertyPtr)xalloc(sizeof(PropertyRec)); if (!pProp) return(BadAlloc); - data = (pointer)xalloc(totalSize); + data = (void *)xalloc(totalSize); if (!data && len) { xfree(pProp); @@ -423,7 +423,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, { if (totalSize != pProp->size * (pProp->format >> 3)) { - data = (pointer)xrealloc(pProp->data, totalSize); + data = (void *)xrealloc(pProp->data, totalSize); if (!data && len) return(BadAlloc); pProp->data = data; @@ -440,7 +440,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, } else if (mode == PropModeAppend) { - data = (pointer)xrealloc(pProp->data, + data = (void *)xrealloc(pProp->data, sizeInBytes * (len + pProp->size)); if (!data) return(BadAlloc); @@ -452,7 +452,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, } else if (mode == PropModePrepend) { - data = (pointer)xalloc(sizeInBytes * (len + pProp->size)); + data = (void *)xalloc(sizeInBytes * (len + pProp->size)); if (!data) return(BadAlloc); memmove(&((char *)data)[totalSize], (char *)pProp->data, diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index e34689399..260355c6e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -125,9 +125,9 @@ void nxagentCreateGlyphSet(GlyphSetPtr glyphSet); void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet); void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph); void nxagentFreeGlyphSet(GlyphSetPtr glyphSet); -void nxagentSetPictureTransform(PicturePtr pPicture, pointer transform); +void nxagentSetPictureTransform(PicturePtr pPicture, void * transform); void nxagentSetPictureFilter(PicturePtr pPicture, char *filter, int name_size, - pointer params, int nparams); + void * params, int nparams); void nxagentTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid *traps); @@ -334,8 +334,8 @@ typedef struct _RenderClient { static void RenderClientCallback (CallbackListPtr *list, - pointer closure, - pointer data) + void * closure, + void * data) { NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ClientPtr pClient = clientinfo->client; @@ -767,7 +767,7 @@ ProcRenderCreatePicture (ClientPtr client) return error; nxagentCreatePicture(pPicture, stuff -> mask); - if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) + if (!AddResource (stuff->pid, PictureType, (void *)pPicture)) return BadAlloc; return Success; } @@ -1341,7 +1341,7 @@ ProcRenderCreateGlyphSet (ClientPtr client) glyphSet = AllocateGlyphSet (f, format); if (!glyphSet) return BadAlloc; - if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet)) + if (!AddResource (stuff->gsid, GlyphSetType, (void *)glyphSet)) return BadAlloc; nxagentCreateGlyphSet(glyphSet); @@ -1372,7 +1372,7 @@ ProcRenderReferenceGlyphSet (ClientPtr client) nxagentReferenceGlyphSet(glyphSet); - if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet)) + if (!AddResource (stuff->gsid, GlyphSetType, (void *)glyphSet)) return BadAlloc; return client->noClientException; } @@ -1953,7 +1953,7 @@ ProcRenderCreateCursor (ClientPtr client) { (*pScreen->GetImage) (pSrc->pDrawable, 0, 0, width, height, ZPixmap, - 0xffffffff, (pointer) argbbits); + 0xffffffff, (void *) argbbits); } else { @@ -1993,7 +1993,7 @@ ProcRenderCreateCursor (ClientPtr client) 0, 0, 0, 0, 0, 0, width, height); (*pScreen->GetImage) (pPicture->pDrawable, 0, 0, width, height, ZPixmap, - 0xffffffff, (pointer) argbbits); + 0xffffffff, (void *) argbbits); FreePicture (pPicture, 0); } /* @@ -2120,7 +2120,7 @@ ProcRenderCreateCursor (ClientPtr client) nxagentRenderRealizeCursor(pScreen, pCursor); - if (AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) + if (AddResource(stuff->cid, RT_CURSOR, (void *)pCursor)) return (client->noClientException); return BadAlloc; } @@ -2324,7 +2324,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) pCursor -> devPriv[i] = NULL; } - if (AddResource (stuff->cid, RT_CURSOR, (pointer)pCursor)) + if (AddResource (stuff->cid, RT_CURSOR, (void *)pCursor)) return client->noClientException; return BadAlloc; } @@ -2370,7 +2370,7 @@ static int ProcRenderCreateSolidFill(ClientPtr client) nxagentRenderCreateSolidFill(pPicture, &stuff -> color); /* AGENT SERVER */ - if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) + if (!AddResource (stuff->pid, PictureType, (void *)pPicture)) return BadAlloc; return Success; } @@ -2407,7 +2407,7 @@ static int ProcRenderCreateLinearGradient (ClientPtr client) stuff->nStops, stops, colors); /* AGENT SERVER */ - if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) + if (!AddResource (stuff->pid, PictureType, (void *)pPicture)) return BadAlloc; return Success; } @@ -2445,7 +2445,7 @@ static int ProcRenderCreateRadialGradient (ClientPtr client) stuff->nStops, stops, colors); /* AGENT SERVER */ - if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) + if (!AddResource (stuff->pid, PictureType, (void *)pPicture)) return BadAlloc; return Success; } @@ -2481,7 +2481,7 @@ static int ProcRenderCreateConicalGradient (ClientPtr client) colors); /* AGENT SERVER */ - if (!AddResource (stuff->pid, PictureType, (pointer)pPicture)) + if (!AddResource (stuff->pid, PictureType, (void *)pPicture)) return BadAlloc; return Success; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index d1c8325f2..833a33fd3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -170,7 +170,7 @@ typedef struct _Resource { struct _Resource *next; XID id; RESTYPE type; - pointer value; + void * value; } ResourceRec, *ResourcePtr; #define NullResource ((ResourcePtr)NULL) @@ -459,7 +459,7 @@ FakeClientID(register int client) #ifdef NXAGENT_SERVER -int nxagentFindClientResource(int client, RESTYPE type, pointer value) +int nxagentFindClientResource(int client, RESTYPE type, void * value) { ResourcePtr pResource; ResourcePtr *resources; @@ -488,7 +488,7 @@ int nxagentFindClientResource(int client, RESTYPE type, pointer value) return 0; } -int nxagentSwitchResourceType(int client, RESTYPE type, pointer value) +int nxagentSwitchResourceType(int client, RESTYPE type, void * value) { ResourcePtr pResource; ResourcePtr *resources; @@ -552,7 +552,7 @@ int nxagentSwitchResourceType(int client, RESTYPE type, pointer value) #endif Bool -AddResource(XID id, RESTYPE type, pointer value) +AddResource(XID id, RESTYPE type, void * value) { int client; register ClientResourceRec *rrec; @@ -753,7 +753,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree) */ Bool -ChangeResourceValue (XID id, RESTYPE rtype, pointer value) +ChangeResourceValue (XID id, RESTYPE rtype, void * value) { int cid; register ResourcePtr res; @@ -785,7 +785,7 @@ FindClientResourcesByType( ClientPtr client, RESTYPE type, FindResType func, - pointer cdata + void * cdata ){ register ResourcePtr *resources; register ResourcePtr this, next; @@ -870,7 +870,7 @@ void FindAllClientResources( ClientPtr client, FindAllRes func, - pointer cdata + void * cdata ){ register ResourcePtr *resources; register ResourcePtr this, next; @@ -950,12 +950,12 @@ RestartLoop: } -pointer +void * LookupClientResourceComplex( ClientPtr client, RESTYPE type, FindComplexResType func, - pointer cdata + void * cdata ){ ResourcePtr *resources; ResourcePtr this; @@ -1126,12 +1126,12 @@ LegalNewID(XID id, register ClientPtr client) * else NULL is returned. */ -pointer +void * SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode) { int cid; register ResourcePtr res; - pointer retval = NULL; + void * retval = NULL; assert(client == NullClient || (client->index <= currentMaxClients && clients[client->index] == client)); @@ -1155,12 +1155,12 @@ SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode) } -pointer +void * SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode) { int cid; register ResourcePtr res = NULL; - pointer retval = NULL; + void * retval = NULL; assert(client == NullClient || (client->index <= currentMaxClients && clients[client->index] == client)); @@ -1187,14 +1187,14 @@ SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode) * macros because of compatibility with loadable servers. */ -pointer +void * LookupIDByType(XID id, RESTYPE rtype) { return SecurityLookupIDByType(NullClient, id, rtype, SecurityUnknownAccess); } -pointer +void * LookupIDByClass(XID id, RESTYPE classes) { return SecurityLookupIDByClass(NullClient, id, classes, @@ -1206,7 +1206,7 @@ LookupIDByClass(XID id, RESTYPE classes) /* * LookupIDByType returns the object with the given id and type, else NULL. */ -pointer +void * LookupIDByType(XID id, RESTYPE rtype) { int cid; @@ -1221,14 +1221,14 @@ LookupIDByType(XID id, RESTYPE rtype) if ((res->id == id) && (res->type == rtype)) return res->value; } - return (pointer)NULL; + return (void *)NULL; } /* * LookupIDByClass returns the object with the given id and any one of the * given classes, else NULL. */ -pointer +void * LookupIDByClass(XID id, RESTYPE classes) { int cid; @@ -1243,7 +1243,7 @@ LookupIDByClass(XID id, RESTYPE classes) if ((res->id == id) && (res->type & classes)) return res->value; } - return (pointer)NULL; + return (void *)NULL; } #endif /* XCSECURITY */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 468dd480d..3b40b82f7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -128,7 +128,7 @@ static void miShmPutImage(XSHM_PUT_IMAGE_ARGS); static void fbShmPutImage(XSHM_PUT_IMAGE_ARGS); static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS); static int ShmDetachSegment( - pointer /* value */, + void * /* value */, XID /* shmseg */ ); static void ShmResetProc( @@ -361,7 +361,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap) #else char *base = (char *) pPixmap->devPrivate.ptr; - if (base != (pointer) (pPixmap + 1)) + if (base != (void *) (pPixmap + 1)) { for (shmdesc = Shmsegs; shmdesc; shmdesc = shmdesc->next) { @@ -373,7 +373,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap) shmdesc = 0; #endif if (shmdesc) - ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id); + ShmDetachSegment ((void *) shmdesc, pPixmap->drawable.id); } pScreen->DestroyPixmap = destroyPixmap[pScreen->myNum]; @@ -520,7 +520,7 @@ ProcShmAttach(client) shmdesc->next = Shmsegs; Shmsegs = shmdesc; } - if (!AddResource(stuff->shmseg, ShmSegType, (pointer)shmdesc)) + if (!AddResource(stuff->shmseg, ShmSegType, (void *)shmdesc)) return BadAlloc; return(client->noClientException); } @@ -528,7 +528,7 @@ ProcShmAttach(client) /*ARGSUSED*/ static int ShmDetachSegment(value, shmseg) - pointer value; /* must conform to DeleteType */ + void * value; /* must conform to DeleteType */ XID shmseg; { ShmDescPtr shmdesc = (ShmDescPtr)value; @@ -618,7 +618,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) PixmapPtr pPixmap; pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth, - BitsPerPixel(depth), PixmapBytePad(w, depth), (pointer)data); + BitsPerPixel(depth), PixmapBytePad(w, depth), (void *)data); if (!pPixmap) return; if (format == XYBitmap) @@ -898,12 +898,12 @@ CreatePmap: if (pMap) { #ifdef PIXPRIV - pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc; + pMap->devPrivates[shmPixmapPrivate].ptr = (void *) shmdesc; #endif shmdesc->refcnt++; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.id = newPix->info[j].id; - if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) { + if (!AddResource(newPix->info[j].id, RT_PIXMAP, (void *)pMap)) { (*pScreen->DestroyPixmap)(pMap); result = BadAlloc; break; @@ -1173,7 +1173,7 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr) #endif if (!(*pScreen->ModifyPixmapHeader)(pPixmap, width, height, depth, - BitsPerPixel(depth), PixmapBytePad(width, depth), (pointer)addr)) + BitsPerPixel(depth), PixmapBytePad(width, depth), (void *)addr)) { #ifdef WARNING fprintf(stderr,"fbShmCreatePixmap: Return Null Pixmap.\n"); @@ -1251,12 +1251,12 @@ CreatePmap: if (pMap) { #ifdef PIXPRIV - pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc; + pMap->devPrivates[shmPixmapPrivate].ptr = (void *) shmdesc; #endif shmdesc->refcnt++; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.id = stuff->pid; - if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap)) + if (AddResource(stuff->pid, RT_PIXMAP, (void *)pMap)) { return(client->noClientException); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index bb28961d1..4017099e9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -249,7 +249,7 @@ PrintWindowTree() #endif int -TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, pointer data) +TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, void * data) { register int result; register WindowPtr pChild; @@ -284,7 +284,7 @@ TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, pointer data) *****/ int -WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data) +WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, void * data) { return(TraverseTree(WindowTable[pScreen->myNum], func, data)); } @@ -310,7 +310,7 @@ SetWindowToDefaults(register WindowPtr pWin) pWin->backingStore = NotUseful; pWin->DIXsaveUnder = FALSE; - pWin->backStorage = (pointer) NULL; + pWin->backStorage = (void *) NULL; pWin->mapped = FALSE; /* off */ pWin->realized = FALSE; /* off */ @@ -430,11 +430,11 @@ AllocateWindow(ScreenPtr pScreen) { if ( (size = *sizes) ) { - ppriv->ptr = (pointer)ptr; + ppriv->ptr = (void *)ptr; ptr += size; } else - ppriv->ptr = (pointer)NULL; + ppriv->ptr = (void *)NULL; } } return pWin; @@ -528,7 +528,7 @@ CreateRootWindow(ScreenPtr pScreen) pWin->border.pixel = pScreen->blackPixel; pWin->borderWidth = 0; - if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer)pWin)) + if (!AddResource(pWin->drawable.id, RT_WINDOW, (void *)pWin)) return FALSE; if (disableBackingStore) @@ -1065,7 +1065,7 @@ CrushTree(WindowPtr pWin) *****/ int -DeleteWindow(pointer value, XID wid) +DeleteWindow(void * value, XID wid) { register WindowPtr pParent; register WindowPtr pWin = (WindowPtr)value; @@ -2798,7 +2798,7 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client) static int CompareWIDs( WindowPtr pWin, - pointer value) /* must conform to VisitWindowProcPtr */ + void *value) /* must conform to VisitWindowProcPtr */ { Window *wid = (Window *)value; @@ -2823,7 +2823,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent, register ScreenPtr pScreen; pScreen = pWin->drawable.pScreen; - if (TraverseTree(pWin, CompareWIDs, (pointer)&pParent->drawable.id) == WT_STOPWALKING) + if (TraverseTree(pWin, CompareWIDs, (void *)&pParent->drawable.id) == WT_STOPWALKING) return(BadMatch); if (!MakeWindowOptional(pWin)) return(BadAlloc); @@ -3791,7 +3791,7 @@ TileScreenSaver(int i, int kind) if (cursor) { cursorID = FakeClientID(0); - if (AddResource (cursorID, RT_CURSOR, (pointer) cursor)) + if (AddResource (cursorID, RT_CURSOR, (void *) cursor)) { attributes[attri] = cursorID; mask |= CWCursor; @@ -3822,7 +3822,7 @@ TileScreenSaver(int i, int kind) return FALSE; if (!AddResource(pWin->drawable.id, RT_WINDOW, - (pointer)savedScreenInfo[i].pWindow)) + (void *)savedScreenInfo[i].pWindow)) return FALSE; if (mask & CWBackPixmap) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index ad7e9c313..1dbd059ac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -534,7 +534,7 @@ RegionPtr nxagentPixmapToRegion(PixmapPtr pPixmap) } Bool nxagentModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, - int bitsPerPixel, int devKind, pointer pPixData) + int bitsPerPixel, int devKind, void * pPixData) { PixmapPtr pVirtualPixmap; @@ -732,7 +732,7 @@ PixmapPtr nxagentPixmapPtr(Pixmap pixmap) * Reconnection stuff. */ -int nxagentDestroyNewPixmapResourceType(pointer p, XID id) +int nxagentDestroyNewPixmapResourceType(void * p, XID id) { /* * Address of the destructor is set in Init.c. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h index 98d5666d1..b42956fcf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmaps.h @@ -115,7 +115,7 @@ Bool nxagentDestroyPixmap(PixmapPtr pPixmap); RegionPtr nxagentPixmapToRegion(PixmapPtr pPixmap); Bool nxagentModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, - int bitsPerPixel, int devKind, pointer pPixData); + int bitsPerPixel, int devKind, void * pPixData); RegionPtr nxagentCreateRegion(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int width, int height); @@ -125,7 +125,7 @@ Bool nxagentReconnectAllPixmaps(void *p0); void nxagentDisconnectPixmap(void *p0, XID x1, void* p2); Bool nxagentDisconnectAllPixmaps(void); -int nxagentDestroyNewPixmapResourceType(pointer p, XID id); +int nxagentDestroyNewPixmapResourceType(void * p, XID id); void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict, int wPict, int hPict); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index ca9959e81..c9f589c3b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -188,10 +188,10 @@ void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph); void nxagentFreeGlyphSet(GlyphSetPtr glyphSet); -void nxagentSetPictureTransform(PicturePtr pPicture, pointer transform); +void nxagentSetPictureTransform(PicturePtr pPicture, void * transform); void nxagentSetPictureFilter(PicturePtr pPicture, char *filter, int name_size, - pointer params, int nparams); + void * params, int nparams); Bool nxagentReconnectAllGlyphSet(void *p); @@ -2337,7 +2337,7 @@ void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph) } } -void nxagentSetPictureTransform(PicturePtr pPicture, pointer transform) +void nxagentSetPictureTransform(PicturePtr pPicture, void * transform) { #ifdef TEST fprintf(stderr, "nxagentSetPictureTransform: Going to set transform [%p] to picture at [%p].\n", @@ -2358,7 +2358,7 @@ FIXME: Is this useful or just a waste of bandwidth? } void nxagentSetPictureFilter(PicturePtr pPicture, char *filter, int name_size, - pointer params, int nparams) + void * params, int nparams) { char *szFilter = Xmalloc(name_size + 1); @@ -2561,7 +2561,7 @@ Bool nxagentReconnectAllGlyphSet(void *p) return success; } -void nxagentReconnectPicture(pointer p0, XID x1, void *p2) +void nxagentReconnectPicture(void * p0, XID x1, void *p2) { PicturePtr pPicture = (PicturePtr) p0; Bool *pBool = (Bool *) p2; @@ -2737,7 +2737,7 @@ Bool nxagentReconnectAllPicture(void *p) return True; } -void nxagentDisconnectPicture(pointer p0, XID x1, void* p2) +void nxagentDisconnectPicture(void * p0, XID x1, void* p2) { PicturePtr pPicture = (PicturePtr) p0; Bool *pBool = (Bool *) p2; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.h b/nx-X11/programs/Xserver/hw/nxagent/Render.h index 6f61ca85f..70f0ef20f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.h @@ -100,8 +100,8 @@ int nxagentRenderRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi, int nglyphs, CARD8 *images, int sizeImages); -void nxagentReconnectPicture(pointer p0, XID x1, void *p2); -void nxagentDisconnectPicture(pointer p0, XID x1, void* p2); +void nxagentReconnectPicture(void * p0, XID x1, void *p2); +void nxagentDisconnectPicture(void * p0, XID x1, void* p2); void nxagentReconnectGlyphSet(void* p0, XID x1, void *p2); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 74d2d1fe5..53a3b3fb7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -444,7 +444,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) Atom property, type; int format, mode; unsigned long nUnits; - pointer value; + void *value; { char *propertyS, *typeS; Atom propertyX, typeX; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.h b/nx-X11/programs/Xserver/hw/nxagent/Rootless.h index 1ea258db3..f502b54c3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.h @@ -63,7 +63,7 @@ void nxagentRootlessRestack(unsigned long *toplevel, unsigned int ntoplevel); int nxagentExportAllProperty(WindowPtr pWin); int nxagentExportProperty(WindowPtr pWin, Atom property, Atom type, int format, - int mode, unsigned long nUnits, pointer value); + int mode, unsigned long nUnits, void * value); #define MAX_RETRIEVED_PROPERTY_SIZE 256 * 1024 diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 37296e80f..095aa7b08 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -211,7 +211,7 @@ RegionRec nxagentShadowUpdateRegion; * but we need it here. */ -int TellChanged(WindowPtr pWin, pointer value); +int TellChanged(WindowPtr pWin, void * value); int nxagentBitsPerPixel(int depth) { @@ -664,7 +664,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin) pRootWin -> drawable.depth, serverClient, visual, &error); - AddResource(xid, RT_WINDOW, (pointer) nxagentViewportFrameLeft); + AddResource(xid, RT_WINDOW, (void *) nxagentViewportFrameLeft); if (error != Success) { @@ -689,7 +689,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin) serverClient, visual, &error); - AddResource(xid, RT_WINDOW, (pointer) nxagentViewportFrameRight); + AddResource(xid, RT_WINDOW, (void *) nxagentViewportFrameRight); if (error != Success) { @@ -714,7 +714,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin) serverClient, visual, &error); - AddResource(xid, RT_WINDOW, (pointer) nxagentViewportFrameAbove); + AddResource(xid, RT_WINDOW, (void *) nxagentViewportFrameAbove); if (error != Success) { @@ -739,7 +739,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin) pRootWin -> drawable.depth, serverClient, visual, &error); - AddResource(xid, RT_WINDOW, (pointer) nxagentViewportFrameBelow); + AddResource(xid, RT_WINDOW, (void *) nxagentViewportFrameBelow); if (error != Success) { @@ -835,7 +835,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, VisualID defaultVisual; int rootDepth; - pointer pFrameBufferBits; + void * pFrameBufferBits; int bitsPerPixel; int sizeInBytes; @@ -2423,7 +2423,7 @@ FIXME: We should try to restore the previously nxagentMoveViewport(pScreen, 0, 0); /* - * Update pointer bounds. + * Update void * bounds. */ ScreenRestructured(pScreen); @@ -2773,11 +2773,11 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin) accessPixmapID = FakeClientID(serverClient -> index); - AddResource(accessPixmapID, RT_PIXMAP, (pointer)nxagentShadowPixmapPtr); + AddResource(accessPixmapID, RT_PIXMAP, (void *)nxagentShadowPixmapPtr); accessWindowID = FakeClientID(serverClient -> index); - AddResource(accessWindowID, RT_WINDOW, (pointer)nxagentShadowWindowPtr); + AddResource(accessWindowID, RT_WINDOW, (void *)nxagentShadowWindowPtr); nxagentResizeScreen(pScreen, nxagentShadowWidth, nxagentShadowHeight, pScreen -> mmWidth, pScreen -> mmHeight); @@ -2847,7 +2847,7 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width, if (nxagentShadowPixmapPtr) { - ChangeResourceValue(accessPixmapID, RT_PIXMAP, (pointer) nxagentShadowPixmapPtr); + ChangeResourceValue(accessPixmapID, RT_PIXMAP, (void *) nxagentShadowPixmapPtr); nxagentShadowPixmapPtr -> drawable.id = accessPixmapID; #ifdef TEST @@ -2933,7 +2933,7 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width, #endif - ChangeResourceValue(accessWindowID, RT_WINDOW, (pointer) nxagentShadowWindowPtr); + ChangeResourceValue(accessWindowID, RT_WINDOW, (void *) nxagentShadowWindowPtr); } else { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index c4aedf482..782ab9c9c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -162,19 +162,19 @@ static Bool nxagentSomeWindowsAreMapped(void); static void nxagentFrameBufferPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what); -static void nxagentTraverseWindow(WindowPtr, void(*)(pointer, XID, pointer), pointer); +static void nxagentTraverseWindow(WindowPtr, void(*)(void *, XID, void *), void *); -static void nxagentDisconnectWindow(pointer, XID, pointer); +static void nxagentDisconnectWindow(void *, XID, void *); -static Bool nxagentLoopOverWindows(void(*)(pointer, XID, pointer)); +static Bool nxagentLoopOverWindows(void(*)(void *, XID, void *)); -static void nxagentReconfigureWindowCursor(pointer, XID, pointer); +static void nxagentReconfigureWindowCursor(void *, XID, void *); -static void nxagentReconnectWindow(pointer, XID, pointer); +static void nxagentReconnectWindow(void *, XID, void *); -static void nxagentReconfigureWindow(pointer, XID, pointer); +static void nxagentReconfigureWindow(void *, XID, void *); -static int nxagentForceExposure(WindowPtr pWin, pointer ptr); +static int nxagentForceExposure(WindowPtr pWin, void * ptr); /* by dimbor */ typedef struct @@ -218,7 +218,7 @@ WindowPtr nxagentGetWindowFromID(Window id) return NULL; } -static int nxagentFindWindowMatch(WindowPtr pWin, pointer ptr) +static int nxagentFindWindowMatch(WindowPtr pWin, void * ptr) { WindowMatchRec *match = (WindowMatchRec *) ptr; @@ -245,7 +245,7 @@ WindowPtr nxagentWindowPtr(Window window) for (i = 0; i < nxagentNumScreens; i++) { - WalkTree(screenInfo.screens[i], nxagentFindWindowMatch, (pointer) &match); + WalkTree(screenInfo.screens[i], nxagentFindWindowMatch, (void *) &match); if (match.pWin) break; } @@ -2437,7 +2437,7 @@ void nxagentShapeWindow(WindowPtr pWin) } #endif /* SHAPE */ -static int nxagentForceExposure(WindowPtr pWin, pointer ptr) +static int nxagentForceExposure(WindowPtr pWin, void * ptr) { RegionPtr exposedRgn; BoxRec Box; @@ -2623,12 +2623,12 @@ Bool nxagentDisconnectAllWindows(void) } /* - * FIXME: We are giving up reconnecting those pointer + * FIXME: We are giving up reconnecting those void * * that are not resource, and we are just disconnecting them. * perhaps we could do better and reconnect them. */ -void nxagentDisconnectWindow(pointer p0, XID x1, pointer p2) +void nxagentDisconnectWindow(void * p0, XID x1, void * p2) { WindowPtr pWin = (WindowPtr)p0; Bool* pBool = (Bool*)p2; @@ -2828,8 +2828,8 @@ Bool nxagentSetWindowCursors(void *p0) static void nxagentTraverseWindow( WindowPtr pWin, - void (*pF)(pointer, XID, pointer), - pointer p) + void (*pF)(void *, XID, void *), + void * p) { pF(pWin, 0, p); @@ -2844,7 +2844,7 @@ static void nxagentTraverseWindow( } } -static Bool nxagentLoopOverWindows(void (*pF)(pointer, XID, pointer)) +static Bool nxagentLoopOverWindows(void (*pF)(void *, XID, void *)) { int i; Bool windowSuccess = True; @@ -2859,7 +2859,7 @@ static Bool nxagentLoopOverWindows(void (*pF)(pointer, XID, pointer)) return windowSuccess; } -static void nxagentReconnectWindow(pointer param0, XID param1, pointer data_buffer) +static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer) { WindowPtr pWin = (WindowPtr)param0; Bool *pBool = (Bool*)data_buffer; @@ -3113,7 +3113,7 @@ FIXME: Do we need to set save unders attribute here? } } -static void nxagentReconfigureWindowCursor(pointer param0, XID param1, pointer data_buffer) +static void nxagentReconfigureWindowCursor(void * param0, XID param1, void * data_buffer) { WindowPtr pWin = (WindowPtr)param0; Bool *pBool = (Bool*)data_buffer; @@ -3164,7 +3164,7 @@ static void nxagentReconfigureWindowCursor(pointer param0, XID param1, pointer d } } -static void nxagentReconfigureWindow(pointer param0, XID param1, pointer data_buffer) +static void nxagentReconfigureWindow(void * param0, XID param1, void * data_buffer) { WindowPtr pWin = (WindowPtr)param0; unsigned long mask = 0; @@ -3732,7 +3732,7 @@ StaticResizedWindowStruct *nxagentFindStaticResizedWindow(unsigned long sequence return ret; } -void nxagentEmptyBackingStoreRegion(pointer param0, XID param1, pointer data_buffer) +void nxagentEmptyBackingStoreRegion(void * param0, XID param1, void * data_buffer) { WindowPtr pWin = (WindowPtr) param0; |