mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

workspace_next_name: fallback to next available number 

This changes `workspace_next_name` to use the next available number as
the workspace name instead of the number of outputs. This fixes the case
where a number that is already in use could be returned. The workspace
numbers in use have no relation to the number of outputs so it makes
more sense to use the lowest available number
This commit is contained in:
Brian Ashworth 2019-02-17 13:07:04 -05:00 committed by Drew DeVault
parent f22aef018b
commit 34f5c1e7c4
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sway/tree/workspace.c
View File

@ -334,16 +334,13 @@ char *workspace_next_name(const char *output_name) {
if (target != NULL) {
return target;
}
// As a fall back, get the current number of active workspaces
// and return that + 1 for the next workspace's name
int ws_num = root->outputs->length;
int l = snprintf(NULL, 0, "%d", ws_num);
char *name = malloc(l + 1);
if (!sway_assert(name, "Could not allocate workspace name")) {
return NULL;
}
sprintf(name, "%d", ws_num++);
return name;
// As a fall back, use the next available number
char name[12] = "";
unsigned int ws_num = 1;
do {
snprintf(name, sizeof(name), "%u", ws_num++);
} while (workspace_by_number(name));
return strdup(name);
}
static bool _workspace_by_number(struct sway_workspace *ws, void *data) {