Merge branch 'master' into master

1 files changed, 23 insertions, 27 deletions

diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index e8b37182..f5558bb4 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -17,17 +17,6 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
 
 	int output_location = -1;
 
-	struct sway_container *current_container = config->handler_context.current_container;
-	struct sway_container *old_workspace = NULL, *old_output = NULL;
-	if (current_container) {
-		if (current_container->type == C_WORKSPACE) {
-			old_workspace = current_container;
-		} else {
-			old_workspace = container_parent(current_container, C_WORKSPACE);
-		}
-		old_output = container_parent(current_container, C_OUTPUT);
-	}
-
 	for (int i = 0; i < argc; ++i) {
 		if (strcasecmp(argv[i], "output") == 0) {
 			output_location = i;
@@ -57,29 +46,36 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
 		if (config->reading || !config->active) {
 			return cmd_results_new(CMD_DEFER, "workspace", NULL);
 		}
+
+		bool no_auto_back_and_forth = false;
+		while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) {
+			no_auto_back_and_forth = true;
+			if ((error = checkarg(--argc, "workspace", EXPECTED_AT_LEAST, 1))) {
+				return error;
+			}
+			++argv;
+		}
+
+
 		struct sway_container *ws = NULL;
 		if (strcasecmp(argv[0], "number") == 0) {
+			if (argc < 2) {
+				cmd_results_new(CMD_INVALID, "workspace",
+						"Expected workspace number");
+			}
 			if (!(ws = workspace_by_number(argv[1]))) {
 				char *name = join_args(argv + 1, argc - 1);
 				ws = workspace_create(NULL, name);
 				free(name);
 			}
-		} else if (strcasecmp(argv[0], "next") == 0) {
-			ws = workspace_next(old_workspace);
-		} else if (strcasecmp(argv[0], "prev") == 0) {
-			ws = workspace_prev(old_workspace);
-		} else if (strcasecmp(argv[0], "next_on_output") == 0) {
-			ws = workspace_output_next(old_output);
-		} else if (strcasecmp(argv[0], "prev_on_output") == 0) {
-			ws = workspace_output_prev(old_output);
+		} 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], "back_and_forth") == 0) {
-			// if auto_back_and_forth is enabled, workspace_switch will swap
-			// the workspaces. If we created prev_workspace here, workspace_switch
-			// would put us back on original workspace.
-			if (config->auto_back_and_forth) {
-				ws = old_workspace;
-			} else if (prev_workspace_name
-					&& !(ws = workspace_by_name(prev_workspace_name))) {
+			if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) {
 				ws = workspace_create(NULL, prev_workspace_name);
 			}
 		} else {
@@ -89,7 +85,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
 			}
 			free(name);
 		}
-		workspace_switch(ws);
+		workspace_switch(ws, no_auto_back_and_forth);
 	}
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }