mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-08 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename container_sort_workspaces and container_wrap_children

Browse source 
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.
This commit is contained in:
Ryan Dwyer 2018-08-18 21:54:09 +10:00
parent cfe205b36f
commit 16c663ed49
12 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sway/commands/floating.c
View file

@ -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);
}

3
sway/commands/fullscreen.c
View file

@ -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);
}

6
sway/commands/move.c
View file

@ -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;
}

3
sway/commands/rename.c
View file

@ -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);