From adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:29:01 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- mfb/mfb.h | 196 ++----------------------------------------------------- mfb/mfbbitblt.c | 43 +++++++++--- mfb/mfbclip.c | 4 +- mfb/mfbfillarc.c | 22 +++---- mfb/mfbgc.c | 60 ++++++++++++++--- mfb/mfbimggblt.c | 6 +- mfb/mfbplygblt.c | 6 +- mfb/mfbtile.c | 9 ++- mfb/mfbwindow.c | 3 +- mfb/mfbzerarc.c | 12 ++-- 10 files changed, 128 insertions(+), 233 deletions(-) (limited to 'mfb') diff --git a/mfb/mfb.h b/mfb/mfb.h index c41a2077f..01e09f195 100644 --- a/mfb/mfb.h +++ b/mfb/mfb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.19 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.22 2003/11/17 22:20:44 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -77,17 +77,14 @@ extern int InverseAlu[]; /* mfbbitblt.c */ extern void mfbDoBitblt( -#if NeedFunctionPrototypes DrawablePtr /*pSrc*/, DrawablePtr /*pDst*/, int /*alu*/, RegionPtr /*prgnDst*/, DDXPointPtr /*pptSrc*/ -#endif ); extern RegionPtr mfbCopyArea( -#if NeedFunctionPrototypes DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pDstDrawable*/, GCPtr/*pGC*/, @@ -97,14 +94,11 @@ extern RegionPtr mfbCopyArea( int /*height*/, int /*dstx*/, int /*dsty*/ -#endif ); extern Bool mfbRegisterCopyPlaneProc( -#if NeedFunctionPrototypes ScreenPtr /*pScreen*/, RegionPtr (* /*proc*/)( -#if NeedNestedPrototypes DrawablePtr /* pSrcDrawable */, DrawablePtr /* pDstDrawable */, GCPtr /* pGC */, @@ -115,13 +109,10 @@ extern Bool mfbRegisterCopyPlaneProc( int /* dstx */, int /* dsty */, unsigned long /* bitPlane */ -#endif ) -#endif ); extern RegionPtr mfbCopyPlane( -#if NeedFunctionPrototypes DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pDstDrawable*/, GCPtr/*pGC*/, @@ -132,67 +123,55 @@ extern RegionPtr mfbCopyPlane( int /*dstx*/, int /*dsty*/, unsigned long /*plane*/ -#endif ); /* mfbbltC.c */ extern void mfbDoBitbltCopy( -#if NeedFunctionPrototypes DrawablePtr /*pSrc*/, DrawablePtr /*pDst*/, int /*alu*/, RegionPtr /*prgnDst*/, DDXPointPtr /*pptSrc*/ -#endif ); /* mfbbltCI.c */ extern void mfbDoBitbltCopyInverted( -#if NeedFunctionPrototypes DrawablePtr /*pSrc*/, DrawablePtr /*pDst*/, int /*alu*/, RegionPtr /*prgnDst*/, DDXPointPtr /*pptSrc*/ -#endif ); /* mfbbltG.c */ extern void mfbDoBitbltGeneral( -#if NeedFunctionPrototypes DrawablePtr /*pSrc*/, DrawablePtr /*pDst*/, int /*alu*/, RegionPtr /*prgnDst*/, DDXPointPtr /*pptSrc*/ -#endif ); /* mfbbltO.c */ extern void mfbDoBitbltOr( -#if NeedFunctionPrototypes DrawablePtr /*pSrc*/, DrawablePtr /*pDst*/, int /*alu*/, RegionPtr /*prgnDst*/, DDXPointPtr /*pptSrc*/ -#endif ); /* mfbbltX.c */ extern void mfbDoBitbltXor( -#if NeedFunctionPrototypes DrawablePtr /*pSrc*/, DrawablePtr /*pDst*/, int /*alu*/, RegionPtr /*prgnDst*/, DDXPointPtr /*pptSrc*/ -#endif ); /* mfbbres.c */ extern void mfbBresS( -#if NeedFunctionPrototypes int /*rop*/, PixelType * /*addrl*/, int /*nlwidth*/, @@ -205,12 +184,10 @@ extern void mfbBresS( int /*e1*/, int /*e2*/, int /*len*/ -#endif ); /* mfbbresd.c */ extern void mfbBresD( -#if NeedFunctionPrototypes int /*fgrop*/, int /*bgrop*/, int * /*pdashIndex*/, @@ -229,280 +206,220 @@ extern void mfbBresD( int /*e1*/, int /*e2*/, int /*len*/ -#endif ); /* mfbbstore.c */ extern void mfbSaveAreas( -#if NeedFunctionPrototypes PixmapPtr /*pPixmap*/, RegionPtr /*prgnSave*/, int /*xorg*/, int /*yorg*/, WindowPtr /*pWin*/ -#endif ); extern void mfbRestoreAreas( -#if NeedFunctionPrototypes PixmapPtr /*pPixmap*/, RegionPtr /*prgnRestore*/, int /*xorg*/, int /*yorg*/, WindowPtr /*pWin*/ -#endif ); /* mfbclip.c */ extern RegionPtr mfbPixmapToRegion( -#if NeedFunctionPrototypes PixmapPtr /*pPix*/ -#endif ); /* mfbcmap.c */ extern int mfbListInstalledColormaps( -#if NeedFunctionPrototypes ScreenPtr /*pScreen*/, Colormap * /*pmaps*/ -#endif ); extern void mfbInstallColormap( -#if NeedFunctionPrototypes ColormapPtr /*pmap*/ -#endif ); extern void mfbUninstallColormap( -#if NeedFunctionPrototypes ColormapPtr /*pmap*/ -#endif ); extern void mfbResolveColor( -#if NeedFunctionPrototypes unsigned short * /*pred*/, unsigned short * /*pgreen*/, unsigned short * /*pblue*/, VisualPtr /*pVisual*/ -#endif ); extern Bool mfbCreateColormap( -#if NeedFunctionPrototypes ColormapPtr /*pMap*/ -#endif ); extern void mfbDestroyColormap( -#if NeedFunctionPrototypes ColormapPtr /*pMap*/ -#endif ); extern Bool mfbCreateDefColormap( -#if NeedFunctionPrototypes ScreenPtr /*pScreen*/ -#endif ); /* mfbfillarc.c */ extern void mfbPolyFillArcSolid( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*narcs*/, xArc * /*parcs*/ -#endif ); /* mfbfillrct.c */ extern void mfbPolyFillRect( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*nrectFill*/, xRectangle * /*prectInit*/ -#endif ); /* mfbfillsp.c */ extern void mfbBlackSolidFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbWhiteSolidFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbInvertSolidFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbWhiteStippleFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbBlackStippleFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbInvertStippleFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbTileFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbUnnaturalTileFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); extern void mfbUnnaturalStippleFS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*nInit*/, DDXPointPtr /*pptInit*/, int * /*pwidthInit*/, int /*fSorted*/ -#endif ); /* mfbfont.c */ extern Bool mfbRealizeFont( -#if NeedFunctionPrototypes ScreenPtr /*pscr*/, FontPtr /*pFont*/ -#endif ); extern Bool mfbUnrealizeFont( -#if NeedFunctionPrototypes ScreenPtr /*pscr*/, FontPtr /*pFont*/ -#endif ); /* mfbgc.c */ extern Bool mfbCreateGC( -#if NeedFunctionPrototypes GCPtr /*pGC*/ -#endif ); extern void mfbValidateGC( -#if NeedFunctionPrototypes GCPtr /*pGC*/, unsigned long /*changes*/, DrawablePtr /*pDrawable*/ -#endif ); extern int mfbReduceRop( -#if NeedFunctionPrototypes int /*alu*/, Pixel /*src*/ -#endif ); /* mfbgetsp.c */ extern void mfbGetSpans( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, int /*wMax*/, DDXPointPtr /*ppt*/, int * /*pwidth*/, int /*nspans*/, char * /*pdstStart*/ -#endif ); /* mfbhrzvert.c */ extern void mfbHorzS( -#if NeedFunctionPrototypes int /*rop*/, PixelType * /*addrl*/, int /*nlwidth*/, int /*x1*/, int /*y1*/, int /*len*/ -#endif ); extern void mfbVertS( -#if NeedFunctionPrototypes int /*rop*/, PixelType * /*addrl*/, int /*nlwidth*/, int /*x1*/, int /*y1*/, int /*len*/ -#endif ); /* mfbigbblak.c */ extern void mfbImageGlyphBltBlack( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*x*/, @@ -510,12 +427,10 @@ extern void mfbImageGlyphBltBlack( unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, pointer /*pglyphBase*/ -#endif ); /* mfbigbwht.c */ extern void mfbImageGlyphBltWhite( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*x*/, @@ -523,12 +438,10 @@ extern void mfbImageGlyphBltWhite( unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, pointer /*pglyphBase*/ -#endif ); /* mfbimage.c */ extern void mfbPutImage( -#if NeedFunctionPrototypes DrawablePtr /*dst*/, GCPtr /*pGC*/, int /*depth*/, @@ -539,11 +452,9 @@ extern void mfbPutImage( int /*leftPad*/, int /*format*/, char * /*pImage*/ -#endif ); extern void mfbGetImage( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, int /*sx*/, int /*sy*/, @@ -552,107 +463,88 @@ extern void mfbGetImage( unsigned int /*format*/, unsigned long /*planeMask*/, char * /*pdstLine*/ -#endif ); /* mfbline.c */ extern void mfbLineSS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*mode*/, int /*npt*/, DDXPointPtr /*pptInit*/ -#endif ); extern void mfbLineSD( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*mode*/, int /*npt*/, DDXPointPtr /*pptInit*/ -#endif ); /* mfbmisc.c */ extern void mfbQueryBestSize( -#if NeedFunctionPrototypes int /*class*/, unsigned short * /*pwidth*/, unsigned short * /*pheight*/, ScreenPtr /*pScreen*/ -#endif ); /* mfbpablack.c */ extern void mfbSolidBlackArea( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*nop*/ -#endif ); extern void mfbStippleBlackArea( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*pstipple*/ -#endif ); /* mfbpainv.c */ extern void mfbSolidInvertArea( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*nop*/ -#endif ); extern void mfbStippleInvertArea( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*pstipple*/ -#endif ); /* mfbpawhite.c */ extern void mfbSolidWhiteArea( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*nop*/ -#endif ); extern void mfbStippleWhiteArea( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*pstipple*/ -#endif ); -/* mfbpgbblak.c */ + +/* mfbpgbinv.c */ extern void mfbPolyGlyphBltBlack( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*x*/, @@ -660,12 +552,10 @@ extern void mfbPolyGlyphBltBlack( unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, pointer /*pglyphBase*/ -#endif ); /* mfbpgbinv.c */ extern void mfbPolyGlyphBltInvert( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*x*/, @@ -673,12 +563,10 @@ extern void mfbPolyGlyphBltInvert( unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, pointer /*pglyphBase*/ -#endif ); /* mfbpgbwht.c */ extern void mfbPolyGlyphBltWhite( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*x*/, @@ -686,119 +574,94 @@ extern void mfbPolyGlyphBltWhite( unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, pointer /*pglyphBase*/ -#endif ); /* mfbpixmap.c */ extern PixmapPtr mfbCreatePixmap( -#if NeedFunctionPrototypes ScreenPtr /*pScreen*/, int /*width*/, int /*height*/, int /*depth*/ -#endif ); extern Bool mfbDestroyPixmap( -#if NeedFunctionPrototypes PixmapPtr /*pPixmap*/ -#endif ); extern PixmapPtr mfbCopyPixmap( -#if NeedFunctionPrototypes PixmapPtr /*pSrc*/ -#endif ); extern void mfbPadPixmap( -#if NeedFunctionPrototypes PixmapPtr /*pPixmap*/ -#endif ); extern void mfbXRotatePixmap( -#if NeedFunctionPrototypes PixmapPtr /*pPix*/, int /*rw*/ -#endif ); extern void mfbYRotatePixmap( -#if NeedFunctionPrototypes PixmapPtr /*pPix*/, int /*rh*/ -#endif ); extern void mfbCopyRotatePixmap( -#if NeedFunctionPrototypes PixmapPtr /*psrcPix*/, PixmapPtr * /*ppdstPix*/, int /*xrot*/, int /*yrot*/ -#endif ); /* mfbplyblack.c */ extern void mfbFillPolyBlack( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*shape*/, int /*mode*/, int /*count*/, DDXPointPtr /*ptsIn*/ -#endif ); /* mfbplyinv.c */ extern void mfbFillPolyInvert( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*shape*/, int /*mode*/, int /*count*/, DDXPointPtr /*ptsIn*/ -#endif ); -/* mfbplywhite.c */ + +/* mfbpntwin.c */ extern void mfbFillPolyWhite( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*shape*/, int /*mode*/, int /*count*/, DDXPointPtr /*ptsIn*/ -#endif ); /* mfbpntwin.c */ extern void mfbPaintWindow( -#if NeedFunctionPrototypes WindowPtr /*pWin*/, RegionPtr /*pRegion*/, int /*what*/ -#endif ); /* mfbpolypnt.c */ extern void mfbPolyPoint( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*mode*/, int /*npt*/, xPoint * /*pptInit*/ -#endif ); /* mfbpushpxl.c */ extern void mfbSolidPP( -#if NeedFunctionPrototypes GCPtr /*pGC*/, PixmapPtr /*pBitMap*/, DrawablePtr /*pDrawable*/, @@ -806,11 +669,9 @@ extern void mfbSolidPP( int /*dy*/, int /*xOrg*/, int /*yOrg*/ -#endif ); extern void mfbPushPixels( -#if NeedFunctionPrototypes GCPtr /*pGC*/, PixmapPtr /*pBitMap*/, DrawablePtr /*pDrawable*/, @@ -818,28 +679,22 @@ extern void mfbPushPixels( int /*dy*/, int /*xOrg*/, int /*yOrg*/ -#endif ); /* mfbscrclse.c */ extern Bool mfbCloseScreen( -#if NeedFunctionPrototypes int /*index*/, ScreenPtr /*pScreen*/ -#endif ); /* mfbscrinit.c */ extern Bool mfbAllocatePrivates( -#if NeedFunctionPrototypes ScreenPtr /*pScreen*/, int * /*pWinIndex*/, int * /*pGCIndex*/ -#endif ); extern Bool mfbScreenInit( -#if NeedFunctionPrototypes ScreenPtr /*pScreen*/, pointer /*pbits*/, int /*xsize*/, @@ -847,45 +702,35 @@ extern Bool mfbScreenInit( int /*dpix*/, int /*dpiy*/, int /*width*/ -#endif ); extern PixmapPtr mfbGetWindowPixmap( -#if NeedFunctionPrototypes WindowPtr /*pWin*/ -#endif ); extern void mfbSetWindowPixmap( -#if NeedFunctionPrototypes WindowPtr /*pWin*/, PixmapPtr /*pPix*/ -#endif ); /* mfbseg.c */ extern void mfbSegmentSS( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*nseg*/, xSegment * /*pSeg*/ -#endif ); extern void mfbSegmentSD( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, int /*nseg*/, xSegment * /*pSeg*/ -#endif ); /* mfbsetsp.c */ extern void mfbSetScanline( -#if NeedFunctionPrototypes int /*y*/, int /*xOrigin*/, int /*xStart*/, @@ -894,11 +739,9 @@ extern void mfbSetScanline( int /*alu*/, PixelType * /*pdstBase*/, int /*widthDst*/ -#endif ); extern void mfbSetSpans( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr /*pGC*/, char * /*psrc*/, @@ -906,12 +749,10 @@ extern void mfbSetSpans( int * /*pwidth*/, int /*nspans*/, int /*fSorted*/ -#endif ); /* mfbteblack.c */ extern void mfbTEGlyphBltBlack( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*x*/, @@ -919,12 +760,10 @@ extern void mfbTEGlyphBltBlack( unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, pointer /*pglyphBase*/ -#endif ); /* mfbtewhite.c */ extern void mfbTEGlyphBltWhite( -#if NeedFunctionPrototypes DrawablePtr /*pDrawable*/, GCPtr/*pGC*/, int /*x*/, @@ -932,97 +771,74 @@ extern void mfbTEGlyphBltWhite( unsigned int /*nglyph*/, CharInfoPtr * /*ppci*/, pointer /*pglyphBase*/ -#endif ); /* mfbtileC.c */ extern void mfbTileAreaPPWCopy( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*ptile*/ -#endif ); /* mfbtileG.c */ extern void mfbTileAreaPPWGeneral( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*ptile*/ -#endif ); extern void mfbTileAreaPPW( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*ptile*/ -#endif ); /* mfbwindow.c */ extern Bool mfbCreateWindow( -#if NeedFunctionPrototypes WindowPtr /*pWin*/ -#endif ); extern Bool mfbDestroyWindow( -#if NeedFunctionPrototypes WindowPtr /*pWin*/ -#endif ); extern Bool mfbMapWindow( -#if NeedFunctionPrototypes WindowPtr /*pWindow*/ -#endif ); extern Bool mfbPositionWindow( -#if NeedFunctionPrototypes WindowPtr /*pWin*/, int /*x*/, int /*y*/ -#endif ); extern Bool mfbUnmapWindow( -#if NeedFunctionPrototypes WindowPtr /*pWindow*/ -#endif ); extern void mfbCopyWindow( -#if NeedFunctionPrototypes WindowPtr /*pWin*/, DDXPointRec /*ptOldOrg*/, RegionPtr /*prgnSrc*/ -#endif ); extern Bool mfbChangeWindowAttributes( -#if NeedFunctionPrototypes WindowPtr /*pWin*/, unsigned long /*mask*/ -#endif ); /* mfbzerarc.c */ extern void mfbZeroPolyArcSS( -#if NeedFunctionPrototypes DrawablePtr /*pDraw*/, GCPtr /*pGC*/, int /*narcs*/, xArc * /*parcs*/ -#endif ); #ifndef MFB_PROTOTYPES_ONLY @@ -1041,13 +857,11 @@ across, but was 1024 in the hardware.) private field of GC */ typedef void (*mfbFillAreaProcPtr)( -#if NeedNestedPrototypes DrawablePtr /*pDraw*/, int /*nbox*/, BoxPtr /*pbox*/, int /*alu*/, PixmapPtr /*nop*/ -#endif ); typedef struct { diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 601f59d54..310d492f8 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.6 2001/12/14 20:00:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.8 2003/11/10 18:22:45 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -50,7 +50,6 @@ SOFTWARE. #include "X.h" #include "Xprotostr.h" -#include "miscstruct.h" #include "regionstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -150,7 +149,12 @@ int dstx, dsty; BoxRec fastBox; int fastClip = 0; /* for fast clipping with pixmap source */ int fastExpose = 0; /* for fast exposures with pixmap source */ - void (*localDoBitBlt)(); + void (*localDoBitBlt)( + DrawablePtr /*pSrc*/, + DrawablePtr /*pDst*/, + int /*alu*/, + RegionPtr /*prgnDst*/, + DDXPointPtr /*pptSrc*/); origSource.x = srcx; origSource.y = srcy; @@ -314,7 +318,7 @@ int dstx, dsty; /* Check to see if the region is empty */ if (fastBox.x1 >= fastBox.x2 || fastBox.y1 >= fastBox.y2) { - REGION_INIT(pGC->pScreen, &rgnDst, NullBox, 0); + REGION_NULL(pGC->pScreen, &rgnDst); } else { @@ -327,7 +331,7 @@ int dstx, dsty; a full blown region. It is intersected with the composite clip below. */ fastClip = 0; - REGION_INIT(pGC->pScreen, &rgnDst, &fastBox,1); + REGION_INIT(pGC->pScreen, &rgnDst, &fastBox, 1); } } else @@ -397,7 +401,17 @@ static int copyPlaneScreenIndex = -1; Bool mfbRegisterCopyPlaneProc (pScreen, proc) ScreenPtr pScreen; - RegionPtr (*proc)(); + RegionPtr (*proc)( + DrawablePtr /* pSrcDrawable */, + DrawablePtr /* pDstDrawable */, + GCPtr /* pGC */, + int /* srcx */, + int /* srcy */, + int /* width */, + int /* height */, + int /* dstx */, + int /* dsty */, + unsigned long /* bitPlane */); { if (copyPlaneGeneration != serverGeneration) { @@ -406,7 +420,7 @@ mfbRegisterCopyPlaneProc (pScreen, proc) return FALSE; copyPlaneGeneration = serverGeneration; } - pScreen->devPrivates[copyPlaneScreenIndex].fptr = (pointer (*)()) proc; + pScreen->devPrivates[copyPlaneScreenIndex].fptr = proc; return TRUE; } @@ -437,12 +451,23 @@ unsigned long plane; { int alu; RegionPtr prgnExposed; - RegionPtr (*copyPlane)(); + RegionPtr (*copyPlane)( + DrawablePtr /* pSrcDrawable */, + DrawablePtr /* pDstDrawable */, + GCPtr /* pGC */, + int /* srcx */, + int /* srcy */, + int /* width */, + int /* height */, + int /* dstx */, + int /* dsty */, + unsigned long /* bitPlane */); + if (pSrcDrawable->depth != 1) { if (copyPlaneScreenIndex >= 0 && - (copyPlane = (RegionPtr (*)()) + (copyPlane = pSrcDrawable->pScreen->devPrivates[copyPlaneScreenIndex].fptr) ) { diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 0de94b3f9..d23071cd3 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include "X.h" -#include "miscstruct.h" +#include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" #include "regionstr.h" diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 5484e9259..886c2852a 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.5 2001/12/14 20:00:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #include "X.h" #include "Xprotostr.h" -#include "miscstruct.h" +#include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" #include "scrnintstr.h" @@ -39,10 +39,10 @@ in this Software without prior written authorization from The Open Group. #include "mi.h" static void -mfbFillEllipseSolid(pDraw, arc, rop) - DrawablePtr pDraw; - xArc *arc; - register int rop; +mfbFillEllipseSolid( + DrawablePtr pDraw, + xArc *arc, + register int rop) { int x, y, e; int yk, xk, ym, xm, dx, dy, xorg, yorg; @@ -220,11 +220,11 @@ mfbFillEllipseSolid(pDraw, arc, rop) } static void -mfbFillArcSliceSolidCopy(pDraw, pGC, arc, rop) - DrawablePtr pDraw; - GCPtr pGC; - xArc *arc; - register int rop; +mfbFillArcSliceSolidCopy( + DrawablePtr pDraw, + GCPtr pGC, + xArc *arc, + register int rop) { register PixelType *addrl; register int n; diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index 314af0b4a..1119f66f9 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -656,7 +656,12 @@ struct commonOps { int rrop; int terminalFont; GCOps *ops; - void (*fillArea)(); + void (*fillArea)( + DrawablePtr /*pDraw*/, + int /*nbox*/, + BoxPtr /*pbox*/, + int /*alu*/, + PixmapPtr /*nop*/); }; static struct commonOps mfbCommonOps[] = { @@ -677,8 +682,8 @@ static struct commonOps mfbCommonOps[] = { #define numberCommonOps (sizeof (mfbCommonOps) / sizeof (mfbCommonOps[0])) static GCOps * -matchCommon (pGC) - GCPtr pGC; +matchCommon ( + GCPtr pGC) { int i; struct commonOps *cop; @@ -743,6 +748,45 @@ mfbCreateGC(pGC) return TRUE; } +/* some noop functions */ +static void +mfbPolyGlyphBltNoop( + DrawablePtr pDrawable, + GCPtr pGC, + int x, + int y, + unsigned int nglyph, + CharInfoPtr * ppci, + pointer pglyphBase) +{ + /* this is a no-op function */ +} + +static void +mfbNoopFS( + DrawablePtr pDrawable, + GCPtr pGC, + int nInit, + DDXPointPtr pptInit, + int * pwidthInit, + int fSorted) +{ + /* this is a no-op function */ +} + +static void +mfbFillPolyNoop( + DrawablePtr pDrawable, + GCPtr pGC, + int shape, + int mode, + int count, + DDXPointPtr ptsIn) +{ + /* this is a no-op function */ +} + + /* Clipping conventions if the drawable is a window CT_REGION ==> pCompositeClip really is the composite @@ -1107,7 +1151,7 @@ mfbValidateGC(pGC, changes, pDrawable) else if (rrop == RROP_INVERT) pGC->ops->PolyGlyphBlt = mfbPolyGlyphBltInvert; else - pGC->ops->PolyGlyphBlt = (void (*)())NoopDDA; + pGC->ops->PolyGlyphBlt = mfbPolyGlyphBltNoop; } else { @@ -1144,8 +1188,8 @@ mfbValidateGC(pGC, changes, pDrawable) pGC->ops->FillPolygon = mfbFillPolyInvert; break; case RROP_NOP: - pGC->ops->FillSpans = (void (*)())NoopDDA; - pGC->ops->FillPolygon = (void (*)())NoopDDA; + pGC->ops->FillSpans = mfbNoopFS; + pGC->ops->FillPolygon = mfbFillPolyNoop; break; } } @@ -1174,7 +1218,7 @@ mfbValidateGC(pGC, changes, pDrawable) pGC->ops->FillSpans = mfbInvertStippleFS; break; case RROP_NOP: - pGC->ops->FillSpans = (void (*)())NoopDDA; + pGC->ops->FillSpans = mfbNoopFS; break; } } diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index 428e4c46b..066ca3ce7 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.5 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.6 2003/11/03 05:11:59 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -291,7 +291,9 @@ MFBIMAGEGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) int glyphRow; /* first row of glyph not wholly clipped out */ int glyphCol; /* leftmost visible column of glyph */ +#if GETLEFTBITS_ALIGNMENT > 1 int getWidth; /* bits to get from glyph */ +#endif if(!(ppos = (TEXTPOS *)ALLOCATE_LOCAL(nglyph * sizeof(TEXTPOS)))) return; @@ -391,7 +393,9 @@ MFBIMAGEGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) glyphCol = (leftEdge - ppos[i].xpos) - (pci->metrics.leftSideBearing); +#if GETLEFTBITS_ALIGNMENT > 1 getWidth = w + glyphCol; +#endif xoff = xchar + (leftEdge - ppos[i].xpos); if (xoff > PLST) { diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index 661590e5e..61a7297f0 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.4 2001/12/14 20:00:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.5 2003/11/03 05:12:00 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -248,7 +248,9 @@ MFBPOLYGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) int glyphRow; /* first row of glyph not wholly clipped out */ int glyphCol; /* leftmost visible column of glyph */ +#if GETLEFTBITS_ALIGNMENT > 1 int getWidth; /* bits to get from glyph */ +#endif if(!(ppos = (TEXTPOS *)ALLOCATE_LOCAL(nglyph * sizeof(TEXTPOS)))) return; @@ -341,7 +343,9 @@ MFBPOLYGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) glyphCol = (leftEdge - ppos[i].xpos) - (pci->metrics.leftSideBearing); +#if GETLEFTBITS_ALIGNMENT > 1 getWidth = w + glyphCol; +#endif xoff = xchar + (leftEdge - ppos[i].xpos); if (xoff > PLST) { diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index 05bc93722..e672f38c9 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.3 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.4 2003/07/16 01:38:55 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -220,7 +220,12 @@ mfbTileAreaPPW (pDraw, nbox, pbox, alu, ptile) int alu; PixmapPtr ptile; { - void (*f)(); + void (*f)( + DrawablePtr /*pDraw*/, + int /*nbox*/, + BoxPtr /*pbox*/, + int /*alu*/, + PixmapPtr /*ptile*/); if (alu == GXcopy) f = mfbTileAreaPPWCopy; diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index 8107b9807..f7ff963c4 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ #include "X.h" #include "scrnintstr.h" @@ -55,8 +56,6 @@ SOFTWARE. #include "regionstr.h" #include "maskbits.h" -extern WindowPtr *WindowTable; - Bool mfbCreateWindow(pWin) register WindowPtr pWin; diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index 51dc727d9..1ef9f1f56 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.7 2002/09/27 01:57:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.8 2003/07/16 01:38:55 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group. #include "X.h" #include "Xprotostr.h" -#include "miscstruct.h" +#include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" #include "scrnintstr.h" @@ -72,10 +72,10 @@ in this Software without prior written authorization from The Open Group. #define DoPix(bit,base,yoff,xoff) if (mask & bit) Pixelate(base,yoff,xoff); static void -mfbZeroArcSS(pDraw, pGC, arc) - DrawablePtr pDraw; - GCPtr pGC; - xArc *arc; +mfbZeroArcSS( + DrawablePtr pDraw, + GCPtr pGC, + xArc *arc) { miZeroArcRec info; Bool do360; -- cgit v1.2.3