Rename container_sort_workspaces and container_wrap_children

This commit renames container_sort_workspaces to output_sort_workspaces
and moves it to output.c.

This also renames container_wrap_children to workspace_wrap_children and
moves it to workspace.c. This function is only called with workspaces.

4 files changed, 9 insertions, 6 deletions

diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index 31de5ec3..c9467ef0 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -8,6 +8,7 @@
 #include "sway/tree/container.h"
 #include "sway/tree/layout.h"
 #include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
 #include "list.h"
 
 struct cmd_results *cmd_floating(int argc, char **argv) {
@@ -24,7 +25,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
 	if (container->type == C_WORKSPACE) {
 		// Wrap the workspace's children in a container so we can float it
 		struct sway_container *workspace = container;
-		container = container_wrap_children(container);
+		container = workspace_wrap_children(container);
 		workspace->layout = L_HORIZ;
 		seat_set_focus(config->handler_context.seat, container);
 	}
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 5ad06e40..a0661200 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -4,6 +4,7 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
 #include "sway/tree/layout.h"
 #include "util.h"
 
@@ -21,7 +22,7 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
 	if (container->type == C_WORKSPACE) {
 		// Wrap the workspace's children in a container so we can fullscreen it
 		struct sway_container *workspace = container;
-		container = container_wrap_children(container);
+		container = workspace_wrap_children(container);
 		workspace->layout = L_HORIZ;
 		seat_set_focus(config->handler_context.seat, container);
 	}
diff --git a/sway/commands/move.c b/sway/commands/move.c
index de6b1b0a..acdc50b5 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -64,7 +64,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
 			return cmd_results_new(CMD_FAILURE, "move",
 					"Can't move an empty workspace");
 		}
-		current = container_wrap_children(current);
+		current = workspace_wrap_children(current);
 	} else if (current->type != C_CONTAINER && current->type != C_VIEW) {
 		return cmd_results_new(CMD_FAILURE, "move",
 				"Can only move containers and views.");
@@ -245,7 +245,7 @@ static void workspace_move_to_output(struct sway_container *workspace,
 	// Try to remove an empty workspace from the destination output.
 	container_reap_empty_recursive(new_output_focus);
 
-	container_sort_workspaces(output);
+	output_sort_workspaces(output);
 	seat_set_focus(seat, output);
 	workspace_output_raise_priority(workspace, old_output, output);
 	ipc_event_workspace(NULL, workspace, "move");
@@ -437,7 +437,7 @@ static struct cmd_results *move_to_scratchpad(struct sway_container *con) {
 	if (con->type == C_WORKSPACE) {
 		// Wrap the workspace's children in a container
 		struct sway_container *workspace = con;
-		con = container_wrap_children(con);
+		con = workspace_wrap_children(con);
 		workspace->layout = L_HORIZ;
 	}
 
diff --git a/sway/commands/rename.c b/sway/commands/rename.c
index c6952bbb..c69bbdac 100644
--- a/sway/commands/rename.c
+++ b/sway/commands/rename.c
@@ -6,6 +6,7 @@
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"
+#include "sway/output.h"
 #include "sway/tree/container.h"
 #include "sway/tree/workspace.h"
 
@@ -82,7 +83,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
 	free(workspace->name);
 	workspace->name = new_name;
 
-	container_sort_workspaces(workspace->parent);
+	output_sort_workspaces(workspace->parent);
 	ipc_event_workspace(NULL, workspace, "rename");
 
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);