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

Xext: canonical walkScreen variable on screen list iterations

Browse Source 
When iterating screen lists, consistently use the same variable name
`walkScreen` for holding current screen pointer everywhere.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-12 18:51:31 +02:00
committed by Enrico Weigelt
parent e29c0454ce
commit d81cf93329
8 changed files with 161 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
Xext/panoramiXprocs.c
View File

@@ -134,11 +134,12 @@ PanoramiXCreateWindow(ClientPtr client)
parentIsRoot = (stuff->parent == screenInfo.screens[0]->root->drawable.id)
|| (stuff->parent == screenInfo.screens[0]->screensaver.wid);
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->wid = newWin->info[j].id;
stuff->parent = parent->info[j].id;
if (parentIsRoot) {
stuff->x = orig_x - screenInfo.screens[j]->x;
stuff->y = orig_y - screenInfo.screens[j]->y;
stuff->x = orig_x - walkScreen->x;
stuff->y = orig_y - walkScreen->y;
}
if (backPix)
*((CARD32 *) &stuff[1] + pback_offset) = backPix->info[j].id;
@@ -343,11 +344,12 @@ PanoramiXReparentWindow(ClientPtr client)
parentIsRoot = (stuff->parent == screenInfo.screens[0]->root->drawable.id)
|| (stuff->parent == screenInfo.screens[0]->screensaver.wid);
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->window = win->info[j].id;
stuff->parent = parent->info[j].id;
if (parentIsRoot) {
stuff->x = x - screenInfo.screens[j]->x;
stuff->y = y - screenInfo.screens[j]->y;
stuff->x = x - walkScreen->x;
stuff->y = y - walkScreen->y;
}
result = (*SavedProcVector[X_ReparentWindow]) (client);
if (result != Success)
@@ -514,13 +516,14 @@ PanoramiXConfigureWindow(ClientPtr client)
/* have to go forward or you get expose events before
ConfigureNotify events */
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->window = win->info[j].id;
if (sib)
*((CARD32 *) &stuff[1] + sib_offset) = sib->info[j].id;
if (x_offset >= 0)
*((CARD32 *) &stuff[1] + x_offset) = x - screenInfo.screens[j]->x;
*((CARD32 *) &stuff[1] + x_offset) = x - walkScreen->x;
if (y_offset >= 0)
*((CARD32 *) &stuff[1] + y_offset) = y - screenInfo.screens[j]->y;
*((CARD32 *) &stuff[1] + y_offset) = y - walkScreen->y;
result = (*SavedProcVector[X_ConfigureWindow]) (client);
if (result != Success)
break;
@@ -1045,10 +1048,11 @@ PanoramiXClearToBackground(ClientPtr client)
y = stuff->y;
isRoot = win->u.win.root;
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->window = win->info[j].id;
if (isRoot) {
stuff->x = x - screenInfo.screens[j]->x;
stuff->y = y - screenInfo.screens[j]->y;
stuff->x = x - walkScreen->x;
stuff->y = y - walkScreen->y;
}
result = (*SavedProcVector[X_ClearArea]) (client);
if (result != Success)
@@ -1176,7 +1180,7 @@ PanoramiXCopyArea(ClientPtr client)
/* subtract the (screen-space) clips of the source drawables */
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr screen = screenInfo.screens[j];
ScreenPtr walkScreen = screenInfo.screens[j];
RegionPtr sd;
if (pGC->subWindowMode == IncludeInferiors)
@@ -1185,12 +1189,12 @@ PanoramiXCopyArea(ClientPtr client)
sd = &((WindowPtr)drawables[j])->clipList;
if (srcIsRoot)
RegionTranslate(&rgn, -screen->x, -screen->y);
RegionTranslate(&rgn, -walkScreen->x, -walkScreen->y);
RegionSubtract(&rgn, &rgn, sd);
if (srcIsRoot)
RegionTranslate(&rgn, screen->x, screen->y);
RegionTranslate(&rgn, walkScreen->x, walkScreen->y);
if (pGC->subWindowMode == IncludeInferiors)
RegionDestroy(sd);
@@ -1215,18 +1219,19 @@ PanoramiXCopyArea(ClientPtr client)
RegionNull(&totalReg);
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
RegionPtr pRgn;
stuff->dstDrawable = dst->info[j].id;
stuff->srcDrawable = src->info[j].id;
stuff->gc = gc->info[j].id;
if (srcIsRoot) {
stuff->srcX = srcx - screenInfo.screens[j]->x;
stuff->srcY = srcy - screenInfo.screens[j]->y;
stuff->srcX = srcx - walkScreen->x;
stuff->srcY = srcy - walkScreen->y;
}
if (dstIsRoot) {
stuff->dstX = dstx - screenInfo.screens[j]->x;
stuff->dstY = dsty - screenInfo.screens[j]->y;
stuff->dstX = dstx - walkScreen->x;
stuff->dstY = dsty - walkScreen->y;
}
VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, DixWriteAccess);
@@ -1252,9 +1257,7 @@ PanoramiXCopyArea(ClientPtr client)
stuff->dstX, stuff->dstY);
if (pGC->graphicsExposures && pRgn) {
if (srcIsRoot) {
RegionTranslate(pRgn,
screenInfo.screens[j]->x,
screenInfo.screens[j]->y);
RegionTranslate(pRgn, walkScreen->x, walkScreen->y);
}
RegionAppend(&totalReg, pRgn);
RegionDestroy(pRgn);
@@ -1327,18 +1330,19 @@ PanoramiXCopyPlane(ClientPtr client)
RegionNull(&totalReg);
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
RegionPtr pRgn;
stuff->dstDrawable = dst->info[j].id;
stuff->srcDrawable = src->info[j].id;
stuff->gc = gc->info[j].id;
if (srcIsRoot) {
stuff->srcX = srcx - screenInfo.screens[j]->x;
stuff->srcY = srcy - screenInfo.screens[j]->y;
stuff->srcX = srcx - walkScreen->x;
stuff->srcY = srcy - walkScreen->y;
}
if (dstIsRoot) {
stuff->dstX = dstx - screenInfo.screens[j]->x;
stuff->dstY = dsty - screenInfo.screens[j]->y;
stuff->dstX = dstx - walkScreen->x;
stuff->dstY = dsty - walkScreen->y;
}
VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, DixWriteAccess);
@@ -1421,13 +1425,14 @@ PanoramiXPolyPoint(ClientPtr client)
memcpy((char *) origPts, (char *) &stuff[1], npoint * sizeof(xPoint));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], origPts, npoint * sizeof(xPoint));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
xPoint *pnts = (xPoint *) &stuff[1];
@@ -1487,13 +1492,14 @@ PanoramiXPolyLine(ClientPtr client)
return BadAlloc;
memcpy((char *) origPts, (char *) &stuff[1], npoint * sizeof(xPoint));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], origPts, npoint * sizeof(xPoint));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
xPoint *pnts = (xPoint *) &stuff[1];
@@ -1557,13 +1563,14 @@ PanoramiXPolySegment(ClientPtr client)
return BadAlloc;
memcpy((char *) origSegs, (char *) &stuff[1], nsegs * sizeof(xSegment));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], origSegs, nsegs * sizeof(xSegment));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
xSegment *segs = (xSegment *) &stuff[1];
@@ -1627,13 +1634,14 @@ PanoramiXPolyRectangle(ClientPtr client)
memcpy((char *) origRecs, (char *) &stuff[1],
nrects * sizeof(xRectangle));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], origRecs, nrects * sizeof(xRectangle));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
xRectangle *rects = (xRectangle *) &stuff[1];
@@ -1694,13 +1702,14 @@ PanoramiXPolyArc(ClientPtr client)
return BadAlloc;
memcpy((char *) origArcs, (char *) &stuff[1], narcs * sizeof(xArc));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], origArcs, narcs * sizeof(xArc));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
xArc *arcs = (xArc *) &stuff[1];
@@ -1758,13 +1767,14 @@ PanoramiXFillPoly(ClientPtr client)
memcpy((char *) locPts, (char *) &stuff[1],
count * sizeof(DDXPointRec));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], locPts, count * sizeof(DDXPointRec));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
DDXPointPtr pnts = (DDXPointPtr) &stuff[1];
@@ -1827,13 +1837,14 @@ PanoramiXPolyFillRectangle(ClientPtr client)
memcpy((char *) origRects, (char *) &stuff[1],
things * sizeof(xRectangle));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], origRects, things * sizeof(xRectangle));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
xRectangle *rects = (xRectangle *) &stuff[1];
@@ -1894,13 +1905,14 @@ PanoramiXPolyFillArc(ClientPtr client)
return BadAlloc;
memcpy((char *) origArcs, (char *) &stuff[1], narcs * sizeof(xArc));
FOR_NSCREENS_FORWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (j)
memcpy(&stuff[1], origArcs, narcs * sizeof(xArc));
if (isRoot) {
int x_off = screenInfo.screens[j]->x;
int y_off = screenInfo.screens[j]->y;
int x_off = walkScreen->x;
int y_off = walkScreen->y;
if (x_off || y_off) {
xArc *arcs = (xArc *) &stuff[1];
@@ -1954,9 +1966,10 @@ PanoramiXPutImage(ClientPtr client)
orig_x = stuff->dstX;
orig_y = stuff->dstY;
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
if (isRoot) {
stuff->dstX = orig_x - screenInfo.screens[j]->x;
stuff->dstY = orig_y - screenInfo.screens[j]->y;
stuff->dstX = orig_x - walkScreen->x;
stuff->dstY = orig_y - walkScreen->y;
}
stuff->drawable = draw->info[j].id;
stuff->gc = gc->info[j].id;
@@ -2167,11 +2180,13 @@ PanoramiXPolyText8(ClientPtr client)
orig_x = stuff->x;
orig_y = stuff->y;
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->drawable = draw->info[j].id;
stuff->gc = gc->info[j].id;
if (isRoot) {
stuff->x = orig_x - screenInfo.screens[j]->x;
stuff->y = orig_y - screenInfo.screens[j]->y;
stuff->x = orig_x - walkScreen->x;
stuff->y = orig_y - walkScreen->y;
}
result = (*SavedProcVector[X_PolyText8]) (client);
if (result != Success)
@@ -2210,11 +2225,13 @@ PanoramiXPolyText16(ClientPtr client)
orig_x = stuff->x;
orig_y = stuff->y;
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->drawable = draw->info[j].id;
stuff->gc = gc->info[j].id;
if (isRoot) {
stuff->x = orig_x - screenInfo.screens[j]->x;
stuff->y = orig_y - screenInfo.screens[j]->y;
stuff->x = orig_x - walkScreen->x;
stuff->y = orig_y - walkScreen->y;
}
result = (*SavedProcVector[X_PolyText16]) (client);
if (result != Success)
@@ -2253,11 +2270,13 @@ PanoramiXImageText8(ClientPtr client)
orig_x = stuff->x;
orig_y = stuff->y;
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->drawable = draw->info[j].id;
stuff->gc = gc->info[j].id;
if (isRoot) {
stuff->x = orig_x - screenInfo.screens[j]->x;
stuff->y = orig_y - screenInfo.screens[j]->y;
stuff->x = orig_x - walkScreen->x;
stuff->y = orig_y - walkScreen->y;
}
result = (*SavedProcVector[X_ImageText8]) (client);
if (result != Success)
@@ -2296,11 +2315,13 @@ PanoramiXImageText16(ClientPtr client)
orig_x = stuff->x;
orig_y = stuff->y;
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->drawable = draw->info[j].id;
stuff->gc = gc->info[j].id;
if (isRoot) {
stuff->x = orig_x - screenInfo.screens[j]->x;
stuff->y = orig_y - screenInfo.screens[j]->y;
stuff->x = orig_x - walkScreen->x;
stuff->y = orig_y - walkScreen->y;
}
result = (*SavedProcVector[X_ImageText16]) (client);
if (result != Success)