diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-20 18:22:59 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-20 18:22:59 -0500 |
| commit | 67e82e306f67a215c6c89868cc1d3649747bd93d (patch) | |
| tree | 1baee31cb35361ae9069791036661d6fe87ad0d9 | |
| parent | 8583bf78ad056ffe2d83b54e5c9a0a217e425a7b (diff) | |
Revert "registry: Register SHAPE extension protocol names."
This reverts commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7.
Moving all the names to dix/registry.c
| -rw-r--r-- | Xext/shape.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/Xext/shape.c b/Xext/shape.c index 567737c13..e84eb34da 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -43,7 +43,6 @@ 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" @@ -112,6 +111,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 */ @@ -152,32 +154,12 @@ 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*/ |