1 files changed, 153 insertions, 874 deletions

diff --git a/sway/config.c b/sway/config.c
index a33b8edc..90b833ab 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -12,17 +12,19 @@
 #include <signal.h>
 #include <libinput.h>
 #include <limits.h>
-#include <float.h>
 #include <dirent.h>
 #include <strings.h>
-#include "wayland-desktop-shell-server-protocol.h"
+#ifdef __linux__
+#include <linux/input-event-codes.h>
+#elif __FreeBSD__
+#include <dev/evdev/input-event-codes.h>
+#endif
+#include <wlr/types/wlr_output.h>
+#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "sway/layout.h"
-#include "sway/input_state.h"
-#include "sway/criteria.h"
-#include "sway/input.h"
-#include "sway/border.h"
+#include "sway/tree/layout.h"
 #include "readline.h"
 #include "stringop.h"
 #include "list.h"
@@ -30,269 +32,102 @@
 
 struct sway_config *config = NULL;
 
-static void terminate_swaybar(pid_t pid);
-
-static void free_variable(struct sway_variable *var) {
-	if (!var) {
-		return;
-	}
-	free(var->name);
-	free(var->value);
-	free(var);
-}
-
-static void free_binding(struct sway_binding *bind) {
-	if (!bind) {
-		return;
-	}
-	free_flat_list(bind->keys);
-	free(bind->command);
-	free(bind);
-}
-
 static void free_mode(struct sway_mode *mode) {
-	if (!mode) {
-		return;
-	}
-	free(mode->name);
-	int i;
-	for (i = 0; mode->bindings && i < mode->bindings->length; ++i) {
-		free_binding(mode->bindings->items[i]);
-	}
-	list_free(mode->bindings);
-	free(mode);
-}
-
-static void free_bar(struct bar_config *bar) {
-	if (!bar) {
-		return;
-	}
-	free(bar->mode);
-	free(bar->hidden_state);
-#ifdef ENABLE_TRAY
-	free(bar->tray_output);
-	free(bar->icon_theme);
-#endif
-	free(bar->status_command);
-	free(bar->font);
-	free(bar->separator_symbol);
 	int i;
-	for (i = 0; bar->bindings && i < bar->bindings->length; ++i) {
-		free_sway_mouse_binding(bar->bindings->items[i]);
-	}
-	list_free(bar->bindings);
-
-	if (bar->outputs) {
-		free_flat_list(bar->outputs);
-	}
-
-	if (bar->pid != 0) {
-		terminate_swaybar(bar->pid);
-	}
-
-	free(bar->colors.background);
-	free(bar->colors.statusline);
-	free(bar->colors.separator);
-	free(bar->colors.focused_background);
-	free(bar->colors.focused_statusline);
-	free(bar->colors.focused_separator);
-	free(bar->colors.focused_workspace_border);
-	free(bar->colors.focused_workspace_bg);
-	free(bar->colors.focused_workspace_text);
-	free(bar->colors.active_workspace_border);
-	free(bar->colors.active_workspace_bg);
-	free(bar->colors.active_workspace_text);
-	free(bar->colors.inactive_workspace_border);
-	free(bar->colors.inactive_workspace_bg);
-	free(bar->colors.inactive_workspace_text);
-	free(bar->colors.urgent_workspace_border);
-	free(bar->colors.urgent_workspace_bg);
-	free(bar->colors.urgent_workspace_text);
-	free(bar->colors.binding_mode_border);
-	free(bar->colors.binding_mode_bg);
-	free(bar->colors.binding_mode_text);
-
-	free(bar);
-}
 
