Introduce seat_set_focus_container and seat_set_focus_workspace

These are the same as seat_set_focus, but accept a specific type rather
than using nodes. Doing this adds more typesafety and lets us avoid
using &con->node which looks a little ugly.

This fixes a crash that pretty much nobody would ever come across. If
you have a bindsym for "focus" with no arguments and run it from an
empty workspace, sway would crash because it assumes `container` is not
NULL.

1 files changed, 5 insertions, 5 deletions

diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index a0ffbda8..e7f9cbea 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -52,20 +52,20 @@ static void swap_focus(struct sway_container *con1,
                         if (workspace_is_visible(ws2)) {
                                 seat_set_focus_warp(seat, &con2->node, false, true);
                         }
-                        seat_set_focus(seat, ws1 != ws2 ? &con2->node : &con1->node);
+                        seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
                 } else if (focus == con2 && (layout1 == L_TABBED
                                         || layout1 == L_STACKED)) {
                         if (workspace_is_visible(ws1)) {
                                 seat_set_focus_warp(seat, &con1->node, false, true);
                         }
-                        seat_set_focus(seat, ws1 != ws2 ? &con1->node : &con2->node);
+                        seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
                 } else if (ws1 != ws2) {
-                        seat_set_focus(seat, focus == con1 ? &con2->node : &con1->node);
+                        seat_set_focus_container(seat, focus == con1 ? con2 : con1);
                 } else {
-                        seat_set_focus(seat, &focus->node);
+                        seat_set_focus_container(seat, focus);
                 }
         } else {
-                seat_set_focus(seat, &focus->node);
+                seat_set_focus_container(seat, focus);
         }
 }