diff options
Diffstat (limited to 'sway/commands/workspace.c')
| -rw-r--r-- | sway/commands/workspace.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c index 67db08ff..a6a0beda 100644 --- a/sway/commands/workspace.c +++ b/sway/commands/workspace.c @@ -187,12 +187,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) { ++argv; } - bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0; struct sway_seat *seat = config->handler_context.seat; - struct sway_workspace *current = seat_get_focused_workspace(seat); - if (!current) { - return cmd_results_new(CMD_FAILURE, "No workspace to switch from"); - } struct sway_workspace *ws = NULL; if (strcasecmp(argv[0], "number") == 0) { @@ -214,12 +209,10 @@ struct cmd_results *cmd_workspace(int argc, char **argv) { } } else if (strcasecmp(argv[0], "next") == 0 || strcasecmp(argv[0], "prev") == 0 || + strcasecmp(argv[0], "next_on_output") == 0 || + strcasecmp(argv[0], "prev_on_output") == 0 || strcasecmp(argv[0], "current") == 0) { ws = workspace_by_name(argv[0]); - } else if (strcasecmp(argv[0], "next_on_output") == 0) { - ws = workspace_output_next(current, create); - } else if (strcasecmp(argv[0], "prev_on_output") == 0) { - ws = workspace_output_prev(current, create); } else if (strcasecmp(argv[0], "back_and_forth") == 0) { if (!seat->prev_workspace_name) { return cmd_results_new(CMD_INVALID, |