Commit 9b544fa4 authored by Peter Hutterer's avatar Peter Hutterer

mi: ansify.

parent 64677f6a
......@@ -1042,11 +1042,7 @@ miFillWideEllipse(
*/
_X_EXPORT void
miPolyArc(pDraw, pGC, narcs, parcs)
DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
miPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
{
int i;
xArc *parc;
......
......@@ -74,14 +74,15 @@ extern int ffs(int);
* We let SetSpans worry about clipping to the destination.
*/
_X_EXPORT RegionPtr
miCopyArea(pSrcDrawable, pDstDrawable,
pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut)
DrawablePtr pSrcDrawable;
DrawablePtr pDstDrawable;
GCPtr pGC;
int xIn, yIn;
int widthSrc, heightSrc;
int xOut, yOut;
miCopyArea(DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
GCPtr pGC,
int xIn,
int yIn,
int widthSrc,
int heightSrc,
int xOut,
int yOut)
{
DDXPointPtr ppt, pptFirst;
unsigned int *pwidthFirst, *pwidth, *pbits;
......@@ -549,15 +550,16 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
* Use the bitmap we've built up as a Stipple for the destination
*/
_X_EXPORT RegionPtr
miCopyPlane(pSrcDrawable, pDstDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, bitPlane)
DrawablePtr pSrcDrawable;
DrawablePtr pDstDrawable;
GCPtr pGC;
int srcx, srcy;
int width, height;
int dstx, dsty;
unsigned long bitPlane;
miCopyPlane( DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
GCPtr pGC,
int srcx,
int srcy,
int width,
int height,
int dstx,
int dsty,
unsigned long bitPlane)
{
MiBits *ptile;
BoxRec box;
......@@ -643,12 +645,8 @@ miCopyPlane(pSrcDrawable, pDstDrawable,
* get the single plane specified in planemask
*/
_X_EXPORT void
miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst)
DrawablePtr pDraw;
int sx, sy, w, h;
unsigned int format;
unsigned long planeMask;
char * pDst;
miGetImage( DrawablePtr pDraw, int sx, int sy, int w, int h,
unsigned int format, unsigned long planeMask, char *pDst)
{
unsigned char depth;
int i, linelength, width, srcx, srcy;
......@@ -745,12 +743,9 @@ miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst)
* This part is simple, just call SetSpans
*/
_X_EXPORT void
miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage)
DrawablePtr pDraw;
GCPtr pGC;
int depth, x, y, w, h, leftPad;
int format;
char *pImage;
miPutImage( DrawablePtr pDraw, GCPtr pGC, int depth,
int x, int y, int w, int h,
int leftPad, int format, char *pImage)
{
DDXPointPtr pptFirst, ppt;
int *pwidthFirst, *pwidth;
......
......@@ -57,11 +57,8 @@ SOFTWARE.
extern Bool Must_have_memory;
_X_EXPORT void
miRecolorCursor( pDev, pScr, pCurs, displayed)
DeviceIntPtr pDev;
ScreenPtr pScr;
CursorPtr pCurs;
Bool displayed;
miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
CursorPtr pCurs, Bool displayed)
{
/*
* This is guaranteed to correct any color-dependent state which may have
......
......@@ -53,12 +53,13 @@ SOFTWARE.
#include "mifpoly.h"
_X_EXPORT void
miStepDash (dist, pDashIndex, pDash, numInDashList, pDashOffset)
int dist; /* distance to step */
int *pDashIndex; /* current dash */
unsigned char *pDash; /* dash list */
int numInDashList; /* total length of dash list */
int *pDashOffset; /* offset into current dash */
miStepDash (
int dist, /* distance to step */
int *pDashIndex, /* current dash */
unsigned char *pDash, /* dash list */
int numInDashList, /* total length of dash list */
int *pDashOffset /* offset into current dash */
)
{
int dashIndex, dashOffset;
int totallen;
......
......@@ -142,9 +142,7 @@ static miSpriteCursorFuncRec miDCFuncs = {
};
_X_EXPORT Bool
miDCInitialize (pScreen, screenFuncs)
ScreenPtr pScreen;
miPointerScreenFuncPtr screenFuncs;
miDCInitialize (ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
{
miDCScreenPtr pScreenPriv;
......@@ -171,9 +169,7 @@ miDCInitialize (pScreen, screenFuncs)
#define tossPict(pict) (pict ? FreePicture (pict, 0) : 0)
static Bool
miDCCloseScreen (index, pScreen)
int index;
ScreenPtr pScreen;
miDCCloseScreen (int index, ScreenPtr pScreen)
{
miDCScreenPtr pScreenPriv;
......@@ -185,9 +181,7 @@ miDCCloseScreen (index, pScreen)
}
static Bool
miDCRealizeCursor (pScreen, pCursor)
ScreenPtr pScreen;
CursorPtr pCursor;
miDCRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
{
if (pCursor->bits->refcnt <= 1)
dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
......@@ -235,9 +229,7 @@ miDCMakePicture (PicturePtr *ppPicture, DrawablePtr pDraw, WindowPtr pWin)
#endif
static miDCCursorPtr
miDCRealize (
ScreenPtr pScreen,
CursorPtr pCursor)
miDCRealize (ScreenPtr pScreen, CursorPtr pCursor)
{
miDCCursorPtr pPriv;
GCPtr pGC;
......@@ -349,9 +341,7 @@ miDCRealize (
}
static Bool
miDCUnrealizeCursor (pScreen, pCursor)
ScreenPtr pScreen;
CursorPtr pCursor;
miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
{
miDCCursorPtr pPriv;
......@@ -453,12 +443,8 @@ miDCMakeGC(
static Bool
miDCPutUpCursor (pDev, pScreen, pCursor, x, y, source, mask)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
int x, y;
unsigned long source, mask;
miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
int x, int y, unsigned long source, unsigned long mask)
{
miDCScreenPtr pScreenPriv;
miDCCursorPtr pPriv;
......@@ -540,10 +526,8 @@ miDCPutUpCursor (pDev, pScreen, pCursor, x, y, source, mask)
}
static Bool
miDCSaveUnderCursor (pDev, pScreen, x, y, w, h)
DeviceIntPtr pDev;
ScreenPtr pScreen;
int x, y, w, h;
miDCSaveUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, int w, int h)
{
miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer;
......@@ -583,10 +567,8 @@ miDCSaveUnderCursor (pDev, pScreen, x, y, w, h)
}
static Bool
miDCRestoreUnderCursor (pDev, pScreen, x, y, w, h)
DeviceIntPtr pDev;
ScreenPtr pScreen;
int x, y, w, h;
miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, int w, int h)
{
miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer;
......@@ -619,10 +601,8 @@ miDCRestoreUnderCursor (pDev, pScreen, x, y, w, h)
}
static Bool
miDCChangeSave (pDev, pScreen, x, y, w, h, dx, dy)
DeviceIntPtr pDev;
ScreenPtr pScreen;
int x, y, w, h, dx, dy;
miDCChangeSave (DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, int w, int h, int dx, int dy)
{
miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer;
......@@ -768,12 +748,9 @@ miDCChangeSave (pDev, pScreen, x, y, w, h, dx, dy)
}
static Bool
miDCMoveCursor (pDev, pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
int x, y, w, h, dx, dy;
unsigned long source, mask;
miDCMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
int x, int y, int w, int h, int dx, int dy,
unsigned long source, unsigned long mask)
{
miDCCursorPtr pPriv;
miDCScreenPtr pScreenPriv;
......@@ -904,9 +881,7 @@ miDCMoveCursor (pDev, pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
}
static Bool
miDCDeviceInitialize(pDev, pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
{
miDCBufferPtr pBuffer;
......@@ -930,9 +905,7 @@ miDCDeviceInitialize(pDev, pScreen)
}
static void
miDCDeviceCleanup(pDev, pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{
miDCBufferPtr pBuffer;
......
......@@ -128,15 +128,9 @@ exposing is done by the backing store's GraphicsExpose function, of course.
*/
_X_EXPORT RegionPtr
miHandleExposures(pSrcDrawable, pDstDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, plane)
DrawablePtr pSrcDrawable;
DrawablePtr pDstDrawable;
GCPtr pGC;
int srcx, srcy;
int width, height;
int dstx, dsty;
unsigned long plane;
miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
GCPtr pGC, int srcx, int srcy, int width, int height,
int dstx, int dsty, unsigned long plane)
{
ScreenPtr pscr;
RegionPtr prgnSrcClip; /* drawable-relative source clip */
......@@ -350,12 +344,8 @@ miHandleExposures(pSrcDrawable, pDstDrawable,
/* send GraphicsExpose events, or a NoExpose event, based on the region */
_X_EXPORT void
miSendGraphicsExpose (client, pRgn, drawable, major, minor)
ClientPtr client;
RegionPtr pRgn;
XID drawable;
int major;
int minor;
miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
int major, int minor)
{
if (pRgn && !REGION_NIL(pRgn))
{
......@@ -401,10 +391,7 @@ miSendGraphicsExpose (client, pRgn, drawable, major, minor)
void
miSendExposures(pWin, pRgn, dx, dy)
WindowPtr pWin;
RegionPtr pRgn;
int dx, dy;
miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy)
{
BoxPtr pBox;
int numRects;
......@@ -464,9 +451,7 @@ miSendExposures(pWin, pRgn, dx, dy)
}
_X_EXPORT void
miWindowExposures(pWin, prgn, other_exposed)
WindowPtr pWin;
RegionPtr prgn, other_exposed;
miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)
{
RegionPtr exposures = prgn;
if ((prgn && !REGION_NIL(prgn)) ||
......@@ -654,9 +639,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
* the GC. Useful when we have a scratch drawable and need to initialize
* it. */
_X_EXPORT void
miClearDrawable(pDraw, pGC)
DrawablePtr pDraw;
GCPtr pGC;
miClearDrawable(DrawablePtr pDraw, GCPtr pGC)
{
XID fg = pGC->fgPixel;
XID bg = pGC->bgPixel;
......
......@@ -53,9 +53,7 @@ Author: Bob Scheifler, MIT X Consortium
#define Dcos(d) cos((double)d*(M_PI/11520.0))
_X_EXPORT void
miFillArcSetup(arc, info)
xArc *arc;
miFillArcRec *info;
miFillArcSetup(xArc *arc, miFillArcRec *info)
{
info->y = arc->height >> 1;
info->dy = arc->height & 1;
......@@ -307,10 +305,7 @@ miGetPieEdge(
}
_X_EXPORT void
miFillArcSliceSetup(arc, slice, pGC)
xArc *arc;
miArcSliceRec *slice;
GCPtr pGC;
miFillArcSliceSetup(xArc *arc, miArcSliceRec *slice, GCPtr pGC)
{
int angle1, angle2;
......@@ -776,11 +771,7 @@ miFillArcSliceD(
* fill each arc as it comes.
*/
_X_EXPORT void
miPolyFillArc(pDraw, pGC, narcs, parcs)
DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
{
int i;
xArc *arc;
......
......@@ -67,11 +67,12 @@ SOFTWARE.
* clipping to the destination
*/
_X_EXPORT void
miPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
DrawablePtr pDrawable;
GCPtr pGC;
int nrectFill; /* number of rectangles to fill */
xRectangle *prectInit; /* Pointer to first rectangle to fill */
miPolyFillRect(
DrawablePtr pDrawable,
GCPtr pGC,
int nrectFill, /* number of rectangles to fill */
xRectangle *prectInit /* Pointer to first rectangle to fill */
)
{
int i;
int height;
......
......@@ -71,18 +71,20 @@ static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans,
* interpolation involved because of the subpixel postioning.
*/
void
miFillSppPoly(dst, pgc, count, ptsIn, xTrans, yTrans, xFtrans, yFtrans)
DrawablePtr dst;
GCPtr pgc;
int count; /* number of points */
SppPointPtr ptsIn; /* the points */
int xTrans, yTrans; /* Translate each point by this */
double xFtrans, yFtrans; /* translate before conversion
by this amount. This provides
miFillSppPoly(
DrawablePtr dst,
GCPtr pgc,
int count, /* number of points */
SppPointPtr ptsIn, /* the points */
int xTrans, int yTrans, /* Translate each point by this */
double xFtrans,
double yFtrans /* translate before conversion
by this amount. This provides
a mechanism to match rounding
errors with any shape that must
meet the polygon exactly.
*/
)
{
double xl = 0.0, xr = 0.0, /* x vals of left and right edges */
ml = 0.0, /* left edge slope */
......
......@@ -39,16 +39,13 @@ from The Open Group.
/* ARGSUSED */
_X_EXPORT void
miChangeGC(pGC, mask)
GCPtr pGC;
unsigned long mask;
miChangeGC(GCPtr pGC, unsigned long mask)
{
return;
}
_X_EXPORT void
miDestroyGC(pGC)
GCPtr pGC;
miDestroyGC(GCPtr pGC)
{
if (pGC->pRotatedPixmap)
(*pGC->pScreen->DestroyPixmap) (pGC->pRotatedPixmap);
......@@ -62,8 +59,7 @@ miDestroyGC(pGC)
*/
_X_EXPORT GCOpsPtr
miCreateGCOps(prototype)
GCOpsPtr prototype;
miCreateGCOps(GCOpsPtr prototype)
{
GCOpsPtr ret;
......@@ -78,8 +74,7 @@ miCreateGCOps(prototype)
}
_X_EXPORT void
miDestroyGCOps(ops)
GCOpsPtr ops;
miDestroyGCOps(GCOpsPtr ops)
{
if (ops->devPrivate.val)
xfree(ops);
......@@ -87,8 +82,7 @@ miDestroyGCOps(ops)
_X_EXPORT void
miDestroyClip(pGC)
GCPtr pGC;
miDestroyClip(GCPtr pGC)
{
if (pGC->clientClipType == CT_NONE)
return;
......@@ -109,11 +103,7 @@ miDestroyClip(pGC)
}
_X_EXPORT void
miChangeClip(pGC, type, pvalue, nrects)
GCPtr pGC;
int type;
pointer pvalue;
int nrects;
miChangeClip( GCPtr pGC, int type, pointer pvalue, int nrects)
{
(*pGC->funcs->DestroyClip) (pGC);
if (type == CT_PIXMAP)
......@@ -140,8 +130,7 @@ miChangeClip(pGC, type, pvalue, nrects)
}
_X_EXPORT void
miCopyClip(pgcDst, pgcSrc)
GCPtr pgcDst, pgcSrc;
miCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
{
RegionPtr prgnNew;
......@@ -165,18 +154,13 @@ miCopyClip(pgcDst, pgcSrc)
/* ARGSUSED */
_X_EXPORT void
miCopyGC(pGCSrc, changes, pGCDst)
GCPtr pGCSrc;
unsigned long changes;
GCPtr pGCDst;
miCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
{
return;
}
_X_EXPORT void
miComputeCompositeClip(pGC, pDrawable)
GCPtr pGC;
DrawablePtr pDrawable;
miComputeCompositeClip( GCPtr pGC, DrawablePtr pDrawable)
{
ScreenPtr pScreen;
......
......@@ -82,13 +82,15 @@ with the sample server.
*/
_X_EXPORT void
miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
DrawablePtr pDrawable;
GC *pGC;
int x, y;
unsigned int nglyph;
CharInfoPtr *ppci; /* array of character info */
pointer pglyphBase; /* start of array of glyphs */
miPolyGlyphBlt(
DrawablePtr pDrawable,
GC *pGC,
int x,
int y,
unsigned int nglyph,
CharInfoPtr *ppci, /* array of character info */
pointer pglyphBase /* start of array of glyphs */
)
{
int width, height;
PixmapPtr pPixmap;
......@@ -196,13 +198,15 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
_X_EXPORT void
miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
DrawablePtr pDrawable;
GC *pGC;
int x, y;
unsigned int nglyph;
CharInfoPtr *ppci; /* array of character info */
pointer pglyphBase; /* start of array of glyphs */
miImageGlyphBlt(
DrawablePtr pDrawable,
GC *pGC,
int x,
int y,
unsigned int nglyph,
CharInfoPtr *ppci, /* array of character info */
pointer pglyphBase /* start of array of glyphs */
)
{
ExtentInfoRec info; /* used by QueryGlyphExtents() */
XID gcvals[3];
......
......@@ -454,9 +454,7 @@ void EnableDisableExtensionError(char *name, Bool enable)
/*ARGSUSED*/
void
InitExtensions(argc, argv)
int argc;
char *argv[];
InitExtensions(int argc, char *argv[])
{
if (!noGEExtension) GEExtensionInit();
......@@ -633,9 +631,7 @@ static ExtensionModule staticExtensions[] = {
/*ARGSUSED*/
void
InitExtensions(argc, argv)
int argc;
char *argv[];
InitExtensions(int argc, char *argv[])
{
int i;
ExtensionModule *ext;
......
......@@ -81,11 +81,10 @@ static void miPointerDeviceCleanup(DeviceIntPtr pDev,
static EventList* events; /* for WarpPointer MotionNotifies */
_X_EXPORT Bool
miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
ScreenPtr pScreen;
miPointerSpriteFuncPtr spriteFuncs;
miPointerScreenFuncPtr screenFuncs;
Bool waitForUpdate;
miPointerInitialize (ScreenPtr pScreen,
miPointerSpriteFuncPtr spriteFuncs,
miPointerScreenFuncPtr screenFuncs,
Bool waitForUpdate)
{
miPointerScreenPtr pScreenPriv;
......@@ -125,9 +124,7 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
}
static Bool
miPointerCloseScreen (index, pScreen)
int index;
ScreenPtr pScreen;
miPointerCloseScreen (int index, ScreenPtr pScreen)
{
miPointerPtr pPointer;
DeviceIntPtr pDev;
......@@ -166,33 +163,26 @@ miPointerCloseScreen (index, pScreen)
*/
static Bool
miPointerRealizeCursor (pDev, pScreen, pCursor)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
miPointerRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{
SetupScreen(pScreen);
return (*pScreenPriv->spriteFuncs->RealizeCursor) (pDev, pScreen, pCursor);
}
static Bool
miPointerUnrealizeCursor (pDev, pScreen, pCursor)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
miPointerUnrealizeCursor (DeviceIntPtr pDev,
ScreenPtr pScreen,
CursorPtr pCursor)
{
SetupScreen(pScreen);
return (*pScreenPriv->spriteFuncs->UnrealizeCursor) (pDev, pScreen, pCursor);
}
static Bool
miPointerDisplayCursor (pDev, pScreen, pCursor)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{
miPointerPtr pPointer;
/* return for keyboards */
if ((pDev->isMaster && !DevHasCursor(pDev)) ||
(!pDev->isMaster && pDev->u.master && !DevHasCursor(pDev->u.master)))
......@@ -207,10 +197,7 @@ miPointerDisplayCursor (pDev, pScreen, pCursor)
}
static void
miPointerConstrainCursor (pDev, pScreen, pBox)
DeviceIntPtr pDev;
ScreenPtr pScreen;
BoxPtr pBox;
miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
{
miPointerPtr pPointer;
......@@ -222,22 +209,17 @@ miPointerConstrainCursor (pDev, pScreen, pBox)
/*ARGSUSED*/
static void
miPointerPointerNonInterestBox (pDev, pScreen, pBox)
DeviceIntPtr pDev;
ScreenPtr pScreen;
BoxPtr pBox;
miPointerPointerNonInterestBox (DeviceIntPtr pDev,
ScreenPtr pScreen,
BoxPtr pBox)
{
/* until DIX uses this, this will remain a stub */
}
/*ARGSUSED*/
static void
miPointerCursorLimits(pDev, pScreen, pCursor, pHotBox, pTopLeftBox)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
BoxPtr pHotBox;
BoxPtr pTopLeftBox;
miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
BoxPtr pHotBox, BoxPtr pTopLeftBox)
{
*pTopLeftBox = *pHotBox;
}
......@@ -245,11 +227,8 @@ miPointerCursorLimits(pDev, pScreen, pCursor, pHotBox, pTopLeftBox)
static Bool GenerateEvent;
static Bool
miPointerSetCursorPosition(pDev, pScreen, x, y, generateEvent)
DeviceIntPtr pDev;
ScreenPtr pScreen;
int x, y;
Bool generateEvent;
miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, Bool generateEvent)
{
SetupScreen (pScreen);
......@@ -261,14 +240,12 @@ miPointerSetCursorPosition(pDev, pScreen, x, y, generateEvent)
return TRUE;
}
/* Set up sprite information for the device.
/* Set up sprite information for the device.
This function will be called once for each device after it is initialized
in the DIX.
*/
*/
static Bool
miPointerDeviceInitialize(pDev, pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
{
miPointerPtr pPointer;
SetupScreen (pScreen);
......@@ -299,13 +276,11 @@ miPointerDeviceInitialize(pDev, pScreen)
return TRUE;
}
/* Clean up after device.
/* Clean up after device.
This function will be called once before the device is freed in the DIX
*/
static void
miPointerDeviceCleanup(pDev, pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{
if (!pDev->isMaster && pDev->u.master)
return;
......@@ -320,10 +295,7 @@ miPointerDeviceCleanup(pDev, pScreen)
/* Once signals are ignored, the WarpCursor function can call this */
_X_EXPORT void
miPointerWarpCursor (pDev, pScreen, x, y)
DeviceIntPtr pDev;
ScreenPtr pScreen;
int x, y;
miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{