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, 4 insertions, 4 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 19dc3165..be3fc9c7 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -675,7 +675,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
         // Handle tiling resize via border
         if (resize_edge && button == BTN_LEFT && state == WLR_BUTTON_PRESSED &&
                         !is_floating) {
-                seat_set_focus(seat, &cont->node);
+                seat_set_focus_container(seat, cont);
                 seat_begin_resize_tiling(seat, cont, button, edge);
                 return;
         }
@@ -704,7 +704,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
                                 image = "sw-resize";
                         }
                         cursor_set_image(seat->cursor, image, NULL);
-                        seat_set_focus(seat, &cont->node);
+                        seat_set_focus_container(seat, cont);
                         seat_begin_resize_tiling(seat, cont, button, edge);
                         return;
                 }
@@ -753,7 +753,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 
         // Handle mousedown on a container surface
         if (surface && cont && state == WLR_BUTTON_PRESSED) {
-                seat_set_focus(seat, &cont->node);
+                seat_set_focus_container(seat, cont);
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 seat_begin_down(seat, cont, button, sx, sy);
                 return;
@@ -761,7 +761,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 
         // Handle clicking a container surface
         if (cont) {
-                seat_set_focus(seat, &cont->node);
+                seat_set_focus_container(seat, cont);
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
         }