mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2979 from RedSoxFan/config-var-repl

Browse source 
Alter config variable replacement process
This commit is contained in:
Drew DeVault 2018-11-12 11:13:59 -05:00 committed by GitHub
parent ee6b0ce24a b277000601
commit 2e43f02427
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
sway/commands.c
View file

@ -353,12 +353,14 @@ struct cmd_results *config_command(char *exec) {
struct cmd_results *results = NULL; struct cmd_results *results = NULL;
int argc; int argc;
char **argv = split_args(exec, &argc); char **argv = split_args(exec, &argc);
// Check for empty lines
if (!argc) { if (!argc) {
results = cmd_results_new(CMD_SUCCESS, NULL, NULL); results = cmd_results_new(CMD_SUCCESS, NULL, NULL);
goto cleanup; goto cleanup;
} }
// Start block // Check for the start of a block
if (argc > 1 && strcmp(argv[argc - 1], "{") == 0) { if (argc > 1 && strcmp(argv[argc - 1], "{") == 0) {
char *block = join_args(argv, argc - 1); char *block = join_args(argv, argc - 1);
results = cmd_results_new(CMD_BLOCK, block, NULL); results = cmd_results_new(CMD_BLOCK, block, NULL);
@ -366,22 +368,54 @@ struct cmd_results *config_command(char *exec) {
goto cleanup; goto cleanup;
} }
// Endblock // Check for the end of a block
if (strcmp(argv[argc - 1], "}") == 0) { if (strcmp(argv[argc - 1], "}") == 0) {
results = cmd_results_new(CMD_BLOCK_END, NULL, NULL); results = cmd_results_new(CMD_BLOCK_END, NULL, NULL);
goto cleanup; goto cleanup;
} }
wlr_log(WLR_INFO, "handling config command '%s'", exec);
// Make sure the command is not stored in a variable
if (*argv[0] == '$') {
argv[0] = do_var_replacement(argv[0]);
char *temp = join_args(argv, argc);
free_argv(argc, argv);
argv = split_args(temp, &argc);
free(temp);
if (!argc) {
results = cmd_results_new(CMD_SUCCESS, NULL, NULL);
goto cleanup;
}
}
// Determine the command handler
wlr_log(WLR_INFO, "Config command: %s", exec);
struct cmd_handler *handler = find_handler(argv[0], NULL, 0); struct cmd_handler *handler = find_handler(argv[0], NULL, 0);
if (!handler) { if (!handler || !handler->handle) {
char *input = argv[0] ? argv[0] : "(empty)"; char *input = argv[0] ? argv[0] : "(empty)";
results = cmd_results_new(CMD_INVALID, input, "Unknown/invalid command"); char *error = handler
? "This command is shimmed, but unimplemented"
: "Unknown/invalid command";
results = cmd_results_new(CMD_INVALID, input, error);
goto cleanup; goto cleanup;
} }
int i;
// Var replacement, for all but first argument of set // Do variable replacement
// TODO commands if (handler->handle == cmd_set && argc > 1 && *argv[1] == '$') {
for (i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { // Escape the variable name so it does not get replaced by one shorter
char *temp = calloc(1, strlen(argv[1]) + 2);
temp[0] = '$';
strcpy(&temp[1], argv[1]);
free(argv[1]);
argv[1] = temp;
}
char *command = do_var_replacement(join_args(argv, argc));
wlr_log(WLR_INFO, "After replacement: %s", command);
free_argv(argc, argv);
argv = split_args(command, &argc);
free(command);
// Strip quotes and unescape the string
for (int i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) {
if (handler->handle != cmd_exec && handler->handle != cmd_exec_always if (handler->handle != cmd_exec && handler->handle != cmd_exec_always
&& handler->handle != cmd_bindsym && handler->handle != cmd_bindsym
&& handler->handle != cmd_bindcode && handler->handle != cmd_bindcode
@ -389,14 +423,11 @@ struct cmd_results *config_command(char *exec) {
&& (*argv[i] == '\"' || *argv[i] == '\'')) { && (*argv[i] == '\"' || *argv[i] == '\'')) {
strip_quotes(argv[i]); strip_quotes(argv[i]);
} }
argv[i] = do_var_replacement(argv[i]);
unescape_string(argv[i]); unescape_string(argv[i]);
} }
if (handler->handle) {
results = handler->handle(argc-1, argv+1); // Run command
} else { results = handler->handle(argc - 1, argv + 1);
results = cmd_results_new(CMD_INVALID, argv[0], "This command is shimmed, but unimplemented");
}
cleanup: cleanup:
free_argv(argc, argv); free_argv(argc, argv);