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] Added option for custom window title

Browse Source
This commit is contained in:
NamoDev 2019-03-13 16:17:24 -04:00 committed by Geoffrey McRae
parent 182c4752d5
commit 80f5d3a660
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/main.c
View File

@ -120,6 +120,8 @@ struct AppParams
bool forceRenderer; bool forceRenderer;
unsigned int forceRendererIndex; unsigned int forceRendererIndex;
RendererOpts rendererOpts[LG_RENDERER_COUNT]; RendererOpts rendererOpts[LG_RENDERER_COUNT];
char * windowTitle;
}; };
struct AppState state; struct AppState state;
@ -153,7 +155,8 @@ struct AppParams params =
.grabKeyboard = true, .grabKeyboard = true,
.captureKey = SDL_SCANCODE_SCROLLLOCK, .captureKey = SDL_SCANCODE_SCROLLLOCK,
.disableAlerts = false, .disableAlerts = false,
.forceRenderer = false .forceRenderer = false,
.windowTitle = "Looking Glass (Client)"
}; };
struct CBRequest struct CBRequest
@ -1035,7 +1038,7 @@ int run()
} }
state.window = SDL_CreateWindow( state.window = SDL_CreateWindow(
"Looking Glass (Client)", params.windowTitle,
params.center ? SDL_WINDOWPOS_CENTERED : params.x, params.center ? SDL_WINDOWPOS_CENTERED : params.x,
params.center ? SDL_WINDOWPOS_CENTERED : params.y, params.center ? SDL_WINDOWPOS_CENTERED : params.y,
params.w, params.w,
@ -1366,6 +1369,7 @@ void doHelp(char * app)
" -m CODE Specify the capture key [current: %u (%s)]\n" " -m CODE Specify the capture key [current: %u (%s)]\n"
" See https://wiki.libsdl.org/SDLScancodeLookup for valid values\n" " See https://wiki.libsdl.org/SDLScancodeLookup for valid values\n"
" -q Disable alert messages [current: %s]\n" " -q Disable alert messages [current: %s]\n"
" -t TITLE Use a custom title for the main window\n"
"\n" "\n"
" -l License information\n" " -l License information\n"
"\n", "\n",
@ -1517,6 +1521,13 @@ static bool load_config(const char * configFile)
} }
params.captureKey = (SDL_Scancode)itmp; params.captureKey = (SDL_Scancode)itmp;
} }
if (config_setting_lookup_string(global, "windowTitle", &stmp))
{
free(params.windowTitle);
params.windowTitle = strdup(stmp);
}
} }
config_setting_t * spice = config_lookup(&cfg, "spice"); config_setting_t * spice = config_lookup(&cfg, "spice");
@ -1619,7 +1630,7 @@ int main(int argc, char * argv[])
for(;;) for(;;)
{ {
switch(getopt(argc, argv, "hC:f:L:s:c:p:jMvK:kg:o:anrdFx:y:w:b:QSGm:lq")) switch(getopt(argc, argv, "hC:f:L:s:c:p:jMvK:kg:o:anrdFx:y:w:b:QSGm:lqt:"))
{ {
case '?': case '?':
case 'h': case 'h':
@ -1873,6 +1884,10 @@ int main(int argc, char * argv[])
params.disableAlerts = true; params.disableAlerts = true;
continue; continue;
case 't':
params.windowTitle = strdup(optarg);
continue;
case 'l': case 'l':
doLicense(); doLicense();
return 0; return 0;