Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-26 07:23:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] input: add releaseKeysOnFocusLoss option

Browse Source 
This makes dealing with window manager shortcuts that overlap with guest
keys more pleasant, while retaining the previous functionality for users
who prefer it.

For instance, previously, using Alt+Tab (or $mod as Alt in i3/sway
movement commands) would result in the guest retaining Alt as pressed.

When the guest regained focus, it would continue thinking Alt is
pressed, leading to accidentally triggering obscure shortcuts. One had
to remember to press Alt again to "unstick" things, which was
suboptimal.
This commit is contained in:
Tudor Brindus 2021-02-13 02:19:01 -05:00 committed by Geoffrey McRae
parent 98a327e99e
commit 1a407a67b1
4 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
client/README.md
View File

@ -145,21 +145,22 @@ Command line arguments will override any options loaded from the config files.
| win:rotate | | 0 | Rotate the displayed image (0, 90, 180, 270) | | win:rotate | | 0 | Rotate the displayed image (0, 90, 180, 270) |
|---------------------------------------------------------------------------------------------------------------------------------| |---------------------------------------------------------------------------------------------------------------------------------|
|----------------------------------------------------------------------------------------------------------------------------------------------| |-----------------------------------------------------------------------------------------------------------------------------------------------|
| Long | Short | Value | Description | | Long | Short | Value | Description |
|----------------------------------------------------------------------------------------------------------------------------------------------| |-----------------------------------------------------------------------------------------------------------------------------------------------|
| input:grabKeyboard | -G | yes | Grab the keyboard in capture mode | | input:grabKeyboard | -G | no | Grab the keyboard in capture mode |
| input:grabKeyboardOnFocus | | yes | Grab the keyboard when focused | | input:grabKeyboardOnFocus | | no | Grab the keyboard when focused |
| input:escapeKey | -m | 71 = ScrollLock | Specify the escape key, see https://wiki.libsdl.org/SDLScancodeLookup for valid values | | input:releaseKeysOnFocusLoss | | yes | On focus loss, send key up events to guest for all held keys |
| input:ignoreWindowsKeys | | no | Do not pass events for the windows keys to the guest | | input:escapeKey | -m | 70 = KEY_SCROLLLOCK | Specify the escape key, see <linux/input-event-codes.h> for valid values |
| input:hideCursor | -M | yes | Hide the local mouse cursor | | input:ignoreWindowsKeys | | no | Do not pass events for the windows keys to the guest |
| input:mouseSens | | 0 | Initial mouse sensitivity when in capture mode (-9 to 9) | | input:hideCursor | -M | yes | Hide the local mouse cursor |
| input:mouseSmoothing | | yes | Apply simple mouse smoothing when rawMouse is not in use (helps reduce aliasing) | | input:mouseSens | | 0 | Initial mouse sensitivity when in capture mode (-9 to 9) |
| input:rawMouse | | no | Use RAW mouse input when in capture mode (good for gaming) | | input:mouseSmoothing | | yes | Apply simple mouse smoothing when rawMouse is not in use (helps reduce aliasing) |
| input:mouseRedraw | | yes | Mouse movements trigger redraws (ignores FPS minimum) | | input:rawMouse | | no | Use RAW mouse input when in capture mode (good for gaming) |
| input:autoCapture | | no | Try to keep the mouse captured when needed | | input:mouseRedraw | | yes | Mouse movements trigger redraws (ignores FPS minimum) |
| input:captureOnly | | no | Only enable input via SPICE if in capture mode | | input:autoCapture | | no | Try to keep the mouse captured when needed |
|----------------------------------------------------------------------------------------------------------------------------------------------| | input:captureOnly | | no | Only enable input via SPICE if in capture mode |
|-----------------------------------------------------------------------------------------------------------------------------------------------|
|------------------------------------------------------------------------------------------------------------------| |------------------------------------------------------------------------------------------------------------------|
| Long | Short | Value | Description | | Long | Short | Value | Description |

