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

xext: panoramix: use X_SEND_REPLY_SIMPLE()

Browse Source 
Use X_SEND_REPLY_SIMPLE() for sending out simple replies.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-21 18:46:41 +02:00
committed by Enrico Weigelt
parent 0c4f5e430a
commit 7a4136d0ff
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Xext/panoramiX.c
View File

@@ -904,21 +904,16 @@ ProcPanoramiXQueryVersion(ClientPtr client)
{
/* REQUEST(xPanoramiXQueryVersionReq); */
xPanoramiXQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.majorVersion = SERVER_PANORAMIX_MAJOR_VERSION,
.minorVersion = SERVER_PANORAMIX_MINOR_VERSION
};
REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.majorVersion);
swaps(&rep.minorVersion);
}
WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), &rep);
X_SEND_REPLY_SIMPLE(client, rep);
return Success;
}
@@ -935,17 +930,14 @@ ProcPanoramiXGetState(ClientPtr client)
return rc;
xPanoramiXGetStateReply rep = {
.type = X_Reply,
.state = !noPanoramiXExtension,
.sequenceNumber = client->sequence,
.window = stuff->window
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.window);
}
WriteToClient(client, sizeof(xPanoramiXGetStateReply), &rep);
X_SEND_REPLY_SIMPLE(client, rep);
return Success;
}
@@ -963,17 +955,14 @@ ProcPanoramiXGetScreenCount(ClientPtr client)
return rc;
xPanoramiXGetScreenCountReply rep = {
.type = X_Reply,
.ScreenCount = PanoramiXNumScreens,
.sequenceNumber = client->sequence,
.window = stuff->window
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.window);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), &rep);
X_SEND_REPLY_SIMPLE(client, rep);
return Success;
}
@@ -994,8 +983,6 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
return rc;
xPanoramiXGetScreenSizeReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
/* screen dimensions */
.width = screenInfo.screens[stuff->screen]->width,
.height = screenInfo.screens[stuff->screen]->height,
@@ -1004,13 +991,12 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.width);
swapl(&rep.height);
swapl(&rep.window);
swapl(&rep.screen);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), &rep);
X_SEND_REPLY_SIMPLE(client, rep);
return Success;
}
@@ -1021,8 +1007,6 @@ ProcXineramaIsActive(ClientPtr client)
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
xXineramaIsActiveReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
#if 1
/* The following hack fools clients into thinking that Xinerama
* is disabled even though it is not. */
@@ -1033,10 +1017,9 @@ ProcXineramaIsActive(ClientPtr client)
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.state);
}
WriteToClient(client, sizeof(xXineramaIsActiveReply), &rep);
X_SEND_REPLY_SIMPLE(client, rep);
return Success;
}

12
Xext/panoramiXprocs.c
View File

@@ -571,9 +571,6 @@ PanoramiXGetGeometry(ClientPtr client)
return rc;
xGetGeometryReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.root = screenInfo.screens[0]->root->drawable.id,
.depth = pDraw->depth,
.width = pDraw->width,
@@ -605,7 +602,6 @@ PanoramiXGetGeometry(ClientPtr client)
}
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.root);
swaps(&rep.x);
swaps(&rep.y);
@@ -613,7 +609,7 @@ PanoramiXGetGeometry(ClientPtr client)
swaps(&rep.height);
swaps(&rep.borderWidth);
}
WriteToClient(client, sizeof(xGetGeometryReply), &rep);
X_SEND_REPLY_SIMPLE(client, rep);
return Success;
}
@@ -681,9 +677,6 @@ PanoramiXTranslateCoords(ClientPtr client)
}
xTranslateCoordsReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.sameScreen = xTrue,
.dstX = dstX,
.dstY = dstY,
@@ -691,12 +684,11 @@ PanoramiXTranslateCoords(ClientPtr client)
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.child);
swaps(&rep.dstX);
swaps(&rep.dstY);
}
WriteToClient(client, sizeof(rep), &rep);
X_SEND_REPLY_SIMPLE(client, rep);
return Success;
}