-void free_input_config(struct input_config *ic) {
-	if (!ic) {
-		return;
-	}
-	free(ic->identifier);
-	free(ic);
-}
-
-void free_output_config(struct output_config *oc) {
-	if (!oc) {
-		return;
-	}
-	free(oc->name);
-	free(oc->background);
-	free(oc->background_option);
-	free(oc);
-}
-
-static void free_workspace_output(struct workspace_output *wo) {
-	if (!wo) {
+	if (!mode) {
 		return;
 	}
-	free(wo->output);
-	free(wo->workspace);
-	free(wo);
-}
-
-static void pid_workspace_cleanup() {
-	struct timespec ts;
-	struct pid_workspace *pw = NULL;
-
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-
-	// work backwards through list and remove any entries
-	// older than PID_WORKSPACE_TIMEOUT
-	for (int i = config->pid_workspaces->length - 1; i > -1; i--) {
-		pw = config->pid_workspaces->items[i];
-
-		if (difftime(ts.tv_sec, *pw->time_added) >= PID_WORKSPACE_TIMEOUT) {
-			free_pid_workspace(config->pid_workspaces->items[i]);
-			list_del(config->pid_workspaces, i);
+	free(mode->name);
+	if (mode->keysym_bindings) {
+		for (i = 0; i < mode->keysym_bindings->length; i++) {
+			free_sway_binding(mode->keysym_bindings->items[i]);
 		}
+		list_free(mode->keysym_bindings);
 	}
-}
-
-// de-dupe pid_workspaces to ensure pid uniqueness
-void pid_workspace_add(struct pid_workspace *pw) {
-	struct pid_workspace *list_pw = NULL;
-	struct timespec ts;
-	time_t *now = malloc(sizeof(time_t));
-	if (!now) {
-		sway_log(L_ERROR, "Allocating time for pid_workspace failed");
-		return;
-	}
-
-	pid_workspace_cleanup();
-
-	// add current time to pw
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	*now = ts.tv_sec;
-
-	pw->time_added = now;
-
-	// work backwards through list and delete any entries that
-	// have the same pid as that in our new pid_workspace
-	for (int i = config->pid_workspaces->length - 1; i > -1; i--) {
-		list_pw = config->pid_workspaces->items[i];
-
-		if (pw->pid == list_pw->pid) {
-			free_pid_workspace(config->pid_workspaces->items[i]);
-			list_del(config->pid_workspaces, i);
+	if (mode->keycode_bindings) {
+		for (i = 0; i < mode->keycode_bindings->length; i++) {
+			free_sway_binding(mode->keycode_bindings->items[i]);
 		}
+		list_free(mode->keycode_bindings);
 	}
-
-	list_add(config->pid_workspaces, pw);
-}
-
-void free_pid_workspace(struct pid_workspace *pw) {
-	if (!pw) {
-		return;
-	}
-	free(pw->pid);
-	free(pw->workspace);
-	free(pw->time_added);
-	free(pw);
-}
-
-void free_command_policy(struct command_policy *policy) {
-	if (!policy) {
-		return;
-	}
-	free(policy->command);
-	free(policy);
-}
-
-void free_feature_policy(struct feature_policy *policy) {
-	if (!policy) {
-		return;
-	}
-	free(policy->program);
-	free(policy);
+	free(mode);
 }
 
 void free_config(struct sway_config *config) {
+	config_clear_handler_context(config);
+
 	if (!config) {
 		return;
 	}
-	int i;
-	for (i = 0; config->symbols && i < config->symbols->length; ++i) {
-		free_variable(config->symbols->items[i]);
-	}
-	list_free(config->symbols);
 
-	for (i = 0; config->modes && i < config->modes->length; ++i) {
-		free_mode(config->modes->items[i]);
+	// TODO: handle all currently unhandled lists as we add implementations
+	if (config->symbols) {
+		for (int i = 0; i < config->symbols->length; ++i) {
+			free_sway_variable(config->symbols->items[i]);
+		}
+		list_free(config->symbols);
 	}
-	list_free(config->modes);
-
-	for (i = 0; config->bars && i < config->bars->length; ++i) {
-		free_bar(config->bars->items[i]);
+	if (config->modes) {
+		for (int i = 0; i < config->modes->length; ++i) {
+			free_mode(config->modes->items[i]);
+		}
+		list_free(config->modes);
 	}
-	list_free(config->bars);
-
-	free_flat_list(config->cmd_queue);
-
-	for (i = 0; config->workspace_outputs && i < config->workspace_outputs->length; ++i) {
-		free_workspace_output(config->workspace_outputs->items[i]);
+	if (config->bars) {
+		for (int i = 0; i < config->bars->length; ++i) {
+			free_bar_config(config->bars->items[i]);
+		}
+		list_free(config->bars);
 	}
+	list_free(config->cmd_queue);
 	list_free(config->workspace_outputs);
-
-	for (i = 0; config->pid_workspaces && i < config->pid_workspaces->length; ++i) {
-		free_pid_workspace(config->pid_workspaces->items[i]);
-	}
 	list_free(config->pid_workspaces);
-
-	for (i = 0; config->criteria && i < config->criteria->length; ++i) {
-		free_criteria(config->criteria->items[i]);
+	list_free(config->output_configs);
+	if (config->input_configs) {
+		for (int i = 0; i < config->input_configs->length; i++) {
+			free_input_config(config->input_configs->items[i]);
+		}
+		list_free(config->input_configs);
 	}
-	list_free(config->criteria);
-
-	for (i = 0; config->no_focus && i < config->no_focus->length; ++i) {
-		free_criteria(config->no_focus->items[i]);
+	if (config->seat_configs) {
+		for (int i = 0; i < config->seat_configs->length; i++) {
+			free_seat_config(config->seat_configs->items[i]);
+		}
+		list_free(config->seat_configs);
 	}
+	list_free(config->criteria);
 	list_free(config->no_focus);
-
-	for (i = 0; config->input_configs && i < config->input_configs->length; ++i) {
-		free_input_config(config->input_configs->items[i]);
-	}
-	list_free(config->input_configs);
-
-	for (i = 0; config->output_configs && i < config->output_configs->length; ++i) {
-		free_output_config(config->output_configs->items[i]);
-	}
-	list_free(config->output_configs);
-
-	for (i = 0; config->command_policies && i < config->command_policies->length; ++i) {
-		free_command_policy(config->command_policies->items[i]);
-	}
+	list_free(config->active_bar_modifiers);
+	list_free(config->config_chain);
 	list_free(config->command_policies);
-
-	for (i = 0; config->feature_policies && i < config->feature_policies->length; ++i) {
-		free_feature_policy(config->feature_policies->items[i]);
-	}
 	list_free(config->feature_policies);
-
-	list_free(config->active_bar_modifiers);
-	free_flat_list(config->config_chain);
-	free(config->font);
+	list_free(config->ipc_policies);
+	free(config->current_bar);
 	free(config->floating_scroll_up_cmd);
 	free(config->floating_scroll_down_cmd);
 	free(config->floating_scroll_left_cmd);
 	free(config->floating_scroll_right_cmd);
+	free(config->font);
+	free((char *)config->current_config);
 	free(config);
 }
 
-
-static bool file_exists(const char *path) {
-	return path && access(path, R_OK) != -1;
+static void destroy_removed_seats(struct sway_config *old_config,
+		struct sway_config *new_config) {
+	struct seat_config *seat_config;
+	struct sway_seat *seat;
+	int i;
+	for (i = 0; i < old_config->seat_configs->length; i++) {
+		seat_config = old_config->seat_configs->items[i];
+		/* Also destroy seats that aren't present in new config */
+		if (new_config && list_seq_find(new_config->seat_configs,
+				seat_name_cmp, seat_config->name) < 0) {
+			seat = input_manager_get_seat(input_manager,
+				seat_config->name);
+			seat_destroy(seat);
+		}
+	}
 }
 
 static void config_defaults(struct sway_config *config) {
@@ -304,19 +139,22 @@ static void config_defaults(struct sway_config *config) {
 	if (!(config->criteria = create_list())) goto cleanup;
 	if (!(config->no_focus = create_list())) goto cleanup;
 	if (!(config->input_configs = create_list())) goto cleanup;
+	if (!(config->seat_configs = create_list())) goto cleanup;
 	if (!(config->output_configs = create_list())) goto cleanup;
 
 	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;
+	if (!(config->current_mode->keysym_bindings = create_list())) goto cleanup;
+	if (!(config->current_mode->keycode_bindings = create_list())) goto cleanup;
 	list_add(config->modes, config->current_mode);
 
 	config->floating_mod = 0;
-	config->dragging_key = M_LEFT_CLICK;
-	config->resizing_key = M_RIGHT_CLICK;
+	config->dragging_key = BTN_LEFT;
+	config->resizing_key = BTN_RIGHT;
 	if (!(config->floating_scroll_up_cmd = strdup(""))) goto cleanup;
 	if (!(config->floating_scroll_down_cmd = strdup(""))) goto cleanup;
 	if (!(config->floating_scroll_left_cmd = strdup(""))) goto cleanup;
@@ -324,7 +162,8 @@ static void config_defaults(struct sway_config *config) {
 	config->default_layout = L_NONE;
 	config->default_orientation = L_NONE;
 	if (!(config->font = strdup("monospace 10"))) goto cleanup;
-	config->font_height = get_font_text_height(config->font);
+	// TODO: border
+	//config->font_height = get_font_text_height(config->font);
 
 	// floating view
 	config->floating_maximum_width = 0;
@@ -339,7 +178,6 @@ static void config_defaults(struct sway_config *config) {
 	config->active = false;
 	config->failed = false;
 	config->auto_back_and_forth = false;
-	config->seamless_mouse = true;
 	config->reading = false;
 	config->show_marks = true;
 
@@ -403,29 +241,8 @@ cleanup:
 	sway_abort("Unable to allocate config structures");
 }
 
-static int compare_modifiers(const void *left, const void *right) {
-	uint32_t a = *(uint32_t *)left;
-	uint32_t b = *(uint32_t *)right;
-
-	return a - b;
-}
-
-void update_active_bar_modifiers() {
-	if (config->active_bar_modifiers->length > 0) {
-		list_free(config->active_bar_modifiers);
-		config->active_bar_modifiers = create_list();
-	}
-
-	struct bar_config *bar;
-	int i;
-	for (i = 0; i < config->bars->length; ++i) {
-		bar = config->bars->items[i];
-		if (strcmp(bar->mode, "hide") == 0 && strcmp(bar->hidden_state, "hide") == 0) {
-			if (list_seq_find(config->active_bar_modifiers, compare_modifiers, &bar->modifier) < 0) {
-				list_add(config->active_bar_modifiers, &bar->modifier);
-			}
-		}
-	}
+static bool file_exists(const char *path) {
+	return path && access(path, R_OK) != -1;
 }
 
 static char *get_config_path(void) {
@@ -442,12 +259,12 @@ static char *get_config_path(void) {
 		char *home = getenv("HOME");
 		char *config_home = malloc(strlen(home) + strlen("/.config") + 1);
 		if (!config_home) {
-			sway_log(L_ERROR, "Unable to allocate $HOME/.config");
+			wlr_log(L_ERROR, "Unable to allocate $HOME/.config");
 		} else {
 			strcpy(config_home, home);
 			strcat(config_home, "/.config");
 			setenv("XDG_CONFIG_HOME", config_home, 1);
-			sway_log(L_DEBUG, "Set XDG_CONFIG_HOME to %s", config_home);
+			wlr_log(L_DEBUG, "Set XDG_CONFIG_HOME to %s", config_home);
 			free(config_home);
 		}
 	}
@@ -463,6 +280,7 @@ static char *get_config_path(void) {
 			if (file_exists(path)) {
 				return path;
 			}
+			free(path);
 		}
 	}
 
@@ -472,7 +290,7 @@ static char *get_config_path(void) {
 const char *current_config_path;
 
 static bool load_config(const char *path, struct sway_config *config) {
-	sway_log(L_INFO, "Loading config from %s", path);
+	wlr_log(L_INFO, "Loading config from %s", path);
 	current_config_path = path;
 
 	struct stat sb;
@@ -481,13 +299,13 @@ static bool load_config(const char *path, struct sway_config *config) {
 	}
 
 	if (path == NULL) {
-		sway_log(L_ERROR, "Unable to find a config file!");
+		wlr_log(L_ERROR, "Unable to find a config file!");
 		return false;
 	}
 
 	FILE *f = fopen(path, "r");
 	if (!f) {
-		sway_log(L_ERROR, "Unable to open %s for reading", path);
+		wlr_log(L_ERROR, "Unable to open %s for reading", path);
 		return false;
 	}
 
@@ -495,20 +313,14 @@ static bool load_config(const char *path, struct sway_config *config) {
 	fclose(f);
 
 	if (!config_load_success) {
-		sway_log(L_ERROR, "Error(s) loading config!");
+		wlr_log(L_ERROR, "Error(s) loading config!");
 	}
 
 	current_config_path = NULL;
 	return true;
 }
 
-static int qstrcmp(const void* a, const void* b) {
-	return strcmp(*((char**) a), *((char**) b));
-}
-
 bool load_main_config(const char *file, bool is_active) {
-	input_init();
-
 	char *path;
 	if (file != NULL) {
 		path = strdup(file);
@@ -524,7 +336,7 @@ bool load_main_config(const char *file, bool is_active) {
 
 	config_defaults(config);
 	if (is_active) {
-		sway_log(L_DEBUG, "Performing configuration file reload");
+		wlr_log(L_DEBUG, "Performing configuration file reload");
 		config->reloading = true;
 		config->active = true;
 	}
@@ -535,11 +347,14 @@ bool load_main_config(const char *file, bool is_active) {
 	config->reading = true;
 
 	// Read security configs
+	// TODO: Security
 	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");
+		wlr_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/";
@@ -563,8 +378,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)) {
+				wlr_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);
@@ -573,6 +392,7 @@ bool load_main_config(const char *file, bool is_active) {
 
 		free_flat_list(secconfigs);
 	}
+	*/
 
 	success = success && load_config(path, config);
 
@@ -581,18 +401,15 @@ bool load_main_config(const char *file, bool is_active) {
 	}
 
 	if (old_config) {
+		destroy_removed_seats(old_config, config);
 		free_config(old_config);
 	}
 	config->reading = false;
-
-	if (success) {
-		update_active_bar_modifiers();
-	}
-
 	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;
 
@@ -602,7 +419,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");
+			wlr_log(L_ERROR,
+				"Unable to allocate full path to included config");
 			return false;
 		}
 		snprintf(full_path, len, "%s/%s", parent_dir, path);
@@ -612,7 +430,7 @@ static bool load_include_config(const char *path, const char *parent_dir, struct
 	free(full_path);
 
 	if (real_path == NULL) {
-		sway_log(L_DEBUG, "%s not found.", path);
+		wlr_log(L_DEBUG, "%s not found.", path);
 		return false;
 	}
 
@@ -621,7 +439,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);
+			wlr_log(L_DEBUG,
+				"%s already included once, won't be included again.",
+				real_path);
 			free(real_path);
 			return false;
 		}
@@ -673,7 +493,7 @@ bool load_include_configs(const char *path, struct sway_config *config) {
 	// restore wd
 	if (chdir(wd) < 0) {
 		free(wd);
-		sway_log(L_ERROR, "failed to restore working directory");
+		wlr_log(L_ERROR, "failed to restore working directory");
 		return false;
 	}
 
@@ -681,13 +501,11 @@ bool load_include_configs(const char *path, struct sway_config *config) {
 	return true;
 }
 
-struct cmd_results *check_security_config() {
-	if (!current_config_path || strncmp(SYSCONFDIR "/sway/security.d/", current_config_path,
-				strlen(SYSCONFDIR "/sway/security.d/")) != 0) {
-		return cmd_results_new(CMD_INVALID, "permit",
-				"This command is only permitted to run from " SYSCONFDIR "/sway/security.d/*");
-	}
-	return NULL;
+void config_clear_handler_context(struct sway_config *config) {
+	free_input_config(config->handler_context.input_config);
+	free_seat_config(config->handler_context.seat_config);
+
+	memset(&config->handler_context, 0, sizeof(config->handler_context));
 }
 
 bool read_config(FILE *file, struct sway_config *config) {
@@ -717,13 +535,13 @@ 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);
+			wlr_log(L_ERROR, "Error on line %i '%s': %s (%s)", line_number,
+				line, res->error, config->current_config);
 			success = false;
 			break;
 
 		case CMD_DEFER:
-			sway_log(L_DEBUG, "Defferring command `%s'", line);
+			wlr_log(L_DEBUG, "Deferring command `%s'", line);
 			list_add(config->cmd_queue, strdup(line));
 			break;
 
@@ -731,7 +549,7 @@ bool read_config(FILE *file, struct sway_config *config) {
 			if (block == CMD_BLOCK_END) {
 				block = CMD_BLOCK_MODE;
 			} else {
-				sway_log(L_ERROR, "Invalid block '%s'", line);
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
 			}
 			break;
 
@@ -739,7 +557,15 @@ bool read_config(FILE *file, struct sway_config *config) {
 			if (block == CMD_BLOCK_END) {
 				block = CMD_BLOCK_INPUT;
 			} else {
-				sway_log(L_ERROR, "Invalid block '%s'", line);
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
+			}
+			break;
+
+		case CMD_BLOCK_SEAT:
+			if (block == CMD_BLOCK_END) {
+				block = CMD_BLOCK_SEAT;
+			} else {
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
 			}
 			break;
 
@@ -747,7 +573,7 @@ bool read_config(FILE *file, struct sway_config *config) {
 			if (block == CMD_BLOCK_END) {
 				block = CMD_BLOCK_BAR;
 			} else {
-				sway_log(L_ERROR, "Invalid block '%s'", line);
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
 			}
 			break;
 
@@ -755,7 +581,7 @@ bool read_config(FILE *file, struct sway_config *config) {
 			if (block == CMD_BLOCK_BAR) {
 				block = CMD_BLOCK_BAR_COLORS;
 			} else {
-				sway_log(L_ERROR, "Invalid block '%s'", line);
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
 			}
 			break;
 
@@ -763,7 +589,7 @@ bool read_config(FILE *file, struct sway_config *config) {
 			if (block == CMD_BLOCK_END) {
 				block = CMD_BLOCK_COMMANDS;
 			} else {
-				sway_log(L_ERROR, "Invalid block '%s'", line);
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
 			}
 			break;
 
@@ -771,7 +597,7 @@ bool read_config(FILE *file, struct sway_config *config) {
 			if (block == CMD_BLOCK_END) {
 				block = CMD_BLOCK_IPC;
 			} else {
-				sway_log(L_ERROR, "Invalid block '%s'", line);
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
 			}
 			break;
 
@@ -779,56 +605,61 @@ bool read_config(FILE *file, struct sway_config *config) {
 			if (block == CMD_BLOCK_IPC) {
 				block = CMD_BLOCK_IPC_EVENTS;
 			} else {
-				sway_log(L_ERROR, "Invalid block '%s'", line);
+				wlr_log(L_ERROR, "Invalid block '%s'", line);
 			}
 			break;
 
 		case CMD_BLOCK_END:
 			switch(block) {
 			case CMD_BLOCK_MODE:
-				sway_log(L_DEBUG, "End of mode block");
+				wlr_log(L_DEBUG, "End of mode block");
 				config->current_mode = config->modes->items[0];
 				block = CMD_BLOCK_END;
 				break;
 
 			case CMD_BLOCK_INPUT:
-				sway_log(L_DEBUG, "End of input block");
-				current_input_config = NULL;
+				wlr_log(L_DEBUG, "End of input block");
+				block = CMD_BLOCK_END;
+				break;
+
+			case CMD_BLOCK_SEAT:
+				wlr_log(L_DEBUG, "End of seat block");
 				block = CMD_BLOCK_END;
 				break;
 
 			case CMD_BLOCK_BAR:
-				sway_log(L_DEBUG, "End of bar block");
+				wlr_log(L_DEBUG, "End of bar block");
 				config->current_bar = NULL;
 				block = CMD_BLOCK_END;
 				break;
 
 			case CMD_BLOCK_BAR_COLORS:
-				sway_log(L_DEBUG, "End of bar colors block");
+				wlr_log(L_DEBUG, "End of bar colors block");
 				block = CMD_BLOCK_BAR;
 				break;
 
 			case CMD_BLOCK_COMMANDS:
-				sway_log(L_DEBUG, "End of commands block");
+				wlr_log(L_DEBUG, "End of commands block");
 				block = CMD_BLOCK_END;
 				break;
 
 			case CMD_BLOCK_IPC:
-				sway_log(L_DEBUG, "End of IPC block");
+				wlr_log(L_DEBUG, "End of IPC block");
 				block = CMD_BLOCK_END;
 				break;
 
 			case CMD_BLOCK_IPC_EVENTS:
-				sway_log(L_DEBUG, "End of IPC events block");
+				wlr_log(L_DEBUG, "End of IPC events block");
 				block = CMD_BLOCK_IPC;
 				break;
 
 			case CMD_BLOCK_END:
-				sway_log(L_ERROR, "Unmatched }");
+				wlr_log(L_ERROR, "Unmatched }");
 				break;
 
 			default:;
 			}
+			config_clear_handler_context(config);
 		default:;
 		}
 		free(line);
@@ -838,365 +669,6 @@ bool read_config(FILE *file, struct sway_config *config) {
 	return success;
 }
 
-int input_identifier_cmp(const void *item, const void *data) {
-	const struct input_config *ic = item;
-	const char *identifier = data;
-	return strcmp(ic->identifier, identifier);
-}
-
-int output_name_cmp(const void *item, const void *data) {
-	const struct output_config *output = item;
-	const char *name = data;
-
-	return strcmp(output->name, name);
-}
-
-void merge_input_config(struct input_config *dst, struct input_config *src) {
-	if (src->identifier) {
-		if (dst->identifier) {
-			free(dst->identifier);
-		}
-		dst->identifier = strdup(src->identifier);
-	}
-	if (src->accel_profile != INT_MIN) {
-		dst->accel_profile = src->accel_profile;
-	}
-	if (src->click_method != INT_MIN) {
-		dst->click_method = src->click_method;
-	}
-	if (src->drag_lock != INT_MIN) {
-		dst->drag_lock = src->drag_lock;
-	}
-	if (src->dwt != INT_MIN) {
-		dst->dwt = src->dwt;
-	}
-	if (src->middle_emulation != INT_MIN) {
-		dst->middle_emulation = src->middle_emulation;
-	}
-	if (src->natural_scroll != INT_MIN) {
-		dst->natural_scroll = src->natural_scroll;
-	}
-	if (src->pointer_accel != FLT_MIN) {
-		dst->pointer_accel = src->pointer_accel;
-	}
-	if (src->scroll_method != INT_MIN) {
-		dst->scroll_method = src->scroll_method;
-	}
-	if (src->send_events != INT_MIN) {
-		dst->send_events = src->send_events;
-	}
-	if (src->tap != INT_MIN) {
-		dst->tap = src->tap;
-	}
-}
-
-void merge_output_config(struct output_config *dst, struct output_config *src) {
-	if (src->name) {
-		if (dst->name) {
-			free(dst->name);
-		}
-		dst->name = strdup(src->name);
-	}
-	if (src->enabled != -1) {
-		dst->enabled = src->enabled;
-	}
-	if (src->width != -1) {
-		dst->width = src->width;
-	}
-	if (src->height != -1) {
-		dst->height = src->height;
-	}
-	if (src->x != -1) {
-		dst->x = src->x;
-	}
-	if (src->y != -1) {
-		dst->y = src->y;
-	}
-  if (src->scale != -1) {
-    dst->scale = src->scale;
-  }
-	if (src->background) {
-		if (dst->background) {
-			free(dst->background);
-		}
-		dst->background = strdup(src->background);
-	}
-	if (src->background_option) {
-		if (dst->background_option) {
-			free(dst->background_option);
-		}
-		dst->background_option = strdup(src->background_option);
-	}
-}
-
-static void invoke_swaybar(struct bar_config *bar) {
-	// Pipe to communicate errors
-	int filedes[2];
-	if (pipe(filedes) == -1) {
-		sway_log(L_ERROR, "Pipe setup failed! Cannot fork into bar");
-		return;
-	}
-
-	bar->pid = fork();
-	if (bar->pid == 0) {
-		close(filedes[0]);
-		if (!bar->swaybar_command) {
-			char *const cmd[] = {
-				"swaybar",
-				"-b",
-				bar->id,
-				NULL,
-			};
-
-			close(filedes[1]);
-			execvp(cmd[0], cmd);
-			_exit(EXIT_SUCCESS);
-		} else {
-			// run custom swaybar
-			int len = strlen(bar->swaybar_command) + strlen(bar->id) + 5;
-			char *command = malloc(len * sizeof(char));
-			if (!command) {
-				const char msg[] = "Unable to allocate swaybar command string";
-				int len = sizeof(msg);
-				if (write(filedes[1], &len, sizeof(int))) {};
-				if (write(filedes[1], msg, len)) {};
-				close(filedes[1]);
-				_exit(EXIT_FAILURE);
-			}
-			snprintf(command, len, "%s -b %s", bar->swaybar_command, bar->id);
-
-			char *const cmd[] = {
-				"sh",
-				"-c",
-				command,
-				NULL,
-			};
-
-			close(filedes[1]);
-			execvp(cmd[0], cmd);
-			free(command);
-			_exit(EXIT_SUCCESS);
-		}
-	}
-	close(filedes[0]);
-	int len;
-	if(read(filedes[1], &len, sizeof(int)) == sizeof(int)) {
-		char *buf = malloc(len);
-		if(!buf) {
-			sway_log(L_ERROR, "Cannot allocate error string");
-			return;
-		}
-		if(read(filedes[1], buf, len)) {
-			sway_log(L_ERROR, "%s", buf);
-		}
-		free(buf);
-	}
-	close(filedes[1]);
-}
-
-static void terminate_swaybar(pid_t pid) {
-	int ret = kill(pid, SIGTERM);
-	if (ret != 0) {
-		sway_log(L_ERROR, "Unable to terminate swaybar [pid: %d]", pid);
-	} else {
-		int status;
-		waitpid(pid, &status, 0);
-	}
-}
-
-void terminate_swaybg(pid_t pid) {
-	int ret = kill(pid, SIGTERM);
-	if (ret != 0) {
-		sway_log(L_ERROR, "Unable to terminate swaybg [pid: %d]", pid);
-	} else {
-		int status;
-		waitpid(pid, &status, 0);
-	}
-}
-
-static bool active_output(const char *name) {
-	int i;
-	swayc_t *cont = NULL;
-	for (i = 0; i < root_container.children->length; ++i) {
-		cont = root_container.children->items[i];
-		if (cont->type == C_OUTPUT && strcasecmp(name, cont->name) == 0) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void load_swaybars() {
-	// Check for bars
-	list_t *bars = create_list();
-	struct bar_config *bar = NULL;
-	int i;
-	for (i = 0; i < config->bars->length; ++i) {
-		bar = config->bars->items[i];
-		bool apply = false;
-		if (bar->outputs) {
-			int j;
-			for (j = 0; j < bar->outputs->length; ++j) {
-				char *o = bar->outputs->items[j];
-				if (!strcmp(o, "*") || active_output(o)) {
-					apply = true;
-					break;
-				}
-			}
-		} else {
-			apply = true;
-		}
-		if (apply) {
-			list_add(bars, bar);
-		}
-	}
-
-	for (i = 0; i < bars->length; ++i) {
-		bar = bars->items[i];
-		if (bar->pid != 0) {
-			terminate_swaybar(bar->pid);
-		}
-		sway_log(L_DEBUG, "Invoking swaybar for bar id '%s'", bar->id);
-		invoke_swaybar(bar);
-	}
-
-	list_free(bars);
-}
-
-void apply_input_config(struct input_config *ic, struct libinput_device *dev) {
-	if (!ic) {
-		return;
-	}
-
-	sway_log(L_DEBUG, "apply_input_config(%s)", ic->identifier);
-
-	if (ic->accel_profile != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) accel_set_profile(%d)", ic->identifier, ic->accel_profile);
-		libinput_device_config_accel_set_profile(dev, ic->accel_profile);
-	}
-	if (ic->click_method != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) click_set_method(%d)", ic->identifier, ic->click_method);
-		libinput_device_config_click_set_method(dev, ic->click_method);
-	}
-	if (ic->drag_lock != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) tap_set_drag_lock_enabled(%d)", ic->identifier, ic->click_method);
-		libinput_device_config_tap_set_drag_lock_enabled(dev, ic->drag_lock);
-	}
-	if (ic->dwt != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) dwt_set_enabled(%d)", ic->identifier, ic->dwt);
-		libinput_device_config_dwt_set_enabled(dev, ic->dwt);
-	}
-	if (ic->left_handed != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) left_handed_set_enabled(%d)", ic->identifier, ic->left_handed);
-		libinput_device_config_left_handed_set(dev, ic->left_handed);
-	}
-	if (ic->middle_emulation != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) middle_emulation_set_enabled(%d)", ic->identifier, ic->middle_emulation);
-		libinput_device_config_middle_emulation_set_enabled(dev, ic->middle_emulation);
-	}
-	if (ic->natural_scroll != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) natural_scroll_set_enabled(%d)", ic->identifier, ic->natural_scroll);
-		libinput_device_config_scroll_set_natural_scroll_enabled(dev, ic->natural_scroll);
-	}
-	if (ic->pointer_accel != FLT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) accel_set_speed(%f)", ic->identifier, ic->pointer_accel);
-		libinput_device_config_accel_set_speed(dev, ic->pointer_accel);
-	}
-	if (ic->scroll_method != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) scroll_set_method(%d)", ic->identifier, ic->scroll_method);
-		libinput_device_config_scroll_set_method(dev, ic->scroll_method);
-	}
-	if (ic->send_events != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) send_events_set_mode(%d)", ic->identifier, ic->send_events);
-		libinput_device_config_send_events_set_mode(dev, ic->send_events);
-	}
-	if (ic->tap != INT_MIN) {
-		sway_log(L_DEBUG, "apply_input_config(%s) tap_set_enabled(%d)", ic->identifier, ic->tap);
-		libinput_device_config_tap_set_enabled(dev, ic->tap);
-	}
-}
-
-void apply_output_config(struct output_config *oc, swayc_t *output) {
-	if (oc && oc->enabled == 0) {
-		destroy_output(output);
-		return;
-	}
-
-	if (oc && oc->width > 0 && oc->height > 0) {
-		output->width = oc->width;
-		output->height = oc->height;
-
-		sway_log(L_DEBUG, "Set %s size to %ix%i (%d)", oc->name, oc->width, oc->height, oc->scale);
-		struct wlc_size new_size = { .w = oc->width, .h = oc->height };
-		wlc_output_set_resolution(output->handle, &new_size, (uint32_t)oc->scale);
-	} else if (oc) {
-		const struct wlc_size *new_size = wlc_output_get_resolution(output->handle);
-		wlc_output_set_resolution(output->handle, new_size, (uint32_t)oc->scale);
-	}
-
-	// Find position for it
-	if (oc && oc->x != -1 && oc->y != -1) {
-		sway_log(L_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y);
-		output->x = oc->x;
-		output->y = oc->y;
-	} else {
-		int x = 0;
-		for (int i = 0; i < root_container.children->length; ++i) {
-			swayc_t *c = root_container.children->items[i];
-			if (c->type == C_OUTPUT) {
-				if (c->width + c->x > x) {
-					x = c->width + c->x;
-				}
-			}
-		}
-		output->x = x;
-	}
-
-	if (!oc || !oc->background) {
-		// Look for a * config for background
-		int i = list_seq_find(config->output_configs, output_name_cmp, "*");
-		if (i >= 0) {
-			oc = config->output_configs->items[i];
-		} else {
-			oc = NULL;
-		}
-	}
-
-	int output_i;
-	for (output_i = 0; output_i < root_container.children->length; ++output_i) {
-		if (root_container.children->items[output_i] == output) {
-			break;
-		}
-	}
-
-	if (oc && oc->background) {
-		if (output->bg_pid != 0) {
-			terminate_swaybg(output->bg_pid);
-		}
-
-		sway_log(L_DEBUG, "Setting background for output %d to %s", output_i, oc->background);
-
-		size_t bufsize = 12;
-		char output_id[bufsize];
-		snprintf(output_id, bufsize, "%d", output_i);
-		output_id[bufsize-1] = 0;
-
-		char *const cmd[] = {
-			"swaybg",
-			output_id,
-			oc->background,
-			oc->background_option,
-			NULL,
-		};
-
-		output->bg_pid = fork();
-		if (output->bg_pid == 0) {
-			execvp(cmd[0], cmd);
-		}
-	}
-}
-
 char *do_var_replacement(char *str) {
 	int i;
 	char *find = str;
@@ -1216,8 +688,9 @@ char *do_var_replacement(char *str) {
 				int vvlen = strlen(var->value);
 				char *newstr = malloc(strlen(str) - vnlen + vvlen + 1);
 				if (!newstr) {
-					sway_log(L_ERROR,
-							"Unable to allocate replacement during variable expansion");
+					wlr_log(L_ERROR,
+						"Unable to allocate replacement "
+						"during variable expansion");
 					break;
 				}
 				char *newptr = newstr;
@@ -1247,197 +720,3 @@ int workspace_output_cmp_workspace(const void *a, const void *b) {
 	const struct workspace_output *wsa = a, *wsb = b;
 	return lenient_strcmp(wsa->workspace, wsb->workspace);
 }
-
-int sway_binding_cmp_keys(const void *a, const void *b) {
-	const struct sway_binding *binda = a, *bindb = b;
-
-	// Count keys pressed for this binding. important so we check long before
-	// short ones.  for example mod+a+b  before  mod+a
-	unsigned int moda = 0, modb = 0, i;
-
-	// Count how any modifiers are pressed
-	for (i = 0; i < 8 * sizeof(binda->modifiers); ++i) {
-		moda += (binda->modifiers & 1 << i) != 0;
-		modb += (bindb->modifiers & 1 << i) != 0;
-	}
-	if (bindb->keys->length + modb != binda->keys->length + moda) {
-		return (bindb->keys->length + modb) - (binda->keys->length + moda);
-	}
-
-	// Otherwise compare keys
-	if (binda->modifiers > bindb->modifiers) {
-		return 1;
-	} else if (binda->modifiers < bindb->modifiers) {
-		return -1;
-	}
-	struct wlc_modifiers no_mods = { 0, 0 };
-	for (int i = 0; i < binda->keys->length; i++) {
-		xkb_keysym_t ka = *(xkb_keysym_t *)binda->keys->items[i],
-			kb = *(xkb_keysym_t *)bindb->keys->items[i];
-		if (binda->bindcode) {
-			uint32_t *keycode = binda->keys->items[i];
-			ka = wlc_keyboard_get_keysym_for_key(*keycode, &no_mods);
-		}
-
-		if (bindb->bindcode) {
-			uint32_t *keycode = bindb->keys->items[i];
-			kb = wlc_keyboard_get_keysym_for_key(*keycode, &no_mods);
-		}
-
-		if (ka > kb) {
-			return 1;
-		} else if (ka < kb) {
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-int sway_binding_cmp(const void *a, const void *b) {
-	int cmp = 0;
-	if ((cmp = sway_binding_cmp_keys(a, b)) != 0) {
-		return cmp;
-	}
-	const struct sway_binding *binda = a, *bindb = b;
-	return lenient_strcmp(binda->command, bindb->command);
-}
-
-int sway_binding_cmp_qsort(const void *a, const void *b) {
-	return sway_binding_cmp(*(void **)a, *(void **)b);
-}
-
-void free_sway_binding(struct sway_binding *binding) {
-	if (binding->keys) {
-		for (int i = 0; i < binding->keys->length; i++) {
-			free(binding->keys->items[i]);
-		}
-		list_free(binding->keys);
-	}
-	if (binding->command) {
-		free(binding->command);
-	}
-	free(binding);
-}
-
-int sway_mouse_binding_cmp_buttons(const void *a, const void *b) {
-	const struct sway_mouse_binding *binda = a, *bindb = b;
-	if (binda->button > bindb->button) {
-		return 1;
-	}
-	if (binda->button < bindb->button) {
-		return -1;
-	}
-	return 0;
-}
-
-int sway_mouse_binding_cmp(const void *a, const void *b) {
-	int cmp = 0;
-	if ((cmp = sway_binding_cmp_keys(a, b)) != 0) {
-		return cmp;
-	}
-	const struct sway_mouse_binding *binda = a, *bindb = b;
-	return lenient_strcmp(binda->command, bindb->command);
-}
-
-int sway_mouse_binding_cmp_qsort(const void *a, const void *b) {
-	return sway_mouse_binding_cmp(*(void **)a, *(void **)b);
-}
-
-void free_sway_mouse_binding(struct sway_mouse_binding *binding) {
-	if (binding->command) {
-		free(binding->command);
-	}
-	free(binding);
-}
-
-struct sway_binding *sway_binding_dup(struct sway_binding *sb) {
-	struct sway_binding *new_sb = malloc(sizeof(struct sway_binding));
-	if (!new_sb) {
-		return NULL;
-	}
-
-	new_sb->order = sb->order;
-	new_sb->modifiers = sb->modifiers;
-	new_sb->command = strdup(sb->command);
-
-	new_sb->keys = create_list();
-	int i;
-	for (i = 0; i < sb->keys->length; ++i) {
-		xkb_keysym_t *key = malloc(sizeof(xkb_keysym_t));
-		if (!key) {
-			free_sway_binding(new_sb);
-			return NULL;
-		}
-		*key = *(xkb_keysym_t *)sb->keys->items[i];
-		list_add(new_sb->keys, key);
-	}
-
-	return new_sb;
-}
-
-struct bar_config *default_bar_config(void) {
-	struct bar_config *bar = NULL;
-	bar = malloc(sizeof(struct bar_config));
-	if (!bar) {
-		return NULL;
-	}
-	if (!(bar->mode = strdup("dock"))) goto cleanup;
-	if (!(bar->hidden_state = strdup("hide"))) goto cleanup;
-	bar->modifier = WLC_BIT_MOD_LOGO;
-	bar->outputs = NULL;
-	bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
-	if (!(bar->bindings = create_list())) goto cleanup;
-	if (!(bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p'; sleep 1; done"))) goto cleanup;
-	bar->pango_markup = false;
-	bar->swaybar_command = NULL;
-	bar->font = NULL;
-	bar->height = -1;
-	bar->workspace_buttons = true;
-	bar->wrap_scroll = false;
-	bar->separator_symbol = NULL;
-	bar->strip_workspace_numbers = false;
-	bar->binding_mode_indicator = true;
-#ifdef ENABLE_TRAY
-	bar->tray_output = NULL;
-	bar->icon_theme = NULL;
-	bar->tray_padding = 2;
-	bar->activate_button = 0x110; /* BTN_LEFT */
-	bar->context_button = 0x111; /* BTN_RIGHT */
-	bar->secondary_button = 0x112; /* BTN_MIDDLE */
-#endif
-	bar->verbose = false;
-	bar->pid = 0;
-	// set default colors
-	if (!(bar->colors.background = strndup("#000000ff", 9))) goto cleanup;
-	if (!(bar->colors.statusline = strndup("#ffffffff", 9))) goto cleanup;
-	if (!(bar->colors.separator = strndup("#666666ff", 9))) goto cleanup;
-	if (!(bar->colors.focused_workspace_border = strndup("#4c7899ff", 9))) goto cleanup;
-	if (!(bar->colors.focused_workspace_bg = strndup("#285577ff", 9))) goto cleanup;
-	if (!(bar->colors.focused_workspace_text = strndup("#ffffffff", 9))) goto cleanup;
-	if (!(bar->colors.active_workspace_border = strndup("#333333ff", 9))) goto cleanup;
-	if (!(bar->colors.active_workspace_bg = strndup("#5f676aff", 9))) goto cleanup;
-	if (!(bar->colors.active_workspace_text = strndup("#ffffffff", 9))) goto cleanup;
-	if (!(bar->colors.inactive_workspace_border = strndup("#333333ff", 9))) goto cleanup;
-	if (!(bar->colors.inactive_workspace_bg = strndup("#222222ff", 9))) goto cleanup;
-	if (!(bar->colors.inactive_workspace_text = strndup("#888888ff", 9))) goto cleanup;
-	if (!(bar->colors.urgent_workspace_border = strndup("#2f343aff", 9))) goto cleanup;
-	if (!(bar->colors.urgent_workspace_bg = strndup("#900000ff", 9))) goto cleanup;
-	if (!(bar->colors.urgent_workspace_text = strndup("#ffffffff", 9))) goto cleanup;
-	// if the following colors stay undefined, they fall back to background,
-	// statusline, separator and urgent_workspace_*.
-	bar->colors.focused_background = NULL;
-	bar->colors.focused_statusline = NULL;
-	bar->colors.focused_separator = NULL;
-	bar->colors.binding_mode_border = NULL;
-	bar->colors.binding_mode_bg = NULL;
-	bar->colors.binding_mode_text = NULL;
-
-	list_add(config->bars, bar);
-
-	return bar;
-
-cleanup:
-	free_bar(bar);
-	return NULL;
-}