Merge branch 'master' into next

[i3/i3] / testcases / t / 113-urgent.t

diff --git a/testcases/t/113-urgent.t b/testcases/t/113-urgent.t
index 7954408fa2bf30efaa30d590f0c16ef1fedf2ea2..04f72c3d8319945422d0f455d043d08b6a8f3c8a 100644 (file)
--- a/testcases/t/113-urgent.t
+++ b/testcases/t/113-urgent.t
@@ -2,15 +2,8 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
 use List::Util qw(first);
 
-BEGIN {
-    use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 #####################################################################
@@ -19,8 +12,8 @@ my $tmp = fresh_workspace;
 
 cmd 'split v';
 
-my $top = open_window($x);
-my $bottom = open_window($x);
+my $top = open_window;
+my $bottom = open_window;
 
 my @urgent = grep { $_->{urgent} } @{get_ws_content($tmp)};
 is(@urgent, 0, 'no window got the urgent flag');
@@ -31,12 +24,12 @@ is(@urgent, 0, 'no window got the urgent flag');
 # Add the urgency hint, switch to a different workspace and back again
 #####################################################################
 $top->add_hint('urgency');
-sync_with_i3($x);
+sync_with_i3;
 
-@content = @{get_ws_content($tmp)};
+my @content = @{get_ws_content($tmp)};
 @urgent = grep { $_->{urgent} } @content;
-$top_info = first { $_->{window} == $top->id } @content;
-$bottom_info = first { $_->{window} == $bottom->id } @content;
+my $top_info = first { $_->{window} == $top->id } @content;
+my $bottom_info = first { $_->{window} == $bottom->id } @content;
 
 ok($top_info->{urgent}, 'top window is marked urgent');
 ok(!$bottom_info->{urgent}, 'bottom window is not marked urgent');
@@ -48,7 +41,7 @@ cmd '[id="' . $top->id . '"] focus';
 is(@urgent, 0, 'no window got the urgent flag after focusing');
 
 $top->add_hint('urgency');
-sync_with_i3($x);
+sync_with_i3;
 
 @urgent = grep { $_->{urgent} } @{get_ws_content($tmp)};
 is(@urgent, 0, 'no window got the urgent flag after re-setting urgency hint');
@@ -56,13 +49,14 @@ is(@urgent, 0, 'no window got the urgent flag after re-setting urgency hint');
 #####################################################################
 # Check if the workspace urgency hint gets set/cleared correctly
 #####################################################################
+
 my $ws = get_ws($tmp);
 ok(!$ws->{urgent}, 'urgent flag not set on workspace');
 
 my $otmp = fresh_workspace;
 
 $top->add_hint('urgency');
-sync_with_i3($x);
+sync_with_i3;
 
 $ws = get_ws($tmp);
 ok($ws->{urgent}, 'urgent flag set on workspace');
@@ -72,4 +66,70 @@ cmd "workspace $tmp";
 $ws = get_ws($tmp);
 ok(!$ws->{urgent}, 'urgent flag not set on workspace after switching');
 
+################################################################################
+# Use the 'urgent' criteria to switch to windows which have the urgency hint set.
+################################################################################
+
+# Go to a new workspace, open a different window, verify focus is on it.
+$otmp = fresh_workspace;
+my $different_window = open_window;
+is($x->input_focus, $different_window->id, 'new window focused');
+
+# Add the urgency hint on the other window.
+$top->add_hint('urgency');
+sync_with_i3;
+
+# Now try to switch to that window and see if focus changes.
+cmd '[urgent=latest] focus';
+isnt($x->input_focus, $different_window->id, 'window no longer focused');
+is($x->input_focus, $top->id, 'urgent window focused');
+
+################################################################################
+# Same thing, but with multiple windows and using the 'urgency=latest' criteria
+# (verify that it works in the correct order).
+################################################################################
+
+cmd "workspace $otmp";
+is($x->input_focus, $different_window->id, 'new window focused again');
+
+$top->add_hint('urgency');
+sync_with_i3;
+
+$bottom->add_hint('urgency');
+sync_with_i3;
+
+cmd '[urgent=latest] focus';
+is($x->input_focus, $bottom->id, 'latest urgent window focused');
+$bottom->delete_hint('urgency');
+sync_with_i3;
+
+cmd '[urgent=latest] focus';
+is($x->input_focus, $top->id, 'second urgent window focused');
+$top->delete_hint('urgency');
+sync_with_i3;
+
+################################################################################
+# Same thing, but with multiple windows and using the 'urgency=oldest' criteria
+# (verify that it works in the correct order).
+################################################################################
+
+cmd "workspace $otmp";
+is($x->input_focus, $different_window->id, 'new window focused again');
+
+$top->add_hint('urgency');
+sync_with_i3;
+
+$bottom->add_hint('urgency');
+sync_with_i3;
+
+cmd '[urgent=oldest] focus';
+is($x->input_focus, $top->id, 'oldest urgent window focused');
+$top->delete_hint('urgency');
+sync_with_i3;
+
+cmd '[urgent=oldest] focus';
+is($x->input_focus, $bottom->id, 'oldest urgent window focused');
+$bottom->delete_hint('urgency');
+sync_with_i3;
+
 done_testing;