diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /Xext/mbuf.c | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'Xext/mbuf.c')
| -rw-r--r-- | Xext/mbuf.c | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 16a59e58e..4308037be 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.14 2001/12/14 19:58:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -61,50 +61,40 @@ in this Software without prior written authorization from The Open Group. #define ValidEventMasks (ExposureMask|MultibufferClobberNotifyMask|MultibufferUpdateNotifyMask) +#if 0 static unsigned char MultibufferReqCode; +#endif static int MultibufferEventBase; static int MultibufferErrorBase; int MultibufferScreenIndex = -1; int MultibufferWindowIndex = -1; static void PerformDisplayRequest ( -#if NeedFunctionPrototypes MultibuffersPtr * /* ppMultibuffers */, MultibufferPtr * /* pMultibuffer */, int /* nbuf */ -#endif ); static Bool QueueDisplayRequest ( -#if NeedFunctionPrototypes ClientPtr /* client */, TimeStamp /* activateTime */ -#endif ); static void BumpTimeStamp ( -#if NeedFunctionPrototypes TimeStamp * /* ts */, CARD32 /* inc */ -#endif ); static void AliasMultibuffer ( -#if NeedFunctionPrototypes MultibuffersPtr /* pMultibuffers */, int /* i */ -#endif ); static void RecalculateMultibufferOtherEvents ( -#if NeedFunctionPrototypes MultibufferPtr /* pMultibuffer */ -#endif ); static int EventSelectForMultibuffer( -#if NeedFunctionPrototypes MultibufferPtr /* pMultibuffer */, ClientPtr /* client */, Mask /* mask */ -#endif ); /* @@ -113,10 +103,8 @@ static int EventSelectForMultibuffer( */ RESTYPE MultibufferDrawableResType; static int MultibufferDrawableDelete ( -#if NeedFunctionPrototypes pointer /* value */, XID /* id */ -#endif ); /* * The per-buffer data can be found as a resource with this type. @@ -125,10 +113,8 @@ static int MultibufferDrawableDelete ( */ static RESTYPE MultibufferResType; static int MultibufferDelete ( -#if NeedFunctionPrototypes pointer /* value */, XID /* id */ -#endif ); /* @@ -137,10 +123,8 @@ static int MultibufferDelete ( */ static RESTYPE MultibuffersResType; static int MultibuffersDelete ( -#if NeedFunctionPrototypes pointer /* value */, XID /* id */ -#endif ); /* @@ -149,10 +133,8 @@ static int MultibuffersDelete ( */ static RESTYPE OtherClientResType; static int OtherClientDelete ( -#if NeedFunctionPrototypes pointer /* value */, XID /* id */ -#endif ); /**************** @@ -187,44 +169,32 @@ static DISPATCH_PROC(SProcSetBufferAttributes); static DISPATCH_PROC(SProcSetMBufferAttributes); static void MultibufferResetProc( -#if NeedFunctionPrototypes ExtensionEntry * /* extEntry */ -#endif ); static void SClobberNotifyEvent( -#if NeedFunctionPrototypes xMbufClobberNotifyEvent * /* from */, xMbufClobberNotifyEvent * /* to */ -# endif ); static void SUpdateNotifyEvent( -#if NeedFunctionPrototypes xMbufUpdateNotifyEvent * /* from */, xMbufUpdateNotifyEvent * /* to */ -#endif ); static Bool MultibufferPositionWindow( -#if NeedFunctionPrototypes WindowPtr /* pWin */, int /* x */, int /* y */ -#endif ); static void SetupBackgroundPainter ( -#if NeedFunctionPrototypes WindowPtr /* pWin */, GCPtr /* pGC */ -#endif ); static int DeliverEventsToMultibuffer ( -#if NeedFunctionPrototypes MultibufferPtr /* pMultibuffer */, xEvent * /* pEvents */, int /* count */, Mask /* filter */ -#endif ); void @@ -279,7 +249,9 @@ MultibufferExtensionInit() ProcMultibufferDispatch, SProcMultibufferDispatch, MultibufferResetProc, StandardMinorOpcode))) { +#if 0 MultibufferReqCode = (unsigned char)extEntry->base; +#endif MultibufferEventBase = extEntry->eventBase; MultibufferErrorBase = extEntry->errorBase; EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent; |