aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/focus.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/focus.c')
-rw-r--r--sway/commands/focus.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 64f079f4..f1a8078f 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -3,11 +3,10 @@
#include "log.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
-#include "sway/tree/view.h"
+#include "sway/view.h"
#include "sway/commands.h"
-static bool parse_movement_direction(const char *name,
- enum movement_direction *out) {
+static bool parse_movement_direction(const char *name, enum movement_direction *out) {
if (strcasecmp(name, "left") == 0) {
*out = MOVE_LEFT;
} else if (strcasecmp(name, "right") == 0) {
@@ -32,7 +31,7 @@ static bool parse_movement_direction(const char *name,
}
struct cmd_results *cmd_focus(int argc, char **argv) {
- struct sway_container *con = config->handler_context.current_container;
+ swayc_t *con = config->handler_context.current_container;
struct sway_seat *seat = config->handler_context.seat;
if (con->type < C_WORKSPACE) {
return cmd_results_new(CMD_FAILURE, "focus",
@@ -51,7 +50,7 @@ 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);
+ swayc_t *next_focus = get_swayc_in_direction(con, seat, direction);
if (next_focus) {
sway_seat_set_focus(seat, next_focus);
}