[client] don't hide the cursor when SPICE is disabled

Fixes #304
This commit is contained in:
Geoffrey McRae 2020-08-21 15:40:22 +10:00
parent 7d2b39058c
commit 8692e9af80
2 changed files with 7 additions and 3 deletions

View File

@ -1 +1 @@
B2-rc4-9-g6927dbecd2+1 B2-rc4-10-g7d2b39058c+1

View File

@ -281,7 +281,7 @@ static int cursorThread(void * unused)
state.lgr->on_mouse_event state.lgr->on_mouse_event
( (
state.lgrData, state.lgrData,
state.cursorVisible && state.drawCursor && state.cursorInView, state.cursorVisible && state.drawCursor,
state.cursor.x, state.cursor.x,
state.cursor.y state.cursor.y
); );
@ -356,7 +356,7 @@ static int cursorThread(void * unused)
state.lgr->on_mouse_event state.lgr->on_mouse_event
( (
state.lgrData, state.lgrData,
state.cursorVisible && state.drawCursor && state.cursorInView, state.cursorVisible && state.drawCursor,
state.cursor.x, state.cursor.x,
state.cursor.y state.cursor.y
); );
@ -730,6 +730,9 @@ static void handleMouseMoveEvent(int ex, int ey)
state.cursorInView = false; state.cursorInView = false;
state.updateCursor = true; state.updateCursor = true;
state.warpState = WARP_STATE_OFF; state.warpState = WARP_STATE_OFF;
if (params.useSpiceInput)
state.drawCursor = false;
return; return;
} }
} }
@ -738,6 +741,7 @@ static void handleMouseMoveEvent(int ex, int ey)
{ {
state.cursorInView = true; state.cursorInView = true;
state.updateCursor = true; state.updateCursor = true;
state.drawCursor = true;
if (state.warpState == WARP_STATE_ARMED) if (state.warpState == WARP_STATE_ARMED)
state.warpState = WARP_STATE_ON; state.warpState = WARP_STATE_ON;
} }