bb66e6d578
* The arrange_foo functions are now replaced with arrange_and_commit, or with manually created transactions and arrange_windows x2. * The arrange functions are now only called from the highest level functions rather than from both high level and low level functions. * Due to the previous point, view_set_fullscreen_raw and view_set_fullscreen are both merged into one function again. * Floating and fullscreen are now working with transactions.
81 lines
2.2 KiB
C
81 lines
2.2 KiB
C
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/tree/view.h"
|
|
#include "sway/input/input-manager.h"
|
|
#include "sway/input/seat.h"
|
|
#include "log.h"
|
|
|
|
static struct cmd_results *do_split(int layout) {
|
|
struct sway_container *con = config->handler_context.current_container;
|
|
if (container_is_floating(con)) {
|
|
return cmd_results_new(CMD_FAILURE, "split",
|
|
"Can't split a floating view");
|
|
}
|
|
struct sway_container *parent = container_split(con, layout);
|
|
container_create_notify(parent);
|
|
arrange_and_commit(parent);
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
}
|
|
|
|
struct cmd_results *cmd_split(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "split", EXPECTED_EQUAL_TO, 1))) {
|
|
return error;
|
|
}
|
|
if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) {
|
|
return do_split(L_VERT);
|
|
} else if (strcasecmp(argv[0], "h") == 0 ||
|
|
strcasecmp(argv[0], "horizontal") == 0) {
|
|
return do_split(L_HORIZ);
|
|
} else if (strcasecmp(argv[0], "t") == 0 ||
|
|
strcasecmp(argv[0], "toggle") == 0) {
|
|
struct sway_container *focused =
|
|
config->handler_context.current_container;
|
|
|
|
if (focused->parent->layout == L_VERT) {
|
|
return do_split(L_HORIZ);
|
|
} else {
|
|
return do_split(L_VERT);
|
|
}
|
|
} else {
|
|
return cmd_results_new(CMD_FAILURE, "split",
|
|
"Invalid split command (expected either horizontal or vertical).");
|
|
}
|
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
|
}
|
|
|
|
struct cmd_results *cmd_splitv(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "splitv", EXPECTED_EQUAL_TO, 0))) {
|
|
return error;
|
|
}
|
|
return do_split(L_VERT);
|
|
}
|
|
|
|
struct cmd_results *cmd_splith(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "splitv", EXPECTED_EQUAL_TO, 0))) {
|
|
return error;
|
|
}
|
|
return do_split(L_HORIZ);
|
|
}
|
|
|
|
struct cmd_results *cmd_splitt(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "splitv", EXPECTED_EQUAL_TO, 0))) {
|
|
return error;
|
|
}
|
|
|
|
struct sway_container *con = config->handler_context.current_container;
|
|
|
|
if (con->parent->layout == L_VERT) {
|
|
return do_split(L_HORIZ);
|
|
} else {
|
|
return do_split(L_VERT);
|
|
}
|
|
}
|