Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-04-26 08:36:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] always show the cursor when not using spice (fixes #409)

Browse Source
This commit is contained in:
Geoffrey McRae 2021-01-20 00:28:27 +11:00
parent 2bfcfa36df
commit 31eafee468
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
client/src/main.c
View File

@ -394,7 +394,7 @@ static int cursorThread(void * unused)
g_state.lgr->on_mouse_event g_state.lgr->on_mouse_event
( (
g_state.lgrData, g_state.lgrData,
g_cursor.guest.visible && g_cursor.draw, g_cursor.guest.visible && (g_cursor.draw || !params.useSpiceInput),
g_cursor.guest.x, g_cursor.guest.x,
g_cursor.guest.y g_cursor.guest.y
); );
@ -484,7 +484,7 @@ static int cursorThread(void * unused)
g_state.lgr->on_mouse_event g_state.lgr->on_mouse_event
( (
g_state.lgrData, g_state.lgrData,
g_cursor.guest.visible && g_cursor.draw, g_cursor.guest.visible && (g_cursor.draw || !params.useSpiceInput),
g_cursor.guest.x, g_cursor.guest.x,
g_cursor.guest.y g_cursor.guest.y
); );
@ -1743,26 +1743,30 @@ static void register_key_binds(void)
g_state.kbFS = app_register_keybind(KEY_F , toggle_fullscreen, NULL); g_state.kbFS = app_register_keybind(KEY_F , toggle_fullscreen, NULL);
g_state.kbVideo = app_register_keybind(KEY_V , toggle_video , NULL); g_state.kbVideo = app_register_keybind(KEY_V , toggle_video , NULL);
g_state.kbRotate = app_register_keybind(KEY_R , toggle_rotate , NULL); g_state.kbRotate = app_register_keybind(KEY_R , toggle_rotate , NULL);
g_state.kbInput = app_register_keybind(KEY_I , toggle_input , NULL);
g_state.kbQuit = app_register_keybind(KEY_Q , quit , NULL); g_state.kbQuit = app_register_keybind(KEY_Q , quit , NULL);
g_state.kbMouseSensInc = app_register_keybind(KEY_INSERT, mouse_sens_inc , NULL);
g_state.kbMouseSensDec = app_register_keybind(KEY_DELETE, mouse_sens_dec , NULL);
g_state.kbCtrlAltFn[0 ] = app_register_keybind(KEY_F1 , ctrl_alt_fn, NULL); if (params.useSpiceInput)
g_state.kbCtrlAltFn[1 ] = app_register_keybind(KEY_F2 , ctrl_alt_fn, NULL); {
g_state.kbCtrlAltFn[2 ] = app_register_keybind(KEY_F3 , ctrl_alt_fn, NULL); g_state.kbInput = app_register_keybind(KEY_I , toggle_input , NULL);
g_state.kbCtrlAltFn[3 ] = app_register_keybind(KEY_F4 , ctrl_alt_fn, NULL); g_state.kbMouseSensInc = app_register_keybind(KEY_INSERT, mouse_sens_inc , NULL);
g_state.kbCtrlAltFn[4 ] = app_register_keybind(KEY_F5 , ctrl_alt_fn, NULL); g_state.kbMouseSensDec = app_register_keybind(KEY_DELETE, mouse_sens_dec , NULL);
g_state.kbCtrlAltFn[5 ] = app_register_keybind(KEY_F6 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[6 ] = app_register_keybind(KEY_F7 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[7 ] = app_register_keybind(KEY_F8 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[8 ] = app_register_keybind(KEY_F9 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[9 ] = app_register_keybind(KEY_F10, ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[10] = app_register_keybind(KEY_F11, ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[11] = app_register_keybind(KEY_F12, ctrl_alt_fn, NULL);
g_state.kbPass[0] = app_register_keybind(KEY_LEFTMETA , key_passthrough, NULL); g_state.kbCtrlAltFn[0 ] = app_register_keybind(KEY_F1 , ctrl_alt_fn, NULL);
g_state.kbPass[1] = app_register_keybind(KEY_RIGHTMETA, key_passthrough, NULL); g_state.kbCtrlAltFn[1 ] = app_register_keybind(KEY_F2 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[2 ] = app_register_keybind(KEY_F3 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[3 ] = app_register_keybind(KEY_F4 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[4 ] = app_register_keybind(KEY_F5 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[5 ] = app_register_keybind(KEY_F6 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[6 ] = app_register_keybind(KEY_F7 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[7 ] = app_register_keybind(KEY_F8 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[8 ] = app_register_keybind(KEY_F9 , ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[9 ] = app_register_keybind(KEY_F10, ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[10] = app_register_keybind(KEY_F11, ctrl_alt_fn, NULL);
g_state.kbCtrlAltFn[11] = app_register_keybind(KEY_F12, ctrl_alt_fn, NULL);
g_state.kbPass[0] = app_register_keybind(KEY_LEFTMETA , key_passthrough, NULL);
g_state.kbPass[1] = app_register_keybind(KEY_RIGHTMETA, key_passthrough, NULL);
}
} }
static void release_key_binds(void) static void release_key_binds(void)