Skip to content

N
nx-libs
Commit 41a0ba72 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mihai Moldovan
Browse files
Options

Xi: reformat code, ansify

parent 5bfafee5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 611 additions and 611 deletions
nx-X11/programs/Xserver/Xi/allowev.c
View file @ 41a0ba72
......@@ -77,13 +77,13 @@ SOFTWARE.
int
SProcXAllowDeviceEvents(client)
register ClientPtr client;
{
{
REQUEST(xAllowDeviceEventsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xAllowDeviceEventsReq);
swapl(&stuff->time);
return(ProcXAllowDeviceEvents(client));
}
return (ProcXAllowDeviceEvents(client));
}
/***********************************************************************
*
......@@ -94,14 +94,14 @@ SProcXAllowDeviceEvents(client)
int
ProcXAllowDeviceEvents(client)
register ClientPtr client;
{
{
TimeStamp time;
DeviceIntPtr thisdev;
REQUEST(xAllowDeviceEventsReq);
REQUEST_SIZE_MATCH(xAllowDeviceEventsReq);
thisdev = LookupDeviceIntRec (stuff->deviceid);
thisdev = LookupDeviceIntRec(stuff->deviceid);
if (thisdev == NULL)
{
SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadDevice);
......@@ -136,4 +136,4 @@ ProcXAllowDeviceEvents(client)
return Success;
}
return Success;
}
}
nx-X11/programs/Xserver/Xi/chgdctl.c
View file @ 41a0ba72
......@@ -78,13 +78,13 @@ SOFTWARE.
int
SProcXChangeDeviceControl(client)
register ClientPtr client;
{
{
REQUEST(xChangeDeviceControlReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl));
swaps(&stuff->control);
return(ProcXChangeDeviceControl(client));
}
return (ProcXChangeDeviceControl(client));
}
/***********************************************************************
*
......@@ -95,7 +95,7 @@ SProcXChangeDeviceControl(client)
int
ProcXChangeDeviceControl(client)
ClientPtr client;
{
{
unsigned len;
int i, status;
DeviceIntPtr dev;
......@@ -107,11 +107,11 @@ ProcXChangeDeviceControl(client)
REQUEST(xChangeDeviceControlReq);
REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl));
len = stuff->length - (sizeof(xChangeDeviceControlReq) >>2);
dev = LookupDeviceIntRec (stuff->deviceid);
len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0,
SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0,
BadDevice);
return Success;
}
......@@ -124,18 +124,18 @@ ProcXChangeDeviceControl(client)
switch (stuff->control)
{
case DEVICE_RESOLUTION:
r = (xDeviceResolutionCtl *) &stuff[1];
if ((len < (sizeof(xDeviceResolutionCtl)>>2)) ||
r = (xDeviceResolutionCtl *) & stuff[1];
if ((len < (sizeof(xDeviceResolutionCtl) >> 2)) ||
(len != (sizeof(xDeviceResolutionCtl)>>2) +
r->num_valuators))
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceControl,
SendErrorToClient(client, IReqCode, X_ChangeDeviceControl,
0, BadLength);
return Success;
}
if (!dev->valuator)
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0,
SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0,
BadMatch);
return Success;
}
......@@ -149,23 +149,23 @@ ProcXChangeDeviceControl(client)
resolution = (CARD32 *) (r + 1);
if (r->first_valuator + r->num_valuators > dev->valuator->numAxes)
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0,
SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0,
BadValue);
return Success;
}
status = ChangeDeviceControl(client, dev, (xDeviceCtl*) r);
status = ChangeDeviceControl(client, dev, (xDeviceCtl *) r);
if (status == Success)
{
a = &dev->valuator->axes[r->first_valuator];
for (i=0; i<r->num_valuators; i++)
if (*(resolution+i) < (a+i)->min_resolution ||
for (i = 0; i < r->num_valuators; i++)
if (*(resolution + i) < (a + i)->min_resolution ||
*(resolution+i) > (a+i)->max_resolution)
{
SendErrorToClient (client, IReqCode,
SendErrorToClient(client, IReqCode,
X_ChangeDeviceControl, 0, BadValue);
return Success;
}
for (i=0; i<r->num_valuators; i++)
for (i = 0; i < r->num_valuators; i++)
(a++)->resolution = *resolution++;
}
else if (status == DeviceBusy)
......@@ -177,7 +177,7 @@ ProcXChangeDeviceControl(client)
}
else
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0,
SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0,
BadMatch);
return Success;
}
......@@ -189,7 +189,7 @@ ProcXChangeDeviceControl(client)
}
WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep);
return Success;
}
}
/***********************************************************************
*
......@@ -203,9 +203,9 @@ SRepXChangeDeviceControl (client, size, rep)
ClientPtr client;
int size;
xChangeDeviceControlReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/chgdctl.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXChangeDeviceControl(
void
SRepXChangeDeviceControl (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xChangeDeviceControlReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/chgfctl.h
View file @ 41a0ba72
......@@ -43,54 +43,54 @@ ProcXChangeFeedbackControl(
int
ChangeKbdFeedback (
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
KbdFeedbackPtr /* k */,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
KbdFeedbackPtr /* k */ ,
xKbdFeedbackCtl * /* f */
);
int
ChangePtrFeedback (
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
PtrFeedbackPtr /* p */,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
PtrFeedbackPtr /* p */ ,
xPtrFeedbackCtl * /* f */
);
int
ChangeIntegerFeedback (
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
IntegerFeedbackPtr /* i */,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
IntegerFeedbackPtr /* i */ ,
xIntegerFeedbackCtl * /* f */
);
int
ChangeStringFeedback (
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
StringFeedbackPtr /* s */,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
StringFeedbackPtr /* s */ ,
xStringFeedbackCtl * /* f */
);
int
ChangeBellFeedback (
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
BellFeedbackPtr /* b */,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
BellFeedbackPtr /* b */ ,
xBellFeedbackCtl * /* f */
);
int
ChangeLedFeedback (
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
LedFeedbackPtr /* l */,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
LedFeedbackPtr /* l */ ,
xLedFeedbackCtl * /* f */
);
......
nx-X11/programs/Xserver/Xi/chgkbd.c
View file @ 41a0ba72
......@@ -80,12 +80,12 @@ SOFTWARE.
int
SProcXChangeKeyboardDevice(client)
register ClientPtr client;
{
{
REQUEST(xChangeKeyboardDeviceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xChangeKeyboardDeviceReq);
return(ProcXChangeKeyboardDevice(client));
}
return (ProcXChangeKeyboardDevice(client));
}
/***********************************************************************
*
......@@ -97,7 +97,7 @@ SProcXChangeKeyboardDevice(client)
int
ProcXChangeKeyboardDevice (client)
register ClientPtr client;
{
{
int i;
DeviceIntPtr xkbd = inputInfo.keyboard;
DeviceIntPtr dev;
......@@ -115,7 +115,7 @@ ProcXChangeKeyboardDevice (client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
rep.status = -1;
......@@ -150,10 +150,10 @@ ProcXChangeKeyboardDevice (client)
return Success;
}
if (!dev->focus)
InitFocusClassDeviceStruct (dev);
InitFocusClassDeviceStruct(dev);
if (!dev->kbdfeed)
InitKbdFeedbackClassDeviceStruct(dev, (BellProcPtr)NoopDDA,
(KbdCtrlProcPtr)NoopDDA);
InitKbdFeedbackClassDeviceStruct(dev, (BellProcPtr) NoopDDA,
(KbdCtrlProcPtr) NoopDDA);
df = dev->focus;
df->win = xf->win;
df->revert = xf->revert;
......@@ -167,18 +167,18 @@ ProcXChangeKeyboardDevice (client)
Must_have_memory = FALSE; /* XXX */
}
df->traceSize = xf->traceSize;
for (i=0; i<df->traceSize; i++)
for (i = 0; i < df->traceSize; i++)
df->trace[i] = xf->trace[i];
RegisterOtherDevice (xkbd);
RegisterKeyboardDevice (dev);
RegisterOtherDevice(xkbd);
RegisterKeyboardDevice(dev);
ev.type = ChangeDeviceNotify;
ev.deviceid = stuff->deviceid;
ev.time = currentTime.milliseconds;
ev.request = NewKeyboard;
SendEventToAllWindows (dev, ChangeDeviceNotifyMask, (xEvent *)&ev, 1);
SendMappingNotify (MappingKeyboard, k->curKeySyms.minKeyCode,
SendEventToAllWindows(dev, ChangeDeviceNotifyMask, (xEvent *) & ev, 1);
SendMappingNotify(MappingKeyboard, k->curKeySyms.minKeyCode,
k->curKeySyms.maxKeyCode - k->curKeySyms.minKeyCode + 1,client);
rep.status = 0;
......@@ -187,7 +187,7 @@ ProcXChangeKeyboardDevice (client)
WriteReplyToClient (client, sizeof (xChangeKeyboardDeviceReply),
&rep);
return Success;
}
}
/***********************************************************************
*
......@@ -201,8 +201,8 @@ SRepXChangeKeyboardDevice (client, size, rep)
ClientPtr client;
int size;
xChangeKeyboardDeviceReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/chgkbd.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXChangeKeyboardDevice (
void
SRepXChangeKeyboardDevice (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xChangeKeyboardDeviceReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/chgkmap.c
View file @ 41a0ba72
......@@ -77,7 +77,7 @@ SOFTWARE.
int
SProcXChangeDeviceKeyMapping(client)
register ClientPtr client;
{
{
unsigned int count;
REQUEST(xChangeDeviceKeyMappingReq);
......@@ -86,8 +86,8 @@ SProcXChangeDeviceKeyMapping(client)
count = stuff->keyCodes * stuff->keySymsPerKeyCode;
REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
SwapLongs((CARD32 *) (&stuff[1]), count);
return(ProcXChangeDeviceKeyMapping(client));
}
return (ProcXChangeDeviceKeyMapping(client));
}
/***********************************************************************
*
......@@ -98,7 +98,7 @@ SProcXChangeDeviceKeyMapping(client)
int
ProcXChangeDeviceKeyMapping(client)
register ClientPtr client;
{
{
int ret;
unsigned len;
DeviceIntPtr dev;
......@@ -110,16 +110,16 @@ ProcXChangeDeviceKeyMapping(client)
count = stuff->keyCodes * stuff->keySymsPerKeyCode;
REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceKeyMapping, 0,
SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0,
BadDevice);
return Success;
}
len = stuff->length - (sizeof(xChangeDeviceKeyMappingReq) >> 2);
ret = ChangeKeyMapping (client, dev, len, DeviceMappingNotify,
ret = ChangeKeyMapping(client, dev, len, DeviceMappingNotify,
stuff->firstKeyCode, stuff->keyCodes, stuff->keySymsPerKeyCode,
(KeySym *)&stuff[1]);
......@@ -127,4 +127,4 @@ ProcXChangeDeviceKeyMapping(client)
SendErrorToClient (client, IReqCode, X_ChangeDeviceKeyMapping, 0,
ret);
return Success;
}
}
nx-X11/programs/Xserver/Xi/chgprop.c
View file @ 41a0ba72
......@@ -79,7 +79,7 @@ SOFTWARE.
int
SProcXChangeDeviceDontPropagateList(client)
register ClientPtr client;
{
{
REQUEST(xChangeDeviceDontPropagateListReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
......@@ -88,8 +88,8 @@ SProcXChangeDeviceDontPropagateList(client)
REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
stuff->count * sizeof(CARD32));
SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
return(ProcXChangeDeviceDontPropagateList(client));
}
return (ProcXChangeDeviceDontPropagateList(client));
}
/***********************************************************************
*
......@@ -100,7 +100,7 @@ SProcXChangeDeviceDontPropagateList(client)
int
ProcXChangeDeviceDontPropagateList (client)
register ClientPtr client;
{
{
int i;
WindowPtr pWin;
struct tmask tmp[EMASKSIZE];
......@@ -109,15 +109,15 @@ ProcXChangeDeviceDontPropagateList (client)
REQUEST(xChangeDeviceDontPropagateListReq);
REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
if (stuff->length !=(sizeof(xChangeDeviceDontPropagateListReq)>>2) +
if (stuff->length != (sizeof(xChangeDeviceDontPropagateListReq) >> 2) +
stuff->count)
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceDontPropagateList, 0,
SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0,
BadLength);
return Success;
}
pWin = (WindowPtr) LookupWindow (stuff->window, client);
pWin = (WindowPtr) LookupWindow(stuff->window, client);
if (!pWin)
{
client->errorValue = stuff->window;
......@@ -134,7 +134,7 @@ ProcXChangeDeviceDontPropagateList (client)
return Success;
}
if (CreateMaskFromList (client, (XEventClass *)&stuff[1],
if (CreateMaskFromList(client, (XEventClass *) & stuff[1],
stuff->count, tmp, NULL, X_ChangeDeviceDontPropagateList) != Success)
return Success;
......@@ -160,4 +160,4 @@ ProcXChangeDeviceDontPropagateList (client)
}
return Success;
}
}
nx-X11/programs/Xserver/Xi/chgptr.c
View file @ 41a0ba72
......@@ -83,12 +83,12 @@ SOFTWARE.
int
SProcXChangePointerDevice(client)
register ClientPtr client;
{
{
REQUEST(xChangePointerDeviceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xChangePointerDeviceReq);
return(ProcXChangePointerDevice(client));
}
return (ProcXChangePointerDevice(client));
}
/***********************************************************************
*
......@@ -99,7 +99,7 @@ SProcXChangePointerDevice(client)
int
ProcXChangePointerDevice (client)
register ClientPtr client;
{
{
DeviceIntPtr xptr = inputInfo.pointer;
DeviceIntPtr dev;
ValuatorClassPtr v;
......@@ -114,7 +114,7 @@ ProcXChangePointerDevice (client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
rep.status = -1;
......@@ -153,19 +153,19 @@ ProcXChangePointerDevice (client)
if (dev->focus)
DeleteFocusClassDeviceStruct(dev);
if (!dev->button)
InitButtonClassDeviceStruct (dev, 0, NULL);
InitButtonClassDeviceStruct(dev, 0, NULL);
if (!dev->ptrfeed)
InitPtrFeedbackClassDeviceStruct(dev, (PtrCtrlProcPtr)NoopDDA);
RegisterOtherDevice (xptr);
RegisterPointerDevice (dev);
InitPtrFeedbackClassDeviceStruct(dev, (PtrCtrlProcPtr) NoopDDA);
RegisterOtherDevice(xptr);
RegisterPointerDevice(dev);
ev.type = ChangeDeviceNotify;
ev.deviceid = stuff->deviceid;
ev.time = currentTime.milliseconds;
ev.request = NewPointer;
SendEventToAllWindows (dev, ChangeDeviceNotifyMask, (xEvent *)&ev, 1);
SendMappingNotify (MappingPointer, 0, 0, client);
SendEventToAllWindows(dev, ChangeDeviceNotifyMask, (xEvent *) & ev, 1);
SendMappingNotify(MappingPointer, 0, 0, client);
rep.status = 0;
}
......@@ -173,16 +173,16 @@ ProcXChangePointerDevice (client)
WriteReplyToClient (client, sizeof (xChangePointerDeviceReply),
&rep);
return Success;
}
}
void
DeleteFocusClassDeviceStruct(dev)
DeviceIntPtr dev;
{
{
free(dev->focus->trace);
free(dev->focus);
dev->focus = NULL;
}
}
/***********************************************************************
*
......@@ -196,7 +196,7 @@ SendEventToAllWindows (dev, mask, ev, count)
Mask mask;
xEvent *ev;
int count;
{
{
int i;
WindowPtr pWin, p1;
......@@ -205,9 +205,9 @@ SendEventToAllWindows (dev, mask, ev, count)
pWin = screenInfo.screens[i]->root;
(void)DeliverEventsToWindow(pWin, ev, count, mask, NullGrab, dev->id);
p1 = pWin->firstChild;
FindInterestedChildren (dev, p1, mask, ev, count);
}
FindInterestedChildren(dev, p1, mask, ev, count);
}
}
/***********************************************************************
*
......@@ -223,17 +223,17 @@ FindInterestedChildren (dev, p1, mask, ev, count)
Mask mask;
xEvent *ev;
int count;
{
{
WindowPtr p2;
while (p1)
{
p2 = p1->firstChild;
(void)DeliverEventsToWindow(p1, ev, count, mask, NullGrab, dev->id);
FindInterestedChildren (dev, p2, mask, ev, count);
FindInterestedChildren(dev, p2, mask, ev, count);
p1 = p1->nextSib;
}
}
}
/***********************************************************************
*
......@@ -247,8 +247,8 @@ SRepXChangePointerDevice (client, size, rep)
ClientPtr client;
int size;
xChangePointerDeviceReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/chgptr.h
View file @ 41a0ba72
......@@ -48,24 +48,24 @@ DeleteFocusClassDeviceStruct(
void
SendEventToAllWindows (
DeviceIntPtr /* dev */,
Mask /* mask */,
xEvent * /* ev */,
Mask /* mask */ ,
xEvent * /* ev */ ,
int /* count */
);
void
FindInterestedChildren ( /* FIXME: could be static? */
DeviceIntPtr /* dev */,
WindowPtr /* p1 */,
Mask /* mask */,
xEvent * /* ev */,
DeviceIntPtr /* dev */ ,
WindowPtr /* p1 */ ,
Mask /* mask */ ,
xEvent * /* ev */ ,
int /* count */
);
void
SRepXChangePointerDevice (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xChangePointerDeviceReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/closedev.c
View file @ 41a0ba72
......@@ -78,12 +78,12 @@ SOFTWARE.
int
SProcXCloseDevice(client)
register ClientPtr client;
{
{
REQUEST(xCloseDeviceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xCloseDeviceReq);
return(ProcXCloseDevice(client));
}
return (ProcXCloseDevice(client));
}
/***********************************************************************
*
......@@ -94,7 +94,7 @@ SProcXCloseDevice(client)
int
ProcXCloseDevice(client)
register ClientPtr client;
{
{
int i;
WindowPtr pWin, p1;
DeviceIntPtr d;
......@@ -102,7 +102,7 @@ ProcXCloseDevice(client)
REQUEST(xCloseDeviceReq);
REQUEST_SIZE_MATCH(xCloseDeviceReq);
d = LookupDeviceIntRec (stuff->deviceid);
d = LookupDeviceIntRec(stuff->deviceid);
if (d == NULL)
{
SendErrorToClient(client, IReqCode, X_CloseDevice, 0, BadDevice);
......@@ -110,7 +110,7 @@ ProcXCloseDevice(client)
}
if (d->grab && SameClient(d->grab, client))
(*d->DeactivateGrab)(d); /* release active grab */
(*d->DeactivateGrab) (d); /* release active grab */
/* Remove event selections from all windows for events from this device
and selected by this client.
......@@ -119,14 +119,14 @@ ProcXCloseDevice(client)
for (i=0; i<screenInfo.numScreens; i++)
{
pWin = screenInfo.screens[i]->root;
DeleteDeviceEvents (d, pWin, client);
DeleteDeviceEvents(d, pWin, client);
p1 = pWin->firstChild;
DeleteEventsFromChildren (d, p1, client);
DeleteEventsFromChildren(d, p1, client);
}
CloseInputDevice (d, client);
CloseInputDevice(d, client);
return Success;
}
}
/***********************************************************************
*
......@@ -140,17 +140,17 @@ DeleteEventsFromChildren(dev, p1, client)
DeviceIntPtr dev;
WindowPtr p1;
ClientPtr client;
{
{
WindowPtr p2;
while (p1)
{
p2 = p1->firstChild;
DeleteDeviceEvents (dev, p1, client);
DeleteDeviceEvents(dev, p1, client);
DeleteEventsFromChildren(dev, p2, client);
p1 = p1->nextSib;
}
}
}
/***********************************************************************
*
......@@ -164,7 +164,7 @@ DeleteDeviceEvents (dev, pWin, client)
DeviceIntPtr dev;
WindowPtr pWin;
ClientPtr client;
{
{
InputClientsPtr others;
OtherInputMasks *pOthers;
GrabPtr grab, next;
......@@ -172,7 +172,7 @@ DeleteDeviceEvents (dev, pWin, client)
if ((pOthers = wOtherInputMasks(pWin)) != 0)
for (others=pOthers->inputClients; others;
others = others->next)
if (SameClient(others,client))
if (SameClient(others, client))
others->mask[dev->id] = NoEventMask;
for (grab = wPassiveGrabs(pWin); grab; grab=next)
......@@ -180,6 +180,6 @@ DeleteDeviceEvents (dev, pWin, client)
next = grab->next;
if ((grab->device == dev) &&
(client->clientAsMask == CLIENT_BITS(grab->resource)))
FreeResource (grab->resource, RT_NONE);
}
FreeResource(grab->resource, RT_NONE);
}
}
nx-X11/programs/Xserver/Xi/closedev.h
View file @ 41a0ba72
......@@ -43,14 +43,14 @@ ProcXCloseDevice(
void
DeleteEventsFromChildren(
DeviceIntPtr /* dev */,
WindowPtr /* p1 */,
WindowPtr /* p1 */ ,
ClientPtr /* client */
);
void
DeleteDeviceEvents (
DeviceIntPtr /* dev */,
WindowPtr /* pWin */,
WindowPtr /* pWin */ ,
ClientPtr /* client */
);
......
nx-X11/programs/Xserver/Xi/devbell.c
View file @ 41a0ba72
......@@ -76,11 +76,11 @@ SOFTWARE.
int
SProcXDeviceBell(client)
register ClientPtr client;
{
{
REQUEST(xDeviceBellReq);
swaps(&stuff->length);
return(ProcXDeviceBell(client));
}
return (ProcXDeviceBell(client));
}
/***********************************************************************
*
......@@ -91,20 +91,20 @@ SProcXDeviceBell(client)
int
ProcXDeviceBell (client)
register ClientPtr client;
{
{
DeviceIntPtr dev;
KbdFeedbackPtr k;
BellFeedbackPtr b;
int base;
int newpercent;
CARD8 class;
void * ctrl;
void *ctrl;
BellProcPtr proc;
REQUEST(xDeviceBellReq);
REQUEST_SIZE_MATCH(xDeviceBellReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
client->errorValue = stuff->deviceid;
......@@ -120,7 +120,7 @@ ProcXDeviceBell (client)
}
if (stuff->feedbackclass == KbdFeedbackClass)
{
for (k=dev->kbdfeed; k; k=k->next)
for (k = dev->kbdfeed; k; k = k->next)
if (k->ctrl.id == stuff->feedbackid)
break;
if (!k)
......@@ -131,12 +131,12 @@ ProcXDeviceBell (client)
}
base = k->ctrl.bell;
proc = k->BellProc;
ctrl = (void *) &(k->ctrl);
ctrl = (void *)&(k->ctrl);
class = KbdFeedbackClass;
}
else if (stuff->feedbackclass == BellFeedbackClass)
{
for (b=dev->bell; b; b=b->next)
for (b = dev->bell; b; b = b->next)
if (b->ctrl.id == stuff->feedbackid)
break;
if (!b)
......@@ -147,7 +147,7 @@ ProcXDeviceBell (client)
}
base = b->ctrl.percent;
proc = b->BellProc;
ctrl = (void *) &(b->ctrl);
ctrl = (void *)&(b->ctrl);
class = BellFeedbackClass;
}
else
......@@ -161,7 +161,7 @@ ProcXDeviceBell (client)
newpercent = base + newpercent;
else
newpercent = base - newpercent + stuff->percent;
(*proc)(newpercent, dev, ctrl, class);
(*proc) (newpercent, dev, ctrl, class);
return Success;
}
}
nx-X11/programs/Xserver/Xi/getbmap.c
View file @ 41a0ba72
......@@ -75,11 +75,11 @@ SOFTWARE.
int
SProcXGetDeviceButtonMapping(client)
register ClientPtr client;
{
{
REQUEST(xGetDeviceButtonMappingReq);
swaps(&stuff->length);
return(ProcXGetDeviceButtonMapping(client));
}
return (ProcXGetDeviceButtonMapping(client));
}
/***********************************************************************
*
......@@ -90,7 +90,7 @@ SProcXGetDeviceButtonMapping(client)
int
ProcXGetDeviceButtonMapping (client)
register ClientPtr client;
{
{
DeviceIntPtr dev;
xGetDeviceButtonMappingReply rep;
ButtonClassPtr b;
......@@ -104,7 +104,7 @@ ProcXGetDeviceButtonMapping (client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_GetDeviceButtonMapping, 0,
......@@ -120,12 +120,12 @@ ProcXGetDeviceButtonMapping (client)
return Success;
}
rep.nElts = b->numButtons;
rep.length = (rep.nElts + (4-1))/4;
WriteReplyToClient (client, sizeof (xGetDeviceButtonMappingReply), &rep);
rep.length = (rep.nElts + (4 - 1)) / 4;
WriteReplyToClient(client, sizeof(xGetDeviceButtonMappingReply), &rep);
WriteToClient(client, rep.nElts,
(char *)&b->map[1]);
return Success;
}
}
/***********************************************************************
*
......@@ -139,8 +139,8 @@ SRepXGetDeviceButtonMapping (client, size, rep)
ClientPtr client;
int size;
xGetDeviceButtonMappingReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getbmap.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXGetDeviceButtonMapping (
void
SRepXGetDeviceButtonMapping (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetDeviceButtonMappingReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getdctl.c
View file @ 41a0ba72
......@@ -76,13 +76,13 @@ SOFTWARE.
int
SProcXGetDeviceControl(client)
register ClientPtr client;
{
{
REQUEST(xGetDeviceControlReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xGetDeviceControlReq);
swaps(&stuff->control);
return(ProcXGetDeviceControl(client));
}
return (ProcXGetDeviceControl(client));
}
/***********************************************************************
*
......@@ -93,7 +93,7 @@ SProcXGetDeviceControl(client)
int
ProcXGetDeviceControl(client)
ClientPtr client;
{
{
int total_length = 0;
char *buf, *savbuf;
register DeviceIntPtr dev;
......@@ -102,7 +102,7 @@ ProcXGetDeviceControl(client)
REQUEST(xGetDeviceControlReq);
REQUEST_SIZE_MATCH(xGetDeviceControlReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0,
......@@ -120,11 +120,11 @@ ProcXGetDeviceControl(client)
case DEVICE_RESOLUTION:
if (!dev->valuator)
{
SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0,
SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0,
BadMatch);
return Success;
}
total_length = sizeof (xDeviceResolutionState) +
total_length = sizeof(xDeviceResolutionState) +
(3 * sizeof(int) * dev->valuator->numAxes);
break;
default:
......@@ -133,14 +133,14 @@ ProcXGetDeviceControl(client)
return Success;
}
buf = (char *) malloc (total_length);
buf = (char *)malloc(total_length);
if (!buf)
{
SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0,
BadAlloc);
return Success;
}
savbuf=buf;
savbuf = buf;
switch (stuff->control)
{
......@@ -152,12 +152,12 @@ ProcXGetDeviceControl(client)
break;
}
rep.length = (total_length+3) >> 2;
rep.length = (total_length + 3) >> 2;
WriteReplyToClient(client, sizeof(xGetDeviceControlReply), &rep);
WriteToClient(client, total_length, savbuf);
free (savbuf);
free(savbuf);
return Success;
}
}
/***********************************************************************
*
......@@ -171,7 +171,7 @@ CopySwapDeviceResolution (client, v, buf, length)
ValuatorClassPtr v;
char *buf;
int length;
{
{
AxisInfoPtr a;
xDeviceResolutionState *r;
int i, *iptr;
......@@ -180,26 +180,26 @@ CopySwapDeviceResolution (client, v, buf, length)
r->control = DEVICE_RESOLUTION;
r->length = length;
r->num_valuators = v->numAxes;
buf += sizeof (xDeviceResolutionState);
iptr = (int *) buf;
for (i=0,a=v->axes; i<v->numAxes; i++,a++)
buf += sizeof(xDeviceResolutionState);
iptr = (int *)buf;
for (i = 0, a = v->axes; i < v->numAxes; i++, a++)
*iptr++ = a->resolution;
for (i=0,a=v->axes; i<v->numAxes; i++,a++)
for (i = 0, a = v->axes; i < v->numAxes; i++, a++)
*iptr++ = a->min_resolution;
for (i=0,a=v->axes; i<v->numAxes; i++,a++)
for (i = 0, a = v->axes; i < v->numAxes; i++, a++)
*iptr++ = a->max_resolution;
if (client->swapped)
{
swaps (&r->control);
swaps (&r->length);
swapl (&r->num_valuators);
iptr = (int *) buf;
swaps(&r->control);
swaps(&r->length);
swapl(&r->num_valuators);
iptr = (int *)buf;
for (i=0; i < (3 * v->numAxes); i++,iptr++)
{
swapl (iptr);
}
swapl(iptr);
}
}
}
/***********************************************************************
*
......@@ -213,9 +213,9 @@ SRepXGetDeviceControl (client, size, rep)
ClientPtr client;
int size;
xGetDeviceControlReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getdctl.h
View file @ 41a0ba72
......@@ -43,15 +43,15 @@ ProcXGetDeviceControl (
void
CopySwapDeviceResolution (
ClientPtr /* client */,
ValuatorClassPtr /* v */,
char * /* buf */,
ValuatorClassPtr /* v */ ,
char * /* buf */ ,
int /* length */
);
void
SRepXGetDeviceControl (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetDeviceControlReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getfctl.c
View file @ 41a0ba72
......@@ -76,11 +76,11 @@ SOFTWARE.
int
SProcXGetFeedbackControl(client)
register ClientPtr client;
{
{
REQUEST(xGetFeedbackControlReq);
swaps(&stuff->length);
return(ProcXGetFeedbackControl(client));
}
return (ProcXGetFeedbackControl(client));
}
/***********************************************************************
*
......@@ -91,7 +91,7 @@ SProcXGetFeedbackControl(client)
int
ProcXGetFeedbackControl(client)
ClientPtr client;
{
{
int total_length = 0;
char *buf, *savbuf;
register DeviceIntPtr dev;
......@@ -106,7 +106,7 @@ ProcXGetFeedbackControl(client)
REQUEST(xGetFeedbackControlReq);
REQUEST_SIZE_MATCH(xGetFeedbackControlReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_GetFeedbackControl, 0,
......@@ -134,7 +134,7 @@ ProcXGetFeedbackControl(client)
{
rep.num_feedbacks++;
total_length += sizeof(xStringFeedbackState) +
(s->ctrl.num_symbols_supported * sizeof (KeySym));
(s->ctrl.num_symbols_supported * sizeof(KeySym));
}
for (i=dev->intfeed; i; i=i->next)
{
......@@ -159,34 +159,34 @@ ProcXGetFeedbackControl(client)
return Success;
}
buf = (char *) malloc (total_length);
buf = (char *)malloc(total_length);
if (!buf)
{
SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0,
BadAlloc);
return Success;
}
savbuf=buf;
for (k=dev->kbdfeed; k; k=k->next)
CopySwapKbdFeedback (client, k, &buf);
for (p=dev->ptrfeed; p; p=p->next)
CopySwapPtrFeedback (client, p, &buf);
for (s=dev->stringfeed; s; s=s->next)
CopySwapStringFeedback (client, s, &buf);
for (i=dev->intfeed; i; i=i->next)
CopySwapIntegerFeedback (client, i, &buf);
for (l=dev->leds; l; l=l->next)
CopySwapLedFeedback (client, l, &buf);
for (b=dev->bell; b; b=b->next)
CopySwapBellFeedback (client, b, &buf);
rep.length = (total_length+3) >> 2;
savbuf = buf;
for (k = dev->kbdfeed; k; k = k->next)
CopySwapKbdFeedback(client, k, &buf);
for (p = dev->ptrfeed; p; p = p->next)
CopySwapPtrFeedback(client, p, &buf);
for (s = dev->stringfeed; s; s = s->next)
CopySwapStringFeedback(client, s, &buf);
for (i = dev->intfeed; i; i = i->next)
CopySwapIntegerFeedback(client, i, &buf);
for (l = dev->leds; l; l = l->next)
CopySwapLedFeedback(client, l, &buf);
for (b = dev->bell; b; b = b->next)
CopySwapBellFeedback(client, b, &buf);
rep.length = (total_length + 3) >> 2;
WriteReplyToClient(client, sizeof(xGetFeedbackControlReply), &rep);
WriteToClient(client, total_length, savbuf);
free (savbuf);
free(savbuf);
return Success;
}
}
/***********************************************************************
*
......@@ -199,13 +199,13 @@ CopySwapKbdFeedback (client, k, buf)
ClientPtr client;
KbdFeedbackPtr k;
char **buf;
{
{
int i;
xKbdFeedbackState *k2;
k2 = (xKbdFeedbackState *) *buf;
k2 = (xKbdFeedbackState *) * buf;
k2->class = KbdFeedbackClass;
k2->length = sizeof (xKbdFeedbackState);
k2->length = sizeof(xKbdFeedbackState);
k2->id = k->ctrl.id;
k2->click = k->ctrl.click;
k2->percent = k->ctrl.bell;
......@@ -213,7 +213,7 @@ CopySwapKbdFeedback (client, k, buf)
k2->duration = k->ctrl.bell_duration;
k2->led_mask = k->ctrl.leds;
k2->global_auto_repeat = k->ctrl.autoRepeat;
for (i=0; i<32; i++)
for (i = 0; i < 32; i++)
k2->auto_repeats[i] = k->ctrl.autoRepeats[i];
if (client->swapped)
{
......@@ -223,8 +223,8 @@ CopySwapKbdFeedback (client, k, buf)
swapl(&k2->led_mask);
swapl(&k2->led_values);
}
*buf += sizeof (xKbdFeedbackState);
}
*buf += sizeof(xKbdFeedbackState);
}
/***********************************************************************
*
......@@ -237,12 +237,12 @@ CopySwapPtrFeedback (client, p, buf)
ClientPtr client;
PtrFeedbackPtr p;
char **buf;
{
{
xPtrFeedbackState *p2;
p2 = (xPtrFeedbackState *) *buf;
p2 = (xPtrFeedbackState *) * buf;
p2->class = PtrFeedbackClass;
p2->length = sizeof (xPtrFeedbackState);
p2->length = sizeof(xPtrFeedbackState);
p2->id = p->ctrl.id;
p2->accelNum = p->ctrl.num;
p2->accelDenom = p->ctrl.den;
......@@ -254,8 +254,8 @@ CopySwapPtrFeedback (client, p, buf)
swaps(&p2->accelDenom);
swaps(&p2->threshold);
}
*buf += sizeof (xPtrFeedbackState);
}
*buf += sizeof(xPtrFeedbackState);
}
/***********************************************************************
*
......@@ -268,12 +268,12 @@ CopySwapIntegerFeedback (client, i, buf)
ClientPtr client;
IntegerFeedbackPtr i;
char **buf;
{
{
xIntegerFeedbackState *i2;
i2 = (xIntegerFeedbackState *) *buf;
i2 = (xIntegerFeedbackState *) * buf;
i2->class = IntegerFeedbackClass;
i2->length = sizeof (xIntegerFeedbackState);
i2->length = sizeof(xIntegerFeedbackState);
i2->id = i->ctrl.id;
i2->resolution = i->ctrl.resolution;
i2->min_value = i->ctrl.min_value;
......@@ -285,8 +285,8 @@ CopySwapIntegerFeedback (client, i, buf)
swapl(&i2->min_value);
swapl(&i2->max_value);
}
*buf += sizeof (xIntegerFeedbackState);
}
*buf += sizeof(xIntegerFeedbackState);
}
/***********************************************************************
*
......@@ -299,22 +299,22 @@ CopySwapStringFeedback (client, s, buf)
ClientPtr client;
StringFeedbackPtr s;
char **buf;
{
{
int i;
xStringFeedbackState *s2;
KeySym *kptr;
s2 = (xStringFeedbackState *) *buf;
s2 = (xStringFeedbackState *) * buf;
s2->class = StringFeedbackClass;
s2->length = sizeof (xStringFeedbackState) +
s->ctrl.num_symbols_supported * sizeof (KeySym);
s2->length = sizeof(xStringFeedbackState) +
s->ctrl.num_symbols_supported * sizeof(KeySym);
s2->id = s->ctrl.id;
s2->max_symbols = s->ctrl.max_symbols;
s2->num_syms_supported = s->ctrl.num_symbols_supported;
*buf += sizeof (xStringFeedbackState);
*buf += sizeof(xStringFeedbackState);
kptr = (KeySym *) (*buf);
for (i=0; i<s->ctrl.num_symbols_supported; i++)
*kptr++ = *(s->ctrl.symbols_supported+i);
for (i = 0; i < s->ctrl.num_symbols_supported; i++)
*kptr++ = *(s->ctrl.symbols_supported + i);
if (client->swapped)
{
swaps(&s2->length);
......@@ -326,8 +326,8 @@ CopySwapStringFeedback (client, s, buf)
swapl(kptr);
}
}
*buf += (s->ctrl.num_symbols_supported * sizeof (KeySym));
}
*buf += (s->ctrl.num_symbols_supported * sizeof(KeySym));
}
/***********************************************************************
*
......@@ -340,12 +340,12 @@ CopySwapLedFeedback (client, l, buf)
ClientPtr client;
LedFeedbackPtr l;
char **buf;
{
{
xLedFeedbackState *l2;
l2 = (xLedFeedbackState *) *buf;
l2 = (xLedFeedbackState *) * buf;
l2->class = LedFeedbackClass;
l2->length = sizeof (xLedFeedbackState);
l2->length = sizeof(xLedFeedbackState);
l2->id = l->ctrl.id;
l2->led_values = l->ctrl.led_values;
l2->led_mask = l->ctrl.led_mask;
......@@ -355,8 +355,8 @@ CopySwapLedFeedback (client, l, buf)
swapl(&l2->led_values);
swapl(&l2->led_mask);
}
*buf += sizeof (xLedFeedbackState);
}
*buf += sizeof(xLedFeedbackState);
}
/***********************************************************************
*
......@@ -369,12 +369,12 @@ CopySwapBellFeedback (client, b, buf)
ClientPtr client;
BellFeedbackPtr b;
char **buf;
{
{
xBellFeedbackState *b2;
b2 = (xBellFeedbackState *) *buf;
b2 = (xBellFeedbackState *) * buf;
b2->class = BellFeedbackClass;
b2->length = sizeof (xBellFeedbackState);
b2->length = sizeof(xBellFeedbackState);
b2->id = b->ctrl.id;
b2->percent = b->ctrl.percent;
b2->pitch = b->ctrl.pitch;
......@@ -385,8 +385,8 @@ CopySwapBellFeedback (client, b, buf)
swaps(&b2->pitch);
swaps(&b2->duration);
}
*buf += sizeof (xBellFeedbackState);
}
*buf += sizeof(xBellFeedbackState);
}
/***********************************************************************
*
......@@ -400,9 +400,9 @@ SRepXGetFeedbackControl (client, size, rep)
ClientPtr client;
int size;
xGetFeedbackControlReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->num_feedbacks);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getfctl.h
View file @ 41a0ba72
......@@ -43,49 +43,49 @@ ProcXGetFeedbackControl(
void
CopySwapKbdFeedback (
ClientPtr /* client */,
KbdFeedbackPtr /* k */,
KbdFeedbackPtr /* k */ ,
char ** /* buf */
);
void
CopySwapPtrFeedback (
ClientPtr /* client */,
PtrFeedbackPtr /* p */,
PtrFeedbackPtr /* p */ ,
char ** /* buf */
);
void
CopySwapIntegerFeedback (
ClientPtr /* client */,
IntegerFeedbackPtr /* i */,
IntegerFeedbackPtr /* i */ ,
char ** /* buf */
);
void
CopySwapStringFeedback (
ClientPtr /* client */,
StringFeedbackPtr /* s */,
StringFeedbackPtr /* s */ ,
char ** /* buf */
);
void
CopySwapLedFeedback (
ClientPtr /* client */,
LedFeedbackPtr /* l */,
LedFeedbackPtr /* l */ ,
char ** /* buf */
);
void
CopySwapBellFeedback (
ClientPtr /* client */,
BellFeedbackPtr /* b */,
BellFeedbackPtr /* b */ ,
char ** /* buf */
);
void
SRepXGetFeedbackControl (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetFeedbackControlReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getfocus.c
View file @ 41a0ba72
......@@ -76,11 +76,11 @@ SOFTWARE.
int
SProcXGetDeviceFocus(client)
register ClientPtr client;
{
{
REQUEST(xGetDeviceFocusReq);
swaps(&stuff->length);
return(ProcXGetDeviceFocus(client));
}
return (ProcXGetDeviceFocus(client));
}
/***********************************************************************
*
......@@ -91,7 +91,7 @@ SProcXGetDeviceFocus(client)
int
ProcXGetDeviceFocus(client)
ClientPtr client;
{
{
DeviceIntPtr dev;
FocusClassPtr focus;
xGetDeviceFocusReply rep;
......@@ -99,7 +99,7 @@ ProcXGetDeviceFocus(client)
REQUEST(xGetDeviceFocusReq);
REQUEST_SIZE_MATCH(xGetDeviceFocusReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL || !dev->focus)
{
SendErrorToClient(client, IReqCode, X_GetDeviceFocus, 0, BadDevice);
......@@ -124,9 +124,9 @@ ProcXGetDeviceFocus(client)
rep.time = focus->time.milliseconds;
rep.revertTo = focus->revert;
WriteReplyToClient (client, sizeof(xGetDeviceFocusReply), &rep);
WriteReplyToClient(client, sizeof(xGetDeviceFocusReply), &rep);
return Success;
}
}
/***********************************************************************
*
......@@ -140,10 +140,10 @@ SRepXGetDeviceFocus (client, size, rep)
ClientPtr client;
int size;
xGetDeviceFocusReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swapl(&rep->focus);
swapl(&rep->time);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getfocus.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXGetDeviceFocus(
void
SRepXGetDeviceFocus (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetDeviceFocusReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getkmap.c
View file @ 41a0ba72
......@@ -77,11 +77,11 @@ SOFTWARE.
int
SProcXGetDeviceKeyMapping(client)
register ClientPtr client;
{
{
REQUEST(xGetDeviceKeyMappingReq);
swaps(&stuff->length);
return(ProcXGetDeviceKeyMapping(client));
}
return (ProcXGetDeviceKeyMapping(client));
}
/***********************************************************************
*
......@@ -92,7 +92,7 @@ SProcXGetDeviceKeyMapping(client)
int
ProcXGetDeviceKeyMapping(client)
register ClientPtr client;
{
{
xGetDeviceKeyMappingReply rep;
DeviceIntPtr dev;
KeySymsPtr k;
......@@ -100,10 +100,10 @@ ProcXGetDeviceKeyMapping(client)
REQUEST(xGetDeviceKeyMappingReq);
REQUEST_SIZE_MATCH(xGetDeviceKeyMappingReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0,
SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0,
BadDevice);
return Success;
}
......@@ -140,7 +140,7 @@ ProcXGetDeviceKeyMapping(client)
rep.length = (k->mapWidth * stuff->count); /* KeySyms are 4 bytes */
WriteReplyToClient(client, sizeof(xGetDeviceKeyMappingReply), &rep);
client->pSwapReplyFunc = (ReplySwapPtr)CopySwap32Write;
client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;
WriteSwappedDataToClient(
client,
k->mapWidth * stuff->count * sizeof(KeySym),
......@@ -148,7 +148,7 @@ ProcXGetDeviceKeyMapping(client)
k->mapWidth]);
return Success;
}
}
/***********************************************************************
*
......@@ -162,9 +162,9 @@ SRepXGetDeviceKeyMapping (client, size, rep)
ClientPtr client;
int size;
xGetDeviceKeyMappingReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getkmap.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXGetDeviceKeyMapping(
void
SRepXGetDeviceKeyMapping (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetDeviceKeyMappingReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getmmap.c
View file @ 41a0ba72
......@@ -76,11 +76,11 @@ SOFTWARE.
int
SProcXGetDeviceModifierMapping(client)
register ClientPtr client;
{
{
REQUEST(xGetDeviceModifierMappingReq);
swaps(&stuff->length);
return(ProcXGetDeviceModifierMapping(client));
}
return (ProcXGetDeviceModifierMapping(client));
}
/***********************************************************************
*
......@@ -91,7 +91,7 @@ SProcXGetDeviceModifierMapping(client)
int
ProcXGetDeviceModifierMapping(client)
ClientPtr client;
{
{
CARD8 maxkeys;
DeviceIntPtr dev;
xGetDeviceModifierMappingReply rep;
......@@ -100,10 +100,10 @@ ProcXGetDeviceModifierMapping(client)
REQUEST(xGetDeviceModifierMappingReq);
REQUEST_SIZE_MATCH(xGetDeviceModifierMappingReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_GetDeviceModifierMapping, 0,
SendErrorToClient(client, IReqCode, X_GetDeviceModifierMapping, 0,
BadDevice);
return Success;
}
......@@ -111,7 +111,7 @@ ProcXGetDeviceModifierMapping(client)
kp = dev->key;
if (kp == NULL)
{
SendErrorToClient (client, IReqCode, X_GetDeviceModifierMapping, 0,
SendErrorToClient(client, IReqCode, X_GetDeviceModifierMapping, 0,
BadMatch);
return Success;
}
......@@ -122,14 +122,14 @@ ProcXGetDeviceModifierMapping(client)
rep.numKeyPerModifier = maxkeys;
rep.sequenceNumber = client->sequence;
/* length counts 4 byte quantities - there are 8 modifiers 1 byte big */
rep.length = 2*maxkeys;
rep.length = 2 * maxkeys;
WriteReplyToClient(client, sizeof(xGetDeviceModifierMappingReply), &rep);
/* Reply with the (modified by DDX) map that SetModifierMapping passed in */
WriteToClient(client, 8*maxkeys, kp->modifierKeyMap);
WriteToClient(client, 8 * maxkeys, kp->modifierKeyMap);
return Success;
}
}
/***********************************************************************
*
......@@ -143,8 +143,8 @@ SRepXGetDeviceModifierMapping (client, size, rep)
ClientPtr client;
int size;
xGetDeviceModifierMappingReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getmmap.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXGetDeviceModifierMapping(
void
SRepXGetDeviceModifierMapping (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetDeviceModifierMappingReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getprop.c
View file @ 41a0ba72
......@@ -80,13 +80,13 @@ extern int ExtEventIndex;
int
SProcXGetDeviceDontPropagateList(client)
register ClientPtr client;
{
{
REQUEST(xGetDeviceDontPropagateListReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);
swapl(&stuff->window);
return(ProcXGetDeviceDontPropagateList(client));
}
return (ProcXGetDeviceDontPropagateList(client));
}
/***********************************************************************
*
......@@ -97,7 +97,7 @@ SProcXGetDeviceDontPropagateList(client)
int
ProcXGetDeviceDontPropagateList (client)
register ClientPtr client;
{
{
CARD16 count = 0;
int i;
XEventClass *buf = NULL, *tbuf;
......@@ -114,7 +114,7 @@ ProcXGetDeviceDontPropagateList (client)
rep.length = 0;
rep.count = 0;
pWin = (WindowPtr) LookupWindow (stuff->window, client);
pWin = (WindowPtr) LookupWindow(stuff->window, client);
if (!pWin)
{
client->errorValue = stuff->window;
......@@ -125,18 +125,18 @@ ProcXGetDeviceDontPropagateList (client)
if ((others = wOtherInputMasks(pWin)) != 0)
{
for (i=0; i<EMASKSIZE; i++)
tbuf = ClassFromMask (NULL, others->dontPropagateMask[i], i,
for (i = 0; i < EMASKSIZE; i++)
tbuf = ClassFromMask(NULL, others->dontPropagateMask[i], i,
&count, COUNT);
if (count)
{
rep.count = count;
buf = (XEventClass *) malloc (rep.count * sizeof(XEventClass));
rep.length = (rep.count * sizeof (XEventClass) + 3) >> 2;
buf = (XEventClass *) malloc(rep.count * sizeof(XEventClass));
rep.length = (rep.count * sizeof(XEventClass) + 3) >> 2;
tbuf = buf;
for (i=0; i<EMASKSIZE; i++)
tbuf = ClassFromMask (tbuf, others->dontPropagateMask[i], i,
for (i = 0; i < EMASKSIZE; i++)
tbuf = ClassFromMask(tbuf, others->dontPropagateMask[i], i,
NULL, CREATE);
}
}
......@@ -146,12 +146,12 @@ ProcXGetDeviceDontPropagateList (client)
if (count)
{
client->pSwapReplyFunc = (ReplySwapPtr)Swap32Write;
WriteSwappedDataToClient( client, count * sizeof(XEventClass), buf);
free (buf);
client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
WriteSwappedDataToClient(client, count * sizeof(XEventClass), buf);
free(buf);
}
return Success;
}
}
/***********************************************************************
*
......@@ -167,15 +167,15 @@ XEventClass
int maskndx;
CARD16 *count;
int mode;
{
int i,j;
{
int i, j;
int id = maskndx;
Mask tmask = 0x80000000;
for (i=0; i<32; i++,tmask>>=1)
for (i = 0; i < 32; i++, tmask >>= 1)
if (tmask & mask)
{
for (j=0; j<ExtEventIndex; j++)
for (j = 0; j < ExtEventIndex; j++)
if (EventInfo[j].mask == tmask)
{
if (mode == COUNT)
......@@ -185,7 +185,7 @@ XEventClass
}
}
return (buf);
}
}
/***********************************************************************
*
......@@ -199,9 +199,9 @@ SRepXGetDeviceDontPropagateList (client, size, rep)
ClientPtr client;
int size;
xGetDeviceDontPropagateListReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->count);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getprop.h
View file @ 41a0ba72
......@@ -43,16 +43,16 @@ ProcXGetDeviceDontPropagateList (
XEventClass *
ClassFromMask (
XEventClass * /* buf */,
Mask /* mask */,
int /* maskndx */,
CARD16 * /* count */,
Mask /* mask */ ,
int /* maskndx */ ,
CARD16 * /* count */ ,
int /* mode */
);
void
SRepXGetDeviceDontPropagateList (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetDeviceDontPropagateListReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getselev.c
View file @ 41a0ba72
......@@ -78,13 +78,13 @@ SOFTWARE.
int
SProcXGetSelectedExtensionEvents(client)
register ClientPtr client;
{
{
REQUEST(xGetSelectedExtensionEventsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq);
swapl(&stuff->window);
return(ProcXGetSelectedExtensionEvents(client));
}
return (ProcXGetSelectedExtensionEvents(client));
}
/***********************************************************************
*
......@@ -96,7 +96,7 @@ SProcXGetSelectedExtensionEvents(client)
int
ProcXGetSelectedExtensionEvents(client)
register ClientPtr client;
{
{
int i;
int total_length = 0;
xGetSelectedExtensionEventsReply rep;
......@@ -126,46 +126,46 @@ ProcXGetSelectedExtensionEvents(client)
if ((pOthers = wOtherInputMasks(pWin)) != 0)
{
for (others = pOthers->inputClients; others; others=others->next)
for (i=0; i<EMASKSIZE; i++)
tclient = ClassFromMask (NULL, others->mask[i], i,
for (others = pOthers->inputClients; others; others = others->next)
for (i = 0; i < EMASKSIZE; i++)
tclient = ClassFromMask(NULL, others->mask[i], i,
&rep.all_clients_count, COUNT);
for (others = pOthers->inputClients; others; others=others->next)
for (others = pOthers->inputClients; others; others = others->next)
if (SameClient(others, client))
{
for (i=0; i<EMASKSIZE; i++)
tclient = ClassFromMask (NULL, others->mask[i], i,
for (i = 0; i < EMASKSIZE; i++)
tclient = ClassFromMask(NULL, others->mask[i], i,
&rep.this_client_count, COUNT);
break;
}
total_length = (rep.all_clients_count + rep.this_client_count) *
sizeof (XEventClass);
sizeof(XEventClass);
rep.length = (total_length + 3) >> 2;
buf = (XEventClass *) malloc (total_length);
buf = (XEventClass *) malloc(total_length);
tclient = buf;
aclient = buf + rep.this_client_count;
if (others)
for (i=0; i<EMASKSIZE; i++)
for (i = 0; i < EMASKSIZE; i++)
tclient = ClassFromMask (tclient, others->mask[i], i, NULL, CREATE);
for (others = pOthers->inputClients; others; others=others->next)
for (i=0; i<EMASKSIZE; i++)
for (others = pOthers->inputClients; others; others = others->next)
for (i = 0; i < EMASKSIZE; i++)
aclient = ClassFromMask (aclient, others->mask[i], i, NULL, CREATE);
}
WriteReplyToClient (client, sizeof(xGetSelectedExtensionEventsReply), &rep);
WriteReplyToClient(client, sizeof(xGetSelectedExtensionEventsReply), &rep);
if (total_length)
{
client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
WriteSwappedDataToClient( client, total_length, buf);
free (buf);
WriteSwappedDataToClient(client, total_length, buf);
free(buf);
}
return Success;
}
}
/***********************************************************************
*
......@@ -179,10 +179,10 @@ SRepXGetSelectedExtensionEvents (client, size, rep)
ClientPtr client;
int size;
xGetSelectedExtensionEventsReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->this_client_count);
swaps(&rep->all_clients_count);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getselev.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXGetSelectedExtensionEvents(
void
SRepXGetSelectedExtensionEvents (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetSelectedExtensionEventsReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/getvers.c
View file @ 41a0ba72
......@@ -77,13 +77,13 @@ XExtensionVersion AllExtensionVersions[128];
int
SProcXGetExtensionVersion(client)
register ClientPtr client;
{
{
REQUEST(xGetExtensionVersionReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq);
swaps(&stuff->nbytes);
return(ProcXGetExtensionVersion(client));
}
return (ProcXGetExtensionVersion(client));
}
/***********************************************************************
*
......@@ -94,7 +94,7 @@ SProcXGetExtensionVersion(client)
int
ProcXGetExtensionVersion (client)
register ClientPtr client;
{
{
xGetExtensionVersionReply rep;
REQUEST(xGetExtensionVersionReq);
......@@ -124,10 +124,10 @@ ProcXGetExtensionVersion (client)
rep.minor_version =
AllExtensionVersions[IReqCode-128].minor_version;
}
WriteReplyToClient (client, sizeof (xGetExtensionVersionReply), &rep);
WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep);
return Success;
}
}
/***********************************************************************
*
......@@ -141,10 +141,10 @@ SRepXGetExtensionVersion (client, size, rep)
ClientPtr client;
int size;
xGetExtensionVersionReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->major_version);
swaps(&rep->minor_version);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/getvers.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXGetExtensionVersion (
void
SRepXGetExtensionVersion (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetExtensionVersionReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/grabdev.c
View file @ 41a0ba72
......@@ -81,7 +81,7 @@ extern int ExtEventIndex;
int
SProcXGrabDevice(client)
register ClientPtr client;
{
{
REQUEST(xGrabDeviceReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xGrabDeviceReq);
......@@ -94,8 +94,8 @@ SProcXGrabDevice(client)
SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
return(ProcXGrabDevice(client));
}
return (ProcXGrabDevice(client));
}
/***********************************************************************
*
......@@ -106,7 +106,7 @@ SProcXGrabDevice(client)
int
ProcXGrabDevice(client)
ClientPtr client;
{
{
int error;
xGrabDeviceReply rep;
DeviceIntPtr dev;
......@@ -117,7 +117,7 @@ ProcXGrabDevice(client)
if (stuff->length !=(sizeof(xGrabDeviceReq)>>2) + stuff->event_count)
{
SendErrorToClient (client, IReqCode, X_GrabDevice, 0, BadLength);
SendErrorToClient(client, IReqCode, X_GrabDevice, 0, BadLength);
return Success;
}
......@@ -126,18 +126,18 @@ ProcXGrabDevice(client)
rep.sequenceNumber = client->sequence;
rep.length = 0;
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_GrabDevice, 0, BadDevice);
return Success;
}
if (CreateMaskFromList (client, (XEventClass *)&stuff[1],
if (CreateMaskFromList(client, (XEventClass *) & stuff[1],
stuff->event_count, tmp, dev, X_GrabDevice) != Success)
return Success;
error = GrabDevice (client, dev, stuff->this_device_mode,
error = GrabDevice(client, dev, stuff->this_device_mode,
stuff->other_devices_mode, stuff->grabWindow, stuff->ownerEvents,
stuff->time, tmp[stuff->deviceid].mask, &rep.status);
......@@ -148,7 +148,7 @@ ProcXGrabDevice(client)
}
WriteReplyToClient(client, sizeof(xGrabDeviceReply), &rep);
return Success;
}
}
/***********************************************************************
......@@ -165,8 +165,8 @@ CreateMaskFromList (client, list, count, mask, dev, req)
struct tmask mask[];
DeviceIntPtr dev;
int req;
{
int i,j;
{
int i, j;
int device;
DeviceIntPtr tdev;
......@@ -184,14 +184,14 @@ CreateMaskFromList (client, list, count, mask, dev, req)
SendErrorToClient(client, IReqCode, req, 0, BadClass);
return BadClass;
}
tdev = LookupDeviceIntRec (device);
tdev = LookupDeviceIntRec(device);
if (tdev==NULL || (dev != NULL && tdev != dev))
{
SendErrorToClient(client, IReqCode, req, 0, BadClass);
return BadClass;
}
for (j=0; j<ExtEventIndex; j++)
for (j = 0; j < ExtEventIndex; j++)
if (EventInfo[j].type == (*list & 0xff))
{
mask[device].mask |= EventInfo[j].mask;
......@@ -200,7 +200,7 @@ CreateMaskFromList (client, list, count, mask, dev, req)
}
}
return Success;
}
}
/***********************************************************************
*
......@@ -214,8 +214,8 @@ SRepXGrabDevice (client, size, rep)
ClientPtr client;
int size;
xGrabDeviceReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/grabdev.h
View file @ 41a0ba72
......@@ -43,17 +43,17 @@ ProcXGrabDevice(
int
CreateMaskFromList (
ClientPtr /* client */,
XEventClass * /* list */,
int /* count */,
struct tmask /* mask */[],
DeviceIntPtr /* dev */,
XEventClass * /* list */ ,
int /* count */ ,
struct tmask /* mask */ [],
DeviceIntPtr /* dev */ ,
int /* req */
);
void
SRepXGrabDevice (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGrabDeviceReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/grabdevb.c
View file @ 41a0ba72
......@@ -78,7 +78,7 @@ SOFTWARE.
int
SProcXGrabDeviceButton(client)
register ClientPtr client;
{
{
REQUEST(xGrabDeviceButtonReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xGrabDeviceButtonReq);
......@@ -89,8 +89,8 @@ SProcXGrabDeviceButton(client)
stuff->event_count * sizeof(CARD32));
SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
return(ProcXGrabDeviceButton(client));
}
return (ProcXGrabDeviceButton(client));
}
/***********************************************************************
*
......@@ -101,7 +101,7 @@ SProcXGrabDeviceButton(client)
int
ProcXGrabDeviceButton(client)
ClientPtr client;
{
{
int ret;
DeviceIntPtr dev;
DeviceIntPtr mdev;
......@@ -113,11 +113,11 @@ ProcXGrabDeviceButton(client)
if (stuff->length !=(sizeof(xGrabDeviceButtonReq)>>2) + stuff->event_count)
{
SendErrorToClient (client, IReqCode, X_GrabDeviceButton, 0, BadLength);
SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, BadLength);
return Success;
}
dev = LookupDeviceIntRec (stuff->grabbed_device);
dev = LookupDeviceIntRec(stuff->grabbed_device);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0,
......@@ -126,7 +126,7 @@ ProcXGrabDeviceButton(client)
}
if (stuff->modifier_device != UseXKeyboard)
{
mdev = LookupDeviceIntRec (stuff->modifier_device);
mdev = LookupDeviceIntRec(stuff->modifier_device);
if (mdev == NULL)
{
SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0,
......@@ -145,7 +145,7 @@ ProcXGrabDeviceButton(client)
class = (XEventClass *) (&stuff[1]); /* first word of values */
if ((ret = CreateMaskFromList (client, class,
if ((ret = CreateMaskFromList(client, class,
stuff->event_count, tmp, dev, X_GrabDeviceButton)) != Success)
return Success;
ret = GrabButton(client, dev, stuff->this_device_mode,
......@@ -155,5 +155,5 @@ ProcXGrabDeviceButton(client)
if (ret != Success)
SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, ret);
return(Success);
}
return (Success);
}
nx-X11/programs/Xserver/Xi/grabdevk.c
View file @ 41a0ba72
......@@ -78,7 +78,7 @@ SOFTWARE.
int
SProcXGrabDeviceKey(client)
register ClientPtr client;
{
{
REQUEST(xGrabDeviceKeyReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq);
......@@ -87,8 +87,8 @@ SProcXGrabDeviceKey(client)
swaps(&stuff->event_count);
REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
return(ProcXGrabDeviceKey(client));
}
return (ProcXGrabDeviceKey(client));
}
/***********************************************************************
*
......@@ -99,7 +99,7 @@ SProcXGrabDeviceKey(client)
int
ProcXGrabDeviceKey(client)
ClientPtr client;
{
{
int ret;
DeviceIntPtr dev;
DeviceIntPtr mdev;
......@@ -111,11 +111,11 @@ ProcXGrabDeviceKey(client)
if (stuff->length !=(sizeof(xGrabDeviceKeyReq)>>2) + stuff->event_count)
{
SendErrorToClient (client, IReqCode, X_GrabDeviceKey, 0, BadLength);
SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadLength);
return Success;
}
dev = LookupDeviceIntRec (stuff->grabbed_device);
dev = LookupDeviceIntRec(stuff->grabbed_device);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0,
......@@ -125,7 +125,7 @@ ProcXGrabDeviceKey(client)
if (stuff->modifier_device != UseXKeyboard)
{
mdev = LookupDeviceIntRec (stuff->modifier_device);
mdev = LookupDeviceIntRec(stuff->modifier_device);
if (mdev == NULL)
{
SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0,
......@@ -144,7 +144,7 @@ ProcXGrabDeviceKey(client)
class = (XEventClass *) (&stuff[1]); /* first word of values */
if ((ret = CreateMaskFromList (client, class,
if ((ret = CreateMaskFromList(client, class,
stuff->event_count, tmp, dev, X_GrabDeviceKey)) != Success)
return Success;
......@@ -159,4 +159,4 @@ ProcXGrabDeviceKey(client)
}
return Success;
}
}
nx-X11/programs/Xserver/Xi/gtmotion.c
View file @ 41a0ba72
......@@ -76,14 +76,14 @@ SOFTWARE.
int
SProcXGetDeviceMotionEvents(client)
register ClientPtr client;
{
{
REQUEST(xGetDeviceMotionEventsReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq);
swapl(&stuff->start);
swapl(&stuff->stop);
return(ProcXGetDeviceMotionEvents(client));
}
return (ProcXGetDeviceMotionEvents(client));
}
/****************************************************************************
*
......@@ -108,7 +108,7 @@ ProcXGetDeviceMotionEvents(client)
REQUEST(xGetDeviceMotionEventsReq);
REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0,
......@@ -145,7 +145,7 @@ ProcXGetDeviceMotionEvents(client)
num_events = v->numMotionEvents;
if (num_events)
{
size = sizeof(Time) + (axes * sizeof (INT32));
size = sizeof(Time) + (axes * sizeof(INT32));
tsize = num_events * size;
coords = (INT32 *) malloc(tsize);
if (!coords)
......@@ -160,7 +160,7 @@ ProcXGetDeviceMotionEvents(client)
}
if (rep.nEvents > 0)
{
length = (rep.nEvents * size +3) >> 2;
length = (rep.nEvents * size + 3) >> 2;
rep.length = length;
}
nEvents = rep.nEvents;
......@@ -195,9 +195,9 @@ SRepXGetDeviceMotionEvents (client, size, rep)
ClientPtr client;
int size;
xGetDeviceMotionEventsReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swapl(&rep->nEvents);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/gtmotion.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXGetDeviceMotionEvents(
void
SRepXGetDeviceMotionEvents (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xGetDeviceMotionEventsReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/listdev.c
View file @ 41a0ba72
......@@ -78,11 +78,11 @@ SOFTWARE.
int
SProcXListInputDevices(client)
register ClientPtr client;
{
{
REQUEST(xListInputDevicesReq);
swaps(&stuff->length);
return(ProcXListInputDevices(client));
}
return (ProcXListInputDevices(client));
}
/***********************************************************************
*
......@@ -93,7 +93,7 @@ SProcXListInputDevices(client)
int
ProcXListInputDevices (client)
register ClientPtr client;
{
{
xListInputDevicesReply rep;
int numdevs;
int namesize = 1; /* need 1 extra byte for strcpy */
......@@ -114,33 +114,33 @@ ProcXListInputDevices (client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
AddOtherInputDevices ();
AddOtherInputDevices();
numdevs = inputInfo.numDevices;
for (d=inputInfo.devices; d; d=d->next)
SizeDeviceInfo (d, &namesize, &size);
for (d=inputInfo.off_devices; d; d=d->next)
SizeDeviceInfo (d, &namesize, &size);
for (d = inputInfo.devices; d; d = d->next)
SizeDeviceInfo(d, &namesize, &size);
for (d = inputInfo.off_devices; d; d = d->next)
SizeDeviceInfo(d, &namesize, &size);
total_length = numdevs * sizeof (xDeviceInfo) + size + namesize;
devbuf = (char *) calloc (1, total_length);
classbuf = devbuf + (numdevs * sizeof (xDeviceInfo));
total_length = numdevs * sizeof(xDeviceInfo) + size + namesize;
devbuf = (char *)calloc(1, total_length);
classbuf = devbuf + (numdevs * sizeof(xDeviceInfo));
namebuf = classbuf + size;
savbuf = devbuf;
dev = (xDeviceInfoPtr) devbuf;
for (d=inputInfo.devices; d; d=d->next,dev++)
ListDeviceInfo (client, d, dev, &devbuf, &classbuf, &namebuf);
for (d=inputInfo.off_devices; d; d=d->next,dev++)
ListDeviceInfo (client, d, dev, &devbuf, &classbuf, &namebuf);
for (d = inputInfo.devices; d; d = d->next, dev++)
ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf);
for (d = inputInfo.off_devices; d; d = d->next, dev++)
ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf);
rep.ndevices = numdevs;
rep.length = (total_length + 3) >> 2;
WriteReplyToClient (client, sizeof (xListInputDevicesReply), &rep);
WriteReplyToClient(client, sizeof(xListInputDevicesReply), &rep);
WriteToClient(client, total_length, savbuf);
free (savbuf);
free(savbuf);
return Success;
}
}
/***********************************************************************
*
......@@ -154,23 +154,23 @@ SizeDeviceInfo (d, namesize, size)
DeviceIntPtr d;
int *namesize;
int *size;
{
{
int chunks;
*namesize += 1;
if (d->name)
*namesize += strlen (d->name);
*namesize += strlen(d->name);
if (d->key != NULL)
*size += sizeof (xKeyInfo);
*size += sizeof(xKeyInfo);
if (d->button != NULL)
*size += sizeof (xButtonInfo);
*size += sizeof(xButtonInfo);
if (d->valuator != NULL)
{
chunks = ((int) d->valuator->numAxes + 19) / VPC;
chunks = ((int)d->valuator->numAxes + 19) / VPC;
*size += (chunks * sizeof(xValuatorInfo) +
d->valuator->numAxes * sizeof(xAxisInfo));
}
}
}
/***********************************************************************
*
......@@ -186,9 +186,9 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
char **devbuf;
char **classbuf;
char **namebuf;
{
CopyDeviceName (namebuf, d->name);
CopySwapDevice (client, d, 0, devbuf);
{
CopyDeviceName(namebuf, d->name);
CopySwapDevice(client, d, 0, devbuf);
if (d->key != NULL)
{
CopySwapKeyClass(client, d->key, classbuf);
......@@ -203,7 +203,7 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
{
dev->num_classes += CopySwapValuatorClass(client, d->valuator, classbuf);
}
}
}
/***********************************************************************
*
......@@ -219,21 +219,21 @@ void
CopyDeviceName (namebuf, name)
char **namebuf;
char *name;
{
char *nameptr = (char *) *namebuf;
{
char *nameptr = (char *)*namebuf;
if (name)
{
*nameptr++ = strlen (name);
strcpy (nameptr, name);
*namebuf += (strlen (name)+1);
*nameptr++ = strlen(name);
strcpy(nameptr, name);
*namebuf += (strlen(name) + 1);
}
else
{
*nameptr++ = 0;
*namebuf += 1;
}
}
}
/***********************************************************************
*
......@@ -247,10 +247,10 @@ CopySwapDevice (client, d, num_classes, buf)
DeviceIntPtr d;
int num_classes;
char **buf;
{
{
xDeviceInfoPtr dev;
dev = (xDeviceInfoPtr) *buf;
dev = (xDeviceInfoPtr) * buf;
dev->id = d->id;
dev->type = d->type;
......@@ -265,8 +265,8 @@ CopySwapDevice (client, d, num_classes, buf)
{
swapl(&dev->type); /* macro - braces are required */
}
*buf += sizeof (xDeviceInfo);
}
*buf += sizeof(xDeviceInfo);
}
/***********************************************************************
*
......@@ -279,12 +279,12 @@ CopySwapKeyClass (client, k, buf)
register ClientPtr client;
KeyClassPtr k;
char **buf;
{
{
xKeyInfoPtr k2;
k2 = (xKeyInfoPtr) *buf;
k2 = (xKeyInfoPtr) * buf;
k2->class = KeyClass;
k2->length = sizeof (xKeyInfo);
k2->length = sizeof(xKeyInfo);
k2->min_keycode = k->curKeySyms.minKeyCode;
k2->max_keycode = k->curKeySyms.maxKeyCode;
k2->num_keys = k2->max_keycode - k2->min_keycode + 1;
......@@ -292,8 +292,8 @@ CopySwapKeyClass (client, k, buf)
{
swaps(&k2->num_keys);
}
*buf += sizeof (xKeyInfo);
}
*buf += sizeof(xKeyInfo);
}
/***********************************************************************
*
......@@ -306,19 +306,19 @@ CopySwapButtonClass (client, b, buf)
register ClientPtr client;
ButtonClassPtr b;
char **buf;
{
{
xButtonInfoPtr b2;
b2 = (xButtonInfoPtr) *buf;
b2 = (xButtonInfoPtr) * buf;
b2->class = ButtonClass;
b2->length = sizeof (xButtonInfo);
b2->length = sizeof(xButtonInfo);
b2->num_buttons = b->numButtons;
if (client->swapped)
{
swaps(&b2->num_buttons); /* macro - braces are required */
}
*buf += sizeof (xButtonInfo);
}
*buf += sizeof(xButtonInfo);
}
/***********************************************************************
*
......@@ -347,9 +347,9 @@ CopySwapValuatorClass (client, v, buf)
t_axes = axes < VPC ? axes : VPC;
if (t_axes < 0)
t_axes = v->numAxes % VPC;
v2 = (xValuatorInfoPtr) *buf;
v2 = (xValuatorInfoPtr) * buf;
v2->class = ValuatorClass;
v2->length = sizeof (xValuatorInfo) + t_axes * sizeof (xAxisInfo);
v2->length = sizeof(xValuatorInfo) + t_axes * sizeof(xAxisInfo);
v2->num_axes = t_axes;
v2->mode = v->mode & DeviceMode;
v2->motion_buffer_size = v->numMotionEvents;
......@@ -357,10 +357,10 @@ CopySwapValuatorClass (client, v, buf)
{
swapl(&v2->motion_buffer_size);
}
*buf += sizeof (xValuatorInfo);
*buf += sizeof(xValuatorInfo);
a = v->axes + (VPC * i);
a2 = (xAxisInfoPtr) *buf;
for (j=0; j<t_axes; j++) {
a2 = (xAxisInfoPtr) * buf;
for (j = 0; j < t_axes; j++) {
a2->min_value = a->min_value;
a2->max_value = a->max_value;
a2->resolution = a->resolution;
......@@ -371,7 +371,7 @@ CopySwapValuatorClass (client, v, buf)
}
a2++;
a++;
*buf += sizeof (xAxisInfo);
*buf += sizeof(xAxisInfo);
}
}
return (i);
......@@ -389,8 +389,8 @@ SRepXListInputDevices (client, size, rep)
ClientPtr client;
int size;
xListInputDevicesReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/listdev.h
View file @ 41a0ba72
......@@ -43,17 +43,17 @@ ProcXListInputDevices (
void
SizeDeviceInfo (
DeviceIntPtr /* d */,
int * /* namesize */,
int * /* namesize */ ,
int * /* size */
);
void
ListDeviceInfo (
ClientPtr /* client */,
DeviceIntPtr /* d */,
xDeviceInfoPtr /* dev */,
char ** /* devbuf */,
char ** /* classbuf */,
DeviceIntPtr /* d */ ,
xDeviceInfoPtr /* dev */ ,
char ** /* devbuf */ ,
char ** /* classbuf */ ,
char ** /* namebuf */
);
......@@ -66,36 +66,36 @@ CopyDeviceName (
void
CopySwapDevice (
ClientPtr /* client */,
DeviceIntPtr /* d */,
int /* num_classes */,
DeviceIntPtr /* d */ ,
int /* num_classes */ ,
char ** /* buf */
);
void
CopySwapKeyClass (
ClientPtr /* client */,
KeyClassPtr /* k */,
KeyClassPtr /* k */ ,
char ** /* buf */
);
void
CopySwapButtonClass (
ClientPtr /* client */,
ButtonClassPtr /* b */,
ButtonClassPtr /* b */ ,
char ** /* buf */
);
int
CopySwapValuatorClass (
ClientPtr /* client */,
ValuatorClassPtr /* v */,
ValuatorClassPtr /* v */ ,
char ** /* buf */
);
void
SRepXListInputDevices (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xListInputDevicesReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/opendev.c
View file @ 41a0ba72
......@@ -68,7 +68,7 @@ SOFTWARE.
#include "opendev.h"
extern CARD8 event_base [];
extern CARD8 event_base[];
/***********************************************************************
*
......@@ -80,11 +80,11 @@ extern CARD8 event_base [];
int
SProcXOpenDevice(client)
register ClientPtr client;
{
{
REQUEST(xOpenDeviceReq);
swaps(&stuff->length);
return(ProcXOpenDevice(client));
}
return (ProcXOpenDevice(client));
}
/***********************************************************************
*
......@@ -95,10 +95,10 @@ SProcXOpenDevice(client)
int
ProcXOpenDevice(client)
register ClientPtr client;
{
xInputClassInfo evbase [numInputClasses];
{
xInputClassInfo evbase[numInputClasses];
Bool enableit = FALSE;
int j=0;
int j = 0;
int status = Success;
xOpenDeviceReply rep;
DeviceIntPtr dev;
......@@ -115,7 +115,7 @@ ProcXOpenDevice(client)
if ((dev = LookupDeviceIntRec(stuff->deviceid)) == NULL) /* not open */
{
for (dev=inputInfo.off_devices; dev; dev=dev->next)
for (dev = inputInfo.off_devices; dev; dev = dev->next)
if (dev->id == stuff->deviceid)
break;
if (dev == NULL)
......@@ -126,7 +126,7 @@ ProcXOpenDevice(client)
enableit = TRUE;
}
OpenInputDevice (dev, client, &status);
OpenInputDevice(dev, client, &status);
if (status != Success)
{
SendErrorToClient(client, IReqCode, X_OpenDevice, 0, status);
......@@ -172,12 +172,12 @@ ProcXOpenDevice(client)
}
evbase[j].class = OtherClass;
evbase[j++].event_type_base = event_base[OtherClass];
rep.length = (j * sizeof (xInputClassInfo) + 3) >> 2;
rep.length = (j * sizeof(xInputClassInfo) + 3) >> 2;
rep.num_classes = j;
WriteReplyToClient (client, sizeof (xOpenDeviceReply), &rep);
WriteToClient(client, j * sizeof (xInputClassInfo), evbase);
WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep);
WriteToClient(client, j * sizeof(xInputClassInfo), evbase);
return (Success);
}
}
/***********************************************************************
*
......@@ -191,8 +191,8 @@ SRepXOpenDevice (client, size, rep)
ClientPtr client;
int size;
xOpenDeviceReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/opendev.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXOpenDevice(
void
SRepXOpenDevice (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xOpenDeviceReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/queryst.c
View file @ 41a0ba72
......@@ -58,11 +58,11 @@ from The Open Group.
int
SProcXQueryDeviceState(client)
register ClientPtr client;
{
{
REQUEST(xQueryDeviceStateReq);
swaps(&stuff->length);
return(ProcXQueryDeviceState(client));
}
return (ProcXQueryDeviceState(client));
}
/***********************************************************************
*
......@@ -73,7 +73,7 @@ SProcXQueryDeviceState(client)
int
ProcXQueryDeviceState(client)
register ClientPtr client;
{
{
int i;
int num_classes = 0;
int total_length = 0;
......@@ -96,7 +96,7 @@ ProcXQueryDeviceState(client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0,
......@@ -111,14 +111,14 @@ ProcXQueryDeviceState(client)
k = dev->key;
if (k != NULL)
{
total_length += sizeof (xKeyState);
total_length += sizeof(xKeyState);
num_classes++;
}
b = dev->button;
if (b != NULL)
{
total_length += sizeof (xButtonState);
total_length += sizeof(xButtonState);
num_classes++;
}
......@@ -128,7 +128,7 @@ ProcXQueryDeviceState(client)
(v->numAxes * sizeof(int)));
num_classes++;
}
buf = (char *) malloc (total_length);
buf = (char *)malloc(total_length);
if (!buf)
{
SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0,
......@@ -141,38 +141,38 @@ ProcXQueryDeviceState(client)
{
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)
{
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)
{
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++;
*((int *)buf) = *values++;
if (client->swapped)
{
swapl ((int *) buf);/* macro - braces needed */
swapl((int *)buf); /* macro - braces needed */
}
buf += sizeof(int);
}
......@@ -180,12 +180,12 @@ ProcXQueryDeviceState(client)
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;
}
}
/***********************************************************************
*
......@@ -199,8 +199,8 @@ SRepXQueryDeviceState (client, size, rep)
ClientPtr client;
int size;
xQueryDeviceStateReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/queryst.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXQueryDeviceState(
void
SRepXQueryDeviceState (
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xQueryDeviceStateReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/selectev.c
View file @ 41a0ba72
......@@ -81,7 +81,7 @@ extern Mask ExtValidMasks[];
int
SProcXSelectExtensionEvent (client)
register ClientPtr client;
{
{
REQUEST(xSelectExtensionEventReq);
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
......@@ -91,8 +91,8 @@ register ClientPtr client;
stuff->count * sizeof(CARD32));
SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
return(ProcXSelectExtensionEvent(client));
}
return (ProcXSelectExtensionEvent(client));
}
/***********************************************************************
*
......@@ -103,7 +103,7 @@ register ClientPtr client;
int
ProcXSelectExtensionEvent (client)
register ClientPtr client;
{
{
int ret;
int i;
WindowPtr pWin;
......@@ -114,12 +114,12 @@ ProcXSelectExtensionEvent (client)
if (stuff->length !=(sizeof(xSelectExtensionEventReq)>>2) + stuff->count)
{
SendErrorToClient (client, IReqCode, X_SelectExtensionEvent, 0,
SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0,
BadLength);
return Success;
}
pWin = (WindowPtr) LookupWindow (stuff->window, client);
pWin = (WindowPtr) LookupWindow(stuff->window, client);
if (!pWin)
{
client->errorValue = stuff->window;
......@@ -128,11 +128,11 @@ ProcXSelectExtensionEvent (client)
return Success;
}
if ((ret = CreateMaskFromList (client, (XEventClass *)&stuff[1],
if ((ret = CreateMaskFromList(client, (XEventClass *) & stuff[1],
stuff->count, tmp, NULL, X_SelectExtensionEvent)) != Success)
return Success;
for (i=0; i<EMASKSIZE; i++)
for (i = 0; i < EMASKSIZE; i++)
if (tmp[i].dev != NULL)
{
if ((ret = SelectForWindow((DeviceIntPtr)tmp[i].dev, pWin, client, tmp[i].mask,
......@@ -145,4 +145,4 @@ ProcXSelectExtensionEvent (client)
}
return Success;
}
}
nx-X11/programs/Xserver/Xi/sendexev.c
View file @ 41a0ba72
......@@ -81,7 +81,7 @@ extern int lastEvent; /* Defined in extension.c */
int
SProcXSendExtensionEvent(client)
register ClientPtr client;
{
{
CARD32 *p;
register int i;
xEvent eventT;
......@@ -98,20 +98,20 @@ SProcXSendExtensionEvent(client)
(stuff->num_events * (sizeof(xEvent) >> 2)))
return BadLength;
eventP = (xEvent *) &stuff[1];
eventP = (xEvent *) & stuff[1];
for (i=0; i<stuff->num_events; i++,eventP++)
{
proc = EventSwapVector[eventP->u.u.type & 0177];
if (proc == NotImplemented) /* no swapping proc; invalid event type? */
return (BadValue);
(*proc)(eventP, &eventT);
(*proc) (eventP, &eventT);
*eventP = eventT;
}
p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
p = (CARD32 *) (((xEvent *) & stuff[1]) + stuff->num_events);
SwapLongs(p, stuff->count);
return(ProcXSendExtensionEvent(client));
}
return (ProcXSendExtensionEvent(client));
}
/***********************************************************************
*
......@@ -123,7 +123,7 @@ SProcXSendExtensionEvent(client)
int
ProcXSendExtensionEvent (client)
register ClientPtr client;
{
{
int ret;
DeviceIntPtr dev;
xEvent *first;
......@@ -133,7 +133,7 @@ ProcXSendExtensionEvent (client)
REQUEST(xSendExtensionEventReq);
REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
if (stuff->length !=(sizeof(xSendExtensionEventReq)>>2) + stuff->count +
if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
(stuff->num_events * (sizeof (xEvent) >> 2)))
{
SendErrorToClient (client, IReqCode, X_SendExtensionEvent, 0,
......@@ -141,7 +141,7 @@ ProcXSendExtensionEvent (client)
return Success;
}
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0,
......@@ -160,8 +160,8 @@ ProcXSendExtensionEvent (client)
/* The client's event type must be one defined by an extension. */
first = ((xEvent *) &stuff[1]);
if ( ! ((EXTENSION_EVENT_BASE <= first->u.u.type) &&
first = ((xEvent *) & stuff[1]);
if (!((EXTENSION_EVENT_BASE <= first->u.u.type) &&
(first->u.u.type < lastEvent)) )
{
client->errorValue = first->u.u.type;
......@@ -171,11 +171,11 @@ ProcXSendExtensionEvent (client)
}
list = (XEventClass *) (first + stuff->num_events);
if ((ret = CreateMaskFromList (client, list, stuff->count, tmp, dev,
if ((ret = CreateMaskFromList(client, list, stuff->count, tmp, dev,
X_SendExtensionEvent)) != Success)
return Success;
ret = (SendEvent (client, dev, stuff->destination,
ret = (SendEvent(client, dev, stuff->destination,
stuff->propagate, (xEvent *)&stuff[1], tmp[stuff->deviceid].mask,
stuff->num_events));
......@@ -183,4 +183,4 @@ ProcXSendExtensionEvent (client)
SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret);
return Success;
}
}
nx-X11/programs/Xserver/Xi/setbmap.c
View file @ 41a0ba72
......@@ -79,11 +79,11 @@ SOFTWARE.
int
SProcXSetDeviceButtonMapping(client)
register ClientPtr client;
{
{
REQUEST(xSetDeviceButtonMappingReq);
swaps(&stuff->length);
return(ProcXSetDeviceButtonMapping(client));
}
return (ProcXSetDeviceButtonMapping(client));
}
/***********************************************************************
*
......@@ -94,7 +94,7 @@ SProcXSetDeviceButtonMapping(client)
int
ProcXSetDeviceButtonMapping (client)
register ClientPtr client;
{
{
int ret;
xSetDeviceButtonMappingReply rep;
DeviceIntPtr dev;
......@@ -116,7 +116,7 @@ ProcXSetDeviceButtonMapping (client)
rep.sequenceNumber = client->sequence;
rep.status = MappingSuccess;
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0,
......@@ -124,7 +124,7 @@ ProcXSetDeviceButtonMapping (client)
return Success;
}
ret = SetButtonMapping (client, dev, stuff->map_length, (BYTE *)&stuff[1]);
ret = SetButtonMapping(client, dev, stuff->map_length, (BYTE *) & stuff[1]);
if (ret == BadValue || ret == BadMatch)
{
......@@ -141,7 +141,7 @@ ProcXSetDeviceButtonMapping (client)
if (ret != MappingBusy)
SendDeviceMappingNotify(MappingPointer, 0, 0, dev);
return Success;
}
}
/***********************************************************************
*
......@@ -155,8 +155,8 @@ SRepXSetDeviceButtonMapping (client, size, rep)
ClientPtr client;
int size;
xSetDeviceButtonMappingReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/setbmap.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXSetDeviceButtonMapping(
void
SRepXSetDeviceButtonMapping(
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xSetDeviceButtonMappingReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/setdval.c
View file @ 41a0ba72
......@@ -76,11 +76,11 @@ SOFTWARE.
int
SProcXSetDeviceValuators(client)
register ClientPtr client;
{
{
REQUEST(xSetDeviceValuatorsReq);
swaps(&stuff->length);
return(ProcXSetDeviceValuators(client));
}
return (ProcXSetDeviceValuators(client));
}
/***********************************************************************
*
......@@ -91,7 +91,7 @@ SProcXSetDeviceValuators(client)
int
ProcXSetDeviceValuators(client)
register ClientPtr client;
{
{
DeviceIntPtr dev;
xSetDeviceValuatorsReply rep;
......@@ -104,14 +104,14 @@ ProcXSetDeviceValuators(client)
rep.status = Success;
rep.sequenceNumber = client->sequence;
if (stuff->length !=(sizeof(xSetDeviceValuatorsReq)>>2) +
if (stuff->length != (sizeof(xSetDeviceValuatorsReq) >> 2) +
stuff->num_valuators)
{
SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0,
BadLength);
return Success;
}
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0,
......@@ -135,17 +135,17 @@ ProcXSetDeviceValuators(client)
if ((dev->grab) && !SameClient(dev->grab, client))
rep.status = AlreadyGrabbed;
else
rep.status = SetDeviceValuators (client, dev, (int *) &stuff[1],
rep.status = SetDeviceValuators(client, dev, (int *)&stuff[1],
stuff->first_valuator, stuff->num_valuators);
if (rep.status != Success && rep.status != AlreadyGrabbed)
SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0,
rep.status);
else
WriteReplyToClient (client, sizeof (xSetDeviceValuatorsReply), &rep);
WriteReplyToClient(client, sizeof(xSetDeviceValuatorsReply), &rep);
return Success;
}
}
/***********************************************************************
*
......@@ -159,8 +159,8 @@ SRepXSetDeviceValuators (client, size, rep)
ClientPtr client;
int size;
xSetDeviceValuatorsReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/setdval.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXSetDeviceValuators(
void
SRepXSetDeviceValuators(
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xSetDeviceValuatorsReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/setfocus.c
View file @ 41a0ba72
......@@ -79,14 +79,14 @@ SOFTWARE.
int
SProcXSetDeviceFocus(client)
register ClientPtr client;
{
{
REQUEST(xSetDeviceFocusReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xSetDeviceFocusReq);
swapl(&stuff->focus);
swapl(&stuff->time);
return(ProcXSetDeviceFocus(client));
}
return (ProcXSetDeviceFocus(client));
}
/***********************************************************************
*
......@@ -97,24 +97,24 @@ SProcXSetDeviceFocus(client)
int
ProcXSetDeviceFocus(client)
register ClientPtr client;
{
{
int ret;
register DeviceIntPtr dev;
REQUEST(xSetDeviceFocusReq);
REQUEST_SIZE_MATCH(xSetDeviceFocusReq);
dev = LookupDeviceIntRec (stuff->device);
dev = LookupDeviceIntRec(stuff->device);
if (dev==NULL || !dev->focus)
{
SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, BadDevice);
return Success;
}
ret = SetInputFocus (client, dev, stuff->focus, stuff->revertTo,
ret = SetInputFocus(client, dev, stuff->focus, stuff->revertTo,
stuff->time, TRUE);
if (ret != Success)
SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, ret);
return Success;
}
}
nx-X11/programs/Xserver/Xi/setmmap.c
View file @ 41a0ba72
......@@ -77,11 +77,11 @@ SOFTWARE.
int
SProcXSetDeviceModifierMapping(client)
register ClientPtr client;
{
{
REQUEST(xSetDeviceModifierMappingReq);
swaps(&stuff->length);
return(ProcXSetDeviceModifierMapping(client));
}
return (ProcXSetDeviceModifierMapping(client));
}
/***********************************************************************
*
......@@ -92,7 +92,7 @@ SProcXSetDeviceModifierMapping(client)
int
ProcXSetDeviceModifierMapping(client)
ClientPtr client;
{
{
int ret;
xSetDeviceModifierMappingReply rep;
DeviceIntPtr dev;
......@@ -101,10 +101,10 @@ ProcXSetDeviceModifierMapping(client)
REQUEST(xSetDeviceModifierMappingReq);
REQUEST_AT_LEAST_SIZE(xSetDeviceModifierMappingReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_SetDeviceModifierMapping, 0,
SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0,
BadDevice);
return Success;
}
......@@ -127,14 +127,14 @@ ProcXSetDeviceModifierMapping(client)
}
else
{
if (ret==-1)
ret=BadValue;
SendErrorToClient (client, IReqCode, X_SetDeviceModifierMapping, 0,ret);
if (ret == -1)
ret = BadValue;
SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, ret);
}
return Success;
}
}
/***********************************************************************
*
......@@ -148,9 +148,9 @@ SRepXSetDeviceModifierMapping (client, size, rep)
ClientPtr client;
int size;
xSetDeviceModifierMappingReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/setmmap.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXSetDeviceModifierMapping(
void
SRepXSetDeviceModifierMapping(
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xSetDeviceModifierMappingReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/setmode.c
View file @ 41a0ba72
......@@ -76,11 +76,11 @@ SOFTWARE.
int
SProcXSetDeviceMode(client)
register ClientPtr client;
{
{
REQUEST(xSetDeviceModeReq);
swaps(&stuff->length);
return(ProcXSetDeviceMode(client));
}
return (ProcXSetDeviceMode(client));
}
/***********************************************************************
*
......@@ -91,7 +91,7 @@ SProcXSetDeviceMode(client)
int
ProcXSetDeviceMode(client)
register ClientPtr client;
{
{
DeviceIntPtr dev;
xSetDeviceModeReply rep;
......@@ -103,10 +103,10 @@ ProcXSetDeviceMode(client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient (client, IReqCode, X_SetDeviceMode, 0, BadDevice);
SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, BadDevice);
return Success;
}
if (dev->valuator == NULL)
......@@ -117,7 +117,7 @@ ProcXSetDeviceMode(client)
if ((dev->grab) && !SameClient(dev->grab, client))
rep.status = AlreadyGrabbed;
else
rep.status = SetDeviceMode (client, dev, stuff->mode);
rep.status = SetDeviceMode(client, dev, stuff->mode);
if (rep.status == Success)
dev->valuator->mode = stuff->mode;
......@@ -127,9 +127,9 @@ ProcXSetDeviceMode(client)
return Success;
}
WriteReplyToClient (client, sizeof (xSetDeviceModeReply), &rep);
WriteReplyToClient(client, sizeof(xSetDeviceModeReply), &rep);
return Success;
}
}
/***********************************************************************
*
......@@ -143,8 +143,8 @@ SRepXSetDeviceMode (client, size, rep)
ClientPtr client;
int size;
xSetDeviceModeReply *rep;
{
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
}
nx-X11/programs/Xserver/Xi/setmode.h
View file @ 41a0ba72
......@@ -43,7 +43,7 @@ ProcXSetDeviceMode(
void
SRepXSetDeviceMode(
ClientPtr /* client */,
int /* size */,
int /* size */ ,
xSetDeviceModeReply * /* rep */
);
......
nx-X11/programs/Xserver/Xi/stubs.c
View file @ 41a0ba72
......@@ -94,12 +94,12 @@ int
ChangeKeyboardDevice (old_dev, new_dev)
DeviceIntPtr old_dev;
DeviceIntPtr new_dev;
{
{
/***********************************************************************
DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c *
**********************************************************************/
return BadMatch;
}
}
/***********************************************************************
......@@ -138,7 +138,7 @@ ChangePointerDevice (
DeviceIntPtr new_dev,
unsigned char x,
unsigned char y)
{
{
/***********************************************************************
InitFocusClassDeviceStruct(old_dev); * allow focusing old ptr*
......@@ -150,7 +150,7 @@ ChangePointerDevice (
axes_changed = FALSE;
*************************************************************************/
return BadMatch;
}
}
/***********************************************************************
*
......@@ -169,8 +169,8 @@ void
CloseInputDevice (d, client)
DeviceIntPtr d;
ClientPtr client;
{
}
{
}
/***********************************************************************
*
......@@ -200,7 +200,7 @@ CloseInputDevice (d, client)
void
AddOtherInputDevices ()
{
{
/**********************************************************************
for each uninitialized device, do something like:
......@@ -214,7 +214,7 @@ AddOtherInputDevices ()
dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success);
************************************************************************/
}
}
/***********************************************************************
*
......@@ -243,8 +243,8 @@ OpenInputDevice (dev, client, status)
DeviceIntPtr dev;
ClientPtr client;
int *status;
{
}
{
}
/****************************************************************************
*
......@@ -263,9 +263,9 @@ SetDeviceMode (client, dev, mode)
register ClientPtr client;
DeviceIntPtr dev;
int mode;
{
{
return BadMatch;
}
}
/****************************************************************************
*
......@@ -286,9 +286,9 @@ SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators)
int *valuators;
int first_valuator;
int num_valuators;
{
{
return BadMatch;
}
}
/****************************************************************************
*
......@@ -305,10 +305,10 @@ ChangeDeviceControl (client, dev, control)
xDeviceCtl *control;
{
switch (control->control)
{
{
case DEVICE_RESOLUTION:
return (BadMatch);
default:
return (BadMatch);
}
}
}
nx-X11/programs/Xserver/Xi/ungrdev.c
View file @ 41a0ba72
......@@ -75,13 +75,13 @@ SOFTWARE.
int
SProcXUngrabDevice(client)
register ClientPtr client;
{
{
REQUEST(xUngrabDeviceReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xUngrabDeviceReq);
swapl(&stuff->time);
return(ProcXUngrabDevice(client));
}
return (ProcXUngrabDevice(client));
}
/***********************************************************************
*
......@@ -92,7 +92,7 @@ register ClientPtr client;
int
ProcXUngrabDevice(client)
register ClientPtr client;
{
{
DeviceIntPtr dev;
GrabPtr grab;
TimeStamp time;
......@@ -100,7 +100,7 @@ register ClientPtr client;
REQUEST(xUngrabDeviceReq);
REQUEST_SIZE_MATCH(xUngrabDeviceReq);
dev = LookupDeviceIntRec (stuff->deviceid);
dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_UngrabDevice, 0, BadDevice);
......@@ -112,6 +112,6 @@ register ClientPtr client;
if ((CompareTimeStamps(time, currentTime) != LATER) &&
(CompareTimeStamps(time, dev->grabTime) != EARLIER) &&
(grab) && SameClient(grab, client))
(*dev->DeactivateGrab)(dev);
(*dev->DeactivateGrab) (dev);
return Success;
}
}
nx-X11/programs/Xserver/Xi/ungrdevb.c
View file @ 41a0ba72
......@@ -81,14 +81,14 @@ SOFTWARE.
int
SProcXUngrabDeviceButton(client)
register ClientPtr client;
{
{
REQUEST(xUngrabDeviceButtonReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xUngrabDeviceButtonReq);
swapl(&stuff->grabWindow);
swaps(&stuff->modifiers);
return(ProcXUngrabDeviceButton(client));
}
return (ProcXUngrabDeviceButton(client));
}
/***********************************************************************
*
......@@ -99,7 +99,7 @@ SProcXUngrabDeviceButton(client)
int
ProcXUngrabDeviceButton(client)
ClientPtr client;
{
{
DeviceIntPtr dev;
DeviceIntPtr mdev;
WindowPtr pWin;
......@@ -108,7 +108,7 @@ ProcXUngrabDeviceButton(client)
REQUEST(xUngrabDeviceButtonReq);
REQUEST_SIZE_MATCH(xUngrabDeviceButtonReq);
dev = LookupDeviceIntRec (stuff->grabbed_device);
dev = LookupDeviceIntRec(stuff->grabbed_device);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0,
......@@ -124,7 +124,7 @@ ProcXUngrabDeviceButton(client)
if (stuff->modifier_device != UseXKeyboard)
{
mdev = LookupDeviceIntRec (stuff->modifier_device);
mdev = LookupDeviceIntRec(stuff->modifier_device);
if (mdev == NULL)
{
SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0,
......@@ -169,4 +169,4 @@ ProcXUngrabDeviceButton(client)
DeletePassiveGrabFromList(&temporaryGrab);
return Success;
}
}
nx-X11/programs/Xserver/Xi/ungrdevk.c
View file @ 41a0ba72
......@@ -81,14 +81,14 @@ SOFTWARE.
int
SProcXUngrabDeviceKey(client)
register ClientPtr client;
{
{
REQUEST(xUngrabDeviceKeyReq);
swaps(&stuff->length);
REQUEST_SIZE_MATCH(xUngrabDeviceKeyReq);
swapl(&stuff->grabWindow);
swaps(&stuff->modifiers);
return(ProcXUngrabDeviceKey(client));
}
return (ProcXUngrabDeviceKey(client));
}
/***********************************************************************
*
......@@ -99,7 +99,7 @@ SProcXUngrabDeviceKey(client)
int
ProcXUngrabDeviceKey(client)
ClientPtr client;
{
{
DeviceIntPtr dev;
DeviceIntPtr mdev;
WindowPtr pWin;
......@@ -108,7 +108,7 @@ ProcXUngrabDeviceKey(client)
REQUEST(xUngrabDeviceKeyReq);
REQUEST_SIZE_MATCH(xUngrabDeviceKeyReq);
dev = LookupDeviceIntRec (stuff->grabbed_device);
dev = LookupDeviceIntRec(stuff->grabbed_device);
if (dev == NULL)
{
SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0,
......@@ -123,7 +123,7 @@ ProcXUngrabDeviceKey(client)
if (stuff->modifier_device != UseXKeyboard)
{
mdev = LookupDeviceIntRec (stuff->modifier_device);
mdev = LookupDeviceIntRec(stuff->modifier_device);
if (mdev == NULL)
{
SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0,
......@@ -175,4 +175,4 @@ ProcXUngrabDeviceKey(client)
DeletePassiveGrabFromList(&temporaryGrab);
return Success;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment