nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RandR: use the next unused workspace instead of fixed counting

This commit is contained in:
Michael Stapelberg 2011-01-05 00:26:23 +01:00
parent f73c02ce92
commit 2312187439
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/randr.c
View File

@ -227,7 +227,6 @@ void disable_randr(xcb_connection_t *conn) {
void output_init_con(Output *output) {
Con *con = NULL, *current;
bool reused = false;
static int c = 1;
DLOG("init_con for output %s\n", output->name);
@ -266,11 +265,33 @@ void output_init_con(Output *output) {
/* add a workspace to this output */
Con *ws = con_new(NULL);
ws->type = CT_WORKSPACE;
/* TODO: don't just number workspaces, but get the next assigned one / unused one */
/* get the next unused workspace number */
DLOG("Getting next unused workspace\n");
int c = 0;
bool exists = true;
while (exists) {
Con *out, *current;
c++;
FREE(ws->name);
asprintf(&(ws->name), "%d", c);
exists = false;
TAILQ_FOREACH(out, &(croot->nodes_head), nodes) {
TAILQ_FOREACH(current, &(out->nodes_head), nodes) {
if (strcasecmp(current->name, ws->name) != 0)
continue;
exists = true;
break;
}
}
DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists);
}
ws->num = c;
FREE(ws->name);
asprintf(&(ws->name), "%d", c);
c++;
con_attach(ws, con, false);
asprintf(&name, "[i3 con] workspace %s", ws->name);

2
src/workspace.c
View File

@ -26,7 +26,7 @@ Con *workspace_get(const char *num) {
TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
TAILQ_FOREACH(current, &(output->nodes_head), nodes) {
if (strcasecmp(current->name, num) != 0)
continue;
continue;
workspace = current;
break;