config cleanup

12 files changed, 94 insertions, 48 deletions

diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
index 13ded431..9b5fb7a2 100644
--- a/sway/commands/input/accel_profile.c
+++ b/sway/commands/input/accel_profile.c
@@ -9,9 +9,11 @@ struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "accel_profile", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE, "accel_profile",
+				"No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "adaptive") == 0) {
 		new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index 40f075ce..a0e3bddf 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -5,15 +5,18 @@
 #include "log.h"
 
 struct cmd_results *input_cmd_click_method(int argc, char **argv) {
-	sway_log(L_DEBUG, "click_method for device:  %d %s", current_input_config==NULL, current_input_config->identifier);
+	sway_log(L_DEBUG, "click_method for device:  %d %s",
+		current_input_config==NULL, current_input_config->identifier);
 	struct cmd_results *error = NULL;
 	if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "click_method", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE, "click_method",
+			"No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "none") == 0) {
 		new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE;
@@ -22,7 +25,8 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) {
 	} else if (strcasecmp(argv[0], "clickfinger") == 0) {
 		new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
 	} else {
-		return cmd_results_new(CMD_INVALID, "click_method", "Expected 'click_method <none|button_areas|clickfinger'");
+		return cmd_results_new(CMD_INVALID, "click_method",
+			"Expected 'click_method <none|button_areas|clickfinger'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
index 11e7fbea..149a6183 100644
--- a/sway/commands/input/drag_lock.c
+++ b/sway/commands/input/drag_lock.c
@@ -9,16 +9,19 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "drag_lock", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE,
+			"drag_lock", "No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "enabled") == 0) {
 		new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_ENABLED;
 	} else if (strcasecmp(argv[0], "disabled") == 0) {
 		new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED;
 	} else {
-		return cmd_results_new(CMD_INVALID, "drag_lock", "Expected 'drag_lock <enabled|disabled>'");
+		return cmd_results_new(CMD_INVALID, "drag_lock",
+			"Expected 'drag_lock <enabled|disabled>'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
index f3cbf252..0954575c 100644
--- a/sway/commands/input/dwt.c
+++ b/sway/commands/input/dwt.c
@@ -11,14 +11,16 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) {
 	if (!current_input_config) {
 		return cmd_results_new(CMD_FAILURE, "dwt", "No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "enabled") == 0) {
 		new_config->dwt = LIBINPUT_CONFIG_DWT_ENABLED;
 	} else if (strcasecmp(argv[0], "disabled") == 0) {
 		new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED;
 	} else {
-		return cmd_results_new(CMD_INVALID, "dwt", "Expected 'dwt <enabled|disabled>'");
+		return cmd_results_new(CMD_INVALID, "dwt",
+			"Expected 'dwt <enabled|disabled>'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 4b2fdff5..f44c0ec7 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -5,24 +5,29 @@
 #include "log.h"
 
 struct cmd_results *input_cmd_events(int argc, char **argv) {
-	sway_log(L_DEBUG, "events for device: %s", current_input_config->identifier);
+	sway_log(L_DEBUG, "events for device: %s",
+		current_input_config->identifier);
 	struct cmd_results *error = NULL;
 	if ((error = checkarg(argc, "events", EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "events", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE, "events",
+			"No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "enabled") == 0) {
 		new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
 	} else if (strcasecmp(argv[0], "disabled") == 0) {
 		new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
 	} else if (strcasecmp(argv[0], "disabled_on_external_mouse") == 0) {
-		new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
+		new_config->send_events =
+			LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
 	} else {
-		return cmd_results_new(CMD_INVALID, "events", "Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
+		return cmd_results_new(CMD_INVALID, "events",
+			"Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c
index 715df2a1..dc8fcd56 100644
--- a/sway/commands/input/left_handed.c
+++ b/sway/commands/input/left_handed.c
@@ -9,16 +9,19 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "left_handed", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE, "left_handed",
+			"No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "enabled") == 0) {
 		new_config->left_handed = 1;
 	} else if (strcasecmp(argv[0], "disabled") == 0) {
 		new_config->left_handed = 0;
 	} else {
-		return cmd_results_new(CMD_INVALID, "left_handed", "Expected 'left_handed <enabled|disabled>'");
+		return cmd_results_new(CMD_INVALID, "left_handed",
+			"Expected 'left_handed <enabled|disabled>'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
index d31ce950..e19964d8 100644
--- a/sway/commands/input/middle_emulation.c
+++ b/sway/commands/input/middle_emulation.c
@@ -9,16 +9,20 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "middle_emulation", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE, "middle_emulation",
+			"No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "enabled") == 0) {
 		new_config->middle_emulation = LIBINPUT_CONFIG_MIDDLE_EMULATION_ENABLED;
 	} else if (strcasecmp(argv[0], "disabled") == 0) {
-		new_config->middle_emulation = LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED;
+		new_config->middle_emulation =
+			LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED;
 	} else {
-		return cmd_results_new(CMD_INVALID, "middle_emulation", "Expected 'middle_emulation <enabled|disabled>'");
+		return cmd_results_new(CMD_INVALID, "middle_emulation",
+			"Expected 'middle_emulation <enabled|disabled>'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
index 9d1dc506..8272c5b3 100644
--- a/sway/commands/input/natural_scroll.c
+++ b/sway/commands/input/natural_scroll.c
@@ -9,16 +9,19 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "natural_scoll", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE, "natural_scoll",
+			"No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "enabled") == 0) {
 		new_config->natural_scroll = 1;
 	} else if (strcasecmp(argv[0], "disabled") == 0) {
 		new_config->natural_scroll = 0;
 	} else {
-		return cmd_results_new(CMD_INVALID, "natural_scroll", "Expected 'natural_scroll <enabled|disabled>'");
+		return cmd_results_new(CMD_INVALID, "natural_scroll",
+			"Expected 'natural_scroll <enabled|disabled>'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
index 87fb5cff..2c9db5bf 100644
--- a/sway/commands/input/pointer_accel.c
+++ b/sway/commands/input/pointer_accel.c
@@ -9,13 +9,16 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "pointer_accel", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE,
+			"pointer_accel", "No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	float pointer_accel = atof(argv[0]);
 	if (pointer_accel < -1 || pointer_accel > 1) {
-		return cmd_results_new(CMD_INVALID, "pointer_accel", "Input out of range [-1, 1]");
+		return cmd_results_new(CMD_INVALID, "pointer_accel",
+			"Input out of range [-1, 1]");
 	}
 	new_config->pointer_accel = pointer_accel;
 
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
index 98873938..40277155 100644
--- a/sway/commands/input/scroll_method.c
+++ b/sway/commands/input/scroll_method.c
@@ -9,9 +9,11 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
 		return error;
 	}
 	if (!current_input_config) {
-		return cmd_results_new(CMD_FAILURE, "scroll_method", "No input device defined.");
+		return cmd_results_new(CMD_FAILURE, "scroll_method",
+			"No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "none") == 0) {
 		new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
@@ -22,7 +24,8 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
 	} else if (strcasecmp(argv[0], "on_button_down") == 0) {
 		new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
 	} else {
-		return cmd_results_new(CMD_INVALID, "scroll_method", "Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
+		return cmd_results_new(CMD_INVALID, "scroll_method",
+			"Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
 	}
 
 	input_cmd_apply(new_config);
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index 1109466f..18a54087 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -13,17 +13,20 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) {
 	if (!current_input_config) {
 		return cmd_results_new(CMD_FAILURE, "tap", "No input device defined.");
 	}
-	struct input_config *new_config = new_input_config(current_input_config->identifier);
+	struct input_config *new_config =
+		new_input_config(current_input_config->identifier);
 
 	if (strcasecmp(argv[0], "enabled") == 0) {
 		new_config->tap = LIBINPUT_CONFIG_TAP_ENABLED;
 	} else if (strcasecmp(argv[0], "disabled") == 0) {
 		new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED;
 	} else {
-		return cmd_results_new(CMD_INVALID, "tap", "Expected 'tap <enabled|disabled>'");
+		return cmd_results_new(CMD_INVALID, "tap",
+			"Expected 'tap <enabled|disabled>'");
 	}
 
-	sway_log(L_DEBUG, "apply-tap for device: %s", current_input_config->identifier);
+	sway_log(L_DEBUG, "apply-tap for device: %s",
+		current_input_config->identifier);
 	input_cmd_apply(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/config.c b/sway/config.c
index 7ae3c2a4..4bc74ee0 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -21,6 +21,7 @@
 #include <dev/evdev/input-event-codes.h>
 #endif
 #include <wlr/types/wlr_output.h>
+#include "sway/input/input-manager.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/layout.h"
@@ -48,7 +49,8 @@ static void config_defaults(struct sway_config *config) {
 
 	if (!(config->cmd_queue = create_list())) goto cleanup;
 
-	if (!(config->current_mode = malloc(sizeof(struct sway_mode)))) goto cleanup;
+	if (!(config->current_mode = malloc(sizeof(struct sway_mode))))
+		goto cleanup;
 	if (!(config->current_mode->name = malloc(sizeof("default")))) goto cleanup;
 	strcpy(config->current_mode->name, "default");
 	if (!(config->current_mode->bindings = create_list())) goto cleanup;
@@ -337,8 +339,9 @@ bool load_main_config(const char *file, bool is_active) {
 	bool success = true;
 	DIR *dir = opendir(SYSCONFDIR "/sway/security.d");
 	if (!dir) {
-		sway_log(L_ERROR, "%s does not exist, sway will have no security configuration"
-				" and will probably be broken", SYSCONFDIR "/sway/security.d");
+		sway_log(L_ERROR,
+			"%s does not exist, sway will have no security configuration"
+			" and will probably be broken", SYSCONFDIR "/sway/security.d");
 	} else {
 		list_t *secconfigs = create_list();
 		char *base = SYSCONFDIR "/sway/security.d/";
@@ -362,8 +365,12 @@ bool load_main_config(const char *file, bool is_active) {
 		list_qsort(secconfigs, qstrcmp);
 		for (int i = 0; i < secconfigs->length; ++i) {
 			char *_path = secconfigs->items[i];
-			if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 || (((s.st_mode & 0777) != 0644) && (s.st_mode & 0777) != 0444)) {
-				sway_log(L_ERROR, "Refusing to load %s - it must be owned by root and mode 644 or 444", _path);
+			if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 ||
+					(((s.st_mode & 0777) != 0644) &&
+					 (s.st_mode & 0777) != 0444)) {
+				sway_log(L_ERROR,
+					"Refusing to load %s - it must be owned by root "
+					"and mode 644 or 444", _path);
 				success = false;
 			} else {
 				success = success && load_config(_path, config);
@@ -392,7 +399,8 @@ bool load_main_config(const char *file, bool is_active) {
 	return success;
 }
 
-static bool load_include_config(const char *path, const char *parent_dir, struct sway_config *config) {
+static bool load_include_config(const char *path, const char *parent_dir,
+		struct sway_config *config) {
 	// save parent config
 	const char *parent_config = config->current_config;
 
@@ -402,7 +410,8 @@ static bool load_include_config(const char *path, const char *parent_dir, struct
 		len = len + strlen(parent_dir) + 2;
 		full_path = malloc(len * sizeof(char));
 		if (!full_path) {
-			sway_log(L_ERROR, "Unable to allocate full path to included config");
+			sway_log(L_ERROR,
+				"Unable to allocate full path to included config");
 			return false;
 		}
 		snprintf(full_path, len, "%s/%s", parent_dir, path);
@@ -421,7 +430,9 @@ static bool load_include_config(const char *path, const char *parent_dir, struct
 	for (j = 0; j < config->config_chain->length; ++j) {
 		char *old_path = config->config_chain->items[j];
 		if (strcmp(real_path, old_path) == 0) {
-			sway_log(L_DEBUG, "%s already included once, won't be included again.", real_path);
+			sway_log(L_DEBUG,
+				"%s already included once, won't be included again.",
+				real_path);
 			free(real_path);
 			return false;
 		}
@@ -509,8 +520,8 @@ bool read_config(FILE *file, struct sway_config *config) {
 		switch(res->status) {
 		case CMD_FAILURE:
 		case CMD_INVALID:
-			sway_log(L_ERROR, "Error on line %i '%s': %s (%s)", line_number, line,
-				res->error, config->current_config);
+			sway_log(L_ERROR, "Error on line %i '%s': %s (%s)", line_number,
+				line, res->error, config->current_config);
 			success = false;
 			break;
 
@@ -585,8 +596,7 @@ bool read_config(FILE *file, struct sway_config *config) {
 
 			case CMD_BLOCK_INPUT:
 				sway_log(L_DEBUG, "End of input block");
-				// TODO: input
-				//current_input_config = NULL;
+				current_input_config = NULL;
 				block = CMD_BLOCK_END;
 				break;
 
@@ -651,7 +661,8 @@ char *do_var_replacement(char *str) {
 				char *newstr = malloc(strlen(str) - vnlen + vvlen + 1);
 				if (!newstr) {
 					sway_log(L_ERROR,
-							"Unable to allocate replacement during variable expansion");
+						"Unable to allocate replacement "
+						"during variable expansion");
 					break;
 				}
 				char *newptr = newstr;