From 1b91049083d85f991251b02088b8a288c8a29434 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Sep 2025 16:24:37 +0200 Subject: [PATCH] kdrive: KdCursorOffScreen(): canonical screen iterator index in preparation of upcoming generic screen iterator macros, already rename the index variable to what the macro will be using. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/kdrive/src/kinput.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index e12676e69..88026c292 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -2115,7 +2115,6 @@ static Bool KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y) { ScreenPtr pScreen = *ppScreen; - int n; int best_x, best_y; int n_best_x, n_best_y; CARD32 ms; @@ -2135,8 +2134,8 @@ KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y) best_x = 32767; n_best_y = -1; best_y = 32767; - for (n = 0; n < screenInfo.numScreens; n++) { - ScreenPtr walkScreen = screenInfo.screens[n]; + for (int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; if (walkScreen == pScreen) continue; int dx = KdScreenOrigin(walkScreen)->x - KdScreenOrigin(pScreen)->x; @@ -2144,25 +2143,25 @@ KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y) if (*x < 0) { if (dx < 0 && -dx < best_x) { best_x = -dx; - n_best_x = n; + n_best_x = walkScreenIdx; } } else if (*x >= pScreen->width) { if (dx > 0 && dx < best_x) { best_x = dx; - n_best_x = n; + n_best_x = walkScreenIdx; } } if (*y < 0) { if (dy < 0 && -dy < best_y) { best_y = -dy; - n_best_y = n; + n_best_y = walkScreenIdx; } } else if (*y >= pScreen->height) { if (dy > 0 && dy < best_y) { best_y = dy; - n_best_y = n; + n_best_y = walkScreenIdx; } } }