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 2013-06-29 20:58:51 +02:00
parent 78e99440f6 73508dec0c
commit c4d4418745
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/workspace.c
View File

@ -128,6 +128,8 @@ Con *create_workspace_on_output(Output *output, Con *content) {
continue;
DLOG("relevant command = %s\n", bind->command);
char *target = bind->command + strlen("workspace ");
while((*target == ' ' || *target == '\t') && target != '\0')
target++;
/* We check if this is the workspace
* next/prev/next_on_output/prev_on_output/back_and_forth/number command.
* Beware: The workspace names "next", "prev", "next_on_output",

18
testcases/t/172-start-on-named-ws.t
View File

@ -70,4 +70,22 @@ is_deeply(\@names, [ 'foobar' ], 'i3 starts on named workspace foobar');
exit_gracefully($pid);
################################################################################
# 4: now with whitespace in front of the workspace number
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace 3
EOT
$pid = launch_with_config($config);
@names = @{get_workspace_names()};
is_deeply(\@names, [ '3' ], 'i3 starts on workspace 3 without whitespace');
exit_gracefully($pid);
done_testing;