diff options
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/Makefile.am | 2 | ||||
| -rw-r--r-- | fb/fb.h | 287 | ||||
| -rw-r--r-- | fb/fb24_32.c | 16 | ||||
| -rw-r--r-- | fb/fballpriv.c | 12 | ||||
| -rw-r--r-- | fb/fbarc.c | 2 | ||||
| -rw-r--r-- | fb/fbbits.h | 14 | ||||
| -rw-r--r-- | fb/fbblt.c | 6 | ||||
| -rw-r--r-- | fb/fbbltone.c | 22 | ||||
| -rw-r--r-- | fb/fbcmap.c | 22 | ||||
| -rw-r--r-- | fb/fbcmap_mi.c | 18 | ||||
| -rw-r--r-- | fb/fbcopy.c | 14 | ||||
| -rw-r--r-- | fb/fbfill.c | 4 | ||||
| -rw-r--r-- | fb/fbfillrect.c | 2 | ||||
| -rw-r--r-- | fb/fbfillsp.c | 2 | ||||
| -rw-r--r-- | fb/fbgc.c | 10 | ||||
| -rw-r--r-- | fb/fbgetsp.c | 2 | ||||
| -rw-r--r-- | fb/fbglyph.c | 8 | ||||
| -rw-r--r-- | fb/fbimage.c | 8 | ||||
| -rw-r--r-- | fb/fbline.c | 10 | ||||
| -rw-r--r-- | fb/fboverlay.c | 22 | ||||
| -rw-r--r-- | fb/fboverlay.h | 22 | ||||
| -rw-r--r-- | fb/fbpict.c | 12 | ||||
| -rw-r--r-- | fb/fbpict.h | 14 | ||||
| -rw-r--r-- | fb/fbpixmap.c | 14 | ||||
| -rw-r--r-- | fb/fbpoint.c | 4 | ||||
| -rw-r--r-- | fb/fbpush.c | 8 | ||||
| -rw-r--r-- | fb/fbrop.h | 14 | ||||
| -rw-r--r-- | fb/fbscreen.c | 18 | ||||
| -rw-r--r-- | fb/fbseg.c | 14 | ||||
| -rw-r--r-- | fb/fbsetsp.c | 2 | ||||
| -rw-r--r-- | fb/fbsolid.c | 4 | ||||
| -rw-r--r-- | fb/fbstipple.c | 8 | ||||
| -rw-r--r-- | fb/fbtile.c | 6 | ||||
| -rw-r--r-- | fb/fbtrap.c | 6 | ||||
| -rw-r--r-- | fb/fbutil.c | 30 | ||||
| -rw-r--r-- | fb/fbwindow.c | 18 |
36 files changed, 339 insertions, 338 deletions
diff --git a/fb/Makefile.am b/fb/Makefile.am index 399426933..64e49f345 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ AM_CFLAGS = $(DIX_CFLAGS) if XORG -sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h +sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h endif libfb_la_CFLAGS = $(AM_CFLAGS) @@ -167,9 +167,9 @@ typedef int FbStride; #ifdef FB_DEBUG -extern void fbValidateDrawable(DrawablePtr d); -extern void fbInitializeDrawable(DrawablePtr d); -extern void fbSetBits (FbStip *bits, int stride, FbStip data); +extern _X_EXPORT void fbValidateDrawable(DrawablePtr d); +extern _X_EXPORT void fbInitializeDrawable(DrawablePtr d); +extern _X_EXPORT void fbSetBits (FbStip *bits, int stride, FbStip data); #define FB_HEAD_BITS (FbStip) (0xbaadf00d) #define FB_TAIL_BITS (FbStip) (0xbaddf0ad) #else @@ -595,10 +595,10 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data); } \ } -extern DevPrivateKey fbGetGCPrivateKey(void); -extern DevPrivateKey fbGetWinPrivateKey(void); -extern const GCOps fbGCOps; -extern const GCFuncs fbGCFuncs; +extern _X_EXPORT DevPrivateKey fbGetGCPrivateKey(void); +extern _X_EXPORT DevPrivateKey fbGetWinPrivateKey(void); +extern _X_EXPORT const GCOps fbGCOps; +extern _X_EXPORT const GCFuncs fbGCFuncs; #ifdef FB_24_32BIT #define FB_SCREEN_PRIVATE @@ -631,7 +631,7 @@ typedef void (*FinishWrapProcPtr)(DrawablePtr pDraw); #ifdef FB_SCREEN_PRIVATE -extern DevPrivateKey fbGetScreenPrivateKey(void); +extern _X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void); /* private field of a screen */ typedef struct { @@ -749,7 +749,7 @@ typedef struct { /* * fb24_32.c */ -void +extern _X_EXPORT void fb24_32GetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, @@ -757,7 +757,7 @@ fb24_32GetSpans(DrawablePtr pDrawable, int nspans, char *pchardstStart); -void +extern _X_EXPORT void fb24_32SetSpans (DrawablePtr pDrawable, GCPtr pGC, char *src, @@ -766,7 +766,7 @@ fb24_32SetSpans (DrawablePtr pDrawable, int nspans, int fSorted); -void +extern _X_EXPORT void fb24_32PutZImage (DrawablePtr pDrawable, RegionPtr pClip, int alu, @@ -778,7 +778,7 @@ fb24_32PutZImage (DrawablePtr pDrawable, CARD8 *src, FbStride srcStride); -void +extern _X_EXPORT void fb24_32GetImage (DrawablePtr pDrawable, int x, int y, @@ -788,7 +788,7 @@ fb24_32GetImage (DrawablePtr pDrawable, unsigned long planeMask, char *d); -void +extern _X_EXPORT void fb24_32CopyMtoN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -801,13 +801,13 @@ fb24_32CopyMtoN (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -PixmapPtr +extern _X_EXPORT PixmapPtr fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel); -Bool +extern _X_EXPORT Bool fb24_32CreateScreenResources(ScreenPtr pScreen); -Bool +extern _X_EXPORT Bool fb24_32ModifyPixmapHeader (PixmapPtr pPixmap, int width, int height, @@ -819,14 +819,14 @@ fb24_32ModifyPixmapHeader (PixmapPtr pPixmap, /* * fballpriv.c */ -Bool +extern _X_EXPORT Bool fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCIndex); /* * fbarc.c */ -void +extern _X_EXPORT void fbPolyArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, @@ -836,7 +836,7 @@ fbPolyArc (DrawablePtr pDrawable, * fbbits.c */ -void +extern _X_EXPORT void fbBresSolid8(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -850,7 +850,7 @@ fbBresSolid8(DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbBresDash8 (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -864,7 +864,7 @@ fbBresDash8 (DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbDots8 (FbBits *dst, FbStride dstStride, int dstBpp, @@ -878,7 +878,7 @@ fbDots8 (FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbArc8 (FbBits *dst, FbStride dstStride, int dstBpp, @@ -888,7 +888,7 @@ fbArc8 (FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbGlyph8 (FbBits *dstLine, FbStride dstStride, int dstBpp, @@ -897,20 +897,20 @@ fbGlyph8 (FbBits *dstLine, int height, int shift); -void +extern _X_EXPORT void fbPolyline8 (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig); -void +extern _X_EXPORT void fbPolySegment8 (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pseg); -void +extern _X_EXPORT void fbBresSolid16(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -924,7 +924,7 @@ fbBresSolid16(DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbBresDash16(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -938,7 +938,7 @@ fbBresDash16(DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbDots16(FbBits *dst, FbStride dstStride, int dstBpp, @@ -952,7 +952,7 @@ fbDots16(FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbArc16(FbBits *dst, FbStride dstStride, int dstBpp, @@ -962,7 +962,7 @@ fbArc16(FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbGlyph16(FbBits *dstLine, FbStride dstStride, int dstBpp, @@ -971,21 +971,21 @@ fbGlyph16(FbBits *dstLine, int height, int shift); -void +extern _X_EXPORT void fbPolyline16 (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig); -void +extern _X_EXPORT void fbPolySegment16 (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pseg); -void +extern _X_EXPORT void fbBresSolid24(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -999,7 +999,7 @@ fbBresSolid24(DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbBresDash24(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -1013,7 +1013,7 @@ fbBresDash24(DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbDots24(FbBits *dst, FbStride dstStride, int dstBpp, @@ -1027,7 +1027,7 @@ fbDots24(FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbArc24(FbBits *dst, FbStride dstStride, int dstBpp, @@ -1037,7 +1037,7 @@ fbArc24(FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbGlyph24(FbBits *dstLine, FbStride dstStride, int dstBpp, @@ -1046,21 +1046,21 @@ fbGlyph24(FbBits *dstLine, int height, int shift); -void +extern _X_EXPORT void fbPolyline24 (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig); -void +extern _X_EXPORT void fbPolySegment24 (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pseg); -void +extern _X_EXPORT void fbBresSolid32(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -1074,7 +1074,7 @@ fbBresSolid32(DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbBresDash32(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -1088,7 +1088,7 @@ fbBresDash32(DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbDots32(FbBits *dst, FbStride dstStride, int dstBpp, @@ -1102,7 +1102,7 @@ fbDots32(FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbArc32(FbBits *dst, FbStride dstStride, int dstBpp, @@ -1112,7 +1112,7 @@ fbArc32(FbBits *dst, FbBits and, FbBits xor); -void +extern _X_EXPORT void fbGlyph32(FbBits *dstLine, FbStride dstStride, int dstBpp, @@ -1120,14 +1120,14 @@ fbGlyph32(FbBits *dstLine, FbBits fg, int height, int shift); -void +extern _X_EXPORT void fbPolyline32 (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig); -void +extern _X_EXPORT void fbPolySegment32 (DrawablePtr pDrawable, GCPtr pGC, int nseg, @@ -1136,7 +1136,7 @@ fbPolySegment32 (DrawablePtr pDrawable, /* * fbblt.c */ -void +extern _X_EXPORT void fbBlt (FbBits *src, FbStride srcStride, int srcX, @@ -1155,7 +1155,7 @@ fbBlt (FbBits *src, Bool reverse, Bool upsidedown); -void +extern _X_EXPORT void fbBlt24 (FbBits *srcLine, FbStride srcStride, int srcX, @@ -1173,7 +1173,7 @@ fbBlt24 (FbBits *srcLine, Bool reverse, Bool upsidedown); -void +extern _X_EXPORT void fbBltStip (FbStip *src, FbStride srcStride, /* in FbStip units, not FbBits units */ int srcX, @@ -1192,7 +1192,7 @@ fbBltStip (FbStip *src, /* * fbbltone.c */ -void +extern _X_EXPORT void fbBltOne (FbStip *src, FbStride srcStride, int srcX, @@ -1210,7 +1210,7 @@ fbBltOne (FbStip *src, FbBits bgxor); #ifdef FB_24BIT -void +extern _X_EXPORT void fbBltOne24 (FbStip *src, FbStride srcStride, /* FbStip units per scanline */ int srcX, /* bit position of source */ @@ -1228,7 +1228,7 @@ fbBltOne24 (FbStip *src, FbBits bgxor); #endif -void +extern _X_EXPORT void fbBltPlane (FbBits *src, FbStride srcStride, int srcX, @@ -1250,47 +1250,47 @@ fbBltPlane (FbBits *src, /* * fbcmap.c */ -int +extern _X_EXPORT int fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps); -void +extern _X_EXPORT void fbInstallColormap(ColormapPtr pmap); -void +extern _X_EXPORT void fbUninstallColormap(ColormapPtr pmap); -void +extern _X_EXPORT void fbResolveColor(unsigned short *pred, unsigned short *pgreen, unsigned short *pblue, VisualPtr pVisual); -Bool +extern _X_EXPORT Bool fbInitializeColormap(ColormapPtr pmap); -int +extern _X_EXPORT int fbExpandDirectColors (ColormapPtr pmap, int ndef, xColorItem *indefs, xColorItem *outdefs); -Bool +extern _X_EXPORT Bool fbCreateDefColormap(ScreenPtr pScreen); -void +extern _X_EXPORT void fbClearVisualTypes(void); -Bool +extern _X_EXPORT Bool fbHasVisualTypes (int depth); -Bool +extern _X_EXPORT Bool fbSetVisualTypes (int depth, int visuals, int bitsPerRGB); -Bool +extern _X_EXPORT Bool fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, Pixel redMask, Pixel greenMask, Pixel blueMask); -Bool +extern _X_EXPORT Bool fbInitVisuals (VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, @@ -1316,7 +1316,7 @@ typedef void (*fbCopyProc) (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -void +extern _X_EXPORT void fbCopyNtoN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -1329,7 +1329,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -void +extern _X_EXPORT void fbCopy1toN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -1342,7 +1342,7 @@ fbCopy1toN (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -void +extern _X_EXPORT void fbCopyNto1 (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -1355,7 +1355,7 @@ fbCopyNto1 (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -void +extern _X_EXPORT void fbCopyRegion (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -1366,7 +1366,7 @@ fbCopyRegion (DrawablePtr pSrcDrawable, Pixel bitPlane, void *closure); -RegionPtr +extern _X_EXPORT RegionPtr fbDoCopy (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -1380,7 +1380,7 @@ fbDoCopy (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -RegionPtr +extern _X_EXPORT RegionPtr fbCopyArea (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -1391,7 +1391,7 @@ fbCopyArea (DrawablePtr pSrcDrawable, int xOut, int yOut); -RegionPtr +extern _X_EXPORT RegionPtr fbCopyPlane (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -1406,7 +1406,7 @@ fbCopyPlane (DrawablePtr pSrcDrawable, /* * fbfill.c */ -void +extern _X_EXPORT void fbFill (DrawablePtr pDrawable, GCPtr pGC, int x, @@ -1414,7 +1414,7 @@ fbFill (DrawablePtr pDrawable, int width, int height); -void +extern _X_EXPORT void fbSolidBoxClipped (DrawablePtr pDrawable, RegionPtr pClip, int xa, @@ -1427,7 +1427,7 @@ fbSolidBoxClipped (DrawablePtr pDrawable, /* * fbfillrect.c */ -void +extern _X_EXPORT void fbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectInit, @@ -1440,7 +1440,7 @@ fbPolyFillRect(DrawablePtr pDrawable, /* * fbfillsp.c */ -void +extern _X_EXPORT void fbFillSpans (DrawablePtr pDrawable, GCPtr pGC, int nInit, @@ -1453,19 +1453,19 @@ fbFillSpans (DrawablePtr pDrawable, * fbgc.c */ -Bool +extern _X_EXPORT Bool fbCreateGC(GCPtr pGC); -void +extern _X_EXPORT void fbPadPixmap (PixmapPtr pPixmap); -void +extern _X_EXPORT void fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable); /* * fbgetsp.c */ -void +extern _X_EXPORT void fbGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, @@ -1477,14 +1477,14 @@ fbGetSpans(DrawablePtr pDrawable, * fbglyph.c */ -Bool +extern _X_EXPORT Bool fbGlyphIn (RegionPtr pRegion, int x, int y, int width, int height); -void +extern _X_EXPORT void fbPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, @@ -1493,7 +1493,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable, CharInfoPtr *ppci, pointer pglyphBase); -void +extern _X_EXPORT void fbImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, @@ -1506,7 +1506,7 @@ fbImageGlyphBlt (DrawablePtr pDrawable, * fbimage.c */ -void +extern _X_EXPORT void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, @@ -1518,7 +1518,7 @@ fbPutImage (DrawablePtr pDrawable, int format, char *pImage); -void +extern _X_EXPORT void fbPutZImage (DrawablePtr pDrawable, RegionPtr pClip, int alu, @@ -1530,7 +1530,7 @@ fbPutZImage (DrawablePtr pDrawable, FbStip *src, FbStride srcStride); -void +extern _X_EXPORT void fbPutXYImage (DrawablePtr pDrawable, RegionPtr pClip, FbBits fg, @@ -1548,7 +1548,7 @@ fbPutXYImage (DrawablePtr pDrawable, FbStride srcStride, int srcX); -void +extern _X_EXPORT void fbGetImage (DrawablePtr pDrawable, int x, int y, @@ -1561,31 +1561,31 @@ fbGetImage (DrawablePtr pDrawable, * fbline.c */ -void +extern _X_EXPORT void fbZeroLine (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ppt); -void +extern _X_EXPORT void fbZeroSegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs); -void +extern _X_EXPORT void fbPolyLine (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ppt); -void +extern _X_EXPORT void fbFixCoordModePrevious (int npt, DDXPointPtr ppt); -void +extern _X_EXPORT void fbPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, @@ -1597,7 +1597,7 @@ fbPolySegment (DrawablePtr pDrawable, * fbpict.c */ -Bool +extern _X_EXPORT Bool fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats); @@ -1606,25 +1606,25 @@ fbPictureInit (ScreenPtr pScreen, * fbpixmap.c */ -PixmapPtr +extern _X_EXPORT PixmapPtr fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, unsigned usage_hint); -PixmapPtr +extern _X_EXPORT PixmapPtr fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint); -Bool +extern _X_EXPORT Bool fbDestroyPixmap (PixmapPtr pPixmap); -RegionPtr +extern _X_EXPORT RegionPtr fbPixmapToRegion(PixmapPtr pPix); /* * fbpoint.c */ -void +extern _X_EXPORT void fbDots (FbBits *dstOrig, FbStride dstStride, int dstBpp, @@ -1638,7 +1638,7 @@ fbDots (FbBits *dstOrig, FbBits andOrig, FbBits xorOrig); -void +extern _X_EXPORT void fbPolyPoint (DrawablePtr pDrawable, GCPtr pGC, int mode, @@ -1648,7 +1648,7 @@ fbPolyPoint (DrawablePtr pDrawable, /* * fbpush.c */ -void +extern _X_EXPORT void fbPushPattern (DrawablePtr pDrawable, GCPtr pGC, @@ -1662,7 +1662,7 @@ fbPushPattern (DrawablePtr pDrawable, int width, int height); -void +extern _X_EXPORT void fbPushFill (DrawablePtr pDrawable, GCPtr pGC, @@ -1675,7 +1675,7 @@ fbPushFill (DrawablePtr pDrawable, int width, int height); -void +extern _X_EXPORT void fbPushImage (DrawablePtr pDrawable, GCPtr pGC, @@ -1688,7 +1688,7 @@ fbPushImage (DrawablePtr pDrawable, int width, int height); -void +extern _X_EXPORT void fbPushPixels (GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable, @@ -1702,27 +1702,27 @@ fbPushPixels (GCPtr pGC, * fbscreen.c */ -Bool +extern _X_EXPORT Bool fbCloseScreen (int indx, ScreenPtr pScreen); -Bool +extern _X_EXPORT Bool fbRealizeFont(ScreenPtr pScreen, FontPtr pFont); -Bool +extern _X_EXPORT Bool fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont); -void +extern _X_EXPORT void fbQueryBestSize (int class, unsigned short *width, unsigned short *height, ScreenPtr pScreen); -PixmapPtr +extern _X_EXPORT PixmapPtr _fbGetWindowPixmap (WindowPtr pWindow); -void +extern _X_EXPORT void _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap); -Bool +extern _X_EXPORT Bool fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */ int xsize, /* in pixels */ @@ -1732,7 +1732,7 @@ fbSetupScreen(ScreenPtr pScreen, int width, /* pixel width of frame buffer */ int bpp); /* bits per pixel of frame buffer */ -Bool +extern _X_EXPORT Bool wfbFinishScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, @@ -1744,7 +1744,7 @@ wfbFinishScreenInit(ScreenPtr pScreen, SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap); -Bool +extern _X_EXPORT Bool wfbScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, @@ -1756,7 +1756,7 @@ wfbScreenInit(ScreenPtr pScreen, SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap); -Bool +extern _X_EXPORT Bool fbFinishScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, @@ -1766,7 +1766,7 @@ fbFinishScreenInit(ScreenPtr pScreen, int width, int bpp); -Bool +extern _X_EXPORT Bool fbScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, @@ -1792,12 +1792,12 @@ typedef void FbBres (DrawablePtr pDrawable, int e3, int len); -FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash; +extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash; /* * fbsetsp.c */ -void +extern _X_EXPORT void fbSetSpans (DrawablePtr pDrawable, GCPtr pGC, char *src, @@ -1806,11 +1806,11 @@ fbSetSpans (DrawablePtr pDrawable, int nspans, int fSorted); -FbBres * +extern _X_EXPORT FbBres * fbSelectBres (DrawablePtr pDrawable, GCPtr pGC); -void +extern _X_EXPORT void fbBres (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -1824,7 +1824,7 @@ fbBres (DrawablePtr pDrawable, int e3, int len); -void +extern _X_EXPORT void fbSegment (DrawablePtr pDrawable, GCPtr pGC, int xa, @@ -1839,7 +1839,7 @@ fbSegment (DrawablePtr pDrawable, * fbsolid.c */ -void +extern _X_EXPORT void fbSolid (FbBits *dst, FbStride dstStride, int dstX, @@ -1852,7 +1852,7 @@ fbSolid (FbBits *dst, FbBits xor); #ifdef FB_24BIT -void +extern _X_EXPORT void fbSolid24 (FbBits *dst, FbStride dstStride, int dstX, @@ -1868,13 +1868,13 @@ fbSolid24 (FbBits *dst, * fbstipple.c */ -void +extern _X_EXPORT void fbTransparentSpan (FbBits *dst, FbBits stip, FbBits fgxor, int n); -void +extern _X_EXPORT void fbEvenStipple (FbBits *dst, FbStride dstStride, int dstX, @@ -1895,7 +1895,7 @@ fbEvenStipple (FbBits *dst, int xRot, int yRot); -void +extern _X_EXPORT void fbOddStipple (FbBits *dst, FbStride dstStride, int dstX, @@ -1917,7 +1917,7 @@ fbOddStipple (FbBits *dst, int xRot, int yRot); -void +extern _X_EXPORT void fbStipple (FbBits *dst, FbStride dstStride, int dstX, @@ -1944,7 +1944,7 @@ fbStipple (FbBits *dst, * fbtile.c */ -void +extern _X_EXPORT void fbEvenTile (FbBits *dst, FbStride dstStride, int dstX, @@ -1961,7 +1961,7 @@ fbEvenTile (FbBits *dst, int xRot, int yRot); -void +extern _X_EXPORT void fbOddTile (FbBits *dst, FbStride dstStride, int dstX, @@ -1981,7 +1981,7 @@ fbOddTile (FbBits *dst, int xRot, int yRot); -void +extern _X_EXPORT void fbTile (FbBits *dst, FbStride dstStride, int dstX, @@ -2004,37 +2004,37 @@ fbTile (FbBits *dst, /* * fbutil.c */ -FbBits +extern _X_EXPORT FbBits fbReplicatePixel (Pixel p, int bpp); -void +extern _X_EXPORT void fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp); #ifdef FB_ACCESS_WRAPPER -extern ReadMemoryProcPtr wfbReadMemory; -extern WriteMemoryProcPtr wfbWriteMemory; +extern _X_EXPORT ReadMemoryProcPtr wfbReadMemory; +extern _X_EXPORT WriteMemoryProcPtr wfbWriteMemory; #endif /* * fbwindow.c */ -Bool +extern _X_EXPORT Bool fbCreateWindow(WindowPtr pWin); -Bool +extern _X_EXPORT Bool fbDestroyWindow(WindowPtr pWin); -Bool +extern _X_EXPORT Bool fbMapWindow(WindowPtr pWindow); -Bool +extern _X_EXPORT Bool fbPositionWindow(WindowPtr pWin, int x, int y); -Bool +extern _X_EXPORT Bool fbUnmapWindow(WindowPtr pWindow); -void +extern _X_EXPORT void fbCopyWindowProc (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -2047,23 +2047,24 @@ fbCopyWindowProc (DrawablePtr pSrcDrawable, Pixel bitplane, void *closure); -void +extern _X_EXPORT void fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc); -Bool +extern _X_EXPORT Bool fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask); -void +extern _X_EXPORT void fbFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion, FbBits and, FbBits xor); -pixman_image_t *image_from_pict (PicturePtr pict, - Bool has_clip); -void free_pixman_pict (PicturePtr, pixman_image_t *); +extern _X_EXPORT pixman_image_t * +image_from_pict (PicturePtr pict, + Bool has_clip); +extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *); #endif /* _FB_H_ */ diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 0f874f0f1..1ebd598a8 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -265,7 +265,7 @@ fb24_32BltUp (CARD8 *srcLine, /* * Spans functions; probably unused. */ -_X_EXPORT void +void fb24_32GetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, @@ -308,7 +308,7 @@ fb24_32GetSpans(DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fb24_32SetSpans (DrawablePtr pDrawable, GCPtr pGC, char *src, @@ -374,7 +374,7 @@ fb24_32SetSpans (DrawablePtr pDrawable, /* * Clip and put 32bpp Z-format images to a 24bpp drawable */ -_X_EXPORT void +void fb24_32PutZImage (DrawablePtr pDrawable, RegionPtr pClip, int alu, @@ -436,7 +436,7 @@ fb24_32PutZImage (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fb24_32GetImage (DrawablePtr pDrawable, int x, int y, @@ -472,7 +472,7 @@ fb24_32GetImage (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fb24_32CopyMtoN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -531,7 +531,7 @@ fb24_32CopyMtoN (DrawablePtr pSrcDrawable, fbFinishAccess (pDstDrawable); } -_X_EXPORT PixmapPtr +PixmapPtr fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel) { ScreenPtr pScreen = pOldTile->drawable.pScreen; @@ -583,7 +583,7 @@ typedef struct { int width; } miScreenInitParmsRec, *miScreenInitParmsPtr; -_X_EXPORT Bool +Bool fb24_32CreateScreenResources(ScreenPtr pScreen) { miScreenInitParmsPtr pScrInitParms; @@ -604,7 +604,7 @@ fb24_32CreateScreenResources(ScreenPtr pScreen) return retval; } -_X_EXPORT Bool +Bool fb24_32ModifyPixmapHeader (PixmapPtr pPixmap, int width, int height, diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 42960061c..c40796c11 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -29,7 +29,7 @@ #ifdef FB_SCREEN_PRIVATE static int fbScreenPrivateKeyIndex; static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex; -_X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void) +DevPrivateKey fbGetScreenPrivateKey(void) { return fbScreenPrivateKey; } @@ -37,19 +37,19 @@ _X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void) static int fbGCPrivateKeyIndex; static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex; -_X_EXPORT DevPrivateKey fbGetGCPrivateKey(void) +DevPrivateKey fbGetGCPrivateKey(void) { return fbGCPrivateKey; } static int fbWinPrivateKeyIndex; static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex; -_X_EXPORT DevPrivateKey fbGetWinPrivateKey(void) +DevPrivateKey fbGetWinPrivateKey(void) { return fbWinPrivateKey; } -_X_EXPORT Bool +Bool fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey) { if (pGCKey) @@ -71,6 +71,6 @@ fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey) } #ifdef FB_ACCESS_WRAPPER -_X_EXPORT ReadMemoryProcPtr wfbReadMemory; -_X_EXPORT WriteMemoryProcPtr wfbWriteMemory; +ReadMemoryProcPtr wfbReadMemory; +WriteMemoryProcPtr wfbWriteMemory; #endif diff --git a/fb/fbarc.c b/fb/fbarc.c index 2597368b4..3a8a2c56a 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -37,7 +37,7 @@ typedef void (*FbArc) (FbBits *dst, FbBits and, FbBits xor); -_X_EXPORT void +void fbPolyArc (DrawablePtr pDrawable, GCPtr pGC, int narcs, diff --git a/fb/fbbits.h b/fb/fbbits.h index 8733be836..44991f106 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -67,7 +67,7 @@ */ #ifdef BRESSOLID -_X_EXPORT void +void BRESSOLID (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -123,7 +123,7 @@ BRESSOLID (DrawablePtr pDrawable, #endif #ifdef BRESDASH -_X_EXPORT void +void BRESDASH (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -269,7 +269,7 @@ onOffOdd: #endif #ifdef DOTS -_X_EXPORT void +void DOTS (FbBits *dst, FbStride dstStride, int dstBpp, @@ -329,7 +329,7 @@ DOTS (FbBits *dst, #define ARCCOPY(d) STORE(d,xorBits) #define ARCRROP(d) RROP(d,andBits,xorBits) -_X_EXPORT void +void ARC (FbBits *dst, FbStride dstStride, int dstBpp, @@ -557,7 +557,7 @@ ARC (FbBits *dst, # define WRITE4(d,n,fg) (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg)) #endif -_X_EXPORT void +void GLYPH (FbBits *dstBits, FbStride dstStride, int dstBpp, @@ -659,7 +659,7 @@ GLYPH (FbBits *dstBits, #endif #ifdef POLYLINE -_X_EXPORT void +void POLYLINE (DrawablePtr pDrawable, GCPtr pGC, int mode, @@ -797,7 +797,7 @@ POLYLINE (DrawablePtr pDrawable, #endif #ifdef POLYSEGMENT -_X_EXPORT void +void POLYSEGMENT (DrawablePtr pDrawable, GCPtr pGC, int nseg, diff --git a/fb/fbblt.c b/fb/fbblt.c index 6c9d50cf1..38271c0c9 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -39,7 +39,7 @@ } \ } -_X_EXPORT void +void fbBlt (FbBits *srcLine, FbStride srcStride, int srcX, @@ -568,7 +568,7 @@ fbBlt24Line (FbBits *src, #endif } -_X_EXPORT void +void fbBlt24 (FbBits *srcLine, FbStride srcStride, int srcX, @@ -873,7 +873,7 @@ fbSetBltOdd (FbStip *stip, } #endif -_X_EXPORT void +void fbBltStip (FbStip *src, FbStride srcStride, /* in FbStip units, not FbBits units */ int srcX, diff --git a/fb/fbbltone.c b/fb/fbbltone.c index ec9300f6c..ffe69775a 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -78,7 +78,7 @@ #endif #if FB_SHIFT == 6 -_X_EXPORT CARD8 fb8Lane[256] = { +CARD8 fb8Lane[256] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, @@ -95,33 +95,33 @@ _X_EXPORT CARD8 fb8Lane[256] = { 242, 243, 244,245,246,247,248,249,250,251,252,253,254,255, }; -_X_EXPORT CARD8 fb16Lane[256] = { +CARD8 fb16Lane[256] = { 0x00, 0x03, 0x0c, 0x0f, 0x30, 0x33, 0x3c, 0x3f, 0xc0, 0xc3, 0xcc, 0xcf, 0xf0, 0xf3, 0xfc, 0xff, }; -_X_EXPORT CARD8 fb32Lane[16] = { +CARD8 fb32Lane[16] = { 0x00, 0x0f, 0xf0, 0xff, }; #endif #if FB_SHIFT == 5 -_X_EXPORT CARD8 fb8Lane[16] = { +CARD8 fb8Lane[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; -_X_EXPORT CARD8 fb16Lane[16] = { +CARD8 fb16Lane[16] = { 0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -_X_EXPORT CARD8 fb32Lane[16] = { +CARD8 fb32Lane[16] = { 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; #endif -_X_EXPORT CARD8 *fbLaneTable[33] = { +CARD8 *fbLaneTable[33] = { 0, 0, 0, 0, 0, 0, 0, 0, fb8Lane, 0, 0, 0, 0, 0, 0, 0, fb16Lane, 0, 0, 0, 0, 0, 0, 0, @@ -130,7 +130,7 @@ _X_EXPORT CARD8 *fbLaneTable[33] = { }; #endif -_X_EXPORT void +void fbBltOne (FbStip *src, FbStride srcStride, /* FbStip units per scanline */ int srcX, /* bit position of source */ @@ -457,7 +457,7 @@ fbBltOne (FbStip *src, #define FbStip24New(rot) (2 + (rot != 0)) #define FbStip24Len 4 -_X_EXPORT const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { +const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { /* rotate 0 */ { C4_24( 0, 0), C4_24( 1, 0), C4_24( 2, 0), C4_24( 3, 0), @@ -569,7 +569,7 @@ const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { * have no acceleration so this code is used for stipples, copyplane * and text */ -_X_EXPORT void +void fbBltOne24 (FbStip *srcLine, FbStride srcStride, /* FbStip units per scanline */ int srcX, /* bit position of source */ @@ -754,7 +754,7 @@ fbBltOne24 (FbStip *srcLine, * from an N bit image to a 1 bit image */ -_X_EXPORT void +void fbBltPlane (FbBits *src, FbStride srcStride, int srcX, diff --git a/fb/fbcmap.c b/fb/fbcmap.c index c01e37940..c29a5131c 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ColormapPtr FbInstalledMaps[MAXSCREENS]; -_X_EXPORT int +int fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { /* By the time we are processing requests, we can guarantee that there @@ -57,7 +57,7 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) } -_X_EXPORT void +void fbInstallColormap(ColormapPtr pmap) { int index = pmap->pScreen->myNum; @@ -75,7 +75,7 @@ fbInstallColormap(ColormapPtr pmap) } } -_X_EXPORT void +void fbUninstallColormap(ColormapPtr pmap) { int index = pmap->pScreen->myNum; @@ -92,7 +92,7 @@ fbUninstallColormap(ColormapPtr pmap) } } -_X_EXPORT void +void fbResolveColor(unsigned short *pred, unsigned short *pgreen, unsigned short *pblue, @@ -116,7 +116,7 @@ fbResolveColor(unsigned short *pred, } } -_X_EXPORT Bool +Bool fbInitializeColormap(ColormapPtr pmap) { register unsigned i; @@ -216,7 +216,7 @@ fbInitializeColormap(ColormapPtr pmap) outdefs[i].blue = pmap->blue[blue >> pVisual->offsetBlue].co.local.blue; \ } -_X_EXPORT int +int fbExpandDirectColors (ColormapPtr pmap, int ndef, xColorItem *indefs, @@ -278,7 +278,7 @@ fbExpandDirectColors (ColormapPtr pmap, return nresult; } -_X_EXPORT Bool +Bool fbCreateDefColormap(ScreenPtr pScreen) { unsigned short zero = 0, ones = 0xFFFF; @@ -387,7 +387,7 @@ maskShift (Pixel p) return s; } -_X_EXPORT Bool +Bool fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, Pixel redMask, Pixel greenMask, Pixel blueMask) { @@ -415,7 +415,7 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, return TRUE; } -_X_EXPORT Bool +Bool fbHasVisualTypes (int depth) { fbVisualsPtr v; @@ -426,7 +426,7 @@ fbHasVisualTypes (int depth) return FALSE; } -_X_EXPORT Bool +Bool fbSetVisualTypes (int depth, int visuals, int bitsPerRGB) { return fbSetVisualTypesAndMasks (depth, visuals, bitsPerRGB, @@ -439,7 +439,7 @@ fbSetVisualTypes (int depth, int visuals, int bitsPerRGB) * the set which can be used with this version of fb. */ -_X_EXPORT Bool +Bool fbInitVisuals (VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c index 269a55552..188decd4c 100644 --- a/fb/fbcmap_mi.c +++ b/fb/fbcmap_mi.c @@ -49,19 +49,19 @@ fbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) return miListInstalledColormaps(pScreen, pmaps); } -_X_EXPORT void +void fbInstallColormap(ColormapPtr pmap) { miInstallColormap(pmap); } -_X_EXPORT void +void fbUninstallColormap(ColormapPtr pmap) { miUninstallColormap(pmap); } -_X_EXPORT void +void fbResolveColor(unsigned short *pred, unsigned short *pgreen, unsigned short *pblue, @@ -70,7 +70,7 @@ fbResolveColor(unsigned short *pred, miResolveColor(pred, pgreen, pblue, pVisual); } -_X_EXPORT Bool +Bool fbInitializeColormap(ColormapPtr pmap) { return miInitializeColormap(pmap); @@ -85,25 +85,25 @@ fbExpandDirectColors (ColormapPtr pmap, return miExpandDirectColors(pmap, ndef, indefs, outdefs); } -_X_EXPORT Bool +Bool fbCreateDefColormap(ScreenPtr pScreen) { return miCreateDefColormap(pScreen); } -_X_EXPORT void +void fbClearVisualTypes(void) { miClearVisualTypes(); } -_X_EXPORT Bool +Bool fbSetVisualTypes (int depth, int visuals, int bitsPerRGB) { return miSetVisualTypes(depth, visuals, bitsPerRGB, -1); } -_X_EXPORT Bool +Bool fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, Pixel redMask, Pixel greenMask, Pixel blueMask) { @@ -116,7 +116,7 @@ fbSetVisualTypesAndMasks (int depth, int visuals, int bitsPerRGB, * of visuals and depths for the screen which coorespond to * the set which can be used with this version of fb. */ -_X_EXPORT Bool +Bool fbInitVisuals (VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 084fadab2..b8b0b6a8c 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -28,7 +28,7 @@ #include "fb.h" -_X_EXPORT void +void fbCopyNtoN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -100,7 +100,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, fbFinishAccess (pSrcDrawable); } -_X_EXPORT void +void fbCopy1toN (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -173,7 +173,7 @@ fbCopy1toN (DrawablePtr pSrcDrawable, fbFinishAccess (pSrcDrawable); } -_X_EXPORT void +void fbCopyNto1 (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -289,7 +289,7 @@ fbCopyNto1 (DrawablePtr pSrcDrawable, } } -_X_EXPORT void +void fbCopyRegion (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -407,7 +407,7 @@ fbCopyRegion (DrawablePtr pSrcDrawable, xfree (pboxNew2); } -_X_EXPORT RegionPtr +RegionPtr fbDoCopy (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -612,7 +612,7 @@ fbDoCopy (DrawablePtr pSrcDrawable, return prgnExposed; } -_X_EXPORT RegionPtr +RegionPtr fbCopyArea (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -635,7 +635,7 @@ fbCopyArea (DrawablePtr pSrcDrawable, widthSrc, heightSrc, xOut, yOut, copy, 0, 0); } -_X_EXPORT RegionPtr +RegionPtr fbCopyPlane (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, diff --git a/fb/fbfill.c b/fb/fbfill.c index f31d1bba4..831b1ce76 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT void +void fbFill (DrawablePtr pDrawable, GCPtr pGC, int x, @@ -165,7 +165,7 @@ fbFill (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fbSolidBoxClipped (DrawablePtr pDrawable, RegionPtr pClip, int x1, diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index a22e648ab..4e4edb3fd 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT void +void fbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrect, diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index 60a70754f..5d2147213 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT void +void fbFillSpans (DrawablePtr pDrawable, GCPtr pGC, int n, @@ -28,7 +28,7 @@ #include "fb.h" -_X_EXPORT const GCFuncs fbGCFuncs = { +const GCFuncs fbGCFuncs = { fbValidateGC, miChangeGC, miCopyGC, @@ -38,7 +38,7 @@ _X_EXPORT const GCFuncs fbGCFuncs = { miCopyClip, }; -_X_EXPORT const GCOps fbGCOps = { +const GCOps fbGCOps = { fbFillSpans, fbSetSpans, fbPutImage, @@ -61,7 +61,7 @@ _X_EXPORT const GCOps fbGCOps = { fbPushPixels }; -_X_EXPORT Bool +Bool fbCreateGC(GCPtr pGC) { pGC->clientClip = NULL; @@ -84,7 +84,7 @@ fbCreateGC(GCPtr pGC) /* * Pad pixmap to FB_UNIT bits wide */ -_X_EXPORT void +void fbPadPixmap (PixmapPtr pPixmap) { int width; @@ -193,7 +193,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp) return TRUE; } -_X_EXPORT void +void fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { FbGCPrivPtr pPriv = fbGetGCPrivate(pGC); diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index b939d6930..6402c6c38 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT void +void fbGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 9ea907dc7..2c19b742f 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -31,7 +31,7 @@ #define dummyScreen screenInfo.screens[0] -_X_EXPORT Bool +Bool fbGlyphIn (RegionPtr pRegion, int x, int y, @@ -129,7 +129,7 @@ fbGlyphIn (RegionPtr pRegion, #define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3)) #endif -_X_EXPORT void +void fbGlyph24 (FbBits *dstBits, FbStride dstStride, int dstBpp, @@ -253,7 +253,7 @@ fbGlyph24 (FbBits *dstBits, #endif #endif -_X_EXPORT void +void fbPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, @@ -343,7 +343,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable, } -_X_EXPORT void +void fbImageGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, diff --git a/fb/fbimage.c b/fb/fbimage.c index 030a6a45d..2b9ac27c0 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -28,7 +28,7 @@ #include "fb.h" -_X_EXPORT void +void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, @@ -112,7 +112,7 @@ fbPutImage (DrawablePtr pDrawable, } } -_X_EXPORT void +void fbPutZImage (DrawablePtr pDrawable, RegionPtr pClip, int alu, @@ -172,7 +172,7 @@ fbPutZImage (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fbPutXYImage (DrawablePtr pDrawable, RegionPtr pClip, FbBits fg, @@ -281,7 +281,7 @@ fbPutXYImage (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fbGetImage (DrawablePtr pDrawable, int x, int y, diff --git a/fb/fbline.c b/fb/fbline.c index eddb6d521..2cee123ae 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT void +void fbZeroLine (DrawablePtr pDrawable, GCPtr pGC, int mode, @@ -61,7 +61,7 @@ fbZeroLine (DrawablePtr pDrawable, } } -_X_EXPORT void +void fbZeroSegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, @@ -85,7 +85,7 @@ fbZeroSegment (DrawablePtr pDrawable, } } -_X_EXPORT void +void fbFixCoordModePrevious (int npt, DDXPointPtr ppt) { @@ -102,7 +102,7 @@ fbFixCoordModePrevious (int npt, } } -_X_EXPORT void +void fbPolyLine (DrawablePtr pDrawable, GCPtr pGC, int mode, @@ -140,7 +140,7 @@ fbPolyLine (DrawablePtr pDrawable, (*line) (pDrawable, pGC, mode, npt, ppt); } -_X_EXPORT void +void fbPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, diff --git a/fb/fboverlay.c b/fb/fboverlay.c index cbfaace6d..1432cb6f0 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -36,7 +36,7 @@ static int fbOverlayScreenPrivateKeyIndex; static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex; -_X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void) +DevPrivateKey fbOverlayGetScreenPrivateKey(void) { return fbOverlayScreenPrivateKey; } @@ -45,7 +45,7 @@ _X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void) * Replace this if you want something supporting * multiple overlays with the same depth */ -_X_EXPORT Bool +Bool fbOverlayCreateWindow(WindowPtr pWin) { FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen); @@ -84,7 +84,7 @@ fbOverlayCreateWindow(WindowPtr pWin) return FALSE; } -_X_EXPORT Bool +Bool fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen) { FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen); @@ -101,7 +101,7 @@ fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen) /* * Return layer containing this window */ -_X_EXPORT int +int fbOverlayWindowLayer(WindowPtr pWin) { FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen); @@ -114,7 +114,7 @@ fbOverlayWindowLayer(WindowPtr pWin) return 0; } -_X_EXPORT Bool +Bool fbOverlayCreateScreenResources(ScreenPtr pScreen) { int i; @@ -153,7 +153,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen) return TRUE; } -_X_EXPORT void +void fbOverlayPaintKey (DrawablePtr pDrawable, RegionPtr pRegion, CARD32 pixel, @@ -166,7 +166,7 @@ fbOverlayPaintKey (DrawablePtr pDrawable, /* * Track visible region for each layer */ -_X_EXPORT void +void fbOverlayUpdateLayerRegion (ScreenPtr pScreen, int layer, RegionPtr prgn) @@ -213,7 +213,7 @@ fbOverlayUpdateLayerRegion (ScreenPtr pScreen, /* * Copy only areas in each layer containing real bits */ -_X_EXPORT void +void fbOverlayCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) @@ -267,7 +267,7 @@ fbOverlayCopyWindow(WindowPtr pWin, REGION_UNINIT(pScreen, &rgnDst); } -_X_EXPORT void +void fbOverlayWindowExposures (WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed) @@ -278,7 +278,7 @@ fbOverlayWindowExposures (WindowPtr pWin, miWindowExposures(pWin, prgn, other_exposed); } -_X_EXPORT Bool +Bool fbOverlaySetupScreen(ScreenPtr pScreen, pointer pbits1, pointer pbits2, @@ -325,7 +325,7 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen) return retval; } -_X_EXPORT Bool +Bool fbOverlayFinishScreenInit(ScreenPtr pScreen, pointer pbits1, pointer pbits2, diff --git a/fb/fboverlay.h b/fb/fboverlay.h index f3db0bb7d..ed355afad 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -27,7 +27,7 @@ #include "privates.h" -extern DevPrivateKey fbOverlayGetScreenPrivateKey(void); +extern _X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void); #ifndef FB_OVERLAY_MAX #define FB_OVERLAY_MAX 2 @@ -59,40 +59,40 @@ typedef struct _fbOverlayScrPriv { #define fbOverlayGetScrPriv(s) \ dixLookupPrivate(&(s)->devPrivates, fbOverlayGetScreenPrivateKey()) -Bool +extern _X_EXPORT Bool fbOverlayCreateWindow(WindowPtr pWin); -Bool +extern _X_EXPORT Bool fbOverlayCloseScreen (int iScreen, ScreenPtr pScreen); -int +extern _X_EXPORT int fbOverlayWindowLayer(WindowPtr pWin); -Bool +extern _X_EXPORT Bool fbOverlayCreateScreenResources(ScreenPtr pScreen); -void +extern _X_EXPORT void fbOverlayPaintKey (DrawablePtr pDrawable, RegionPtr pRegion, CARD32 pixel, int layer); -void +extern _X_EXPORT void fbOverlayUpdateLayerRegion (ScreenPtr pScreen, int layer, RegionPtr prgn); -void +extern _X_EXPORT void fbOverlayCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc); -void +extern _X_EXPORT void fbOverlayWindowExposures (WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed); -Bool +extern _X_EXPORT Bool fbOverlaySetupScreen(ScreenPtr pScreen, pointer pbits1, pointer pbits2, @@ -105,7 +105,7 @@ fbOverlaySetupScreen(ScreenPtr pScreen, int bpp1, int bpp2); -Bool +extern _X_EXPORT Bool fbOverlayFinishScreenInit(ScreenPtr pScreen, pointer pbits1, pointer pbits2, diff --git a/fb/fbpict.c b/fb/fbpict.c index 5dff4e13f..1355e9071 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -39,7 +39,7 @@ #define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) -_X_EXPORT void +void fbWalkCompositeRegion (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -143,7 +143,7 @@ fbWalkCompositeRegion (CARD8 op, REGION_UNINIT (pDst->pDrawable->pScreen, ®ion); } -_X_EXPORT void +void fbComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -192,7 +192,7 @@ fbComposite (CARD8 op, free_pixman_pict (pDst, dest); } -_X_EXPORT void +void fbCompositeGeneral (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -400,7 +400,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict) pixman_image_set_source_clipping (image, TRUE); } -_X_EXPORT pixman_image_t * +pixman_image_t * image_from_pict (PicturePtr pict, Bool has_clip) { @@ -440,14 +440,14 @@ image_from_pict (PicturePtr pict, return image; } -_X_EXPORT void +void free_pixman_pict (PicturePtr pict, pixman_image_t *image) { if (image && pixman_image_unref (image) && pict->pDrawable) fbFinishAccess (pict->pDrawable); } -_X_EXPORT Bool +Bool fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) { diff --git a/fb/fbpict.h b/fb/fbpict.h index b4c1dcf12..0a8082ec0 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -383,7 +383,7 @@ typedef struct _FbComposeData { CARD16 height; } FbComposeData; -void +extern _X_EXPORT void fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer); typedef FASTCALL void (*CombineMaskU) (CARD32 *src, const CARD32 *mask, int width); @@ -398,7 +398,7 @@ typedef struct _FbComposeFunctions { /* fbcompose.c */ -void +extern _X_EXPORT void fbCompositeGeneral (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -413,7 +413,7 @@ fbCompositeGeneral (CARD8 op, CARD16 height); /* fbpict.c */ -void +extern _X_EXPORT void fbComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -440,7 +440,7 @@ typedef void (*CompositeFunc) (CARD8 op, CARD16 width, CARD16 height); -void +extern _X_EXPORT void fbWalkCompositeRegion (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -459,20 +459,20 @@ fbWalkCompositeRegion (CARD8 op, /* fbtrap.c */ -void +extern _X_EXPORT void fbAddTraps (PicturePtr pPicture, INT16 xOff, INT16 yOff, int ntrap, xTrap *traps); -void +extern _X_EXPORT void fbRasterizeTrapezoid (PicturePtr alpha, xTrapezoid *trap, int x_off, int y_off); -void +extern _X_EXPORT void fbAddTriangles (PicturePtr pPicture, INT16 xOff, INT16 yOff, diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 96b3cf015..311da9e62 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -28,7 +28,7 @@ #include "fb.h" -_X_EXPORT PixmapPtr +PixmapPtr fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, unsigned usage_hint) { @@ -82,7 +82,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp, return pPixmap; } -_X_EXPORT PixmapPtr +PixmapPtr fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint) { @@ -95,7 +95,7 @@ fbCreatePixmap (ScreenPtr pScreen, int width, int height, int depth, return fbCreatePixmapBpp (pScreen, width, height, depth, bpp, usage_hint); } -_X_EXPORT Bool +Bool fbDestroyPixmap (PixmapPtr pPixmap) { if(--pPixmap->refcnt) @@ -137,7 +137,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) && \ * Then it coalesces the current line with the previous if they have boxes * at the same X coordinates. */ -_X_EXPORT RegionPtr +RegionPtr fbPixmapToRegion(PixmapPtr pPix) { register RegionPtr pReg; @@ -348,7 +348,7 @@ fbValidateBits (FbStip *bits, int stride, FbStip data) } } -_X_EXPORT void +void fbValidateDrawable (DrawablePtr pDrawable) { FbStip *bits, *first, *last; @@ -368,14 +368,14 @@ fbValidateDrawable (DrawablePtr pDrawable) fbFinishAccess (pDrawable); } -_X_EXPORT void +void fbSetBits (FbStip *bits, int stride, FbStip data) { while (stride--) *bits++ = data; } -_X_EXPORT void +void fbInitializeDrawable (DrawablePtr pDrawable) { FbStip *bits, *first, *last; diff --git a/fb/fbpoint.c b/fb/fbpoint.c index d6637d884..c0ea8ba5b 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -39,7 +39,7 @@ typedef void (*FbDots) (FbBits *dst, FbBits and, FbBits xor); -_X_EXPORT void +void fbDots (FbBits *dstOrig, FbStride dstStride, int dstBpp, @@ -107,7 +107,7 @@ fbDots (FbBits *dstOrig, } } -_X_EXPORT void +void fbPolyPoint (DrawablePtr pDrawable, GCPtr pGC, int mode, diff --git a/fb/fbpush.c b/fb/fbpush.c index 55be9b389..891572f0d 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT void +void fbPushPattern (DrawablePtr pDrawable, GCPtr pGC, @@ -100,7 +100,7 @@ fbPushPattern (DrawablePtr pDrawable, } } -_X_EXPORT void +void fbPushFill (DrawablePtr pDrawable, GCPtr pGC, @@ -172,7 +172,7 @@ fbPushFill (DrawablePtr pDrawable, } } -_X_EXPORT void +void fbPushImage (DrawablePtr pDrawable, GCPtr pGC, @@ -223,7 +223,7 @@ fbPushImage (DrawablePtr pDrawable, } } -_X_EXPORT void +void fbPushPixels (GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable, diff --git a/fb/fbrop.h b/fb/fbrop.h index 1685ee836..a01fdabfe 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -27,7 +27,7 @@ typedef struct _mergeRopBits { FbBits ca1, cx1, ca2, cx2; } FbMergeRopRec, *FbMergeRopPtr; -extern const FbMergeRopRec FbMergeRopBits[16]; +extern _X_EXPORT const FbMergeRopRec FbMergeRopBits[16]; #define FbDeclareMergeRop() FbBits _ca1, _cx1, _ca2, _cx2; #define FbDeclarePrebuiltMergeRop() FbBits _cca, _ccx; @@ -95,14 +95,14 @@ extern const FbMergeRopRec FbMergeRopBits[16]; * Stippling operations; */ -extern const FbBits fbStipple16Bits[256]; /* half of table */ +extern _X_EXPORT const FbBits fbStipple16Bits[256]; /* half of table */ #define FbStipple16Bits(b) \ (fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT) -extern const FbBits fbStipple8Bits[256]; -extern const FbBits fbStipple4Bits[16]; -extern const FbBits fbStipple2Bits[4]; -extern const FbBits fbStipple1Bits[2]; -extern const FbBits *const fbStippleTable[]; +extern _X_EXPORT const FbBits fbStipple8Bits[256]; +extern _X_EXPORT const FbBits fbStipple4Bits[16]; +extern _X_EXPORT const FbBits fbStipple2Bits[4]; +extern _X_EXPORT const FbBits fbStipple1Bits[2]; +extern _X_EXPORT const FbBits *const fbStippleTable[]; #define FbStippleRRop(dst, b, fa, fx, ba, bx) \ (FbDoRRop(dst, fa, fx) & b) | (FbDoRRop(dst, ba, bx) & ~b) diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 483171cb3..24eadde1a 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT Bool +Bool fbCloseScreen (int index, ScreenPtr pScreen) { int d; @@ -43,19 +43,19 @@ fbCloseScreen (int index, ScreenPtr pScreen) return TRUE; } -_X_EXPORT Bool +Bool fbRealizeFont(ScreenPtr pScreen, FontPtr pFont) { return (TRUE); } -_X_EXPORT Bool +Bool fbUnrealizeFont(ScreenPtr pScreen, FontPtr pFont) { return (TRUE); } -_X_EXPORT void +void fbQueryBestSize (int class, unsigned short *width, unsigned short *height, ScreenPtr pScreen) @@ -81,7 +81,7 @@ fbQueryBestSize (int class, } } -_X_EXPORT PixmapPtr +PixmapPtr _fbGetWindowPixmap (WindowPtr pWindow) { return fbGetWindowPixmap (pWindow); @@ -93,7 +93,7 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap) dixSetPrivate(&pWindow->devPrivates, fbGetWinPrivateKey(), pPixmap); } -_X_EXPORT Bool +Bool fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */ int xsize, /* in pixels */ @@ -140,7 +140,7 @@ fbSetupScreen(ScreenPtr pScreen, } #ifdef FB_ACCESS_WRAPPER -_X_EXPORT Bool +Bool wfbFinishScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, @@ -247,7 +247,7 @@ fbFinishScreenInit(ScreenPtr pScreen, /* dts * (inch/dot) * (25.4 mm / inch) = mm */ #ifdef FB_ACCESS_WRAPPER -_X_EXPORT Bool +Bool wfbScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, @@ -267,7 +267,7 @@ wfbScreenInit(ScreenPtr pScreen, return TRUE; } #else -_X_EXPORT Bool +Bool fbScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, diff --git a/fb/fbseg.c b/fb/fbseg.c index b26035514..80ce7404e 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -33,7 +33,7 @@ ((dir < 0) ? FbStipLeft(mask,bpp) : \ FbStipRight(mask,bpp))) -_X_EXPORT void +void fbBresSolid (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -117,7 +117,7 @@ fbBresSolid (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fbBresDash (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -203,7 +203,7 @@ fbBresDash (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -_X_EXPORT void +void fbBresFill (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -255,7 +255,7 @@ fbSetFg (DrawablePtr pDrawable, } } -_X_EXPORT void +void fbBresFillDash (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -513,7 +513,7 @@ fbBresDash24RRop (DrawablePtr pDrawable, * based on the contents of the specified GC. */ -_X_EXPORT FbBres * +FbBres * fbSelectBres (DrawablePtr pDrawable, GCPtr pGC) { @@ -575,7 +575,7 @@ fbSelectBres (DrawablePtr pDrawable, return bres; } -_X_EXPORT void +void fbBres (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -594,7 +594,7 @@ fbBres (DrawablePtr pDrawable, e, e1, e3, len); } -_X_EXPORT void +void fbSegment (DrawablePtr pDrawable, GCPtr pGC, int x1, diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index f64622aef..227ba4c62 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT void +void fbSetSpans (DrawablePtr pDrawable, GCPtr pGC, char *src, diff --git a/fb/fbsolid.c b/fb/fbsolid.c index cc3e72828..53fcae071 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -28,7 +28,7 @@ #include "fb.h" -_X_EXPORT void +void fbSolid (FbBits *dst, FbStride dstStride, int dstX, @@ -82,7 +82,7 @@ fbSolid (FbBits *dst, } #ifdef FB_24BIT -_X_EXPORT void +void fbSolid24 (FbBits *dst, FbStride dstStride, int dstX, diff --git a/fb/fbstipple.c b/fb/fbstipple.c index 4ceab862d..7d1326367 100644 --- a/fb/fbstipple.c +++ b/fb/fbstipple.c @@ -56,7 +56,7 @@ * Repeat a transparent stipple across a scanline n times */ -_X_EXPORT void +void fbTransparentSpan (FbBits *dst, FbBits stip, FbBits fgxor, @@ -80,7 +80,7 @@ fbTransparentSpan (FbBits *dst, } #endif -_X_EXPORT void +void fbEvenStipple (FbBits *dst, FbStride dstStride, int dstX, @@ -213,7 +213,7 @@ fbEvenStipple (FbBits *dst, } } -_X_EXPORT void +void fbOddStipple (FbBits *dst, FbStride dstStride, int dstX, @@ -278,7 +278,7 @@ fbOddStipple (FbBits *dst, } } -_X_EXPORT void +void fbStipple (FbBits *dst, FbStride dstStride, int dstX, diff --git a/fb/fbtile.c b/fb/fbtile.c index 62d326625..05a27a17b 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -31,7 +31,7 @@ * than FB_UNIT */ -_X_EXPORT void +void fbEvenTile (FbBits *dst, FbStride dstStride, int dstX, @@ -107,7 +107,7 @@ fbEvenTile (FbBits *dst, } } -_X_EXPORT void +void fbOddTile(FbBits *dst, FbStride dstStride, int dstX, @@ -172,7 +172,7 @@ fbOddTile(FbBits *dst, } } -_X_EXPORT void +void fbTile (FbBits *dst, FbStride dstStride, int dstX, diff --git a/fb/fbtrap.c b/fb/fbtrap.c index ab64701ec..830603ae7 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -33,7 +33,7 @@ #include "renderedge.h" #include "fbpict.h" -_X_EXPORT void +void fbAddTraps (PicturePtr pPicture, INT16 x_off, INT16 y_off, @@ -50,7 +50,7 @@ fbAddTraps (PicturePtr pPicture, free_pixman_pict (pPicture, image); } -_X_EXPORT void +void fbRasterizeTrapezoid (PicturePtr pPicture, xTrapezoid *trap, int x_off, @@ -92,7 +92,7 @@ _Clockwise (xPointFixed *ref, xPointFixed *a, xPointFixed *b) } /* FIXME -- this could be made more efficient */ -_X_EXPORT void +void fbAddTriangles (PicturePtr pPicture, INT16 x_off, INT16 y_off, diff --git a/fb/fbutil.c b/fb/fbutil.c index db1f5a3f3..5e232971e 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -26,7 +26,7 @@ #include "fb.h" -_X_EXPORT FbBits +FbBits fbReplicatePixel (Pixel p, int bpp) { FbBits b = p; @@ -40,7 +40,7 @@ fbReplicatePixel (Pixel p, int bpp) return b; } -_X_EXPORT void +void fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp) { FbBits and, xor; @@ -122,7 +122,7 @@ fbReduceRasterOp (int rop, FbBits fg, FbBits pm, FbBits *andp, FbBits *xorp) #define O 0 #define I FB_ALLONES -_X_EXPORT const FbMergeRopRec FbMergeRopBits[16] = { +const FbMergeRopRec FbMergeRopBits[16] = { { O,O,O,O }, /* clear 0x0 0 */ { I,O,O,O }, /* and 0x1 src AND dst */ { I,O,I,O }, /* andReverse 0x2 src AND NOT dst */ @@ -180,20 +180,20 @@ _X_EXPORT const FbMergeRopRec FbMergeRopBits[16] = { #if FB_UNIT == 16 #define fbStipple16Bits 0 #define fbStipple8Bits 0 -_X_EXPORT const FbBits fbStipple4Bits[16] = { +const FbBits fbStipple4Bits[16] = { C4( 0,4), C4( 1,4), C4( 2,4), C4( 3,4), C4( 4,4), C4( 5,4), C4( 6,4), C4( 7,4), C4( 8,4), C4( 9,4), C4( 10,4), C4( 11,4), C4( 12,4), C4( 13,4), C4( 14,4), C4( 15,4),}; -_X_EXPORT const FbBits fbStipple2Bits[4] = { +const FbBits fbStipple2Bits[4] = { C2( 0,8), C2( 1,8), C2( 2,8), C2( 3,8), }; -_X_EXPORT const FbBits fbStipple1Bits[2] = { +const FbBits fbStipple1Bits[2] = { C1( 0,16), C1( 1,16), }; #endif #if FB_UNIT == 32 #define fbStipple16Bits 0 -_X_EXPORT const FbBits fbStipple8Bits[256] = { +const FbBits fbStipple8Bits[256] = { C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4), C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4), C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4), @@ -238,19 +238,19 @@ _X_EXPORT const FbBits fbStipple8Bits[256] = { C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4), C8(252,4), C8(253,4), C8(254,4), C8(255,4), }; -_X_EXPORT const FbBits fbStipple4Bits[16] = { +const FbBits fbStipple4Bits[16] = { C4( 0,8), C4( 1,8), C4( 2,8), C4( 3,8), C4( 4,8), C4( 5,8), C4( 6,8), C4( 7,8), C4( 8,8), C4( 9,8), C4( 10,8), C4( 11,8), C4( 12,8), C4( 13,8), C4( 14,8), C4( 15,8),}; -_X_EXPORT const FbBits fbStipple2Bits[4] = { +const FbBits fbStipple2Bits[4] = { C2( 0,16), C2( 1,16), C2( 2,16), C2( 3,16), }; -_X_EXPORT const FbBits fbStipple1Bits[2] = { +const FbBits fbStipple1Bits[2] = { C1( 0,32), C1( 1,32), }; #endif #if FB_UNIT == 64 -_X_EXPORT const FbBits fbStipple16Bits[256] = { +const FbBits fbStipple16Bits[256] = { C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4), C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4), C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4), @@ -295,7 +295,7 @@ _X_EXPORT const FbBits fbStipple16Bits[256] = { C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4), C8(252,4), C8(253,4), C8(254,4), C8(255,4), }; -_X_EXPORT const FbBits fbStipple8Bits[256] = { +const FbBits fbStipple8Bits[256] = { C8( 0,8), C8( 1,8), C8( 2,8), C8( 3,8), C8( 4,8), C8( 5,8), C8( 6,8), C8( 7,8), C8( 8,8), C8( 9,8), C8( 10,8), C8( 11,8), C8( 12,8), C8( 13,8), C8( 14,8), C8( 15,8), C8( 16,8), C8( 17,8), @@ -340,16 +340,16 @@ _X_EXPORT const FbBits fbStipple8Bits[256] = { C8(246,8), C8(247,8), C8(248,8), C8(249,8), C8(250,8), C8(251,8), C8(252,8), C8(253,8), C8(254,8), C8(255,8), }; -_X_EXPORT const FbBits fbStipple4Bits[16] = { +const FbBits fbStipple4Bits[16] = { C4( 0,16), C4( 1,16), C4( 2,16), C4( 3,16), C4( 4,16), C4( 5,16), C4( 6,16), C4( 7,16), C4( 8,16), C4( 9,16), C4( 10,16), C4( 11,16), C4( 12,16), C4( 13,16), C4( 14,16), C4( 15,16),}; -_X_EXPORT const FbBits fbStipple2Bits[4] = { +const FbBits fbStipple2Bits[4] = { C2( 0,32), C2( 1,32), C2( 2,32), C2( 3,32), }; #define fbStipple1Bits 0 #endif -_X_EXPORT const FbBits * const fbStippleTable[] = { +const FbBits * const fbStippleTable[] = { 0, fbStipple1Bits, fbStipple2Bits, diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 926ed4532..022a16f1b 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -28,7 +28,7 @@ #include "fb.h" -_X_EXPORT Bool +Bool fbCreateWindow(WindowPtr pWin) { dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), @@ -40,31 +40,31 @@ fbCreateWindow(WindowPtr pWin) return TRUE; } -_X_EXPORT Bool +Bool fbDestroyWindow(WindowPtr pWin) { return TRUE; } -_X_EXPORT Bool +Bool fbMapWindow(WindowPtr pWindow) { return TRUE; } -_X_EXPORT Bool +Bool fbPositionWindow(WindowPtr pWin, int x, int y) { return TRUE; } -_X_EXPORT Bool +Bool fbUnmapWindow(WindowPtr pWindow) { return TRUE; } -_X_EXPORT void +void fbCopyWindowProc (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, @@ -115,7 +115,7 @@ fbCopyWindowProc (DrawablePtr pSrcDrawable, fbFinishAccess (pSrcDrawable); } -_X_EXPORT void +void fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) @@ -148,7 +148,7 @@ fbCopyWindow(WindowPtr pWin, fbValidateDrawable (&pWin->drawable); } -_X_EXPORT Bool +Bool fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) { PixmapPtr pPixmap; @@ -201,7 +201,7 @@ fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) return TRUE; } -_X_EXPORT void +void fbFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion, FbBits and, |