frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "registry: Register SHAPE extension protocol names." 

This reverts commit 4e274e90e1.

Moving all the names to dix/registry.c
This commit is contained in:
Eamon Walsh 2007-11-20 18:22:59 -05:00 committed by Eamon Walsh
parent 8583bf78ad
commit 67e82e306f
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Xext/shape.c
View File

@ -43,7 +43,6 @@ in this Software without prior written authorization from The Open Group.
#include "dixstruct.h" #include "dixstruct.h"
#include "resource.h" #include "resource.h"
#include "opaque.h" #include "opaque.h"
#include "registry.h"
#define _SHAPE_SERVER_ /* don't want Xlib structures */ #define _SHAPE_SERVER_ /* don't want Xlib structures */
#include <X11/extensions/shapestr.h> #include <X11/extensions/shapestr.h>
#include "regionstr.h" #include "regionstr.h"
@ -112,6 +111,9 @@ static DISPATCH_PROC(SProcShapeSelectInput);
#include "panoramiXsrv.h" #include "panoramiXsrv.h"
#endif #endif
#if 0
static unsigned char ShapeReqCode = 0;
#endif
static int ShapeEventBase = 0; static int ShapeEventBase = 0;
static RESTYPE ClientType, EventType; /* resource types for event masks */ static RESTYPE ClientType, EventType; /* resource types for event masks */
@ -152,32 +154,12 @@ ShapeExtensionInit(void)
ProcShapeDispatch, SProcShapeDispatch, ProcShapeDispatch, SProcShapeDispatch,
ShapeResetProc, StandardMinorOpcode))) ShapeResetProc, StandardMinorOpcode)))
{ {
#if 0
ShapeReqCode = (unsigned char)extEntry->base;
#endif
ShapeEventBase = extEntry->eventBase; ShapeEventBase = extEntry->eventBase;
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent; 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*/ /*ARGSUSED*/