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 2012-05-16 06:24:53 +02:00
parent 85d6c75b94 0cce707451
commit e969ed502b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/workspace.c
View File

@ -112,14 +112,15 @@ Con *create_workspace_on_output(Output *output, Con *content) {
DLOG("relevant command = %s\n", bind->command); DLOG("relevant command = %s\n", bind->command);
char *target = bind->command + strlen("workspace "); char *target = bind->command + strlen("workspace ");
/* We check if this is the workspace /* We check if this is the workspace
* next/prev/next_on_output/prev_on_output/back_and_forth command. * next/prev/next_on_output/prev_on_output/back_and_forth/number command.
* Beware: The workspace names "next", "prev", "next_on_output", * Beware: The workspace names "next", "prev", "next_on_output",
* "prev_on_output" and "back_and_forth" are OK, so we check before * "prev_on_output", "number" and "back_and_forth" are OK, so we check
* stripping the double quotes */ * before stripping the double quotes */
if (strncasecmp(target, "next", strlen("next")) == 0 || if (strncasecmp(target, "next", strlen("next")) == 0 ||
strncasecmp(target, "prev", strlen("prev")) == 0 || strncasecmp(target, "prev", strlen("prev")) == 0 ||
strncasecmp(target, "next_on_output", strlen("next_on_output")) == 0 || strncasecmp(target, "next_on_output", strlen("next_on_output")) == 0 ||
strncasecmp(target, "prev_on_output", strlen("prev_on_output")) == 0 || strncasecmp(target, "prev_on_output", strlen("prev_on_output")) == 0 ||
strncasecmp(target, "number", strlen("number")) == 0 ||
strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0) strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0)
continue; continue;
if (*target == '"') if (*target == '"')