diff --git a/dix/cursor.c b/dix/cursor.c index 2585857780..c654e5aa00 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -114,8 +114,8 @@ FreeCursor(void *value, XID cid) BUG_WARN(CursorRefCount(pCurs) < 0); - for (int nscr = 0; nscr < screenInfo.numScreens; nscr++) { - ScreenPtr walkScreen = screenInfo.screens[nscr]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (walkScreen->UnrealizeCursor) walkScreen->UnrealizeCursor(pDev, walkScreen, pCurs); } @@ -182,8 +182,8 @@ CheckForEmptyMask(CursorBitsPtr bits) static int RealizeCursorAllScreens(CursorPtr pCurs) { - for (int nscr = 0; nscr < screenInfo.numScreens; nscr++) { - ScreenPtr walkScreen = screenInfo.screens[nscr]; + for (int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; for (DeviceIntPtr pDev = inputInfo.devices; pDev; pDev = pDev->next) { if (DevHasCursor(pDev)) { if (!(*walkScreen->RealizeCursor) (pDev, walkScreen, pCurs)) { @@ -200,8 +200,8 @@ RealizeCursorAllScreens(CursorPtr pCurs) walkScreen->UnrealizeCursor(pDevIt, walkScreen, pCurs); pDevIt = pDevIt->next; } - while (--nscr >= 0) { - walkScreen = screenInfo.screens[nscr]; + while (--walkScreenIdx>= 0) { + walkScreen = screenInfo.screens[walkScreenIdx]; /* now unrealize all devices on previous screens */ pDevIt = inputInfo.devices; while (pDevIt) { diff --git a/dix/dispatch.c b/dix/dispatch.c index d80fd3053d..c93cb2b8ca 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -650,10 +650,10 @@ CreateConnectionBlock(void) connBlockScreenStart = sizesofar; memset(&depth, 0, sizeof(xDepth)); memset(&visual, 0, sizeof(xVisualType)); - for (int i = 0; i < screenInfo.numScreens; i++) { + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { DepthPtr pDepth; VisualPtr pVisual; - ScreenPtr walkScreen = screenInfo.screens[i]; + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; root.windowId = walkScreen->root->drawable.id; root.defaultColormap = walkScreen->defColormap; @@ -3162,8 +3162,8 @@ ProcSetScreenSaver(ClientPtr client) REQUEST(xSetScreenSaverReq); REQUEST_SIZE_MATCH(xSetScreenSaverReq); - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; int rc = XaceHookScreensaverAccess(client, walkScreen, DixSetAttrAccess); if (rc != Success) return rc; @@ -3219,8 +3219,8 @@ ProcGetScreenSaver(ClientPtr client) { REQUEST_SIZE_MATCH(xReq); - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; int rc = XaceHookScreensaverAccess(client, walkScreen, DixGetAttrAccess); if (rc != Success) return rc; @@ -3728,8 +3728,8 @@ SendConnSetup(ClientPtr client, const char *reason) numScreens = ((xConnSetup *) ConnectionInfo)->numRoots; #endif /* XINERAMA */ - for (int i = 0; i < numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; xDepth *pDepth; WindowPtr pRoot = walkScreen->root; diff --git a/dix/dixfonts.c b/dix/dixfonts.c index bfc6a65a05..1cfde12208 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -339,8 +339,8 @@ doOpenFont(ClientPtr client, OFclosurePtr c) pfont->refcnt++; if (pfont->refcnt == 1) { UseFPE(pfont->fpe); - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (walkScreen->RealizeFont) { if (!(*walkScreen->RealizeFont) (walkScreen, pfont)) { CloseFont(pfont, (Font) 0); diff --git a/dix/dixutils.c b/dix/dixutils.c index db4d29a8d1..d9f7c0a9e6 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -343,14 +343,14 @@ BlockHandler(void *pTimeout) if (!handlers[i].deleted) (*handlers[i].BlockHandler) (handlers[i].blockData, pTimeout); - for (int i = 0; i < screenInfo.numGPUScreens; i++) { - ScreenPtr walkScreen = screenInfo.gpuscreens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numGPUScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.gpuscreens[walkScreenIdx]; if (walkScreen->BlockHandler) walkScreen->BlockHandler(walkScreen, pTimeout); } - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (walkScreen->BlockHandler) walkScreen->BlockHandler(walkScreen, pTimeout); } @@ -378,13 +378,13 @@ void WakeupHandler(int result) { ++inHandler; - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (walkScreen->WakeupHandler) walkScreen->WakeupHandler(walkScreen, result); } - for (int i = 0; i < screenInfo.numGPUScreens; i++) { - ScreenPtr walkScreen = screenInfo.gpuscreens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numGPUScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.gpuscreens[walkScreenIdx]; if (walkScreen->WakeupHandler) walkScreen->WakeupHandler(walkScreen, result); } diff --git a/dix/enterleave.c b/dix/enterleave.c index 5c5a11b04d..502d8f0a15 100644 --- a/dix/enterleave.c +++ b/dix/enterleave.c @@ -1240,8 +1240,8 @@ CoreFocusPointerRootNoneSwitch(DeviceIntPtr dev, nscreens = 1; #endif /* XINERAMA */ - for (int i = 0; i < nscreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < nscreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; WindowPtr root = walkScreen->root; if (!HasOtherPointer(root, GetMaster(dev, POINTER_OR_FLOAT)) && !FirstFocusChild(root)) { @@ -1263,7 +1263,6 @@ CoreFocusPointerRootNoneSwitch(DeviceIntPtr dev, if (B == PointerRootWin) CoreFocusInNotifyPointerEvents(dev, root, None, mode, TRUE); } - } } @@ -1301,8 +1300,8 @@ CoreFocusToPointerRootOrNone(DeviceIntPtr dev, WindowPtr A, /* NullWindow means we include the root window */ CoreFocusOutEvents(dev, A, NullWindow, mode, NotifyNonlinearVirtual); - for (int i = 0; i < nscreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < nscreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; WindowPtr root = walkScreen->root; if (!HasFocus(root) && !FirstFocusChild(root)) { CoreFocusEvent(dev, FocusIn, mode, @@ -1329,8 +1328,8 @@ CoreFocusFromPointerRootOrNone(DeviceIntPtr dev, nscreens = 1; #endif /* XINERAMA */ - for (int i = 0; i < nscreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < nscreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; WindowPtr root = walkScreen->root; if (!HasFocus(root) && !FirstFocusChild(root)) { /* If pointer was on PointerRootWin and changes to NoneWin, and @@ -1429,8 +1428,8 @@ DeviceFocusEvents(DeviceIntPtr dev, WindowPtr from, WindowPtr to, int mode) NotifyPointer); } /* Notify all the roots */ - for (int i = 0; i < nscreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < nscreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; DeviceFocusEvent(dev, XI_FocusOut, mode, out, walkScreen->root); } } @@ -1447,8 +1446,8 @@ DeviceFocusEvents(DeviceIntPtr dev, WindowPtr from, WindowPtr to, int mode) NotifyNonlinearVirtual); } /* Notify all the roots */ - for (int i = 0; i < nscreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < nscreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; DeviceFocusEvent(dev, XI_FocusIn, mode, in, walkScreen->root); } if (to == PointerRootWin) { @@ -1466,8 +1465,8 @@ DeviceFocusEvents(DeviceIntPtr dev, WindowPtr from, WindowPtr to, int mode) InputDevCurrentRootWindow(dev), mode, NotifyPointer); } - for (int i = 0; i < nscreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < nscreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; DeviceFocusEvent(dev, XI_FocusOut, mode, out, walkScreen->root); } if (to->parent != NullWindow) diff --git a/dix/events.c b/dix/events.c index f6ea857fa7..6b03416e4b 100644 --- a/dix/events.c +++ b/dix/events.c @@ -532,7 +532,6 @@ static Bool XineramaSetCursorPosition(DeviceIntPtr pDev, int x, int y, Bool generateEvent) { ScreenPtr pScreen; - int i; SpritePtr pSprite = pDev->spriteInfo->sprite; /* x,y are in Screen 0 coordinates. We need to decide what Screen @@ -544,9 +543,10 @@ XineramaSetCursorPosition(DeviceIntPtr pDev, int x, int y, Bool generateEvent) y += screenInfo.screens[0]->y; if (!point_on_screen(pScreen, x, y)) { - FOR_NSCREENS_BACKWARD(i) { - ScreenPtr walkScreen = screenInfo.screens[i]; - if (i == pScreen->myNum) + int walkScreenIdx; + FOR_NSCREENS_BACKWARD(walkScreenIdx) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; + if (walkScreenIdx == pScreen->myNum) continue; if (point_on_screen(walkScreen, x, y)) { pScreen = walkScreen; @@ -589,24 +589,25 @@ XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin) SpritePtr pSprite = pDev->spriteInfo->sprite; if (pWin == screenInfo.screens[0]->root) { - int i; - - FOR_NSCREENS_BACKWARD(i) { - ScreenPtr walkScreen = screenInfo.screens[i]; - pSprite->windows[i] = walkScreen->root; + int walkScreenIdx; + FOR_NSCREENS_BACKWARD(walkScreenIdx) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; + pSprite->windows[walkScreenIdx] = walkScreen->root; } } else { PanoramiXRes *win; - int rc, i; + int rc; rc = dixLookupResourceByType((void **) &win, pWin->drawable.id, XRT_WINDOW, serverClient, DixReadAccess); if (rc != Success) return FALSE; - FOR_NSCREENS_BACKWARD(i) { - rc = dixLookupWindow(pSprite->windows + i, win->info[i].id, + int walkScreenIdx; + FOR_NSCREENS_BACKWARD(walkScreenIdx) { + rc = dixLookupWindow(pSprite->windows + walkScreenIdx, + win->info[walkScreenIdx].id, serverClient, DixReadAccess); if (rc != Success) /* window is being unmapped */ return FALSE; @@ -621,22 +622,22 @@ XineramaConfineCursorToWindow(DeviceIntPtr pDev, { SpritePtr pSprite = pDev->spriteInfo->sprite; - int x, y, off_x, off_y, i; + int x, y, off_x, off_y; assert(!noPanoramiXExtension); if (!XineramaSetWindowPntrs(pDev, pWin)) return; - i = PanoramiXNumScreens - 1; + unsigned int walkScreenIdx = PanoramiXNumScreens - 1; - RegionCopy(&pSprite->Reg1, &pSprite->windows[i]->borderSize); - ScreenPtr walkScreen = screenInfo.screens[i]; + RegionCopy(&pSprite->Reg1, &pSprite->windows[walkScreenIdx]->borderSize); + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; off_x = walkScreen->x; off_y = walkScreen->y; - while (i--) { - walkScreen = screenInfo.screens[i]; + while (walkScreenIdx--) { + walkScreen = screenInfo.screens[walkScreenIdx]; x = off_x - walkScreen->x; y = off_y - walkScreen->y; @@ -644,7 +645,7 @@ XineramaConfineCursorToWindow(DeviceIntPtr pDev, RegionTranslate(&pSprite->Reg1, x, y); RegionUnion(&pSprite->Reg1, &pSprite->Reg1, - &pSprite->windows[i]->borderSize); + &pSprite->windows[walkScreenIdx]->borderSize); off_x = walkScreen->x; off_y = walkScreen->y; @@ -829,20 +830,20 @@ CheckVirtualMotion(DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin) #ifdef XINERAMA if (!noPanoramiXExtension) { - int x, y, off_x, off_y, i; + int x, y, off_x, off_y; if (!XineramaSetWindowPntrs(pDev, pWin)) return; - i = PanoramiXNumScreens - 1; + unsigned int walkScreenIdx = PanoramiXNumScreens - 1; - RegionCopy(&pSprite->Reg2, &pSprite->windows[i]->borderSize); - ScreenPtr walkScreen = screenInfo.screens[i]; + RegionCopy(&pSprite->Reg2, &pSprite->windows[walkScreenIdx]->borderSize); + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; off_x = walkScreen->x; off_y = walkScreen->y; - while (i--) { - walkScreen = screenInfo.screens[i]; + while (walkScreenIdx--) { + walkScreen = screenInfo.screens[walkScreenIdx]; x = off_x - walkScreen->x; y = off_y - walkScreen->y; @@ -850,7 +851,7 @@ CheckVirtualMotion(DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin) RegionTranslate(&pSprite->Reg2, x, y); RegionUnion(&pSprite->Reg2, &pSprite->Reg2, - &pSprite->windows[i]->borderSize); + &pSprite->windows[walkScreenIdx]->borderSize); off_x = walkScreen->x; off_y = walkScreen->y; @@ -2482,8 +2483,8 @@ DeliverRawEvent(RawDeviceEvent *ev, DeviceIntPtr device) filter = GetEventFilter(device, xi); - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; InputClients *inputclients; WindowPtr root = walkScreen->root; @@ -3014,13 +3015,13 @@ PointInBorderSize(WindowPtr pWin, int x, int y) if (!noPanoramiXExtension && XineramaSetWindowPntrs(inputInfo.pointer, pWin)) { SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite; - int i; - FOR_NSCREENS_FORWARD(i) { - ScreenPtr walkScreen = screenInfo.screens[i]; - if (!i) + unsigned int walkScreenIdx; + FOR_NSCREENS_FORWARD(walkScreenIdx) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; + if (!walkScreenIdx) continue; /* skip screen #0 */ - if (RegionContainsPoint(&pSprite->windows[i]->borderSize, + if (RegionContainsPoint(&pSprite->windows[walkScreenIdx]->borderSize, x + screenInfo.screens[0]->x - walkScreen->x, y + screenInfo.screens[0]->y - @@ -3522,7 +3523,7 @@ static Bool XineramaPointInWindowIsVisible(WindowPtr pWin, int x, int y) { BoxRec box; - int i, xoff, yoff; + int xoff, yoff; if (!pWin->realized) return FALSE; @@ -3536,12 +3537,13 @@ XineramaPointInWindowIsVisible(WindowPtr pWin, int x, int y) xoff = x + screenInfo.screens[0]->x; yoff = y + screenInfo.screens[0]->y; - FOR_NSCREENS_FORWARD(i) { - ScreenPtr walkScreen = screenInfo.screens[i]; - if (!i) + unsigned int walkScreenIdx; + FOR_NSCREENS_FORWARD(walkScreenIdx) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; + if (!walkScreenIdx) continue; /* skip screen #0 */ - pWin = inputInfo.pointer->spriteInfo->sprite->windows[i]; + pWin = inputInfo.pointer->spriteInfo->sprite->windows[walkScreenIdx]; x = xoff - walkScreen->x; y = yoff - walkScreen->y; @@ -3743,13 +3745,13 @@ BorderSizeNotEmpty(DeviceIntPtr pDev, WindowPtr pWin) #ifdef XINERAMA if (!noPanoramiXExtension && XineramaSetWindowPntrs(pDev, pWin)) { - int i; - FOR_NSCREENS_FORWARD(i) { - if (!i) + unsigned int walkScreenIdx; + FOR_NSCREENS_FORWARD(walkScreenIdx) { + if (!walkScreenIdx) continue; /* skip screen #0 */ if (RegionNotEmpty - (&pDev->spriteInfo->sprite->windows[i]->borderSize)) + (&pDev->spriteInfo->sprite->windows[walkScreenIdx]->borderSize)) return TRUE; } } @@ -5994,8 +5996,8 @@ ProcRecolorCursor(ClientPtr client) pCursor->backGreen = stuff->backGreen; pCursor->backBlue = stuff->backBlue; - for (int nscr = 0; nscr < screenInfo.numScreens; nscr++) { - ScreenPtr walkScreen = screenInfo.screens[nscr]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; #ifdef XINERAMA if (!noPanoramiXExtension) displayed = (walkScreen == pSprite->screen); diff --git a/dix/inpututils.c b/dix/inpututils.c index e6b681cd54..15608dec29 100644 --- a/dix/inpututils.c +++ b/dix/inpututils.c @@ -842,8 +842,8 @@ update_desktop_dimensions(void) int x1 = INT_MAX, y1 = INT_MAX; /* top-left */ int x2 = INT_MIN, y2 = INT_MIN; /* bottom-right */ - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; x1 = min(x1, walkScreen->x); y1 = min(y1, walkScreen->y); diff --git a/dix/main.c b/dix/main.c index 197d8c8616..05173847d4 100644 --- a/dix/main.c +++ b/dix/main.c @@ -201,16 +201,16 @@ dix_main(int argc, char *argv[], char *envp[]) InitExtensions(argc, argv); LogMessageVerb(X_INFO, 1, "Extensions initialized\n"); - for (int i = 0; i < screenInfo.numGPUScreens; i++) { - ScreenPtr walkScreen = screenInfo.gpuscreens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numGPUScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.gpuscreens[walkScreenIdx]; if (!PixmapScreenInit(walkScreen)) FatalError("failed to create screen pixmap properties"); if (!dixScreenRaiseCreateResources(walkScreen)) FatalError("failed to create screen resources"); } - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (!PixmapScreenInit(walkScreen)) FatalError("failed to create screen pixmap properties"); @@ -247,8 +247,8 @@ dix_main(int argc, char *argv[], char *envp[]) PanoramiXConsolidate(); #endif /* XINERAMA */ - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; InitRootWindow(walkScreen->root); CallCallbacks(&PostInitRootWindowCallback, walkScreen); } @@ -313,8 +313,8 @@ dix_main(int argc, char *argv[], char *envp[]) InputThreadFini(); - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; walkScreen->root = NullWindow; } @@ -322,17 +322,21 @@ dix_main(int argc, char *argv[], char *envp[]) CloseDownEvents(); - for (int i = screenInfo.numGPUScreens - 1; i >= 0; i--) { - ScreenPtr walkScreen = screenInfo.gpuscreens[i]; - dixFreeScreen(walkScreen); - screenInfo.numGPUScreens = i; + if (screenInfo.numGPUScreens > 0) { + for (int walkScreenIdx = screenInfo.numGPUScreens - 1; walkScreenIdx >= 0; walkScreenIdx--) { + ScreenPtr walkScreen = screenInfo.gpuscreens[walkScreenIdx]; + dixFreeScreen(walkScreen); + screenInfo.numGPUScreens = walkScreenIdx; + } } memset(&screenInfo.gpuscreens, 0, sizeof(screenInfo.gpuscreens)); - for (int i = screenInfo.numScreens - 1; i >= 0; i--) { - ScreenPtr walkScreen = screenInfo.screens[i]; - dixFreeScreen(walkScreen); - screenInfo.numScreens = i; + if (screenInfo.numScreens > 0) { + for (int walkScreenIdx = screenInfo.numScreens - 1; walkScreenIdx >= 0; walkScreenIdx--) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; + dixFreeScreen(walkScreen); + screenInfo.numScreens = walkScreenIdx; + } } memset(&screenInfo.screens, 0, sizeof(screenInfo.screens)); diff --git a/dix/privates.c b/dix/privates.c index 0fbd1dc850..e2e7e0b5c6 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -211,13 +211,13 @@ fixupOneScreen(ScreenPtr pScreen, FixupFunc fixup, unsigned bytes) static Bool fixupScreens(FixupFunc fixup, unsigned bytes) { - for (int s = 0; s < screenInfo.numScreens; s++) { - ScreenPtr walkScreen = screenInfo.screens[s]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (!fixupOneScreen (walkScreen, fixup, bytes)) return FALSE; } - for (int s = 0; s < screenInfo.numGPUScreens; s++) { - ScreenPtr walkScreen = screenInfo.gpuscreens[s]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numGPUScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.gpuscreens[walkScreenIdx]; if (!fixupOneScreen (walkScreen, fixup, bytes)) return FALSE; } @@ -249,8 +249,8 @@ fixupExtensions(FixupFunc fixup, unsigned bytes) static Bool fixupDefaultColormaps(FixupFunc fixup, unsigned bytes) { - for (int s = 0; s < screenInfo.numScreens; s++) { - ScreenPtr walkScreen = screenInfo.screens[s]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; ColormapPtr cmap; dixLookupResourceByType((void **) &cmap, walkScreen->defColormap, X11_RESTYPE_COLORMAP, @@ -300,12 +300,12 @@ static void grow_screen_specific_set(DevPrivateType type, unsigned bytes) { /* Update offsets for all screen-specific keys */ - for (int s = 0; s < screenInfo.numScreens; s++) { - ScreenPtr walkScreen = screenInfo.screens[s]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; grow_private_set(&walkScreen->screenSpecificPrivates[type], bytes); } - for (int s = 0; s < screenInfo.numGPUScreens; s++) { - ScreenPtr walkScreen = screenInfo.gpuscreens[s]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numGPUScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.gpuscreens[walkScreenIdx]; grow_private_set(&walkScreen->screenSpecificPrivates[type], bytes); } } diff --git a/dix/property.c b/dix/property.c index af906fd1ff..2cf134da63 100644 --- a/dix/property.c +++ b/dix/property.c @@ -130,16 +130,17 @@ notifyVRRMode(ClientPtr pClient, WindowPtr pWindow, int state, PropertyPtr pProp #ifdef XINERAMA if (!noPanoramiXExtension) { PanoramiXRes *win; - int rc, j; + int rc; rc = dixLookupResourceByType((void **) &win, pWindow->drawable.id, XRT_WINDOW, pClient, DixWriteAccess); if (rc != Success) goto no_panoramix; - FOR_NSCREENS_BACKWARD(j) { + int walkScreenIdx; + FOR_NSCREENS_BACKWARD(walkScreenIdx) { WindowPtr pWin; - rc = dixLookupWindow(&pWin, win->info[j].id, pClient, DixSetPropAccess); + rc = dixLookupWindow(&pWin, win->info[walkScreenIdx].id, pClient, DixSetPropAccess); if (rc == Success) setVRRMode(pWin, mode); } diff --git a/dix/window.c b/dix/window.c index 63fffc7b25..2119c5aa32 100644 --- a/dix/window.c +++ b/dix/window.c @@ -396,9 +396,9 @@ PrintWindowTree(void) int depth; WindowPtr pWin; - for (int scrnum = 0; scrnum < screenInfo.numScreens; scrnum++) { - ScreenPtr walkScreen = screenInfo.screens[scrnum]; - ErrorF("[dix] Dumping windows for screen %d (pixmap %x):\n", scrnum, + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; + ErrorF("[dix] Dumping windows for screen %d (pixmap %x):\n", walkScreenIdx, (unsigned) walkScreen->GetScreenPixmap(walkScreen)->drawable.id); pWin = walkScreen->root; depth = 1; @@ -2993,7 +2993,7 @@ SendVisibilityNotify(WindowPtr pWin) if (!noPanoramiXExtension) { PanoramiXRes *win; WindowPtr pWin2; - int rc, i, Scrnum; + int rc, Scrnum; Scrnum = pWin->drawable.pScreen->myNum; @@ -3003,21 +3003,23 @@ SendVisibilityNotify(WindowPtr pWin) return; switch (visibility) { - case VisibilityUnobscured: - FOR_NSCREENS_BACKWARD(i) { - if (i == Scrnum) + case VisibilityUnobscured: { + int walkScreenIdx; + FOR_NSCREENS_BACKWARD(walkScreenIdx) { + if (walkScreenIdx == Scrnum) continue; - rc = dixLookupWindow(&pWin2, win->info[i].id, serverClient, + rc = dixLookupWindow(&pWin2, win->info[walkScreenIdx].id, serverClient, DixWriteAccess); if (rc == Success) { if (pWin2->visibility == VisibilityPartiallyObscured) return; - if (!i) + if (!walkScreenIdx) pWin = pWin2; } + } } break; case VisibilityPartiallyObscured: @@ -3028,24 +3030,26 @@ SendVisibilityNotify(WindowPtr pWin) pWin = pWin2; } break; - case VisibilityFullyObscured: - FOR_NSCREENS_BACKWARD(i) { - if (i == Scrnum) + case VisibilityFullyObscured: { + int walkScreenIdx; + FOR_NSCREENS_BACKWARD(walkScreenIdx) { + if (walkScreenIdx == Scrnum) continue; - rc = dixLookupWindow(&pWin2, win->info[i].id, serverClient, + rc = dixLookupWindow(&pWin2, win->info[walkScreenIdx].id, serverClient, DixWriteAccess); if (rc == Success) { if (pWin2->visibility != VisibilityFullyObscured) return; - if (!i) + if (!walkScreenIdx) pWin = pWin2; } } break; } + } win->u.win.visibility = visibility; } @@ -3080,15 +3084,15 @@ dixSaveScreens(ClientPtr client, int on, int mode) type = SCREEN_SAVER_CYCLE; } - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; int rc = XaceHookScreensaverAccess(client, walkScreen, DixShowAccess | DixHideAccess); if (rc != Success) return rc; } - for (int i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (unsigned int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (on == SCREEN_SAVER_FORCER) walkScreen->SaveScreen(walkScreen, on);