Revert "Refactor tree"

2 files changed, 8 insertions, 9 deletions

diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index c6c73dba..eab7dc90 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -31,10 +31,10 @@ struct sway_input_manager *sway_input_manager_create(
                 struct sway_server *server);
 
 bool sway_input_manager_has_focus(struct sway_input_manager *input,
-                struct sway_container *container);
+                swayc_t *container);
 
 void sway_input_manager_set_focus(struct sway_input_manager *input,
-                struct sway_container *container);
+                swayc_t *container);
 
 void sway_input_manager_configure_xcursor(struct sway_input_manager *input);
 
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 496bfd5d..1d55bec7 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -14,7 +14,7 @@ struct sway_seat_device {
 
 struct sway_seat_container {
         struct sway_seat *seat;
-        struct sway_container *container;
+        swayc_t *container;
 
         struct wl_list link; // sway_seat::focus_stack
 
@@ -54,9 +54,9 @@ void sway_seat_remove_device(struct sway_seat *seat,
 
 void sway_seat_configure_xcursor(struct sway_seat *seat);
 
-void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container);
+void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container);
 
-struct sway_container *sway_seat_get_focus(struct sway_seat *seat);
+swayc_t *sway_seat_get_focus(struct sway_seat *seat);
 
 /**
  * Return the last container to be focused for the seat (or the most recently
@@ -67,11 +67,10 @@ struct sway_container *sway_seat_get_focus(struct sway_seat *seat);
  * is destroyed, or focus moves to a container with children and we need to
  * descend into the next leaf in focus order.
  */
-struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat,
-                struct sway_container *container);
+swayc_t *sway_seat_get_focus_inactive(struct sway_seat *seat, swayc_t *container);
 
-struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
-                enum sway_container_type type);
+swayc_t *sway_seat_get_focus_by_type(struct sway_seat *seat,
+                enum swayc_types type);
 
 void sway_seat_set_config(struct sway_seat *seat, struct seat_config *seat_config);