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

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

Browse source 
Implement default name for workspace command
This commit is contained in:
Drew DeVault 2016-09-25 11:07:25 -04:00 committed by GitHub
parent d98c26d0ed 64d463142f
commit c55ce6ef3d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/commands/workspace.c
View file

@ -5,21 +5,23 @@
#include "sway/workspace.h" #include "sway/workspace.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "stringop.h"
struct cmd_results *cmd_workspace(int argc, char **argv) { struct cmd_results *cmd_workspace(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "workspace", EXPECTED_AT_LEAST, 1))) { if ((error = checkarg(argc, "workspace", EXPECTED_AT_LEAST, 1))) {
return error; 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) { if (config->reading || !config->active) {
return cmd_results_new(CMD_DEFER, "workspace", NULL); return cmd_results_new(CMD_DEFER, "workspace", NULL);
} }
// Handle workspace next/prev
swayc_t *ws = NULL; swayc_t *ws = NULL;
if (argc == 2) { if (argc >= 2) {
if (!(ws = workspace_by_number(argv[1]))) { 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) { } else if (strcasecmp(argv[0], "next") == 0) {
ws = workspace_next(); ws = workspace_next();