4 files changed, 112 insertions, 55 deletions

diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 6b4bcf1f..0fb17f1d 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -1,10 +1,7 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
-#include <strings.h>
-#include "sway/input/input-manager.h"
 #include "sway/commands.h"
 #include "sway/config.h"
-#include "log.h"
 #include "stringop.h"
 
 struct cmd_results *seat_cmd_attach(int argc, char **argv) {
@@ -12,19 +9,17 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
 	if ((error = checkarg(argc, "attach", EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
-	struct seat_config *current_seat_config =
-		config->handler_context.seat_config;
-	if (!current_seat_config) {
+	if (!config->handler_context.seat_config) {
 		return cmd_results_new(CMD_FAILURE, "attach", "No seat defined");
 	}
 
-	struct seat_config *new_config = new_seat_config(current_seat_config->name);
-	struct seat_attachment_config *new_attachment = seat_attachment_config_new();
-	new_attachment->identifier = strdup(argv[0]);
-	list_add(new_config->attachments, new_attachment);
-
-	if (!config->validating) {
-		apply_seat_config(new_config);
+	struct seat_attachment_config *attachment = seat_attachment_config_new();
+	if (!attachment) {
+		return cmd_results_new(CMD_FAILURE, "attach",
+				"Failed to allocate seat attachment config");
 	}
+	attachment->identifier = strdup(argv[0]);
+	list_add(config->handler_context.seat_config->attachments, attachment);
+
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index 1d41a94e..8d9e426a 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -1,12 +1,9 @@
-#define _XOPEN_SOURCE 700
-#ifdef __linux__
+#define _POSIX_C_SOURCE 200809L
 #include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 
 #include <strings.h>
 #include <wlr/types/wlr_cursor.h>
+#include <wlr/types/wlr_pointer.h>
 #include "sway/commands.h"
 #include "sway/input/cursor.h"
 
@@ -15,20 +12,10 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor,
 
 static const char *expected_syntax = "Expected 'cursor <move> <x> <y>' or "
 					"'cursor <set> <x> <y>' or "
-					"'curor <press|release> <left|right|1|2|3...>'";
-
-struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
-	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "cursor", EXPECTED_AT_LEAST, 2))) {
-		return error;
-	}
-	struct sway_seat *seat = config->handler_context.seat;
-	if (!seat) {
-		return cmd_results_new(CMD_FAILURE, "cursor", "No seat defined");
-	}
-
-	struct sway_cursor *cursor = seat->cursor;
+					"'curor <press|release> <button[1-9]|event-name-or-code>'";
 
+static struct cmd_results *handle_command(struct sway_cursor *cursor,
+		int argc, char **argv) {
 	if (strcasecmp(argv[0], "move") == 0) {
 		if (argc < 3) {
 			return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
@@ -50,6 +37,7 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
 		if (argc < 2) {
 			return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
 		}
+		struct cmd_results *error = NULL;
 		if ((error = press_or_release(cursor, argv[0], argv[1]))) {
 			return error;
 		}
@@ -58,6 +46,40 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
+struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "cursor", EXPECTED_AT_LEAST, 2))) {
+		return error;
+	}
+	struct seat_config *sc = config->handler_context.seat_config;
+	if (!sc) {
+		return cmd_results_new(CMD_FAILURE, "cursor", "No seat defined");
+	}
+
+	if (config->reading || !config->active) {
+		return cmd_results_new(CMD_DEFER, NULL, NULL);
+	}
+
+	if (strcmp(sc->name, "*") != 0) {
+		struct sway_seat *seat = input_manager_get_seat(sc->name);
+		if (!seat) {
+			return cmd_results_new(CMD_FAILURE, "cursor",
+					"Failed to get seat");
+		}
+		error = handle_command(seat->cursor, argc, argv);
+	} else {
+		struct sway_seat *seat = NULL;
+		wl_list_for_each(seat, &server.input->seats, link) {
+			error = handle_command(seat->cursor, argc, argv);
+			if ((error && error->status != CMD_SUCCESS)) {
+				break;
+			}
+		}
+	}
+
+	return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
 static struct cmd_results *press_or_release(struct sway_cursor *cursor,
 		char *action, char *button_str) {
 	enum wlr_button_state state;
@@ -70,15 +92,35 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor,
 		return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
 	}
 
-	if (strcasecmp(button_str, "left") == 0) {
-		button = BTN_LEFT;
-	} else if (strcasecmp(button_str, "right") == 0) {
-		button = BTN_RIGHT;
-	} else {
-		button = strtol(button_str, NULL, 10);
-		if (button == 0) {
-			return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
-		}
+	char *message = NULL;
+	button = get_mouse_button(button_str, &message);
+	if (message) {
+		struct cmd_results *error =
+			cmd_results_new(CMD_INVALID, "cursor", message);
+		free(message);
+		return error;
+	} else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
+			|| button == SWAY_SCROLL_LEFT || button == SWAY_SCROLL_RIGHT) {
+		// Dispatch axis event
+		enum wlr_axis_orientation orientation =
+			(button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN)
+			? WLR_AXIS_ORIENTATION_VERTICAL
+			: WLR_AXIS_ORIENTATION_HORIZONTAL;
+		double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT)
+			? -1 : 1;
+		struct wlr_event_pointer_axis event = {
+			.device = NULL,
+			.time_msec = 0,
+			.source = WLR_AXIS_SOURCE_WHEEL,
+			.orientation = orientation,
+			.delta = delta * 15,
+			.delta_discrete = delta
+		};
+		dispatch_cursor_axis(cursor, &event);
+		return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+	} else if (!button) {
+		return cmd_results_new(CMD_INVALID, "curor",
+				"Unknown button %s", button_str);
 	}
 	dispatch_cursor_button(cursor, NULL, 0, button, state);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/seat/fallback.c b/sway/commands/seat/fallback.c
index a0ddf3ef..8f1ab12c 100644
--- a/sway/commands/seat/fallback.c
+++ b/sway/commands/seat/fallback.c
@@ -1,27 +1,18 @@
-#include <string.h>
-#include <strings.h>
 #include "sway/config.h"
 #include "sway/commands.h"
-#include "sway/input/input-manager.h"
 #include "util.h"
 
 struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
 	struct cmd_results *error = NULL;
-	if ((error = checkarg(argc, "fallback", EXPECTED_AT_LEAST, 1))) {
+	if ((error = checkarg(argc, "fallback", EXPECTED_EQUAL_TO, 1))) {
 		return error;
 	}
-	struct seat_config *current_seat_config =
-		config->handler_context.seat_config;
-	if (!current_seat_config) {
+	if (!config->handler_context.seat_config) {
 		return cmd_results_new(CMD_FAILURE, "fallback", "No seat defined");
 	}
-	struct seat_config *new_config =
-		new_seat_config(current_seat_config->name);
-		
-	new_config->fallback = parse_boolean(argv[0], false);
 
-	if (!config->validating) {
-		apply_seat_config(new_config);
-	}
+	config->handler_context.seat_config->fallback =
+		parse_boolean(argv[0], false);
+
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/seat/hide_cursor.c b/sway/commands/seat/hide_cursor.c
new file mode 100644
index 00000000..343573b5
--- /dev/null
+++ b/sway/commands/seat/hide_cursor.c
@@ -0,0 +1,29 @@
+#define _POSIX_C_SOURCE 200809L
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/seat.h"
+#include "stringop.h"
+
+struct cmd_results *seat_cmd_hide_cursor(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "hide_cursor", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+	if (!config->handler_context.seat_config) {
+		return cmd_results_new(CMD_FAILURE, "hide_cursor", "No seat defined");
+	}
+
+	char *end;
+	int timeout = strtol(argv[0], &end, 10);
+	if (*end) {
+		return cmd_results_new(CMD_INVALID, "hide_cursor",
+				"Expected an integer timeout");
+	}
+	if (timeout < 100 && timeout != 0) {
+		timeout = 100;
+	}
+	config->handler_context.seat_config->hide_cursor_timeout = timeout;
+
+	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}