Move config parsing into the main loop.

Some platforms (e.g wayland) require keymap initialization before the input
parsing routines (and hence config validation) work.

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v1.3.3
+ - Fix wayland initialization issue
+
 # v1.3.2
  - Improve config handling (allow for shadowed values to gracefully handle conflicts)
  - Make undo keys in hint based modes configurable

Makefile

@@ -1,5 +1,5 @@
 COMMIT=$(shell git rev-parse --short HEAD)
-VERSION=1.3.2
+VERSION=1.3.3
 DESTDIR=
 PREFIX=/usr
 

src/warpd.c

@@ -25,6 +25,8 @@ static int movearg_y = -1;
 static int record_flag = 0;
 static int drag_flag = 0;
 
+static const char *config_path;
+
 static int oneshot_mode = 0;
 
 static int activation_loop(int mode)
@@ -148,11 +150,15 @@ static int activation_loop(int mode)
 
 static void mode_loop()
 {
+	parse_config(config_path);
+
 	exit(activation_loop(mode_flag));
 }
 
 static void daemon_loop()
 {
+	parse_config(config_path);
+
 	init_mouse();
 	init_hints();
 
@@ -328,7 +334,7 @@ int main(int argc, char *argv[])
 {
 	int c;
 	int foreground = 0;
-	const char *config_path = get_config_path("config");
+	config_path = get_config_path("config");
 
 	struct option opts[] = {
 		{"version", no_argument, NULL, 'v'},
@@ -416,8 +422,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	parse_config(config_path);
-
 	if (mode_flag || oneshot_mode) {
 		platform_run(mode_loop);
 	} else {