diff options
Diffstat (limited to 'Xext/shape.c')
| -rw-r--r-- | Xext/shape.c | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/Xext/shape.c b/Xext/shape.c index 7bd161dcc..956a8ebfc 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.16 2001/12/14 19:58:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -46,45 +46,33 @@ in this Software without prior written authorization from The Open Group. #ifdef EXTMODULE #include "xf86_ansic.h" #endif +#include "modinit.h" typedef RegionPtr (*CreateDftPtr)( -#if NeedNestedPrototypes WindowPtr /* pWin */ -#endif ); static int ShapeFreeClient( -#if NeedFunctionPrototypes pointer /* data */, XID /* id */ -#endif ); static int ShapeFreeEvents( -#if NeedFunctionPrototypes pointer /* data */, XID /* id */ -#endif ); static void SendShapeNotify( -#if NeedFunctionPrototypes WindowPtr /* pWin */, int /* which */ -#endif ); static void ShapeResetProc( -#if NeedFunctionPrototypes ExtensionEntry * /* extEntry */ -#endif ); static void SShapeNotifyEvent( -#if NeedFunctionPrototypes xShapeNotifyEvent * /* from */, xShapeNotifyEvent * /* to */ -#endif ); static int RegionOperate ( -#if NeedFunctionPrototypes ClientPtr /* client */, WindowPtr /* pWin */, int /* kind */, @@ -94,14 +82,9 @@ RegionOperate ( int /* xoff */, int /* yoff */, CreateDftPtr /* create */ -#endif ); -#if NeedFunctionPrototypes #define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */) -#else -#define CREATE_PROC(func) RegionPtr func(/* WindowPtr pWin */) -#endif static CREATE_PROC(CreateBoundingShape); static CREATE_PROC(CreateClipShape); @@ -134,7 +117,9 @@ static DISPATCH_PROC(SProcShapeSelectInput); #include "panoramiXsrv.h" #endif +#if 0 static unsigned char ShapeReqCode = 0; +#endif static int ShapeEventBase = 0; static RESTYPE ClientType, EventType; /* resource types for event masks */ @@ -164,7 +149,7 @@ typedef struct _ShapeEvent { ****************/ void -ShapeExtensionInit() +ShapeExtensionInit(INITARGS) { ExtensionEntry *extEntry; @@ -175,7 +160,9 @@ ShapeExtensionInit() ProcShapeDispatch, SProcShapeDispatch, ShapeResetProc, StandardMinorOpcode))) { +#if 0 ShapeReqCode = (unsigned char)extEntry->base; +#endif ShapeEventBase = extEntry->eventBase; EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent; } @@ -390,8 +377,8 @@ ProcShapeRectangles (client) #ifdef PANORAMIX static int -ProcPanoramiXShapeRectangles (client) - register ClientPtr client; +ProcPanoramiXShapeRectangles( + register ClientPtr client) { REQUEST(xShapeRectanglesReq); PanoramiXRes *win; @@ -479,8 +466,8 @@ ProcShapeMask (client) #ifdef PANORAMIX static int -ProcPanoramiXShapeMask (client) - register ClientPtr client; +ProcPanoramiXShapeMask( + register ClientPtr client) { REQUEST(xShapeMaskReq); PanoramiXRes *win, *pmap; @@ -594,8 +581,8 @@ ProcShapeCombine (client) #ifdef PANORAMIX static int -ProcPanoramiXShapeCombine (client) - register ClientPtr client; +ProcPanoramiXShapeCombine( + register ClientPtr client) { REQUEST(xShapeCombineReq); PanoramiXRes *win, *win2; @@ -663,8 +650,8 @@ ProcShapeOffset (client) #ifdef PANORAMIX static int -ProcPanoramiXShapeOffset (client) - register ClientPtr client; +ProcPanoramiXShapeOffset( + register ClientPtr client) { REQUEST(xShapeOffsetReq); PanoramiXRes *win; |