5
client/src/app.c
View File

@ -57,6 +57,11 @@ void app_handleFocusEvent(bool focused)
{ {
core_setGrabQuiet(false); core_setGrabQuiet(false);
core_setCursorInView(false); core_setCursorInView(false);
if (g_params.releaseKeysOnFocusLoss)
for (int key = 0; key < KEY_MAX; key++)
if (g_state.keyDown[key])
app_handleKeyRelease(key);
} }
g_cursor.realign = true; g_cursor.realign = true;

30
client/src/config.c
View File

@ -271,6 +271,13 @@ static struct Option options[] =
.type = OPTION_TYPE_BOOL, .type = OPTION_TYPE_BOOL,
.value.x_bool = true, .value.x_bool = true,
}, },
{
.module = "input",
.name = "releaseKeysOnFocusLoss",
.description = "On focus loss, send key up events to guest for all held keys",
.type = OPTION_TYPE_BOOL,
.value.x_bool = true
},
{ {
.module = "input", .module = "input",
.name = "escapeKey", .name = "escapeKey",
@ -512,17 +519,18 @@ bool config_load(int argc, char * argv[])
case 270: g_params.winRotate = LG_ROTATE_270; break; case 270: g_params.winRotate = LG_ROTATE_270; break;
} }
g_params.grabKeyboard = option_get_bool("input", "grabKeyboard" ); g_params.grabKeyboard = option_get_bool("input", "grabKeyboard" );
g_params.grabKeyboardOnFocus = option_get_bool("input", "grabKeyboardOnFocus"); g_params.grabKeyboardOnFocus = option_get_bool("input", "grabKeyboardOnFocus" );
g_params.escapeKey = option_get_int ("input", "escapeKey" ); g_params.releaseKeysOnFocusLoss = option_get_bool("input", "releaseKeysOnFocusLoss");
g_params.ignoreWindowsKeys = option_get_bool("input", "ignoreWindowsKeys" ); g_params.escapeKey = option_get_int ("input", "escapeKey" );
g_params.hideMouse = option_get_bool("input", "hideCursor" ); g_params.ignoreWindowsKeys = option_get_bool("input", "ignoreWindowsKeys" );
g_params.mouseSens = option_get_int ("input", "mouseSens" ); g_params.hideMouse = option_get_bool("input", "hideCursor" );
g_params.mouseSmoothing = option_get_bool("input", "mouseSmoothing" ); g_params.mouseSens = option_get_int ("input", "mouseSens" );
g_params.rawMouse = option_get_bool("input", "rawMouse" ); g_params.mouseSmoothing = option_get_bool("input", "mouseSmoothing" );
g_params.mouseRedraw = option_get_bool("input", "mouseRedraw" ); g_params.rawMouse = option_get_bool("input", "rawMouse" );
g_params.autoCapture = option_get_bool("input", "autoCapture" ); g_params.mouseRedraw = option_get_bool("input", "mouseRedraw" );
g_params.captureInputOnly = option_get_bool("input", "captureOnly" ); g_params.autoCapture = option_get_bool("input", "autoCapture" );
g_params.captureInputOnly = option_get_bool("input", "captureOnly" );
g_params.minimizeOnFocusLoss = option_get_bool("win", "minimizeOnFocusLoss"); g_params.minimizeOnFocusLoss = option_get_bool("win", "minimizeOnFocusLoss");

1
client/src/main.h
View File

@ -128,6 +128,7 @@ struct AppParams
bool grabKeyboardOnFocus; bool grabKeyboardOnFocus;
int escapeKey; int escapeKey;
bool ignoreWindowsKeys; bool ignoreWindowsKeys;
bool releaseKeysOnFocusLoss;
bool showAlerts; bool showAlerts;
bool captureOnStart; bool captureOnStart;
bool quickSplash; bool quickSplash;