diff options
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sway/main.c b/sway/main.c index 248beae7..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); - fclose(f); -} - int main(int argc, char **argv) { init_log(L_DEBUG); // TODO: Control this with command line arg init_layout(); @@ -52,6 +34,7 @@ int main(int argc, char **argv) { .motion = handle_pointer_motion, .button = handle_pointer_button } + }; setenv("WLC_DIM", "0", 0); @@ -60,7 +43,9 @@ int main(int argc, char **argv) { } setenv("DISPLAY", ":1", 1); - load_config(); + if (load_config()) { + exit(1); + } wlc_run(); return 0; |