diff options
author | emersion <contact@emersion.fr> | 2017-12-05 10:40:55 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2017-12-05 10:40:55 +0100 |
commit | 90f7f1a0e61fa20ed1b74b9df057aa70abc791ed (patch) | |
tree | e201e4fb9fef471dd2fcf9581e26addfe3550502 /sway/commands | |
parent | Merge pull request #1497 from emersion/cmd-exec (diff) | |
download | sway-90f7f1a0e61fa20ed1b74b9df057aa70abc791ed.tar.gz sway-90f7f1a0e61fa20ed1b74b9df057aa70abc791ed.tar.zst sway-90f7f1a0e61fa20ed1b74b9df057aa70abc791ed.zip |
Add minimal config subsystem
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/exec.c | 6 | ||||
-rw-r--r-- | sway/commands/exec_always.c | 6 | ||||
-rw-r--r-- | sway/commands/exit.c | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sway/commands/exec.c b/sway/commands/exec.c index dd71500a..fbbc4941 100644 --- a/sway/commands/exec.c +++ b/sway/commands/exec.c | |||
@@ -1,16 +1,16 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include "sway/commands.h" | 2 | #include "sway/commands.h" |
3 | #include "sway/config.h" | ||
3 | #include "log.h" | 4 | #include "log.h" |
4 | #include "stringop.h" | 5 | #include "stringop.h" |
5 | 6 | ||
6 | struct cmd_results *cmd_exec(int argc, char **argv) { | 7 | struct cmd_results *cmd_exec(int argc, char **argv) { |
7 | // TODO: config | 8 | if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL); |
8 | /*if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL); | ||
9 | if (config->reloading) { | 9 | if (config->reloading) { |
10 | char *args = join_args(argv, argc); | 10 | char *args = join_args(argv, argc); |
11 | sway_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args); | 11 | sway_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args); |
12 | free(args); | 12 | free(args); |
13 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 13 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
14 | }*/ | 14 | } |
15 | return cmd_exec_always(argc, argv); | 15 | return cmd_exec_always(argc, argv); |
16 | } | 16 | } |
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 0a252e7b..9527a487 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c | |||
@@ -5,15 +5,15 @@ | |||
5 | #include <sys/wait.h> | 5 | #include <sys/wait.h> |
6 | #include <unistd.h> | 6 | #include <unistd.h> |
7 | #include "sway/commands.h" | 7 | #include "sway/commands.h" |
8 | #include "sway/workspace.h" | 8 | #include "sway/config.h" |
9 | #include "sway/container.h" | 9 | #include "sway/container.h" |
10 | #include "sway/workspace.h" | ||
10 | #include "log.h" | 11 | #include "log.h" |
11 | #include "stringop.h" | 12 | #include "stringop.h" |
12 | 13 | ||
13 | struct cmd_results *cmd_exec_always(int argc, char **argv) { | 14 | struct cmd_results *cmd_exec_always(int argc, char **argv) { |
14 | struct cmd_results *error = NULL; | 15 | struct cmd_results *error = NULL; |
15 | // TODO: config | 16 | if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); |
16 | //if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); | ||
17 | if ((error = checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0))) { | 17 | if ((error = checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0))) { |
18 | return error; | 18 | return error; |
19 | } | 19 | } |
diff --git a/sway/commands/exit.c b/sway/commands/exit.c index d294e344..4bb6a97b 100644 --- a/sway/commands/exit.c +++ b/sway/commands/exit.c | |||
@@ -1,19 +1,17 @@ | |||
1 | #include <stddef.h> | 1 | #include <stddef.h> |
2 | #include "sway/commands.h" | 2 | #include "sway/commands.h" |
3 | #include "sway/config.h" | ||
3 | 4 | ||
4 | void sway_terminate(int exit_code); | 5 | void sway_terminate(int exit_code); |
5 | 6 | ||
6 | struct cmd_results *cmd_exit(int argc, char **argv) { | 7 | struct cmd_results *cmd_exit(int argc, char **argv) { |
7 | struct cmd_results *error = NULL; | 8 | struct cmd_results *error = NULL; |
8 | /* TODO | ||
9 | if (config->reading) { | 9 | if (config->reading) { |
10 | return cmd_results_new(CMD_FAILURE, "exit", "Can't be used in config file."); | 10 | return cmd_results_new(CMD_FAILURE, "exit", "Can't be used in config file."); |
11 | } | 11 | } |
12 | */ | ||
13 | if ((error = checkarg(argc, "exit", EXPECTED_EQUAL_TO, 0))) { | 12 | if ((error = checkarg(argc, "exit", EXPECTED_EQUAL_TO, 0))) { |
14 | return error; | 13 | return error; |
15 | } | 14 | } |
16 | sway_terminate(0); | 15 | sway_terminate(0); |
17 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 16 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
18 | } | 17 | } |
19 | |||