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

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-26 12:37:04 +02:00
parent 6fdb2c0df2 fdc4413c46
commit afff328c59
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cfgparse.y
View File

@ -1001,12 +1001,27 @@ workspace:
} }
DLOG("Should assign workspace %s to output %s\n", ws_name, $4); DLOG("Should assign workspace %s to output %s\n", ws_name, $4);
struct Workspace_Assignment *assignment = scalloc(sizeof(struct Workspace_Assignment)); /* Check for earlier assignments of the same workspace so that we
* don’t have assignments of a single workspace to different
* outputs */
struct Workspace_Assignment *assignment;
bool duplicate = false;
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
if (strcasecmp(assignment->name, ws_name) == 0) {
ELOG("You have a duplicate workspace assignment for workspace \"%s\"\n",
ws_name);
assignment->output = $4;
duplicate = true;
}
}
if (!duplicate) {
assignment = scalloc(sizeof(struct Workspace_Assignment));
assignment->name = ws_name; assignment->name = ws_name;
assignment->output = $4; assignment->output = $4;
TAILQ_INSERT_TAIL(&ws_assignments, assignment, ws_assignments); TAILQ_INSERT_TAIL(&ws_assignments, assignment, ws_assignments);
} }
} }
}
| TOKWORKSPACE NUMBER workspace_name | TOKWORKSPACE NUMBER workspace_name
{ {
int ws_num = $2; int ws_num = $2;