diff options
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/focus.c | 3 | ||||
| -rw-r--r-- | sway/commands/focus_wrapping.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c index 8baa616d..93d1effe 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -160,7 +160,8 @@ static struct sway_node *node_get_in_direction_tiling( // Check a different output struct sway_output *output = container->workspace->output; struct sway_output *new_output = output_get_in_direction(output, dir); - if (new_output) { + if ((config->focus_wrapping != WRAP_WORKSPACE || + container->node.type == N_WORKSPACE) && new_output) { return get_node_in_output_direction(new_output, dir); } diff --git a/sway/commands/focus_wrapping.c b/sway/commands/focus_wrapping.c index 3a74a3ea..d3901cb8 100644 --- a/sway/commands/focus_wrapping.c +++ b/sway/commands/focus_wrapping.c @@ -11,6 +11,8 @@ struct cmd_results *cmd_focus_wrapping(int argc, char **argv) { if (strcasecmp(argv[0], "force") == 0) { config->focus_wrapping = WRAP_FORCE; + } else if (strcasecmp(argv[0], "workspace") == 0) { + config->focus_wrapping = WRAP_WORKSPACE; } else if (parse_boolean(argv[0], config->focus_wrapping == WRAP_YES)) { config->focus_wrapping = WRAP_YES; } else { |