1 files changed, 44 insertions, 51 deletions

diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.c b/nx-X11/programs/Xserver/Xi/grabdevb.c
index edf1d763b..922a819fc 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevb.c
+++ b/nx-X11/programs/Xserver/Xi/grabdevb.c
@@ -55,15 +55,15 @@ 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 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 "exevents.h"
 #include "extnsionst.h"
-#include "extinit.h"			/* LookupDeviceIntRec */
+#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "grabdev.h"
@@ -76,9 +76,8 @@ SOFTWARE.
  */
 
 int
-SProcXGrabDeviceButton(client)
-    register ClientPtr client;
-    {
+SProcXGrabDeviceButton(register ClientPtr client)
+{
     REQUEST(xGrabDeviceButtonReq);
     swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xGrabDeviceButtonReq);
@@ -89,8 +88,8 @@ SProcXGrabDeviceButton(client)
                       stuff->event_count * sizeof(CARD32));
     SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
 
-    return(ProcXGrabDeviceButton(client));
-    }
+    return (ProcXGrabDeviceButton(client));
+}
 
 /***********************************************************************
  *
@@ -99,61 +98,55 @@ SProcXGrabDeviceButton(client)
  */
 
 int
-ProcXGrabDeviceButton(client)
-    ClientPtr client;
-    {
-    int			ret;
-    DeviceIntPtr	dev;
-    DeviceIntPtr	mdev;
-    XEventClass		*class;
-    struct tmask	tmp[EMASKSIZE];
+ProcXGrabDeviceButton(ClientPtr client)
+{
+    int ret;
+    DeviceIntPtr dev;
+    DeviceIntPtr mdev;
+    XEventClass *class;
+    struct tmask tmp[EMASKSIZE];
 
     REQUEST(xGrabDeviceButtonReq);
     REQUEST_AT_LEAST_SIZE(xGrabDeviceButtonReq);
 
-    if (stuff->length !=(sizeof(xGrabDeviceButtonReq)>>2) + stuff->event_count)
-	{
-	SendErrorToClient (client, IReqCode, X_GrabDeviceButton, 0, BadLength);
+    if (stuff->length !=
+	(sizeof(xGrabDeviceButtonReq) >> 2) + stuff->event_count) {
+	SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, BadLength);
 	return Success;
-	}
+    }
 
-    dev = LookupDeviceIntRec (stuff->grabbed_device);
-    if (dev == NULL)
-	{
-	SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, 
-	    BadDevice);
+    dev = LookupDeviceIntRec(stuff->grabbed_device);
+    if (dev == NULL) {
+	SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, BadDevice);
 	return Success;
-	}
-    if (stuff->modifier_device != UseXKeyboard)
-	{
-	mdev = LookupDeviceIntRec (stuff->modifier_device);
-	if (mdev == NULL)
-	    {
-	    SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, 
-	        BadDevice);
+    }
+    if (stuff->modifier_device != UseXKeyboard) {
+	mdev = LookupDeviceIntRec(stuff->modifier_device);
+	if (mdev == NULL) {
+	    SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0,
+			      BadDevice);
 	    return Success;
-	    }
-	if (mdev->key == NULL)
-	    {
-	    SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, 
-		BadMatch);
+	}
+	if (mdev->key == NULL) {
+	    SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0,
+			      BadMatch);
 	    return Success;
-	    }
 	}
-    else
+    } else
 	mdev = (DeviceIntPtr) LookupKeyboardDevice();
 
     class = (XEventClass *) (&stuff[1]);	/* first word of values */
 
-    if ((ret = CreateMaskFromList (client, class,
-	stuff->event_count, tmp, dev, X_GrabDeviceButton)) != Success)
-	    return Success;
-    ret = GrabButton(client, dev, stuff->this_device_mode, 
-	stuff->other_devices_mode, stuff->modifiers, mdev, stuff->button, 
-	stuff->grabWindow, stuff->ownerEvents, (Cursor)0, (Window)0, 
-	tmp[stuff->grabbed_device].mask);
+    if ((ret = CreateMaskFromList(client, class,
+				  stuff->event_count, tmp, dev,
+				  X_GrabDeviceButton)) != Success)
+	return Success;
+    ret = GrabButton(client, dev, stuff->this_device_mode,
+		     stuff->other_devices_mode, stuff->modifiers, mdev,
+		     stuff->button, stuff->grabWindow, stuff->ownerEvents,
+		     (Cursor) 0, (Window) 0, tmp[stuff->grabbed_device].mask);
 
     if (ret != Success)
 	SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, ret);
-    return(Success);
-    }
+    return (Success);
+}