morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Unified /app-* command line arguments

Browse Source
This commit is contained in:
akallabeth
2022-10-20 12:43:51 +02:00
committed by akallabeth
parent f7850f08aa
commit e3528e3728
2 changed files with 102 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
client/common/cmdline.c
View File

@@ -2108,11 +2108,13 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_
else if (!freerdp_settings_set_bool(settings, FreeRDP_UnicodeInput, bval > 0))
rc = COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
#if defined(WITH_FREERDP_DEPRECATED_COMMANDLINE)
else if (count == 1)
{
/* Legacy, allow /kbd:<value> for setting keyboard layout */
rc = parse_kbd_layout(settings, val);
}
#endif
else
rc = COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
@@ -2123,6 +2125,91 @@ static int parse_kbd_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_
return rc;
}
static int parse_app_option_program(rdpSettings* settings, const char* cmd)
{
const size_t ids[] = { FreeRDP_RemoteApplicationMode, FreeRDP_RemoteAppLanguageBarSupported,
FreeRDP_Workarea, FreeRDP_DisableWallpaper,
FreeRDP_DisableFullWindowDrag };
if (!freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationProgram, cmd))
return COMMAND_LINE_ERROR_MEMORY;
for (size_t y = 0; y < ARRAYSIZE(ids); y++)
{
if (!freerdp_settings_set_bool(settings, ids[y], TRUE))
return COMMAND_LINE_ERROR;
}
return CHANNEL_RC_OK;
}
static int parse_app_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_A* arg)
{
WINPR_ASSERT(settings);
WINPR_ASSERT(arg);
int rc = CHANNEL_RC_OK;
size_t count = 0;
char** ptr = CommandLineParseCommaSeparatedValues(arg->Value, &count);
if (!ptr || (count == 0))
rc = COMMAND_LINE_ERROR;
else
{
struct app_map
{
const char* name;
size_t nlen;
size_t id;
int (*fkt)(rdpSettings* settings, const char* value);
};
const struct app_map amap[] = {
{ "program:", 8, FreeRDP_RemoteApplicationProgram, parse_app_option_program },
{ "workdir:", 8, FreeRDP_RemoteApplicationWorkingDir, NULL },
{ "name:", 5, FreeRDP_RemoteApplicationName, NULL },
{ "icon:", 5, FreeRDP_RemoteApplicationIcon, NULL },
{ "cmd:", 4, FreeRDP_RemoteApplicationCmdLine, NULL },
{ "file:", 5, FreeRDP_RemoteApplicationFile, NULL },
{ "guid:", 5, FreeRDP_RemoteApplicationGuid, NULL },
};
for (size_t x = 0; x < count; x++)
{
BOOL handled = FALSE;
const char* val = ptr[x];
for (size_t y = 0; y < ARRAYSIZE(amap); y++)
{
const struct app_map* cur = &amap[y];
if (_strnicmp(val, cur->name, cur->nlen) == 0)
{
if (cur->fkt)
rc = cur->fkt(settings, &val[cur->nlen]);
else if (!freerdp_settings_set_string(settings, cur->id, &val[cur->nlen]))
rc = COMMAND_LINE_ERROR_MEMORY;
handled = TRUE;
break;
}
}
#if defined(WITH_FREERDP_DEPRECATED_COMMANDLINE)
if (!handled && (count == 1))
{
/* Legacy path, allow /app:command and /app:||command syntax */
rc = parse_app_option_program(settings, val);
}
else
#endif
if (!handled)
rc = COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
if (rc != 0)
break;
}
}
free(ptr);
return rc;
}
static int parse_cache_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_A* arg)
{
WINPR_ASSERT(settings);
@@ -2903,21 +2990,9 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
}
CommandLineSwitchCase(arg, "app")
{
if (!freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationProgram,
arg->Value))
return COMMAND_LINE_ERROR_MEMORY;
settings->RemoteApplicationMode = TRUE;
settings->RemoteAppLanguageBarSupported = TRUE;
settings->Workarea = TRUE;
settings->DisableWallpaper = TRUE;
settings->DisableFullWindowDrag = TRUE;
}
CommandLineSwitchCase(arg, "app-workdir")
{
if (!freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationWorkingDir,
arg->Value))
return COMMAND_LINE_ERROR_MEMORY;
int rc = parse_app_options(settings, arg);
if (rc != 0)
return rc;
}
CommandLineSwitchCase(arg, "load-balance-info")
{
@@ -2926,6 +3001,13 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
settings->LoadBalanceInfoLength = (UINT32)strlen((char*)settings->LoadBalanceInfo);
}
#if defined(WITH_FREERDP_DEPRECATED_COMMANDLINE_COMMANDLINE)
CommandLineSwitchCase(arg, "app-workdir")
{
if (!freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationWorkingDir,
arg->Value))
return COMMAND_LINE_ERROR_MEMORY;
}
CommandLineSwitchCase(arg, "app-name")
{
if (!freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationName, arg->Value))
@@ -2952,6 +3034,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
if (!freerdp_settings_set_string(settings, FreeRDP_RemoteApplicationGuid, arg->Value))
return COMMAND_LINE_ERROR_MEMORY;
}
#endif
CommandLineSwitchCase(arg, "compression")
{
settings->CompressionEnabled = enable;

6
client/common/cmdline.h
View File

@@ -32,8 +32,10 @@ static const COMMAND_LINE_ARGUMENT_A global_cmd_args[] = {
"Admin (or console) session" },
{ "aero", COMMAND_LINE_VALUE_BOOL, NULL, NULL, BoolValueFalse, -1, NULL,
"desktop composition" },
{ "app", COMMAND_LINE_VALUE_REQUIRED, "<path> or ||<alias>", NULL, NULL, -1, NULL,
"Remote application program" },
{ "app", COMMAND_LINE_VALUE_REQUIRED,
"program:[<path>|<||alias>],cmd:<command>,file:<filename>,guid:<guid>,icon:<filename>,name:<"
"name>,workdir:<directory>",
NULL, NULL, -1, NULL, "Remote application program" },
#if defined(WITH_FREERDP_DEPRECATED_COMMANDLINE)
{ "app-cmd", COMMAND_LINE_VALUE_REQUIRED, "<parameters>", NULL, NULL, -1, NULL,
"[DEPRECATED, use /app:cmd:<command>] Remote application command-line parameters" },