diff --git a/mi/mibstore.c b/mi/mibstore.c index 70839ce..60c97c9 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -411,9 +411,7 @@ miInitializeBackingStore (pScreen) */ static Bool -miBSCloseScreen (i, pScreen) - int i; - ScreenPtr pScreen; +miBSCloseScreen (int i, ScreenPtr pScreen) { miBSScreenPtr pScreenPriv; @@ -435,12 +433,8 @@ static void miBSFillVirtualBits(DrawablePtr pDrawable, GCPtr pGC, PixUnion pixunion, unsigned long planemask); static void -miBSGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) - DrawablePtr pDrawable; - int sx, sy, w, h; - unsigned int format; - unsigned long planemask; - char *pdstLine; +miBSGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h, + unsigned int format, unsigned long planemask, char *pdstLine) { ScreenPtr pScreen = pDrawable->pScreen; BoxRec bounds; @@ -614,13 +608,8 @@ punt: ; } static void -miBSGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) - DrawablePtr pDrawable; - int wMax; - DDXPointPtr ppt; - int *pwidth; - int nspans; - char *pdstStart; +miBSGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, + int nspans, char *pdstStart) { ScreenPtr pScreen = pDrawable->pScreen; BoxRec bounds; @@ -715,9 +704,7 @@ miBSGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) } static Bool -miBSChangeWindowAttributes (pWin, mask) - WindowPtr pWin; - unsigned long mask; +miBSChangeWindowAttributes (WindowPtr pWin, unsigned long mask) { ScreenPtr pScreen; Bool ret; @@ -747,8 +734,7 @@ miBSChangeWindowAttributes (pWin, mask) */ static Bool -miBSCreateGC (pGC) - GCPtr pGC; +miBSCreateGC (GCPtr pGC) { ScreenPtr pScreen = pGC->pScreen; Bool ret; @@ -767,8 +753,7 @@ miBSCreateGC (pGC) } static Bool -miBSDestroyWindow (pWin) - WindowPtr pWin; +miBSDestroyWindow (WindowPtr pWin) { ScreenPtr pScreen = pWin->drawable.pScreen; Bool ret; @@ -790,10 +775,8 @@ miBSDestroyWindow (pWin) */ static void -miBSCheapValidateGC (pGC, stateChanges, pDrawable) - GCPtr pGC; - unsigned long stateChanges; - DrawablePtr pDrawable; +miBSCheapValidateGC (GCPtr pGC, unsigned long stateChanges, + DrawablePtr pDrawable) { CHEAP_FUNC_PROLOGUE (pGC); @@ -815,9 +798,7 @@ miBSCheapValidateGC (pGC, stateChanges, pDrawable) } static void -miBSCheapChangeGC (pGC, mask) - GCPtr pGC; - unsigned long mask; +miBSCheapChangeGC (GCPtr pGC, unsigned long mask) { CHEAP_FUNC_PROLOGUE (pGC); @@ -827,9 +808,7 @@ miBSCheapChangeGC (pGC, mask) } static void -miBSCheapCopyGC (pGCSrc, mask, pGCDst) - GCPtr pGCSrc, pGCDst; - unsigned long mask; +miBSCheapCopyGC (GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) { CHEAP_FUNC_PROLOGUE (pGCDst); @@ -839,8 +818,7 @@ miBSCheapCopyGC (pGCSrc, mask, pGCDst) } static void -miBSCheapDestroyGC (pGC) - GCPtr pGC; +miBSCheapDestroyGC (GCPtr pGC) { CHEAP_FUNC_PROLOGUE (pGC); @@ -850,11 +828,7 @@ miBSCheapDestroyGC (pGC) } static void -miBSCheapChangeClip (pGC, type, pvalue, nrects) - GCPtr pGC; - int type; - pointer pvalue; - int nrects; +miBSCheapChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects) { CHEAP_FUNC_PROLOGUE (pGC); @@ -864,8 +838,7 @@ miBSCheapChangeClip (pGC, type, pvalue, nrects) } static void -miBSCheapCopyClip(pgcDst, pgcSrc) - GCPtr pgcDst, pgcSrc; +miBSCheapCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { CHEAP_FUNC_PROLOGUE (pgcDst); @@ -875,8 +848,7 @@ miBSCheapCopyClip(pgcDst, pgcSrc) } static void -miBSCheapDestroyClip(pGC) - GCPtr pGC; +miBSCheapDestroyClip(GCPtr pGC) { CHEAP_FUNC_PROLOGUE (pGC); @@ -890,8 +862,7 @@ miBSCheapDestroyClip(pGC) */ static Bool -miBSCreateGCPrivate (pGC) - GCPtr pGC; +miBSCreateGCPrivate (GCPtr pGC) { miBSGCRec *pPriv; @@ -944,13 +915,11 @@ miBSDestroyGCPrivate (GCPtr pGC) *----------------------------------------------------------------------- */ static void -miBSFillSpans(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +miBSFillSpans(DrawablePtr pDrawable, GCPtr pGC, + int nInit, /* number of spans to fill */ + DDXPointPtr pptInit, /* pointer to list of start points */ + int *pwidthInit, /* pointer to list of n widths */ + int fSorted) { DDXPointPtr pptCopy, pptReset; int *pwidthCopy; @@ -1006,14 +975,8 @@ miBSFillSpans(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) *----------------------------------------------------------------------- */ static void -miBSSetSpans(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - char *psrc; - DDXPointPtr ppt; - int *pwidth; - int nspans; - int fSorted; +miBSSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, + int *pwidth, int nspans, int fSorted) { DDXPointPtr pptCopy, pptReset; int *pwidthCopy; @@ -1068,17 +1031,8 @@ miBSSetSpans(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted) *----------------------------------------------------------------------- */ static void -miBSPutImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format, pBits) - DrawablePtr pDrawable; - GCPtr pGC; - int depth; - int x; - int y; - int w; - int h; - int leftPad; - int format; - char *pBits; +miBSPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, + int w, int h, int leftPad, int format, char *pBits) { SETUP_BACKING (pDrawable, pGC); @@ -1478,16 +1432,8 @@ miBSDoCopy( *----------------------------------------------------------------------- */ static RegionPtr -miBSCopyArea (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty) - DrawablePtr pSrc; - DrawablePtr pDst; - GCPtr pGC; - int srcx; - int srcy; - int w; - int h; - int dstx; - int dsty; +miBSCopyArea (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, + int w, int h, int dstx, int dsty) { BoxPtr pExtents; long dx, dy; @@ -1588,17 +1534,8 @@ miBSCopyArea (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty) *----------------------------------------------------------------------- */ static RegionPtr -miBSCopyPlane (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty, plane) - DrawablePtr pSrc; - DrawablePtr pDst; - GC *pGC; - int srcx, - srcy; - int w, - h; - int dstx, - dsty; - unsigned long plane; +miBSCopyPlane (DrawablePtr pSrc, DrawablePtr pDst, GC *pGC, int srcx, int srcy, + int w, int h, int dstx, int dsty, unsigned long plane) { BoxPtr pExtents; long dx, dy; @@ -1703,12 +1640,10 @@ miBSCopyPlane (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty, plane) *----------------------------------------------------------------------- */ static void -miBSPolyPoint (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; - xPoint *pptInit; +miBSPolyPoint (DrawablePtr pDrawable, GCPtr pGC, + int mode, /* Origin or Previous */ + int npt, + xPoint *pptInit) { xPoint *pptCopy; SETUP_BACKING (pDrawable, pGC); @@ -1743,12 +1678,7 @@ miBSPolyPoint (pDrawable, pGC, mode, npt, pptInit) *----------------------------------------------------------------------- */ static void -miBSPolylines (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; - int npt; - DDXPointPtr pptInit; +miBSPolylines (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr pptInit) { DDXPointPtr pptCopy; SETUP_BACKING (pDrawable, pGC); @@ -1782,11 +1712,7 @@ miBSPolylines (pDrawable, pGC, mode, npt, pptInit) *----------------------------------------------------------------------- */ static void -miBSPolySegment(pDrawable, pGC, nseg, pSegs) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - xSegment *pSegs; +miBSPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs) { xSegment *pSegsCopy; @@ -1822,11 +1748,8 @@ miBSPolySegment(pDrawable, pGC, nseg, pSegs) *----------------------------------------------------------------------- */ static void -miBSPolyRectangle(pDrawable, pGC, nrects, pRects) - DrawablePtr pDrawable; - GCPtr pGC; - int nrects; - xRectangle *pRects; +miBSPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nrects, + xRectangle *pRects) { xRectangle *pRectsCopy; SETUP_BACKING (pDrawable, pGC); @@ -1860,11 +1783,7 @@ miBSPolyRectangle(pDrawable, pGC, nrects, pRects) *----------------------------------------------------------------------- */ static void -miBSPolyArc(pDrawable, pGC, narcs, parcs) - DrawablePtr pDrawable; - GCPtr pGC; - int narcs; - xArc *parcs; +miBSPolyArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs) { xArc *pArcsCopy; SETUP_BACKING (pDrawable, pGC); @@ -1899,12 +1818,8 @@ miBSPolyArc(pDrawable, pGC, narcs, parcs) *----------------------------------------------------------------------- */ static void -miBSFillPolygon(pDrawable, pGC, shape, mode, count, pPts) - DrawablePtr pDrawable; - GCPtr pGC; - int shape, mode; - int count; - DDXPointPtr pPts; +miBSFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, + int count, DDXPointPtr pPts) { DDXPointPtr pPtsCopy; SETUP_BACKING (pDrawable, pGC); @@ -1939,11 +1854,9 @@ miBSFillPolygon(pDrawable, pGC, shape, mode, count, pPts) *----------------------------------------------------------------------- */ static void -miBSPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +miBSPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, + int nrectFill, /* number of rectangles to fill */ + xRectangle *prectInit) /* Pointer to first rectangle to fill */ { xRectangle *pRectCopy; SETUP_BACKING (pDrawable, pGC); @@ -1979,11 +1892,7 @@ miBSPolyFillRect(pDrawable, pGC, nrectFill, prectInit) *----------------------------------------------------------------------- */ static void -miBSPolyFillArc(pDrawable, pGC, narcs, parcs) - DrawablePtr pDrawable; - GCPtr pGC; - int narcs; - xArc *parcs; +miBSPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs) { xArc *pArcsCopy; SETUP_BACKING (pDrawable, pGC); @@ -2016,12 +1925,8 @@ miBSPolyFillArc(pDrawable, pGC, narcs, parcs) *----------------------------------------------------------------------- */ static int -miBSPolyText8(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - char *chars; +miBSPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + char *chars) { int result; SETUP_BACKING (pDrawable, pGC); @@ -2049,12 +1954,8 @@ miBSPolyText8(pDrawable, pGC, x, y, count, chars) *----------------------------------------------------------------------- */ static int -miBSPolyText16(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miBSPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { int result; SETUP_BACKING (pDrawable, pGC); @@ -2083,12 +1984,8 @@ miBSPolyText16(pDrawable, pGC, x, y, count, chars) *----------------------------------------------------------------------- */ static void -miBSImageText8(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - char *chars; +miBSImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + char *chars) { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2113,12 +2010,8 @@ miBSImageText8(pDrawable, pGC, x, y, count, chars) *----------------------------------------------------------------------- */ static void -miBSImageText16(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miBSImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2143,13 +2036,10 @@ miBSImageText16(pDrawable, pGC, x, y, count, chars) *----------------------------------------------------------------------- */ static void -miBSImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miBSImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, + CharInfoPtr *ppci, /* array of character info */ + pointer pglyphBase) /* start of array of glyphs */ { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2175,13 +2065,10 @@ miBSImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) *----------------------------------------------------------------------- */ static void -miBSPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miBSPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, + CharInfoPtr *ppci, /* array of character info */ + pointer pglyphBase) /* start of array of glyphs */ { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2206,11 +2093,8 @@ miBSPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) *----------------------------------------------------------------------- */ static void -miBSPushPixels(pGC, pBitMap, pDst, w, h, x, y) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDst; - int w, h, x, y; +miBSPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, + int x, int y) { SETUP_BACKING (pDst, pGC); PROLOGUE(pGC); @@ -2246,13 +2130,8 @@ miBSPushPixels(pGC, pBitMap, pDst, w, h, x, y) *----------------------------------------------------------------------- */ static RegionPtr -miBSClearBackingStore(pWin, x, y, w, h, generateExposures) - WindowPtr pWin; - int x; - int y; - int w; - int h; - Bool generateExposures; +miBSClearBackingStore(WindowPtr pWin, int x, int y, int w, int h, Bool + generateExposures) { RegionPtr pRgn; int i; @@ -2414,9 +2293,7 @@ miBSClearBackingStore(pWin, x, y, w, h, generateExposures) } static void -miBSClearBackingRegion (pWin, pRgn) - WindowPtr pWin; - RegionPtr pRgn; +miBSClearBackingRegion (WindowPtr pWin, RegionPtr pRgn) { BoxPtr pBox; int i; @@ -2440,14 +2317,8 @@ miBSClearBackingRegion (pWin, pRgn) */ static void -miBSFillVirtualBits (pDrawable, pGC, pRgn, x, y, state, pixunion, planeMask) - DrawablePtr pDrawable; - GCPtr pGC; - RegionPtr pRgn; - int x, y; - int state; - PixUnion pixunion; - unsigned long planeMask; +miBSFillVirtualBits (DrawablePtr pDrawable, GCPtr pGC, RegionPtr pRgn, + int x, int y, int state, PixUnion pixunion, unsigned long planeMask) { int i; BITS32 gcmask; @@ -2543,8 +2414,7 @@ miBSFillVirtualBits (pDrawable, pGC, pRgn, x, y, state, pixunion, planeMask) */ static void -miBSAllocate(pWin) - WindowPtr pWin; +miBSAllocate(WindowPtr pWin) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -2644,8 +2514,7 @@ miBSAllocate(pWin) *----------------------------------------------------------------------- */ static void -miBSFree(pWin) - WindowPtr pWin; +miBSFree(WindowPtr pWin) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -2791,10 +2660,7 @@ miResizeBackingStore( *----------------------------------------------------------------------- */ static void -miBSSaveDoomedAreas(pWin, pObscured, dx, dy) - WindowPtr pWin; - RegionPtr pObscured; - int dx, dy; +miBSSaveDoomedAreas(WindowPtr pWin, RegionPtr pObscured, int dx, int dy) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -2898,9 +2764,7 @@ miBSSaveDoomedAreas(pWin, pObscured, dx, dy) *----------------------------------------------------------------------- */ static RegionPtr -miBSRestoreAreas(pWin, prgnExposed) - WindowPtr pWin; - RegionPtr prgnExposed; +miBSRestoreAreas(WindowPtr pWin, RegionPtr prgnExposed) { PixmapPtr pBackingPixmap; miBSWindowPtr pBackingStore; @@ -3089,13 +2953,12 @@ miBSRestoreAreas(pWin, prgnExposed) */ static RegionPtr -miBSTranslateBackingStore(pWin, windx, windy, oldClip, oldx, oldy) - WindowPtr pWin; - int windx; /* bit translation distance in window */ - int windy; - RegionPtr oldClip; /* Region being copied */ - int oldx; /* old window position */ - int oldy; +miBSTranslateBackingStore(WindowPtr pWin, + int windx, /* bit translation distance in window */ + int windy, + RegionPtr oldClip, /* Region being copied */ + int oldx, /* old window position */ + int oldy) { miBSWindowPtr pBackingStore; RegionPtr pSavedRegion; @@ -3270,10 +3133,7 @@ miBSTranslateBackingStore(pWin, windx, windy, oldClip, oldx, oldy) */ static void -miBSDrawGuarantee (pWin, pGC, guarantee) - WindowPtr pWin; - GCPtr pGC; - int guarantee; +miBSDrawGuarantee (WindowPtr pWin, GCPtr pGC, int guarantee) { miBSGCPtr pPriv; @@ -3332,10 +3192,7 @@ miBSDrawGuarantee (pWin, pGC, guarantee) */ static void -miBSValidateGC (pGC, stateChanges, pDrawable) - GCPtr pGC; - unsigned long stateChanges; - DrawablePtr pDrawable; +miBSValidateGC (GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable) { GCPtr pBackingGC; miBSWindowPtr pWindowPriv = NULL; @@ -3547,9 +3404,7 @@ miBSValidateGC (pGC, stateChanges, pDrawable) } static void -miBSChangeGC (pGC, mask) - GCPtr pGC; - unsigned long mask; +miBSChangeGC (GCPtr pGC, unsigned long mask) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3561,9 +3416,7 @@ miBSChangeGC (pGC, mask) } static void -miBSCopyGC (pGCSrc, mask, pGCDst) - GCPtr pGCSrc, pGCDst; - unsigned long mask; +miBSCopyGC (GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) { miBSGCPtr pPriv = (miBSGCPtr) (pGCDst)->devPrivates[miBSGCIndex].ptr; @@ -3575,8 +3428,7 @@ miBSCopyGC (pGCSrc, mask, pGCDst) } static void -miBSDestroyGC (pGC) - GCPtr pGC; +miBSDestroyGC (GCPtr pGC) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3593,11 +3445,7 @@ miBSDestroyGC (pGC) } static void -miBSChangeClip(pGC, type, pvalue, nrects) - GCPtr pGC; - int type; - pointer pvalue; - int nrects; +miBSChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3609,8 +3457,7 @@ miBSChangeClip(pGC, type, pvalue, nrects) } static void -miBSCopyClip(pgcDst, pgcSrc) - GCPtr pgcDst, pgcSrc; +miBSCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { miBSGCPtr pPriv = (miBSGCPtr) (pgcDst)->devPrivates[miBSGCIndex].ptr; @@ -3622,8 +3469,7 @@ miBSCopyClip(pgcDst, pgcSrc) } static void -miBSDestroyClip(pGC) - GCPtr pGC; +miBSDestroyClip(GCPtr pGC) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3635,8 +3481,7 @@ miBSDestroyClip(pGC) } static void -miDestroyBSPixmap (pWin) - WindowPtr pWin; +miDestroyBSPixmap (WindowPtr pWin) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -3656,8 +3501,7 @@ miDestroyBSPixmap (pWin) } static void -miTileVirtualBS (pWin) - WindowPtr pWin; +miTileVirtualBS (WindowPtr pWin) { miBSWindowPtr pBackingStore; @@ -3688,9 +3532,7 @@ static int failedIndex; #endif static void -miCreateBSPixmap (pWin, pExtents) - WindowPtr pWin; - BoxPtr pExtents; +miCreateBSPixmap (WindowPtr pWin, BoxPtr pExtents) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -3802,14 +3644,9 @@ miCreateBSPixmap (pWin, pExtents) *----------------------------------------------------------------------- */ static void -miBSExposeCopy (pSrc, pDst, pGC, prgnExposed, srcx, srcy, dstx, dsty, plane) - WindowPtr pSrc; - DrawablePtr pDst; - GCPtr pGC; - RegionPtr prgnExposed; - int srcx, srcy; - int dstx, dsty; - unsigned long plane; +miBSExposeCopy (WindowPtr pSrc, DrawablePtr pDst, GCPtr pGC, + RegionPtr prgnExposed, + int srcx, int srcy, int dstx, int dsty, unsigned long plane) { RegionRec tempRgn; miBSWindowPtr pBackingStore; diff --git a/mi/midispcur.c b/mi/midispcur.c index de009cb..04ca4af 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -164,9 +164,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; @@ -192,9 +190,7 @@ miDCCloseScreen (index, pScreen) } static Bool -miDCRealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miDCRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { if (pCursor->bits->refcnt <= 1) pCursor->bits->devPriv[pScreen->myNum] = (pointer)NULL; @@ -355,9 +351,7 @@ miDCRealize ( } static Bool -miDCUnrealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { miDCCursorPtr pPriv; @@ -459,11 +453,8 @@ miDCMakeGC( static Bool -miDCPutUpCursor (pScreen, pCursor, x, y, source, mask) - ScreenPtr pScreen; - CursorPtr pCursor; - int x, y; - unsigned long source, mask; +miDCPutUpCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y, + unsigned long source, unsigned long mask) { miDCScreenPtr pScreenPriv; miDCCursorPtr pPriv; @@ -512,9 +503,7 @@ miDCPutUpCursor (pScreen, pCursor, x, y, source, mask) } static Bool -miDCSaveUnderCursor (pScreen, x, y, w, h) - ScreenPtr pScreen; - int x, y, w, h; +miDCSaveUnderCursor (ScreenPtr pScreen, int x, int y, int w, int h) { miDCScreenPtr pScreenPriv; PixmapPtr pSave; @@ -544,9 +533,7 @@ miDCSaveUnderCursor (pScreen, x, y, w, h) } static Bool -miDCRestoreUnderCursor (pScreen, x, y, w, h) - ScreenPtr pScreen; - int x, y, w, h; +miDCRestoreUnderCursor (ScreenPtr pScreen, int x, int y, int w, int h) { miDCScreenPtr pScreenPriv; PixmapPtr pSave; @@ -569,9 +556,7 @@ miDCRestoreUnderCursor (pScreen, x, y, w, h) } static Bool -miDCChangeSave (pScreen, x, y, w, h, dx, dy) - ScreenPtr pScreen; - int x, y, w, h, dx, dy; +miDCChangeSave (ScreenPtr pScreen, int x, int y, int w, int h, int dx, int dy) { miDCScreenPtr pScreenPriv; PixmapPtr pSave; @@ -701,11 +686,8 @@ miDCChangeSave (pScreen, x, y, w, h, dx, dy) } static Bool -miDCMoveCursor (pScreen, pCursor, x, y, w, h, dx, dy, source, mask) - ScreenPtr pScreen; - CursorPtr pCursor; - int x, y, w, h, dx, dy; - unsigned long source, mask; +miDCMoveCursor (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; diff --git a/mi/mipointer.c b/mi/mipointer.c index b86a26a..e305cfc 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -132,9 +132,7 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate) } static Bool -miPointerCloseScreen (index, pScreen) - int index; - ScreenPtr pScreen; +miPointerCloseScreen (int index, ScreenPtr pScreen) { SetupScreen(pScreen); @@ -154,9 +152,7 @@ miPointerCloseScreen (index, pScreen) */ static Bool -miPointerRealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miPointerRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { SetupScreen(pScreen); @@ -164,9 +160,7 @@ miPointerRealizeCursor (pScreen, pCursor) } static Bool -miPointerUnrealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miPointerUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { SetupScreen(pScreen); @@ -174,9 +168,7 @@ miPointerUnrealizeCursor (pScreen, pCursor) } static Bool -miPointerDisplayCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miPointerDisplayCursor (ScreenPtr pScreen, CursorPtr pCursor) { miPointer.pCursor = pCursor; miPointer.pScreen = pScreen; @@ -185,9 +177,7 @@ miPointerDisplayCursor (pScreen, pCursor) } static void -miPointerConstrainCursor (pScreen, pBox) - ScreenPtr pScreen; - BoxPtr pBox; +miPointerConstrainCursor (ScreenPtr pScreen, BoxPtr pBox) { miPointer.limits = *pBox; miPointer.confined = PointerConfinedToScreen(); @@ -195,20 +185,15 @@ miPointerConstrainCursor (pScreen, pBox) /*ARGSUSED*/ static void -miPointerPointerNonInterestBox (pScreen, pBox) - ScreenPtr pScreen; - BoxPtr pBox; +miPointerPointerNonInterestBox (ScreenPtr pScreen, BoxPtr pBox) { /* until DIX uses this, this will remain a stub */ } /*ARGSUSED*/ static void -miPointerCursorLimits(pScreen, pCursor, pHotBox, pTopLeftBox) - ScreenPtr pScreen; - CursorPtr pCursor; - BoxPtr pHotBox; - BoxPtr pTopLeftBox; +miPointerCursorLimits(ScreenPtr pScreen, CursorPtr pCursor, BoxPtr pHotBox, + BoxPtr pTopLeftBox) { *pTopLeftBox = *pHotBox; } @@ -216,10 +201,7 @@ miPointerCursorLimits(pScreen, pCursor, pHotBox, pTopLeftBox) static Bool GenerateEvent; static Bool -miPointerSetCursorPosition(pScreen, x, y, generateEvent) - ScreenPtr pScreen; - int x, y; - Bool generateEvent; +miPointerSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent) { SetupScreen (pScreen); diff --git a/mi/misprite.c b/mi/misprite.c index c0560a4..118080a 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -248,9 +248,7 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs) */ static Bool -miSpriteCloseScreen (i, pScreen) - int i; - ScreenPtr pScreen; +miSpriteCloseScreen (int i, ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; @@ -274,12 +272,8 @@ miSpriteCloseScreen (i, pScreen) } static void -miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) - DrawablePtr pDrawable; - int sx, sy, w, h; - unsigned int format; - unsigned long planemask; - char *pdstLine; +miSpriteGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h, + unsigned int format, unsigned long planemask, char *pdstLine) { ScreenPtr pScreen = pDrawable->pScreen; miSpriteScreenPtr pScreenPriv; @@ -303,13 +297,8 @@ miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) } static void -miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) - DrawablePtr pDrawable; - int wMax; - DDXPointPtr ppt; - int *pwidth; - int nspans; - char *pdstStart; +miSpriteGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, + int nspans, char *pdstStart) { ScreenPtr pScreen = pDrawable->pScreen; miSpriteScreenPtr pScreenPriv; @@ -349,9 +338,7 @@ miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) } static void -miSpriteSourceValidate (pDrawable, x, y, width, height) - DrawablePtr pDrawable; - int x, y, width, height; +miSpriteSourceValidate (DrawablePtr pDrawable, int x, int y, int width, int height) { ScreenPtr pScreen = pDrawable->pScreen; miSpriteScreenPtr pScreenPriv; @@ -398,11 +385,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) } static void -miSpriteBlockHandler (i, blockData, pTimeout, pReadmask) - int i; - pointer blockData; - pointer pTimeout; - pointer pReadmask; +miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout, pointer pReadmask) { ScreenPtr pScreen = screenInfo.screens[i]; miSpriteScreenPtr pPriv; @@ -423,8 +406,7 @@ miSpriteBlockHandler (i, blockData, pTimeout, pReadmask) } static void -miSpriteInstallColormap (pMap) - ColormapPtr pMap; +miSpriteInstallColormap (ColormapPtr pMap) { ScreenPtr pScreen = pMap->pScreen; miSpriteScreenPtr pPriv; @@ -447,10 +429,7 @@ miSpriteInstallColormap (pMap) } static void -miSpriteStoreColors (pMap, ndef, pdef) - ColormapPtr pMap; - int ndef; - xColorItem *pdef; +miSpriteStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef) { ScreenPtr pScreen = pMap->pScreen; miSpriteScreenPtr pPriv; @@ -562,10 +541,7 @@ miSpriteFindColors (ScreenPtr pScreen) */ static void -miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy) - WindowPtr pWin; - RegionPtr pObscured; - int dx, dy; +miSpriteSaveDoomedAreas (WindowPtr pWin, RegionPtr pObscured, int dx, int dy) { ScreenPtr pScreen; miSpriteScreenPtr pScreenPriv; @@ -603,9 +579,7 @@ miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy) #define SPRITE_PAD 8 static Bool -miSpriteRealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miSpriteRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { miSpriteScreenPtr pScreenPriv; @@ -616,9 +590,7 @@ miSpriteRealizeCursor (pScreen, pCursor) } static Bool -miSpriteUnrealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miSpriteUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { miSpriteScreenPtr pScreenPriv; @@ -627,11 +599,7 @@ miSpriteUnrealizeCursor (pScreen, pCursor) } static void -miSpriteSetCursor (pScreen, pCursor, x, y) - ScreenPtr pScreen; - CursorPtr pCursor; - int x; - int y; +miSpriteSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y) { miSpriteScreenPtr pScreenPriv; @@ -729,9 +697,7 @@ miSpriteSetCursor (pScreen, pCursor, x, y) } static void -miSpriteMoveCursor (pScreen, x, y) - ScreenPtr pScreen; - int x, y; +miSpriteMoveCursor (ScreenPtr pScreen, int x, int y) { miSpriteScreenPtr pScreenPriv; @@ -744,8 +710,7 @@ miSpriteMoveCursor (pScreen, x, y) */ static void -miSpriteRemoveCursor (pScreen) - ScreenPtr pScreen; +miSpriteRemoveCursor (ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; @@ -770,8 +735,7 @@ miSpriteRemoveCursor (pScreen) */ static void -miSpriteRestoreCursor (pScreen) - ScreenPtr pScreen; +miSpriteRestoreCursor (ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; int x, y; @@ -806,8 +770,7 @@ miSpriteRestoreCursor (pScreen) */ static void -miSpriteComputeSaved (pScreen) - ScreenPtr pScreen; +miSpriteComputeSaved (ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; int x, y, w, h;