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

[client] spice: fix reversed warp offset math and incorrect lookbehind

Browse Source
This commit is contained in:
Geoffrey McRae 2021-01-07 02:05:47 +11:00
parent 9b309db964
commit 026251cfd9
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/main.c
View File

@ -792,18 +792,10 @@ static void warpMouse(int x, int y, bool disable)
if (disable) if (disable)
g_cursor.warpState = WARP_STATE_OFF; g_cursor.warpState = WARP_STATE_OFF;
struct WarpInfo * last;
struct WarpInfo * warp = malloc(sizeof(struct WarpInfo)); struct WarpInfo * warp = malloc(sizeof(struct WarpInfo));
warp->x = g_cursor.last.x; warp->x = g_cursor.last.x;
warp->y = g_cursor.last.y; warp->y = g_cursor.last.y;
/* if there is a queued warp still, adjust for it */
if (ll_peek_tail(g_cursor.warpList, (void **)&last))
{
warp->x += x - last->x;
warp->y += y - last->y;
}
if (g_state.wminfo.subsystem == SDL_SYSWM_X11) if (g_state.wminfo.subsystem == SDL_SYSWM_X11)
{ {
warp->serial = NextRequest(g_state.wminfo.info.x11.display); warp->serial = NextRequest(g_state.wminfo.info.x11.display);
@ -1087,8 +1079,8 @@ static void processWarp(int x, int y)
ll_shift(g_cursor.warpList, NULL); ll_shift(g_cursor.warpList, NULL);
g_cursor.last.x = x + (g_cursor.last.x - warp->x); g_cursor.last.x = x + (warp->x - g_cursor.last.x);
g_cursor.last.y = y + (g_cursor.last.y - warp->y); g_cursor.last.y = y + (warp->y - g_cursor.last.y);
free(warp); free(warp);
if (ll_count(g_cursor.warpList) == 0 && g_cursor.inWindow) if (ll_count(g_cursor.warpList) == 0 && g_cursor.inWindow)
@ -1104,8 +1096,8 @@ static void processXWarp(const XEvent xe, int x, int y)
ll_shift(g_cursor.warpList, NULL); ll_shift(g_cursor.warpList, NULL);
g_cursor.last.x = x + (g_cursor.last.x - warp->x); g_cursor.last.x = x + (warp->x - g_cursor.last.x);
g_cursor.last.y = y + (g_cursor.last.y - warp->y); g_cursor.last.y = y + (warp->y - g_cursor.last.y);
free(warp); free(warp);
if (ll_count(g_cursor.warpList) == 0 && g_cursor.inWindow) if (ll_count(g_cursor.warpList) == 0 && g_cursor.inWindow)