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

dix: 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 fd3eaf69a1
commit 361b576c48
10 changed files with 181 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dix/main.c
View File

@@ -202,27 +202,27 @@ dix_main(int argc, char *argv[], char *envp[])
LogMessageVerb(X_INFO, 1, "Extensions initialized\n");
for (int i = 0; i < screenInfo.numGPUScreens; i++) {
ScreenPtr pScreen = screenInfo.gpuscreens[i];
if (!PixmapScreenInit(pScreen))
ScreenPtr walkScreen = screenInfo.gpuscreens[i];
if (!PixmapScreenInit(walkScreen))
FatalError("failed to create screen pixmap properties");
if (!dixScreenRaiseCreateResources(pScreen))
if (!dixScreenRaiseCreateResources(walkScreen))
FatalError("failed to create screen resources");
}
for (int i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
ScreenPtr walkScreen = screenInfo.screens[i];
if (!PixmapScreenInit(pScreen))
if (!PixmapScreenInit(walkScreen))
FatalError("failed to create screen pixmap properties");
if (!dixScreenRaiseCreateResources(pScreen))
if (!dixScreenRaiseCreateResources(walkScreen))
FatalError("failed to create screen resources");
if (!CreateGCperDepth(pScreen))
if (!CreateGCperDepth(walkScreen))
FatalError("failed to create scratch GCs");
if (!CreateDefaultStipple(pScreen))
if (!CreateDefaultStipple(walkScreen))
FatalError("failed to create default stipple");
if (!CreateRootWindow(pScreen))
if (!CreateRootWindow(walkScreen))
FatalError("failed to create root window");
CallCallbacks(&RootWindowFinalizeCallback, pScreen);
CallCallbacks(&RootWindowFinalizeCallback, walkScreen);
}
if (SetDefaultFontPath(defaultFontPath) != Success) {
@@ -248,8 +248,9 @@ dix_main(int argc, char *argv[], char *envp[])
#endif /* XINERAMA */
for (int i = 0; i < screenInfo.numScreens; i++) {
InitRootWindow(screenInfo.screens[i]->root);
CallCallbacks(&PostInitRootWindowCallback, screenInfo.screens[i]);
ScreenPtr walkScreen = screenInfo.screens[i];
InitRootWindow(walkScreen->root);
CallCallbacks(&PostInitRootWindowCallback, walkScreen);
}
LogMessageVerb(X_INFO, 1, "Screen(s) initialized\n");
@@ -312,21 +313,25 @@ dix_main(int argc, char *argv[], char *envp[])
InputThreadFini();
for (int i = 0; i < screenInfo.numScreens; i++)
screenInfo.screens[i]->root = NullWindow;
for (int i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr walkScreen = screenInfo.screens[i];
walkScreen->root = NullWindow;
}
CloseDownDevices();
CloseDownEvents();
for (int i = screenInfo.numGPUScreens - 1; i >= 0; i--) {
dixFreeScreen(screenInfo.gpuscreens[i]);
ScreenPtr walkScreen = screenInfo.gpuscreens[i];
dixFreeScreen(walkScreen);
screenInfo.numGPUScreens = i;
}
memset(&screenInfo.gpuscreens, 0, sizeof(screenInfo.gpuscreens));
for (int i = screenInfo.numScreens - 1; i >= 0; i--) {
dixFreeScreen(screenInfo.screens[i]);
ScreenPtr walkScreen = screenInfo.screens[i];
dixFreeScreen(walkScreen);
screenInfo.numScreens = i;
}
memset(&screenInfo.screens, 0, sizeof(screenInfo.screens));