XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

miext: 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 6c25d52276
commit fb2c085de0
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
miext/rootless/rootlessScreen.c
View File

@@ -710,11 +710,15 @@ RootlessUpdateRooted(Bool state)
int i;
if (!state) {
for (i = 0; i < screenInfo.numScreens; i++)
RootlessDisableRoot(screenInfo.screens[i]);
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr walkScreen = screenInfo.screens[i];
RootlessDisableRoot(walkScreen);
}
}
else {
for (i = 0; i < screenInfo.numScreens; i++)
RootlessEnableRoot(screenInfo.screens[i]);
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr walkScreen = screenInfo.screens[i];
RootlessEnableRoot(walkScreen);
}
}
}

28
miext/rootless/rootlessWindow.c
View File

@@ -1170,16 +1170,16 @@ void
RootlessOrderAllWindows(Bool include_unhitable)
{
int i;
WindowPtr pWin;
if (windows_hidden)
return;
RL_DEBUG_MSG("RootlessOrderAllWindows() ");
for (i = 0; i < screenInfo.numScreens; i++) {
if (screenInfo.screens[i] == NULL)
ScreenPtr walkScreen = screenInfo.screens[i];
if (walkScreen == NULL)
continue;
pWin = screenInfo.screens[i]->root;
WindowPtr pWin = walkScreen->root;
if (pWin == NULL)
continue;
@@ -1228,8 +1228,6 @@ void
RootlessHideAllWindows(void)
{
int i;
ScreenPtr pScreen;
WindowPtr pWin;
RootlessWindowRec *winRec;
if (windows_hidden)
@@ -1238,10 +1236,10 @@ RootlessHideAllWindows(void)
windows_hidden = TRUE;
for (i = 0; i < screenInfo.numScreens; i++) {
pScreen = screenInfo.screens[i];
if (pScreen == NULL)
ScreenPtr walkScreen = screenInfo.screens[i];
if (walkScreen == NULL)
continue;
pWin = pScreen->root;
WindowPtr pWin = walkScreen->root;
if (pWin == NULL)
continue;
@@ -1253,8 +1251,8 @@ RootlessHideAllWindows(void)
winRec = WINREC(pWin);
if (winRec != NULL) {
if (SCREENREC(pScreen)->imp->HideWindow)
SCREENREC(pScreen)->imp->HideWindow(winRec->wid);
if (SCREENREC(walkScreen)->imp->HideWindow)
SCREENREC(walkScreen)->imp->HideWindow(winRec->wid);
}
}
}
@@ -1264,8 +1262,6 @@ void
RootlessShowAllWindows(void)
{
int i;
ScreenPtr pScreen;
WindowPtr pWin;
RootlessWindowRec *winRec;
if (!windows_hidden)
@@ -1274,10 +1270,10 @@ RootlessShowAllWindows(void)
windows_hidden = FALSE;
for (i = 0; i < screenInfo.numScreens; i++) {
pScreen = screenInfo.screens[i];
if (pScreen == NULL)
ScreenPtr walkScreen = screenInfo.screens[i];
if (walkScreen == NULL)
continue;
pWin = pScreen->root;
WindowPtr pWin = walkScreen->root;
if (pWin == NULL)
continue;
@@ -1292,7 +1288,7 @@ RootlessShowAllWindows(void)
RootlessReorderWindow(pWin);
}
RootlessScreenExpose(pScreen);
RootlessScreenExpose(walkScreen);
}
}