sway

commit c55ce6ef3dee013953c6cec16eb20001ca993f81
parent d98c26d0edbab66042ff3da0348d339fd857f99d
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun, 25 Sep 2016 11:07:25 -0400

Merge pull request #915 from RyanDwyer/implement-workspace-number-default

Implement default name for workspace command
Diffstat:
M
sway/commands/workspace.c
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
@@ -5,21 +5,23 @@
 #include "sway/workspace.h"
 #include "list.h"
 #include "log.h"
+#include "stringop.h"
 
 struct cmd_results *cmd_workspace(int argc, char **argv) {
 	struct cmd_results *error = NULL;
 	if ((error = checkarg(argc, "workspace", EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
-	if (argc == 1 || (argc == 2 && strcasecmp(argv[0], "number") == 0) ) {
+	if (argc == 1 || (argc >= 2 && strcasecmp(argv[0], "number") == 0) ) {
 		if (config->reading || !config->active) {
 			return cmd_results_new(CMD_DEFER, "workspace", NULL);
 		}
-		// Handle workspace next/prev
 		swayc_t *ws = NULL;
-		if (argc == 2) {
+		if (argc >= 2) {
 			if (!(ws = workspace_by_number(argv[1]))) {
-				ws = workspace_create(argv[1]);
+				char *name = join_args(argv + 1, argc - 1);
+				ws = workspace_create(name);
+				free(name);
 			}
 		} else if (strcasecmp(argv[0], "next") == 0) {
 			ws = workspace_next();