diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-10-15 22:04:20 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-10-15 22:04:20 -0400 |
| commit | 4e274e90e16b1d954391e1af3e2074fb10f70ee7 (patch) | |
| tree | a68f972939992b90381452d97c6d85684bfbe2b9 | |
| parent | 9f597f6c87e0b14cc382d8e5929e42f822db4329 (diff) | |
registry: Register SHAPE extension protocol names.
| -rw-r--r-- | Xext/shape.c | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/Xext/shape.c b/Xext/shape.c index 0f49f7332..12ab53a05 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -43,6 +43,7 @@ in this Software without prior written authorization from The Open Group. #include "dixstruct.h" #include "resource.h" #include "opaque.h" +#include "registry.h" #define _SHAPE_SERVER_ /* don't want Xlib structures */ #include <X11/extensions/shapestr.h> #include "regionstr.h" @@ -111,9 +112,6 @@ 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 */ @@ -154,12 +152,32 @@ ShapeExtensionInit(void) ProcShapeDispatch, SProcShapeDispatch, ShapeResetProc, StandardMinorOpcode))) { -#if 0 - ShapeReqCode = (unsigned char)extEntry->base; -#endif ShapeEventBase = extEntry->eventBase; EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent; - } + } else + return; + + RegisterRequestName(extEntry->base, X_ShapeQueryVersion, + SHAPENAME ":QueryVersion"); + RegisterRequestName(extEntry->base, X_ShapeRectangles, + SHAPENAME ":Rectangles"); + RegisterRequestName(extEntry->base, X_ShapeMask, + SHAPENAME ":Mask"); + RegisterRequestName(extEntry->base, X_ShapeCombine, + SHAPENAME ":Combine"); + RegisterRequestName(extEntry->base, X_ShapeOffset, + SHAPENAME ":Offset"); + RegisterRequestName(extEntry->base, X_ShapeQueryExtents, + SHAPENAME ":QueryExtents"); + RegisterRequestName(extEntry->base, X_ShapeSelectInput, + SHAPENAME ":SelectInput"); + RegisterRequestName(extEntry->base, X_ShapeInputSelected, + SHAPENAME ":InputSelected"); + RegisterRequestName(extEntry->base, X_ShapeGetRectangles, + SHAPENAME ":GetRectangles"); + + RegisterEventName(ShapeEventBase + ShapeNotify, + SHAPENAME ":Notify"); } /*ARGSUSED*/ |