Reindent with -cbi0.

This commit is contained in:
Daniel Stone 2006-03-31 14:52:57 +00:00
parent 7c44bb8c49
commit 710bb2e6c8
8 changed files with 60 additions and 53 deletions

View File

@ -9,6 +9,9 @@
* xkb/xkbfmisc.c: * xkb/xkbfmisc.c:
Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew. Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew.
* Xi/*.[ch]:
Reindent with -cbi0.
2006-03-30 Eric Anholt <anholt@FreeBSD.org> 2006-03-30 Eric Anholt <anholt@FreeBSD.org>
* exa/exa.c: (exaValidateGC): * exa/exa.c: (exaValidateGC):

View File

@ -146,26 +146,26 @@ ProcXChangeFeedbackControl(ClientPtr client)
} }
break; break;
case StringFeedbackClass: case StringFeedbackClass:
{ {
register char n; register char n;
xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]); xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]);
if (client->swapped) { if (client->swapped) {
swaps(&f->num_keysyms, n); swaps(&f->num_keysyms, n);
} }
if (len != ((sizeof(xStringFeedbackCtl) >> 2) + f->num_keysyms)) { if (len != ((sizeof(xStringFeedbackCtl) >> 2) + f->num_keysyms)) {
SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
0, BadLength); 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; return Success;
} }
for (s = dev->stringfeed; s; s = s->next) break;
if (s->ctrl.id == ((xStringFeedbackCtl *) & stuff[1])->id) { }
ChangeStringFeedback(client, dev, stuff->mask, s,
(xStringFeedbackCtl *) & stuff[1]);
return Success;
}
break;
}
case IntegerFeedbackClass: case IntegerFeedbackClass:
if (len != (sizeof(xIntegerFeedbackCtl) >> 2)) { if (len != (sizeof(xIntegerFeedbackCtl) >> 2)) {
SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
@ -446,8 +446,9 @@ ChangeIntegerFeedback(ClientPtr client, DeviceIntPtr dev,
*/ */
int 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 char n;
register long *p; register long *p;
@ -495,8 +496,9 @@ ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
*/ */
int 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; register char n;
int t; int t;

View File

@ -155,8 +155,8 @@ ProcXChangeDeviceDontPropagateList(register ClientPtr client)
if (DeviceEventSuppressForWindow(pWin, client, tmp[i].mask, i) != if (DeviceEventSuppressForWindow(pWin, client, tmp[i].mask, i) !=
Success) { Success) {
SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, SendErrorToClient(client, IReqCode,
0, BadClass); X_ChangeDeviceDontPropagateList, 0, BadClass);
return Success; return Success;
} }
} }

View File

@ -206,8 +206,8 @@ SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
*/ */
void 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; WindowPtr p2;

View File

@ -539,8 +539,9 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
int int
GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode, 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; WindowPtr pWin;
GrabPtr grab; GrabPtr grab;
@ -585,8 +586,8 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
} }
int 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 mskidx = dev->id;
int i, ret; int i, ret;
@ -1035,7 +1036,8 @@ DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
do { do {
parent = parent->parent; parent = parent->parent;
dev->focus->traceGood--; dev->focus->traceGood--;
} while (!parent->realized); }
while (!parent->realized);
DoFocusEvents(dev, pWin, parent, focusEventMode); DoFocusEvents(dev, pWin, parent, focusEventMode);
dev->focus->win = parent; dev->focus->win = parent;
dev->focus->revert = RevertToNone; dev->focus->revert = RevertToNone;

View File

@ -120,24 +120,25 @@ struct dev_type
{ {
Atom type; Atom type;
char *name; 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}}; 0, XI_FOOTMOUSE}};
CARD8 event_base[numInputClasses]; CARD8 event_base[numInputClasses];
@ -440,7 +441,6 @@ SProcIDispatch(register ClientPtr client)
void void
SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep) SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep)
/* All we look at is the type field */ /* All we look at is the type field */
{ /* This is common to all replies */ { /* This is common to all replies */
if (rep->RepType == X_GetExtensionVersion) if (rep->RepType == X_GetExtensionVersion)

View File

@ -147,8 +147,8 @@ ProcXGrabDeviceKey(ClientPtr client)
return Success; return Success;
ret = GrabKey(client, dev, stuff->this_device_mode, 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); tmp[stuff->grabbed_device].mask);
if (ret != Success) { if (ret != Success) {

View File

@ -266,8 +266,8 @@ SetDeviceMode(register ClientPtr client, DeviceIntPtr dev, int mode)
*/ */
int 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; return BadMatch;
} }