frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: ansify.

This commit is contained in:
Peter Hutterer 2008-05-28 12:27:07 +09:30
parent 64677f6a16
commit 9b544fa400
32 changed files with 345 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mi/miarc.c
View File

@ -1042,11 +1042,7 @@ miFillWideEllipse(
*/ */
_X_EXPORT void _X_EXPORT void
miPolyArc(pDraw, pGC, narcs, parcs) miPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
{ {
int i; int i;
xArc *parc; xArc *parc;

53
mi/mibitblt.c
View File

@ -74,14 +74,15 @@ extern int ffs(int);
* We let SetSpans worry about clipping to the destination. * We let SetSpans worry about clipping to the destination.
*/ */
_X_EXPORT RegionPtr _X_EXPORT RegionPtr
miCopyArea(pSrcDrawable, pDstDrawable, miCopyArea(DrawablePtr pSrcDrawable,
pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut) DrawablePtr pDstDrawable,
DrawablePtr pSrcDrawable; GCPtr pGC,
DrawablePtr pDstDrawable; int xIn,
GCPtr pGC; int yIn,
int xIn, yIn; int widthSrc,
int widthSrc, heightSrc; int heightSrc,
int xOut, yOut; int xOut,
int yOut)
{ {
DDXPointPtr ppt, pptFirst; DDXPointPtr ppt, pptFirst;
unsigned int *pwidthFirst, *pwidth, *pbits; 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 * Use the bitmap we've built up as a Stipple for the destination
*/ */
_X_EXPORT RegionPtr _X_EXPORT RegionPtr
miCopyPlane(pSrcDrawable, pDstDrawable, miCopyPlane( DrawablePtr pSrcDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, bitPlane) DrawablePtr pDstDrawable,
DrawablePtr pSrcDrawable; GCPtr pGC,
DrawablePtr pDstDrawable; int srcx,
GCPtr pGC; int srcy,
int srcx, srcy; int width,
int width, height; int height,
int dstx, dsty; int dstx,
unsigned long bitPlane; int dsty,
unsigned long bitPlane)
{ {
MiBits *ptile; MiBits *ptile;
BoxRec box; BoxRec box;
@ -643,12 +645,8 @@ miCopyPlane(pSrcDrawable, pDstDrawable,
* get the single plane specified in planemask * get the single plane specified in planemask
*/ */
_X_EXPORT void _X_EXPORT void
miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst) miGetImage( DrawablePtr pDraw, int sx, int sy, int w, int h,
DrawablePtr pDraw; unsigned int format, unsigned long planeMask, char *pDst)
int sx, sy, w, h;
unsigned int format;
unsigned long planeMask;
char * pDst;
{ {
unsigned char depth; unsigned char depth;
int i, linelength, width, srcx, srcy; 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 * This part is simple, just call SetSpans
*/ */
_X_EXPORT void _X_EXPORT void
miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage) miPutImage( DrawablePtr pDraw, GCPtr pGC, int depth,
DrawablePtr pDraw; int x, int y, int w, int h,
GCPtr pGC; int leftPad, int format, char *pImage)
int depth, x, y, w, h, leftPad;
int format;
char *pImage;
{ {
DDXPointPtr pptFirst, ppt; DDXPointPtr pptFirst, ppt;
int *pwidthFirst, *pwidth; int *pwidthFirst, *pwidth;

7
mi/micursor.c
View File

@ -57,11 +57,8 @@ SOFTWARE.
extern Bool Must_have_memory; extern Bool Must_have_memory;
_X_EXPORT void _X_EXPORT void
miRecolorCursor( pDev, pScr, pCurs, displayed) miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr,
DeviceIntPtr pDev; CursorPtr pCurs, Bool displayed)
ScreenPtr pScr;
CursorPtr pCurs;
Bool displayed;
{ {
/* /*
* This is guaranteed to correct any color-dependent state which may have * This is guaranteed to correct any color-dependent state which may have

13
mi/midash.c
View File

@ -53,12 +53,13 @@ SOFTWARE.
#include "mifpoly.h" #include "mifpoly.h"
_X_EXPORT void _X_EXPORT void
miStepDash (dist, pDashIndex, pDash, numInDashList, pDashOffset) miStepDash (
int dist; /* distance to step */ int dist, /* distance to step */
int *pDashIndex; /* current dash */ int *pDashIndex, /* current dash */
unsigned char *pDash; /* dash list */ unsigned char *pDash, /* dash list */
int numInDashList; /* total length of dash list */ int numInDashList, /* total length of dash list */
int *pDashOffset; /* offset into current dash */ int *pDashOffset /* offset into current dash */
)
{ {
int dashIndex, dashOffset; int dashIndex, dashOffset;
int totallen; int totallen;

63
mi/midispcur.c
View File

@ -142,9 +142,7 @@ static miSpriteCursorFuncRec miDCFuncs = {
}; };
_X_EXPORT Bool _X_EXPORT Bool
miDCInitialize (pScreen, screenFuncs) miDCInitialize (ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
ScreenPtr pScreen;
miPointerScreenFuncPtr screenFuncs;
{ {
miDCScreenPtr pScreenPriv; miDCScreenPtr pScreenPriv;
@ -171,9 +169,7 @@ miDCInitialize (pScreen, screenFuncs)
#define tossPict(pict) (pict ? FreePicture (pict, 0) : 0) #define tossPict(pict) (pict ? FreePicture (pict, 0) : 0)
static Bool static Bool
miDCCloseScreen (index, pScreen) miDCCloseScreen (int index, ScreenPtr pScreen)
int index;
ScreenPtr pScreen;
{ {
miDCScreenPtr pScreenPriv; miDCScreenPtr pScreenPriv;
@ -185,9 +181,7 @@ miDCCloseScreen (index, pScreen)
} }
static Bool static Bool
miDCRealizeCursor (pScreen, pCursor) miDCRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
ScreenPtr pScreen;
CursorPtr pCursor;
{ {
if (pCursor->bits->refcnt <= 1) if (pCursor->bits->refcnt <= 1)
dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL); dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
@ -235,9 +229,7 @@ miDCMakePicture (PicturePtr *ppPicture, DrawablePtr pDraw, WindowPtr pWin)
#endif #endif
static miDCCursorPtr static miDCCursorPtr
miDCRealize ( miDCRealize (ScreenPtr pScreen, CursorPtr pCursor)
ScreenPtr pScreen,
CursorPtr pCursor)
{ {
miDCCursorPtr pPriv; miDCCursorPtr pPriv;
GCPtr pGC; GCPtr pGC;
@ -349,9 +341,7 @@ miDCRealize (
} }
static Bool static Bool
miDCUnrealizeCursor (pScreen, pCursor) miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
ScreenPtr pScreen;
CursorPtr pCursor;
{ {
miDCCursorPtr pPriv; miDCCursorPtr pPriv;
@ -453,12 +443,8 @@ miDCMakeGC(
static Bool static Bool
miDCPutUpCursor (pDev, pScreen, pCursor, x, y, source, mask) miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
DeviceIntPtr pDev; int x, int y, unsigned long source, unsigned long mask)
ScreenPtr pScreen;
CursorPtr pCursor;
int x, y;
unsigned long source, mask;
{ {
miDCScreenPtr pScreenPriv; miDCScreenPtr pScreenPriv;
miDCCursorPtr pPriv; miDCCursorPtr pPriv;
@ -540,10 +526,8 @@ miDCPutUpCursor (pDev, pScreen, pCursor, x, y, source, mask)
} }
static Bool static Bool
miDCSaveUnderCursor (pDev, pScreen, x, y, w, h) miDCSaveUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
DeviceIntPtr pDev; int x, int y, int w, int h)
ScreenPtr pScreen;
int x, y, w, h;
{ {
miDCScreenPtr pScreenPriv; miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer; miDCBufferPtr pBuffer;
@ -583,10 +567,8 @@ miDCSaveUnderCursor (pDev, pScreen, x, y, w, h)
} }
static Bool static Bool
miDCRestoreUnderCursor (pDev, pScreen, x, y, w, h) miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
DeviceIntPtr pDev; int x, int y, int w, int h)
ScreenPtr pScreen;
int x, y, w, h;
{ {
miDCScreenPtr pScreenPriv; miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer; miDCBufferPtr pBuffer;
@ -619,10 +601,8 @@ miDCRestoreUnderCursor (pDev, pScreen, x, y, w, h)
} }
static Bool static Bool
miDCChangeSave (pDev, pScreen, x, y, w, h, dx, dy) miDCChangeSave (DeviceIntPtr pDev, ScreenPtr pScreen,
DeviceIntPtr pDev; int x, int y, int w, int h, int dx, int dy)
ScreenPtr pScreen;
int x, y, w, h, dx, dy;
{ {
miDCScreenPtr pScreenPriv; miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer; miDCBufferPtr pBuffer;
@ -768,12 +748,9 @@ miDCChangeSave (pDev, pScreen, x, y, w, h, dx, dy)
} }
static Bool static Bool
miDCMoveCursor (pDev, pScreen, pCursor, x, y, w, h, dx, dy, source, mask) miDCMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
DeviceIntPtr pDev; int x, int y, int w, int h, int dx, int dy,
ScreenPtr pScreen; unsigned long source, unsigned long mask)
CursorPtr pCursor;
int x, y, w, h, dx, dy;
unsigned long source, mask;
{ {
miDCCursorPtr pPriv; miDCCursorPtr pPriv;
miDCScreenPtr pScreenPriv; miDCScreenPtr pScreenPriv;
@ -904,9 +881,7 @@ miDCMoveCursor (pDev, pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
} }
static Bool static Bool
miDCDeviceInitialize(pDev, pScreen) miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miDCBufferPtr pBuffer; miDCBufferPtr pBuffer;
@ -930,9 +905,7 @@ miDCDeviceInitialize(pDev, pScreen)
} }
static void static void
miDCDeviceCleanup(pDev, pScreen) miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miDCBufferPtr pBuffer; miDCBufferPtr pBuffer;

33
mi/miexpose.c
View File

@ -128,15 +128,9 @@ exposing is done by the backing store's GraphicsExpose function, of course.
*/ */
_X_EXPORT RegionPtr _X_EXPORT RegionPtr
miHandleExposures(pSrcDrawable, pDstDrawable, miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, plane) GCPtr pGC, int srcx, int srcy, int width, int height,
DrawablePtr pSrcDrawable; int dstx, int dsty, unsigned long plane)
DrawablePtr pDstDrawable;
GCPtr pGC;
int srcx, srcy;
int width, height;
int dstx, dsty;
unsigned long plane;
{ {
ScreenPtr pscr; ScreenPtr pscr;
RegionPtr prgnSrcClip; /* drawable-relative source clip */ RegionPtr prgnSrcClip; /* drawable-relative source clip */
@ -350,12 +344,8 @@ miHandleExposures(pSrcDrawable, 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 _X_EXPORT void
miSendGraphicsExpose (client, pRgn, drawable, major, minor) miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
ClientPtr client; int major, int minor)
RegionPtr pRgn;
XID drawable;
int major;
int minor;
{ {
if (pRgn && !REGION_NIL(pRgn)) if (pRgn && !REGION_NIL(pRgn))
{ {
@ -401,10 +391,7 @@ miSendGraphicsExpose (client, pRgn, drawable, major, minor)
void void
miSendExposures(pWin, pRgn, dx, dy) miSendExposures( WindowPtr pWin, RegionPtr pRgn, int dx, int dy)
WindowPtr pWin;
RegionPtr pRgn;
int dx, dy;
{ {
BoxPtr pBox; BoxPtr pBox;
int numRects; int numRects;
@ -464,9 +451,7 @@ miSendExposures(pWin, pRgn, dx, dy)
} }
_X_EXPORT void _X_EXPORT void
miWindowExposures(pWin, prgn, other_exposed) miWindowExposures( WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed)
WindowPtr pWin;
RegionPtr prgn, other_exposed;
{ {
RegionPtr exposures = prgn; RegionPtr exposures = prgn;
if ((prgn && !REGION_NIL(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 * the GC. Useful when we have a scratch drawable and need to initialize
* it. */ * it. */
_X_EXPORT void _X_EXPORT void
miClearDrawable(pDraw, pGC) miClearDrawable(DrawablePtr pDraw, GCPtr pGC)
DrawablePtr pDraw;
GCPtr pGC;
{ {
XID fg = pGC->fgPixel; XID fg = pGC->fgPixel;
XID bg = pGC->bgPixel; XID bg = pGC->bgPixel;

15
mi/mifillarc.c
View File

@ -53,9 +53,7 @@ Author: Bob Scheifler, MIT X Consortium
#define Dcos(d) cos((double)d*(M_PI/11520.0)) #define Dcos(d) cos((double)d*(M_PI/11520.0))
_X_EXPORT void _X_EXPORT void
miFillArcSetup(arc, info) miFillArcSetup(xArc *arc, miFillArcRec *info)
xArc *arc;
miFillArcRec *info;
{ {
info->y = arc->height >> 1; info->y = arc->height >> 1;
info->dy = arc->height & 1; info->dy = arc->height & 1;
@ -307,10 +305,7 @@ miGetPieEdge(
} }
_X_EXPORT void _X_EXPORT void
miFillArcSliceSetup(arc, slice, pGC) miFillArcSliceSetup(xArc *arc, miArcSliceRec *slice, GCPtr pGC)
xArc *arc;
miArcSliceRec *slice;
GCPtr pGC;
{ {
int angle1, angle2; int angle1, angle2;
@ -776,11 +771,7 @@ miFillArcSliceD(
* fill each arc as it comes. * fill each arc as it comes.
*/ */
_X_EXPORT void _X_EXPORT void
miPolyFillArc(pDraw, pGC, narcs, parcs) miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
{ {
int i; int i;
xArc *arc; xArc *arc;

11
mi/mifillrct.c
View File

@ -67,11 +67,12 @@ SOFTWARE.
* clipping to the destination * clipping to the destination
*/ */
_X_EXPORT void _X_EXPORT void
miPolyFillRect(pDrawable, pGC, nrectFill, prectInit) miPolyFillRect(
DrawablePtr pDrawable; DrawablePtr pDrawable,
GCPtr pGC; GCPtr pGC,
int nrectFill; /* number of rectangles to fill */ int nrectFill, /* number of rectangles to fill */
xRectangle *prectInit; /* Pointer to first rectangle to fill */ xRectangle *prectInit /* Pointer to first rectangle to fill */
)
{ {
int i; int i;
int height; int height;

18
mi/mifpolycon.c
View File

@ -71,18 +71,20 @@ static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans,
* interpolation involved because of the subpixel postioning. * interpolation involved because of the subpixel postioning.
*/ */
void void
miFillSppPoly(dst, pgc, count, ptsIn, xTrans, yTrans, xFtrans, yFtrans) miFillSppPoly(
DrawablePtr dst; DrawablePtr dst,
GCPtr pgc; GCPtr pgc,
int count; /* number of points */ int count, /* number of points */
SppPointPtr ptsIn; /* the points */ SppPointPtr ptsIn, /* the points */
int xTrans, yTrans; /* Translate each point by this */ int xTrans, int yTrans, /* Translate each point by this */
double xFtrans, yFtrans; /* translate before conversion double xFtrans,
by this amount. This provides double yFtrans /* translate before conversion
by this amount. This provides
a mechanism to match rounding a mechanism to match rounding
errors with any shape that must errors with any shape that must
meet the polygon exactly. meet the polygon exactly.
*/ */
)
{ {
double xl = 0.0, xr = 0.0, /* x vals of left and right edges */ double xl = 0.0, xr = 0.0, /* x vals of left and right edges */
ml = 0.0, /* left edge slope */ ml = 0.0, /* left edge slope */

34
mi/migc.c
View File

@ -39,16 +39,13 @@ from The Open Group.
/* ARGSUSED */ /* ARGSUSED */
_X_EXPORT void _X_EXPORT void
miChangeGC(pGC, mask) miChangeGC(GCPtr pGC, unsigned long mask)
GCPtr pGC;
unsigned long mask;
{ {
return; return;
} }
_X_EXPORT void _X_EXPORT void
miDestroyGC(pGC) miDestroyGC(GCPtr pGC)
GCPtr pGC;
{ {
if (pGC->pRotatedPixmap) if (pGC->pRotatedPixmap)
(*pGC->pScreen->DestroyPixmap) (pGC->pRotatedPixmap); (*pGC->pScreen->DestroyPixmap) (pGC->pRotatedPixmap);
@ -62,8 +59,7 @@ miDestroyGC(pGC)
*/ */
_X_EXPORT GCOpsPtr _X_EXPORT GCOpsPtr
miCreateGCOps(prototype) miCreateGCOps(GCOpsPtr prototype)
GCOpsPtr prototype;
{ {
GCOpsPtr ret; GCOpsPtr ret;
@ -78,8 +74,7 @@ miCreateGCOps(prototype)
} }
_X_EXPORT void _X_EXPORT void
miDestroyGCOps(ops) miDestroyGCOps(GCOpsPtr ops)
GCOpsPtr ops;
{ {
if (ops->devPrivate.val) if (ops->devPrivate.val)
xfree(ops); xfree(ops);
@ -87,8 +82,7 @@ miDestroyGCOps(ops)
_X_EXPORT void _X_EXPORT void
miDestroyClip(pGC) miDestroyClip(GCPtr pGC)
GCPtr pGC;
{ {
if (pGC->clientClipType == CT_NONE) if (pGC->clientClipType == CT_NONE)
return; return;
@ -109,11 +103,7 @@ miDestroyClip(pGC)
} }
_X_EXPORT void _X_EXPORT void
miChangeClip(pGC, type, pvalue, nrects) miChangeClip( GCPtr pGC, int type, pointer pvalue, int nrects)
GCPtr pGC;
int type;
pointer pvalue;
int nrects;
{ {
(*pGC->funcs->DestroyClip) (pGC); (*pGC->funcs->DestroyClip) (pGC);
if (type == CT_PIXMAP) if (type == CT_PIXMAP)
@ -140,8 +130,7 @@ miChangeClip(pGC, type, pvalue, nrects)
} }
_X_EXPORT void _X_EXPORT void
miCopyClip(pgcDst, pgcSrc) miCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
GCPtr pgcDst, pgcSrc;
{ {
RegionPtr prgnNew; RegionPtr prgnNew;
@ -165,18 +154,13 @@ miCopyClip(pgcDst, pgcSrc)
/* ARGSUSED */ /* ARGSUSED */
_X_EXPORT void _X_EXPORT void
miCopyGC(pGCSrc, changes, pGCDst) miCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
GCPtr pGCSrc;
unsigned long changes;
GCPtr pGCDst;
{ {
return; return;
} }
_X_EXPORT void _X_EXPORT void
miComputeCompositeClip(pGC, pDrawable) miComputeCompositeClip( GCPtr pGC, DrawablePtr pDrawable)
GCPtr pGC;
DrawablePtr pDrawable;
{ {
ScreenPtr pScreen; ScreenPtr pScreen;

32
mi/miglblt.c
View File

@ -82,13 +82,15 @@ with the sample server.
*/ */
_X_EXPORT void _X_EXPORT void
miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) miPolyGlyphBlt(
DrawablePtr pDrawable; DrawablePtr pDrawable,
GC *pGC; GC *pGC,
int x, y; int x,
unsigned int nglyph; int y,
CharInfoPtr *ppci; /* array of character info */ unsigned int nglyph,
pointer pglyphBase; /* start of array of glyphs */ CharInfoPtr *ppci, /* array of character info */
pointer pglyphBase /* start of array of glyphs */
)
{ {
int width, height; int width, height;
PixmapPtr pPixmap; PixmapPtr pPixmap;
@ -196,13 +198,15 @@ miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
_X_EXPORT void _X_EXPORT void
miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) miImageGlyphBlt(
DrawablePtr pDrawable; DrawablePtr pDrawable,
GC *pGC; GC *pGC,
int x, y; int x,
unsigned int nglyph; int y,
CharInfoPtr *ppci; /* array of character info */ unsigned int nglyph,
pointer pglyphBase; /* start of array of glyphs */ CharInfoPtr *ppci, /* array of character info */
pointer pglyphBase /* start of array of glyphs */
)
{ {
ExtentInfoRec info; /* used by QueryGlyphExtents() */ ExtentInfoRec info; /* used by QueryGlyphExtents() */
XID gcvals[3]; XID gcvals[3];

8
mi/miinitext.c
View File

@ -454,9 +454,7 @@ void EnableDisableExtensionError(char *name, Bool enable)
/*ARGSUSED*/ /*ARGSUSED*/
void void
InitExtensions(argc, argv) InitExtensions(int argc, char *argv[])
int argc;
char *argv[];
{ {
if (!noGEExtension) GEExtensionInit(); if (!noGEExtension) GEExtensionInit();
@ -633,9 +631,7 @@ static ExtensionModule staticExtensions[] = {
/*ARGSUSED*/ /*ARGSUSED*/
void void
InitExtensions(argc, argv) InitExtensions(int argc, char *argv[])
int argc;
char *argv[];
{ {
int i; int i;
ExtensionModule *ext; ExtensionModule *ext;

82
mi/mipointer.c
View File

@ -81,11 +81,10 @@ static void miPointerDeviceCleanup(DeviceIntPtr pDev,
static EventList* events; /* for WarpPointer MotionNotifies */ static EventList* events; /* for WarpPointer MotionNotifies */
_X_EXPORT Bool _X_EXPORT Bool
miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate) miPointerInitialize (ScreenPtr pScreen,
ScreenPtr pScreen; miPointerSpriteFuncPtr spriteFuncs,
miPointerSpriteFuncPtr spriteFuncs; miPointerScreenFuncPtr screenFuncs,
miPointerScreenFuncPtr screenFuncs; Bool waitForUpdate)
Bool waitForUpdate;
{ {
miPointerScreenPtr pScreenPriv; miPointerScreenPtr pScreenPriv;
@ -125,9 +124,7 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
} }
static Bool static Bool
miPointerCloseScreen (index, pScreen) miPointerCloseScreen (int index, ScreenPtr pScreen)
int index;
ScreenPtr pScreen;
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
DeviceIntPtr pDev; DeviceIntPtr pDev;
@ -166,33 +163,26 @@ miPointerCloseScreen (index, pScreen)
*/ */
static Bool static Bool
miPointerRealizeCursor (pDev, pScreen, pCursor) miPointerRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
{ {
SetupScreen(pScreen); SetupScreen(pScreen);
return (*pScreenPriv->spriteFuncs->RealizeCursor) (pDev, pScreen, pCursor); return (*pScreenPriv->spriteFuncs->RealizeCursor) (pDev, pScreen, pCursor);
} }
static Bool static Bool
miPointerUnrealizeCursor (pDev, pScreen, pCursor) miPointerUnrealizeCursor (DeviceIntPtr pDev,
DeviceIntPtr pDev; ScreenPtr pScreen,
ScreenPtr pScreen; CursorPtr pCursor)
CursorPtr pCursor;
{ {
SetupScreen(pScreen); SetupScreen(pScreen);
return (*pScreenPriv->spriteFuncs->UnrealizeCursor) (pDev, pScreen, pCursor); return (*pScreenPriv->spriteFuncs->UnrealizeCursor) (pDev, pScreen, pCursor);
} }
static Bool static Bool
miPointerDisplayCursor (pDev, pScreen, pCursor) miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
/* return for keyboards */ /* return for keyboards */
if ((pDev->isMaster && !DevHasCursor(pDev)) || if ((pDev->isMaster && !DevHasCursor(pDev)) ||
(!pDev->isMaster && pDev->u.master && !DevHasCursor(pDev->u.master))) (!pDev->isMaster && pDev->u.master && !DevHasCursor(pDev->u.master)))
@ -207,10 +197,7 @@ miPointerDisplayCursor (pDev, pScreen, pCursor)
} }
static void static void
miPointerConstrainCursor (pDev, pScreen, pBox) miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
DeviceIntPtr pDev;
ScreenPtr pScreen;
BoxPtr pBox;
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
@ -222,22 +209,17 @@ miPointerConstrainCursor (pDev, pScreen, pBox)
/*ARGSUSED*/ /*ARGSUSED*/
static void static void
miPointerPointerNonInterestBox (pDev, pScreen, pBox) miPointerPointerNonInterestBox (DeviceIntPtr pDev,
DeviceIntPtr pDev; ScreenPtr pScreen,
ScreenPtr pScreen; BoxPtr pBox)
BoxPtr pBox;
{ {
/* until DIX uses this, this will remain a stub */ /* until DIX uses this, this will remain a stub */
} }
/*ARGSUSED*/ /*ARGSUSED*/
static void static void
miPointerCursorLimits(pDev, pScreen, pCursor, pHotBox, pTopLeftBox) miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
DeviceIntPtr pDev; BoxPtr pHotBox, BoxPtr pTopLeftBox)
ScreenPtr pScreen;
CursorPtr pCursor;
BoxPtr pHotBox;
BoxPtr pTopLeftBox;
{ {
*pTopLeftBox = *pHotBox; *pTopLeftBox = *pHotBox;
} }
@ -245,11 +227,8 @@ miPointerCursorLimits(pDev, pScreen, pCursor, pHotBox, pTopLeftBox)
static Bool GenerateEvent; static Bool GenerateEvent;
static Bool static Bool
miPointerSetCursorPosition(pDev, pScreen, x, y, generateEvent) miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
DeviceIntPtr pDev; int x, int y, Bool generateEvent)
ScreenPtr pScreen;
int x, y;
Bool generateEvent;
{ {
SetupScreen (pScreen); SetupScreen (pScreen);
@ -261,14 +240,12 @@ miPointerSetCursorPosition(pDev, pScreen, x, y, generateEvent)
return TRUE; 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 This function will be called once for each device after it is initialized
in the DIX. in the DIX.
*/ */
static Bool static Bool
miPointerDeviceInitialize(pDev, pScreen) miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
SetupScreen (pScreen); SetupScreen (pScreen);
@ -299,13 +276,11 @@ miPointerDeviceInitialize(pDev, pScreen)
return TRUE; return TRUE;
} }
/* Clean up after device. /* Clean up after device.
This function will be called once before the device is freed in the DIX This function will be called once before the device is freed in the DIX
*/ */
static void static void
miPointerDeviceCleanup(pDev, pScreen) miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
if (!pDev->isMaster && pDev->u.master) if (!pDev->isMaster && pDev->u.master)
return; return;
@ -320,10 +295,7 @@ miPointerDeviceCleanup(pDev, pScreen)
/* Once signals are ignored, the WarpCursor function can call this */ /* Once signals are ignored, the WarpCursor function can call this */
_X_EXPORT void _X_EXPORT void
miPointerWarpCursor (pDev, pScreen, x, y) miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
DeviceIntPtr pDev;
ScreenPtr pScreen;
int x, y;
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
BOOL changedScreen = FALSE; BOOL changedScreen = FALSE;
@ -506,8 +478,8 @@ miPointerAbsoluteCursor (int x, int y, unsigned long time)
/* Move the pointer on the current screen, and update the sprite. */ /* Move the pointer on the current screen, and update the sprite. */
static void static void
miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y, miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,
unsigned long time) int x, int y, unsigned long time)
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
SetupScreen(pScreen); SetupScreen(pScreen);

9
mi/mipoly.c
View File

@ -67,12 +67,9 @@ SOFTWARE.
_X_EXPORT void _X_EXPORT void
miFillPolygon(dst, pgc, shape, mode, count, pPts) miFillPolygon( DrawablePtr dst, GCPtr pgc,
DrawablePtr dst; int shape, int mode,
GCPtr pgc; int count, DDXPointPtr pPts)
int shape, mode;
int count;
DDXPointPtr pPts;
{ {
int i; int i;
int xorg, yorg; int xorg, yorg;

11
mi/mipolycon.c
View File

@ -72,11 +72,12 @@ static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty);
* this code. * this code.
*/ */
_X_EXPORT Bool _X_EXPORT Bool
miFillConvexPoly(dst, pgc, count, ptsIn) miFillConvexPoly(
DrawablePtr dst; DrawablePtr dst,
GCPtr pgc; GCPtr pgc,
int count; /* number of points */ int count, /* number of points */
DDXPointPtr ptsIn; /* the points */ DDXPointPtr ptsIn /* the points */
)
{ {
int xl = 0, xr = 0; /* x vals of left and right edges */ int xl = 0, xr = 0; /* x vals of left and right edges */
int dl = 0, dr = 0; /* decision variables */ int dl = 0, dr = 0; /* decision variables */

11
mi/mipolygen.c
View File

@ -66,11 +66,12 @@ SOFTWARE.
*/ */
Bool Bool
miFillGeneralPoly(dst, pgc, count, ptsIn) miFillGeneralPoly(
DrawablePtr dst; DrawablePtr dst,
GCPtr pgc; GCPtr pgc,
int count; /* number of points */ int count, /* number of points */
DDXPointPtr ptsIn; /* the points */ DDXPointPtr ptsIn /* the points */
)
{ {
EdgeTableEntry *pAET; /* the Active Edge Table */ EdgeTableEntry *pAET; /* the Active Edge Table */
int y; /* the current scanline */ int y; /* the current scanline */

13
mi/mipolypnt.c
View File

@ -56,12 +56,13 @@ SOFTWARE.
#include "mi.h" #include "mi.h"
_X_EXPORT void _X_EXPORT void
miPolyPoint(pDrawable, pGC, mode, npt, pptInit) miPolyPoint(
DrawablePtr pDrawable; DrawablePtr pDrawable,
GCPtr pGC; GCPtr pGC,
int mode; /* Origin or Previous */ int mode, /* Origin or Previous */
int npt; int npt,
xPoint *pptInit; xPoint *pptInit
)
{ {
int xorg; int xorg;

6
mi/mipolyrect.c
View File

@ -56,11 +56,7 @@ SOFTWARE.
#include "mi.h" #include "mi.h"
_X_EXPORT void _X_EXPORT void
miPolyRectangle(pDraw, pGC, nrects, pRects) miPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, xRectangle *pRects)
DrawablePtr pDraw;
GCPtr pGC;
int nrects;
xRectangle *pRects;
{ {
int i; int i;
xRectangle *pR = pRects; xRectangle *pR = pRects;

6
mi/mipolyseg.c
View File

@ -67,11 +67,7 @@ SOFTWARE.
_X_EXPORT void _X_EXPORT void
miPolySegment(pDraw, pGC, nseg, pSegs) miPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg, xSegment *pSegs)
DrawablePtr pDraw;
GCPtr pGC;
int nseg;
xSegment *pSegs;
{ {
int i; int i;

29
mi/mipolytext.c
View File

@ -67,12 +67,7 @@ SOFTWARE.
#include "mi.h" #include "mi.h"
_X_EXPORT int _X_EXPORT int
miPolyText8(pDraw, pGC, x, y, count, chars) miPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars)
DrawablePtr pDraw;
GCPtr pGC;
int x, y;
int count;
char *chars;
{ {
unsigned long n, i; unsigned long n, i;
int w; int w;
@ -89,12 +84,7 @@ miPolyText8(pDraw, pGC, x, y, count, chars)
} }
_X_EXPORT int _X_EXPORT int
miPolyText16(pDraw, pGC, x, y, count, chars) miPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, unsigned short *chars)
DrawablePtr pDraw;
GCPtr pGC;
int x, y;
int count;
unsigned short *chars;
{ {
unsigned long n, i; unsigned long n, i;
int w; int w;
@ -112,12 +102,7 @@ miPolyText16(pDraw, pGC, x, y, count, chars)
} }
_X_EXPORT void _X_EXPORT void
miImageText8(pDraw, pGC, x, y, count, chars) miImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars)
DrawablePtr pDraw;
GCPtr pGC;
int x, y;
int count;
char *chars;
{ {
unsigned long n; unsigned long n;
FontPtr font = pGC->font; FontPtr font = pGC->font;
@ -130,12 +115,8 @@ miImageText8(pDraw, pGC, x, y, count, chars)
} }
_X_EXPORT void _X_EXPORT void
miImageText16(pDraw, pGC, x, y, count, chars) miImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
DrawablePtr pDraw; int count, unsigned short *chars)
GCPtr pGC;
int x, y;
int count;
unsigned short *chars;
{ {
unsigned long n; unsigned long n;
FontPtr font = pGC->font; FontPtr font = pGC->font;

21
mi/mipolyutil.c
View File

@ -161,13 +161,8 @@ miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline,
*/ */
Bool Bool
miCreateETandAET(count, pts, ET, AET, pETEs, pSLLBlock) miCreateETandAET(int count, DDXPointPtr pts, EdgeTable *ET, EdgeTableEntry *AET,
int count; EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock)
DDXPointPtr pts;
EdgeTable *ET;
EdgeTableEntry *AET;
EdgeTableEntry *pETEs;
ScanLineListBlock *pSLLBlock;
{ {
DDXPointPtr top, bottom; DDXPointPtr top, bottom;
DDXPointPtr PrevPt, CurrPt; DDXPointPtr PrevPt, CurrPt;
@ -257,8 +252,7 @@ miCreateETandAET(count, pts, ET, AET, pETEs, pSLLBlock)
*/ */
void void
miloadAET(AET, ETEs) miloadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs)
EdgeTableEntry *AET, *ETEs;
{ {
EdgeTableEntry *pPrevAET; EdgeTableEntry *pPrevAET;
EdgeTableEntry *tmp; EdgeTableEntry *tmp;
@ -305,8 +299,7 @@ miloadAET(AET, ETEs)
* *
*/ */
void void
micomputeWAET(AET) micomputeWAET(EdgeTableEntry *AET)
EdgeTableEntry *AET;
{ {
EdgeTableEntry *pWETE; EdgeTableEntry *pWETE;
int inside = 1; int inside = 1;
@ -344,8 +337,7 @@ micomputeWAET(AET)
*/ */
int int
miInsertionSort(AET) miInsertionSort(EdgeTableEntry *AET)
EdgeTableEntry *AET;
{ {
EdgeTableEntry *pETEchase; EdgeTableEntry *pETEchase;
EdgeTableEntry *pETEinsert; EdgeTableEntry *pETEinsert;
@ -381,8 +373,7 @@ miInsertionSort(AET)
* Clean up our act. * Clean up our act.
*/ */
void void
miFreeStorage(pSLLBlock) miFreeStorage(ScanLineListBlock *pSLLBlock)
ScanLineListBlock *pSLLBlock;
{ {
ScanLineListBlock *tmpSLLBlock; ScanLineListBlock *tmpSLLBlock;

7
mi/mipushpxl.c
View File

@ -93,11 +93,8 @@ bitsizeof(int) padding and sacnline unit == bitsizeof(int).)
* in the server, we need to rename one of them * in the server, we need to rename one of them
*/ */
_X_EXPORT void _X_EXPORT void
miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
GCPtr pGC; int dx, int dy, int xOrg, int yOrg)
PixmapPtr pBitMap;
DrawablePtr pDrawable;
int dx, dy, xOrg, yOrg;
{ {
int h, dxDivPPW, ibEnd; int h, dxDivPPW, ibEnd;
MiBits *pwLineStart; MiBits *pwLineStart;

118
mi/miregion.c
View File

@ -237,9 +237,7 @@ InitRegions (void)
*****************************************************************/ *****************************************************************/
_X_EXPORT RegionPtr _X_EXPORT RegionPtr
miRegionCreate(rect, size) miRegionCreate(BoxPtr rect, int size)
BoxPtr rect;
int size;
{ {
RegionPtr pReg; RegionPtr pReg;
@ -253,8 +251,7 @@ miRegionCreate(rect, size)
} }
_X_EXPORT void _X_EXPORT void
miRegionDestroy(pReg) miRegionDestroy(RegionPtr pReg)
RegionPtr pReg;
{ {
pixman_region_fini (pReg); pixman_region_fini (pReg);
if (pReg != &miBrokenRegion) if (pReg != &miBrokenRegion)
@ -262,8 +259,7 @@ miRegionDestroy(pReg)
} }
_X_EXPORT void _X_EXPORT void
miPrintRegion(rgn) miPrintRegion(RegionPtr rgn)
RegionPtr rgn;
{ {
int num, size; int num, size;
int i; int i;
@ -282,17 +278,14 @@ miPrintRegion(rgn)
} }
_X_EXPORT Bool _X_EXPORT Bool
miRegionEqual(reg1, reg2) miRegionEqual(RegionPtr reg1, RegionPtr reg2)
RegionPtr reg1;
RegionPtr reg2;
{ {
return pixman_region_equal (reg1, reg2); return pixman_region_equal (reg1, reg2);
} }
#ifdef DEBUG #ifdef DEBUG
Bool Bool
miValidRegion(reg) miValidRegion(RegionPtr reg)
RegionPtr reg;
{ {
int i, numRects; int i, numRects;
@ -343,10 +336,7 @@ miValidRegion(reg)
*****************************************************************/ *****************************************************************/
_X_EXPORT void _X_EXPORT void
miRegionInit(pReg, rect, size) miRegionInit(RegionPtr pReg, BoxPtr rect, int size)
RegionPtr pReg;
BoxPtr rect;
int size;
{ {
if (rect) if (rect)
pixman_region_init_with_extents (pReg, rect); pixman_region_init_with_extents (pReg, rect);
@ -355,15 +345,13 @@ miRegionInit(pReg, rect, size)
} }
_X_EXPORT void _X_EXPORT void
miRegionUninit(pReg) miRegionUninit(RegionPtr pReg)
RegionPtr pReg;
{ {
pixman_region_fini (pReg); pixman_region_fini (pReg);
} }
Bool Bool
miRegionBreak (pReg) miRegionBreak (RegionPtr pReg)
RegionPtr pReg;
{ {
xfreeData (pReg); xfreeData (pReg);
pReg->extents = miEmptyBox; pReg->extents = miEmptyBox;
@ -372,9 +360,7 @@ miRegionBreak (pReg)
} }
_X_EXPORT Bool _X_EXPORT Bool
miRectAlloc( miRectAlloc(RegionPtr pRgn, int n)
RegionPtr pRgn,
int n)
{ {
RegDataPtr data; RegDataPtr data;
@ -413,9 +399,7 @@ miRectAlloc(
} }
_X_EXPORT Bool _X_EXPORT Bool
miRegionCopy(dst, src) miRegionCopy(RegionPtr dst, RegionPtr src)
RegionPtr dst;
RegionPtr src;
{ {
return pixman_region_copy (dst, src); return pixman_region_copy (dst, src);
} }
@ -908,10 +892,11 @@ miSetExtents (RegionPtr pReg)
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
_X_EXPORT Bool _X_EXPORT Bool
miIntersect(newReg, reg1, reg2) miIntersect(
RegionPtr newReg; /* destination Region */ RegionPtr newReg, /* destination Region */
RegionPtr reg1; RegionPtr reg1,
RegionPtr reg2; /* source regions */ RegionPtr reg2 /* source regions */
)
{ {
return pixman_region_intersect (newReg, reg1, reg2); return pixman_region_intersect (newReg, reg1, reg2);
} }
@ -1010,11 +995,12 @@ miUnionO (
return TRUE; return TRUE;
} }
_X_EXPORT Bool _X_EXPORT Bool
miUnion(newReg, reg1, reg2) miUnion(
RegionPtr newReg; /* destination Region */ RegionPtr newReg, /* destination Region */
RegionPtr reg1; RegionPtr reg1,
RegionPtr reg2; /* source regions */ RegionPtr reg2 /* source regions */
)
{ {
return pixman_region_union (newReg, reg1, reg2); return pixman_region_union (newReg, reg1, reg2);
} }
@ -1041,9 +1027,7 @@ miUnion(newReg, reg1, reg2)
* *
*/ */
_X_EXPORT Bool _X_EXPORT Bool
miRegionAppend(dstrgn, rgn) miRegionAppend(RegionPtr dstrgn, RegionPtr rgn)
RegionPtr dstrgn;
RegionPtr rgn;
{ {
int numRects, dnumRects, size; int numRects, dnumRects, size;
BoxPtr new, old; BoxPtr new, old;
@ -1227,9 +1211,7 @@ QuickSortRects(
*/ */
_X_EXPORT Bool _X_EXPORT Bool
miRegionValidate(badreg, pOverlap) miRegionValidate(RegionPtr badreg, Bool *pOverlap)
RegionPtr badreg;
Bool *pOverlap;
{ {
/* Descriptor for regions under construction in Step 2. */ /* Descriptor for regions under construction in Step 2. */
typedef struct { typedef struct {
@ -1418,10 +1400,7 @@ bail:
} }
_X_EXPORT RegionPtr _X_EXPORT RegionPtr
miRectsToRegion(nrects, prect, ctype) miRectsToRegion(int nrects, xRectangle *prect, int ctype)
int nrects;
xRectangle *prect;
int ctype;
{ {
RegionPtr pRgn; RegionPtr pRgn;
@ -1535,10 +1514,7 @@ miRectsToRegion(nrects, prect, ctype)
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
_X_EXPORT Bool _X_EXPORT Bool
miSubtract(regD, regM, regS) miSubtract(RegionPtr regD, RegionPtr regM, RegionPtr regS)
RegionPtr regD;
RegionPtr regM;
RegionPtr regS;
{ {
return pixman_region_subtract (regD, regM, regS); return pixman_region_subtract (regD, regM, regS);
} }
@ -1563,17 +1539,16 @@ miSubtract(regD, regM, regS)
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
_X_EXPORT Bool _X_EXPORT Bool
miInverse(newReg, reg1, invRect) miInverse(
RegionPtr newReg; /* Destination region */ RegionPtr newReg, /* Destination region */
RegionPtr reg1; /* Region to invert */ RegionPtr reg1, /* Region to invert */
BoxPtr invRect; /* Bounding box for inversion */ BoxPtr invRect /* Bounding box for inversion */
)
{ {
return pixman_region_inverse (newReg, reg1, invRect); return pixman_region_inverse (newReg, reg1, invRect);
} }
_X_EXPORT int _X_EXPORT int
miRectIn(region, prect) miRectIn(RegionPtr region, BoxPtr prect)
RegionPtr region;
BoxPtr prect;
{ {
return pixman_region_contains_rectangle (region, prect); return pixman_region_contains_rectangle (region, prect);
} }
@ -1583,34 +1558,30 @@ miRectIn(region, prect)
*/ */
_X_EXPORT void _X_EXPORT void
miTranslateRegion(pReg, x, y) miTranslateRegion(RegionPtr pReg, int x, int y)
RegionPtr pReg;
int x;
int y;
{ {
pixman_region_translate (pReg, x, y); pixman_region_translate (pReg, x, y);
} }
_X_EXPORT void _X_EXPORT void
miRegionReset(pReg, pBox) miRegionReset(RegionPtr pReg, BoxPtr pBox)
RegionPtr pReg;
BoxPtr pBox;
{ {
pixman_region_reset (pReg, pBox); pixman_region_reset (pReg, pBox);
} }
_X_EXPORT Bool _X_EXPORT Bool
miPointInRegion(pReg, x, y, box) miPointInRegion(
RegionPtr pReg; RegionPtr pReg,
int x, y; int x,
BoxPtr box; /* "return" value */ int y,
BoxPtr box /* "return" value */
)
{ {
return pixman_region_contains_point (pReg, x, y, box); return pixman_region_contains_point (pReg, x, y, box);
} }
_X_EXPORT Bool _X_EXPORT Bool
miRegionNotEmpty(pReg) miRegionNotEmpty(RegionPtr pReg)
RegionPtr pReg;
{ {
return pixman_region_not_empty (pReg); return pixman_region_not_empty (pReg);
} }
@ -1623,8 +1594,7 @@ miRegionBroken(RegionPtr pReg)
} }
_X_EXPORT void _X_EXPORT void
miRegionEmpty(pReg) miRegionEmpty(RegionPtr pReg)
RegionPtr pReg;
{ {
good(pReg); good(pReg);
xfreeData(pReg); xfreeData(pReg);
@ -1634,8 +1604,7 @@ miRegionEmpty(pReg)
} }
_X_EXPORT BoxPtr _X_EXPORT BoxPtr
miRegionExtents(pReg) miRegionExtents(RegionPtr pReg)
RegionPtr pReg;
{ {
good(pReg); good(pReg);
return(&pReg->extents); return(&pReg->extents);
@ -1877,8 +1846,7 @@ miClipSpans(
/* find the band in a region with the most rectangles */ /* find the band in a region with the most rectangles */
_X_EXPORT int _X_EXPORT int
miFindMaxBand(prgn) miFindMaxBand(RegionPtr prgn)
RegionPtr prgn;
{ {
int nbox; int nbox;
BoxPtr pbox; BoxPtr pbox;

55
mi/miscrinit.c
View File

@ -61,15 +61,8 @@ typedef struct
/* this plugs into pScreen->ModifyPixmapHeader */ /* this plugs into pScreen->ModifyPixmapHeader */
_X_EXPORT Bool _X_EXPORT Bool
miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind, miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
pPixData) int bitsPerPixel, int devKind, pointer pPixData)
PixmapPtr pPixmap;
int width;
int height;
int depth;
int bitsPerPixel;
int devKind;
pointer pPixData;
{ {
if (!pPixmap) if (!pPixmap)
return FALSE; return FALSE;
@ -140,8 +133,7 @@ miCloseScreen (int iScreen, ScreenPtr pScreen)
* screen pixmap here. * screen pixmap here.
*/ */
_X_EXPORT Bool _X_EXPORT Bool
miCreateScreenResources(pScreen) miCreateScreenResources(ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
miScreenInitParmsPtr pScrInitParms; miScreenInitParmsPtr pScrInitParms;
pointer value; pointer value;
@ -180,10 +172,7 @@ miCreateScreenResources(pScreen)
} }
Bool Bool
miScreenDevPrivateInit(pScreen, width, pbits) miScreenDevPrivateInit(ScreenPtr pScreen, int width, pointer pbits)
ScreenPtr pScreen;
int width;
pointer pbits;
{ {
miScreenInitParmsPtr pScrInitParms; miScreenInitParmsPtr pScrInitParms;
@ -201,19 +190,19 @@ miScreenDevPrivateInit(pScreen, width, pbits)
} }
_X_EXPORT Bool _X_EXPORT Bool
miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, miScreenInit(
rootDepth, numDepths, depths, rootVisual, numVisuals, visuals) ScreenPtr pScreen,
ScreenPtr pScreen; pointer pbits, /* pointer to screen bits */
pointer pbits; /* pointer to screen bits */ int xsize, int ysize, /* in pixels */
int xsize, ysize; /* in pixels */ int dpix, int dpiy, /* dots per inch */
int dpix, dpiy; /* dots per inch */ int width, /* pixel width of frame buffer */
int width; /* pixel width of frame buffer */ int rootDepth, /* depth of root window */
int rootDepth; /* depth of root window */ int numDepths, /* number of depths supported */
int numDepths; /* number of depths supported */ DepthRec *depths, /* supported depths */
DepthRec *depths; /* supported depths */ VisualID rootVisual, /* root visual */
VisualID rootVisual; /* root visual */ int numVisuals, /* number of visuals supported */
int numVisuals; /* number of visuals supported */ VisualRec *visuals /* supported visuals */
VisualRec *visuals; /* supported visuals */ )
{ {
pScreen->width = xsize; pScreen->width = xsize;
pScreen->height = ysize; pScreen->height = ysize;
@ -304,23 +293,19 @@ miAllocateGCPrivateIndex()
_X_EXPORT DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKey; _X_EXPORT DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKey;
_X_EXPORT void _X_EXPORT void
miSetZeroLineBias(pScreen, bias) miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias)
ScreenPtr pScreen;
unsigned int bias;
{ {
dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias); dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias);
} }
_X_EXPORT PixmapPtr _X_EXPORT PixmapPtr
miGetScreenPixmap(pScreen) miGetScreenPixmap(ScreenPtr pScreen)
ScreenPtr pScreen;
{ {
return (PixmapPtr)(pScreen->devPrivate); return (PixmapPtr)(pScreen->devPrivate);
} }
_X_EXPORT void _X_EXPORT void
miSetScreenPixmap(pPix) miSetScreenPixmap(PixmapPtr pPix)
PixmapPtr pPix;
{ {
if (pPix) if (pPix)
pPix->drawable.pScreen->devPrivate = (pointer)pPix; pPix->drawable.pScreen->devPrivate = (pointer)pPix;

15
mi/mispans.c
View File

@ -180,11 +180,8 @@ static void miSubtractSpans (SpanGroup *spanGroup, Spans *sub)
} }
} }
} }
void miAppendSpans(spanGroup, otherGroup, spans) void miAppendSpans(SpanGroup *spanGroup, SpanGroup *otherGroup, Spans *spans)
SpanGroup *spanGroup;
SpanGroup *otherGroup;
Spans *spans;
{ {
int ymin, ymax; int ymin, ymax;
int spansCount; int spansCount;
@ -217,8 +214,7 @@ void miAppendSpans(spanGroup, otherGroup, spans)
} }
} /* AppendSpans */ } /* AppendSpans */
void miFreeSpanGroup(spanGroup) void miFreeSpanGroup(SpanGroup *spanGroup)
SpanGroup *spanGroup;
{ {
if (spanGroup->group != NULL) xfree(spanGroup->group); if (spanGroup->group != NULL) xfree(spanGroup->group);
} }
@ -376,10 +372,7 @@ miDisposeSpanGroup (SpanGroup *spanGroup)
} }
} }
void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) void miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup *spanGroup)
DrawablePtr pDraw;
GCPtr pGC;
SpanGroup *spanGroup;
{ {
int i; int i;
Spans *spans; Spans *spans;

98
mi/misprite.c
View File

@ -182,10 +182,9 @@ miSpriteReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
*/ */
Bool Bool
miSpriteInitialize (pScreen, cursorFuncs, screenFuncs) miSpriteInitialize (ScreenPtr pScreen,
ScreenPtr pScreen; miSpriteCursorFuncPtr cursorFuncs,
miSpriteCursorFuncPtr cursorFuncs; miPointerScreenFuncPtr screenFuncs)
miPointerScreenFuncPtr screenFuncs;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
VisualPtr pVisual; VisualPtr pVisual;
@ -266,9 +265,7 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
*/ */
static Bool static Bool
miSpriteCloseScreen (i, pScreen) miSpriteCloseScreen (int i, ScreenPtr pScreen)
int i;
ScreenPtr pScreen;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
DeviceIntPtr pDev; DeviceIntPtr pDev;
@ -291,12 +288,9 @@ miSpriteCloseScreen (i, pScreen)
} }
static void static void
miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) miSpriteGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h,
DrawablePtr pDrawable; unsigned int format, unsigned long planemask,
int sx, sy, w, h; char *pdstLine)
unsigned int format;
unsigned long planemask;
char *pdstLine;
{ {
ScreenPtr pScreen = pDrawable->pScreen; ScreenPtr pScreen = pDrawable->pScreen;
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
@ -331,13 +325,8 @@ miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine)
} }
static void static void
miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) miSpriteGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
DrawablePtr pDrawable; int *pwidth, int nspans, char *pdstStart)
int wMax;
DDXPointPtr ppt;
int *pwidth;
int nspans;
char *pdstStart;
{ {
ScreenPtr pScreen = pDrawable->pScreen; ScreenPtr pScreen = pDrawable->pScreen;
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
@ -390,9 +379,8 @@ miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart)
} }
static void static void
miSpriteSourceValidate (pDrawable, x, y, width, height) miSpriteSourceValidate (DrawablePtr pDrawable, int x, int y, int width,
DrawablePtr pDrawable; int height)
int x, y, width, height;
{ {
ScreenPtr pScreen = pDrawable->pScreen; ScreenPtr pScreen = pDrawable->pScreen;
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
@ -461,11 +449,8 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
} }
static void static void
miSpriteBlockHandler (i, blockData, pTimeout, pReadmask) miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout,
int i; pointer pReadmask)
pointer blockData;
pointer pTimeout;
pointer pReadmask;
{ {
ScreenPtr pScreen = screenInfo.screens[i]; ScreenPtr pScreen = screenInfo.screens[i];
miSpriteScreenPtr pPriv; miSpriteScreenPtr pPriv;
@ -511,8 +496,7 @@ miSpriteBlockHandler (i, blockData, pTimeout, pReadmask)
} }
static void static void
miSpriteInstallColormap (pMap) miSpriteInstallColormap (ColormapPtr pMap)
ColormapPtr pMap;
{ {
ScreenPtr pScreen = pMap->pScreen; ScreenPtr pScreen = pMap->pScreen;
miSpriteScreenPtr pPriv; miSpriteScreenPtr pPriv;
@ -546,10 +530,7 @@ miSpriteInstallColormap (pMap)
} }
static void static void
miSpriteStoreColors (pMap, ndef, pdef) miSpriteStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef)
ColormapPtr pMap;
int ndef;
xColorItem *pdef;
{ {
ScreenPtr pScreen = pMap->pScreen; ScreenPtr pScreen = pMap->pScreen;
miSpriteScreenPtr pPriv; miSpriteScreenPtr pPriv;
@ -676,10 +657,7 @@ miSpriteFindColors (miCursorInfoPtr pDevCursor, ScreenPtr pScreen)
#define SPRITE_PAD 8 #define SPRITE_PAD 8
static Bool static Bool
miSpriteRealizeCursor (pDev, pScreen, pCursor) miSpriteRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
@ -700,10 +678,7 @@ miSpriteRealizeCursor (pDev, pScreen, pCursor)
} }
static Bool static Bool
miSpriteUnrealizeCursor (pDev, pScreen, pCursor) miSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
DeviceIntPtr pDev;
ScreenPtr pScreen;
CursorPtr pCursor;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
@ -713,12 +688,8 @@ miSpriteUnrealizeCursor (pDev, pScreen, pCursor)
} }
static void static void
miSpriteSetCursor (pDev, pScreen, pCursor, x, y) miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
DeviceIntPtr pDev; CursorPtr pCursor, int x, int y)
ScreenPtr pScreen;
CursorPtr pCursor;
int x;
int y;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
@ -837,10 +808,7 @@ miSpriteSetCursor (pDev, pScreen, pCursor, x, y)
} }
static void static void
miSpriteMoveCursor (pDev, pScreen, x, y) miSpriteMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
DeviceIntPtr pDev;
ScreenPtr pScreen;
int x, y;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
CursorPtr pCursor; CursorPtr pCursor;
@ -859,9 +827,7 @@ miSpriteMoveCursor (pDev, pScreen, x, y)
static Bool static Bool
miSpriteDeviceCursorInitialize(pDev, pScreen) miSpriteDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
@ -895,9 +861,7 @@ miSpriteDeviceCursorInitialize(pDev, pScreen)
} }
static void static void
miSpriteDeviceCursorCleanup(pDev, pScreen) miSpriteDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
if (DevHasCursor(pDev)) if (DevHasCursor(pDev))
{ {
@ -914,9 +878,7 @@ miSpriteDeviceCursorCleanup(pDev, pScreen)
*/ */
static void static void
miSpriteRemoveCursor (pDev, pScreen) miSpriteRemoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
@ -955,10 +917,8 @@ miSpriteRemoveCursor (pDev, pScreen)
* before waiting for something to do. * before waiting for something to do.
*/ */
static void static void
miSpriteSaveUnderCursor(pDev, pScreen) miSpriteSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
int x, y; int x, y;
@ -1002,9 +962,7 @@ miSpriteSaveUnderCursor(pDev, pScreen)
*/ */
static void static void
miSpriteRestoreCursor (pDev, pScreen) miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
int x, y; int x, y;
@ -1048,9 +1006,7 @@ miSpriteRestoreCursor (pDev, pScreen)
*/ */
static void static void
miSpriteComputeSaved (pDev, pScreen) miSpriteComputeSaved (DeviceIntPtr pDev, ScreenPtr pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
int x, y, w, h; int x, y, w, h;

16
mi/mivaltree.c
View File

@ -108,11 +108,8 @@ Equipment Corporation.
* Compute the visibility of a shaped window * Compute the visibility of a shaped window
*/ */
_X_EXPORT int _X_EXPORT int
miShapedWindowIn (pScreen, universe, bounding, rect, x, y) miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding,
ScreenPtr pScreen; BoxPtr rect, int x, int y)
RegionPtr universe, bounding;
BoxPtr rect;
int x, y;
{ {
BoxRec box; BoxRec box;
BoxPtr boundBox; BoxPtr boundBox;
@ -597,11 +594,12 @@ miTreeObscured(
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
int int
miValidateTree (pParent, pChild, kind) miValidateTree (
WindowPtr pParent; /* Parent to validate */ WindowPtr pParent, /* Parent to validate */
WindowPtr pChild; /* First child of pParent that was WindowPtr pChild, /* First child of pParent that was
* affected */ * affected */
VTKind kind; /* What kind of configuration caused call */ VTKind kind /* What kind of configuration caused call */
)
{ {
RegionRec totalClip; /* Total clipping region available to RegionRec totalClip; /* Total clipping region available to
* the marked children. pParent's clipList * the marked children. pParent's clipList

68
mi/miwideline.c
View File

@ -252,13 +252,16 @@ miFillRectPolyHelper (
} }
_X_EXPORT /* static */ int _X_EXPORT /* static */ int
miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge) miPolyBuildEdge (
double x0, y0; double x0,
double k; /* x0 * dy - y0 * dx */ double y0,
int dx, dy; double k, /* x0 * dy - y0 * dx */
int xi, yi; int dx,
int left; int dy,
PolyEdgePtr edge; int xi,
int yi,
int left,
PolyEdgePtr edge)
{ {
int x, y, e; int x, y, e;
int xady; int xady;
@ -311,14 +314,17 @@ miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge)
#define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr)))
_X_EXPORT /* static */ int _X_EXPORT /* static */ int
miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright, h) miPolyBuildPoly (
PolyVertexPtr vertices; PolyVertexPtr vertices,
PolySlopePtr slopes; PolySlopePtr slopes,
int count; int count,
int xi, yi; int xi,
PolyEdgePtr left, right; int yi,
int *pnleft, *pnright; PolyEdgePtr left,
int *h; PolyEdgePtr right,
int *pnleft,
int *pnright,
int *h)
{ {
int top, bottom; int top, bottom;
double miny, maxy; double miny, maxy;
@ -910,11 +916,9 @@ miRoundJoinFace (LineFacePtr face, PolyEdgePtr edge, Bool *leftEdge)
} }
_X_EXPORT void _X_EXPORT void
miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2) miRoundJoinClip (LineFacePtr pLeft, LineFacePtr pRight,
LineFacePtr pLeft, pRight; PolyEdgePtr edge1, PolyEdgePtr edge2,
PolyEdgePtr edge1, edge2; int *y1, int *y2, Bool *left1, Bool *left2)
int *y1, *y2;
Bool *left1, *left2;
{ {
double denom; double denom;
@ -935,11 +939,7 @@ miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2)
} }
_X_EXPORT int _X_EXPORT int
miRoundCapClip (face, isInt, edge, leftEdge) miRoundCapClip (LineFacePtr face, Bool isInt, PolyEdgePtr edge, Bool *leftEdge)
LineFacePtr face;
Bool isInt;
PolyEdgePtr edge;
Bool *leftEdge;
{ {
int y; int y;
int dx, dy; int dx, dy;
@ -1525,14 +1525,10 @@ miCleanupSpanData (DrawablePtr pDrawable, GCPtr pGC, SpanDataPtr spanData)
} }
_X_EXPORT void _X_EXPORT void
miWideLine (pDrawable, pGC, mode, npt, pPts) miWideLine (DrawablePtr pDrawable, GCPtr pGC,
DrawablePtr pDrawable; int mode, int npt, DDXPointPtr pPts)
GCPtr pGC;
int mode;
int npt;
DDXPointPtr pPts;
{ {
int x1, y1, x2, y2; int x1, y1, x2, y2;
SpanDataRec spanDataRec; SpanDataRec spanDataRec;
SpanDataPtr spanData; SpanDataPtr spanData;
long pixel; long pixel;
@ -2023,12 +2019,8 @@ miWideDashSegment (
} }
_X_EXPORT void _X_EXPORT void
miWideDash (pDrawable, pGC, mode, npt, pPts) miWideDash (DrawablePtr pDrawable, GCPtr pGC,
DrawablePtr pDrawable; int mode, int npt, DDXPointPtr pPts)
GCPtr pGC;
int mode;
int npt;
DDXPointPtr pPts;
{ {
int x1, y1, x2, y2; int x1, y1, x2, y2;
unsigned long pixel; unsigned long pixel;

62
mi/miwindow.c
View File

@ -57,12 +57,10 @@ SOFTWARE.
#include "pixmapstr.h" #include "pixmapstr.h"
#include "mivalidate.h" #include "mivalidate.h"
_X_EXPORT void _X_EXPORT void
miClearToBackground(pWin, x, y, w, h, generateExposures) miClearToBackground(WindowPtr pWin,
WindowPtr pWin; int x, int y, int w, int h,
int x,y; Bool generateExposures)
int w,h;
Bool generateExposures;
{ {
BoxRec box; BoxRec box;
RegionRec reg; RegionRec reg;
@ -255,10 +253,11 @@ miCheckSubSaveUnder(
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
Bool Bool
miChangeSaveUnder(pWin, first) miChangeSaveUnder(
WindowPtr pWin; WindowPtr pWin,
WindowPtr first; /* First window to check. WindowPtr first /* First window to check.
* Used when pWin was restacked */ * Used when pWin was restacked */
)
{ {
RegionRec rgn; /* Area obscured by saveUnder windows */ RegionRec rgn; /* Area obscured by saveUnder windows */
ScreenPtr pScreen; ScreenPtr pScreen;
@ -293,9 +292,7 @@ miChangeSaveUnder(pWin, first)
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
void void
miPostChangeSaveUnder(pWin, pFirst) miPostChangeSaveUnder(WindowPtr pWin, WindowPtr pFirst)
WindowPtr pWin;
WindowPtr pFirst;
{ {
WindowPtr pParent, pChild; WindowPtr pParent, pChild;
ChangeWindowAttributesProcPtr ChangeWindowAttributes; ChangeWindowAttributesProcPtr ChangeWindowAttributes;
@ -329,8 +326,7 @@ miPostChangeSaveUnder(pWin, pFirst)
} }
void void
miMarkWindow(pWin) miMarkWindow(WindowPtr pWin)
WindowPtr pWin;
{ {
ValidatePtr val; ValidatePtr val;
@ -345,10 +341,7 @@ miMarkWindow(pWin)
} }
Bool Bool
miMarkOverlappedWindows(pWin, pFirst, ppLayerWin) miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, WindowPtr *ppLayerWin)
WindowPtr pWin;
WindowPtr pFirst;
WindowPtr *ppLayerWin;
{ {
BoxPtr box; BoxPtr box;
WindowPtr pChild, pLast; WindowPtr pChild, pLast;
@ -434,8 +427,7 @@ miMarkOverlappedWindows(pWin, pFirst, ppLayerWin)
* and then send any regions still exposed to the client * and then send any regions still exposed to the client
*****/ *****/
_X_EXPORT void _X_EXPORT void
miHandleValidateExposures(pWin) miHandleValidateExposures(WindowPtr pWin)
WindowPtr pWin;
{ {
WindowPtr pChild; WindowPtr pChild;
ValidatePtr val; ValidatePtr val;
@ -472,11 +464,7 @@ miHandleValidateExposures(pWin)
} }
void void
miMoveWindow(pWin, x, y, pNextSib, kind) miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind)
WindowPtr pWin;
int x,y;
WindowPtr pNextSib;
VTKind kind;
{ {
WindowPtr pParent; WindowPtr pParent;
Bool WasViewable = (Bool)(pWin->viewable); Bool WasViewable = (Bool)(pWin->viewable);
@ -589,11 +577,10 @@ miRecomputeExposures (
} }
void void
miSlideAndSizeWindow(pWin, x, y, w, h, pSib) miSlideAndSizeWindow(WindowPtr pWin,
WindowPtr pWin; int x, int y,
int x,y; unsigned int w, unsigned int h,
unsigned int w, h; WindowPtr pSib)
WindowPtr pSib;
{ {
WindowPtr pParent; WindowPtr pParent;
Bool WasViewable = (Bool)(pWin->viewable); Bool WasViewable = (Bool)(pWin->viewable);
@ -917,8 +904,7 @@ miSlideAndSizeWindow(pWin, x, y, w, h, pSib)
} }
WindowPtr WindowPtr
miGetLayerWindow(pWin) miGetLayerWindow(WindowPtr pWin)
WindowPtr pWin;
{ {
return pWin->firstChild; return pWin->firstChild;
} }
@ -932,8 +918,7 @@ miGetLayerWindow(pWin)
*/ */
_X_EXPORT void _X_EXPORT void
miSetShape(pWin) miSetShape(WindowPtr pWin)
WindowPtr pWin;
{ {
Bool WasViewable = (Bool)(pWin->viewable); Bool WasViewable = (Bool)(pWin->viewable);
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -1003,9 +988,7 @@ miSetShape(pWin)
/* Keeps the same inside(!) origin */ /* Keeps the same inside(!) origin */
_X_EXPORT void _X_EXPORT void
miChangeBorderWidth(pWin, width) miChangeBorderWidth(WindowPtr pWin, unsigned int width)
WindowPtr pWin;
unsigned int width;
{ {
int oldwidth; int oldwidth;
Bool anyMarked = FALSE; Bool anyMarked = FALSE;
@ -1072,10 +1055,7 @@ miChangeBorderWidth(pWin, width)
} }
void void
miMarkUnrealizedWindow(pChild, pWin, fromConfigure) miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure)
WindowPtr pChild;
WindowPtr pWin;
Bool fromConfigure;
{ {
if ((pChild != pWin) || fromConfigure) if ((pChild != pWin) || fromConfigure)
{ {

11
mi/mizerarc.c
View File

@ -96,10 +96,7 @@ static miZeroArcPtRec oob = {65536, 65536, 0};
*/ */
_X_EXPORT Bool _X_EXPORT Bool
miZeroArcSetup(arc, info, ok360) miZeroArcSetup(xArc *arc, miZeroArcRec *info, Bool ok360)
xArc *arc;
miZeroArcRec *info;
Bool ok360;
{ {
int l; int l;
int angle1, angle2; int angle1, angle2;
@ -706,11 +703,7 @@ miZeroArcDashPts(
} }
_X_EXPORT void _X_EXPORT void
miZeroPolyArc(pDraw, pGC, narcs, parcs) miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
DrawablePtr pDraw;
GCPtr pGC;
int narcs;
xArc *parcs;
{ {
int maxPts = 0; int maxPts = 0;
int n, maxw = 0; int n, maxw = 0;

17
mi/mizerclip.c
View File

@ -405,17 +405,12 @@ the numerator is therefore (2^32 - 1), which does not overflow an unsigned
* *
*/ */
_X_EXPORT int _X_EXPORT int
miZeroClipLine(xmin, ymin, xmax, ymax, miZeroClipLine(int xmin, int ymin, int xmax, int ymax,
new_x1, new_y1, new_x2, new_y2, int *new_x1, int *new_y1, int *new_x2, int *new_y2,
adx, ady, unsigned int adx, unsigned int ady,
pt1_clipped, pt2_clipped, octant, bias, oc1, oc2) int *pt1_clipped, int *pt2_clipped,
int xmin, ymin, xmax, ymax; int octant, unsigned int bias,
int *new_x1, *new_y1, *new_x2, *new_y2; int oc1, int oc2)
int *pt1_clipped, *pt2_clipped;
unsigned int adx, ady;
int octant;
unsigned int bias;
int oc1, oc2;
{ {
int swapped = 0; int swapped = 0;
int clipDone = 0; int clipDone = 0;

25
mi/mizerline.c
View File

@ -98,12 +98,12 @@ SOFTWARE.
} }
_X_EXPORT void _X_EXPORT void
miZeroLine(pDraw, pGC, mode, npt, pptInit) miZeroLine(
DrawablePtr pDraw; DrawablePtr pDraw,
GCPtr pGC; GCPtr pGC,
int mode; /* Origin or Previous */ int mode, /* Origin or Previous */
int npt; /* number of points */ int npt, /* number of points */
DDXPointPtr pptInit; DDXPointPtr pptInit)
{ {
int Nspans, current_y = 0; int Nspans, current_y = 0;
DDXPointPtr ppt; DDXPointPtr ppt;
@ -364,12 +364,13 @@ miZeroLine(pDraw, pGC, mode, npt, pptInit)
} }
_X_EXPORT void _X_EXPORT void
miZeroDashLine(dst, pgc, mode, nptInit, pptInit) miZeroDashLine(
DrawablePtr dst; DrawablePtr dst,
GCPtr pgc; GCPtr pgc,
int mode; int mode,
int nptInit; /* number of points in polyline */ int nptInit, /* number of points in polyline */
DDXPointRec *pptInit; /* points in the polyline */ DDXPointRec *pptInit /* points in the polyline */
)
{ {
/* XXX kludge until real zero-width dash code is written */ /* XXX kludge until real zero-width dash code is written */
pgc->lineWidth = 1; pgc->lineWidth = 1;