diff options
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/sendexev.c')
-rw-r--r-- | nx-X11/programs/Xserver/Xi/sendexev.c | 91 |
1 files changed, 41 insertions, 50 deletions
diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index a851c5120..ef7b9c4e9 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -56,21 +56,21 @@ SOFTWARE. #include <dix-config.h> #endif -#include <nx-X11/X.h> /* for inputstr.h */ -#include <nx-X11/Xproto.h> /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* Window */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* Window */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" #include "grabdev.h" #include "sendexev.h" -extern int lastEvent; /* Defined in extension.c */ +extern int lastEvent; /* Defined in extension.c */ /*********************************************************************** * @@ -79,9 +79,8 @@ extern int lastEvent; /* Defined in extension.c */ */ int -SProcXSendExtensionEvent(client) - register ClientPtr client; - { +SProcXSendExtensionEvent(register ClientPtr client) +{ CARD32 *p; register int i; xEvent eventT; @@ -98,20 +97,19 @@ SProcXSendExtensionEvent(client) (stuff->num_events * (sizeof(xEvent) >> 2))) return BadLength; - eventP = (xEvent *) &stuff[1]; - for (i=0; i<stuff->num_events; i++,eventP++) - { + eventP = (xEvent *) & stuff[1]; + for (i = 0; i < stuff->num_events; i++, eventP++) { proc = EventSwapVector[eventP->u.u.type & 0177]; - if (proc == NotImplemented) /* no swapping proc; invalid event type? */ + if (proc == NotImplemented) /* no swapping proc; invalid event type? */ return (BadValue); - (*proc)(eventP, &eventT); + (*proc) (eventP, &eventT); *eventP = eventT; - } + } p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events); SwapLongs(p, stuff->count); - return(ProcXSendExtensionEvent(client)); - } + return (ProcXSendExtensionEvent(client)); +} /*********************************************************************** * @@ -121,33 +119,28 @@ SProcXSendExtensionEvent(client) */ int -ProcXSendExtensionEvent (client) - register ClientPtr client; - { - int ret; - DeviceIntPtr dev; - xEvent *first; - XEventClass *list; - struct tmask tmp[EMASKSIZE]; +ProcXSendExtensionEvent(register ClientPtr client) +{ + int ret; + DeviceIntPtr dev; + xEvent *first; + XEventClass *list; + struct tmask tmp[EMASKSIZE]; REQUEST(xSendExtensionEventReq); REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq); - if (stuff->length !=(sizeof(xSendExtensionEventReq)>>2) + stuff->count + - (stuff->num_events * (sizeof (xEvent) >> 2))) - { - SendErrorToClient (client, IReqCode, X_SendExtensionEvent, 0, - BadLength); + if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count + + (stuff->num_events * (sizeof(xEvent) >> 2))) { + SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadLength); return Success; - } + } - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadDevice); return Success; - } + } /* the previous code here returned the unitialized variable ret, @@ -160,27 +153,25 @@ ProcXSendExtensionEvent (client) /* The client's event type must be one defined by an extension. */ - first = ((xEvent *) &stuff[1]); - if ( ! ((EXTENSION_EVENT_BASE <= first->u.u.type) && - (first->u.u.type < lastEvent)) ) - { + first = ((xEvent *) & stuff[1]); + if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && + (first->u.u.type < lastEvent))) { client->errorValue = first->u.u.type; - SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, - BadValue); + SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadValue); return Success; - } + } list = (XEventClass *) (first + stuff->num_events); - if ((ret = CreateMaskFromList (client, list, stuff->count, tmp, dev, - X_SendExtensionEvent)) != Success) + if ((ret = CreateMaskFromList(client, list, stuff->count, tmp, dev, + X_SendExtensionEvent)) != Success) return Success; - ret = (SendEvent (client, dev, stuff->destination, - stuff->propagate, (xEvent *)&stuff[1], tmp[stuff->deviceid].mask, - stuff->num_events)); + ret = (SendEvent(client, dev, stuff->destination, + stuff->propagate, (xEvent *) & stuff[1], + tmp[stuff->deviceid].mask, stuff->num_events)); if (ret != Success) SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret); return Success; - } +} |