Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-14 01:58:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] spice: take into account the render rect for the new x/y pos

Browse Source
This commit is contained in:
Geoffrey McRae 2021-01-03 17:42:58 +11:00
parent cd06fc251f
commit 9f495863cd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/main.c
View File

@ -837,8 +837,8 @@ static void handleMouseMoveEvent(int ex, int ey)
{ {
state.cursorInView = true; state.cursorInView = true;
spice_mouse_motion(delta.x, delta.y); spice_mouse_motion(delta.x, delta.y);
if (ex < 100 || ex > state.windowW - 100 || if (ex < 50 || ex > state.windowW - 50 ||
ey < 100 || ey > state.windowH - 100) ey < 50 || ey > state.windowH - 50)
warpMouse(state.windowW / 2, state.windowH / 2); warpMouse(state.windowW / 2, state.windowH / 2);
} }
@ -885,8 +885,8 @@ static void handleMouseMoveEvent(int ex, int ey)
} }
else if (inView) else if (inView)
{ {
if (ex < 100 || ex > state.windowW - 100 || if (ex < state.dstRect.x + 50 || ex > state.dstRect.w - 50 ||
ey < 100 || ey > state.windowH - 100) ey < state.dstRect.y + 50 || ey > state.dstRect.h - 50)
warpMouse(state.windowW / 2, state.windowH / 2); warpMouse(state.windowW / 2, state.windowH / 2);
} }
@ -927,8 +927,11 @@ static void handleMouseMoveEvent(int ex, int ey)
if (newPos.x < 0 || newPos.x >= state.dstRect.w || if (newPos.x < 0 || newPos.x >= state.dstRect.w ||
newPos.y < 0 || newPos.y >= state.dstRect.h) newPos.y < 0 || newPos.y >= state.dstRect.h)
{ {
const int nx = state.windowPos.x + state.border.x + newPos.x; const int nx = state.windowPos.x + state.border.x +
const int ny = state.windowPos.y + state.border.y + newPos.y; state.dstRect.x + newPos.x;
const int ny = state.windowPos.y + state.border.y +
state.dstRect.y + newPos.y;
if (isValidCursorLocation(nx, ny)) if (isValidCursorLocation(nx, ny))
{ {
/* put the mouse where it should be and disable warp */ /* put the mouse where it should be and disable warp */