diff options
Diffstat (limited to 'sway/commands/for_window.c')
-rw-r--r-- | sway/commands/for_window.c | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c index dd5461f0..8c425a1d 100644 --- a/sway/commands/for_window.c +++ b/sway/commands/for_window.c | |||
@@ -11,31 +11,20 @@ struct cmd_results *cmd_for_window(int argc, char **argv) { | |||
11 | if ((error = checkarg(argc, "for_window", EXPECTED_AT_LEAST, 2))) { | 11 | if ((error = checkarg(argc, "for_window", EXPECTED_AT_LEAST, 2))) { |
12 | return error; | 12 | return error; |
13 | } | 13 | } |
14 | // add command to a criteria/command pair that is run against views when they appear. | ||
15 | char *criteria = argv[0], *cmdlist = join_args(argv + 1, argc - 1); | ||
16 | 14 | ||
17 | struct criteria *crit = calloc(sizeof(struct criteria), 1); | 15 | char *err_str = NULL; |
18 | if (!crit) { | 16 | struct criteria *criteria = criteria_parse(argv[0], &err_str); |
19 | return cmd_results_new(CMD_FAILURE, "for_window", "Unable to allocate criteria"); | 17 | if (!criteria) { |
20 | } | ||
21 | crit->crit_raw = strdup(criteria); | ||
22 | crit->cmdlist = cmdlist; | ||
23 | crit->tokens = create_list(); | ||
24 | char *err_str = extract_crit_tokens(crit->tokens, crit->crit_raw); | ||
25 | |||
26 | if (err_str) { | ||
27 | error = cmd_results_new(CMD_INVALID, "for_window", err_str); | 18 | error = cmd_results_new(CMD_INVALID, "for_window", err_str); |
28 | free(err_str); | 19 | free(err_str); |
29 | free_criteria(crit); | 20 | return error; |
30 | } else if (crit->tokens->length == 0) { | ||
31 | error = cmd_results_new(CMD_INVALID, "for_window", "Found no name/value pairs in criteria"); | ||
32 | free_criteria(crit); | ||
33 | } else if (list_seq_find(config->criteria, criteria_cmp, crit) != -1) { | ||
34 | wlr_log(L_DEBUG, "for_window: Duplicate, skipping."); | ||
35 | free_criteria(crit); | ||
36 | } else { | ||
37 | wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", crit->crit_raw, crit->cmdlist); | ||
38 | list_add(config->criteria, crit); | ||
39 | } | 21 | } |
40 | return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL); | 22 | |
23 | criteria->type = CT_COMMAND; | ||
24 | criteria->cmdlist = join_args(argv + 1, argc - 1); | ||
25 | |||
26 | list_add(config->criteria, criteria); | ||
27 | wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", criteria->raw, criteria->cmdlist); | ||
28 | |||
29 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
41 | } | 30 | } |