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/queryst.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/queryst.c') diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index 4eeba4c5f..ff62657cc 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -36,14 +36,14 @@ from The Open Group. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ +#include /* for inputstr.h */ +#include /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #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/queryst.c | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/queryst.c') diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index ff62657cc..ebf4dcba6 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -58,11 +58,11 @@ from The Open Group. int SProcXQueryDeviceState(client) register ClientPtr client; - { +{ REQUEST(xQueryDeviceStateReq); swaps(&stuff->length); - return(ProcXQueryDeviceState(client)); - } + return (ProcXQueryDeviceState(client)); +} /*********************************************************************** * @@ -73,20 +73,20 @@ SProcXQueryDeviceState(client) int ProcXQueryDeviceState(client) register ClientPtr client; - { - int i; - int num_classes = 0; - int total_length = 0; - char *buf, *savbuf; - KeyClassPtr k; - xKeyState *tk; - ButtonClassPtr b; - xButtonState *tb; - ValuatorClassPtr v; - xValuatorState *tv; - xQueryDeviceStateReply rep; - DeviceIntPtr dev; - int *values; +{ + int i; + int num_classes = 0; + int total_length = 0; + char *buf, *savbuf; + KeyClassPtr k; + xKeyState *tk; + ButtonClassPtr b; + xButtonState *tb; + ValuatorClassPtr v; + xValuatorState *tv; + xQueryDeviceStateReply rep; + DeviceIntPtr dev; + int *values; REQUEST(xQueryDeviceStateReq); REQUEST_SIZE_MATCH(xQueryDeviceStateReq); @@ -96,13 +96,13 @@ ProcXQueryDeviceState(client) rep.length = 0; rep.sequenceNumber = client->sequence; - dev = LookupDeviceIntRec (stuff->deviceid); + dev = LookupDeviceIntRec(stuff->deviceid); if (dev == NULL) { SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadDevice); return Success; - } + } v = dev->valuator; if (v != NULL && v->motionHintWindow != NULL) @@ -111,81 +111,81 @@ ProcXQueryDeviceState(client) k = dev->key; if (k != NULL) { - total_length += sizeof (xKeyState); + total_length += sizeof(xKeyState); num_classes++; - } + } b = dev->button; if (b != NULL) { - total_length += sizeof (xButtonState); + total_length += sizeof(xButtonState); num_classes++; - } + } if (v != NULL) { total_length += (sizeof(xValuatorState) + (v->numAxes * sizeof(int))); num_classes++; - } - buf = (char *) malloc (total_length); + } + buf = (char *)malloc(total_length); if (!buf) { SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadAlloc); return Success; - } + } savbuf = buf; if (k != NULL) { tk = (xKeyState *) buf; tk->class = KeyClass; - tk->length = sizeof (xKeyState); + tk->length = sizeof(xKeyState); tk->num_keys = k->curKeySyms.maxKeyCode - k->curKeySyms.minKeyCode + 1; - for (i = 0; i<32; i++) + for (i = 0; i < 32; i++) tk->keys[i] = k->down[i]; - buf += sizeof (xKeyState); - } + buf += sizeof(xKeyState); + } if (b != NULL) { tb = (xButtonState *) buf; tb->class = ButtonClass; - tb->length = sizeof (xButtonState); + tb->length = sizeof(xButtonState); tb->num_buttons = b->numButtons; - for (i = 0; i<32; i++) + for (i = 0; i < 32; i++) tb->buttons[i] = b->down[i]; - buf += sizeof (xButtonState); - } + buf += sizeof(xButtonState); + } if (v != NULL) { tv = (xValuatorState *) buf; tv->class = ValuatorClass; - tv->length = sizeof (xValuatorState); + tv->length = sizeof(xValuatorState); tv->num_valuators = v->numAxes; tv->mode = v->mode; buf += sizeof(xValuatorState); for (i=0, values=v->axisVal; inumAxes; i++) { - *((int *) buf) = *values++; + *((int *)buf) = *values++; if (client->swapped) { - swapl ((int *) buf);/* macro - braces needed */ - } - buf += sizeof(int); + swapl((int *)buf); /* macro - braces needed */ } + buf += sizeof(int); } + } rep.num_classes = num_classes; rep.length = (total_length + 3) >> 2; - WriteReplyToClient (client, sizeof(xQueryDeviceStateReply), &rep); + WriteReplyToClient(client, sizeof(xQueryDeviceStateReply), &rep); if (total_length > 0) - WriteToClient (client, total_length, savbuf); - free (savbuf); + WriteToClient(client, total_length, savbuf); + free(savbuf); return Success; - } +} /*********************************************************************** * @@ -199,8 +199,8 @@ SRepXQueryDeviceState (client, size, rep) ClientPtr client; int size; xQueryDeviceStateReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} -- 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/queryst.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/queryst.c') diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index ebf4dcba6..ba9b63fa2 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -56,8 +56,7 @@ from The Open Group. */ int -SProcXQueryDeviceState(client) - register ClientPtr client; +SProcXQueryDeviceState(register ClientPtr client) { REQUEST(xQueryDeviceStateReq); swaps(&stuff->length); @@ -71,8 +70,7 @@ SProcXQueryDeviceState(client) */ int -ProcXQueryDeviceState(client) - register ClientPtr client; +ProcXQueryDeviceState(register ClientPtr client) { int i; int num_classes = 0; @@ -195,10 +193,7 @@ ProcXQueryDeviceState(client) */ void -SRepXQueryDeviceState (client, size, rep) - ClientPtr client; - int size; - xQueryDeviceStateReply *rep; +SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); -- 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/queryst.c | 39 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 26 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/queryst.c') diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index ba9b63fa2..f7392f9fe 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -95,10 +95,8 @@ ProcXQueryDeviceState(register ClientPtr client) rep.sequenceNumber = client->sequence; dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, - BadDevice); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadDevice); return Success; } @@ -107,36 +105,29 @@ ProcXQueryDeviceState(register ClientPtr client) MaybeStopDeviceHint(dev, client); k = dev->key; - if (k != NULL) - { + if (k != NULL) { total_length += sizeof(xKeyState); num_classes++; } b = dev->button; - if (b != NULL) - { + if (b != NULL) { total_length += sizeof(xButtonState); num_classes++; } - if (v != NULL) - { - total_length += (sizeof(xValuatorState) + - (v->numAxes * sizeof(int))); + if (v != NULL) { + total_length += (sizeof(xValuatorState) + (v->numAxes * sizeof(int))); num_classes++; } buf = (char *)malloc(total_length); - if (!buf) - { - SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, - BadAlloc); + if (!buf) { + SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadAlloc); return Success; } savbuf = buf; - if (k != NULL) - { + if (k != NULL) { tk = (xKeyState *) buf; tk->class = KeyClass; tk->length = sizeof(xKeyState); @@ -146,8 +137,7 @@ ProcXQueryDeviceState(register ClientPtr client) buf += sizeof(xKeyState); } - if (b != NULL) - { + if (b != NULL) { tb = (xButtonState *) buf; tb->class = ButtonClass; tb->length = sizeof(xButtonState); @@ -157,19 +147,16 @@ ProcXQueryDeviceState(register ClientPtr client) buf += sizeof(xButtonState); } - if (v != NULL) - { + if (v != NULL) { tv = (xValuatorState *) buf; tv->class = ValuatorClass; tv->length = sizeof(xValuatorState); tv->num_valuators = v->numAxes; tv->mode = v->mode; buf += sizeof(xValuatorState); - for (i=0, values=v->axisVal; inumAxes; i++) - { + for (i = 0, values = v->axisVal; i < v->numAxes; i++) { *((int *)buf) = *values++; - if (client->swapped) - { + if (client->swapped) { swapl((int *)buf); /* macro - braces needed */ } buf += sizeof(int); -- cgit v1.2.3