Reindent with -cbi0.

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):

Xi/chgfctl.c

@@ -446,8 +446,9 @@ ChangeIntegerFeedback(ClientPtr client, DeviceIntPtr dev,
  */
 
 int
-ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
-		     StringFeedbackPtr s, xStringFeedbackCtl * f)
+		     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,
+ChangeBellFeedback(ClientPtr client, DeviceIntPtr dev,
-		   BellFeedbackPtr b, xBellFeedbackCtl * f)
+		   long unsigned int mask, BellFeedbackPtr b,
+		   xBellFeedbackCtl * f)
 {
     register char n;
     int t;

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,
+	    SendErrorToClient(client, IReqCode,
-			      0, BadClass);
+			      X_ChangeDeviceDontPropagateList, 0, BadClass);
 	    return Success;
 	}
     }

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,
+FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
-		       int count)
+		       xEvent * ev, int count)
 {
     WindowPtr p2;
 

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,
+	BYTE other_devices_mode, CARD16 modifiers,
-	CARD8 key, Window grabWindow, BOOL ownerEvents, Mask mask)
+	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,
+SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
-		Mask exclusivemasks, Mask validmasks)
+		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;

Xi/extinit.c

@@ -120,24 +120,25 @@ struct dev_type
 {
     Atom type;
     char *name;
-} dev_type[] = { {
+} dev_type[] = {
-0, XI_KEYBOARD}, {
+    {
-0, XI_MOUSE}, {
+    0, XI_KEYBOARD}, {
-0, XI_TABLET}, {
+    0, XI_MOUSE}, {
-0, XI_TOUCHSCREEN}, {
+    0, XI_TABLET}, {
-0, XI_TOUCHPAD}, {
+    0, XI_TOUCHSCREEN}, {
-0, XI_BARCODE}, {
+    0, XI_TOUCHPAD}, {
-0, XI_BUTTONBOX}, {
+    0, XI_BARCODE}, {
-0, XI_KNOB_BOX}, {
+    0, XI_BUTTONBOX}, {
-0, XI_ONE_KNOB}, {
+    0, XI_KNOB_BOX}, {
-0, XI_NINE_KNOB}, {
+    0, XI_ONE_KNOB}, {
-0, XI_TRACKBALL}, {
+    0, XI_NINE_KNOB}, {
-0, XI_QUADRATURE}, {
+    0, XI_TRACKBALL}, {
-0, XI_ID_MODULE}, {
+    0, XI_QUADRATURE}, {
-0, XI_SPACEBALL}, {
+    0, XI_ID_MODULE}, {
-0, XI_DATAGLOVE}, {
+    0, XI_SPACEBALL}, {
-0, XI_EYETRACKER}, {
+    0, XI_DATAGLOVE}, {
-0, XI_CURSORKEYS}, {
+    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)

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->other_devices_mode, stuff->modifiers, mdev,
-		  stuff->grabWindow, stuff->ownerEvents,
+		  stuff->key, stuff->grabWindow, stuff->ownerEvents,
 		  tmp[stuff->grabbed_device].mask);
 
     if (ret != Success) {

Xi/stubs.c

@@ -266,8 +266,8 @@ SetDeviceMode(register ClientPtr client, DeviceIntPtr dev, int mode)
  */
 
 int
-SetDeviceValuators(register ClientPtr client, DeviceIntPtr dev, int *valuators,
+SetDeviceValuators(register ClientPtr client, DeviceIntPtr dev,
-		   int first_valuator, int num_valuators)
+		   int *valuators, int first_valuator, int num_valuators)
 {
     return BadMatch;
 }