mirror of
https://github.com/NickHu/sway
synced 2024-12-29 22:23:46 +01:00
c312a10cc7
Previously, `layout toggle` and `layout toggle split` would set L_VERT when layout was L_HORIZ, otherwise it would set L_HORIZ. This meant that when the layout was L_TABBED or L_STACKED, it would always be L_HORIZ. This extends #4315 (which corrects the handling when multiple layouts are given) to try prev_split_layout, config->default_orientation, and then falling back to L_VERT when the output is taller than wide and L_HORIZ when wider than tall.
180 lines
5.1 KiB
C
180 lines
5.1 KiB
C
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include <strings.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/output.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/tree/workspace.h"
|
|
#include "log.h"
|
|
|
|
static enum sway_container_layout parse_layout_string(char *s) {
|
|
if (strcasecmp(s, "splith") == 0) {
|
|
return L_HORIZ;
|
|
} else if (strcasecmp(s, "splitv") == 0) {
|
|
return L_VERT;
|
|
} else if (strcasecmp(s, "tabbed") == 0) {
|
|
return L_TABBED;
|
|
} else if (strcasecmp(s, "stacking") == 0) {
|
|
return L_STACKED;
|
|
}
|
|
return L_NONE;
|
|
}
|
|
|
|
static const char expected_syntax[] =
|
|
"Expected 'layout default|tabbed|stacking|splitv|splith' or "
|
|
"'layout toggle [split|all]' or "
|
|
"'layout toggle [split|tabbed|stacking|splitv|splith] [split|tabbed|stacking|splitv|splith]...'";
|
|
|
|
static enum sway_container_layout toggle_split_layout(
|
|
enum sway_container_layout layout,
|
|
enum sway_container_layout prev_split_layout,
|
|
struct sway_output *output) {
|
|
if (layout == L_HORIZ) {
|
|
return L_VERT;
|
|
} else if (layout == L_VERT) {
|
|
return L_HORIZ;
|
|
} else if (prev_split_layout != L_NONE) {
|
|
return prev_split_layout;
|
|
} else if (config->default_orientation != L_NONE) {
|
|
return config->default_orientation;
|
|
} else if (output->height > output->width) {
|
|
return L_VERT;
|
|
}
|
|
return L_HORIZ;
|
|
}
|
|
|
|
static enum sway_container_layout get_layout_toggle(int argc, char **argv,
|
|
enum sway_container_layout layout,
|
|
enum sway_container_layout prev_split_layout,
|
|
struct sway_output *output) {
|
|
// "layout toggle"
|
|
if (argc == 1) {
|
|
return toggle_split_layout(layout, prev_split_layout, output);
|
|
}
|
|
|
|
if (argc == 2) {
|
|
// "layout toggle split" (same as "layout toggle")
|
|
if (strcasecmp(argv[1], "split") == 0) {
|
|
return toggle_split_layout(layout, prev_split_layout, output);
|
|
}
|
|
// "layout toggle all"
|
|
if (strcasecmp(argv[1], "all") == 0) {
|
|
return layout == L_HORIZ ? L_VERT :
|
|
layout == L_VERT ? L_STACKED :
|
|
layout == L_STACKED ? L_TABBED : L_HORIZ;
|
|
}
|
|
return L_NONE;
|
|
}
|
|
|
|
enum sway_container_layout parsed;
|
|
int curr = 1;
|
|
for (; curr < argc; curr++) {
|
|
parsed = parse_layout_string(argv[curr]);
|
|
if (parsed == layout || (strcmp(argv[curr], "split") == 0 &&
|
|
(layout == L_VERT || layout == L_HORIZ))) {
|
|
break;
|
|
}
|
|
}
|
|
for (int i = curr + 1; i != curr; ++i) {
|
|
// cycle round to find next valid layout
|
|
if (i >= argc) {
|
|
i = 1;
|
|
}
|
|
parsed = parse_layout_string(argv[i]);
|
|
if (parsed != L_NONE) {
|
|
return parsed;
|
|
}
|
|
if (strcmp(argv[i], "split") == 0) {
|
|
return toggle_split_layout(layout, prev_split_layout, output);
|
|
}
|
|
// invalid layout strings are silently ignored
|
|
}
|
|
return L_NONE;
|
|
}
|
|
|
|
static enum sway_container_layout get_layout(int argc, char **argv,
|
|
enum sway_container_layout layout,
|
|
enum sway_container_layout prev_split_layout,
|
|
struct sway_output *output) {
|
|
// Check if assigned directly
|
|
enum sway_container_layout parsed = parse_layout_string(argv[0]);
|
|
if (parsed != L_NONE) {
|
|
return parsed;
|
|
}
|
|
|
|
if (strcasecmp(argv[0], "default") == 0) {
|
|
return prev_split_layout;
|
|
}
|
|
|
|
if (strcasecmp(argv[0], "toggle") == 0) {
|
|
return get_layout_toggle(argc, argv, layout, prev_split_layout, output);
|
|
}
|
|
|
|
return L_NONE;
|
|
}
|
|
|
|
struct cmd_results *cmd_layout(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "layout", EXPECTED_AT_LEAST, 1))) {
|
|
return error;
|
|
}
|
|
if (!root->outputs->length) {
|
|
return cmd_results_new(CMD_INVALID,
|
|
"Can't run this command while there's no outputs connected.");
|
|
}
|
|
struct sway_container *container = config->handler_context.container;
|
|
struct sway_workspace *workspace = config->handler_context.workspace;
|
|
|
|
if (container && container_is_floating(container)) {
|
|
return cmd_results_new(CMD_FAILURE,
|
|
"Unable to change layout of floating windows");
|
|
}
|
|
|
|
// Operate on parent container, like i3.
|
|
if (container) {
|
|
container = container->parent;
|
|
}
|
|
|
|
// We could be working with a container OR a workspace. These are different
|
|
// structures, so we set up pointers to they layouts so we can refer them in
|
|
// an abstract way.
|
|
enum sway_container_layout new_layout = L_NONE;
|
|
enum sway_container_layout old_layout = L_NONE;
|
|
if (container) {
|
|
old_layout = container->layout;
|
|
new_layout = get_layout(argc, argv,
|
|
container->layout, container->prev_split_layout,
|
|
container->workspace->output);
|
|
} else {
|
|
old_layout = workspace->layout;
|
|
new_layout = get_layout(argc, argv,
|
|
workspace->layout, workspace->prev_split_layout,
|
|
workspace->output);
|
|
}
|
|
if (new_layout == L_NONE) {
|
|
return cmd_results_new(CMD_INVALID, expected_syntax);
|
|
}
|
|
if (new_layout != old_layout) {
|
|
if (container) {
|
|
if (old_layout != L_TABBED && old_layout != L_STACKED) {
|
|
container->prev_split_layout = old_layout;
|
|
}
|
|
container->layout = new_layout;
|
|
container_update_representation(container);
|
|
} else {
|
|
if (old_layout != L_TABBED && old_layout != L_STACKED) {
|
|
workspace->prev_split_layout = old_layout;
|
|
}
|
|
workspace->layout = new_layout;
|
|
workspace_update_representation(workspace);
|
|
}
|
|
if (root->fullscreen_global) {
|
|
arrange_root();
|
|
} else {
|
|
arrange_workspace(workspace);
|
|
}
|
|
}
|
|
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|