Merge pull request #1613 from Airblader/feature-1426
Added focus_on_window_activation directive
This commit is contained in:
Michael Stapelberg
@ -433,7 +433,7 @@ client.focused #4c7899 #285577 #ffffff #2e9ef4
|
||||
EOT
|
||||
|
||||
my $expected_all_tokens = <<'EOT';
|
||||
ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'bindsym', 'bindcode', 'bind', 'bar', 'font', 'mode', 'floating_minimum_size', 'floating_maximum_size', 'floating_modifier', 'default_orientation', 'workspace_layout', 'new_window', 'new_float', 'hide_edge_borders', 'for_window', 'assign', 'focus_follows_mouse', 'mouse_warping', 'force_focus_wrapping', 'force_xinerama', 'force-xinerama', 'workspace_auto_back_and_forth', 'fake_outputs', 'fake-outputs', 'force_display_urgency_hint', 'workspace', 'ipc_socket', 'ipc-socket', 'restart_state', 'popup_during_fullscreen', 'exec_always', 'exec', 'client.background', 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent', 'client.placeholder'
|
||||
ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'bindsym', 'bindcode', 'bind', 'bar', 'font', 'mode', 'floating_minimum_size', 'floating_maximum_size', 'floating_modifier', 'default_orientation', 'workspace_layout', 'new_window', 'new_float', 'hide_edge_borders', 'for_window', 'assign', 'focus_follows_mouse', 'mouse_warping', 'force_focus_wrapping', 'force_xinerama', 'force-xinerama', 'workspace_auto_back_and_forth', 'fake_outputs', 'fake-outputs', 'force_display_urgency_hint', 'focus_on_window_activation', 'workspace', 'ipc_socket', 'ipc-socket', 'restart_state', 'popup_during_fullscreen', 'exec_always', 'exec', 'client.background', 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent', 'client.placeholder'
|
||||
EOT
|
||||
|
||||
my $expected_end = <<'EOT';
|
||||
|
||||
206
testcases/t/240-focus-on-window-activation.t
Normal file
206
testcases/t/240-focus-on-window-activation.t
Normal file
@ -0,0 +1,206 @@
|
||||
#!perl
|
||||
# vim:ts=4:sw=4:expandtab
|
||||
#
|
||||
# Please read the following documents before working on tests:
|
||||
# • http://build.i3wm.org/docs/testsuite.html
|
||||
# (or docs/testsuite)
|
||||
#
|
||||
# • http://build.i3wm.org/docs/lib-i3test.html
|
||||
# (alternatively: perldoc ./testcases/lib/i3test.pm)
|
||||
#
|
||||
# • http://build.i3wm.org/docs/ipc.html
|
||||
# (or docs/ipc)
|
||||
#
|
||||
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
|
||||
# (unless you are already familiar with Perl)
|
||||
#
|
||||
# Tests for the focus_on_window_activation directive
|
||||
# Ticket: #1426
|
||||
use i3test i3_autostart => 0;
|
||||
use List::Util qw(first);
|
||||
|
||||
sub send_net_active_window {
|
||||
my ($id) = @_;
|
||||
|
||||
my $msg = pack "CCSLLLLLLL",
|
||||
X11::XCB::CLIENT_MESSAGE, # response_type
|
||||
32, # format
|
||||
0, # sequence
|
||||
$id, # destination window
|
||||
$x->atom(name => '_NET_ACTIVE_WINDOW')->id,
|
||||
0, # source
|
||||
0, 0, 0, 0;
|
||||
|
||||
$x->send_event(0, $x->get_root_window(), X11::XCB::EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg);
|
||||
}
|
||||
|
||||
sub get_urgency_for_window_on_workspace {
|
||||
my ($ws, $con) = @_;
|
||||
|
||||
my $current = first { $_->{window} == $con->{id} } @{get_ws_content($ws)};
|
||||
return $current->{urgent};
|
||||
}
|
||||
|
||||
#####################################################################
|
||||
# 1: If mode is set to 'urgent' and the target workspace is visible,
|
||||
# check that the urgent flag is set and focus is not lost.
|
||||
#####################################################################
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
focus_on_window_activation urgent
|
||||
EOT
|
||||
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $ws = fresh_workspace;
|
||||
my $first = open_window;
|
||||
my $second = open_window;
|
||||
|
||||
send_net_active_window($first->id);
|
||||
sync_with_i3;
|
||||
|
||||
is($x->input_focus, $second->id, 'second window is still focused');
|
||||
is(get_urgency_for_window_on_workspace($ws, $first), 1, 'first window is marked urgent');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 2: If mode is set to 'urgent' and the target workspace is not
|
||||
# visible, check that the urgent flag is set and focus is not lost.
|
||||
#####################################################################
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
focus_on_window_activation urgent
|
||||
EOT
|
||||
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $ws1 = fresh_workspace;
|
||||
my $first = open_window;
|
||||
my $ws2 = fresh_workspace;
|
||||
my $second = open_window;
|
||||
|
||||
send_net_active_window($first->id);
|
||||
sync_with_i3;
|
||||
|
||||
is(focused_ws(), $ws2, 'second workspace is still focused');
|
||||
is($x->input_focus, $second->id, 'second window is still focused');
|
||||
is(get_urgency_for_window_on_workspace($ws1, $first), 1, 'first window is marked urgent');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 3: If mode is set to 'focus' and the target workspace is visible,
|
||||
# check that the focus is switched.
|
||||
#####################################################################
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
focus_on_window_activation focus
|
||||
EOT
|
||||
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $ws = fresh_workspace;
|
||||
my $first = open_window;
|
||||
my $second = open_window;
|
||||
|
||||
send_net_active_window($first->id);
|
||||
sync_with_i3;
|
||||
|
||||
is($x->input_focus, $first->id, 'first window is now focused');
|
||||
ok(!get_urgency_for_window_on_workspace($ws, $first), 'first window is not marked urgent');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 4: If mode is set to 'focus' and the target workspace is not
|
||||
# visible, check that the focus switched.
|
||||
#####################################################################
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
focus_on_window_activation focus
|
||||
EOT
|
||||
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $ws1 = fresh_workspace;
|
||||
my $first = open_window;
|
||||
my $ws2 = fresh_workspace;
|
||||
my $second = open_window;
|
||||
|
||||
send_net_active_window($first->id);
|
||||
sync_with_i3;
|
||||
|
||||
is(focused_ws(), $ws1, 'first workspace is now focused');
|
||||
is($x->input_focus, $first->id, 'first window is now focused');
|
||||
ok(!get_urgency_for_window_on_workspace($ws1, $first), 'first window is not marked urgent');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 5: If mode is set to 'none' and the target workspace is visible,
|
||||
# check that nothing happens.
|
||||
#####################################################################
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
focus_on_window_activation none
|
||||
EOT
|
||||
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $ws = fresh_workspace;
|
||||
my $first = open_window;
|
||||
my $second = open_window;
|
||||
|
||||
send_net_active_window($first->id);
|
||||
sync_with_i3;
|
||||
|
||||
is($x->input_focus, $second->id, 'second window is still focused');
|
||||
ok(!get_urgency_for_window_on_workspace($ws, $first), 'first window is not marked urgent');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
#####################################################################
|
||||
# 6: If mode is set to 'none' and the target workspace is not
|
||||
# visible, check that nothing happens.
|
||||
#####################################################################
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
|
||||
focus_on_window_activation none
|
||||
EOT
|
||||
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $ws1 = fresh_workspace;
|
||||
my $first = open_window;
|
||||
my $ws2 = fresh_workspace;
|
||||
my $second = open_window;
|
||||
|
||||
send_net_active_window($first->id);
|
||||
sync_with_i3;
|
||||
|
||||
is(focused_ws(), $ws2, 'second workspace is still focused');
|
||||
is($x->input_focus, $second->id, 'second window is still focused');
|
||||
ok(!get_urgency_for_window_on_workspace($ws1, $first), 'first window is not marked urgent');
|
||||
|
||||
exit_gracefully($pid);
|
||||
|
||||
done_testing;
|
||||
Reference in New Issue
Block a user