Add minimal config subsystem

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 @@
 #include <string.h>
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "log.h"
 #include "stringop.h"
 
 struct cmd_results *cmd_exec(int argc, char **argv) {
-        // TODO: config
-        /*if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL);
+        if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL);
         if (config->reloading) {
                 char *args = join_args(argv, argc);
                 sway_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args);
                 free(args);
                 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
-        }*/
+        }
         return cmd_exec_always(argc, argv);
 }
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 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include "sway/commands.h"
-#include "sway/workspace.h"
+#include "sway/config.h"
 #include "sway/container.h"
+#include "sway/workspace.h"
 #include "log.h"
 #include "stringop.h"
 
 struct cmd_results *cmd_exec_always(int argc, char **argv) {
         struct cmd_results *error = NULL;
-        // TODO: config
-        //if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL);
+        if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL);
         if ((error = checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0))) {
                 return error;
         }
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 @@
 #include <stddef.h>
 #include "sway/commands.h"
+#include "sway/config.h"
 
 void sway_terminate(int exit_code);
 
 struct cmd_results *cmd_exit(int argc, char **argv) {
         struct cmd_results *error = NULL;
-        /* TODO
         if (config->reading) {
                 return cmd_results_new(CMD_FAILURE, "exit", "Can't be used in config file.");
         }
-        */
         if ((error = checkarg(argc, "exit", EXPECTED_EQUAL_TO, 0))) {
                 return error;
         }
         sway_terminate(0);
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
-