Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement split none command #4935

Merged
merged 1 commit into from
Sep 3, 2021
Merged

Implement split none command #4935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions sway/commands/split.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@ static struct cmd_results *do_split(int layout) {
return cmd_results_new(CMD_SUCCESS, NULL);
}

static struct cmd_results *do_unsplit() {
struct sway_container *con = config->handler_context.container;
struct sway_workspace *ws = config->handler_context.workspace;

if (con && con->parent && con->parent->children->length == 1) {
container_flatten(con->parent);
} else {
return cmd_results_new(CMD_FAILURE, "Can only flatten a child container with no siblings");
}

if (root->fullscreen_global) {
arrange_root();
} else {
arrange_workspace(ws);
}
return cmd_results_new(CMD_SUCCESS, NULL);
}

struct cmd_results *cmd_split(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "split", EXPECTED_EQUAL_TO, 1))) {
Expand All @@ -59,6 +77,9 @@ struct cmd_results *cmd_split(int argc, char **argv) {
} else {
return do_split(L_VERT);
}
} else if (strcasecmp(argv[0], "n") == 0 ||
strcasecmp(argv[0], "none") == 0) {
return do_unsplit();
} else {
return cmd_results_new(CMD_FAILURE,
"Invalid split command (expected either horizontal or vertical).");
Expand Down
6 changes: 4 additions & 2 deletions sway/sway.5.scd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,10 @@ set|plus|minus <amount>
established by the *seat* subcommand of the same name. See
*sway-input*(5) for more ways to affect inhibitors.

*split* vertical|v|horizontal|h|toggle|t
Splits the current container, vertically or horizontally. When _toggle_ is
*split* vertical|v|horizontal|h|none|n|toggle|t
Splits the current container, vertically or horizontally. When _none_ is
specified, the effect of a previous split is undone if the current
container is the only child of a split parent. When _toggle_ is
specified, the current container is split opposite to the parent
container's layout.

Expand Down