Revert "Merge pull request #1653 from swaywm/revert-1647-refactor-tree"

This reverts commit 472e81f35d689d67cda241acafda91c688d61046, reversing
changes made to 6b7841b11ff4cd35f54d69dc92029855893e5ce0.

1 files changed, 5 insertions, 5 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 8a0d1df5..d57ac3e3 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -7,7 +7,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "sway/input/cursor.h"
-#include "sway/view.h"
+#include "sway/tree/view.h"
 #include "list.h"
 #include "log.h"
 
@@ -49,8 +49,8 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
                 }
         }
 
-        swayc_t *swayc =
-                swayc_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
+        struct sway_container *swayc =
+                container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
         if (swayc) {
                 wlr_seat_pointer_notify_enter(seat, surface, sx, sy);
                 wlr_seat_pointer_notify_motion(seat, time, sx, sy);
@@ -87,8 +87,8 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
         if (event->button == BTN_LEFT) {
                 struct wlr_surface *surface = NULL;
                 double sx, sy;
-                swayc_t *swayc =
-                        swayc_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
+                struct sway_container *swayc =
+                        container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
 
                 sway_seat_set_focus(cursor->seat, swayc);
         }