Load config after xwayland is created

This lets us run x commands on startup
swaywm · Aug 9, 2015 · b075b06 · b075b06
1 parent 4924628
commit b075b06
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/sway/commands.c b/sway/commands.c
@@ -73,11 +73,12 @@ int cmd_bindsym(struct sway_config *config, int argc, char **argv) {
 
 int cmd_exec(struct sway_config *config, int argc, char **argv) {
 	if (argc < 1) {
-		sway_log(L_ERROR, "Invalid exit command (expected 1 arguments, got %d)", argc);
+		sway_log(L_ERROR, "Invalid exec command (expected at least 1 argument, got %d)", argc);
 		return 1;
 	}
 	if (fork() == 0) {
 		char *args = join_args(argv, argc);
+		sway_log(L_DEBUG, "Executing %s", args);
 		execl("/bin/sh", "sh", "-c", args, (char *)NULL);
 		free(args);
 		exit(0);

diff --git a/sway/main.c b/sway/main.c
@@ -29,7 +29,6 @@ void load_config() {
 
 int main(int argc, char **argv) {
 	init_log(L_DEBUG); // TODO: Control this with command line arg
-	load_config();
 	init_layout();
 
 	static struct wlc_interface interface = {
@@ -58,7 +57,10 @@ int main(int argc, char **argv) {
 	if (!wlc_init(&interface, argc, argv)) {
 		return 1;
 	}
+
 	setenv("DISPLAY", ":1", 1);
+	load_config();
+
 	wlc_run();
 	return 0;
 }