mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-14 21:17:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] spice: fix mouse exiting when the window is letterboxed/padded

Browse source
This commit is contained in:
Geoffrey McRae 2020-12-04 20:04:06 +11:00
parent 1a8dfe1cc0
commit 80d911f040
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
client/src/main.c
View file

@ -899,15 +899,9 @@ static void handleMouseMoveEvent(int ex, int ey)
.y = (float)(state.cursor.y + delta.y) / state.scaleY
};
const SDL_Point pos = {
.x = state.windowPos.x + state.border.x + newPos.x,
.y = state.windowPos.y + state.border.y + newPos.y
};
/* check if the movement would exit the window */
if ((newPos.x < 0 || newPos.x >= state.dstRect.w ||
newPos.y < 0 || newPos.y >= state.dstRect.h) &&
isValidCursorLocation(pos.x, pos.y))
if (newPos.x < 0 || newPos.x >= state.dstRect.w ||
newPos.y < 0 || newPos.y >= state.dstRect.h)
{
/* determine where to move the cursor to taking into account any borders
* if the aspect ratio is not being forced */
@ -934,10 +928,15 @@ static void handleMouseMoveEvent(int ex, int ey)
ny = newPos.y + state.dstRect.y * 2;
}
/* put the mouse where it should be and disable warp */
state.warpState = WARP_STATE_WIN_EXIT;
warpMouse(nx, ny);
return;
if (isValidCursorLocation(
state.windowPos.x + state.border.x + nx,
state.windowPos.y + state.border.y + ny))
{
/* put the mouse where it should be and disable warp */
state.warpState = WARP_STATE_WIN_EXIT;
warpMouse(nx, ny);
return;
}
}
}