summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-08-17 18:20:56 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-08-17 18:20:56 -0400
commit3f3d1ffee48b5a41910378dcd7c869397ca882d4 (patch)
treec9771bd7f5b3aaa37427fdf520aaf03de7916c8c
parentSwitched config loading order to prevent root access w/wlc (diff)
downloadsway-3f3d1ffee48b5a41910378dcd7c869397ca882d4.tar.gz
sway-3f3d1ffee48b5a41910378dcd7c869397ca882d4.tar.zst
sway-3f3d1ffee48b5a41910378dcd7c869397ca882d4.zip
Rearrange main.c some more
-rw-r--r--sway/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/main.c b/sway/main.c
index aa8546e9..2db4604c 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -12,17 +12,17 @@
12static void sigchld_handle(int signal); 12static void sigchld_handle(int signal);
13 13
14int main(int argc, char **argv) { 14int main(int argc, char **argv) {
15 init_log(L_DEBUG); // TODO: Control this with command line arg
16 init_layout();
17
18 /* Signal handling */ 15 /* Signal handling */
19 signal(SIGCHLD, sigchld_handle); 16 signal(SIGCHLD, sigchld_handle);
20 17
21 setenv("WLC_DIM", "0", 0); 18 setenv("WLC_DIM", "0", 0);
19 /* Changing code earlier than this point requires detailed review */
22 if (!wlc_init(&interface, argc, argv)) { 20 if (!wlc_init(&interface, argc, argv)) {
23 return 1; 21 return 1;
24 } 22 }
25 setenv("DISPLAY", ":1", 1); 23
24 init_log(L_DEBUG); // TODO: Control this with command line arg
25 init_layout();
26 26
27 if (!load_config()) { 27 if (!load_config()) {
28 sway_log(L_ERROR, "Error(s) loading config!"); 28 sway_log(L_ERROR, "Error(s) loading config!");