koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move.c: Fix move_to_output_directed problems

Browse Source 
- Use workspace_show that correctly updates _NET_CURRENT_DESKTOP, warps
mouse.
- Use TAILQ_INSERT_TAIL only for focus_head. Focus order is not related
to direction.
- Call con_focus only if con was focused before. See testcase for
directional move with command criteria.
- Correct first call of move_to_output_directed in tree_move which
didn't call ipc_send_window_event("move", con) and
ewmh_update_wm_desktop().
- Don't produce events when the move doesn't happen. Correct
276-ipc-window-move.t as well.
This commit is contained in:
Orestis Floros
2018-10-09 21:45:59 +03:00
parent dfe89cc4f1
commit 9380a75186
3 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testcases/t/276-ipc-window-move.t
View File

@ -34,7 +34,7 @@ sub move_subtest {
is($move[0]->{container}->{window}, $window->{id}, 'window id matches');
}
subtest 'move right', \&move_subtest, 'move right';
subtest 'move left', \&move_subtest, 'move left';
subtest 'move to workspace', \&move_subtest, 'move to workspace ws_new';
done_testing;

22
testcases/t/294-focus-order.t
View File

@ -16,7 +16,11 @@
#
# Verify that the corrent focus stack order is preserved after various
# operations.
use i3test;
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0
EOT
sub kill_and_confirm_focus {
my $focus = shift;
@ -68,7 +72,6 @@ confirm_focus('tabbed');
#####################################################################
fresh_workspace;
$windows[3] = open_window;
$windows[1] = open_window;
$windows[0] = open_window;
@ -107,6 +110,21 @@ $windows[0] = open_window;
cmd 'move left';
confirm_focus('split-v + move');
#####################################################################
# Test that moving an unfocused container from another output
# maintains the correct focus order.
#####################################################################
fresh_workspace(output => 0);
$windows[3] = open_window;
fresh_workspace(output => 1);
$windows[2] = open_window;
$windows[1] = open_window;
$windows[0] = open_window;
cmd '[id=' . $windows[3]->id . '] move right';
confirm_focus('unfocused move from other output');
######################################################################
# Test that moving an unfocused container maintains the correct focus
# order.