diff options
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/chgdctl.c')
-rw-r--r-- | nx-X11/programs/Xserver/Xi/chgdctl.c | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c index 9f45ddcc8..566df5906 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.c +++ b/nx-X11/programs/Xserver/Xi/chgdctl.c @@ -107,8 +107,7 @@ ProcXChangeDeviceControl(ClientPtr client) len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2); dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) - { + if (dev == NULL) { SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadDevice); return Success; @@ -119,70 +118,55 @@ ProcXChangeDeviceControl(ClientPtr client) rep.length = 0; rep.sequenceNumber = client->sequence; - switch (stuff->control) - { + switch (stuff->control) { case DEVICE_RESOLUTION: r = (xDeviceResolutionCtl *) & stuff[1]; if ((len < (sizeof(xDeviceResolutionCtl) >> 2)) || - (len != (sizeof(xDeviceResolutionCtl)>>2) + - r->num_valuators)) - { + (len != (sizeof(xDeviceResolutionCtl) >> 2) + r->num_valuators)) { SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadLength); return Success; } - if (!dev->valuator) - { + if (!dev->valuator) { SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadMatch); return Success; } - if ((dev->grab) && !SameClient(dev->grab, client)) - { + if ((dev->grab) && !SameClient(dev->grab, client)) { rep.status = AlreadyGrabbed; - WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), - &rep); + WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); return Success; } 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, BadValue); return Success; } status = ChangeDeviceControl(client, dev, (xDeviceCtl *) r); - if (status == Success) - { + if (status == Success) { a = &dev->valuator->axes[r->first_valuator]; for (i = 0; i < r->num_valuators; i++) if (*(resolution + i) < (a + i)->min_resolution || - *(resolution+i) > (a+i)->max_resolution) - { + *(resolution + i) > (a + i)->max_resolution) { SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadValue); return Success; } for (i = 0; i < r->num_valuators; i++) (a++)->resolution = *resolution++; - } - else if (status == DeviceBusy) - { + } else if (status == DeviceBusy) { rep.status = DeviceBusy; - WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), - &rep); + WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); return Success; - } - else - { + } else { SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadMatch); return Success; } break; default: - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadValue); + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadValue); return Success; } WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); |