1 files changed, 66 insertions, 84 deletions

diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c
index 4eeba4c5f..f7392f9fe 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 <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 structure  */
+#include <nx-X11/X.h>	/* for inputstr.h    */
+#include <nx-X11/Xproto.h>	/* Request macro     */
+#include "inputstr.h"	/* DeviceIntPtr      */
+#include "windowstr.h"	/* window structure  */
 #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"
 
@@ -56,13 +56,12 @@ from The Open Group.
  */
 
 int
-SProcXQueryDeviceState(client)
-    register ClientPtr client;
-    {
+SProcXQueryDeviceState(register ClientPtr client)
+{
     REQUEST(xQueryDeviceStateReq);
     swaps(&stuff->length);
-    return(ProcXQueryDeviceState(client));
-    }
+    return (ProcXQueryDeviceState(client));
+}
 
 /***********************************************************************
  *
@@ -71,22 +70,21 @@ 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;
+ProcXQueryDeviceState(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;
 
     REQUEST(xQueryDeviceStateReq);
     REQUEST_SIZE_MATCH(xQueryDeviceStateReq);
@@ -96,96 +94,83 @@ ProcXQueryDeviceState(client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    dev = LookupDeviceIntRec (stuff->deviceid);
-    if (dev == NULL)
-	{
-	SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, 
-		BadDevice);
+    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)
 	MaybeStopDeviceHint(dev, client);
 
     k = dev->key;
-    if (k != NULL)
-	{
-	total_length += sizeof (xKeyState);
+    if (k != NULL) {
+	total_length += sizeof(xKeyState);
 	num_classes++;
-	}
+    }
 
     b = dev->button;
-    if (b != NULL)
-	{
-	total_length += sizeof (xButtonState);
+    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);
+    }
+    buf = (char *)malloc(total_length);
+    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);
+	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)
-	{
+    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)
-	{
+    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; i<v->numAxes; i++)
-	    {
-	    *((int *) buf) = *values++;
-	    if (client->swapped)
-		{
-		swapl ((int *) buf);/* macro - braces needed */
-		}
-	    buf += sizeof(int);
+	for (i = 0, values = v->axisVal; i < v->numAxes; i++) {
+	    *((int *)buf) = *values++;
+	    if (client->swapped) {
+		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;
-    }
+}
 
 /***********************************************************************
  *
@@ -195,12 +180,9 @@ 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);
     WriteToClient(client, size, rep);
-    }
+}