From c0ee2a64065f3a9953e977e517a466361444c144 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Mon, 10 Aug 2015 13:53:43 -0500 Subject: Added in reload and exec_always handling --- sway/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index 248beae7..298e530d 100644 --- a/sway/main.c +++ b/sway/main.c @@ -23,7 +23,7 @@ void load_config() { exit(1); } free(temp); - config = read_config(f); + config = read_config(f, false); fclose(f); } @@ -52,6 +52,7 @@ int main(int argc, char **argv) { .motion = handle_pointer_motion, .button = handle_pointer_button } + }; setenv("WLC_DIM", "0", 0); -- cgit v1.2.3 From 508980e3ab930fd1ea16cbb769771126110aa329 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Mon, 10 Aug 2015 14:22:22 -0500 Subject: Abstracted load_config --- sway/main.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index 298e530d..900e6e5d 100644 --- a/sway/main.c +++ b/sway/main.c @@ -9,24 +9,6 @@ struct sway_config *config; -void load_config() { - // TODO: Allow use of more config file locations - const char *name = "/.sway/config"; - const char *home = getenv("HOME"); - char *temp = malloc(strlen(home) + strlen(name) + 1); - strcpy(temp, home); - strcat(temp, name); - FILE *f = fopen(temp, "r"); - if (!f) { - fprintf(stderr, "Unable to open %s for reading", temp); - free(temp); - exit(1); - } - free(temp); - config = read_config(f, false); - fclose(f); -} - int main(int argc, char **argv) { init_log(L_DEBUG); // TODO: Control this with command line arg init_layout(); @@ -61,7 +43,9 @@ int main(int argc, char **argv) { } setenv("DISPLAY", ":1", 1); - load_config(); + if (load_config()) { + exit(1); + } wlc_run(); return 0; -- cgit v1.2.3