Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 05:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] fix mouse acceleration when in capture mode

Browse Source 
SDL2 really doesn't do this well, instead I have implemented our own
capture method that allows us to maintain better client/server cursor
sync.
This commit is contained in:
Geoffrey McRae 2020-01-11 04:53:46 +11:00
parent 5b163063c3
commit 1341bf8fbd
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B1-74-gc2a15ad89d+1 B1-75-g5b163063c3+1

29
client/src/main.c
View File

@ -644,15 +644,35 @@ void spiceClipboardRequest(const SpiceDataType type)
static void handleMouseMoveEvent(int ex, int ey) static void handleMouseMoveEvent(int ex, int ey)
{ {
static bool wrapping = false;
static int wrapX, wrapY;
if (state.ignoreInput || !params.useSpiceInput) if (state.ignoreInput || !params.useSpiceInput)
return; return;
if (state.serverMode) if (state.serverMode)
{ {
/* get the screen center as SDL sees it */ if (wrapping)
SDL_GetWindowSize(state.window, &lastX, &lastY); {
lastX /= 2; if (ex == state.windowW / 2 && ey == state.windowH / 2)
lastY /= 2; {
lastX += (state.windowW / 2) - wrapX;
lastY += (state.windowH / 2) - wrapY;
wrapping = false;
}
}
else
{
if (
ex < 100 || ex > state.windowW - 100 ||
ey < 100 || ey > state.windowH - 100)
{
wrapping = true;
wrapX = ex;
wrapY = ey;
SDL_WarpMouseInWindow(state.window, state.windowW / 2, state.windowH / 2);
}
}
} }
else else
{ {
@ -814,7 +834,6 @@ int eventFilter(void * userdata, SDL_Event * event)
{ {
state.serverMode = !state.serverMode; state.serverMode = !state.serverMode;
spice_mouse_mode(state.serverMode); spice_mouse_mode(state.serverMode);
SDL_SetRelativeMouseMode(state.serverMode);
SDL_SetWindowGrab(state.window, state.serverMode); SDL_SetWindowGrab(state.window, state.serverMode);
DEBUG_INFO("Server Mode: %s", state.serverMode ? "on" : "off"); DEBUG_INFO("Server Mode: %s", state.serverMode ? "on" : "off");