XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xext: shape: ProcShapeQueryExtents(): consolidate reply struct assembly

Browse Source 
Consolidate reply struct assembly into one big struct initializer,
no more later assignments. Preparation for more upcoming consolidations
via generic macros for simple byteswapping.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-18 06:35:31 +02:00
committed by Enrico Weigelt
parent 1ddfce3ae6
commit 75a6b756f1
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Xext/shape.c
View File

@@ -625,13 +625,6 @@ ProcShapeQueryExtents(ClientPtr client)
if (rc != Success)
return rc;
xShapeQueryExtentsReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.boundingShaped = (wBoundingShape(pWin) != 0),
.clipShaped = (wClipShape(pWin) != 0)
};
RegionPtr boundRegion;
BoxRec boundBox;
if ((boundRegion = wBoundingShape(pWin))) {
@@ -645,10 +638,6 @@ ProcShapeQueryExtents(ClientPtr client)
boundBox.x2 = pWin->drawable.width + wBorderWidth(pWin);
boundBox.y2 = pWin->drawable.height + wBorderWidth(pWin);
}
rep.xBoundingShape = boundBox.x1;
rep.yBoundingShape = boundBox.y1;
rep.widthBoundingShape = boundBox.x2 - boundBox.x1;
rep.heightBoundingShape = boundBox.y2 - boundBox.y1;
RegionPtr shapeRegion;
BoxRec shapeBox;
@@ -663,10 +652,22 @@ ProcShapeQueryExtents(ClientPtr client)
shapeBox.x2 = pWin->drawable.width;
shapeBox.y2 = pWin->drawable.height;
}
rep.xClipShape = shapeBox.x1;
rep.yClipShape = shapeBox.y1;
rep.widthClipShape = shapeBox.x2 - shapeBox.x1;
rep.heightClipShape = shapeBox.y2 - shapeBox.y1;
xShapeQueryExtentsReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.boundingShaped = (wBoundingShape(pWin) != 0),
.clipShaped = (wClipShape(pWin) != 0),
.xBoundingShape = boundBox.x1,
.yBoundingShape = boundBox.y1,
.widthBoundingShape = boundBox.x2 - boundBox.x1,
.heightBoundingShape = boundBox.y2 - boundBox.y1,
.xClipShape = shapeBox.x1,
.yClipShape = shapeBox.y1,
.widthClipShape = shapeBox.x2 - shapeBox.x1,
.heightClipShape = shapeBox.y2 - shapeBox.y1,
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);