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/opendev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/opendev.c') diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index 1b0a2476b..fc4110d82 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.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 #include "XIstubs.h" -#include "windowstr.h" /* window structure */ +#include "windowstr.h" /* window structure */ #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "opendev.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/opendev.c | 56 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/opendev.c') diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index fc4110d82..7e237b205 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.c @@ -68,7 +68,7 @@ SOFTWARE. #include "opendev.h" -extern CARD8 event_base []; +extern CARD8 event_base[]; /*********************************************************************** * @@ -80,11 +80,11 @@ extern CARD8 event_base []; int SProcXOpenDevice(client) register ClientPtr client; - { +{ REQUEST(xOpenDeviceReq); swaps(&stuff->length); - return(ProcXOpenDevice(client)); - } + return (ProcXOpenDevice(client)); +} /*********************************************************************** * @@ -95,43 +95,43 @@ SProcXOpenDevice(client) int ProcXOpenDevice(client) register ClientPtr client; - { - xInputClassInfo evbase [numInputClasses]; +{ + xInputClassInfo evbase[numInputClasses]; Bool enableit = FALSE; - int j=0; + int j = 0; int status = Success; - xOpenDeviceReply rep; + xOpenDeviceReply rep; DeviceIntPtr dev; REQUEST(xOpenDeviceReq); REQUEST_SIZE_MATCH(xOpenDeviceReq); - if (stuff->deviceid == inputInfo.pointer->id || + if (stuff->deviceid == inputInfo.pointer->id || stuff->deviceid == inputInfo.keyboard->id) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); - return Success; - } + return Success; + } if ((dev = LookupDeviceIntRec(stuff->deviceid)) == NULL) /* not open */ { - for (dev=inputInfo.off_devices; dev; dev=dev->next) + for (dev = inputInfo.off_devices; dev; dev = dev->next) if (dev->id == stuff->deviceid) break; if (dev == NULL) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); return Success; - } - enableit = TRUE; } + enableit = TRUE; + } - OpenInputDevice (dev, client, &status); + OpenInputDevice(dev, client, &status); if (status != Success) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, status); return Success; - } + } if (enableit && dev->inited && dev->startup) (void)EnableDevice(dev); @@ -143,41 +143,41 @@ ProcXOpenDevice(client) { evbase[j].class = KeyClass; evbase[j++].event_type_base = event_base[KeyClass]; - } + } if (dev->button != NULL) { evbase[j].class = ButtonClass; evbase[j++].event_type_base = event_base[ButtonClass]; - } + } if (dev->valuator != NULL) { evbase[j].class = ValuatorClass; evbase[j++].event_type_base = event_base[ValuatorClass]; - } + } if (dev->kbdfeed != NULL || dev->ptrfeed != NULL || dev->leds != NULL || dev->intfeed != NULL || dev->bell != NULL || dev->stringfeed != NULL) { evbase[j].class = FeedbackClass; evbase[j++].event_type_base = event_base[FeedbackClass]; - } + } if (dev->focus != NULL) { evbase[j].class = FocusClass; evbase[j++].event_type_base = event_base[FocusClass]; - } + } if (dev->proximity != NULL) { evbase[j].class = ProximityClass; evbase[j++].event_type_base = event_base[ProximityClass]; - } + } evbase[j].class = OtherClass; evbase[j++].event_type_base = event_base[OtherClass]; - rep.length = (j * sizeof (xInputClassInfo) + 3) >> 2; + rep.length = (j * sizeof(xInputClassInfo) + 3) >> 2; rep.num_classes = j; - WriteReplyToClient (client, sizeof (xOpenDeviceReply), &rep); - WriteToClient(client, j * sizeof (xInputClassInfo), evbase); + WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep); + WriteToClient(client, j * sizeof(xInputClassInfo), evbase); return (Success); - } +} /*********************************************************************** * @@ -191,8 +191,8 @@ SRepXOpenDevice (client, size, rep) ClientPtr client; int size; xOpenDeviceReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} -- 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/opendev.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/opendev.c') diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index 7e237b205..52bd03620 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.c @@ -78,8 +78,7 @@ extern CARD8 event_base[]; */ int -SProcXOpenDevice(client) - register ClientPtr client; +SProcXOpenDevice(register ClientPtr client) { REQUEST(xOpenDeviceReq); swaps(&stuff->length); @@ -93,8 +92,7 @@ SProcXOpenDevice(client) */ int -ProcXOpenDevice(client) - register ClientPtr client; +ProcXOpenDevice(register ClientPtr client) { xInputClassInfo evbase[numInputClasses]; Bool enableit = FALSE; @@ -187,10 +185,7 @@ ProcXOpenDevice(client) */ void -SRepXOpenDevice (client, size, rep) - ClientPtr client; - int size; - xOpenDeviceReply *rep; +SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); -- 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/opendev.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/opendev.c') diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index 52bd03620..975ed5169 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.c @@ -105,19 +105,16 @@ ProcXOpenDevice(register ClientPtr client) REQUEST_SIZE_MATCH(xOpenDeviceReq); if (stuff->deviceid == inputInfo.pointer->id || - stuff->deviceid == inputInfo.keyboard->id) - { + stuff->deviceid == inputInfo.keyboard->id) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); 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) if (dev->id == stuff->deviceid) break; - if (dev == NULL) - { + if (dev == NULL) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); return Success; } @@ -125,8 +122,7 @@ ProcXOpenDevice(register ClientPtr client) } OpenInputDevice(dev, client, &status); - if (status != Success) - { + if (status != Success) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, status); return Success; } @@ -137,34 +133,28 @@ ProcXOpenDevice(register ClientPtr client) rep.repType = X_Reply; rep.RepType = X_OpenDevice; rep.sequenceNumber = client->sequence; - if (dev->key != NULL) - { + if (dev->key != NULL) { evbase[j].class = KeyClass; evbase[j++].event_type_base = event_base[KeyClass]; } - if (dev->button != NULL) - { + if (dev->button != NULL) { evbase[j].class = ButtonClass; evbase[j++].event_type_base = event_base[ButtonClass]; } - if (dev->valuator != NULL) - { + if (dev->valuator != NULL) { evbase[j].class = ValuatorClass; evbase[j++].event_type_base = event_base[ValuatorClass]; } 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++].event_type_base = event_base[FeedbackClass]; } - if (dev->focus != NULL) - { + if (dev->focus != NULL) { evbase[j].class = FocusClass; evbase[j++].event_type_base = event_base[FocusClass]; } - if (dev->proximity != NULL) - { + if (dev->proximity != NULL) { evbase[j].class = ProximityClass; evbase[j++].event_type_base = event_base[ProximityClass]; } -- cgit v1.2.3 From 8e188629fde213f29cfaf62c4ea3abd0520a0f41 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 21:41:19 +0100 Subject: Xi: small formatting changes to match Xorg 7.1's Xi --- nx-X11/programs/Xserver/Xi/opendev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/Xi/opendev.c') diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index 975ed5169..5927546de 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.c @@ -163,7 +163,7 @@ ProcXOpenDevice(register ClientPtr client) rep.length = (j * sizeof(xInputClassInfo) + 3) >> 2; rep.num_classes = j; WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep); - WriteToClient(client, j * sizeof(xInputClassInfo), evbase); + WriteToClient(client, j * sizeof (xInputClassInfo), evbase); return (Success); } -- cgit v1.2.3