mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-09 13:29:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add minimal config subsystem

Browse source
This commit is contained in:
emersion 2017-12-05 10:40:55 +01:00
parent 83b4c0648d
commit 90f7f1a0e6
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
11 changed files with 1091 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sway/commands/exec.c
View file

@ -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);
}

6
sway/commands/exec_always.c
View file

@ -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;
}

4
sway/commands/exit.c
View file

@ -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);
}