5dbbab7bdc
When we have type safety we'll need to have functions for
workspace_add_tiling and so on. This means the existing container
functions will be just for containers, so they are being moved to
container.c. At this point layout.c doesn't contain much else, so I've
relocated everything and removed the file.
* container_swap and its static functions have been moved to the swap
command and made static.
* container_recursive_resize has been moved to the resize command and
made static.
* The following have been moved to container.c:
* container_handle_fullscreen_reparent
* container_insert_child
* container_add_sibling
* container_add_child
* container_remove_child
* container_replace_child
* container_split
* enum movement_direction and sway_dir_to_wlr have been moved to util.c.
Side note: Several commands included layout.h which then included
root.h. With layout.h gone, root.h has to be included by those commands.
59 lines
1.8 KiB
C
59 lines
1.8 KiB
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/input/seat.h"
|
|
#include "sway/ipc-server.h"
|
|
#include "sway/output.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/tree/view.h"
|
|
#include "sway/tree/workspace.h"
|
|
#include "list.h"
|
|
|
|
struct cmd_results *cmd_floating(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "floating", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
struct sway_container *container =
|
|
config->handler_context.current_container;
|
|
if (container->type == C_WORKSPACE && container->children->length == 0) {
|
|
return cmd_results_new(CMD_INVALID, "floating",
|
|
"Can't float an empty workspace");
|
|
}
|
|
if (container->type == C_WORKSPACE) {
|
|
// Wrap the workspace's children in a container so we can float it
|
|
struct sway_container *workspace = container;
|
|
container = workspace_wrap_children(container);
|
|
workspace->layout = L_HORIZ;
|
|
seat_set_focus(config->handler_context.seat, container);
|
|
}
|
|
|
|
// If the container is in a floating split container,
|
|
// operate on the split container instead of the child.
|
|
if (container_is_floating_or_child(container)) {
|
|
while (container->parent->type != C_WORKSPACE) {
|
|
container = container->parent;
|
|
}
|
|
}
|
|
|
|
bool wants_floating;
|
|
if (strcasecmp(argv[0], "enable") == 0) {
|
|
wants_floating = true;
|
|
} else if (strcasecmp(argv[0], "disable") == 0) {
|
|
wants_floating = false;
|
|
} else if (strcasecmp(argv[0], "toggle") == 0) {
|
|
wants_floating = !container_is_floating(container);
|
|
} else {
|
|
return cmd_results_new(CMD_FAILURE, "floating",
|
|
"Expected 'floating <enable|disable|toggle>'");
|
|
}
|
|
|
|
container_set_floating(container, wants_floating);
|
|
|
|
struct sway_container *workspace = container_parent(container, C_WORKSPACE);
|
|
arrange_windows(workspace);
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
}
|