Respect workspace numbers when looking for a free workspace name

This prevents a ws '1' appearing on a new output when there's
already a ws '1: www' on an existing output
This commit is contained in:
Sebastian Ullrich
2013-08-07 17:20:22 +02:00
committed by Michael Stapelberg
parent da20cd397c
commit 431e98dc35
2 changed files with 44 additions and 5 deletions

View File

@ -197,17 +197,16 @@ Con *create_workspace_on_output(Output *output, Con *content) {
while (exists) {
c++;
FREE(ws->name);
sasprintf(&(ws->name), "%d", c);
ws->num = c;
current = NULL;
TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name));
GREP_FIRST(current, output_get_content(out), child->num == ws->num);
exists = (current != NULL);
DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists);
DLOG("result for ws %d: exists = %d\n", c, exists);
}
ws->num = c;
sasprintf(&(ws->name), "%d", c);
}
con_attach(ws, content, false);