Remove a bunch of unused API from the mi export list.

This commit is contained in:
Adam Jackson 2008-10-03 17:13:10 -04:00
parent ee5e07bc22
commit bd0e87c747
16 changed files with 21 additions and 49 deletions

View File

@ -84,8 +84,6 @@
extern miPointerSpriteFuncRec miSpritePointerFuncs; extern miPointerSpriteFuncRec miSpritePointerFuncs;
_X_HIDDEN void *miLookupTab[] = { _X_HIDDEN void *miLookupTab[] = {
SYMFUNC(miAllocateGCPrivateIndex)
SYMFUNC(miChangeBorderWidth)
SYMFUNC(miChangeClip) SYMFUNC(miChangeClip)
SYMFUNC(miChangeGC) SYMFUNC(miChangeGC)
SYMFUNC(miClearDrawable) SYMFUNC(miClearDrawable)
@ -93,29 +91,19 @@ _X_HIDDEN void *miLookupTab[] = {
SYMFUNC(miClearVisualTypes) SYMFUNC(miClearVisualTypes)
SYMFUNC(miClipSpans) SYMFUNC(miClipSpans)
SYMFUNC(miComputeCompositeClip) SYMFUNC(miComputeCompositeClip)
SYMFUNC(miCopyArea)
SYMFUNC(miCopyClip) SYMFUNC(miCopyClip)
SYMFUNC(miCopyGC) SYMFUNC(miCopyGC)
SYMFUNC(miCopyPlane)
SYMFUNC(miCreateDefColormap) SYMFUNC(miCreateDefColormap)
SYMFUNC(miCreateGCOps)
SYMFUNC(miCreateScreenResources) SYMFUNC(miCreateScreenResources)
SYMFUNC(miDCInitialize) SYMFUNC(miDCInitialize)
SYMFUNC(miDestroyClip) SYMFUNC(miDestroyClip)
SYMFUNC(miDestroyGC) SYMFUNC(miDestroyGC)
SYMFUNC(miDestroyGCOps)
SYMFUNC(miExpandDirectColors) SYMFUNC(miExpandDirectColors)
SYMFUNC(miFillArcSetup) SYMFUNC(miFillArcSetup)
SYMFUNC(miFillArcSliceSetup) SYMFUNC(miFillArcSliceSetup)
SYMFUNC(miFillConvexPoly)
SYMFUNC(miFillPolygon) SYMFUNC(miFillPolygon)
SYMFUNC(miFindMaxBand)
SYMFUNC(miGetDefaultVisualMask) SYMFUNC(miGetDefaultVisualMask)
SYMFUNC(miGetImage)
SYMFUNC(miGetScreenPixmap)
SYMFUNC(miHandleExposures) SYMFUNC(miHandleExposures)
SYMFUNC(miHandleValidateExposures)
SYMFUNC(miHookInitVisuals)
SYMFUNC(miImageGlyphBlt) SYMFUNC(miImageGlyphBlt)
SYMFUNC(miImageText16) SYMFUNC(miImageText16)
SYMFUNC(miImageText8) SYMFUNC(miImageText8)
@ -128,7 +116,6 @@ _X_HIDDEN void *miLookupTab[] = {
SYMFUNC(miIntersect) SYMFUNC(miIntersect)
SYMFUNC(miInverse) SYMFUNC(miInverse)
SYMFUNC(miListInstalledColormaps) SYMFUNC(miListInstalledColormaps)
SYMFUNC(miModifyBanking)
SYMFUNC(miModifyPixmapHeader) SYMFUNC(miModifyPixmapHeader)
SYMFUNC(miOverlayCollectUnderlayRegions) SYMFUNC(miOverlayCollectUnderlayRegions)
SYMFUNC(miOverlayComputeCompositeClip) SYMFUNC(miOverlayComputeCompositeClip)
@ -136,7 +123,6 @@ _X_HIDDEN void *miLookupTab[] = {
SYMFUNC(miOverlayGetPrivateClips) SYMFUNC(miOverlayGetPrivateClips)
SYMFUNC(miOverlaySetRootClip) SYMFUNC(miOverlaySetRootClip)
SYMFUNC(miOverlaySetTransFunction) SYMFUNC(miOverlaySetTransFunction)
SYMFUNC(miPaintWindow)
SYMFUNC(miPointInRegion) SYMFUNC(miPointInRegion)
SYMFUNC(miPointerAbsoluteCursor) SYMFUNC(miPointerAbsoluteCursor)
SYMFUNC(miPointerCurrentScreen) SYMFUNC(miPointerCurrentScreen)
@ -153,9 +139,6 @@ _X_HIDDEN void *miLookupTab[] = {
SYMFUNC(miPolySegment) SYMFUNC(miPolySegment)
SYMFUNC(miPolyText16) SYMFUNC(miPolyText16)
SYMFUNC(miPolyText8) SYMFUNC(miPolyText8)
SYMFUNC(miPushPixels)
SYMFUNC(miPutImage)
SYMFUNC(miRecolorCursor)
SYMFUNC(miRectAlloc) SYMFUNC(miRectAlloc)
SYMFUNC(miRectIn) SYMFUNC(miRectIn)
SYMFUNC(miRectsToRegion) SYMFUNC(miRectsToRegion)
@ -176,15 +159,10 @@ _X_HIDDEN void *miLookupTab[] = {
SYMFUNC(miRoundJoinClip) SYMFUNC(miRoundJoinClip)
SYMFUNC(miScreenInit) SYMFUNC(miScreenInit)
SYMFUNC(miSegregateChildren) SYMFUNC(miSegregateChildren)
SYMFUNC(miSendGraphicsExpose)
SYMFUNC(miSetPixmapDepths) SYMFUNC(miSetPixmapDepths)
SYMFUNC(miSetScreenPixmap)
SYMFUNC(miSetShape)
SYMFUNC(miSetVisualTypes) SYMFUNC(miSetVisualTypes)
SYMFUNC(miSetVisualTypesAndMasks) SYMFUNC(miSetVisualTypesAndMasks)
SYMFUNC(miSetZeroLineBias) SYMFUNC(miSetZeroLineBias)
SYMFUNC(miShapedWindowIn)
SYMFUNC(miStepDash)
SYMFUNC(miSubtract) SYMFUNC(miSubtract)
SYMFUNC(miTranslateRegion) SYMFUNC(miTranslateRegion)
SYMFUNC(miUninstallColormap) SYMFUNC(miUninstallColormap)
@ -194,12 +172,10 @@ _X_HIDDEN void *miLookupTab[] = {
SYMFUNC(miWindowExposures) SYMFUNC(miWindowExposures)
SYMFUNC(miZeroArcSetup) SYMFUNC(miZeroArcSetup)
SYMFUNC(miZeroClipLine) SYMFUNC(miZeroClipLine)
SYMFUNC(miZeroDashLine)
SYMFUNC(miZeroLine) SYMFUNC(miZeroLine)
SYMFUNC(miZeroPolyArc) SYMFUNC(miZeroPolyArc)
SYMVAR(miEmptyBox) SYMVAR(miEmptyBox)
SYMVAR(miEmptyData) SYMVAR(miEmptyData)
SYMVAR(miInitVisualsProc)
SYMVAR(miInstalledMaps) SYMVAR(miInstalledMaps)
SYMVAR(miPointerScreenKey) SYMVAR(miPointerScreenKey)
SYMVAR(miSpritePointerFuncs) SYMVAR(miSpritePointerFuncs)

View File

@ -423,10 +423,6 @@ extern DevPrivateKey miAllocateGCPrivateIndex(
void void
); );
extern PixmapPtr miGetScreenPixmap(
ScreenPtr pScreen
);
extern void miSetScreenPixmap( extern void miSetScreenPixmap(
PixmapPtr pPix PixmapPtr pPix
); );

View File

@ -2217,7 +2217,7 @@ miBankNewSerialNumber(
} }
/* This entry modifies the banking interface */ /* This entry modifies the banking interface */
_X_EXPORT Bool Bool
miModifyBanking( miModifyBanking(
ScreenPtr pScreen, ScreenPtr pScreen,
miBankInfoPtr pBankInfo miBankInfoPtr pBankInfo

View File

@ -73,7 +73,7 @@ extern int ffs(int);
* set them in the destination with SetSpans * set them in the destination with SetSpans
* We let SetSpans worry about clipping to the destination. * We let SetSpans worry about clipping to the destination.
*/ */
_X_EXPORT RegionPtr RegionPtr
miCopyArea(DrawablePtr pSrcDrawable, miCopyArea(DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,
@ -549,7 +549,7 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
* build a source clip * build a source clip
* Use the bitmap we've built up as a Stipple for the destination * Use the bitmap we've built up as a Stipple for the destination
*/ */
_X_EXPORT RegionPtr RegionPtr
miCopyPlane( DrawablePtr pSrcDrawable, miCopyPlane( DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, GCPtr pGC,

View File

@ -52,7 +52,7 @@ static Bool miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
int *ndepthp, int *rootDepthp, VisualID *defaultVisp, int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
unsigned long sizes, int bitsPerRGB, int preferredVis); unsigned long sizes, int bitsPerRGB, int preferredVis);
_X_EXPORT miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals; miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
_X_EXPORT int _X_EXPORT int
miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)

View File

@ -54,7 +54,7 @@ SOFTWARE.
#include "mi.h" #include "mi.h"
#include "inputstr.h" #include "inputstr.h"
_X_EXPORT void void
miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr, miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
CursorPtr pCurs, Bool displayed) CursorPtr pCurs, Bool displayed)
{ {

View File

@ -52,7 +52,7 @@ SOFTWARE.
#include "mistruct.h" #include "mistruct.h"
#include "mifpoly.h" #include "mifpoly.h"
_X_EXPORT void void
miStepDash ( miStepDash (
int dist, /* distance to step */ int dist, /* distance to step */
int *pDashIndex, /* current dash */ int *pDashIndex, /* current dash */

View File

@ -341,7 +341,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
/* send GraphicsExpose events, or a NoExpose event, based on the region */ /* send GraphicsExpose events, or a NoExpose event, based on the region */
_X_EXPORT void void
miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable, miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
int major, int minor) int major, int minor)
{ {
@ -514,7 +514,7 @@ miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)
REGION_DESTROY( pWin->drawable.pScreen, exposures); REGION_DESTROY( pWin->drawable.pScreen, exposures);
} }
_X_EXPORT void void
miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;

View File

@ -58,7 +58,7 @@ miDestroyGC(GCPtr pGC)
* create a private op array for a gc * create a private op array for a gc
*/ */
_X_EXPORT GCOpsPtr GCOpsPtr
miCreateGCOps(GCOpsPtr prototype) miCreateGCOps(GCOpsPtr prototype)
{ {
GCOpsPtr ret; GCOpsPtr ret;
@ -71,7 +71,7 @@ miCreateGCOps(GCOpsPtr prototype)
return ret; return ret;
} }
_X_EXPORT void void
miDestroyGCOps(GCOpsPtr ops) miDestroyGCOps(GCOpsPtr ops)
{ {
if (ops->devPrivate.val) if (ops->devPrivate.val)

View File

@ -584,7 +584,7 @@ InitVisualWrap()
(*__miHookInitVisualsFunction)(&miInitVisualsProc); (*__miHookInitVisualsFunction)(&miInitVisualsProc);
} }
_X_EXPORT void void
miHookInitVisuals(void (**old)(miInitVisualsProcPtr *), miHookInitVisuals(void (**old)(miInitVisualsProcPtr *),
void (*new)(miInitVisualsProcPtr *)) void (*new)(miInitVisualsProcPtr *))
{ {

View File

@ -71,7 +71,7 @@ static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty);
* For a derivation of the algorithm, see the author of * For a derivation of the algorithm, see the author of
* this code. * this code.
*/ */
_X_EXPORT Bool Bool
miFillConvexPoly( miFillConvexPoly(
DrawablePtr dst, DrawablePtr dst,
GCPtr pgc, GCPtr pgc,

View File

@ -92,7 +92,7 @@ bitsizeof(int) padding and sacnline unit == bitsizeof(int).)
* in order to have both (MSB_FIRST and LSB_FIRST) versions of this * in order to have both (MSB_FIRST and LSB_FIRST) versions of this
* in the server, we need to rename one of them * in the server, we need to rename one of them
*/ */
_X_EXPORT void void
miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
int dx, int dy, int xOrg, int yOrg) int dx, int dy, int xOrg, int yOrg)
{ {

View File

@ -283,7 +283,7 @@ miScreenInit(
static int privateKeyIndex; static int privateKeyIndex;
static DevPrivateKey privateKey = &privateKeyIndex; static DevPrivateKey privateKey = &privateKeyIndex;
_X_EXPORT DevPrivateKey DevPrivateKey
miAllocateGCPrivateIndex() miAllocateGCPrivateIndex()
{ {
return privateKey; return privateKey;
@ -298,13 +298,13 @@ miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias)
dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias); dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias);
} }
_X_EXPORT PixmapPtr PixmapPtr
miGetScreenPixmap(ScreenPtr pScreen) miGetScreenPixmap(ScreenPtr pScreen)
{ {
return (PixmapPtr)(pScreen->devPrivate); return (PixmapPtr)(pScreen->devPrivate);
} }
_X_EXPORT void void
miSetScreenPixmap(PixmapPtr pPix) miSetScreenPixmap(PixmapPtr pPix)
{ {
if (pPix) if (pPix)

View File

@ -106,7 +106,7 @@ Equipment Corporation.
/* /*
* Compute the visibility of a shaped window * Compute the visibility of a shaped window
*/ */
_X_EXPORT int int
miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding, miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding,
BoxPtr rect, int x, int y) BoxPtr rect, int x, int y)
{ {

View File

@ -223,7 +223,7 @@ miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, WindowPtr *ppLayerWin)
* regions, translate the regions, restore any backing store, * regions, translate the regions, restore any backing store,
* and then send any regions still exposed to the client * and then send any regions still exposed to the client
*****/ *****/
_X_EXPORT void void
miHandleValidateExposures(WindowPtr pWin) miHandleValidateExposures(WindowPtr pWin)
{ {
WindowPtr pChild; WindowPtr pChild;
@ -694,7 +694,7 @@ miGetLayerWindow(WindowPtr pWin)
* and send appropriate exposure events * and send appropriate exposure events
*/ */
_X_EXPORT void void
miSetShape(WindowPtr pWin) miSetShape(WindowPtr pWin)
{ {
Bool WasViewable = (Bool)(pWin->viewable); Bool WasViewable = (Bool)(pWin->viewable);
@ -750,7 +750,7 @@ miSetShape(WindowPtr pWin)
/* Keeps the same inside(!) origin */ /* Keeps the same inside(!) origin */
_X_EXPORT void void
miChangeBorderWidth(WindowPtr pWin, unsigned int width) miChangeBorderWidth(WindowPtr pWin, unsigned int width)
{ {
int oldwidth; int oldwidth;

View File

@ -363,7 +363,7 @@ miZeroLine(
xfree(pspanInit); xfree(pspanInit);
} }
_X_EXPORT void void
miZeroDashLine( miZeroDashLine(
DrawablePtr dst, DrawablePtr dst,
GCPtr pgc, GCPtr pgc,