mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-30 21:53:25 +00:00
xserver: delete pervasively use of DISPATCH_PROC
Some functions had to be moved around due some missing static definitions. Another minor clean up like inexistent function declarations and etc were made also. Part of this patch was cooked using: sed -i -e '/static DISPATCH_PROC*.*;/d' `git ls-files` Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
This commit is contained in:
parent
58bd317e29
commit
cbd4d5dbb7
22 changed files with 714 additions and 986 deletions
54
Xext/shape.c
54
Xext/shape.c
|
|
@ -68,26 +68,6 @@ static void SShapeNotifyEvent(
|
|||
* externally by the Xfixes extension and are now defined in window.h
|
||||
*/
|
||||
|
||||
static DISPATCH_PROC(ProcShapeCombine);
|
||||
static DISPATCH_PROC(ProcShapeDispatch);
|
||||
static DISPATCH_PROC(ProcShapeGetRectangles);
|
||||
static DISPATCH_PROC(ProcShapeInputSelected);
|
||||
static DISPATCH_PROC(ProcShapeMask);
|
||||
static DISPATCH_PROC(ProcShapeOffset);
|
||||
static DISPATCH_PROC(ProcShapeQueryExtents);
|
||||
static DISPATCH_PROC(ProcShapeQueryVersion);
|
||||
static DISPATCH_PROC(ProcShapeRectangles);
|
||||
static DISPATCH_PROC(ProcShapeSelectInput);
|
||||
static DISPATCH_PROC(SProcShapeCombine);
|
||||
static DISPATCH_PROC(SProcShapeDispatch);
|
||||
static DISPATCH_PROC(SProcShapeGetRectangles);
|
||||
static DISPATCH_PROC(SProcShapeInputSelected);
|
||||
static DISPATCH_PROC(SProcShapeMask);
|
||||
static DISPATCH_PROC(SProcShapeOffset);
|
||||
static DISPATCH_PROC(SProcShapeQueryExtents);
|
||||
static DISPATCH_PROC(SProcShapeQueryVersion);
|
||||
static DISPATCH_PROC(SProcShapeRectangles);
|
||||
static DISPATCH_PROC(SProcShapeSelectInput);
|
||||
|
||||
#ifdef PANORAMIX
|
||||
#include "panoramiX.h"
|
||||
|
|
@ -122,23 +102,6 @@ typedef struct _ShapeEvent {
|
|||
*
|
||||
****************/
|
||||
|
||||
void
|
||||
ShapeExtensionInit(void)
|
||||
{
|
||||
ExtensionEntry *extEntry;
|
||||
|
||||
ClientType = CreateNewResourceType(ShapeFreeClient, "ShapeClient");
|
||||
ShapeEventType = CreateNewResourceType(ShapeFreeEvents, "ShapeEvent");
|
||||
if (ClientType && ShapeEventType &&
|
||||
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
|
||||
ProcShapeDispatch, SProcShapeDispatch,
|
||||
NULL, StandardMinorOpcode)))
|
||||
{
|
||||
ShapeEventBase = extEntry->eventBase;
|
||||
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
RegionOperate (
|
||||
ClientPtr client,
|
||||
|
|
@ -1278,3 +1241,20 @@ SProcShapeDispatch (ClientPtr client)
|
|||
return BadRequest;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ShapeExtensionInit(void)
|
||||
{
|
||||
ExtensionEntry *extEntry;
|
||||
|
||||
ClientType = CreateNewResourceType(ShapeFreeClient, "ShapeClient");
|
||||
ShapeEventType = CreateNewResourceType(ShapeFreeEvents, "ShapeEvent");
|
||||
if (ClientType && ShapeEventType &&
|
||||
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
|
||||
ProcShapeDispatch, SProcShapeDispatch,
|
||||
NULL, StandardMinorOpcode)))
|
||||
{
|
||||
ShapeEventBase = extEntry->eventBase;
|
||||
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue