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