mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-03-06 08:40:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[client] added the ability to specify the capture key (-m)

Browse source
This commit is contained in:
Geoffrey McRae 2018-05-29 08:51:58 +10:00
parent afdae8efc0
commit a084b2b32f
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
client/main.c
View file

@ -100,6 +100,7 @@ struct AppParams
bool hideMouse; bool hideMouse;
bool ignoreQuit; bool ignoreQuit;
bool allowScreensaver; bool allowScreensaver;
SDL_Scancode captureKey;
bool forceRenderer; bool forceRenderer;
unsigned int forceRendererIndex; unsigned int forceRendererIndex;
@ -131,6 +132,7 @@ struct AppParams params =
.hideMouse = true, .hideMouse = true,
.ignoreQuit = false, .ignoreQuit = false,
.allowScreensaver = true, .allowScreensaver = true,
.captureKey = SDL_SCANCODE_SCROLLLOCK,
.forceRenderer = false .forceRenderer = false
}; };
@ -514,7 +516,7 @@ int eventFilter(void * userdata, SDL_Event * event)
case SDL_KEYDOWN: case SDL_KEYDOWN:
{ {
SDL_Scancode sc = event->key.keysym.scancode; SDL_Scancode sc = event->key.keysym.scancode;
if (sc == SDL_SCANCODE_SCROLLLOCK) if (sc == params.captureKey)
{ {
if (event->key.repeat) if (event->key.repeat)
break; break;
@ -549,7 +551,7 @@ int eventFilter(void * userdata, SDL_Event * event)
case SDL_KEYUP: case SDL_KEYUP:
{ {
SDL_Scancode sc = event->key.keysym.scancode; SDL_Scancode sc = event->key.keysym.scancode;
if (sc == SDL_SCANCODE_SCROLLLOCK) if (sc == params.captureKey)
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
@ -1057,6 +1059,8 @@ void doHelp(char * app)
" -b HEIGHT Initial window height [current: %u]\n" " -b HEIGHT Initial window height [current: %u]\n"
" -Q Ignore requests to quit (ie: Alt+F4)\n" " -Q Ignore requests to quit (ie: Alt+F4)\n"
" -S Disable the screensaver\n" " -S Disable the screensaver\n"
" -m CODE Specify the capture key [current: %u (%s)]\n"
" See https://wiki.libsdl.org/SDLScancodeLookup for valid values\n"
"\n" "\n"
" -l License information\n" " -l License information\n"
"\n", "\n",
@ -1070,7 +1074,9 @@ void doHelp(char * app)
params.center ? "center" : x, params.center ? "center" : x,
params.center ? "center" : y, params.center ? "center" : y,
params.w, params.w,
params.h params.h,
params.captureKey,
SDL_GetScancodeName(params.captureKey)
); );
} }
@ -1193,6 +1199,17 @@ static bool load_config(const char * configFile)
} }
params.fpsLimit = (unsigned int)itmp; params.fpsLimit = (unsigned int)itmp;
} }
if (config_setting_lookup_int(global, "captureKey", &itmp))
{
if (itmp <= SDL_SCANCODE_UNKNOWN || itmp > SDL_SCANCODE_APP2)
{
DEBUG_ERROR("Invalid capture key value, see https://wiki.libsdl.org/SDLScancodeLookup");
config_destroy(&cfg);
return false;
}
params.captureKey = (SDL_Scancode)itmp;
}
} }
config_setting_t * spice = config_lookup(&cfg, "spice"); config_setting_t * spice = config_lookup(&cfg, "spice");
@ -1286,7 +1303,7 @@ int main(int argc, char * argv[])
for(;;) for(;;)
{ {
switch(getopt(argc, argv, "hC:f:L:sc:p:jMvK:kg:o:anrdFx:y:w:b:QSl")) switch(getopt(argc, argv, "hC:f:L:sc:p:jMvK:kg:o:anrdFx:y:w:b:QSm:l"))
{ {
case '?': case '?':
case 'h': case 'h':
@ -1511,6 +1528,10 @@ int main(int argc, char * argv[])
params.allowScreensaver = false; params.allowScreensaver = false;
continue; continue;
case 'm':
params.captureKey = atoi(optarg);
continue;
case 'l': case 'l':
doLicense(); doLicense();
return 0; return 0;