Skip to content

N
nx-libs
Unverified Commit 05152b78 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

Merge branch 'uli42-pr/update_xi' into arctica-3.6.x

Attributes GH PR #644: https://github.com/ArcticaProject/nx-libs/pull/644
parents e247900e 4598c0c3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1003 additions and 1584 deletions
nx-X11/programs/Xserver/Xi/allowev.c
View file @ 05152b78
...@@ -75,15 +75,14 @@ SOFTWARE. ...@@ -75,15 +75,14 @@ SOFTWARE.
*/ */
int int
SProcXAllowDeviceEvents(client) SProcXAllowDeviceEvents(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -92,25 +91,22 @@ SProcXAllowDeviceEvents(client) ...@@ -92,25 +91,22 @@ SProcXAllowDeviceEvents(client)
*/ */
int int
ProcXAllowDeviceEvents(client) ProcXAllowDeviceEvents(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);
return Success; return Success;
} }
time = ClientTimeToServerTime(stuff->time); time = ClientTimeToServerTime(stuff->time);
switch (stuff->mode) switch (stuff->mode) {
{
case ReplayThisDevice: case ReplayThisDevice:
AllowSome(client, time, thisdev, NOT_GRABBED); AllowSome(client, time, thisdev, NOT_GRABBED);
break; break;
...@@ -130,10 +126,9 @@ ProcXAllowDeviceEvents(client) ...@@ -130,10 +126,9 @@ ProcXAllowDeviceEvents(client)
AllowSome(client, time, thisdev, THAWED_BOTH); AllowSome(client, time, thisdev, THAWED_BOTH);
break; break;
default: default:
SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadValue);
BadValue);
client->errorValue = stuff->mode; client->errorValue = stuff->mode;
return Success; return Success;
} }
return Success; return Success;
} }
nx-X11/programs/Xserver/Xi/allowev.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef ALLOWEV_H #ifndef ALLOWEV_H
#define ALLOWEV_H 1 #define ALLOWEV_H 1
int int SProcXAllowDeviceEvents(ClientPtr /* client */
SProcXAllowDeviceEvents(
ClientPtr /* client */
); );
int int ProcXAllowDeviceEvents(ClientPtr /* client */
ProcXAllowDeviceEvents(
ClientPtr /* client */
); );
#endif /* ALLOWEV_H */ #endif /* ALLOWEV_H */
nx-X11/programs/Xserver/Xi/chgdctl.c
View file @ 05152b78
...@@ -76,15 +76,14 @@ SOFTWARE. ...@@ -76,15 +76,14 @@ SOFTWARE.
*/ */
int int
SProcXChangeDeviceControl(client) SProcXChangeDeviceControl(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -93,9 +92,8 @@ SProcXChangeDeviceControl(client) ...@@ -93,9 +92,8 @@ SProcXChangeDeviceControl(client)
*/ */
int int
ProcXChangeDeviceControl(client) ProcXChangeDeviceControl(ClientPtr client)
ClientPtr client; {
{
unsigned len; unsigned len;
int i, status; int i, status;
DeviceIntPtr dev; DeviceIntPtr dev;
...@@ -107,11 +105,10 @@ ProcXChangeDeviceControl(client) ...@@ -107,11 +105,10 @@ 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;
} }
...@@ -121,75 +118,60 @@ ProcXChangeDeviceControl(client) ...@@ -121,75 +118,60 @@ ProcXChangeDeviceControl(client)
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
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;
} }
if ((dev->grab) && !SameClient(dev->grab, client)) if ((dev->grab) && !SameClient(dev->grab, client)) {
{
rep.status = AlreadyGrabbed; rep.status = AlreadyGrabbed;
WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep);
&rep);
return Success; return Success;
} }
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)
{
rep.status = DeviceBusy; rep.status = DeviceBusy;
WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep);
&rep);
return Success; return Success;
} } else {
else SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0,
{
SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0,
BadMatch); BadMatch);
return Success; return Success;
} }
break; break;
default: default:
SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadValue);
BadValue);
return Success; return Success;
} }
WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -199,13 +181,10 @@ ProcXChangeDeviceControl(client) ...@@ -199,13 +181,10 @@ ProcXChangeDeviceControl(client)
*/ */
void void
SRepXChangeDeviceControl (client, size, rep) SRepXChangeDeviceControl(ClientPtr client, int size,
ClientPtr client; xChangeDeviceControlReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGDCTL_H #ifndef CHGDCTL_H
#define CHGDCTL_H 1 #define CHGDCTL_H 1
int int SProcXChangeDeviceControl(ClientPtr /* client */
SProcXChangeDeviceControl(
ClientPtr /* client */
); );
int int ProcXChangeDeviceControl(ClientPtr /* client */
ProcXChangeDeviceControl(
ClientPtr /* client */
); );
void void SRepXChangeDeviceControl(ClientPtr /* client */ ,
SRepXChangeDeviceControl ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xChangeDeviceControlReply * /* rep */ xChangeDeviceControlReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/chgfctl.h
View file @ 05152b78
...@@ -30,67 +30,51 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,67 +30,51 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGFCTL_H #ifndef CHGFCTL_H
#define CHGFCTL_H 1 #define CHGFCTL_H 1
int int SProcXChangeFeedbackControl(ClientPtr /* client */
SProcXChangeFeedbackControl(
ClientPtr /* client */
); );
int int ProcXChangeFeedbackControl(ClientPtr /* client */
ProcXChangeFeedbackControl(
ClientPtr /* client */
); );
int int ChangeKbdFeedback(ClientPtr /* client */ ,
ChangeKbdFeedback ( DeviceIntPtr /* dev */ ,
ClientPtr /* client */, unsigned long /* mask */ ,
DeviceIntPtr /* dev */, KbdFeedbackPtr /* k */ ,
unsigned long /* mask */,
KbdFeedbackPtr /* k */,
xKbdFeedbackCtl * /* f */ xKbdFeedbackCtl * /* f */
); );
int int ChangePtrFeedback(ClientPtr /* client */ ,
ChangePtrFeedback ( DeviceIntPtr /* dev */ ,
ClientPtr /* client */, unsigned long /* mask */ ,
DeviceIntPtr /* dev */, PtrFeedbackPtr /* p */ ,
unsigned long /* mask */,
PtrFeedbackPtr /* p */,
xPtrFeedbackCtl * /* f */ xPtrFeedbackCtl * /* f */
); );
int int ChangeIntegerFeedback(ClientPtr /* client */ ,
ChangeIntegerFeedback ( DeviceIntPtr /* dev */ ,
ClientPtr /* client */, unsigned long /* mask */ ,
DeviceIntPtr /* dev */, IntegerFeedbackPtr /* i */ ,
unsigned long /* mask */,
IntegerFeedbackPtr /* i */,
xIntegerFeedbackCtl * /* f */ xIntegerFeedbackCtl * /* f */
); );
int int ChangeStringFeedback(ClientPtr /* client */ ,
ChangeStringFeedback ( DeviceIntPtr /* dev */ ,
ClientPtr /* client */, unsigned long /* mask */ ,
DeviceIntPtr /* dev */, StringFeedbackPtr /* s */ ,
unsigned long /* mask */,
StringFeedbackPtr /* s */,
xStringFeedbackCtl * /* f */ xStringFeedbackCtl * /* f */
); );
int int ChangeBellFeedback(ClientPtr /* client */ ,
ChangeBellFeedback ( DeviceIntPtr /* dev */ ,
ClientPtr /* client */, unsigned long /* mask */ ,
DeviceIntPtr /* dev */, BellFeedbackPtr /* b */ ,
unsigned long /* mask */,
BellFeedbackPtr /* b */,
xBellFeedbackCtl * /* f */ xBellFeedbackCtl * /* f */
); );
int int ChangeLedFeedback(ClientPtr /* client */ ,
ChangeLedFeedback ( DeviceIntPtr /* dev */ ,
ClientPtr /* client */, unsigned long /* mask */ ,
DeviceIntPtr /* dev */, LedFeedbackPtr /* l */ ,
unsigned long /* mask */,
LedFeedbackPtr /* l */,
xLedFeedbackCtl * /* f */ xLedFeedbackCtl * /* f */
); );
......
nx-X11/programs/Xserver/Xi/chgkbd.c
View file @ 05152b78
...@@ -78,14 +78,13 @@ SOFTWARE. ...@@ -78,14 +78,13 @@ SOFTWARE.
*/ */
int int
SProcXChangeKeyboardDevice(client) SProcXChangeKeyboardDevice(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -95,9 +94,8 @@ SProcXChangeKeyboardDevice(client) ...@@ -95,9 +94,8 @@ SProcXChangeKeyboardDevice(client)
*/ */
int int
ProcXChangeKeyboardDevice (client) ProcXChangeKeyboardDevice(register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
DeviceIntPtr xkbd = inputInfo.keyboard; DeviceIntPtr xkbd = inputInfo.keyboard;
DeviceIntPtr dev; DeviceIntPtr dev;
...@@ -115,9 +113,8 @@ ProcXChangeKeyboardDevice (client) ...@@ -115,9 +113,8 @@ 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;
SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0,
BadDevice); BadDevice);
...@@ -125,8 +122,7 @@ ProcXChangeKeyboardDevice (client) ...@@ -125,8 +122,7 @@ ProcXChangeKeyboardDevice (client)
} }
k = dev->key; k = dev->key;
if (k == NULL) if (k == NULL) {
{
rep.status = -1; rep.status = -1;
SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0,
BadMatch); BadMatch);
...@@ -141,53 +137,51 @@ ProcXChangeKeyboardDevice (client) ...@@ -141,53 +137,51 @@ ProcXChangeKeyboardDevice (client)
(xkbd->sync.frozen && (xkbd->sync.frozen &&
xkbd->sync.other && !SameClient(xkbd->sync.other, client))) xkbd->sync.other && !SameClient(xkbd->sync.other, client)))
rep.status = GrabFrozen; rep.status = GrabFrozen;
else else {
{ if (ChangeKeyboardDevice(xkbd, dev) != Success) {
if (ChangeKeyboardDevice (xkbd, dev) != Success)
{
SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0,
BadDevice); BadDevice);
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;
df->time = xf->time; df->time = xf->time;
df->traceGood = xf->traceGood; df->traceGood = xf->traceGood;
if (df->traceSize != xf->traceSize) if (df->traceSize != xf->traceSize) {
{
Must_have_memory = TRUE; /* XXX */ Must_have_memory = TRUE; /* XXX */
df->trace = (WindowPtr *) realloc(df->trace, df->trace = (WindowPtr *) realloc(df->trace,
xf->traceSize * sizeof(WindowPtr)); xf->traceSize *
sizeof(WindowPtr));
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;
} }
WriteReplyToClient (client, sizeof (xChangeKeyboardDeviceReply), WriteReplyToClient(client, sizeof(xChangeKeyboardDeviceReply), &rep);
&rep);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -197,12 +191,10 @@ ProcXChangeKeyboardDevice (client) ...@@ -197,12 +191,10 @@ ProcXChangeKeyboardDevice (client)
*/ */
void void
SRepXChangeKeyboardDevice (client, size, rep) SRepXChangeKeyboardDevice(ClientPtr client, int size,
ClientPtr client; xChangeKeyboardDeviceReply * rep)
int size; {
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 @ 05152b78
...@@ -30,22 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,22 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGKBD_H #ifndef CHGKBD_H
#define CHGKBD_H 1 #define CHGKBD_H 1
int int SProcXChangeKeyboardDevice(ClientPtr /* client */
SProcXChangeKeyboardDevice(
ClientPtr /* client */
); );
int int ProcXChangeKeyboardDevice(ClientPtr /* client */
ProcXChangeKeyboardDevice (
ClientPtr /* client */
); );
void void SRepXChangeKeyboardDevice(ClientPtr /* client */ ,
SRepXChangeKeyboardDevice ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xChangeKeyboardDeviceReply * /* rep */ xChangeKeyboardDeviceReply * /* rep */
); );
#endif /* CHGKBD_H */ #endif /* CHGKBD_H */
nx-X11/programs/Xserver/Xi/chgkmap.c
View file @ 05152b78
...@@ -75,9 +75,8 @@ SOFTWARE. ...@@ -75,9 +75,8 @@ SOFTWARE.
*/ */
int int
SProcXChangeDeviceKeyMapping(client) SProcXChangeDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
unsigned int count; unsigned int count;
REQUEST(xChangeDeviceKeyMappingReq); REQUEST(xChangeDeviceKeyMappingReq);
...@@ -86,8 +85,8 @@ SProcXChangeDeviceKeyMapping(client) ...@@ -86,8 +85,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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -96,9 +95,8 @@ SProcXChangeDeviceKeyMapping(client) ...@@ -96,9 +95,8 @@ SProcXChangeDeviceKeyMapping(client)
*/ */
int int
ProcXChangeDeviceKeyMapping(client) ProcXChangeDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
unsigned len; unsigned len;
DeviceIntPtr dev; DeviceIntPtr dev;
...@@ -110,21 +108,19 @@ ProcXChangeDeviceKeyMapping(client) ...@@ -110,21 +108,19 @@ 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,
(KeySym *)&stuff[1]); stuff->keySymsPerKeyCode, (KeySym *) & stuff[1]);
if (ret != Success) if (ret != Success)
SendErrorToClient (client, IReqCode, X_ChangeDeviceKeyMapping, 0, SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, ret);
ret);
return Success; return Success;
} }
nx-X11/programs/Xserver/Xi/chgkmap.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGKMAP_H #ifndef CHGKMAP_H
#define CHGKMAP_H 1 #define CHGKMAP_H 1
int int SProcXChangeDeviceKeyMapping(ClientPtr /* client */
SProcXChangeDeviceKeyMapping(
ClientPtr /* client */
); );
int int ProcXChangeDeviceKeyMapping(ClientPtr /* client */
ProcXChangeDeviceKeyMapping(
ClientPtr /* client */
); );
#endif /* CHGKMAP_H */ #endif /* CHGKMAP_H */
nx-X11/programs/Xserver/Xi/chgprop.c
View file @ 05152b78
...@@ -77,9 +77,8 @@ SOFTWARE. ...@@ -77,9 +77,8 @@ SOFTWARE.
*/ */
int int
SProcXChangeDeviceDontPropagateList(client) SProcXChangeDeviceDontPropagateList(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 +87,8 @@ SProcXChangeDeviceDontPropagateList(client) ...@@ -88,8 +87,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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -98,9 +97,8 @@ SProcXChangeDeviceDontPropagateList(client) ...@@ -98,9 +97,8 @@ SProcXChangeDeviceDontPropagateList(client)
*/ */
int int
ProcXChangeDeviceDontPropagateList (client) ProcXChangeDeviceDontPropagateList(register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
WindowPtr pWin; WindowPtr pWin;
struct tmask tmp[EMASKSIZE]; struct tmask tmp[EMASKSIZE];
...@@ -109,40 +107,37 @@ ProcXChangeDeviceDontPropagateList (client) ...@@ -109,40 +107,37 @@ 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;
SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0, SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0,
BadWindow); BadWindow);
return Success; return Success;
} }
if (stuff->mode != AddToList && stuff->mode != DeleteFromList) if (stuff->mode != AddToList && stuff->mode != DeleteFromList) {
{
client->errorValue = stuff->window; client->errorValue = stuff->window;
SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0, SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0,
BadMode); BadMode);
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;
others = wOtherInputMasks(pWin); others = wOtherInputMasks(pWin);
if (!others && stuff->mode == DeleteFromList) if (!others && stuff->mode == DeleteFromList)
return Success; return Success;
for (i=0; i<EMASKSIZE; i++) for (i = 0; i < EMASKSIZE; i++) {
{
if (tmp[i].mask == 0) if (tmp[i].mask == 0)
continue; continue;
...@@ -151,13 +146,13 @@ ProcXChangeDeviceDontPropagateList (client) ...@@ -151,13 +146,13 @@ ProcXChangeDeviceDontPropagateList (client)
else if (others) else if (others)
tmp[i].mask |= others->dontPropagateMask[i]; tmp[i].mask |= others->dontPropagateMask[i];
if (DeviceEventSuppressForWindow (pWin,client,tmp[i].mask,i) != Success) if (DeviceEventSuppressForWindow(pWin, client, tmp[i].mask, i) !=
{ Success) {
SendErrorToClient ( client, IReqCode, X_ChangeDeviceDontPropagateList, 0, SendErrorToClient(client, IReqCode,
BadClass); X_ChangeDeviceDontPropagateList, 0, BadClass);
return Success; return Success;
} }
} }
return Success; return Success;
} }
nx-X11/programs/Xserver/Xi/chgprop.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGPROP_H #ifndef CHGPROP_H
#define CHGPROP_H 1 #define CHGPROP_H 1
int int SProcXChangeDeviceDontPropagateList(ClientPtr /* client */
SProcXChangeDeviceDontPropagateList (
ClientPtr /* client */
); );
int int ProcXChangeDeviceDontPropagateList(ClientPtr /* client */
ProcXChangeDeviceDontPropagateList (
ClientPtr /* client */
); );
#endif /* CHGPROP_H */ #endif /* CHGPROP_H */
nx-X11/programs/Xserver/Xi/chgptr.c
View file @ 05152b78
...@@ -81,14 +81,13 @@ SOFTWARE. ...@@ -81,14 +81,13 @@ SOFTWARE.
*/ */
int int
SProcXChangePointerDevice(client) SProcXChangePointerDevice(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -97,9 +96,8 @@ SProcXChangePointerDevice(client) ...@@ -97,9 +96,8 @@ SProcXChangePointerDevice(client)
*/ */
int int
ProcXChangePointerDevice (client) ProcXChangePointerDevice(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr xptr = inputInfo.pointer; DeviceIntPtr xptr = inputInfo.pointer;
DeviceIntPtr dev; DeviceIntPtr dev;
ValuatorClassPtr v; ValuatorClassPtr v;
...@@ -114,9 +112,8 @@ ProcXChangePointerDevice (client) ...@@ -114,9 +112,8 @@ 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;
SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0,
BadDevice); BadDevice);
...@@ -125,9 +122,7 @@ ProcXChangePointerDevice (client) ...@@ -125,9 +122,7 @@ ProcXChangePointerDevice (client)
v = dev->valuator; v = dev->valuator;
if (v == NULL || v->numAxes < 2 || if (v == NULL || v->numAxes < 2 ||
stuff->xaxis >= v->numAxes || stuff->xaxis >= v->numAxes || stuff->yaxis >= v->numAxes) {
stuff->yaxis >= v->numAxes)
{
rep.status = -1; rep.status = -1;
SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, BadMatch); SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, BadMatch);
return Success; return Success;
...@@ -141,11 +136,9 @@ ProcXChangePointerDevice (client) ...@@ -141,11 +136,9 @@ ProcXChangePointerDevice (client)
(xptr->sync.frozen && (xptr->sync.frozen &&
xptr->sync.other && !SameClient(xptr->sync.other, client))) xptr->sync.other && !SameClient(xptr->sync.other, client)))
rep.status = GrabFrozen; rep.status = GrabFrozen;
else else {
{ if (ChangePointerDevice(xptr, dev, stuff->xaxis, stuff->yaxis) !=
if (ChangePointerDevice ( Success) {
xptr, dev, stuff->xaxis, stuff->yaxis) != Success)
{
SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0,
BadDevice); BadDevice);
return Success; return Success;
...@@ -153,36 +146,34 @@ ProcXChangePointerDevice (client) ...@@ -153,36 +146,34 @@ 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;
} }
WriteReplyToClient (client, sizeof (xChangePointerDeviceReply), WriteReplyToClient(client, sizeof(xChangePointerDeviceReply), &rep);
&rep);
return Success; return Success;
} }
void void
DeleteFocusClassDeviceStruct(dev) DeleteFocusClassDeviceStruct(DeviceIntPtr dev)
DeviceIntPtr dev; {
{
free(dev->focus->trace); free(dev->focus->trace);
free(dev->focus); free(dev->focus);
dev->focus = NULL; dev->focus = NULL;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -191,23 +182,18 @@ DeleteFocusClassDeviceStruct(dev) ...@@ -191,23 +182,18 @@ DeleteFocusClassDeviceStruct(dev)
*/ */
void void
SendEventToAllWindows (dev, mask, ev, count) SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
DeviceIntPtr dev; {
Mask mask;
xEvent *ev;
int count;
{
int i; int i;
WindowPtr pWin, p1; WindowPtr pWin, p1;
for (i=0; i<screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++) {
{
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);
}
} }
}
/*********************************************************************** /***********************************************************************
* *
...@@ -217,23 +203,18 @@ SendEventToAllWindows (dev, mask, ev, count) ...@@ -217,23 +203,18 @@ SendEventToAllWindows (dev, mask, ev, count)
*/ */
void void
FindInterestedChildren (dev, p1, mask, ev, count) FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
DeviceIntPtr dev; xEvent * ev, int count)
WindowPtr p1; {
Mask mask;
xEvent *ev;
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;
} }
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -243,12 +224,10 @@ FindInterestedChildren (dev, p1, mask, ev, count) ...@@ -243,12 +224,10 @@ FindInterestedChildren (dev, p1, mask, ev, count)
*/ */
void void
SRepXChangePointerDevice (client, size, rep) SRepXChangePointerDevice(ClientPtr client, int size,
ClientPtr client; xChangePointerDeviceReply * rep)
int size; {
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 @ 05152b78
...@@ -30,42 +30,31 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,42 +30,31 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGPTR_H #ifndef CHGPTR_H
#define CHGPTR_H 1 #define CHGPTR_H 1
int int SProcXChangePointerDevice(ClientPtr /* client */
SProcXChangePointerDevice(
ClientPtr /* client */
); );
int int ProcXChangePointerDevice(ClientPtr /* client */
ProcXChangePointerDevice (
ClientPtr /* client */
); );
void void DeleteFocusClassDeviceStruct(DeviceIntPtr /* dev */
DeleteFocusClassDeviceStruct(
DeviceIntPtr /* dev */
); );
void void SendEventToAllWindows(DeviceIntPtr /* dev */ ,
SendEventToAllWindows ( Mask /* mask */ ,
DeviceIntPtr /* dev */, xEvent * /* ev */ ,
Mask /* mask */,
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(ClientPtr /* client */ ,
SRepXChangePointerDevice ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xChangePointerDeviceReply * /* rep */ xChangePointerDeviceReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/closedev.c
View file @ 05152b78
...@@ -76,14 +76,13 @@ SOFTWARE. ...@@ -76,14 +76,13 @@ SOFTWARE.
*/ */
int int
SProcXCloseDevice(client) SProcXCloseDevice(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -92,9 +91,8 @@ SProcXCloseDevice(client) ...@@ -92,9 +91,8 @@ SProcXCloseDevice(client)
*/ */
int int
ProcXCloseDevice(client) ProcXCloseDevice(register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
WindowPtr pWin, p1; WindowPtr pWin, p1;
DeviceIntPtr d; DeviceIntPtr d;
...@@ -102,31 +100,29 @@ ProcXCloseDevice(client) ...@@ -102,31 +100,29 @@ 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);
return Success; return Success;
} }
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.
Delete passive grabs from all windows for this device. */ * Delete passive grabs from all windows for this device. */
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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -136,21 +132,17 @@ ProcXCloseDevice(client) ...@@ -136,21 +132,17 @@ ProcXCloseDevice(client)
*/ */
void void
DeleteEventsFromChildren(dev, p1, client) DeleteEventsFromChildren(DeviceIntPtr dev, WindowPtr p1, ClientPtr client)
DeviceIntPtr dev; {
WindowPtr p1;
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;
} }
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -160,26 +152,21 @@ DeleteEventsFromChildren(dev, p1, client) ...@@ -160,26 +152,21 @@ DeleteEventsFromChildren(dev, p1, client)
*/ */
void void
DeleteDeviceEvents (dev, pWin, client) DeleteDeviceEvents(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
DeviceIntPtr dev; {
WindowPtr pWin;
ClientPtr client;
{
InputClientsPtr others; InputClientsPtr others;
OtherInputMasks *pOthers; OtherInputMasks *pOthers;
GrabPtr grab, next; GrabPtr grab, next;
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) {
{
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 @ 05152b78
...@@ -30,27 +30,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,27 +30,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CLOSEDEV_H #ifndef CLOSEDEV_H
#define CLOSEDEV_H 1 #define CLOSEDEV_H 1
int int SProcXCloseDevice(ClientPtr /* client */
SProcXCloseDevice(
ClientPtr /* client */
); );
int int ProcXCloseDevice(ClientPtr /* client */
ProcXCloseDevice(
ClientPtr /* client */
); );
void void DeleteEventsFromChildren(DeviceIntPtr /* dev */ ,
DeleteEventsFromChildren( WindowPtr /* p1 */ ,
DeviceIntPtr /* dev */,
WindowPtr /* p1 */,
ClientPtr /* client */ ClientPtr /* client */
); );
void void DeleteDeviceEvents(DeviceIntPtr /* dev */ ,
DeleteDeviceEvents ( WindowPtr /* pWin */ ,
DeviceIntPtr /* dev */,
WindowPtr /* pWin */,
ClientPtr /* client */ ClientPtr /* client */
); );
......
nx-X11/programs/Xserver/Xi/devbell.c
View file @ 05152b78
...@@ -74,13 +74,12 @@ SOFTWARE. ...@@ -74,13 +74,12 @@ SOFTWARE.
*/ */
int int
SProcXDeviceBell(client) SProcXDeviceBell(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xDeviceBellReq); REQUEST(xDeviceBellReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXDeviceBell(client)); return (ProcXDeviceBell(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -89,9 +88,8 @@ SProcXDeviceBell(client) ...@@ -89,9 +88,8 @@ SProcXDeviceBell(client)
*/ */
int int
ProcXDeviceBell (client) ProcXDeviceBell(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
KbdFeedbackPtr k; KbdFeedbackPtr k;
BellFeedbackPtr b; BellFeedbackPtr b;
...@@ -104,27 +102,23 @@ ProcXDeviceBell (client) ...@@ -104,27 +102,23 @@ ProcXDeviceBell (client)
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;
SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadDevice); SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadDevice);
return Success; return Success;
} }
if (stuff->percent < -100 || stuff->percent > 100) if (stuff->percent < -100 || stuff->percent > 100) {
{
client->errorValue = stuff->percent; client->errorValue = stuff->percent;
SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue);
return Success; return Success;
} }
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) {
{
client->errorValue = stuff->feedbackid; client->errorValue = stuff->feedbackid;
SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue);
return Success; return Success;
...@@ -133,14 +127,11 @@ ProcXDeviceBell (client) ...@@ -133,14 +127,11 @@ ProcXDeviceBell (client)
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) {
{
client->errorValue = stuff->feedbackid; client->errorValue = stuff->feedbackid;
SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue);
return Success; return Success;
...@@ -149,9 +140,7 @@ ProcXDeviceBell (client) ...@@ -149,9 +140,7 @@ ProcXDeviceBell (client)
proc = b->BellProc; proc = b->BellProc;
ctrl = (void *) &(b->ctrl); ctrl = (void *) &(b->ctrl);
class = BellFeedbackClass; class = BellFeedbackClass;
} } else {
else
{
client->errorValue = stuff->feedbackclass; client->errorValue = stuff->feedbackclass;
SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue);
return Success; return Success;
...@@ -161,7 +150,7 @@ ProcXDeviceBell (client) ...@@ -161,7 +150,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/devbell.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef DEVBELL_H #ifndef DEVBELL_H
#define DEVBELL_H 1 #define DEVBELL_H 1
int int SProcXDeviceBell(ClientPtr /* client */
SProcXDeviceBell (
ClientPtr /* client */
); );
int int ProcXDeviceBell(ClientPtr /* client */
ProcXDeviceBell (
ClientPtr /* client */
); );
#endif /* DEVBELL_H */ #endif /* DEVBELL_H */
nx-X11/programs/Xserver/Xi/getbmap.c
View file @ 05152b78
...@@ -73,13 +73,12 @@ SOFTWARE. ...@@ -73,13 +73,12 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceButtonMapping(client) SProcXGetDeviceButtonMapping(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xGetDeviceButtonMappingReq); REQUEST(xGetDeviceButtonMappingReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXGetDeviceButtonMapping(client)); return (ProcXGetDeviceButtonMapping(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -88,9 +87,8 @@ SProcXGetDeviceButtonMapping(client) ...@@ -88,9 +87,8 @@ SProcXGetDeviceButtonMapping(client)
*/ */
int int
ProcXGetDeviceButtonMapping (client) ProcXGetDeviceButtonMapping(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
xGetDeviceButtonMappingReply rep; xGetDeviceButtonMappingReply rep;
ButtonClassPtr b; ButtonClassPtr b;
...@@ -104,28 +102,25 @@ ProcXGetDeviceButtonMapping (client) ...@@ -104,28 +102,25 @@ 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,
BadDevice); BadDevice);
return Success; return Success;
} }
b = dev->button; b = dev->button;
if (b == NULL) if (b == NULL) {
{
SendErrorToClient(client, IReqCode, X_GetDeviceButtonMapping, 0, SendErrorToClient(client, IReqCode, X_GetDeviceButtonMapping, 0,
BadMatch); BadMatch);
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, &b->map[1]);
(char *)&b->map[1]);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -135,12 +130,10 @@ ProcXGetDeviceButtonMapping (client) ...@@ -135,12 +130,10 @@ ProcXGetDeviceButtonMapping (client)
*/ */
void void
SRepXGetDeviceButtonMapping (client, size, rep) SRepXGetDeviceButtonMapping(ClientPtr client, int size,
ClientPtr client; xGetDeviceButtonMappingReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETBMAP_H #ifndef GETBMAP_H
#define GETBMAP_H 1 #define GETBMAP_H 1
int int SProcXGetDeviceButtonMapping(ClientPtr /* client */
SProcXGetDeviceButtonMapping(
ClientPtr /* client */
); );
int int ProcXGetDeviceButtonMapping(ClientPtr /* client */
ProcXGetDeviceButtonMapping (
ClientPtr /* client */
); );
void void SRepXGetDeviceButtonMapping(ClientPtr /* client */ ,
SRepXGetDeviceButtonMapping ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetDeviceButtonMappingReply * /* rep */ xGetDeviceButtonMappingReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getdctl.c
View file @ 05152b78
...@@ -74,15 +74,14 @@ SOFTWARE. ...@@ -74,15 +74,14 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceControl(client) SProcXGetDeviceControl(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -91,9 +90,8 @@ SProcXGetDeviceControl(client) ...@@ -91,9 +90,8 @@ SProcXGetDeviceControl(client)
*/ */
int int
ProcXGetDeviceControl(client) ProcXGetDeviceControl(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,11 +100,9 @@ ProcXGetDeviceControl(client) ...@@ -102,11 +100,9 @@ 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, BadDevice);
SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0,
BadDevice);
return Success; return Success;
} }
...@@ -115,49 +111,42 @@ ProcXGetDeviceControl(client) ...@@ -115,49 +111,42 @@ ProcXGetDeviceControl(client)
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
switch (stuff->control) switch (stuff->control) {
{
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:
SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0, SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadValue);
BadValue);
return Success; return Success;
} }
buf = (char *) malloc (total_length); buf = (char *)malloc(total_length);
if (!buf) if (!buf) {
{ SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadAlloc);
SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0,
BadAlloc);
return Success; return Success;
} }
savbuf=buf; savbuf = buf;
switch (stuff->control) switch (stuff->control) {
{
case DEVICE_RESOLUTION: case DEVICE_RESOLUTION:
CopySwapDeviceResolution(client, dev->valuator, buf, CopySwapDeviceResolution(client, dev->valuator, buf, total_length);
total_length);
break; break;
default: default:
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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -166,12 +155,9 @@ ProcXGetDeviceControl(client) ...@@ -166,12 +155,9 @@ ProcXGetDeviceControl(client)
*/ */
void void
CopySwapDeviceResolution (client, v, buf, length) CopySwapDeviceResolution(ClientPtr client, ValuatorClassPtr v, char *buf,
ClientPtr client; int length)
ValuatorClassPtr v; {
char *buf;
int length;
{
AxisInfoPtr a; AxisInfoPtr a;
xDeviceResolutionState *r; xDeviceResolutionState *r;
int i, *iptr; int i, *iptr;
...@@ -180,26 +166,24 @@ CopySwapDeviceResolution (client, v, buf, length) ...@@ -180,26 +166,24 @@ 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);
}
} }
} }
}
/*********************************************************************** /***********************************************************************
* *
...@@ -209,13 +193,9 @@ CopySwapDeviceResolution (client, v, buf, length) ...@@ -209,13 +193,9 @@ CopySwapDeviceResolution (client, v, buf, length)
*/ */
void void
SRepXGetDeviceControl (client, size, rep) SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep)
ClientPtr client; {
int size;
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 @ 05152b78
...@@ -30,28 +30,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,28 +30,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETDCTL_H #ifndef GETDCTL_H
#define GETDCTL_H 1 #define GETDCTL_H 1
int int SProcXGetDeviceControl(ClientPtr /* client */
SProcXGetDeviceControl (
ClientPtr /* client */
); );
int int ProcXGetDeviceControl(ClientPtr /* client */
ProcXGetDeviceControl (
ClientPtr /* client */
); );
void void CopySwapDeviceResolution(ClientPtr /* client */ ,
CopySwapDeviceResolution ( ValuatorClassPtr /* v */ ,
ClientPtr /* client */, char * /* buf */ ,
ValuatorClassPtr /* v */,
char * /* buf */,
int /* length */ int /* length */
); );
void void SRepXGetDeviceControl(ClientPtr /* client */ ,
SRepXGetDeviceControl ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetDeviceControlReply * /* rep */ xGetDeviceControlReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getfctl.h
View file @ 05152b78
...@@ -30,62 +30,44 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,62 +30,44 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETFCTL_H #ifndef GETFCTL_H
#define GETFCTL_H 1 #define GETFCTL_H 1
int int SProcXGetFeedbackControl(ClientPtr /* client */
SProcXGetFeedbackControl(
ClientPtr /* client */
); );
int int ProcXGetFeedbackControl(ClientPtr /* client */
ProcXGetFeedbackControl(
ClientPtr /* client */
); );
void void CopySwapKbdFeedback(ClientPtr /* client */ ,
CopySwapKbdFeedback ( KbdFeedbackPtr /* k */ ,
ClientPtr /* client */,
KbdFeedbackPtr /* k */,
char ** /* buf */ char ** /* buf */
); );
void void CopySwapPtrFeedback(ClientPtr /* client */ ,
CopySwapPtrFeedback ( PtrFeedbackPtr /* p */ ,
ClientPtr /* client */,
PtrFeedbackPtr /* p */,
char ** /* buf */ char ** /* buf */
); );
void void CopySwapIntegerFeedback(ClientPtr /* client */ ,
CopySwapIntegerFeedback ( IntegerFeedbackPtr /* i */ ,
ClientPtr /* client */,
IntegerFeedbackPtr /* i */,
char ** /* buf */ char ** /* buf */
); );
void void CopySwapStringFeedback(ClientPtr /* client */ ,
CopySwapStringFeedback ( StringFeedbackPtr /* s */ ,
ClientPtr /* client */,
StringFeedbackPtr /* s */,
char ** /* buf */ char ** /* buf */
); );
void void CopySwapLedFeedback(ClientPtr /* client */ ,
CopySwapLedFeedback ( LedFeedbackPtr /* l */ ,
ClientPtr /* client */,
LedFeedbackPtr /* l */,
char ** /* buf */ char ** /* buf */
); );
void void CopySwapBellFeedback(ClientPtr /* client */ ,
CopySwapBellFeedback ( BellFeedbackPtr /* b */ ,
ClientPtr /* client */,
BellFeedbackPtr /* b */,
char ** /* buf */ char ** /* buf */
); );
void void SRepXGetFeedbackControl(ClientPtr /* client */ ,
SRepXGetFeedbackControl ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetFeedbackControlReply * /* rep */ xGetFeedbackControlReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getfocus.c
View file @ 05152b78
...@@ -74,13 +74,12 @@ SOFTWARE. ...@@ -74,13 +74,12 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceFocus(client) SProcXGetDeviceFocus(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xGetDeviceFocusReq); REQUEST(xGetDeviceFocusReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXGetDeviceFocus(client)); return (ProcXGetDeviceFocus(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -89,9 +88,8 @@ SProcXGetDeviceFocus(client) ...@@ -89,9 +88,8 @@ SProcXGetDeviceFocus(client)
*/ */
int int
ProcXGetDeviceFocus(client) ProcXGetDeviceFocus(ClientPtr client)
ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
FocusClassPtr focus; FocusClassPtr focus;
xGetDeviceFocusReply rep; xGetDeviceFocusReply rep;
...@@ -99,9 +97,8 @@ ProcXGetDeviceFocus(client) ...@@ -99,9 +97,8 @@ 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);
return Success; return Success;
} }
...@@ -124,9 +121,9 @@ ProcXGetDeviceFocus(client) ...@@ -124,9 +121,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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -136,14 +133,11 @@ ProcXGetDeviceFocus(client) ...@@ -136,14 +133,11 @@ ProcXGetDeviceFocus(client)
*/ */
void void
SRepXGetDeviceFocus (client, size, rep) SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep)
ClientPtr client; {
int size;
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETFOCUS_H #ifndef GETFOCUS_H
#define GETFOCUS_H 1 #define GETFOCUS_H 1
int int SProcXGetDeviceFocus(ClientPtr /* client */
SProcXGetDeviceFocus(
ClientPtr /* client */
); );
int int ProcXGetDeviceFocus(ClientPtr /* client */
ProcXGetDeviceFocus(
ClientPtr /* client */
); );
void void SRepXGetDeviceFocus(ClientPtr /* client */ ,
SRepXGetDeviceFocus ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetDeviceFocusReply * /* rep */ xGetDeviceFocusReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getkmap.c
View file @ 05152b78
...@@ -75,13 +75,12 @@ SOFTWARE. ...@@ -75,13 +75,12 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceKeyMapping(client) SProcXGetDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xGetDeviceKeyMappingReq); REQUEST(xGetDeviceKeyMappingReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXGetDeviceKeyMapping(client)); return (ProcXGetDeviceKeyMapping(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -90,9 +89,8 @@ SProcXGetDeviceKeyMapping(client) ...@@ -90,9 +89,8 @@ SProcXGetDeviceKeyMapping(client)
*/ */
int int
ProcXGetDeviceKeyMapping(client) ProcXGetDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
xGetDeviceKeyMappingReply rep; xGetDeviceKeyMappingReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
KeySymsPtr k; KeySymsPtr k;
...@@ -100,36 +98,29 @@ ProcXGetDeviceKeyMapping(client) ...@@ -100,36 +98,29 @@ 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;
} }
if (dev->key == NULL) if (dev->key == NULL) {
{ SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0, BadMatch);
SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0,
BadMatch);
return Success; return Success;
} }
k = &dev->key->curKeySyms; k = &dev->key->curKeySyms;
if ((stuff->firstKeyCode < k->minKeyCode) || if ((stuff->firstKeyCode < k->minKeyCode) ||
(stuff->firstKeyCode > k->maxKeyCode)) (stuff->firstKeyCode > k->maxKeyCode)) {
{
client->errorValue = stuff->firstKeyCode; client->errorValue = stuff->firstKeyCode;
SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0, SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0, BadValue);
BadValue);
return Success; return Success;
} }
if (stuff->firstKeyCode + stuff->count > k->maxKeyCode + 1) if (stuff->firstKeyCode + stuff->count > k->maxKeyCode + 1) {
{
client->errorValue = stuff->count; client->errorValue = stuff->count;
SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0, SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0, BadValue);
BadValue);
return Success; return Success;
} }
...@@ -140,15 +131,14 @@ ProcXGetDeviceKeyMapping(client) ...@@ -140,15 +131,14 @@ 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),
&k->map[(stuff->firstKeyCode - k->minKeyCode) * &k->map[(stuff->firstKeyCode - k->minKeyCode) *
k->mapWidth]); k->mapWidth]);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -158,13 +148,10 @@ ProcXGetDeviceKeyMapping(client) ...@@ -158,13 +148,10 @@ ProcXGetDeviceKeyMapping(client)
*/ */
void void
SRepXGetDeviceKeyMapping (client, size, rep) SRepXGetDeviceKeyMapping(ClientPtr client, int size,
ClientPtr client; xGetDeviceKeyMappingReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETKMAP_H #ifndef GETKMAP_H
#define GETKMAP_H 1 #define GETKMAP_H 1
int int SProcXGetDeviceKeyMapping(ClientPtr /* client */
SProcXGetDeviceKeyMapping(
ClientPtr /* client */
); );
int int ProcXGetDeviceKeyMapping(ClientPtr /* client */
ProcXGetDeviceKeyMapping(
ClientPtr /* client */
); );
void void SRepXGetDeviceKeyMapping(ClientPtr /* client */ ,
SRepXGetDeviceKeyMapping ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetDeviceKeyMappingReply * /* rep */ xGetDeviceKeyMappingReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getmmap.c
View file @ 05152b78
...@@ -74,13 +74,12 @@ SOFTWARE. ...@@ -74,13 +74,12 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceModifierMapping(client) SProcXGetDeviceModifierMapping(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xGetDeviceModifierMappingReq); REQUEST(xGetDeviceModifierMappingReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXGetDeviceModifierMapping(client)); return (ProcXGetDeviceModifierMapping(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -89,9 +88,8 @@ SProcXGetDeviceModifierMapping(client) ...@@ -89,9 +88,8 @@ SProcXGetDeviceModifierMapping(client)
*/ */
int int
ProcXGetDeviceModifierMapping(client) ProcXGetDeviceModifierMapping(ClientPtr client)
ClientPtr client; {
{
CARD8 maxkeys; CARD8 maxkeys;
DeviceIntPtr dev; DeviceIntPtr dev;
xGetDeviceModifierMappingReply rep; xGetDeviceModifierMappingReply rep;
...@@ -100,18 +98,16 @@ ProcXGetDeviceModifierMapping(client) ...@@ -100,18 +98,16 @@ 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;
} }
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 +118,14 @@ ProcXGetDeviceModifierMapping(client) ...@@ -122,14 +118,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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -139,12 +135,10 @@ ProcXGetDeviceModifierMapping(client) ...@@ -139,12 +135,10 @@ ProcXGetDeviceModifierMapping(client)
*/ */
void void
SRepXGetDeviceModifierMapping (client, size, rep) SRepXGetDeviceModifierMapping(ClientPtr client, int size,
ClientPtr client; xGetDeviceModifierMappingReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETMMAP_H #ifndef GETMMAP_H
#define GETMMAP_H 1 #define GETMMAP_H 1
int int SProcXGetDeviceModifierMapping(ClientPtr /* client */
SProcXGetDeviceModifierMapping(
ClientPtr /* client */
); );
int int ProcXGetDeviceModifierMapping(ClientPtr /* client */
ProcXGetDeviceModifierMapping(
ClientPtr /* client */
); );
void void SRepXGetDeviceModifierMapping(ClientPtr /* client */ ,
SRepXGetDeviceModifierMapping ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetDeviceModifierMappingReply * /* rep */ xGetDeviceModifierMappingReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getprop.c
View file @ 05152b78
...@@ -78,15 +78,14 @@ extern int ExtEventIndex; ...@@ -78,15 +78,14 @@ extern int ExtEventIndex;
*/ */
int int
SProcXGetDeviceDontPropagateList(client) SProcXGetDeviceDontPropagateList(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -95,9 +94,8 @@ SProcXGetDeviceDontPropagateList(client) ...@@ -95,9 +94,8 @@ SProcXGetDeviceDontPropagateList(client)
*/ */
int int
ProcXGetDeviceDontPropagateList (client) ProcXGetDeviceDontPropagateList(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,44 +112,39 @@ ProcXGetDeviceDontPropagateList (client) ...@@ -114,44 +112,39 @@ 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;
SendErrorToClient(client, IReqCode, X_GetDeviceDontPropagateList, 0, SendErrorToClient(client, IReqCode, X_GetDeviceDontPropagateList, 0,
BadWindow); BadWindow);
return Success; return Success;
} }
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);
} }
} }
WriteReplyToClient (client, sizeof (xGetDeviceDontPropagateListReply), WriteReplyToClient(client, sizeof(xGetDeviceDontPropagateListReply), &rep);
&rep);
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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -161,23 +154,17 @@ ProcXGetDeviceDontPropagateList (client) ...@@ -161,23 +154,17 @@ ProcXGetDeviceDontPropagateList (client)
*/ */
XEventClass XEventClass
*ClassFromMask (buf, mask, maskndx, count, mode) * ClassFromMask(XEventClass * buf, Mask mask, int maskndx, CARD16 * count,
XEventClass *buf; int mode)
Mask mask; {
int maskndx; int i, j;
CARD16 *count;
int mode;
{
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)
(*count)++; (*count)++;
else else
...@@ -185,7 +172,7 @@ XEventClass ...@@ -185,7 +172,7 @@ XEventClass
} }
} }
return (buf); return (buf);
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -195,13 +182,11 @@ XEventClass ...@@ -195,13 +182,11 @@ XEventClass
*/ */
void void
SRepXGetDeviceDontPropagateList (client, size, rep) SRepXGetDeviceDontPropagateList(ClientPtr client, int size,
ClientPtr client; xGetDeviceDontPropagateListReply * rep)
int size; {
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 @ 05152b78
...@@ -30,29 +30,21 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,29 +30,21 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETPROP_H #ifndef GETPROP_H
#define GETPROP_H 1 #define GETPROP_H 1
int int SProcXGetDeviceDontPropagateList(ClientPtr /* client */
SProcXGetDeviceDontPropagateList(
ClientPtr /* client */
); );
int int ProcXGetDeviceDontPropagateList(ClientPtr /* client */
ProcXGetDeviceDontPropagateList (
ClientPtr /* client */
); );
XEventClass * XEventClass *ClassFromMask(XEventClass * /* buf */ ,
ClassFromMask ( Mask /* mask */ ,
XEventClass * /* buf */, int /* maskndx */ ,
Mask /* mask */, CARD16 * /* count */ ,
int /* maskndx */,
CARD16 * /* count */,
int /* mode */ int /* mode */
); );
void void SRepXGetDeviceDontPropagateList(ClientPtr /* client */ ,
SRepXGetDeviceDontPropagateList ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetDeviceDontPropagateListReply * /* rep */ xGetDeviceDontPropagateListReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getselev.c
View file @ 05152b78
...@@ -76,15 +76,14 @@ SOFTWARE. ...@@ -76,15 +76,14 @@ SOFTWARE.
*/ */
int int
SProcXGetSelectedExtensionEvents(client) SProcXGetSelectedExtensionEvents(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -94,9 +93,8 @@ SProcXGetSelectedExtensionEvents(client) ...@@ -94,9 +93,8 @@ SProcXGetSelectedExtensionEvents(client)
*/ */
int int
ProcXGetSelectedExtensionEvents(client) ProcXGetSelectedExtensionEvents(register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
int total_length = 0; int total_length = 0;
xGetSelectedExtensionEventsReply rep; xGetSelectedExtensionEventsReply rep;
...@@ -117,55 +115,53 @@ ProcXGetSelectedExtensionEvents(client) ...@@ -117,55 +115,53 @@ ProcXGetSelectedExtensionEvents(client)
rep.this_client_count = 0; rep.this_client_count = 0;
rep.all_clients_count = 0; rep.all_clients_count = 0;
if (!(pWin = LookupWindow(stuff->window, client))) if (!(pWin = LookupWindow(stuff->window, client))) {
{
SendErrorToClient(client, IReqCode, X_GetSelectedExtensionEvents, 0, SendErrorToClient(client, IReqCode, X_GetSelectedExtensionEvents, 0,
BadWindow); BadWindow);
return Success; return Success;
} }
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 (i=0; i<EMASKSIZE; i++) for (others = pOthers->inputClients; others; others = others->next)
aclient = ClassFromMask (aclient, others->mask[i], i, NULL, CREATE); for (i = 0; i < EMASKSIZE; i++)
aclient =
ClassFromMask(aclient, others->mask[i], i, NULL, CREATE);
} }
WriteReplyToClient (client, sizeof(xGetSelectedExtensionEventsReply), &rep); WriteReplyToClient(client, sizeof(xGetSelectedExtensionEventsReply), &rep);
if (total_length) 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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -175,14 +171,12 @@ ProcXGetSelectedExtensionEvents(client) ...@@ -175,14 +171,12 @@ ProcXGetSelectedExtensionEvents(client)
*/ */
void void
SRepXGetSelectedExtensionEvents (client, size, rep) SRepXGetSelectedExtensionEvents(ClientPtr client, int size,
ClientPtr client; xGetSelectedExtensionEventsReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETSELEV_H #ifndef GETSELEV_H
#define GETSELEV_H 1 #define GETSELEV_H 1
int int SProcXGetSelectedExtensionEvents(ClientPtr /* client */
SProcXGetSelectedExtensionEvents(
ClientPtr /* client */
); );
int int ProcXGetSelectedExtensionEvents(ClientPtr /* client */
ProcXGetSelectedExtensionEvents(
ClientPtr /* client */
); );
void void SRepXGetSelectedExtensionEvents(ClientPtr /* client */ ,
SRepXGetSelectedExtensionEvents ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetSelectedExtensionEventsReply * /* rep */ xGetSelectedExtensionEventsReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/getvers.c
View file @ 05152b78
...@@ -75,15 +75,14 @@ XExtensionVersion AllExtensionVersions[128]; ...@@ -75,15 +75,14 @@ XExtensionVersion AllExtensionVersions[128];
*/ */
int int
SProcXGetExtensionVersion(client) SProcXGetExtensionVersion(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -92,17 +91,15 @@ SProcXGetExtensionVersion(client) ...@@ -92,17 +91,15 @@ SProcXGetExtensionVersion(client)
*/ */
int int
ProcXGetExtensionVersion (client) ProcXGetExtensionVersion(register ClientPtr client)
register ClientPtr client; {
{
xGetExtensionVersionReply rep; xGetExtensionVersionReply rep;
REQUEST(xGetExtensionVersionReq); REQUEST(xGetExtensionVersionReq);
REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq); REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq);
if (stuff->length != (sizeof(xGetExtensionVersionReq) + if (stuff->length != (sizeof(xGetExtensionVersionReq) +
stuff->nbytes + 3)>>2) stuff->nbytes + 3) >> 2) {
{
SendErrorToClient(client, IReqCode, X_GetExtensionVersion, 0, SendErrorToClient(client, IReqCode, X_GetExtensionVersion, 0,
BadLength); BadLength);
return Success; return Success;
...@@ -117,17 +114,14 @@ ProcXGetExtensionVersion (client) ...@@ -117,17 +114,14 @@ ProcXGetExtensionVersion (client)
rep.minor_version = 0; rep.minor_version = 0;
rep.present = TRUE; rep.present = TRUE;
if (rep.present) if (rep.present) {
{ rep.major_version = AllExtensionVersions[IReqCode - 128].major_version;
rep.major_version = rep.minor_version = AllExtensionVersions[IReqCode - 128].minor_version;
AllExtensionVersions[IReqCode-128].major_version;
rep.minor_version =
AllExtensionVersions[IReqCode-128].minor_version;
} }
WriteReplyToClient (client, sizeof (xGetExtensionVersionReply), &rep); WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -137,14 +131,12 @@ ProcXGetExtensionVersion (client) ...@@ -137,14 +131,12 @@ ProcXGetExtensionVersion (client)
*/ */
void void
SRepXGetExtensionVersion (client, size, rep) SRepXGetExtensionVersion(ClientPtr client, int size,
ClientPtr client; xGetExtensionVersionReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETVERS_H #ifndef GETVERS_H
#define GETVERS_H 1 #define GETVERS_H 1
int int SProcXGetExtensionVersion(ClientPtr /* client */
SProcXGetExtensionVersion(
ClientPtr /* client */
); );
int int ProcXGetExtensionVersion(ClientPtr /* client */
ProcXGetExtensionVersion (
ClientPtr /* client */
); );
void void SRepXGetExtensionVersion(ClientPtr /* client */ ,
SRepXGetExtensionVersion ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetExtensionVersionReply * /* rep */ xGetExtensionVersionReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/grabdev.c
View file @ 05152b78
...@@ -51,7 +51,6 @@ SOFTWARE. ...@@ -51,7 +51,6 @@ SOFTWARE.
* *
*/ */
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #endif
...@@ -79,9 +78,8 @@ extern int ExtEventIndex; ...@@ -79,9 +78,8 @@ extern int ExtEventIndex;
*/ */
int int
SProcXGrabDevice(client) SProcXGrabDevice(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 +92,8 @@ SProcXGrabDevice(client) ...@@ -94,8 +92,8 @@ SProcXGrabDevice(client)
SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
return(ProcXGrabDevice(client)); return (ProcXGrabDevice(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -104,9 +102,8 @@ SProcXGrabDevice(client) ...@@ -104,9 +102,8 @@ SProcXGrabDevice(client)
*/ */
int int
ProcXGrabDevice(client) ProcXGrabDevice(ClientPtr client)
ClientPtr client; {
{
int error; int error;
xGrabDeviceReply rep; xGrabDeviceReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
...@@ -115,9 +112,8 @@ ProcXGrabDevice(client) ...@@ -115,9 +112,8 @@ ProcXGrabDevice(client)
REQUEST(xGrabDeviceReq); REQUEST(xGrabDeviceReq);
REQUEST_AT_LEAST_SIZE(xGrabDeviceReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceReq);
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,30 +122,29 @@ ProcXGrabDevice(client) ...@@ -126,30 +122,29 @@ 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->time, tmp[stuff->deviceid].mask, &rep.status); stuff->ownerEvents, stuff->time,
tmp[stuff->deviceid].mask, &rep.status);
if (error != Success) if (error != Success) {
{
SendErrorToClient(client, IReqCode, X_GrabDevice, 0, error); SendErrorToClient(client, IReqCode, X_GrabDevice, 0, error);
return Success; return Success;
} }
WriteReplyToClient(client, sizeof(xGrabDeviceReply), &rep); WriteReplyToClient(client, sizeof(xGrabDeviceReply), &rep);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -158,49 +153,39 @@ ProcXGrabDevice(client) ...@@ -158,49 +153,39 @@ ProcXGrabDevice(client)
*/ */
int int
CreateMaskFromList (client, list, count, mask, dev, req) CreateMaskFromList(ClientPtr client, XEventClass * list, int count,
ClientPtr client; struct tmask *mask, DeviceIntPtr dev, int req)
XEventClass *list; {
int count; int i, j;
struct tmask mask[];
DeviceIntPtr dev;
int req;
{
int i,j;
int device; int device;
DeviceIntPtr tdev; DeviceIntPtr tdev;
for (i=0; i<EMASKSIZE; i++) for (i = 0; i < EMASKSIZE; i++) {
{
mask[i].mask = 0; mask[i].mask = 0;
mask[i].dev = NULL; mask[i].dev = NULL;
} }
for (i=0; i<count; i++, list++) for (i = 0; i < count; i++, list++) {
{
device = *list >> 8; device = *list >> 8;
if (device > 255) if (device > 255) {
{
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;
mask[device].dev = (Pointer) tdev; mask[device].dev = (Pointer) tdev;
break; break;
} }
} }
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -210,12 +195,9 @@ CreateMaskFromList (client, list, count, mask, dev, req) ...@@ -210,12 +195,9 @@ CreateMaskFromList (client, list, count, mask, dev, req)
*/ */
void void
SRepXGrabDevice (client, size, rep) SRepXGrabDevice(ClientPtr client, int size, xGrabDeviceReply * rep)
ClientPtr client; {
int size;
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 @ 05152b78
...@@ -30,30 +30,22 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,30 +30,22 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GRABDEV_H #ifndef GRABDEV_H
#define GRABDEV_H 1 #define GRABDEV_H 1
int int SProcXGrabDevice(ClientPtr /* client */
SProcXGrabDevice(
ClientPtr /* client */
); );
int int ProcXGrabDevice(ClientPtr /* client */
ProcXGrabDevice(
ClientPtr /* client */
); );
int int CreateMaskFromList(ClientPtr /* client */ ,
CreateMaskFromList ( XEventClass * /* list */ ,
ClientPtr /* client */, int /* count */ ,
XEventClass * /* list */, struct tmask /* mask */ [],
int /* count */, DeviceIntPtr /* dev */ ,
struct tmask /* mask */[],
DeviceIntPtr /* dev */,
int /* req */ int /* req */
); );
void void SRepXGrabDevice(ClientPtr /* client */ ,
SRepXGrabDevice ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGrabDeviceReply * /* rep */ xGrabDeviceReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/grabdevb.c
View file @ 05152b78
...@@ -76,9 +76,8 @@ SOFTWARE. ...@@ -76,9 +76,8 @@ SOFTWARE.
*/ */
int int
SProcXGrabDeviceButton(client) SProcXGrabDeviceButton(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 +88,8 @@ SProcXGrabDeviceButton(client) ...@@ -89,8 +88,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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -99,9 +98,8 @@ SProcXGrabDeviceButton(client) ...@@ -99,9 +98,8 @@ SProcXGrabDeviceButton(client)
*/ */
int int
ProcXGrabDeviceButton(client) ProcXGrabDeviceButton(ClientPtr client)
ClientPtr client; {
{
int ret; int ret;
DeviceIntPtr dev; DeviceIntPtr dev;
DeviceIntPtr mdev; DeviceIntPtr mdev;
...@@ -111,49 +109,44 @@ ProcXGrabDeviceButton(client) ...@@ -111,49 +109,44 @@ ProcXGrabDeviceButton(client)
REQUEST(xGrabDeviceButtonReq); REQUEST(xGrabDeviceButtonReq);
REQUEST_AT_LEAST_SIZE(xGrabDeviceButtonReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceButtonReq);
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, BadDevice);
SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0,
BadDevice);
return Success; return Success;
} }
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,
BadDevice); BadDevice);
return Success; return Success;
} }
if (mdev->key == NULL) if (mdev->key == NULL) {
{
SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0,
BadMatch); BadMatch);
return Success; return Success;
} }
} } else
else
mdev = (DeviceIntPtr) LookupKeyboardDevice(); mdev = (DeviceIntPtr) LookupKeyboardDevice();
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,
stuff->other_devices_mode, stuff->modifiers, mdev, stuff->button, stuff->other_devices_mode, stuff->modifiers, mdev,
stuff->grabWindow, stuff->ownerEvents, (Cursor)0, (Window)0, stuff->button, stuff->grabWindow, stuff->ownerEvents,
tmp[stuff->grabbed_device].mask); (Cursor) 0, (Window) 0, tmp[stuff->grabbed_device].mask);
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/grabdevb.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GRABDEVB_H #ifndef GRABDEVB_H
#define GRABDEVB_H 1 #define GRABDEVB_H 1
int int SProcXGrabDeviceButton(ClientPtr /* client */
SProcXGrabDeviceButton(
ClientPtr /* client */
); );
int int ProcXGrabDeviceButton(ClientPtr /* client */
ProcXGrabDeviceButton(
ClientPtr /* client */
); );
#endif /* GRABDEVB_H */ #endif /* GRABDEVB_H */
nx-X11/programs/Xserver/Xi/grabdevk.c
View file @ 05152b78
...@@ -76,9 +76,8 @@ SOFTWARE. ...@@ -76,9 +76,8 @@ SOFTWARE.
*/ */
int int
SProcXGrabDeviceKey(client) SProcXGrabDeviceKey(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 +86,8 @@ SProcXGrabDeviceKey(client) ...@@ -87,8 +86,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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -97,9 +96,8 @@ SProcXGrabDeviceKey(client) ...@@ -97,9 +96,8 @@ SProcXGrabDeviceKey(client)
*/ */
int int
ProcXGrabDeviceKey(client) ProcXGrabDeviceKey(ClientPtr client)
ClientPtr client; {
{
int ret; int ret;
DeviceIntPtr dev; DeviceIntPtr dev;
DeviceIntPtr mdev; DeviceIntPtr mdev;
...@@ -109,54 +107,46 @@ ProcXGrabDeviceKey(client) ...@@ -109,54 +107,46 @@ ProcXGrabDeviceKey(client)
REQUEST(xGrabDeviceKeyReq); REQUEST(xGrabDeviceKeyReq);
REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq);
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, BadDevice);
SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0,
BadDevice);
return Success; return Success;
} }
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, BadDevice);
{
SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0,
BadDevice);
return Success; return Success;
} }
if (mdev->key == NULL) if (mdev->key == NULL) {
{ SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadMatch);
SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0,
BadMatch);
return Success; return Success;
} }
} } else
else
mdev = (DeviceIntPtr) LookupKeyboardDevice(); mdev = (DeviceIntPtr) LookupKeyboardDevice();
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;
ret = GrabKey(client, dev, stuff->this_device_mode, ret = GrabKey(client, dev, stuff->this_device_mode,
stuff->other_devices_mode, stuff->modifiers, mdev, stuff->key, stuff->other_devices_mode, stuff->modifiers, mdev,
stuff->grabWindow, stuff->ownerEvents, tmp[stuff->grabbed_device].mask); stuff->key, stuff->grabWindow, stuff->ownerEvents,
tmp[stuff->grabbed_device].mask);
if (ret != Success) if (ret != Success) {
{
SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, ret); SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, ret);
return Success; return Success;
} }
return Success; return Success;
} }
nx-X11/programs/Xserver/Xi/grabdevk.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GRABDEVK_H #ifndef GRABDEVK_H
#define GRABDEVK_H 1 #define GRABDEVK_H 1
int int SProcXGrabDeviceKey(ClientPtr /* client */
SProcXGrabDeviceKey(
ClientPtr /* client */
); );
int int ProcXGrabDeviceKey(ClientPtr /* client */
ProcXGrabDeviceKey(
ClientPtr /* client */
); );
#endif /* GRABDEVK_H */ #endif /* GRABDEVK_H */
nx-X11/programs/Xserver/Xi/gtmotion.c
View file @ 05152b78
...@@ -74,16 +74,15 @@ SOFTWARE. ...@@ -74,16 +74,15 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceMotionEvents(client) SProcXGetDeviceMotionEvents(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));
} }
/**************************************************************************** /****************************************************************************
* *
...@@ -92,8 +91,7 @@ register ClientPtr client; ...@@ -92,8 +91,7 @@ register ClientPtr client;
*/ */
int int
ProcXGetDeviceMotionEvents(client) ProcXGetDeviceMotionEvents(ClientPtr client)
ClientPtr client;
{ {
INT32 *coords = NULL, *bufptr; INT32 *coords = NULL, *bufptr;
xGetDeviceMotionEventsReply rep; xGetDeviceMotionEventsReply rep;
...@@ -108,16 +106,14 @@ ProcXGetDeviceMotionEvents(client) ...@@ -108,16 +106,14 @@ 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,
BadDevice); BadDevice);
return Success; return Success;
} }
v = dev->valuator; v = dev->valuator;
if (v==NULL || v->numAxes == 0) if (v == NULL || v->numAxes == 0) {
{
SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0,
BadMatch); BadMatch);
return Success; return Success;
...@@ -135,17 +131,15 @@ ProcXGetDeviceMotionEvents(client) ...@@ -135,17 +131,15 @@ ProcXGetDeviceMotionEvents(client)
start = ClientTimeToServerTime(stuff->start); start = ClientTimeToServerTime(stuff->start);
stop = ClientTimeToServerTime(stuff->stop); stop = ClientTimeToServerTime(stuff->stop);
if (CompareTimeStamps(start, stop) == LATER || if (CompareTimeStamps(start, stop) == LATER ||
CompareTimeStamps(start, currentTime) == LATER) CompareTimeStamps(start, currentTime) == LATER) {
{
WriteReplyToClient(client, sizeof(xGetDeviceMotionEventsReply), &rep); WriteReplyToClient(client, sizeof(xGetDeviceMotionEventsReply), &rep);
return Success; return Success;
} }
if (CompareTimeStamps(stop, currentTime) == LATER) if (CompareTimeStamps(stop, currentTime) == LATER)
stop = currentTime; stop = currentTime;
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)
...@@ -154,24 +148,20 @@ ProcXGetDeviceMotionEvents(client) ...@@ -154,24 +148,20 @@ ProcXGetDeviceMotionEvents(client)
BadAlloc); BadAlloc);
return Success; return Success;
} }
rep.nEvents = (v->GetMotionProc) ( rep.nEvents = (v->GetMotionProc) (dev, (xTimecoord *) coords, /* XXX */
dev, (xTimecoord *)coords, /* XXX */ start.milliseconds, stop.milliseconds,
start.milliseconds, stop.milliseconds, (ScreenPtr)NULL); (ScreenPtr) NULL);
} }
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;
WriteReplyToClient(client, sizeof(xGetDeviceMotionEventsReply), &rep); WriteReplyToClient(client, sizeof(xGetDeviceMotionEventsReply), &rep);
if (nEvents) if (nEvents) {
{ if (client->swapped) {
if (client->swapped)
{
bufptr = coords; bufptr = coords;
for (i=0; i<nEvents * (axes+1); i++) for (i = 0; i < nEvents * (axes + 1); i++) {
{
swapl(bufptr); swapl(bufptr);
bufptr++; bufptr++;
} }
...@@ -191,13 +181,11 @@ ProcXGetDeviceMotionEvents(client) ...@@ -191,13 +181,11 @@ ProcXGetDeviceMotionEvents(client)
*/ */
void void
SRepXGetDeviceMotionEvents (client, size, rep) SRepXGetDeviceMotionEvents(ClientPtr client, int size,
ClientPtr client; xGetDeviceMotionEventsReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GTMOTION_H #ifndef GTMOTION_H
#define GTMOTION_H 1 #define GTMOTION_H 1
int int SProcXGetDeviceMotionEvents(ClientPtr /* client */
SProcXGetDeviceMotionEvents(
ClientPtr /* client */
); );
int int ProcXGetDeviceMotionEvents(ClientPtr /* client */
ProcXGetDeviceMotionEvents(
ClientPtr /* client */
); );
void void SRepXGetDeviceMotionEvents(ClientPtr /* client */ ,
SRepXGetDeviceMotionEvents ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xGetDeviceMotionEventsReply * /* rep */ xGetDeviceMotionEventsReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/listdev.c
View file @ 05152b78
...@@ -76,13 +76,12 @@ SOFTWARE. ...@@ -76,13 +76,12 @@ SOFTWARE.
*/ */
int int
SProcXListInputDevices(client) SProcXListInputDevices(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xListInputDevicesReq); REQUEST(xListInputDevicesReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXListInputDevices(client)); return (ProcXListInputDevices(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -91,9 +90,8 @@ SProcXListInputDevices(client) ...@@ -91,9 +90,8 @@ SProcXListInputDevices(client)
*/ */
int int
ProcXListInputDevices (client) ProcXListInputDevices(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 +112,33 @@ ProcXListInputDevices (client) ...@@ -114,33 +112,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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -150,27 +148,23 @@ ProcXListInputDevices (client) ...@@ -150,27 +148,23 @@ ProcXListInputDevices (client)
*/ */
void void
SizeDeviceInfo (d, namesize, size) SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size)
DeviceIntPtr d; {
int *namesize;
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));
} }
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -179,31 +173,24 @@ SizeDeviceInfo (d, namesize, size) ...@@ -179,31 +173,24 @@ SizeDeviceInfo (d, namesize, size)
*/ */
void void
ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) ListDeviceInfo(ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev,
ClientPtr client; char **devbuf, char **classbuf, char **namebuf)
DeviceIntPtr d; {
xDeviceInfoPtr dev; CopyDeviceName(namebuf, d->name);
char **devbuf; CopySwapDevice(client, d, 0, devbuf);
char **classbuf; if (d->key != NULL) {
char **namebuf;
{
CopyDeviceName (namebuf, d->name);
CopySwapDevice (client, d, 0, devbuf);
if (d->key != NULL)
{
CopySwapKeyClass(client, d->key, classbuf); CopySwapKeyClass(client, d->key, classbuf);
dev->num_classes++; dev->num_classes++;
} }
if (d->button != NULL) if (d->button != NULL) {
{
CopySwapButtonClass(client, d->button, classbuf); CopySwapButtonClass(client, d->button, classbuf);
dev->num_classes++; dev->num_classes++;
} }
if (d->valuator != NULL) if (d->valuator != NULL) {
{ dev->num_classes +=
dev->num_classes += CopySwapValuatorClass(client, d->valuator, classbuf); CopySwapValuatorClass(client, d->valuator, classbuf);
}
} }
}
/*********************************************************************** /***********************************************************************
* *
...@@ -216,24 +203,19 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) ...@@ -216,24 +203,19 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
*/ */
void void
CopyDeviceName (namebuf, name) CopyDeviceName(char **namebuf, char *name)
char **namebuf; {
char *name; char *nameptr = (char *)*namebuf;
{
char *nameptr = (char *) *namebuf; if (name) {
*nameptr++ = strlen(name);
if (name) strcpy(nameptr, name);
{ *namebuf += (strlen(name) + 1);
*nameptr++ = strlen (name); } else {
strcpy (nameptr, name);
*namebuf += (strlen (name)+1);
}
else
{
*nameptr++ = 0; *nameptr++ = 0;
*namebuf += 1; *namebuf += 1;
} }
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -242,15 +224,12 @@ CopyDeviceName (namebuf, name) ...@@ -242,15 +224,12 @@ CopyDeviceName (namebuf, name)
*/ */
void void
CopySwapDevice (client, d, num_classes, buf) CopySwapDevice(register ClientPtr client, DeviceIntPtr d, int num_classes,
register ClientPtr client; char **buf)
DeviceIntPtr d; {
int num_classes;
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;
...@@ -261,12 +240,11 @@ CopySwapDevice (client, d, num_classes, buf) ...@@ -261,12 +240,11 @@ CopySwapDevice (client, d, num_classes, buf)
dev->use = IsXPointer; dev->use = IsXPointer;
else else
dev->use = IsXExtensionDevice; dev->use = IsXExtensionDevice;
if (client->swapped) if (client->swapped) {
{
swapl(&dev->type); /* macro - braces are required */ swapl(&dev->type); /* macro - braces are required */
} }
*buf += sizeof (xDeviceInfo); *buf += sizeof(xDeviceInfo);
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -275,25 +253,21 @@ CopySwapDevice (client, d, num_classes, buf) ...@@ -275,25 +253,21 @@ CopySwapDevice (client, d, num_classes, buf)
*/ */
void void
CopySwapKeyClass (client, k, buf) CopySwapKeyClass(register ClientPtr client, KeyClassPtr k, char **buf)
register ClientPtr client; {
KeyClassPtr k;
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;
if (client->swapped) if (client->swapped) {
{
swaps(&k2->num_keys); swaps(&k2->num_keys);
} }
*buf += sizeof (xKeyInfo); *buf += sizeof(xKeyInfo);
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -302,23 +276,19 @@ CopySwapKeyClass (client, k, buf) ...@@ -302,23 +276,19 @@ CopySwapKeyClass (client, k, buf)
*/ */
void void
CopySwapButtonClass (client, b, buf) CopySwapButtonClass(register ClientPtr client, ButtonClassPtr b, char **buf)
register ClientPtr client; {
ButtonClassPtr b;
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);
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -333,34 +303,31 @@ CopySwapButtonClass (client, b, buf) ...@@ -333,34 +303,31 @@ CopySwapButtonClass (client, b, buf)
*/ */
int int
CopySwapValuatorClass (client, v, buf) CopySwapValuatorClass(register ClientPtr client, ValuatorClassPtr v, char **buf)
register ClientPtr client;
ValuatorClassPtr v;
char **buf;
{ {
int i, j, axes, t_axes; int i, j, axes, t_axes;
xValuatorInfoPtr v2; xValuatorInfoPtr v2;
AxisInfo *a; AxisInfo *a;
xAxisInfoPtr a2; xAxisInfoPtr a2;
for (i=0,axes=v->numAxes; i < ((v->numAxes+19)/VPC); i++, axes-=VPC) { for (i = 0, axes = v->numAxes; i < ((v->numAxes + 19) / VPC);
i++, axes -= VPC) {
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;
if (client->swapped) if (client->swapped) {
{
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 +338,7 @@ CopySwapValuatorClass (client, v, buf) ...@@ -371,7 +338,7 @@ CopySwapValuatorClass (client, v, buf)
} }
a2++; a2++;
a++; a++;
*buf += sizeof (xAxisInfo); *buf += sizeof(xAxisInfo);
} }
} }
return (i); return (i);
...@@ -385,12 +352,9 @@ CopySwapValuatorClass (client, v, buf) ...@@ -385,12 +352,9 @@ CopySwapValuatorClass (client, v, buf)
*/ */
void void
SRepXListInputDevices (client, size, rep) SRepXListInputDevices(ClientPtr client, int size, xListInputDevicesReply * rep)
ClientPtr client; {
int size;
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 @ 05152b78
...@@ -30,72 +30,52 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,72 +30,52 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef LISTDEV_H #ifndef LISTDEV_H
#define LISTDEV_H 1 #define LISTDEV_H 1
int int SProcXListInputDevices(ClientPtr /* client */
SProcXListInputDevices(
ClientPtr /* client */
); );
int int ProcXListInputDevices(ClientPtr /* client */
ProcXListInputDevices (
ClientPtr /* client */
); );
void void SizeDeviceInfo(DeviceIntPtr /* d */ ,
SizeDeviceInfo ( int * /* namesize */ ,
DeviceIntPtr /* d */,
int * /* namesize */,
int * /* size */ int * /* size */
); );
void void ListDeviceInfo(ClientPtr /* client */ ,
ListDeviceInfo ( DeviceIntPtr /* d */ ,
ClientPtr /* client */, xDeviceInfoPtr /* dev */ ,
DeviceIntPtr /* d */, char ** /* devbuf */ ,
xDeviceInfoPtr /* dev */, char ** /* classbuf */ ,
char ** /* devbuf */,
char ** /* classbuf */,
char ** /* namebuf */ char ** /* namebuf */
); );
void void CopyDeviceName(char ** /* namebuf */ ,
CopyDeviceName (
char ** /* namebuf */,
char * /* name */ char * /* name */
); );
void void CopySwapDevice(ClientPtr /* client */ ,
CopySwapDevice ( DeviceIntPtr /* d */ ,
ClientPtr /* client */, int /* num_classes */ ,
DeviceIntPtr /* d */,
int /* num_classes */,
char ** /* buf */ char ** /* buf */
); );
void void CopySwapKeyClass(ClientPtr /* client */ ,
CopySwapKeyClass ( KeyClassPtr /* k */ ,
ClientPtr /* client */,
KeyClassPtr /* k */,
char ** /* buf */ char ** /* buf */
); );
void void CopySwapButtonClass(ClientPtr /* client */ ,
CopySwapButtonClass ( ButtonClassPtr /* b */ ,
ClientPtr /* client */,
ButtonClassPtr /* b */,
char ** /* buf */ char ** /* buf */
); );
int int CopySwapValuatorClass(ClientPtr /* client */ ,
CopySwapValuatorClass ( ValuatorClassPtr /* v */ ,
ClientPtr /* client */,
ValuatorClassPtr /* v */,
char ** /* buf */ char ** /* buf */
); );
void void SRepXListInputDevices(ClientPtr /* client */ ,
SRepXListInputDevices ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xListInputDevicesReply * /* rep */ xListInputDevicesReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/opendev.c
View file @ 05152b78
...@@ -68,7 +68,7 @@ SOFTWARE. ...@@ -68,7 +68,7 @@ SOFTWARE.
#include "opendev.h" #include "opendev.h"
extern CARD8 event_base []; extern CARD8 event_base[];
/*********************************************************************** /***********************************************************************
* *
...@@ -78,13 +78,12 @@ extern CARD8 event_base []; ...@@ -78,13 +78,12 @@ extern CARD8 event_base [];
*/ */
int int
SProcXOpenDevice(client) SProcXOpenDevice(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xOpenDeviceReq); REQUEST(xOpenDeviceReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXOpenDevice(client)); return (ProcXOpenDevice(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -93,12 +92,11 @@ SProcXOpenDevice(client) ...@@ -93,12 +92,11 @@ SProcXOpenDevice(client)
*/ */
int int
ProcXOpenDevice(client) ProcXOpenDevice(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;
...@@ -107,28 +105,24 @@ ProcXOpenDevice(client) ...@@ -107,28 +105,24 @@ ProcXOpenDevice(client)
REQUEST_SIZE_MATCH(xOpenDeviceReq); REQUEST_SIZE_MATCH(xOpenDeviceReq);
if (stuff->deviceid == inputInfo.pointer->id || if (stuff->deviceid == inputInfo.pointer->id ||
stuff->deviceid == inputInfo.keyboard->id) stuff->deviceid == inputInfo.keyboard->id) {
{
SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice);
return Success; return Success;
} }
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) {
{
SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice);
return Success; return Success;
} }
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);
return Success; return Success;
} }
...@@ -139,45 +133,39 @@ ProcXOpenDevice(client) ...@@ -139,45 +133,39 @@ ProcXOpenDevice(client)
rep.repType = X_Reply; rep.repType = X_Reply;
rep.RepType = X_OpenDevice; rep.RepType = X_OpenDevice;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
if (dev->key != NULL) if (dev->key != NULL) {
{
evbase[j].class = KeyClass; evbase[j].class = KeyClass;
evbase[j++].event_type_base = event_base[KeyClass]; evbase[j++].event_type_base = event_base[KeyClass];
} }
if (dev->button != NULL) if (dev->button != NULL) {
{
evbase[j].class = ButtonClass; evbase[j].class = ButtonClass;
evbase[j++].event_type_base = event_base[ButtonClass]; evbase[j++].event_type_base = event_base[ButtonClass];
} }
if (dev->valuator != NULL) if (dev->valuator != NULL) {
{
evbase[j].class = ValuatorClass; evbase[j].class = ValuatorClass;
evbase[j++].event_type_base = event_base[ValuatorClass]; evbase[j++].event_type_base = event_base[ValuatorClass];
} }
if (dev->kbdfeed != NULL || dev->ptrfeed != NULL || dev->leds != NULL || if (dev->kbdfeed != NULL || dev->ptrfeed != NULL || dev->leds != NULL ||
dev->intfeed != NULL || dev->bell != NULL || dev->stringfeed != NULL) dev->intfeed != NULL || dev->bell != NULL || dev->stringfeed != NULL) {
{
evbase[j].class = FeedbackClass; evbase[j].class = FeedbackClass;
evbase[j++].event_type_base = event_base[FeedbackClass]; evbase[j++].event_type_base = event_base[FeedbackClass];
} }
if (dev->focus != NULL) if (dev->focus != NULL) {
{
evbase[j].class = FocusClass; evbase[j].class = FocusClass;
evbase[j++].event_type_base = event_base[FocusClass]; evbase[j++].event_type_base = event_base[FocusClass];
} }
if (dev->proximity != NULL) if (dev->proximity != NULL) {
{
evbase[j].class = ProximityClass; evbase[j].class = ProximityClass;
evbase[j++].event_type_base = event_base[ProximityClass]; evbase[j++].event_type_base = event_base[ProximityClass];
} }
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);
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -187,12 +175,9 @@ ProcXOpenDevice(client) ...@@ -187,12 +175,9 @@ ProcXOpenDevice(client)
*/ */
void void
SRepXOpenDevice (client, size, rep) SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep)
ClientPtr client; {
int size;
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef OPENDEV_H #ifndef OPENDEV_H
#define OPENDEV_H 1 #define OPENDEV_H 1
int int SProcXOpenDevice(ClientPtr /* client */
SProcXOpenDevice(
ClientPtr /* client */
); );
int int ProcXOpenDevice(ClientPtr /* client */
ProcXOpenDevice(
ClientPtr /* client */
); );
void void SRepXOpenDevice(ClientPtr /* client */ ,
SRepXOpenDevice ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xOpenDeviceReply * /* rep */ xOpenDeviceReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/queryst.c
View file @ 05152b78
...@@ -56,13 +56,12 @@ from The Open Group. ...@@ -56,13 +56,12 @@ from The Open Group.
*/ */
int int
SProcXQueryDeviceState(client) SProcXQueryDeviceState(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xQueryDeviceStateReq); REQUEST(xQueryDeviceStateReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXQueryDeviceState(client)); return (ProcXQueryDeviceState(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -71,9 +70,8 @@ SProcXQueryDeviceState(client) ...@@ -71,9 +70,8 @@ SProcXQueryDeviceState(client)
*/ */
int int
ProcXQueryDeviceState(client) ProcXQueryDeviceState(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,11 +94,9 @@ ProcXQueryDeviceState(client) ...@@ -96,11 +94,9 @@ 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, BadDevice);
SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0,
BadDevice);
return Success; return Success;
} }
...@@ -109,70 +105,59 @@ ProcXQueryDeviceState(client) ...@@ -109,70 +105,59 @@ ProcXQueryDeviceState(client)
MaybeStopDeviceHint(dev, client); MaybeStopDeviceHint(dev, 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++;
} }
if (v != NULL) if (v != NULL) {
{ total_length += (sizeof(xValuatorState) + (v->numAxes * sizeof(int)));
total_length += (sizeof(xValuatorState) +
(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, BadAlloc);
SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0,
BadAlloc);
return Success; return Success;
} }
savbuf = buf; savbuf = buf;
if (k != NULL) if (k != NULL) {
{
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 +165,12 @@ ProcXQueryDeviceState(client) ...@@ -180,12 +165,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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -195,12 +180,9 @@ ProcXQueryDeviceState(client) ...@@ -195,12 +180,9 @@ ProcXQueryDeviceState(client)
*/ */
void void
SRepXQueryDeviceState (client, size, rep) SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep)
ClientPtr client; {
int size;
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef QUERYST_H #ifndef QUERYST_H
#define QUERYST_H 1 #define QUERYST_H 1
int int SProcXQueryDeviceState(ClientPtr /* client */
SProcXQueryDeviceState(
ClientPtr /* client */
); );
int int ProcXQueryDeviceState(ClientPtr /* client */
ProcXQueryDeviceState(
ClientPtr /* client */
); );
void void SRepXQueryDeviceState(ClientPtr /* client */ ,
SRepXQueryDeviceState ( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xQueryDeviceStateReply * /* rep */ xQueryDeviceStateReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/selectev.c
View file @ 05152b78
...@@ -51,6 +51,7 @@ SOFTWARE. ...@@ -51,6 +51,7 @@ SOFTWARE.
* *
*/ */
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h> #include <dix-config.h>
#endif #endif
...@@ -79,9 +80,8 @@ extern Mask ExtValidMasks[]; ...@@ -79,9 +80,8 @@ extern Mask ExtValidMasks[];
*/ */
int int
SProcXSelectExtensionEvent (client) SProcXSelectExtensionEvent(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -101,9 +101,8 @@ register ClientPtr client; ...@@ -101,9 +101,8 @@ register ClientPtr client;
*/ */
int int
ProcXSelectExtensionEvent (client) ProcXSelectExtensionEvent(register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
int i; int i;
WindowPtr pWin; WindowPtr pWin;
...@@ -112,32 +111,31 @@ ProcXSelectExtensionEvent (client) ...@@ -112,32 +111,31 @@ ProcXSelectExtensionEvent (client)
REQUEST(xSelectExtensionEventReq); REQUEST(xSelectExtensionEventReq);
REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
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;
SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0,
BadWindow); BadWindow);
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 =
if ((ret = SelectForWindow((DeviceIntPtr)tmp[i].dev, pWin, client, tmp[i].mask, SelectForWindow((DeviceIntPtr) tmp[i].dev, pWin, client,
ExtExclusiveMasks[i], ExtValidMasks[i])) != Success) tmp[i].mask, ExtExclusiveMasks[i],
{ ExtValidMasks[i])) != Success) {
SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0,
ret); ret);
return Success; return Success;
...@@ -145,4 +143,4 @@ ProcXSelectExtensionEvent (client) ...@@ -145,4 +143,4 @@ ProcXSelectExtensionEvent (client)
} }
return Success; return Success;
} }
nx-X11/programs/Xserver/Xi/selectev.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SELECTEV_H #ifndef SELECTEV_H
#define SELECTEV_H 1 #define SELECTEV_H 1
int int SProcXSelectExtensionEvent(ClientPtr /* client */
SProcXSelectExtensionEvent (
ClientPtr /* client */
); );
int int ProcXSelectExtensionEvent(ClientPtr /* client */
ProcXSelectExtensionEvent (
ClientPtr /* client */
); );
#endif /* SELECTEV_H */ #endif /* SELECTEV_H */
nx-X11/programs/Xserver/Xi/sendexev.c
View file @ 05152b78
...@@ -79,9 +79,8 @@ extern int lastEvent; /* Defined in extension.c */ ...@@ -79,9 +79,8 @@ extern int lastEvent; /* Defined in extension.c */
*/ */
int int
SProcXSendExtensionEvent(client) SProcXSendExtensionEvent(register ClientPtr client)
register ClientPtr client; {
{
CARD32 *p; CARD32 *p;
register int i; register int i;
xEvent eventT; xEvent eventT;
...@@ -98,20 +97,19 @@ SProcXSendExtensionEvent(client) ...@@ -98,20 +97,19 @@ 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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -121,9 +119,8 @@ SProcXSendExtensionEvent(client) ...@@ -121,9 +119,8 @@ SProcXSendExtensionEvent(client)
*/ */
int int
ProcXSendExtensionEvent (client) ProcXSendExtensionEvent(register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
DeviceIntPtr dev; DeviceIntPtr dev;
xEvent *first; xEvent *first;
...@@ -133,19 +130,15 @@ ProcXSendExtensionEvent (client) ...@@ -133,19 +130,15 @@ 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, BadLength);
SendErrorToClient (client, IReqCode, X_SendExtensionEvent, 0,
BadLength);
return Success; return Success;
} }
dev = LookupDeviceIntRec (stuff->deviceid); dev = LookupDeviceIntRec(stuff->deviceid);
if (dev == NULL) if (dev == NULL) {
{ SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadDevice);
SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0,
BadDevice);
return Success; return Success;
} }
...@@ -160,27 +153,25 @@ ProcXSendExtensionEvent (client) ...@@ -160,27 +153,25 @@ 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;
SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadValue);
BadValue);
return Success; return Success;
} }
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],
stuff->num_events)); tmp[stuff->deviceid].mask, stuff->num_events));
if (ret != Success) if (ret != Success)
SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret); SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret);
return Success; return Success;
} }
nx-X11/programs/Xserver/Xi/sendexev.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SENDEXEV_H #ifndef SENDEXEV_H
#define SENDEXEV_H 1 #define SENDEXEV_H 1
int int SProcXSendExtensionEvent(ClientPtr /* client */
SProcXSendExtensionEvent(
ClientPtr /* client */
); );
int int ProcXSendExtensionEvent(ClientPtr /* client */
ProcXSendExtensionEvent(
ClientPtr /* client */
); );
#endif /* SENDEXEV_H */ #endif /* SENDEXEV_H */
nx-X11/programs/Xserver/Xi/setbmap.c
View file @ 05152b78
...@@ -77,13 +77,12 @@ SOFTWARE. ...@@ -77,13 +77,12 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceButtonMapping(client) SProcXSetDeviceButtonMapping(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xSetDeviceButtonMappingReq); REQUEST(xSetDeviceButtonMappingReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXSetDeviceButtonMapping(client)); return (ProcXSetDeviceButtonMapping(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -92,9 +91,8 @@ SProcXSetDeviceButtonMapping(client) ...@@ -92,9 +91,8 @@ SProcXSetDeviceButtonMapping(client)
*/ */
int int
ProcXSetDeviceButtonMapping (client) ProcXSetDeviceButtonMapping(register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
xSetDeviceButtonMappingReply rep; xSetDeviceButtonMappingReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
...@@ -103,8 +101,7 @@ ProcXSetDeviceButtonMapping (client) ...@@ -103,8 +101,7 @@ ProcXSetDeviceButtonMapping (client)
REQUEST_AT_LEAST_SIZE(xSetDeviceButtonMappingReq); REQUEST_AT_LEAST_SIZE(xSetDeviceButtonMappingReq);
if (stuff->length != (sizeof(xSetDeviceButtonMappingReq) + if (stuff->length != (sizeof(xSetDeviceButtonMappingReq) +
stuff->map_length + 3)>>2) stuff->map_length + 3) >> 2) {
{
SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0,
BadLength); BadLength);
return Success; return Success;
...@@ -116,24 +113,19 @@ ProcXSetDeviceButtonMapping (client) ...@@ -116,24 +113,19 @@ 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,
BadDevice); BadDevice);
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) {
{ SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, ret);
SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0,
ret);
return Success; return Success;
} } else {
else
{
rep.status = ret; rep.status = ret;
WriteReplyToClient(client, sizeof(xSetDeviceButtonMappingReply), &rep); WriteReplyToClient(client, sizeof(xSetDeviceButtonMappingReply), &rep);
} }
...@@ -141,7 +133,7 @@ ProcXSetDeviceButtonMapping (client) ...@@ -141,7 +133,7 @@ ProcXSetDeviceButtonMapping (client)
if (ret != MappingBusy) if (ret != MappingBusy)
SendDeviceMappingNotify(MappingPointer, 0, 0, dev); SendDeviceMappingNotify(MappingPointer, 0, 0, dev);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -151,12 +143,10 @@ ProcXSetDeviceButtonMapping (client) ...@@ -151,12 +143,10 @@ ProcXSetDeviceButtonMapping (client)
*/ */
void void
SRepXSetDeviceButtonMapping (client, size, rep) SRepXSetDeviceButtonMapping(ClientPtr client, int size,
ClientPtr client; xSetDeviceButtonMappingReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETBMAP_H #ifndef SETBMAP_H
#define SETBMAP_H 1 #define SETBMAP_H 1
int int SProcXSetDeviceButtonMapping(ClientPtr /* client */
SProcXSetDeviceButtonMapping(
ClientPtr /* client */
); );
int int ProcXSetDeviceButtonMapping(ClientPtr /* client */
ProcXSetDeviceButtonMapping(
ClientPtr /* client */
); );
void void SRepXSetDeviceButtonMapping(ClientPtr /* client */ ,
SRepXSetDeviceButtonMapping( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xSetDeviceButtonMappingReply * /* rep */ xSetDeviceButtonMappingReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/setdval.c
View file @ 05152b78
...@@ -74,13 +74,12 @@ SOFTWARE. ...@@ -74,13 +74,12 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceValuators(client) SProcXSetDeviceValuators(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xSetDeviceValuatorsReq); REQUEST(xSetDeviceValuatorsReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXSetDeviceValuators(client)); return (ProcXSetDeviceValuators(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -89,9 +88,8 @@ SProcXSetDeviceValuators(client) ...@@ -89,9 +88,8 @@ SProcXSetDeviceValuators(client)
*/ */
int int
ProcXSetDeviceValuators(client) ProcXSetDeviceValuators(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
xSetDeviceValuatorsReply rep; xSetDeviceValuatorsReply rep;
...@@ -104,48 +102,41 @@ ProcXSetDeviceValuators(client) ...@@ -104,48 +102,41 @@ 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, BadLength);
SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0,
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, BadDevice);
SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0,
BadDevice);
return Success; return Success;
} }
if (dev->valuator == NULL) if (dev->valuator == NULL) {
{ SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadMatch);
SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0,
BadMatch);
return Success; return Success;
} }
if (stuff->first_valuator + stuff->num_valuators > dev->valuator->numAxes) if (stuff->first_valuator + stuff->num_valuators > dev->valuator->numAxes) {
{ SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadValue);
SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0,
BadValue);
return Success; return Success;
} }
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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -155,12 +146,10 @@ ProcXSetDeviceValuators(client) ...@@ -155,12 +146,10 @@ ProcXSetDeviceValuators(client)
*/ */
void void
SRepXSetDeviceValuators (client, size, rep) SRepXSetDeviceValuators(ClientPtr client, int size,
ClientPtr client; xSetDeviceValuatorsReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETDVAL_H #ifndef SETDVAL_H
#define SETDVAL_H 1 #define SETDVAL_H 1
int int SProcXSetDeviceValuators(ClientPtr /* client */
SProcXSetDeviceValuators(
ClientPtr /* client */
); );
int int ProcXSetDeviceValuators(ClientPtr /* client */
ProcXSetDeviceValuators(
ClientPtr /* client */
); );
void void SRepXSetDeviceValuators(ClientPtr /* client */ ,
SRepXSetDeviceValuators( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xSetDeviceValuatorsReply * /* rep */ xSetDeviceValuatorsReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/setfocus.c
View file @ 05152b78
...@@ -77,16 +77,15 @@ SOFTWARE. ...@@ -77,16 +77,15 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceFocus(client) SProcXSetDeviceFocus(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));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -95,26 +94,24 @@ SProcXSetDeviceFocus(client) ...@@ -95,26 +94,24 @@ SProcXSetDeviceFocus(client)
*/ */
int int
ProcXSetDeviceFocus(client) ProcXSetDeviceFocus(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/setfocus.h
View file @ 05152b78
...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETFOCUS_H #ifndef SETFOCUS_H
#define SETFOCUS_H 1 #define SETFOCUS_H 1
int int SProcXSetDeviceFocus(ClientPtr /* client */
SProcXSetDeviceFocus(
ClientPtr /* client */
); );
int int ProcXSetDeviceFocus(ClientPtr /* client */
ProcXSetDeviceFocus(
ClientPtr /* client */
); );
#endif /* SETFOCUS_H */ #endif /* SETFOCUS_H */
nx-X11/programs/Xserver/Xi/setmmap.c
View file @ 05152b78
...@@ -75,13 +75,12 @@ SOFTWARE. ...@@ -75,13 +75,12 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceModifierMapping(client) SProcXSetDeviceModifierMapping(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xSetDeviceModifierMappingReq); REQUEST(xSetDeviceModifierMappingReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXSetDeviceModifierMapping(client)); return (ProcXSetDeviceModifierMapping(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -90,9 +89,8 @@ SProcXSetDeviceModifierMapping(client) ...@@ -90,9 +89,8 @@ SProcXSetDeviceModifierMapping(client)
*/ */
int int
ProcXSetDeviceModifierMapping(client) ProcXSetDeviceModifierMapping(ClientPtr client)
ClientPtr client; {
{
int ret; int ret;
xSetDeviceModifierMappingReply rep; xSetDeviceModifierMappingReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
...@@ -101,10 +99,9 @@ ProcXSetDeviceModifierMapping(client) ...@@ -101,10 +99,9 @@ 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;
} }
...@@ -115,26 +112,24 @@ ProcXSetDeviceModifierMapping(client) ...@@ -115,26 +112,24 @@ ProcXSetDeviceModifierMapping(client)
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
ret = SetModifierMapping(client, dev, stuff->length, ret = SetModifierMapping(client, dev, stuff->length,
(sizeof (xSetDeviceModifierMappingReq)>>2), stuff->numKeyPerModifier, (sizeof(xSetDeviceModifierMappingReq) >> 2),
(BYTE *)&stuff[1], &kp); stuff->numKeyPerModifier, (BYTE *) & stuff[1],
&kp);
if (ret==MappingSuccess || ret==MappingBusy || ret==MappingFailed) if (ret == MappingSuccess || ret == MappingBusy || ret == MappingFailed) {
{
rep.success = ret; rep.success = ret;
if (ret == MappingSuccess) if (ret == MappingSuccess)
SendDeviceMappingNotify(MappingModifier, 0, 0, dev); SendDeviceMappingNotify(MappingModifier, 0, 0, dev);
WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply),&rep); WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply),
} &rep);
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;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -144,13 +139,10 @@ ProcXSetDeviceModifierMapping(client) ...@@ -144,13 +139,10 @@ ProcXSetDeviceModifierMapping(client)
*/ */
void void
SRepXSetDeviceModifierMapping (client, size, rep) SRepXSetDeviceModifierMapping(ClientPtr client, int size,
ClientPtr client; xSetDeviceModifierMappingReply * rep)
int size; {
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETMMAP_H #ifndef SETMMAP_H
#define SETMMAP_H 1 #define SETMMAP_H 1
int int SProcXSetDeviceModifierMapping(ClientPtr /* client */
SProcXSetDeviceModifierMapping(
ClientPtr /* client */
); );
int int ProcXSetDeviceModifierMapping(ClientPtr /* client */
ProcXSetDeviceModifierMapping(
ClientPtr /* client */
); );
void void SRepXSetDeviceModifierMapping(ClientPtr /* client */ ,
SRepXSetDeviceModifierMapping( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xSetDeviceModifierMappingReply * /* rep */ xSetDeviceModifierMappingReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/setmode.c
View file @ 05152b78
...@@ -74,13 +74,12 @@ SOFTWARE. ...@@ -74,13 +74,12 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceMode(client) SProcXSetDeviceMode(register ClientPtr client)
register ClientPtr client; {
{
REQUEST(xSetDeviceModeReq); REQUEST(xSetDeviceModeReq);
swaps(&stuff->length); swaps(&stuff->length);
return(ProcXSetDeviceMode(client)); return (ProcXSetDeviceMode(client));
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -89,9 +88,8 @@ SProcXSetDeviceMode(client) ...@@ -89,9 +88,8 @@ SProcXSetDeviceMode(client)
*/ */
int int
ProcXSetDeviceMode(client) ProcXSetDeviceMode(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
xSetDeviceModeReply rep; xSetDeviceModeReply rep;
...@@ -103,33 +101,30 @@ ProcXSetDeviceMode(client) ...@@ -103,33 +101,30 @@ 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) {
{
SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, BadMatch); SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, BadMatch);
return Success; return Success;
} }
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;
else if (rep.status != AlreadyGrabbed) else if (rep.status != AlreadyGrabbed) {
{
SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, rep.status); SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, rep.status);
return Success; return Success;
} }
WriteReplyToClient (client, sizeof (xSetDeviceModeReply), &rep); WriteReplyToClient(client, sizeof(xSetDeviceModeReply), &rep);
return Success; return Success;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -139,12 +134,9 @@ ProcXSetDeviceMode(client) ...@@ -139,12 +134,9 @@ ProcXSetDeviceMode(client)
*/ */
void void
SRepXSetDeviceMode (client, size, rep) SRepXSetDeviceMode(ClientPtr client, int size, xSetDeviceModeReply * rep)
ClientPtr client; {
int size;
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 @ 05152b78
...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -30,20 +30,14 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETMODE_H #ifndef SETMODE_H
#define SETMODE_H 1 #define SETMODE_H 1
int int SProcXSetDeviceMode(ClientPtr /* client */
SProcXSetDeviceMode(
ClientPtr /* client */
); );
int int ProcXSetDeviceMode(ClientPtr /* client */
ProcXSetDeviceMode(
ClientPtr /* client */
); );
void void SRepXSetDeviceMode(ClientPtr /* client */ ,
SRepXSetDeviceMode( int /* size */ ,
ClientPtr /* client */,
int /* size */,
xSetDeviceModeReply * /* rep */ xSetDeviceModeReply * /* rep */
); );
......
nx-X11/programs/Xserver/Xi/stubs.c
View file @ 05152b78
...@@ -91,16 +91,13 @@ SOFTWARE. ...@@ -91,16 +91,13 @@ SOFTWARE.
*/ */
int int
ChangeKeyboardDevice (old_dev, new_dev) ChangeKeyboardDevice(DeviceIntPtr old_dev, DeviceIntPtr new_dev)
DeviceIntPtr old_dev; {
DeviceIntPtr new_dev;
{
/*********************************************************************** /***********************************************************************
DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c * DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c *
**********************************************************************/ **********************************************************************/
return BadMatch; return BadMatch;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -133,12 +130,9 @@ ChangeKeyboardDevice (old_dev, new_dev) ...@@ -133,12 +130,9 @@ ChangeKeyboardDevice (old_dev, new_dev)
*/ */
int int
ChangePointerDevice ( ChangePointerDevice(DeviceIntPtr old_dev,
DeviceIntPtr old_dev, DeviceIntPtr new_dev, unsigned char x, unsigned char y)
DeviceIntPtr new_dev, {
unsigned char x,
unsigned char y)
{
/*********************************************************************** /***********************************************************************
InitFocusClassDeviceStruct(old_dev); * allow focusing old ptr* InitFocusClassDeviceStruct(old_dev); * allow focusing old ptr*
...@@ -150,7 +144,7 @@ ChangePointerDevice ( ...@@ -150,7 +144,7 @@ ChangePointerDevice (
axes_changed = FALSE; axes_changed = FALSE;
*************************************************************************/ *************************************************************************/
return BadMatch; return BadMatch;
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -166,11 +160,9 @@ ChangePointerDevice ( ...@@ -166,11 +160,9 @@ ChangePointerDevice (
*/ */
void void
CloseInputDevice (d, client) CloseInputDevice(DeviceIntPtr d, ClientPtr client)
DeviceIntPtr d; {
ClientPtr client; }
{
}
/*********************************************************************** /***********************************************************************
* *
...@@ -199,8 +191,8 @@ CloseInputDevice (d, client) ...@@ -199,8 +191,8 @@ CloseInputDevice (d, client)
*/ */
void void
AddOtherInputDevices () AddOtherInputDevices(void)
{ {
/********************************************************************** /**********************************************************************
for each uninitialized device, do something like: for each uninitialized device, do something like:
...@@ -214,7 +206,7 @@ AddOtherInputDevices () ...@@ -214,7 +206,7 @@ AddOtherInputDevices ()
dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success); dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success);
************************************************************************/ ************************************************************************/
} }
/*********************************************************************** /***********************************************************************
* *
...@@ -239,12 +231,9 @@ AddOtherInputDevices () ...@@ -239,12 +231,9 @@ AddOtherInputDevices ()
*/ */
void void
OpenInputDevice (dev, client, status) OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status)
DeviceIntPtr dev; {
ClientPtr client; }
int *status;
{
}
/**************************************************************************** /****************************************************************************
* *
...@@ -259,13 +248,10 @@ OpenInputDevice (dev, client, status) ...@@ -259,13 +248,10 @@ OpenInputDevice (dev, client, status)
*/ */
int int
SetDeviceMode (client, dev, mode) SetDeviceMode(register ClientPtr client, DeviceIntPtr dev, int mode)
register ClientPtr client; {
DeviceIntPtr dev;
int mode;
{
return BadMatch; return BadMatch;
} }
/**************************************************************************** /****************************************************************************
* *
...@@ -280,15 +266,11 @@ SetDeviceMode (client, dev, mode) ...@@ -280,15 +266,11 @@ SetDeviceMode (client, dev, mode)
*/ */
int int
SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators) SetDeviceValuators(register ClientPtr client, DeviceIntPtr dev,
register ClientPtr client; int *valuators, int first_valuator, int num_valuators)
DeviceIntPtr dev; {
int *valuators;
int first_valuator;
int num_valuators;
{
return BadMatch; return BadMatch;
} }
/**************************************************************************** /****************************************************************************
* *
...@@ -299,16 +281,13 @@ SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators) ...@@ -299,16 +281,13 @@ SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators)
*/ */
int int
ChangeDeviceControl (client, dev, control) ChangeDeviceControl(register ClientPtr client, DeviceIntPtr dev,
register ClientPtr client; xDeviceCtl * control)
DeviceIntPtr dev; {
xDeviceCtl *control; switch (control->control) {
{
switch (control->control)
{
case DEVICE_RESOLUTION: case DEVICE_RESOLUTION:
return (BadMatch); return (BadMatch);
default: default:
return (BadMatch); return (BadMatch);
} }
} }
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