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

cmd_layout: toggle split for tabbed/stack default

Browse source 
This fixes the logic of split for layout toggle when the default
layout is L_TABBED or L_STACKED. When the default layout is L_TABBED
or L_STACKED, the container/workspace may not have a prev_split_layout.
This was causing L_NONE to be returned by get_layout_toggle, which was
being handled as a syntax error. This adds logic to try
config->default_orientation when prev_split_layout is L_NONE. If that
is also L_NONE, then L_VERT is used when the output is taller than
wide, otherwise, L_HORIZ is used.
This commit is contained in:
Brian Ashworth 2019-07-10 15:16:17 -04:00 committed by Drew DeVault
parent 6096d31eed
commit 5ffcea4c28
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sway/commands/layout.c
View file

@ -2,6 +2,7 @@
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/output.h"
#include "sway/tree/arrange.h" #include "sway/tree/arrange.h"
#include "sway/tree/container.h" #include "sway/tree/container.h"
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
@ -27,7 +28,8 @@ static const char expected_syntax[] =
static enum sway_container_layout get_layout_toggle(int argc, char **argv, static enum sway_container_layout get_layout_toggle(int argc, char **argv,
enum sway_container_layout layout, enum sway_container_layout layout,
enum sway_container_layout prev_split_layout) { enum sway_container_layout prev_split_layout,
struct sway_output *output) {
// "layout toggle" // "layout toggle"
if (argc == 1) { if (argc == 1) {
return layout == L_HORIZ ? L_VERT : L_HORIZ; return layout == L_HORIZ ? L_VERT : L_HORIZ;
@ -66,8 +68,18 @@ static enum sway_container_layout get_layout_toggle(int argc, char **argv,
return parsed; return parsed;
} }
if (strcmp(argv[i], "split") == 0) { if (strcmp(argv[i], "split") == 0) {
return layout == L_HORIZ ? L_VERT : if (layout == L_HORIZ) {
layout == L_VERT ? L_HORIZ : prev_split_layout; 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;
} }
// invalid layout strings are silently ignored // invalid layout strings are silently ignored
} }
@ -76,7 +88,8 @@ static enum sway_container_layout get_layout_toggle(int argc, char **argv,
static enum sway_container_layout get_layout(int argc, char **argv, static enum sway_container_layout get_layout(int argc, char **argv,
enum sway_container_layout layout, enum sway_container_layout layout,
enum sway_container_layout prev_split_layout) { enum sway_container_layout prev_split_layout,
struct sway_output *output) {
// Check if assigned directly // Check if assigned directly
enum sway_container_layout parsed = parse_layout_string(argv[0]); enum sway_container_layout parsed = parse_layout_string(argv[0]);
if (parsed != L_NONE) { if (parsed != L_NONE) {
@ -88,7 +101,7 @@ static enum sway_container_layout get_layout(int argc, char **argv,
} }
if (strcasecmp(argv[0], "toggle") == 0) { if (strcasecmp(argv[0], "toggle") == 0) {
return get_layout_toggle(argc, argv, layout, prev_split_layout); return get_layout_toggle(argc, argv, layout, prev_split_layout, output);
} }
return L_NONE; return L_NONE;
@ -124,11 +137,13 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
if (container) { if (container) {
old_layout = container->layout; old_layout = container->layout;
new_layout = get_layout(argc, argv, new_layout = get_layout(argc, argv,
container->layout, container->prev_split_layout); container->layout, container->prev_split_layout,
container->workspace->output);
} else { } else {
old_layout = workspace->layout; old_layout = workspace->layout;
new_layout = get_layout(argc, argv, new_layout = get_layout(argc, argv,
workspace->layout, workspace->prev_split_layout); workspace->layout, workspace->prev_split_layout,
workspace->output);
} }
if (new_layout == L_NONE) { if (new_layout == L_NONE) {
return cmd_results_new(CMD_INVALID, expected_syntax); return cmd_results_new(CMD_INVALID, expected_syntax);