aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xi/listdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/listdev.c')
-rw-r--r--nx-X11/programs/Xserver/Xi/listdev.c268
1 files changed, 116 insertions, 152 deletions
diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c
index 95896d49d..bd62fa022 100644
--- a/nx-X11/programs/Xserver/Xi/listdev.c
+++ b/nx-X11/programs/Xserver/Xi/listdev.c
@@ -55,19 +55,19 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <nx-X11/X.h> /* for inputstr.h */
-#include <nx-X11/Xproto.h> /* Request macro */
-#include "inputstr.h" /* DeviceIntPtr */
+#include <nx-X11/X.h> /* for inputstr.h */
+#include <nx-X11/Xproto.h> /* Request macro */
+#include "inputstr.h" /* DeviceIntPtr */
#include <nx-X11/extensions/XI.h>
#include <nx-X11/extensions/XIproto.h>
#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"
-#define VPC 20 /* Max # valuators per chunk */
+#define VPC 20 /* Max # valuators per chunk */
/***********************************************************************
*
@@ -76,13 +76,12 @@ SOFTWARE.
*/
int
-SProcXListInputDevices(client)
- register ClientPtr client;
- {
+SProcXListInputDevices(register ClientPtr client)
+{
REQUEST(xListInputDevicesReq);
swaps(&stuff->length);
- return(ProcXListInputDevices(client));
- }
+ return (ProcXListInputDevices(client));
+}
/***********************************************************************
*
@@ -91,20 +90,19 @@ 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;
+ProcXListInputDevices(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;
REQUEST_SIZE_MATCH(xListInputDevicesReq);
@@ -114,33 +112,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;
+ total_length = numdevs * sizeof(xDeviceInfo) + size + namesize;
devbuf = (char *) calloc (1, total_length);
- classbuf = devbuf + (numdevs * sizeof (xDeviceInfo));
+ 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;
- }
+}
/***********************************************************************
*
@@ -150,27 +148,23 @@ ProcXListInputDevices (client)
*/
void
-SizeDeviceInfo (d, namesize, size)
- DeviceIntPtr d;
- int *namesize;
- int *size;
- {
+SizeDeviceInfo(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);
- if (d->valuator != NULL)
- {
- chunks = ((int) d->valuator->numAxes + 19) / VPC;
- *size += (chunks * sizeof(xValuatorInfo) +
- d->valuator->numAxes * sizeof(xAxisInfo));
- }
+ *size += sizeof(xButtonInfo);
+ if (d->valuator != NULL) {
+ chunks = ((int)d->valuator->numAxes + 19) / VPC;
+ *size += (chunks * sizeof(xValuatorInfo) +
+ d->valuator->numAxes * sizeof(xAxisInfo));
}
+}
/***********************************************************************
*
@@ -179,31 +173,24 @@ SizeDeviceInfo (d, namesize, size)
*/
void
-ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
- ClientPtr client;
- DeviceIntPtr d;
- xDeviceInfoPtr dev;
- char **devbuf;
- char **classbuf;
- char **namebuf;
- {
- CopyDeviceName (namebuf, d->name);
- CopySwapDevice (client, d, 0, devbuf);
- if (d->key != NULL)
- {
+ListDeviceInfo(ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev,
+ char **devbuf, char **classbuf, char **namebuf)
+{
+ 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)
- {
+ }
+ 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);
+ }
+}
/***********************************************************************
*
@@ -216,24 +203,19 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
*/
void
-CopyDeviceName (namebuf, name)
- char **namebuf;
- char *name;
- {
- char *nameptr = (char *) *namebuf;
-
- if (name)
- {
- *nameptr++ = strlen (name);
- strcpy (nameptr, name);
- *namebuf += (strlen (name)+1);
- }
- else
- {
+CopyDeviceName(char **namebuf, char *name)
+{
+ char *nameptr = (char *)*namebuf;
+
+ if (name) {
+ *nameptr++ = strlen(name);
+ strcpy(nameptr, name);
+ *namebuf += (strlen(name) + 1);
+ } else {
*nameptr++ = 0;
*namebuf += 1;
- }
}
+}
/***********************************************************************
*
@@ -242,15 +224,12 @@ 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;
- dev = (xDeviceInfoPtr) *buf;
+ dev = (xDeviceInfoPtr) * buf;
dev->id = d->id;
dev->type = d->type;
@@ -261,12 +240,11 @@ CopySwapDevice (client, d, num_classes, buf)
dev->use = IsXPointer;
else
dev->use = IsXExtensionDevice;
- if (client->swapped)
- {
+ if (client->swapped) {
swapl(&dev->type); /* macro - braces are required */
- }
- *buf += sizeof (xDeviceInfo);
}
+ *buf += sizeof(xDeviceInfo);
+}
/***********************************************************************
*
@@ -275,25 +253,21 @@ CopySwapDevice (client, d, num_classes, buf)
*/
void
-CopySwapKeyClass (client, k, buf)
- register ClientPtr client;
- KeyClassPtr k;
- char **buf;
- {
- xKeyInfoPtr k2;
-
- k2 = (xKeyInfoPtr) *buf;
+CopySwapKeyClass(register ClientPtr client, KeyClassPtr k, char **buf)
+{
+ xKeyInfoPtr k2;
+
+ 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)
- {
+ if (client->swapped) {
swaps(&k2->num_keys);
- }
- *buf += sizeof (xKeyInfo);
}
+ *buf += sizeof(xKeyInfo);
+}
/***********************************************************************
*
@@ -302,23 +276,19 @@ CopySwapKeyClass (client, k, buf)
*/
void
-CopySwapButtonClass (client, b, buf)
- register ClientPtr client;
- ButtonClassPtr b;
- char **buf;
- {
- xButtonInfoPtr b2;
-
- b2 = (xButtonInfoPtr) *buf;
+CopySwapButtonClass(register ClientPtr client, ButtonClassPtr b, char **buf)
+{
+ xButtonInfoPtr b2;
+
+ b2 = (xButtonInfoPtr) * buf;
b2->class = ButtonClass;
- b2->length = sizeof (xButtonInfo);
+ 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);
}
+ *buf += sizeof(xButtonInfo);
+}
/***********************************************************************
*
@@ -333,34 +303,31 @@ 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;
- 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) {
+ 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;
- if (client->swapped)
- {
+ 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; j<t_axes; j++) {
+ a2 = (xAxisInfoPtr) * buf;
+ for (j = 0; j < t_axes; j++) {
a2->min_value = a->min_value;
a2->max_value = a->max_value;
a2->resolution = a->resolution;
@@ -371,7 +338,7 @@ CopySwapValuatorClass (client, v, buf)
}
a2++;
a++;
- *buf += sizeof (xAxisInfo);
+ *buf += sizeof(xAxisInfo);
}
}
return (i);
@@ -385,12 +352,9 @@ 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);
WriteToClient(client, size, rep);
- }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:49:35 +0000