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/listdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/listdev.c') diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index 95896d49d..7601abec6 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.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 "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ -#include "exglobals.h" /* FIXME */ +#include "extinit.h" /* LookupDeviceIntRec */ +#include "exglobals.h" /* FIXME */ #include "listdev.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/listdev.c | 166 +++++++++++++++++------------------ 1 file changed, 83 insertions(+), 83 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/listdev.c') diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index 7601abec6..76bfa3564 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -67,7 +67,7 @@ SOFTWARE. #include "listdev.h" -#define VPC 20 /* Max # valuators per chunk */ +#define VPC 20 /* Max # valuators per chunk */ /*********************************************************************** * @@ -78,11 +78,11 @@ SOFTWARE. int SProcXListInputDevices(client) register ClientPtr client; - { +{ REQUEST(xListInputDevicesReq); swaps(&stuff->length); - return(ProcXListInputDevices(client)); - } + return (ProcXListInputDevices(client)); +} /*********************************************************************** * @@ -93,18 +93,18 @@ SProcXListInputDevices(client) int ProcXListInputDevices (client) register ClientPtr client; - { - xListInputDevicesReply rep; - int numdevs; - int namesize = 1; /* need 1 extra byte for strcpy */ - int size = 0; - int total_length; - char *devbuf; - char *classbuf; - char *namebuf; - char *savbuf; - xDeviceInfo *dev; - DeviceIntPtr d; +{ + xListInputDevicesReply rep; + int numdevs; + int namesize = 1; /* need 1 extra byte for strcpy */ + int size = 0; + int total_length; + char *devbuf; + char *classbuf; + char *namebuf; + char *savbuf; + xDeviceInfo *dev; + DeviceIntPtr d; REQUEST_SIZE_MATCH(xListInputDevicesReq); @@ -114,33 +114,33 @@ ProcXListInputDevices (client) rep.length = 0; rep.sequenceNumber = client->sequence; - AddOtherInputDevices (); + AddOtherInputDevices(); numdevs = inputInfo.numDevices; - for (d=inputInfo.devices; d; d=d->next) - SizeDeviceInfo (d, &namesize, &size); - for (d=inputInfo.off_devices; d; d=d->next) - SizeDeviceInfo (d, &namesize, &size); + for (d = inputInfo.devices; d; d = d->next) + SizeDeviceInfo(d, &namesize, &size); + for (d = inputInfo.off_devices; d; d = d->next) + SizeDeviceInfo(d, &namesize, &size); - total_length = numdevs * sizeof (xDeviceInfo) + size + namesize; - devbuf = (char *) calloc (1, total_length); - classbuf = devbuf + (numdevs * sizeof (xDeviceInfo)); + total_length = numdevs * sizeof(xDeviceInfo) + size + namesize; + devbuf = (char *)calloc(1, total_length); + classbuf = devbuf + (numdevs * sizeof(xDeviceInfo)); namebuf = classbuf + size; savbuf = devbuf; dev = (xDeviceInfoPtr) devbuf; - for (d=inputInfo.devices; d; d=d->next,dev++) - ListDeviceInfo (client, d, dev, &devbuf, &classbuf, &namebuf); - for (d=inputInfo.off_devices; d; d=d->next,dev++) - ListDeviceInfo (client, d, dev, &devbuf, &classbuf, &namebuf); + for (d = inputInfo.devices; d; d = d->next, dev++) + ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf); + for (d = inputInfo.off_devices; d; d = d->next, dev++) + ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf); rep.ndevices = numdevs; rep.length = (total_length + 3) >> 2; - WriteReplyToClient (client, sizeof (xListInputDevicesReply), &rep); + WriteReplyToClient(client, sizeof(xListInputDevicesReply), &rep); WriteToClient(client, total_length, savbuf); - free (savbuf); + free(savbuf); return Success; - } +} /*********************************************************************** * @@ -154,23 +154,23 @@ SizeDeviceInfo (d, namesize, size) DeviceIntPtr d; int *namesize; int *size; - { +{ int chunks; *namesize += 1; if (d->name) - *namesize += strlen (d->name); + *namesize += strlen(d->name); if (d->key != NULL) - *size += sizeof (xKeyInfo); + *size += sizeof(xKeyInfo); if (d->button != NULL) - *size += sizeof (xButtonInfo); + *size += sizeof(xButtonInfo); if (d->valuator != NULL) { - chunks = ((int) d->valuator->numAxes + 19) / VPC; - *size += (chunks * sizeof(xValuatorInfo) + - d->valuator->numAxes * sizeof(xAxisInfo)); - } + chunks = ((int)d->valuator->numAxes + 19) / VPC; + *size += (chunks * sizeof(xValuatorInfo) + + d->valuator->numAxes * sizeof(xAxisInfo)); } +} /*********************************************************************** * @@ -186,24 +186,24 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) char **devbuf; char **classbuf; char **namebuf; - { - CopyDeviceName (namebuf, d->name); - CopySwapDevice (client, d, 0, devbuf); +{ + CopyDeviceName(namebuf, d->name); + CopySwapDevice(client, d, 0, devbuf); if (d->key != NULL) { CopySwapKeyClass(client, d->key, classbuf); dev->num_classes++; - } + } if (d->button != NULL) { CopySwapButtonClass(client, d->button, classbuf); dev->num_classes++; - } + } if (d->valuator != NULL) { dev->num_classes += CopySwapValuatorClass(client, d->valuator, classbuf); - } } +} /*********************************************************************** * @@ -219,21 +219,21 @@ void CopyDeviceName (namebuf, name) char **namebuf; char *name; - { - char *nameptr = (char *) *namebuf; +{ + char *nameptr = (char *)*namebuf; if (name) { - *nameptr++ = strlen (name); - strcpy (nameptr, name); - *namebuf += (strlen (name)+1); + *nameptr++ = strlen(name); + strcpy(nameptr, name); + *namebuf += (strlen(name) + 1); } else { *nameptr++ = 0; *namebuf += 1; - } } +} /*********************************************************************** * @@ -247,10 +247,10 @@ CopySwapDevice (client, d, num_classes, buf) DeviceIntPtr d; int num_classes; char **buf; - { +{ xDeviceInfoPtr dev; - dev = (xDeviceInfoPtr) *buf; + dev = (xDeviceInfoPtr) * buf; dev->id = d->id; dev->type = d->type; @@ -264,9 +264,9 @@ CopySwapDevice (client, d, num_classes, buf) if (client->swapped) { swapl(&dev->type); /* macro - braces are required */ - } - *buf += sizeof (xDeviceInfo); } + *buf += sizeof(xDeviceInfo); +} /*********************************************************************** * @@ -279,21 +279,21 @@ CopySwapKeyClass (client, k, buf) register ClientPtr client; KeyClassPtr k; char **buf; - { - xKeyInfoPtr k2; +{ + xKeyInfoPtr k2; - k2 = (xKeyInfoPtr) *buf; + k2 = (xKeyInfoPtr) * buf; k2->class = KeyClass; - k2->length = sizeof (xKeyInfo); + k2->length = sizeof(xKeyInfo); k2->min_keycode = k->curKeySyms.minKeyCode; k2->max_keycode = k->curKeySyms.maxKeyCode; k2->num_keys = k2->max_keycode - k2->min_keycode + 1; if (client->swapped) { swaps(&k2->num_keys); - } - *buf += sizeof (xKeyInfo); } + *buf += sizeof(xKeyInfo); +} /*********************************************************************** * @@ -306,19 +306,19 @@ CopySwapButtonClass (client, b, buf) register ClientPtr client; ButtonClassPtr b; char **buf; - { - xButtonInfoPtr b2; +{ + xButtonInfoPtr b2; - b2 = (xButtonInfoPtr) *buf; + b2 = (xButtonInfoPtr) * buf; b2->class = ButtonClass; - b2->length = sizeof (xButtonInfo); + b2->length = sizeof(xButtonInfo); b2->num_buttons = b->numButtons; if (client->swapped) { swaps(&b2->num_buttons); /* macro - braces are required */ - } - *buf += sizeof (xButtonInfo); } + *buf += sizeof(xButtonInfo); +} /*********************************************************************** * @@ -338,29 +338,29 @@ CopySwapValuatorClass (client, v, buf) ValuatorClassPtr v; char **buf; { - int i, j, axes, t_axes; - xValuatorInfoPtr v2; - AxisInfo *a; - xAxisInfoPtr a2; + int i, j, axes, t_axes; + xValuatorInfoPtr v2; + AxisInfo *a; + xAxisInfoPtr a2; for (i=0,axes=v->numAxes; i < ((v->numAxes+19)/VPC); i++, axes-=VPC) { t_axes = axes < VPC ? axes : VPC; if (t_axes < 0) t_axes = v->numAxes % VPC; - v2 = (xValuatorInfoPtr) *buf; + v2 = (xValuatorInfoPtr) * buf; v2->class = ValuatorClass; - v2->length = sizeof (xValuatorInfo) + t_axes * sizeof (xAxisInfo); - v2->num_axes = t_axes; - v2->mode = v->mode & DeviceMode; - v2->motion_buffer_size = v->numMotionEvents; + v2->length = sizeof(xValuatorInfo) + t_axes * sizeof(xAxisInfo); + v2->num_axes = t_axes; + v2->mode = v->mode & DeviceMode; + v2->motion_buffer_size = v->numMotionEvents; if (client->swapped) { swapl(&v2->motion_buffer_size); - } - *buf += sizeof (xValuatorInfo); + } + *buf += sizeof(xValuatorInfo); a = v->axes + (VPC * i); - a2 = (xAxisInfoPtr) *buf; - for (j=0; jmin_value = a->min_value; a2->max_value = a->max_value; a2->resolution = a->resolution; @@ -371,7 +371,7 @@ CopySwapValuatorClass (client, v, buf) } a2++; a++; - *buf += sizeof (xAxisInfo); + *buf += sizeof(xAxisInfo); } } return (i); @@ -389,8 +389,8 @@ SRepXListInputDevices (client, size, rep) ClientPtr client; int size; xListInputDevicesReply *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/listdev.c | 51 +++++++++--------------------------- 1 file changed, 12 insertions(+), 39 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/listdev.c') diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index 76bfa3564..c667f1632 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -76,8 +76,7 @@ SOFTWARE. */ int -SProcXListInputDevices(client) - register ClientPtr client; +SProcXListInputDevices(register ClientPtr client) { REQUEST(xListInputDevicesReq); swaps(&stuff->length); @@ -91,8 +90,7 @@ SProcXListInputDevices(client) */ int -ProcXListInputDevices (client) - register ClientPtr client; +ProcXListInputDevices(register ClientPtr client) { xListInputDevicesReply rep; int numdevs; @@ -150,10 +148,7 @@ ProcXListInputDevices (client) */ void -SizeDeviceInfo (d, namesize, size) - DeviceIntPtr d; - int *namesize; - int *size; +SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size) { int chunks; @@ -179,13 +174,8 @@ SizeDeviceInfo (d, namesize, size) */ void -ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) - ClientPtr client; - DeviceIntPtr d; - xDeviceInfoPtr dev; - char **devbuf; - char **classbuf; - char **namebuf; +ListDeviceInfo(ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev, + char **devbuf, char **classbuf, char **namebuf) { CopyDeviceName(namebuf, d->name); CopySwapDevice(client, d, 0, devbuf); @@ -216,9 +206,7 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) */ void -CopyDeviceName (namebuf, name) - char **namebuf; - char *name; +CopyDeviceName(char **namebuf, char *name) { char *nameptr = (char *)*namebuf; @@ -242,11 +230,8 @@ CopyDeviceName (namebuf, name) */ void -CopySwapDevice (client, d, num_classes, buf) - register ClientPtr client; - DeviceIntPtr d; - int num_classes; - char **buf; +CopySwapDevice(register ClientPtr client, DeviceIntPtr d, int num_classes, + char **buf) { xDeviceInfoPtr dev; @@ -275,10 +260,7 @@ CopySwapDevice (client, d, num_classes, buf) */ void -CopySwapKeyClass (client, k, buf) - register ClientPtr client; - KeyClassPtr k; - char **buf; +CopySwapKeyClass(register ClientPtr client, KeyClassPtr k, char **buf) { xKeyInfoPtr k2; @@ -302,10 +284,7 @@ CopySwapKeyClass (client, k, buf) */ void -CopySwapButtonClass (client, b, buf) - register ClientPtr client; - ButtonClassPtr b; - char **buf; +CopySwapButtonClass(register ClientPtr client, ButtonClassPtr b, char **buf) { xButtonInfoPtr b2; @@ -333,10 +312,7 @@ CopySwapButtonClass (client, b, buf) */ int -CopySwapValuatorClass (client, v, buf) - register ClientPtr client; - ValuatorClassPtr v; - char **buf; +CopySwapValuatorClass(register ClientPtr client, ValuatorClassPtr v, char **buf) { int i, j, axes, t_axes; xValuatorInfoPtr v2; @@ -385,10 +361,7 @@ CopySwapValuatorClass (client, v, buf) */ void -SRepXListInputDevices (client, size, rep) - ClientPtr client; - int size; - xListInputDevicesReply *rep; +SRepXListInputDevices(ClientPtr client, int size, xListInputDevicesReply * 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/listdev.c | 37 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/listdev.c') diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index c667f1632..ba32d5494 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -159,8 +159,7 @@ SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size) *size += sizeof(xKeyInfo); if (d->button != NULL) *size += sizeof(xButtonInfo); - if (d->valuator != NULL) - { + if (d->valuator != NULL) { chunks = ((int)d->valuator->numAxes + 19) / VPC; *size += (chunks * sizeof(xValuatorInfo) + d->valuator->numAxes * sizeof(xAxisInfo)); @@ -179,19 +178,17 @@ ListDeviceInfo(ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev, { CopyDeviceName(namebuf, d->name); CopySwapDevice(client, d, 0, devbuf); - if (d->key != NULL) - { + if (d->key != NULL) { CopySwapKeyClass(client, d->key, classbuf); dev->num_classes++; } - if (d->button != NULL) - { + if (d->button != NULL) { CopySwapButtonClass(client, d->button, classbuf); dev->num_classes++; } - if (d->valuator != NULL) - { - dev->num_classes += CopySwapValuatorClass(client, d->valuator, classbuf); + if (d->valuator != NULL) { + dev->num_classes += + CopySwapValuatorClass(client, d->valuator, classbuf); } } @@ -210,14 +207,11 @@ CopyDeviceName(char **namebuf, char *name) { char *nameptr = (char *)*namebuf; - if (name) - { + if (name) { *nameptr++ = strlen(name); strcpy(nameptr, name); *namebuf += (strlen(name) + 1); - } - else - { + } else { *nameptr++ = 0; *namebuf += 1; } @@ -246,8 +240,7 @@ CopySwapDevice(register ClientPtr client, DeviceIntPtr d, int num_classes, dev->use = IsXPointer; else dev->use = IsXExtensionDevice; - if (client->swapped) - { + if (client->swapped) { swapl(&dev->type); /* macro - braces are required */ } *buf += sizeof(xDeviceInfo); @@ -270,8 +263,7 @@ CopySwapKeyClass(register ClientPtr client, KeyClassPtr k, char **buf) k2->min_keycode = k->curKeySyms.minKeyCode; k2->max_keycode = k->curKeySyms.maxKeyCode; k2->num_keys = k2->max_keycode - k2->min_keycode + 1; - if (client->swapped) - { + if (client->swapped) { swaps(&k2->num_keys); } *buf += sizeof(xKeyInfo); @@ -292,8 +284,7 @@ CopySwapButtonClass(register ClientPtr client, ButtonClassPtr b, char **buf) b2->class = ButtonClass; b2->length = sizeof(xButtonInfo); b2->num_buttons = b->numButtons; - if (client->swapped) - { + if (client->swapped) { swaps(&b2->num_buttons); /* macro - braces are required */ } *buf += sizeof(xButtonInfo); @@ -319,7 +310,8 @@ CopySwapValuatorClass(register ClientPtr client, ValuatorClassPtr v, char **buf) AxisInfo *a; 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; if (t_axes < 0) t_axes = v->numAxes % VPC; @@ -329,8 +321,7 @@ CopySwapValuatorClass(register ClientPtr client, ValuatorClassPtr v, char **buf) v2->num_axes = t_axes; v2->mode = v->mode & DeviceMode; v2->motion_buffer_size = v->numMotionEvents; - if (client->swapped) - { + if (client->swapped) { swapl(&v2->motion_buffer_size); } *buf += sizeof(xValuatorInfo); -- 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/listdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/listdev.c') diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index ba32d5494..bd62fa022 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -121,7 +121,7 @@ ProcXListInputDevices(register ClientPtr client) SizeDeviceInfo(d, &namesize, &size); total_length = numdevs * sizeof(xDeviceInfo) + size + namesize; - devbuf = (char *)calloc(1, total_length); + devbuf = (char *) calloc (1, total_length); classbuf = devbuf + (numdevs * sizeof(xDeviceInfo)); namebuf = classbuf + size; savbuf = devbuf; @@ -162,7 +162,7 @@ SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size) if (d->valuator != NULL) { chunks = ((int)d->valuator->numAxes + 19) / VPC; *size += (chunks * sizeof(xValuatorInfo) + - d->valuator->numAxes * sizeof(xAxisInfo)); + d->valuator->numAxes * sizeof(xAxisInfo)); } } -- cgit v1.2.3