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

xfixes: canonical walkScreenIdx variable on screen list iterations

Browse Source 
When iterating screen lists, consistently use the same variable name
`walkScreenIdx` for holding current screen index 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:26:57 +02:00
committed by Enrico Weigelt
parent ddee0a9397
commit 8d82699acf
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xfixes/cursor.c
View File

@@ -1014,8 +1014,6 @@ SProcXFixesDestroyPointerBarrier(ClientPtr client)
Bool Bool
XFixesCursorInit(void) XFixesCursorInit(void)
{ {
int i;
if (party_like_its_1989) if (party_like_its_1989)
CursorVisible = EnableCursor; CursorVisible = EnableCursor;
else else
@@ -1024,8 +1022,8 @@ XFixesCursorInit(void)
if (!dixRegisterPrivateKey(&CursorScreenPrivateKeyRec, PRIVATE_SCREEN, sizeof(CursorScreenRec))) if (!dixRegisterPrivateKey(&CursorScreenPrivateKeyRec, PRIVATE_SCREEN, sizeof(CursorScreenRec)))
return FALSE; return FALSE;
for (i = 0; i < screenInfo.numScreens; i++) { for (unsigned walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) {
ScreenPtr walkScreen = screenInfo.screens[i]; ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx];
CursorScreenPtr cs = GetCursorScreen(walkScreen); CursorScreenPtr cs = GetCursorScreen(walkScreen);
dixScreenHookClose(walkScreen, CursorScreenClose); dixScreenHookClose(walkScreen, CursorScreenClose);
Wrap(cs, walkScreen, DisplayCursor, CursorDisplayCursor); Wrap(cs, walkScreen, DisplayCursor, CursorDisplayCursor);

25
xfixes/region.c
View File

@@ -828,7 +828,7 @@ SProcXFixesExpandRegion(ClientPtr client)
static int static int
PanoramiXFixesSetGCClipRegion(ClientPtr client, xXFixesSetGCClipRegionReq *stuff) PanoramiXFixesSetGCClipRegion(ClientPtr client, xXFixesSetGCClipRegionReq *stuff)
{ {
int result = Success, j; int result = Success;
PanoramiXRes *gc; PanoramiXRes *gc;
if ((result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC, if ((result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
@@ -837,8 +837,9 @@ PanoramiXFixesSetGCClipRegion(ClientPtr client, xXFixesSetGCClipRegionReq *stuff
return result; return result;
} }
FOR_NSCREENS_BACKWARD(j) { int walkScreenIdx;
stuff->gc = gc->info[j].id; FOR_NSCREENS_BACKWARD(walkScreenIdx) {
stuff->gc = gc->info[walkScreenIdx].id;
result = SingleXFixesSetGCClipRegion(client, stuff); result = SingleXFixesSetGCClipRegion(client, stuff);
if (result != Success) if (result != Success)
break; break;
@@ -850,7 +851,7 @@ PanoramiXFixesSetGCClipRegion(ClientPtr client, xXFixesSetGCClipRegionReq *stuff
static int static int
PanoramiXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegionReq *stuff) PanoramiXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegionReq *stuff)
{ {
int result = Success, j; int result = Success;
PanoramiXRes *win; PanoramiXRes *win;
RegionPtr reg = NULL; RegionPtr reg = NULL;
@@ -864,9 +865,10 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegion
if (win->u.win.root) if (win->u.win.root)
VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess); VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess);
FOR_NSCREENS_FORWARD(j) { unsigned int walkScreenIdx;
ScreenPtr walkScreen = screenInfo.screens[j]; FOR_NSCREENS_FORWARD(walkScreenIdx) {
stuff->dest = win->info[j].id; ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx];
stuff->dest = win->info[walkScreenIdx].id;
if (reg) if (reg)
RegionTranslate(reg, -walkScreen->x, -walkScreen->y); RegionTranslate(reg, -walkScreen->x, -walkScreen->y);
@@ -886,7 +888,7 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegion
static int static int
PanoramiXFixesSetPictureClipRegion(ClientPtr client, xXFixesSetPictureClipRegionReq *stuff) PanoramiXFixesSetPictureClipRegion(ClientPtr client, xXFixesSetPictureClipRegionReq *stuff)
{ {
int result = Success, j; int result = Success;
PanoramiXRes *pict; PanoramiXRes *pict;
RegionPtr reg = NULL; RegionPtr reg = NULL;
@@ -900,9 +902,10 @@ PanoramiXFixesSetPictureClipRegion(ClientPtr client, xXFixesSetPictureClipRegion
if (pict->u.pict.root) if (pict->u.pict.root)
VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess); VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess);
FOR_NSCREENS_BACKWARD(j) { int walkScreenIdx;
ScreenPtr walkScreen = screenInfo.screens[j]; FOR_NSCREENS_BACKWARD(walkScreenIdx) {
stuff->picture = pict->info[j].id; ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx];
stuff->picture = pict->info[walkScreenIdx].id;
if (reg) if (reg)
RegionTranslate(reg, -walkScreen->x, -walkScreen->y); RegionTranslate(reg, -walkScreen->x, -walkScreen->y);