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

[client] added new option input:grabKeyboardOnFocus

Browse Source
This commit is contained in:
Geoffrey McRae 2020-11-29 07:12:19 +11:00
parent dea7177d29
commit bbcaaccdcc
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/config.c
View File

@ -244,6 +244,13 @@ static struct Option options[] =
.type = OPTION_TYPE_BOOL, .type = OPTION_TYPE_BOOL,
.value.x_bool = true, .value.x_bool = true,
}, },
{
.module = "input",
.name = "grabKeyboardOnFocus",
.description = "Grab the keyboard when focused",
.type = OPTION_TYPE_BOOL,
.value.x_bool = true,
},
{ {
.module = "input", .module = "input",
.name = "escapeKey", .name = "escapeKey",
@ -433,11 +440,12 @@ bool config_load(int argc, char * argv[])
params.showAlerts = option_get_bool ("win", "alerts" ); params.showAlerts = option_get_bool ("win", "alerts" );
params.quickSplash = option_get_bool ("win", "quickSplash" ); params.quickSplash = option_get_bool ("win", "quickSplash" );
params.grabKeyboard = option_get_bool ("input", "grabKeyboard"); params.grabKeyboard = option_get_bool ("input", "grabKeyboard" );
params.escapeKey = option_get_int ("input", "escapeKey" ); params.grabKeyboardOnFocus = option_get_bool ("input", "grabKeyboardOnFocus");
params.hideMouse = option_get_bool ("input", "hideCursor" ); params.escapeKey = option_get_int ("input", "escapeKey" );
params.mouseSens = option_get_int ("input", "mouseSens" ); params.hideMouse = option_get_bool ("input", "hideCursor" );
params.mouseRedraw = option_get_bool ("input", "mouseRedraw" ); params.mouseSens = option_get_int ("input", "mouseSens" );
params.mouseRedraw = option_get_bool ("input", "mouseRedraw" );
params.minimizeOnFocusLoss = option_get_bool("win", "minimizeOnFocusLoss"); params.minimizeOnFocusLoss = option_get_bool("win", "minimizeOnFocusLoss");

6
client/src/main.c
View File

@ -928,6 +928,9 @@ static void handleWindowEnter()
// only called for X11 // only called for X11
static void keyboardGrab() static void keyboardGrab()
{ {
if (!params.grabKeyboardOnFocus)
return;
// grab the keyboard so we can intercept WM keys // grab the keyboard so we can intercept WM keys
XGrabKeyboard( XGrabKeyboard(
state.wminfo.info.x11.display, state.wminfo.info.x11.display,
@ -942,6 +945,9 @@ static void keyboardGrab()
// only called for X11 // only called for X11
static void keyboardUngrab() static void keyboardUngrab()
{ {
if (!params.grabKeyboardOnFocus)
return;
// ungrab the keyboard // ungrab the keyboard
XUngrabKeyboard( XUngrabKeyboard(
state.wminfo.info.x11.display, state.wminfo.info.x11.display,

1
client/src/main.h
View File

@ -151,6 +151,7 @@ struct AppParams
bool ignoreQuit; bool ignoreQuit;
bool noScreensaver; bool noScreensaver;
bool grabKeyboard; bool grabKeyboard;
bool grabKeyboardOnFocus;
SDL_Scancode escapeKey; SDL_Scancode escapeKey;
bool showAlerts; bool showAlerts;
bool captureOnStart; bool captureOnStart;