From 5bfafee5087bcbc37b7f8db246b20d7a4bba5731 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Feb 2018 23:44:10 +0100 Subject: Xi: Adapt include sections to match Xorg 7.1 --- nx-X11/programs/Xserver/Xi/sendexev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/sendexev.c') diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index a851c5120..b721d72ee 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -56,14 +56,14 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* Window */ +#include /* for inputstr.h */ +#include /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* Window */ #include #include #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" -- cgit v1.2.3 From 41a0ba729fb67efdc5f7bd50f73f145cf5d8a153 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 11 Feb 2018 22:01:11 +0100 Subject: Xi: reformat code, ansify --- nx-X11/programs/Xserver/Xi/sendexev.c | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/sendexev.c') diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index b721d72ee..9dd00ce25 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -70,7 +70,7 @@ SOFTWARE. #include "grabdev.h" #include "sendexev.h" -extern int lastEvent; /* Defined in extension.c */ +extern int lastEvent; /* Defined in extension.c */ /*********************************************************************** * @@ -81,7 +81,7 @@ extern int lastEvent; /* Defined in extension.c */ int SProcXSendExtensionEvent(client) register ClientPtr client; - { +{ CARD32 *p; register int i; xEvent eventT; @@ -95,23 +95,23 @@ SProcXSendExtensionEvent(client) swaps(&stuff->count); if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count + - (stuff->num_events * (sizeof(xEvent) >> 2))) - return BadLength; + (stuff->num_events * (sizeof(xEvent) >> 2))) + return BadLength; - eventP = (xEvent *) &stuff[1]; + eventP = (xEvent *) & stuff[1]; for (i=0; inum_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); + p = (CARD32 *) (((xEvent *) & stuff[1]) + stuff->num_events); SwapLongs(p, stuff->count); - return(ProcXSendExtensionEvent(client)); - } + return (ProcXSendExtensionEvent(client)); +} /*********************************************************************** * @@ -123,59 +123,59 @@ SProcXSendExtensionEvent(client) int ProcXSendExtensionEvent (client) register ClientPtr client; - { - int ret; - DeviceIntPtr dev; - xEvent *first; - XEventClass *list; - struct tmask tmp[EMASKSIZE]; +{ + 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 + + 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); + 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, so using Success we have defined returncode at least. FIXME: Upstream works different here, we must check this! - */ + */ if (stuff->num_events == 0) - /* return ret; */ - return Success; + /* return ret; */ + return Success; /* 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 = ((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); 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, + ret = (SendEvent(client, dev, stuff->destination, stuff->propagate, (xEvent *)&stuff[1], tmp[stuff->deviceid].mask, stuff->num_events)); @@ -183,4 +183,4 @@ ProcXSendExtensionEvent (client) SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret); return Success; - } +} -- cgit v1.2.3 From 7aca428ffe10b2cffca8fe01962aef421a5a5645 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 15:14:14 +0100 Subject: Xi: ansify function prototypes --- nx-X11/programs/Xserver/Xi/sendexev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/sendexev.c') diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index 9dd00ce25..aeb3be683 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -79,8 +79,7 @@ extern int lastEvent; /* Defined in extension.c */ */ int -SProcXSendExtensionEvent(client) - register ClientPtr client; +SProcXSendExtensionEvent(register ClientPtr client) { CARD32 *p; register int i; @@ -121,8 +120,7 @@ SProcXSendExtensionEvent(client) */ int -ProcXSendExtensionEvent (client) - register ClientPtr client; +ProcXSendExtensionEvent(register ClientPtr client) { int ret; DeviceIntPtr dev; -- cgit v1.2.3 From b0abdf7bd8284b1edf39c13e1863ecc420fd68e4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 21:25:27 +0100 Subject: Xi: reformat --- nx-X11/programs/Xserver/Xi/sendexev.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/sendexev.c') diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index aeb3be683..c357fc7a5 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -98,8 +98,7 @@ SProcXSendExtensionEvent(register ClientPtr client) return BadLength; eventP = (xEvent *) & stuff[1]; - for (i=0; inum_events; i++,eventP++) - { + 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? */ return (BadValue); @@ -132,18 +131,14 @@ ProcXSendExtensionEvent(register ClientPtr client) 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); + (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); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadDevice); return Success; } @@ -160,11 +155,9 @@ ProcXSendExtensionEvent(register ClientPtr client) first = ((xEvent *) & stuff[1]); if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && - (first->u.u.type < lastEvent)) ) - { + (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; } @@ -174,8 +167,8 @@ ProcXSendExtensionEvent(register ClientPtr client) return Success; ret = (SendEvent(client, dev, stuff->destination, - stuff->propagate, (xEvent *)&stuff[1], tmp[stuff->deviceid].mask, - stuff->num_events)); + stuff->propagate, (xEvent *) & stuff[1], + tmp[stuff->deviceid].mask, stuff->num_events)); if (ret != Success) SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret); -- cgit v1.2.3 From 8e188629fde213f29cfaf62c4ea3abd0520a0f41 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 21:41:19 +0100 Subject: Xi: small formatting changes to match Xorg 7.1's Xi --- nx-X11/programs/Xserver/Xi/sendexev.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/sendexev.c') diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index c357fc7a5..ef7b9c4e9 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -94,8 +94,8 @@ SProcXSendExtensionEvent(register ClientPtr client) swaps(&stuff->count); if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count + - (stuff->num_events * (sizeof(xEvent) >> 2))) - return BadLength; + (stuff->num_events * (sizeof(xEvent) >> 2))) + return BadLength; eventP = (xEvent *) & stuff[1]; for (i = 0; i < stuff->num_events; i++, eventP++) { @@ -106,7 +106,7 @@ SProcXSendExtensionEvent(register ClientPtr client) *eventP = eventT; } - p = (CARD32 *) (((xEvent *) & stuff[1]) + stuff->num_events); + p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events); SwapLongs(p, stuff->count); return (ProcXSendExtensionEvent(client)); } @@ -146,10 +146,10 @@ ProcXSendExtensionEvent(register ClientPtr client) the previous code here returned the unitialized variable ret, so using Success we have defined returncode at least. FIXME: Upstream works different here, we must check this! - */ + */ if (stuff->num_events == 0) - /* return ret; */ - return Success; + /* return ret; */ + return Success; /* The client's event type must be one defined by an extension. */ @@ -163,7 +163,7 @@ ProcXSendExtensionEvent(register ClientPtr client) list = (XEventClass *) (first + stuff->num_events); if ((ret = CreateMaskFromList(client, list, stuff->count, tmp, dev, - X_SendExtensionEvent)) != Success) + X_SendExtensionEvent)) != Success) return Success; ret = (SendEvent(client, dev, stuff->destination, -- cgit v1.2.3