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

Merge pull request #1913 from Airblader/feature-1809 

Let "focus" report success depending on whether a window was matched.
This commit is contained in:
Michael Stapelberg 2015-09-11 00:47:28 -07:00
parent 619661552f f31e476b28
commit 520602e8d7
2 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/commands.c
View File

@ -1507,8 +1507,7 @@ void cmd_focus(I3_CMD) {
count); count);
cmd_output->needs_tree_render = true; cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply ysuccess(count > 0);
ysuccess(true);
} }
/* /*

48
testcases/t/101-focus.t
View File

@ -60,48 +60,14 @@ is($focus, $bottom->id, "Bottom window focused (wrapping to the top works)");
$focus = focus_after('focus down'); $focus = focus_after('focus down');
is($focus, $top->id, "Top window focused (wrapping to the bottom works)"); is($focus, $top->id, "Top window focused (wrapping to the bottom works)");
############################################### #####################################################################
# Test focus with empty containers and colspan # Test focus is only successful if there was a window that could be
############################################### # matched.
#####################################################################
#my $otmp = get_unused_workspace(); my $result = cmd '[con_mark=__does_not_exist] focus';
#$i3->command("workspace $otmp")->recv; is($result->[0]->{success}, 0, 'focus is unsuccessful if no window was matched');
#
#$top = i3test::open_standard_window($x);
#$bottom = i3test::open_standard_window($x);
#sleep 0.25;
#
#$focus = focus_after("mj");
#$focus = focus_after("mh");
#$focus = focus_after("k");
#is($focus, $bottom->id, "Selecting top window without snapping doesn't work");
#
#$focus = focus_after("sl");
#is($focus, $bottom->id, "Bottom window focused");
#
#$focus = focus_after("k");
#is($focus, $top->id, "Top window focused");
#
## Same thing, but left/right instead of top/bottom
#
#my $o2tmp = get_unused_workspace();
#$i3->command("workspace $o2tmp")->recv;
#
#my $left = i3test::open_standard_window($x);
#my $right = i3test::open_standard_window($x);
#sleep 0.25;
#
#$focus = focus_after("ml");
#$focus = focus_after("h");
#$focus = focus_after("mk");
#$focus = focus_after("l");
#is($focus, $left->id, "Selecting right window without snapping doesn't work");
#
#$focus = focus_after("sj");
#is($focus, $left->id, "left window focused");
#
#$focus = focus_after("l");
#is($focus, $right->id, "right window focused");
#####################################################################
done_testing; done_testing;