From 5bfafee5087bcbc37b7f8db246b20d7a4bba5731 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Feb 2018 23:44:10 +0100 Subject: Xi: Adapt include sections to match Xorg 7.1 --- nx-X11/programs/Xserver/Xi/chgdctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/chgdctl.c') diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c index b07885f9c..eec63c7dc 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.c +++ b/nx-X11/programs/Xserver/Xi/chgdctl.c @@ -55,15 +55,15 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ +#include /* for inputstr.h */ +#include /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ #include -#include /* control constants */ +#include /* control constants */ #include "XIstubs.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "chgdctl.h" -- cgit v1.2.3 From 41a0ba729fb67efdc5f7bd50f73f145cf5d8a153 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 11 Feb 2018 22:01:11 +0100 Subject: Xi: reformat code, ansify --- nx-X11/programs/Xserver/Xi/chgdctl.c | 102 +++++++++++++++++------------------ 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/chgdctl.c') diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c index eec63c7dc..c60570ae7 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.c +++ b/nx-X11/programs/Xserver/Xi/chgdctl.c @@ -78,13 +78,13 @@ SOFTWARE. int SProcXChangeDeviceControl(client) register ClientPtr client; - { +{ REQUEST(xChangeDeviceControlReq); swaps(&stuff->length); REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl)); swaps(&stuff->control); - return(ProcXChangeDeviceControl(client)); - } + return (ProcXChangeDeviceControl(client)); +} /*********************************************************************** * @@ -95,7 +95,7 @@ SProcXChangeDeviceControl(client) int ProcXChangeDeviceControl(client) ClientPtr client; - { +{ unsigned len; int i, status; DeviceIntPtr dev; @@ -107,14 +107,14 @@ ProcXChangeDeviceControl(client) REQUEST(xChangeDeviceControlReq); REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl)); - len = stuff->length - (sizeof(xChangeDeviceControlReq) >>2); - dev = LookupDeviceIntRec (stuff->deviceid); + len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2); + dev = LookupDeviceIntRec(stuff->deviceid); if (dev == NULL) { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadDevice); + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, + BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_ChangeDeviceControl; @@ -123,73 +123,73 @@ ProcXChangeDeviceControl(client) switch (stuff->control) { - case DEVICE_RESOLUTION: - r = (xDeviceResolutionCtl *) &stuff[1]; - if ((len < (sizeof(xDeviceResolutionCtl)>>2)) || + case DEVICE_RESOLUTION: + r = (xDeviceResolutionCtl *) & stuff[1]; + if ((len < (sizeof(xDeviceResolutionCtl) >> 2)) || (len != (sizeof(xDeviceResolutionCtl)>>2) + r->num_valuators)) { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, - 0, BadLength); - return Success; - } + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, + 0, BadLength); + return Success; + } if (!dev->valuator) { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadMatch); - return Success; - } + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, + BadMatch); + return Success; + } if ((dev->grab) && !SameClient(dev->grab, client)) { - rep.status = AlreadyGrabbed; + rep.status = AlreadyGrabbed; WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); - return Success; - } - resolution = (CARD32 *) (r + 1); + return Success; + } + resolution = (CARD32 *) (r + 1); 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); + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, + BadValue); + return Success; + } + status = ChangeDeviceControl(client, dev, (xDeviceCtl *) r); if (status == Success) { - a = &dev->valuator->axes[r->first_valuator]; - for (i=0; inum_valuators; i++) - if (*(resolution+i) < (a+i)->min_resolution || + 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) { - SendErrorToClient (client, IReqCode, - X_ChangeDeviceControl, 0, BadValue); - return Success; - } - for (i=0; inum_valuators; i++) - (a++)->resolution = *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) { - rep.status = DeviceBusy; + rep.status = DeviceBusy; WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); - return Success; + return Success; } 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, + BadMatch); return Success; } + break; + default: + SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, + BadValue); + return Success; + } WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); return Success; - } +} /*********************************************************************** * @@ -203,9 +203,9 @@ SRepXChangeDeviceControl (client, size, rep) ClientPtr client; int size; xChangeDeviceControlReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} -- cgit v1.2.3 From 7aca428ffe10b2cffca8fe01962aef421a5a5645 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 15:14:14 +0100 Subject: Xi: ansify function prototypes --- nx-X11/programs/Xserver/Xi/chgdctl.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/chgdctl.c') diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c index c60570ae7..9f45ddcc8 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.c +++ b/nx-X11/programs/Xserver/Xi/chgdctl.c @@ -76,8 +76,7 @@ SOFTWARE. */ int -SProcXChangeDeviceControl(client) - register ClientPtr client; +SProcXChangeDeviceControl(register ClientPtr client) { REQUEST(xChangeDeviceControlReq); swaps(&stuff->length); @@ -93,8 +92,7 @@ SProcXChangeDeviceControl(client) */ int -ProcXChangeDeviceControl(client) - ClientPtr client; +ProcXChangeDeviceControl(ClientPtr client) { unsigned len; int i, status; @@ -199,13 +197,10 @@ ProcXChangeDeviceControl(client) */ void -SRepXChangeDeviceControl (client, size, rep) - ClientPtr client; - int size; - xChangeDeviceControlReply *rep; +SRepXChangeDeviceControl(ClientPtr client, int size, + xChangeDeviceControlReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); } - -- cgit v1.2.3 From b0abdf7bd8284b1edf39c13e1863ecc420fd68e4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 21:25:27 +0100 Subject: Xi: reformat --- nx-X11/programs/Xserver/Xi/chgdctl.c | 42 +++++++++++------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/chgdctl.c') 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); -- cgit v1.2.3