diff options
| author | Drew DeVault <sir@cmpwn.com> | 2015-11-24 10:56:29 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-11-24 10:56:29 -0500 |
| commit | 8ad8ceeeb92ca6609bc40974a8c528b593251566 (patch) | |
| tree | 4f706f14f54c2f250c8bb2d720072b9443ea7777 /sway | |
| parent | e7c0573a980938a5174bc647faf41f24fa523b0b (diff) | |
| parent | db92920cf9bcdd0008ba446df4d7249e7902373a (diff) | |
Merge pull request #250 from sce/initial_support_for_criteria_strings
Initial support for criteria strings
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands.c | 21 | ||||
| -rw-r--r-- | sway/stringop.c | 9 |
2 files changed, 26 insertions, 4 deletions
diff --git a/sway/commands.c b/sway/commands.c index f6d56bb4..42105d5f 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1401,17 +1401,34 @@ struct cmd_results *handle_command(char *_exec) { head = exec; do { - // Handle criteria + // Extract criteria (valid for this command list only). + criteria = NULL; if (*head == '[') { + ++head; criteria = argsep(&head, "]"); if (head) { ++head; // TODO handle criteria } else { - results = cmd_results_new(CMD_INVALID, NULL, "Unmatched ["); + if (!results) { + results = cmd_results_new(CMD_INVALID, criteria, "Unmatched ["); + } + goto cleanup; } // Skip leading whitespace head += strspn(head, whitespace); + + // TODO: it will yield unexpected results to execute commands + // (on any view) that where meant for certain views only. + if (!results) { + int len = strlen(criteria) + strlen(head) + 4; + char *tmp = malloc(len); + snprintf(tmp, len, "[%s] %s", criteria, head); + results = cmd_results_new(CMD_INVALID, tmp, + "Can't handle criteria string: Refusing to execute command"); + free(tmp); + } + goto cleanup; } // Split command list cmdlist = argsep(&head, ";"); diff --git a/sway/stringop.c b/sway/stringop.c index fe5a97ca..efa3a207 100644 --- a/sway/stringop.c +++ b/sway/stringop.c @@ -117,6 +117,7 @@ char **split_args(const char *start, int *argc) { bool in_token = false; bool in_string = false; bool in_char = false; + bool in_brackets = false; // brackets are used for critera bool escaped = false; const char *end = start; if (start) { @@ -129,10 +130,14 @@ char **split_args(const char *start, int *argc) { in_string = !in_string; } else if (*end == '\'' && !in_string && !escaped) { in_char = !in_char; + } else if (*end == '[' && !in_string && !in_char && !in_brackets && !escaped) { + in_brackets = true; + } else if (*end == ']' && !in_string && !in_char && in_brackets && !escaped) { + in_brackets = false; } else if (*end == '\\') { escaped = !escaped; - } else if (*end == '\0' || (!in_string && !in_char && !escaped - && strchr(whitespace, *end))) { + } else if (*end == '\0' || (!in_string && !in_char && !in_brackets + && !escaped && strchr(whitespace, *end))) { goto add_token; } if (*end != '\\') { |