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

kdrive: KdCursorOffScreen(): canonical screen iterator index

Browse Source 
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 <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-03 16:24:37 +02:00
committed by Enrico Weigelt
parent ef46dec08d
commit 1b91049083
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hw/kdrive/src/kinput.c
View File

@@ -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;
}
}
}