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] main: don't ignore keybinds when spice is disabled

Browse Source
This commit is contained in:
Geoffrey McRae 2019-03-29 02:33:09 +11:00
parent 10217fc8d9
commit 5d254c7751
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
a12-130-g226dd28be8+1 a12-131-g10217fc8d9+1

49
client/src/main.c
View File

@ -737,16 +737,10 @@ int eventFilter(void * userdata, SDL_Event * event)
state.lgc->wmevent(event->syswm.msg); state.lgc->wmevent(event->syswm.msg);
return 0; return 0;
} }
}
if (!params.useSpiceInput)
return 0;
switch(event->type)
{
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
{ {
if (state.ignoreInput) if (state.ignoreInput || !params.useSpiceInput)
break; break;
if ( if (
@ -824,7 +818,7 @@ int eventFilter(void * userdata, SDL_Event * event)
break; break;
} }
if (state.ignoreInput) if (state.ignoreInput || !params.useSpiceInput)
break; break;
uint32_t scancode = mapScancode(sc); uint32_t scancode = mapScancode(sc);
@ -851,22 +845,25 @@ int eventFilter(void * userdata, SDL_Event * event)
{ {
if (state.escapeAction == params.escapeKey) if (state.escapeAction == params.escapeKey)
{ {
serverMode = !serverMode; if (params.useSpiceInput)
spice_mouse_mode(serverMode); {
SDL_SetRelativeMouseMode(serverMode); serverMode = !serverMode;
SDL_SetWindowGrab(state.window, serverMode); spice_mouse_mode(serverMode);
DEBUG_INFO("Server Mode: %s", serverMode ? "on" : "off"); SDL_SetRelativeMouseMode(serverMode);
SDL_SetWindowGrab(state.window, serverMode);
DEBUG_INFO("Server Mode: %s", serverMode ? "on" : "off");
if (state.lgr && !params.disableAlerts) if (state.lgr && !params.disableAlerts)
state.lgr->on_alert( state.lgr->on_alert(
state.lgrData, state.lgrData,
serverMode ? LG_ALERT_SUCCESS : LG_ALERT_WARNING, serverMode ? LG_ALERT_SUCCESS : LG_ALERT_WARNING,
serverMode ? "Capture Enabled" : "Capture Disabled", serverMode ? "Capture Enabled" : "Capture Disabled",
NULL NULL
); );
if (!serverMode) if (!serverMode)
realignGuest = true; realignGuest = true;
}
} }
else else
{ {
@ -878,7 +875,7 @@ int eventFilter(void * userdata, SDL_Event * event)
state.escapeActive = false; state.escapeActive = false;
} }
if (state.ignoreInput) if (state.ignoreInput || !params.useSpiceInput)
break; break;
// avoid sending key up events when we didn't send a down // avoid sending key up events when we didn't send a down
@ -900,7 +897,7 @@ int eventFilter(void * userdata, SDL_Event * event)
} }
case SDL_MOUSEWHEEL: case SDL_MOUSEWHEEL:
if (state.ignoreInput) if (state.ignoreInput || !params.useSpiceInput)
break; break;
if ( if (
@ -914,7 +911,7 @@ int eventFilter(void * userdata, SDL_Event * event)
break; break;
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
if (state.ignoreInput) if (state.ignoreInput || !params.useSpiceInput)
break; break;
// The SPICE protocol doesn't support more than a standard PS/2 3 button mouse // The SPICE protocol doesn't support more than a standard PS/2 3 button mouse
@ -931,7 +928,7 @@ int eventFilter(void * userdata, SDL_Event * event)
break; break;
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
if (state.ignoreInput) if (state.ignoreInput || !params.useSpiceInput)
break; break;
// The SPICE protocol doesn't support more than a standard PS/2 3 button mouse // The SPICE protocol doesn't support more than a standard PS/2 3 button mouse