alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Clean up config loading and launch wayland

Browse source
This commit is contained in:
Drew DeVault 2015-08-05 22:59:06 -04:00
parent e7a8868514
commit 47b28bd335
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/commands.c
View file

@ -139,7 +139,8 @@ int handle_command(struct sway_config *config, char *exec) {
} }
struct cmd_handler *handler = find_handler(handlers, sizeof(handlers) / sizeof(struct cmd_handler), cmd); struct cmd_handler *handler = find_handler(handlers, sizeof(handlers) / sizeof(struct cmd_handler), cmd);
if (handler == NULL) { if (handler == NULL) {
return 1; fprintf(stderr, "Unknown command '%s'\n", cmd);
return 0; // TODO: return error, probably
} }
int argc; int argc;
char **argv = split_directive(exec + strlen(handler->command), &argc); char **argv = split_directive(exec + strlen(handler->command), &argc);

2
sway/config.c
View file

@ -33,7 +33,7 @@ struct sway_config *read_config(FILE *file) {
goto _continue; goto _continue;
} }
if (!handle_command(config, line)) { if (handle_command(config, line) != 0) {
success = false; success = false;
} }

1
sway/main.c
View file

@ -26,7 +26,6 @@ void load_config() {
int main(int argc, char **argv) { int main(int argc, char **argv) {
load_config(); load_config();
return 0;
static struct wlc_interface interface = { }; static struct wlc_interface interface = { };
if (!wlc_init(&interface, argc, argv)) { if (!wlc_init(&interface, argc, argv)) {