4 files changed, 8 insertions, 8 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index c91b0361..50f284f4 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -871,7 +871,7 @@ void container_set_fullscreen(struct sway_container *container, bool enable) {
                         focus_ws = seat_get_focused_workspace(seat);
                         if (focus_ws) {
                                 if (focus_ws == workspace) {
-                                        seat_set_focus(seat, &container->node);
+                                        seat_set_focus_container(seat, container);
                                 }
                         }
                 }
@@ -1159,8 +1159,8 @@ struct sway_container *container_split(struct sway_container *child,
         container_add_child(cont, child);
 
         if (set_focus) {
-                seat_set_focus(seat, &cont->node);
-                seat_set_focus(seat, &child->node);
+                seat_set_focus_container(seat, cont);
+                seat_set_focus_container(seat, child);
         }
 
         return cont;
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 201e767f..1976ad51 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -85,7 +85,7 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
                 struct sway_seat *seat = NULL;
                 wl_list_for_each(seat, &input_manager->seats, link) {
                         if (!seat->has_focus) {
-                                seat_set_focus(seat, &ws->node);
+                                seat_set_focus_workspace(seat, ws);
                         }
                 }
                 free(ws_name);
diff --git a/sway/tree/view.c b/sway/tree/view.c
index f9dcb11a..312c62d1 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -294,7 +294,7 @@ void view_request_activate(struct sway_view *view) {
         switch (config->focus_on_window_activation) {
         case FOWA_SMART:
                 if (workspace_is_visible(ws)) {
-                        seat_set_focus(seat, &view->container->node);
+                        seat_set_focus_container(seat, view->container);
                 } else {
                         view_set_urgent(view, true);
                 }
@@ -303,7 +303,7 @@ void view_request_activate(struct sway_view *view) {
                 view_set_urgent(view, true);
                 break;
         case FOWA_FOCUS:
-                seat_set_focus(seat, &view->container->node);
+                seat_set_focus_container(seat, view->container);
                 break;
         case FOWA_NONE:
                 break;
@@ -404,7 +404,7 @@ void view_execute_criteria(struct sway_view *view) {
                 }
                 wlr_log(WLR_DEBUG, "for_window '%s' matches view %p, cmd: '%s'",
                                 criteria->raw, view, criteria->cmdlist);
-                seat_set_focus(seat, &view->container->node);
+                seat_set_focus_container(seat, view->container);
                 list_add(view->executed_criteria, criteria);
                 struct cmd_results *res = execute_command(criteria->cmdlist, NULL);
                 if (res->status != CMD_SUCCESS) {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index bb1ded22..378bfc5d 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -399,7 +399,7 @@ bool workspace_switch(struct sway_workspace *workspace,
                                 workspace_add_floating(workspace, floater);
                                 if (&floater->node == focus) {
                                         seat_set_focus(seat, NULL);
-                                        seat_set_focus(seat, &floater->node);
+                                        seat_set_focus_container(seat, floater);
                                 }
                                 --i;
                         }