more renaming things

1 files changed, 11 insertions, 11 deletions

diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 96edab51..fa1054f2 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -49,11 +49,11 @@ static void set_position(struct sway_view *view, double ox, double oy) {
 	if (!assert_xwayland(view)) {
 		return;
 	}
-	struct sway_container *output = sway_container_parent(view->swayc, C_OUTPUT);
+	struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
 	if (!sway_assert(output, "view must be within tree to set position")) {
 		return;
 	}
-	struct sway_container *root = sway_container_parent(output, C_ROOT);
+	struct sway_container *root = container_parent(output, C_ROOT);
 	if (!sway_assert(root, "output must be within tree to set position")) {
 		return;
 	}
@@ -114,9 +114,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 		}
 	}
 
-	struct sway_container *parent = sway_container_view_destroy(sway_surface->view->swayc);
+	struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
 	if (parent) {
-		arrange_windows(parent, -1, -1);
+		container_arrange_windows(parent, -1, -1);
 	}
 
 	free(sway_surface->view);
@@ -132,9 +132,9 @@ static void handle_unmap_notify(struct wl_listener *listener, void *data) {
 	}
 
 	// take it out of the tree
-	struct sway_container *parent = sway_container_view_destroy(sway_surface->view->swayc);
+	struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
 	if (parent) {
-		arrange_windows(parent, -1, -1);
+		container_arrange_windows(parent, -1, -1);
 	}
 
 	sway_surface->view->swayc = NULL;
@@ -155,15 +155,15 @@ static void handle_map_notify(struct wl_listener *listener, void *data) {
 			&sway_surface->view->unmanaged_view_link);
 	} else {
 		struct sway_view *view = sway_surface->view;
-		sway_container_view_destroy(view->swayc);
+		container_view_destroy(view->swayc);
 
 		struct sway_container *parent = root_container.children->items[0];
 		parent = parent->children->items[0]; // workspace
 
-		struct sway_container *cont = sway_container_view_create(parent, view);
+		struct sway_container *cont = container_view_create(parent, view);
 		view->swayc = cont;
 
-		arrange_windows(cont->parent, -1, -1);
+		container_arrange_windows(cont->parent, -1, -1);
 		sway_input_manager_set_focus(input_manager, cont);
 	}
 }
@@ -239,9 +239,9 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
 	struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
-	struct sway_container *cont = sway_container_view_create(focus, sway_view);
+	struct sway_container *cont = container_view_create(focus, sway_view);
 	sway_view->swayc = cont;
 
-	arrange_windows(cont->parent, -1, -1);
+	container_arrange_windows(cont->parent, -1, -1);
 	sway_input_manager_set_focus(input_manager, cont);
 }