Reindent with -cbi0.

8 files changed, 60 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index 56933c8d8..80b7b70d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 	* xkb/xkbfmisc.c:
 	Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew.
 
+	* Xi/*.[ch]:
+	Reindent with -cbi0.
+
 2006-03-30  Eric Anholt  <anholt@FreeBSD.org>
 
 	* exa/exa.c: (exaValidateGC):
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 76914dcad..d0acc593b 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -146,26 +146,26 @@ ProcXChangeFeedbackControl(ClientPtr client)
 	    }
 	break;
     case StringFeedbackClass:
-	{
-	    register char n;
-	    xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]);
+    {
+	register char n;
+	xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]);
 
-	    if (client->swapped) {
-		swaps(&f->num_keysyms, n);
-	    }
-	    if (len != ((sizeof(xStringFeedbackCtl) >> 2) + f->num_keysyms)) {
-		SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
-				  0, BadLength);
+	if (client->swapped) {
+	    swaps(&f->num_keysyms, n);
+	}
+	if (len != ((sizeof(xStringFeedbackCtl) >> 2) + f->num_keysyms)) {
+	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+			      0, BadLength);
+	    return Success;
+	}
+	for (s = dev->stringfeed; s; s = s->next)
+	    if (s->ctrl.id == ((xStringFeedbackCtl *) & stuff[1])->id) {
+		ChangeStringFeedback(client, dev, stuff->mask, s,
+				     (xStringFeedbackCtl *) & stuff[1]);
 		return Success;
 	    }
-	    for (s = dev->stringfeed; s; s = s->next)
-		if (s->ctrl.id == ((xStringFeedbackCtl *) & stuff[1])->id) {
-		    ChangeStringFeedback(client, dev, stuff->mask, s,
-					 (xStringFeedbackCtl *) & stuff[1]);
-		    return Success;
-		}
-	    break;
-	}
+	break;
+    }
     case IntegerFeedbackClass:
 	if (len != (sizeof(xIntegerFeedbackCtl) >> 2)) {
 	    SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
@@ -446,8 +446,9 @@ ChangeIntegerFeedback(ClientPtr client, DeviceIntPtr dev,
  */
 
 int
-ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
-		     StringFeedbackPtr s, xStringFeedbackCtl * f)
+ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
+		     long unsigned int mask, StringFeedbackPtr s,
+		     xStringFeedbackCtl * f)
 {
     register char n;
     register long *p;
@@ -495,8 +496,9 @@ ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
  */
 
 int
-ChangeBellFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
-		   BellFeedbackPtr b, xBellFeedbackCtl * f)
+ChangeBellFeedback(ClientPtr client, DeviceIntPtr dev,
+		   long unsigned int mask, BellFeedbackPtr b,
+		   xBellFeedbackCtl * f)
 {
     register char n;
     int t;
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 0f1ab5152..52c38838d 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -155,8 +155,8 @@ ProcXChangeDeviceDontPropagateList(register ClientPtr client)
 
 	if (DeviceEventSuppressForWindow(pWin, client, tmp[i].mask, i) !=
 	    Success) {
-	    SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList,
-			      0, BadClass);
+	    SendErrorToClient(client, IReqCode,
+			      X_ChangeDeviceDontPropagateList, 0, BadClass);
 	    return Success;
 	}
     }
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index ef99e3a5b..f6f4b8bff 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -206,8 +206,8 @@ SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
  */
 
 void
-FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask, xEvent * ev,
-		       int count)
+FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
+		       xEvent * ev, int count)
 {
     WindowPtr p2;
 
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 9645934eb..4f1f30967 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -539,8 +539,9 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
 
 int
 GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
-	BYTE other_devices_mode, CARD16 modifiers, DeviceIntPtr modifier_device,
-	CARD8 key, Window grabWindow, BOOL ownerEvents, Mask mask)
+	BYTE other_devices_mode, CARD16 modifiers,
+	DeviceIntPtr modifier_device, CARD8 key, Window grabWindow,
+	BOOL ownerEvents, Mask mask)
 {
     WindowPtr pWin;
     GrabPtr grab;
@@ -585,8 +586,8 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
 }
 
 int
-SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client, Mask mask,
-		Mask exclusivemasks, Mask validmasks)
+SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
+		Mask mask, Mask exclusivemasks, Mask validmasks)
 {
     int mskidx = dev->id;
     int i, ret;
@@ -1035,7 +1036,8 @@ DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
 	    do {
 		parent = parent->parent;
 		dev->focus->traceGood--;
-	    } while (!parent->realized);
+	    }
+	    while (!parent->realized);
 	    DoFocusEvents(dev, pWin, parent, focusEventMode);
 	    dev->focus->win = parent;
 	    dev->focus->revert = RevertToNone;
diff --git a/Xi/extinit.c b/Xi/extinit.c
index c8d4db1fc..f3aabe3a7 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -120,24 +120,25 @@ struct dev_type
 {
     Atom type;
     char *name;
-} dev_type[] = { {
-0, XI_KEYBOARD}, {
-0, XI_MOUSE}, {
-0, XI_TABLET}, {
-0, XI_TOUCHSCREEN}, {
-0, XI_TOUCHPAD}, {
-0, XI_BARCODE}, {
-0, XI_BUTTONBOX}, {
-0, XI_KNOB_BOX}, {
-0, XI_ONE_KNOB}, {
-0, XI_NINE_KNOB}, {
-0, XI_TRACKBALL}, {
-0, XI_QUADRATURE}, {
-0, XI_ID_MODULE}, {
-0, XI_SPACEBALL}, {
-0, XI_DATAGLOVE}, {
-0, XI_EYETRACKER}, {
-0, XI_CURSORKEYS}, {
+} dev_type[] = {
+    {
+    0, XI_KEYBOARD}, {
+    0, XI_MOUSE}, {
+    0, XI_TABLET}, {
+    0, XI_TOUCHSCREEN}, {
+    0, XI_TOUCHPAD}, {
+    0, XI_BARCODE}, {
+    0, XI_BUTTONBOX}, {
+    0, XI_KNOB_BOX}, {
+    0, XI_ONE_KNOB}, {
+    0, XI_NINE_KNOB}, {
+    0, XI_TRACKBALL}, {
+    0, XI_QUADRATURE}, {
+    0, XI_ID_MODULE}, {
+    0, XI_SPACEBALL}, {
+    0, XI_DATAGLOVE}, {
+    0, XI_EYETRACKER}, {
+    0, XI_CURSORKEYS}, {
 0, XI_FOOTMOUSE}};
 
 CARD8 event_base[numInputClasses];
@@ -440,7 +441,6 @@ SProcIDispatch(register ClientPtr client)
 
 void
 SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep)
-
 					/* All we look at is the type field */
 {	/* This is common to all replies    */
     if (rep->RepType == X_GetExtensionVersion)
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 1767d4002..71e72d56f 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -147,8 +147,8 @@ ProcXGrabDeviceKey(ClientPtr client)
 	return Success;
 
     ret = GrabKey(client, dev, stuff->this_device_mode,
-		  stuff->other_devices_mode, stuff->modifiers, mdev, stuff->key,
-		  stuff->grabWindow, stuff->ownerEvents,
+		  stuff->other_devices_mode, stuff->modifiers, mdev,
+		  stuff->key, stuff->grabWindow, stuff->ownerEvents,
 		  tmp[stuff->grabbed_device].mask);
 
     if (ret != Success) {
diff --git a/Xi/stubs.c b/Xi/stubs.c
index f7b0fe984..6b9e682b9 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -266,8 +266,8 @@ SetDeviceMode(register ClientPtr client, DeviceIntPtr dev, int mode)
  */
 
 int
-SetDeviceValuators(register ClientPtr client, DeviceIntPtr dev, int *valuators,
-		   int first_valuator, int num_valuators)
+SetDeviceValuators(register ClientPtr client, DeviceIntPtr dev,
+		   int *valuators, int first_valuator, int num_valuators)
 {
     return BadMatch;
 }