Merge branch 'wlroots' into view-redesign

1 files changed, 4 insertions, 7 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 64f079f4..74d9d535 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -20,10 +20,6 @@ static bool parse_movement_direction(const char *name,
 		*out = MOVE_PARENT;
 	} else if (strcasecmp(name, "child") == 0) {
 		*out = MOVE_CHILD;
-	} else if (strcasecmp(name, "next") == 0) {
-		*out = MOVE_NEXT;
-	} else if (strcasecmp(name, "prev") == 0) {
-		*out = MOVE_PREV;
 	} else {
 		return false;
 	}
@@ -40,7 +36,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
 	}
 
 	if (argc == 0) {
-		sway_seat_set_focus(seat, con);
+		seat_set_focus(seat, con);
 		return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 	}
 
@@ -51,9 +47,10 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
 				"Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
 	}
 
-	struct sway_container *next_focus = container_get_in_direction(con, seat, direction);
+	struct sway_container *next_focus = container_get_in_direction(
+			con, seat, direction);
 	if (next_focus) {
-		sway_seat_set_focus(seat, next_focus);
+		seat_set_focus(seat, next_focus);
 	}
 
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);