tests: extend t/35-floating-focus to use focus left/right on floating windows

diff --git a/testcases/t/35-floating-focus.t b/testcases/t/35-floating-focus.t
index 3f820ea5c5b92797c379a8e6dc1147b53ce5a816..6adad246292a50ae06b01574523dc9f36c1a1b2c 100644 (file)
--- a/testcases/t/35-floating-focus.t
+++ b/testcases/t/35-floating-focus.t
@@ -170,5 +170,46 @@ sleep 0.25;
 
 is($x->input_focus, $second->id, 'second (floating) container focused');
 
+#############################################################################
+# 6: see if switching floating focus using the focus left/right command works
+#############################################################################
+
+$tmp = fresh_workspace;
+
+$first = open_standard_window($x, '#ff0000', 1);    # window 10
+$second = open_standard_window($x, '#00ff00', 1);   # window 11
+$third = open_standard_window($x, '#0000ff', 1);   # window 12
+
+is($x->input_focus, $third->id, 'third container focused');
+
+cmd 'focus left';
+
+sleep 0.25;
+
+is($x->input_focus, $second->id, 'second container focused');
+
+cmd 'focus left';
+
+sleep 0.25;
+
+is($x->input_focus, $first->id, 'first container focused');
+
+cmd 'focus left';
+
+sleep 0.25;
+
+is($x->input_focus, $third->id, 'focus wrapped to third container');
+
+cmd 'focus right';
+
+sleep 0.25;
+
+is($x->input_focus, $first->id, 'focus wrapped to first container');
+
+cmd 'focus right';
+
+sleep 0.25;
+
+is($x->input_focus, $second->id, 'focus on second container');
 
 done_testing;

diff --git a/testcases/t/lib/i3test.pm b/testcases/t/lib/i3test.pm
index 054bb2ae56de6676246c48e433e0cfc0587e5aa3..749b89b77d4df4290cb8aecdffd3a28b73999e6e 100644 (file)
--- a/testcases/t/lib/i3test.pm
+++ b/testcases/t/lib/i3test.pm
@@ -48,16 +48,23 @@ use warnings;
 }
 
 sub open_standard_window {
-    my ($x, $color) = @_;
+    my ($x, $color, $floating) = @_;
 
     $color ||= '#c0c0c0';
 
-    my $window = $x->root->create_child(
+    # We cannot use a hashref here because create_child expands the arguments into an array
+    my @args = (
         class => WINDOW_CLASS_INPUT_OUTPUT,
-        rect => [ 0, 0, 30, 30 ],
+        rect => X11::XCB::Rect->new(x => 0, y => 0, width => 30, height => 30 ),
         background_color => $color,
     );
 
+    if (defined($floating) && $floating) {
+        @args = (@args, window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'));
+    }
+
+    my $window = $x->root->create_child(@args);
+
     $window->name('Window ' . counter_window());
     $window->map;