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

xfree86: dri: ProcXF86DRIGetDrawableInfo() use x_rpcbuf_t

Browse Source 
Use x_rpcbuf_t for reply payload assembly and X_SEND_REPLY_WITH_RPCBUF()
for sending it all out.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-10 12:30:59 +02:00
committed by Enrico Weigelt
parent fd3af5fc7a
commit 765d0de418
1 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
hw/xfree86/dri/xf86dri.c
View File

@@ -319,14 +319,9 @@ ProcXF86DRIDestroyDrawable(register ClientPtr client)
static int
ProcXF86DRIGetDrawableInfo(register ClientPtr client)
{
xXF86DRIGetDrawableInfoReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0
};
DrawablePtr pDrawable;
int X, Y, W, H;
drm_clip_rect_t *pClipRects, *pClippedRects;
drm_clip_rect_t *pClipRects;
drm_clip_rect_t *pBackClipRects;
int backX, backY, rc;
@@ -344,6 +339,8 @@ ProcXF86DRIGetDrawableInfo(register ClientPtr client)
ScreenPtr pScreen = screenInfo.screens[stuff->screen];
xXF86DRIGetDrawableInfoReply rep = { 0 };
if (!DRIGetDrawableInfo(pScreen,
pDrawable,
(unsigned int *) &rep.drawableTableIndex,
@@ -364,58 +361,42 @@ ProcXF86DRIGetDrawableInfo(register ClientPtr client)
rep.drawableY = Y;
rep.drawableWidth = W;
rep.drawableHeight = H;
rep.length = X_REPLY_HEADER_UNITS(xXF86DRIGetDrawableInfoReply);
rep.backX = backX;
rep.backY = backY;
if (rep.numBackClipRects)
rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;
pClippedRects = pClipRects;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (rep.numClipRects) {
/* Clip cliprects to screen dimensions (redirected windows) */
pClippedRects = calloc(rep.numClipRects, sizeof(drm_clip_rect_t));
int j = 0;
if (!pClippedRects)
return BadAlloc;
for (int i = 0; i < rep.numClipRects; i++) {
/* Clip cliprects to screen dimensions (redirected windows) */
CARD16 x1 = max(pClipRects[i].x1, 0);
CARD16 y1 = max(pClipRects[i].y1, 0);
CARD16 x2 = min(pClipRects[i].x2, pScreen->width);
CARD16 y2 = min(pClipRects[i].y2, pScreen->height);
int i, j;
for (i = 0, j = 0; i < rep.numClipRects; i++) {
pClippedRects[j].x1 = max(pClipRects[i].x1, 0);
pClippedRects[j].y1 = max(pClipRects[i].y1, 0);
pClippedRects[j].x2 = min(pClipRects[i].x2, pScreen->width);
pClippedRects[j].y2 = min(pClipRects[i].y2, pScreen->height);
if (pClippedRects[j].x1 < pClippedRects[j].x2 &&
pClippedRects[j].y1 < pClippedRects[j].y2) {
/* only write visible ones */
if (x1 < x2 && y1 < y2) {
x_rpcbuf_write_CARD16(&rpcbuf, x1);
x_rpcbuf_write_CARD16(&rpcbuf, y1);
x_rpcbuf_write_CARD16(&rpcbuf, x2);
x_rpcbuf_write_CARD16(&rpcbuf, y2);
j++;
}
}
rep.numClipRects = j;
rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
}
rep.length = bytes_to_int32(rep.length);
WriteToClient(client, sizeof(xXF86DRIGetDrawableInfoReply), &rep);
if (rep.numClipRects) {
WriteToClient(client,
sizeof(drm_clip_rect_t) * rep.numClipRects,
pClippedRects);
free(pClippedRects);
for (int i = 0; i < rep.numBackClipRects; i++) {
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].x1);
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].y1);
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].x2);
x_rpcbuf_write_CARD16(&rpcbuf, pBackClipRects[i].y2);
}
if (rep.numBackClipRects) {
WriteToClient(client,
sizeof(drm_clip_rect_t) * rep.numBackClipRects,
pBackClipRects);
}
return Success;
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
}
static int