From 7fd4ba3aadfb0facbc9985ccaf05e73c1d945683 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Fri, 29 Mar 2019 02:17:06 +1100 Subject: [PATCH] [client] main: added +I for spice input enable toggle --- VERSION | 2 +- client/src/main.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 6d2efeab..008435fe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -a12-126-g30ea57c644+1 \ No newline at end of file +a12-127-gecfcf11c05+1 \ No newline at end of file diff --git a/client/src/main.c b/client/src/main.c index 84a328d2..9b35dc8f 100644 --- a/client/src/main.c +++ b/client/src/main.c @@ -50,6 +50,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA struct AppState { bool running; + bool ignoreInput; bool escapeActive; SDL_Scancode escapeAction; KeybindHandle bindings[SDL_NUM_SCANCODES]; @@ -85,6 +86,7 @@ struct AppState uint64_t renderCount; KeybindHandle kbFS; + KeybindHandle kbInput; }; typedef struct RenderOpts @@ -744,6 +746,9 @@ int eventFilter(void * userdata, SDL_Event * event) { case SDL_MOUSEMOTION: { + if (state.ignoreInput) + break; + if ( !serverMode && ( event->motion.x < state.dstRect.x || @@ -819,6 +824,9 @@ int eventFilter(void * userdata, SDL_Event * event) break; } + if (state.ignoreInput) + break; + uint32_t scancode = mapScancode(sc); if (scancode == 0) break; @@ -870,6 +878,9 @@ int eventFilter(void * userdata, SDL_Event * event) state.escapeActive = false; } + if (state.ignoreInput) + break; + // avoid sending key up events when we didn't send a down if (!state.keyDown[sc]) break; @@ -889,6 +900,9 @@ int eventFilter(void * userdata, SDL_Event * event) } case SDL_MOUSEWHEEL: + if (state.ignoreInput) + break; + if ( !spice_mouse_press (event->wheel.y == 1 ? 4 : 5) || !spice_mouse_release(event->wheel.y == 1 ? 4 : 5) @@ -900,6 +914,9 @@ int eventFilter(void * userdata, SDL_Event * event) break; case SDL_MOUSEBUTTONDOWN: + if (state.ignoreInput) + break; + // The SPICE protocol doesn't support more than a standard PS/2 3 button mouse if (event->button.button > 3) break; @@ -914,6 +931,9 @@ int eventFilter(void * userdata, SDL_Event * event) break; case SDL_MOUSEBUTTONUP: + if (state.ignoreInput) + break; + // The SPICE protocol doesn't support more than a standard PS/2 3 button mouse if (event->button.button > 3) break; @@ -1002,20 +1022,27 @@ static bool try_renderer(const int index, const LG_RendererParams lgrParams, Uin return true; } -void toggle_fullscreen(SDL_Scancode key, void * opaque) +static void toggle_fullscreen(SDL_Scancode key, void * opaque) { SDL_SetWindowFullscreen(state.window, params.fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP); params.fullscreen = !params.fullscreen; } +static void toggle_input(SDL_Scancode key, void * opaque) +{ + state.ignoreInput = !state.ignoreInput; +} + static void register_key_binds() { - state.kbFS = app_register_keybind(SDL_SCANCODE_F, toggle_fullscreen, NULL); + state.kbFS = app_register_keybind(SDL_SCANCODE_F, toggle_fullscreen, NULL); + state.kbInput = app_register_keybind(SDL_SCANCODE_I, toggle_input , NULL); } static void release_key_binds() { app_release_keybind(&state.kbFS); + app_release_keybind(&state.kbInput); } int run()