Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] app: do not toggle capture if escapeKey is held

Browse Source 
When users press escapeKey for a long time, they probably want to
see the help text instead of actually toggling capture. Therefore,
if the key is held down for more than 500 ms, we assume the user
wants to look at the help text and do not toggle capture mode.

500 ms seems to be a decent compromise, allowing slow presses, but
is not enough time for the user to have looked at the help text.
This commit is contained in:
Quantum 2021-02-25 04:01:22 -05:00 committed by Geoffrey McRae
parent 9886c2bf40
commit 521ac706c1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app.c
View File

@ -194,6 +194,7 @@ void app_handleKeyPress(int sc)
if (sc == g_params.escapeKey && !g_state.escapeActive) if (sc == g_params.escapeKey && !g_state.escapeActive)
{ {
g_state.escapeActive = true; g_state.escapeActive = true;
g_state.escapeTime = microtime();
g_state.escapeAction = -1; g_state.escapeAction = -1;
app_showHelp(true); app_showHelp(true);
return; return;
@ -233,7 +234,7 @@ void app_handleKeyRelease(int sc)
{ {
if (g_state.escapeAction == -1) if (g_state.escapeAction == -1)
{ {
if (g_params.useSpiceInput) if (microtime() - g_state.escapeTime < 500000 && g_params.useSpiceInput)
core_setGrab(!g_cursor.grab); core_setGrab(!g_cursor.grab);
} }
else else

1
client/src/main.h
View File

@ -49,6 +49,7 @@ struct AppState
bool ignoreInput; bool ignoreInput;
bool showFPS; bool showFPS;
bool escapeActive; bool escapeActive;
uint64_t escapeTime;
int escapeAction; int escapeAction;
KeybindHandle bindings[KEY_MAX]; KeybindHandle bindings[KEY_MAX];
const char * keyDescription[KEY_MAX]; const char * keyDescription[KEY_MAX];