XFree86 4.3.0.1

1 files changed, 32 insertions, 145 deletions

diff --git a/mi/mi.h b/mi/mi.h
index dd7dc94ed..fba57567d 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -45,6 +45,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.10 2001/12/14 20:00:19 dawes Exp $ */
+
 #ifndef MI_H
 #define MI_H
 #include "X11/X.h"
@@ -56,6 +58,8 @@ SOFTWARE.
 #include "input.h"
 #include "cursor.h"
 
+#define MiBits	CARD32
+
 typedef struct _miDash *miDashPtr;
 #define EVEN_DASH	0
 #define ODD_DASH	~0
@@ -63,18 +67,15 @@ typedef struct _miDash *miDashPtr;
 /* miarc.c */
 
 extern void miPolyArc(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*narcs*/,
     xArc * /*parcs*/
-#endif
 );
 
 /* mibitblt.c */
 
 extern RegionPtr miCopyArea(
-#if NeedFunctionPrototypes
     DrawablePtr /*pSrcDrawable*/,
     DrawablePtr /*pDstDrawable*/,
     GCPtr /*pGC*/,
@@ -84,25 +85,21 @@ extern RegionPtr miCopyArea(
     int /*heightSrc*/,
     int /*xOut*/,
     int /*yOut*/
-#endif
 );
 
 extern void miOpqStipDrawable(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     RegionPtr /*prgnSrc*/,
-    unsigned long * /*pbits*/,
+    MiBits * /*pbits*/,
     int /*srcx*/,
     int /*w*/,
     int /*h*/,
     int /*dstx*/,
     int /*dsty*/
-#endif
 );
 
 extern RegionPtr miCopyPlane(
-#if NeedFunctionPrototypes
     DrawablePtr /*pSrcDrawable*/,
     DrawablePtr /*pDstDrawable*/,
     GCPtr /*pGC*/,
@@ -113,11 +110,9 @@ extern RegionPtr miCopyPlane(
     int /*dstx*/,
     int /*dsty*/,
     unsigned long /*bitPlane*/
-#endif
 );
 
 extern void miGetImage(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     int /*sx*/,
     int /*sy*/,
@@ -126,11 +121,9 @@ extern void miGetImage(
     unsigned int /*format*/,
     unsigned long /*planeMask*/,
     char * /*pdstLine*/
-#endif
 );
 
 extern void miPutImage(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*depth*/,
@@ -141,48 +134,43 @@ extern void miPutImage(
     int /*leftPad*/,
     int /*format*/,
     char * /*pImage*/
-#endif
 );
 
 /* miclipn.c */
 
 extern void miClipNotify(
-#if NeedFunctionPrototypes
-    void (* /*func*/)()
-#endif
+    void (* /*func*/)(
+	WindowPtr /* pWin */,
+	int /* dx */,
+	int /* dy */
+	)
 );
 
 /* micursor.c */
 
 extern void miRecolorCursor(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScr*/,
     CursorPtr /*pCurs*/,
     Bool /*displayed*/
-#endif
 );
 
 /* midash.c */
 
 extern miDashPtr miDashLine(
-#if NeedFunctionPrototypes
     int /*npt*/,
     DDXPointPtr /*ppt*/,
     unsigned int /*nDash*/,
     unsigned char * /*pDash*/,
     unsigned int /*offset*/,
     int * /*pnseg*/
-#endif
 );
 
 extern void miStepDash(
-#if NeedFunctionPrototypes
     int /*dist*/,
     int * /*pDashIndex*/,
     unsigned char * /*pDash*/,
     int /*numInDashList*/,
     int * /*pDashOffset*/
-#endif
 );
 
 /* mieq.c */
@@ -193,35 +181,26 @@ typedef struct _DeviceRec *DevicePtr;
 #endif
 
 extern Bool mieqInit(
-#if NeedFunctionPrototypes
     DevicePtr /*pKbd*/,
     DevicePtr /*pPtr*/
-#endif
 );
 
 extern void mieqEnqueue(
-#if NeedFunctionPrototypes
     xEventPtr /*e*/
-#endif
 );
 
 extern void mieqSwitchScreen(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScreen*/,
     Bool /*fromDIX*/
-#endif
 );
 
-extern int mieqProcessInputEvents(
-#if NeedFunctionPrototypes
+extern void mieqProcessInputEvents(
     void
-#endif
 );
 
 /* miexpose.c */
 
 extern RegionPtr miHandleExposures(
-#if NeedFunctionPrototypes
     DrawablePtr /*pSrcDrawable*/,
     DrawablePtr /*pDstDrawable*/,
     GCPtr /*pGC*/,
@@ -232,66 +211,52 @@ extern RegionPtr miHandleExposures(
     int /*dstx*/,
     int /*dsty*/,
     unsigned long /*plane*/
-#endif
 );
 
 extern void miSendGraphicsExpose(
-#if NeedFunctionPrototypes
     ClientPtr /*client*/,
     RegionPtr /*pRgn*/,
     XID /*drawable*/,
     int /*major*/,
     int /*minor*/
-#endif
 );
 
 extern void miSendExposures(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     RegionPtr /*pRgn*/,
     int /*dx*/,
     int /*dy*/
-#endif
 );
 
 extern void miWindowExposures(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     RegionPtr /*prgn*/,
     RegionPtr /*other_exposed*/
-#endif
 );
 
 extern void miPaintWindow(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     RegionPtr /*prgn*/,
     int /*what*/
-#endif
 );
 
-extern int miClearDrawable(
-#if NeedFunctionPrototypes
+extern void miClearDrawable(
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/
-#endif
 );
 
 /* mifillrct.c */
 
 extern void miPolyFillRect(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDrawable*/,
     GCPtr /*pGC*/,
     int /*nrectFill*/,
     xRectangle * /*prectInit*/
-#endif
 );
 
 /* miglblt.c */
 
 extern void miPolyGlyphBlt(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDrawable*/,
     GCPtr /*pGC*/,
     int /*x*/,
@@ -299,11 +264,9 @@ extern void miPolyGlyphBlt(
     unsigned int /*nglyph*/,
     CharInfoPtr * /*ppci*/,
     pointer /*pglyphBase*/
-#endif
 );
 
 extern void miImageGlyphBlt(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDrawable*/,
     GCPtr /*pGC*/,
     int /*x*/,
@@ -311,82 +274,68 @@ extern void miImageGlyphBlt(
     unsigned int /*nglyph*/,
     CharInfoPtr * /*ppci*/,
     pointer /*pglyphBase*/
-#endif
 );
 
 /* mipoly.c */
 
 extern void miFillPolygon(
-#if NeedFunctionPrototypes
     DrawablePtr /*dst*/,
     GCPtr /*pgc*/,
     int /*shape*/,
     int /*mode*/,
     int /*count*/,
     DDXPointPtr /*pPts*/
-#endif
 );
 
 /* mipolycon.c */
 
 extern Bool miFillConvexPoly(
-#if NeedFunctionPrototypes
     DrawablePtr /*dst*/,
     GCPtr /*pgc*/,
     int /*count*/,
     DDXPointPtr /*ptsIn*/
-#endif
 );
 
 /* mipolygen.c */
 
 extern Bool miFillGeneralPoly(
-#if NeedFunctionPrototypes
     DrawablePtr /*dst*/,
     GCPtr /*pgc*/,
     int /*count*/,
     DDXPointPtr /*ptsIn*/
-#endif
 );
 
 /* mipolypnt.c */
 
 extern void miPolyPoint(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDrawable*/,
     GCPtr /*pGC*/,
     int /*mode*/,
     int /*npt*/,
     xPoint * /*pptInit*/
-#endif
 );
 
 /* mipolyrect.c */
 
 extern void miPolyRectangle(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*nrects*/,
     xRectangle * /*pRects*/
-#endif
 );
 
 /* mipolyseg.c */
 
 extern void miPolySegment(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*nseg*/,
     xSegment * /*pSegs*/
-#endif
 );
 
 /* mipolytext.c */
 
 extern int miPolyText(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*x*/,
@@ -394,33 +343,27 @@ extern int miPolyText(
     int /*count*/,
     char * /*chars*/,
     FontEncoding /*fontEncoding*/
-#endif
 );
 
 extern int miPolyText8(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*x*/,
     int /*y*/,
     int /*count*/,
     char * /*chars*/
-#endif
 );
 
 extern int miPolyText16(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*x*/,
     int /*y*/,
     int /*count*/,
     unsigned short * /*chars*/
-#endif
 );
 
 extern int miImageText(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*x*/,
@@ -428,35 +371,29 @@ extern int miImageText(
     int /*count*/,
     char * /*chars*/,
     FontEncoding /*fontEncoding*/
-#endif
 );
 
 extern void miImageText8(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*x*/,
     int /*y*/,
     int /*count*/,
     char * /*chars*/
-#endif
 );
 
 extern void miImageText16(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*x*/,
     int /*y*/,
     int /*count*/,
     unsigned short * /*chars*/
-#endif
 );
 
 /* mipushpxl.c */
 
 extern void miPushPixels(
-#if NeedFunctionPrototypes
     GCPtr /*pGC*/,
     PixmapPtr /*pBitMap*/,
     DrawablePtr /*pDrawable*/,
@@ -464,7 +401,6 @@ extern void miPushPixels(
     int /*dy*/,
     int /*xOrg*/,
     int /*yOrg*/
-#endif
 );
 
 /* miregion.c */
@@ -472,36 +408,30 @@ extern void miPushPixels(
 /* see also region.h */
 
 extern Bool miRectAlloc(
-#if NeedFunctionPrototypes
     RegionPtr /*pRgn*/,
     int /*n*/
-#endif
 );
 
 extern void miSetExtents(
-#if NeedFunctionPrototypes
     RegionPtr /*pReg*/
-#endif
 );
 
 extern int miFindMaxBand(
-#if NeedFunctionPrototypes
     RegionPtr /*prgn*/
-#endif
 );
 
 #ifdef DEBUG
 extern Bool miValidRegion(
-#if NeedFunctionPrototypes
     RegionPtr /*prgn*/
-#endif
 );
 #endif
 
+extern Bool miRegionDataCopy(RegionPtr dst, RegionPtr src);
+extern Bool miRegionBroken(RegionPtr pReg);
+
 /* miscrinit.c */
 
 extern Bool miModifyPixmapHeader(
-#if NeedFunctionPrototypes
     PixmapPtr /*pPixmap*/,
     int /*width*/,
     int /*height*/,
@@ -509,37 +439,24 @@ extern Bool miModifyPixmapHeader(
     int /*bitsPerPixel*/,
     int /*devKind*/,
     pointer /*pPixData*/
-#endif
 );
 
 extern Bool miCloseScreen(
-#if NeedFunctionPrototypes
     int /*index*/,
     ScreenPtr /*pScreen*/
-#endif
 );
 
 extern Bool miCreateScreenResources(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScreen*/
-#endif
 );
 
 extern Bool miScreenDevPrivateInit(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScreen*/,
     int /*width*/,
     pointer /*pbits*/
-#endif
 );
 
-#ifndef _XTYPEDEF_MIBSFUNCPTR
-typedef struct _miBSFuncRec *miBSFuncPtr;
-#define _XTYPEDEF_MIBSFUNCPTR
-#endif
-
 extern Bool miScreenInit(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScreen*/,
     pointer /*pbits*/,
     int /*xsize*/,
@@ -552,197 +469,167 @@ extern Bool miScreenInit(
     DepthPtr /*depths*/,
     VisualID /*rootVisual*/,
     int /*numVisuals*/,
-    VisualPtr /*visuals*/,
-    miBSFuncPtr /*bsfuncs*/
-#endif
+    VisualPtr /*visuals*/
+);
+
+extern int miAllocateGCPrivateIndex(
+    void
+);
+
+extern PixmapPtr miGetScreenPixmap(
+    ScreenPtr pScreen
+);
+
+extern void miSetScreenPixmap(
+    PixmapPtr pPix
 );
 
 /* mivaltree.c */
 
 extern int miShapedWindowIn(
-#if NeedFunctionPrototypes
     ScreenPtr /*pScreen*/,
     RegionPtr /*universe*/,
     RegionPtr /*bounding*/,
     BoxPtr /*rect*/,
     int /*x*/,
     int /*y*/
-#endif
 );
 
 extern int miValidateTree(
-#if NeedFunctionPrototypes
     WindowPtr /*pParent*/,
     WindowPtr /*pChild*/,
     VTKind /*kind*/
-#endif
 );
 
 extern void miWideLine(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDrawable*/,
     GCPtr /*pGC*/,
     int /*mode*/,
     int /*npt*/,
     DDXPointPtr /*pPts*/
-#endif
 );
 
 extern void miWideDash(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDrawable*/,
     GCPtr /*pGC*/,
     int /*mode*/,
     int /*npt*/,
     DDXPointPtr /*pPts*/
-#endif
 );
 
 extern void miMiter(
-#if NeedFunctionPrototypes
     void
-#endif
 );
 
 extern void miNotMiter(
-#if NeedFunctionPrototypes
     void
-#endif
 );
 
 /* miwindow.c */
 
 extern void miClearToBackground(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     int /*x*/,
     int /*y*/,
     int /*w*/,
     int /*h*/,
     Bool /*generateExposures*/
-#endif
 );
 
 extern Bool miChangeSaveUnder(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     WindowPtr /*first*/
-#endif
 );
 
 extern void miPostChangeSaveUnder(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     WindowPtr /*pFirst*/
-#endif
 );
 
 extern void miMarkWindow(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/
-#endif
 );
 
 extern Bool miMarkOverlappedWindows(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     WindowPtr /*pFirst*/,
     WindowPtr * /*ppLayerWin*/
-#endif
 );
 
 extern void miHandleValidateExposures(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/
-#endif
 );
 
 extern void miMoveWindow(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     int /*x*/,
     int /*y*/,
     WindowPtr /*pNextSib*/,
     VTKind /*kind*/
-#endif
 );
 
 extern void miSlideAndSizeWindow(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     int /*x*/,
     int /*y*/,
     unsigned int /*w*/,
     unsigned int /*h*/,
     WindowPtr /*pSib*/
-#endif
 );
 
 extern WindowPtr miGetLayerWindow(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/
-#endif
 );
 
 extern void miSetShape(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/
-#endif
 );
 
 extern void miChangeBorderWidth(
-#if NeedFunctionPrototypes
     WindowPtr /*pWin*/,
     unsigned int /*width*/
-#endif
 );
 
 extern void miMarkUnrealizedWindow(
-#if NeedFunctionPrototypes
     WindowPtr /*pChild*/,
     WindowPtr /*pWin*/,
     Bool /*fromConfigure*/
-#endif
 );
 
+extern void miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth);
+
+/* mizerarc.c */
+
 extern void miZeroPolyArc(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*narcs*/,
     xArc * /*parcs*/
-#endif
 );
 
 /* mizerline.c */
 
 extern void miZeroLine(
-#if NeedFunctionPrototypes
     DrawablePtr /*dst*/,
     GCPtr /*pgc*/,
     int /*mode*/,
     int /*nptInit*/,
     DDXPointRec * /*pptInit*/
-#endif
 );
 
 extern void miZeroDashLine(
-#if NeedFunctionPrototypes
     DrawablePtr /*dst*/,
     GCPtr /*pgc*/,
     int /*mode*/,
     int /*nptInit*/,
     DDXPointRec * /*pptInit*/
-#endif
 );
 
 extern void miPolyFillArc(
-#if NeedFunctionPrototypes
     DrawablePtr /*pDraw*/,
     GCPtr /*pGC*/,
     int /*narcs*/,
     xArc * /*parcs*/
-#endif
 );
 
 #endif /* MI_H */