diff options
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/getdctl.c')
-rw-r--r-- | nx-X11/programs/Xserver/Xi/getdctl.c | 150 |
1 files changed, 65 insertions, 85 deletions
diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c index c315f0bb6..7cc96cb2b 100644 --- a/nx-X11/programs/Xserver/Xi/getdctl.c +++ b/nx-X11/programs/Xserver/Xi/getdctl.c @@ -55,13 +55,13 @@ 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 <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "getdctl.h" @@ -74,15 +74,14 @@ SOFTWARE. */ int -SProcXGetDeviceControl(client) - register ClientPtr client; - { +SProcXGetDeviceControl(register ClientPtr client) +{ REQUEST(xGetDeviceControlReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xGetDeviceControlReq); swaps(&stuff->control); - return(ProcXGetDeviceControl(client)); - } + return (ProcXGetDeviceControl(client)); +} /*********************************************************************** * @@ -91,10 +90,9 @@ SProcXGetDeviceControl(client) */ int -ProcXGetDeviceControl(client) - ClientPtr client; - { - int total_length = 0; +ProcXGetDeviceControl(ClientPtr client) +{ + int total_length = 0; char *buf, *savbuf; register DeviceIntPtr dev; xGetDeviceControlReply rep; @@ -102,62 +100,53 @@ ProcXGetDeviceControl(client) REQUEST(xGetDeviceControlReq); REQUEST_SIZE_MATCH(xGetDeviceControlReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_GetDeviceControl; rep.length = 0; rep.sequenceNumber = client->sequence; - switch (stuff->control) - { - case DEVICE_RESOLUTION: - if (!dev->valuator) - { - SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0, - BadMatch); - return Success; - } - total_length = sizeof (xDeviceResolutionState) + - (3 * sizeof(int) * dev->valuator->numAxes); - break; - default: - SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0, - BadValue); + switch (stuff->control) { + case DEVICE_RESOLUTION: + if (!dev->valuator) { + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, + BadMatch); return Success; } + total_length = sizeof(xDeviceResolutionState) + + (3 * sizeof(int) * dev->valuator->numAxes); + break; + default: + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadValue); + return Success; + } - buf = (char *) malloc (total_length); - if (!buf) - { - SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, - BadAlloc); + buf = (char *)malloc(total_length); + if (!buf) { + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadAlloc); return Success; - } - savbuf=buf; - - switch (stuff->control) - { - case DEVICE_RESOLUTION: - CopySwapDeviceResolution(client, dev->valuator, buf, - total_length); - break; - default: - break; - } + } + savbuf = buf; + + switch (stuff->control) { + case DEVICE_RESOLUTION: + CopySwapDeviceResolution(client, dev->valuator, buf, total_length); + break; + default: + break; + } - rep.length = (total_length+3) >> 2; + rep.length = (total_length + 3) >> 2; WriteReplyToClient(client, sizeof(xGetDeviceControlReply), &rep); WriteToClient(client, total_length, savbuf); - free (savbuf); + free(savbuf); return Success; - } +} /*********************************************************************** * @@ -166,40 +155,35 @@ ProcXGetDeviceControl(client) */ void -CopySwapDeviceResolution (client, v, buf, length) - ClientPtr client; - ValuatorClassPtr v; - char *buf; - int length; - { - AxisInfoPtr a; +CopySwapDeviceResolution(ClientPtr client, ValuatorClassPtr v, char *buf, + int length) +{ + AxisInfoPtr a; xDeviceResolutionState *r; int i, *iptr; r = (xDeviceResolutionState *) buf; r->control = DEVICE_RESOLUTION; - r->length = length; - r->num_valuators = v->numAxes; - buf += sizeof (xDeviceResolutionState); - iptr = (int *) buf; - for (i=0,a=v->axes; i<v->numAxes; i++,a++) + r->length = length; + r->num_valuators = v->numAxes; + buf += sizeof(xDeviceResolutionState); + iptr = (int *)buf; + for (i = 0, a = v->axes; i < v->numAxes; i++, a++) *iptr++ = a->resolution; - for (i=0,a=v->axes; i<v->numAxes; i++,a++) + for (i = 0, a = v->axes; i < v->numAxes; i++, a++) *iptr++ = a->min_resolution; - for (i=0,a=v->axes; i<v->numAxes; i++,a++) + for (i = 0, a = v->axes; i < v->numAxes; i++, a++) *iptr++ = a->max_resolution; - if (client->swapped) - { - swaps (&r->control); - swaps (&r->length); - swapl (&r->num_valuators); - iptr = (int *) buf; - for (i=0; i < (3 * v->numAxes); i++,iptr++) - { - swapl (iptr); - } + if (client->swapped) { + swaps(&r->control); + swaps(&r->length); + swapl(&r->num_valuators); + iptr = (int *)buf; + for (i = 0; i < (3 * v->numAxes); i++, iptr++) { + swapl(iptr); } } +} /*********************************************************************** * @@ -209,13 +193,9 @@ CopySwapDeviceResolution (client, v, buf, length) */ void -SRepXGetDeviceControl (client, size, rep) - ClientPtr client; - int size; - xGetDeviceControlReply *rep; - { +SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } - +} |