aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext/shape.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/Xext/shape.c')
-rw-r--r--xorg-server/Xext/shape.c86
1 files changed, 38 insertions, 48 deletions
diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c
index 2f1baf917..aaef0cb14 100644
--- a/xorg-server/Xext/shape.c
+++ b/xorg-server/Xext/shape.c
@@ -61,9 +61,6 @@ static int ShapeFreeEvents(
pointer /* data */,
XID /* id */
);
-static void ShapeResetProc(
- ExtensionEntry * /* extEntry */
- );
static void SShapeNotifyEvent(
xShapeNotifyEvent * /* from */,
xShapeNotifyEvent * /* to */
@@ -149,20 +146,13 @@ ShapeExtensionInit(void)
if (ClientType && EventType &&
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
ProcShapeDispatch, SProcShapeDispatch,
- ShapeResetProc, StandardMinorOpcode)))
+ NULL, StandardMinorOpcode)))
{
ShapeEventBase = extEntry->eventBase;
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
}
}
-/*ARGSUSED*/
-static void
-ShapeResetProc (extEntry)
-ExtensionEntry *extEntry;
-{
-}
-
static int
RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
ClientPtr client;
@@ -276,10 +266,10 @@ CreateClipShape (pWin)
static int
ProcShapeQueryVersion (client)
- register ClientPtr client;
+ ClientPtr client;
{
xShapeQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xShapeQueryVersionReq);
rep.type = X_Reply;
@@ -304,7 +294,7 @@ ProcShapeQueryVersion (client)
static int
ProcShapeRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -375,7 +365,7 @@ ProcShapeRectangles (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeRectangles(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeRectanglesReq);
PanoramiXRes *win;
@@ -404,7 +394,7 @@ ProcPanoramiXShapeRectangles(
static int
ProcShapeMask (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -474,7 +464,7 @@ ProcShapeMask (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeMask(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeMaskReq);
PanoramiXRes *win, *pmap;
@@ -511,7 +501,7 @@ ProcPanoramiXShapeMask(
static int
ProcShapeCombine (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pSrcWin, pDestWin;
ScreenPtr pScreen;
@@ -603,7 +593,7 @@ ProcShapeCombine (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeCombine(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeCombineReq);
PanoramiXRes *win, *win2;
@@ -635,7 +625,7 @@ ProcPanoramiXShapeCombine(
static int
ProcShapeOffset (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -676,7 +666,7 @@ ProcShapeOffset (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeOffset(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeOffsetReq);
PanoramiXRes *win;
@@ -700,13 +690,13 @@ ProcPanoramiXShapeOffset(
static int
ProcShapeQueryExtents (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeQueryExtentsReq);
WindowPtr pWin;
xShapeQueryExtentsReply rep;
BoxRec extents, *pExtents;
- register int n, rc;
+ int n, rc;
RegionPtr region;
REQUEST_SIZE_MATCH (xShapeQueryExtentsReq);
@@ -811,7 +801,7 @@ ShapeFreeEvents (data, id)
static int
ProcShapeSelectInput (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeSelectInputReq);
WindowPtr pWin;
@@ -983,14 +973,14 @@ SendShapeNotify (pWin, which)
static int
ProcShapeInputSelected (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeInputSelectedReq);
WindowPtr pWin;
ShapeEventPtr pShapeEvent, *pHead;
int enabled, rc;
xShapeInputSelectedReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xShapeInputSelectedReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
@@ -1024,7 +1014,7 @@ ProcShapeInputSelected (client)
static int
ProcShapeGetRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeGetRectanglesReq);
WindowPtr pWin;
@@ -1032,7 +1022,7 @@ ProcShapeGetRectangles (client)
xRectangle *rects;
int nrects, i, rc;
RegionPtr region;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xShapeGetRectanglesReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
@@ -1110,7 +1100,7 @@ ProcShapeGetRectangles (client)
static int
ProcShapeDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data) {
@@ -1175,9 +1165,9 @@ SShapeNotifyEvent(from, to)
static int
SProcShapeQueryVersion (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xShapeQueryVersionReq);
swaps (&stuff->length, n);
@@ -1186,9 +1176,9 @@ SProcShapeQueryVersion (client)
static int
SProcShapeRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeRectanglesReq);
swaps (&stuff->length, n);
@@ -1202,9 +1192,9 @@ SProcShapeRectangles (client)
static int
SProcShapeMask (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeMaskReq);
swaps (&stuff->length, n);
@@ -1218,9 +1208,9 @@ SProcShapeMask (client)
static int
SProcShapeCombine (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeCombineReq);
swaps (&stuff->length, n);
@@ -1234,9 +1224,9 @@ SProcShapeCombine (client)
static int
SProcShapeOffset (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeOffsetReq);
swaps (&stuff->length, n);
@@ -1249,9 +1239,9 @@ SProcShapeOffset (client)
static int
SProcShapeQueryExtents (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeQueryExtentsReq);
swaps (&stuff->length, n);
@@ -1262,9 +1252,9 @@ SProcShapeQueryExtents (client)
static int
SProcShapeSelectInput (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeSelectInputReq);
swaps (&stuff->length, n);
@@ -1275,9 +1265,9 @@ SProcShapeSelectInput (client)
static int
SProcShapeInputSelected (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xShapeInputSelectedReq);
swaps (&stuff->length, n);
@@ -1288,10 +1278,10 @@ SProcShapeInputSelected (client)
static int
SProcShapeGetRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeGetRectanglesReq);
- register char n;
+ char n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xShapeGetRectanglesReq);
@@ -1301,7 +1291,7 @@ SProcShapeGetRectangles (client)
static int
SProcShapeDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data) {