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

xfixes: 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 d8149d9c9e
commit 44ae54e3c6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xfixes/cursor.c
View File

@@ -1038,10 +1038,10 @@ XFixesCursorInit(void)
return FALSE;
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
CursorScreenPtr cs = GetCursorScreen(pScreen);
dixScreenHookClose(pScreen, CursorScreenClose);
Wrap(cs, pScreen, DisplayCursor, CursorDisplayCursor);
ScreenPtr walkScreen = screenInfo.screens[i];
CursorScreenPtr cs = GetCursorScreen(walkScreen);
dixScreenHookClose(walkScreen, CursorScreenClose);
Wrap(cs, walkScreen, DisplayCursor, CursorDisplayCursor);
cs->pCursorHideCounts = NULL;
}
CursorClientType = CreateNewResourceType(CursorFreeClient,

12
xfixes/region.c
View File

@@ -871,16 +871,16 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegion
VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess);
FOR_NSCREENS_FORWARD(j) {
ScreenPtr screen = screenInfo.screens[j];
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->dest = win->info[j].id;
if (reg)
RegionTranslate(reg, -screen->x, -screen->y);
RegionTranslate(reg, -walkScreen->x, -walkScreen->y);
result = SingleXFixesSetWindowShapeRegion(client, stuff);
if (reg)
RegionTranslate(reg, screen->x, screen->y);
RegionTranslate(reg, walkScreen->x, walkScreen->y);
if (result != Success)
break;
@@ -907,16 +907,16 @@ PanoramiXFixesSetPictureClipRegion(ClientPtr client, xXFixesSetPictureClipRegion
VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess);
FOR_NSCREENS_BACKWARD(j) {
ScreenPtr screen = screenInfo.screens[j];
ScreenPtr walkScreen = screenInfo.screens[j];
stuff->picture = pict->info[j].id;
if (reg)
RegionTranslate(reg, -screen->x, -screen->y);
RegionTranslate(reg, -walkScreen->x, -walkScreen->y);
result = SingleXFixesSetPictureClipRegion(client, stuff);
if (reg)
RegionTranslate(reg, screen->x, screen->y);
RegionTranslate(reg, walkScreen->x, walkScreen->y);
if (result != Success)
break;