XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-25 12:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xi: simplify ProcXListDeviceProperties() and ProcXIListProperties()

Browse Source 
Skip allocation of temporay buffer for the atom IDs, instead walk through
the property list and write the IDs directly into the rpcbuf.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-16 17:24:28 +02:00
committed by Enrico Weigelt
parent 79ca3103f7
commit 232c8d97f8
1 changed files with 24 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Xi/xiproperty.c
View File

@@ -212,31 +212,6 @@ send_property_event(DeviceIntPtr dev, Atom property, int what)
(xEvent *) &xi2, 1);
}
static int
list_atoms(DeviceIntPtr dev, int *natoms, Atom **atoms_return)
{
XIPropertyPtr prop;
Atom *atoms = NULL;
int nprops = 0;
for (prop = dev->properties.properties; prop; prop = prop->next)
nprops++;
if (nprops) {
Atom *a;
atoms = calloc(nprops, sizeof(Atom));
if (!atoms)
return BadAlloc;
a = atoms;
for (prop = dev->properties.properties; prop; prop = prop->next, a++)
*a = prop->propertyName;
}
*natoms = nprops;
*atoms_return = atoms;
return Success;
}
static int
get_property(ClientPtr client, DeviceIntPtr dev, Atom property, Atom type,
BOOL delete, int offset, int length,
@@ -844,31 +819,35 @@ XISetDevicePropertyDeletable(DeviceIntPtr dev, Atom property, Bool deletable)
return Success;
}
/* rpcbuf->err_clear needs to be TRUE */
static int _writeDevProps(x_rpcbuf_t *rpcbuf, XID devId,
ClientPtr pClient, size_t *natoms) {
DeviceIntPtr dev;
int rc = dixLookupDevice(&dev, devId, pClient, DixListPropAccess);
if (rc != Success)
return rc;
size_t n = 0;
for (XIPropertyPtr p = dev->properties.properties; p; p = p->next) {
if (!x_rpcbuf_write_CARD32(rpcbuf, p->propertyName))
return BadAlloc;
}
*natoms = n;
return Success;
}
int
ProcXListDeviceProperties(ClientPtr client)
{
DeviceIntPtr dev;
int rc = Success;
REQUEST(xListDevicePropertiesReq);
REQUEST_SIZE_MATCH(xListDevicePropertiesReq);
rc = dixLookupDevice(&dev, stuff->deviceid, client, DixListPropAccess);
if (rc != Success)
return rc;
Atom *atoms = NULL;
int natoms;
rc = list_atoms(dev, &natoms, &atoms);
if (rc != Success)
return rc;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
x_rpcbuf_write_CARD32s(&rpcbuf, atoms, natoms);
free(atoms);
if (rpcbuf.error)
return BadAlloc;
size_t natoms = 0;
int rc = _writeDevProps(&rpcbuf, stuff->deviceid, client, &natoms);
if (rc != Success)
return rc;
xListDevicePropertiesReply rep = {
.repType = X_Reply,
@@ -1068,19 +1047,13 @@ SProcXGetDeviceProperty(ClientPtr client)
int
ProcXIListProperties(ClientPtr client)
{
Atom *atoms;
int natoms;
DeviceIntPtr dev;
int rc = Success;
REQUEST(xXIListPropertiesReq);
REQUEST_SIZE_MATCH(xXIListPropertiesReq);
rc = dixLookupDevice(&dev, stuff->deviceid, client, DixListPropAccess);
if (rc != Success)
return rc;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
rc = list_atoms(dev, &natoms, &atoms);
size_t natoms = 0;
int rc = _writeDevProps(&rpcbuf, stuff->deviceid, client, &natoms);
if (rc != Success)
return rc;
@@ -1098,14 +1071,6 @@ ProcXIListProperties(ClientPtr client)
swaps(&rep.num_properties);
}
x_rpcbuf_t rpcbuf = { .swapped = client->swapped };
x_rpcbuf_write_CARD32s(&rpcbuf, atoms, natoms);
free(atoms);
if (rpcbuf.error)
return BadAlloc;
WriteToClient(client, sizeof(xXIListPropertiesReply), &rep);
WriteRpcbufToClient(client, &rpcbuf);
return Success;