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

Xi: 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 d81cf93329
commit 6730e673d6
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Xi/closedev.c
View File

@@ -122,7 +122,6 @@ int
ProcXCloseDevice(ClientPtr client)
{
int rc, i;
WindowPtr pWin, p1;
DeviceIntPtr d;
REQUEST(xCloseDeviceReq);
@@ -140,9 +139,10 @@ ProcXCloseDevice(ClientPtr client)
* Delete passive grabs from all windows for this device. */
for (i = 0; i < screenInfo.numScreens; i++) {
pWin = screenInfo.screens[i]->root;
ScreenPtr walkScreen = screenInfo.screens[i];
WindowPtr pWin = walkScreen->root;
DeleteDeviceEvents(d, pWin, client);
p1 = pWin->firstChild;
WindowPtr p1 = pWin->firstChild;
DeleteEventsFromChildren(d, p1, client);
}

7
Xi/exevents.c
View File

@@ -3308,14 +3308,13 @@ void
SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent *ev, int count)
{
int i;
WindowPtr pWin, p1;
for (i = 0; i < screenInfo.numScreens; i++) {
pWin = screenInfo.screens[i]->root;
ScreenPtr walkScreen = screenInfo.screens[i];
WindowPtr pWin = walkScreen->root;
if (!pWin)
continue;
DeliverEventsToWindow(dev, pWin, ev, count, mask, NullGrab);
p1 = pWin->firstChild;
WindowPtr p1 = pWin->firstChild;
FindInterestedChildren(dev, p1, mask, ev, count);
}
}

10
Xi/xibarriers.c
View File

@@ -938,14 +938,14 @@ XIBarrierInit(void)
return FALSE;
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
ScreenPtr walkScreen = screenInfo.screens[i];
BarrierScreenPtr cs;
cs = (BarrierScreenPtr) calloc(1, sizeof(BarrierScreenRec));
if (!cs)
return FALSE;
xorg_list_init(&cs->barriers);
SetBarrierScreen(pScreen, cs);
SetBarrierScreen(walkScreen, cs);
}
PointerBarrierType = CreateNewResourceType(BarrierFreeBarrier,
@@ -959,9 +959,9 @@ XIBarrierReset(void)
{
int i;
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
BarrierScreenPtr cs = GetBarrierScreen(pScreen);
ScreenPtr walkScreen = screenInfo.screens[i];
BarrierScreenPtr cs = GetBarrierScreen(walkScreen);
free(cs);
SetBarrierScreen(pScreen, NULL);
SetBarrierScreen(walkScreen, NULL);
}
}