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

Bugfix: parser: limit of 10 workspaces is gone

This commit is contained in:
Michael Stapelberg 2009-09-27 23:05:07 +02:00
parent 226664d288
commit fa868ed61c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cfgparse.y
View File

@ -313,22 +313,23 @@ workspace:
TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen workspace_name TOKWORKSPACE WHITESPACE NUMBER WHITESPACE TOKSCREEN WHITESPACE screen workspace_name
{ {
int ws_num = $<number>3; int ws_num = $<number>3;
if (ws_num < 1 || ws_num > 10) { if (ws_num < 1) {
LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num); LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else { } else {
workspaces[ws_num - 1].preferred_screen = sstrdup($<string>7); Workspace *ws = workspace_get(ws_num - 1);
ws->preferred_screen = sstrdup($<string>7);
if ($<string>8 != NULL) if ($<string>8 != NULL)
workspace_set_name(&(workspaces[ws_num - 1]), $<string>8); workspace_set_name(ws, $<string>8);
} }
} }
| TOKWORKSPACE WHITESPACE NUMBER workspace_name | TOKWORKSPACE WHITESPACE NUMBER workspace_name
{ {
int ws_num = $<number>3; int ws_num = $<number>3;
if (ws_num < 1 || ws_num > 10) { if (ws_num < 1) {
LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num); LOG("Invalid workspace assignment, workspace number %d out of range\n", ws_num);
} else { } else {
if ($<string>4 != NULL) if ($<string>4 != NULL)
workspace_set_name(&(workspaces[ws_num - 1]), $<string>4); workspace_set_name(workspace_get(ws_num - 1), $<string>4);
} }
} }
; ;