mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 05:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent splitting a floating view

Browse Source
This commit is contained in:
Ryan Dwyer 2018-05-25 17:10:58 +10:00
parent dc83b158e1
commit 5d69a56209
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sway/commands/split.c
View File

@ -10,6 +10,10 @@
static struct cmd_results *do_split(int layout) { static struct cmd_results *do_split(int layout) {
struct sway_container *con = config->handler_context.current_container; 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); struct sway_container *parent = container_split(con, layout);
container_create_notify(parent); container_create_notify(parent);
arrange_children_of(parent); arrange_children_of(parent);
@ -23,24 +27,23 @@ struct cmd_results *cmd_split(int argc, char **argv) {
return error; return error;
} }
if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) { if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) {
do_split(L_VERT); return do_split(L_VERT);
} else if (strcasecmp(argv[0], "h") == 0 || } else if (strcasecmp(argv[0], "h") == 0 ||
strcasecmp(argv[0], "horizontal") == 0) { strcasecmp(argv[0], "horizontal") == 0) {
do_split(L_HORIZ); return do_split(L_HORIZ);
} else if (strcasecmp(argv[0], "t") == 0 || } else if (strcasecmp(argv[0], "t") == 0 ||
strcasecmp(argv[0], "toggle") == 0) { strcasecmp(argv[0], "toggle") == 0) {
struct sway_container *focused = struct sway_container *focused =
config->handler_context.current_container; config->handler_context.current_container;
if (focused->parent->layout == L_VERT) { if (focused->parent->layout == L_VERT) {
do_split(L_HORIZ); return do_split(L_HORIZ);
} else { } else {
do_split(L_VERT); return do_split(L_VERT);
} }
} else { } else {
error = cmd_results_new(CMD_FAILURE, "split", return cmd_results_new(CMD_FAILURE, "split",
"Invalid split command (expected either horizontal or vertical)."); "Invalid split command (expected either horizontal or vertical).");
return error;
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }