Merge pull request #4622 from orestisfl/focus-output-next

Focus output next

testcases/lib/i3test.pm.in

@@ -42,6 +42,7 @@ our @EXPORT = qw(
     exit_forcefully
     workspace_exists
     focused_ws
+    focused_output
     get_socket_path
     launch_with_config
     get_i3_log
@@ -664,6 +665,25 @@ sub workspace_exists {
     (scalar grep { $_ eq $name } @{get_workspace_names()}) > 0;
 }
 
+=head2 focused_output
+
+Returns the name of the currently focused output.
+
+  is(focused_output, 'fake-0', 'i3 starts on output 0');
+
+=cut
+sub _focused_output {
+    my $i3 = i3(get_socket_path());
+    my $tree = $i3->get_tree->recv;
+    my $focused = $tree->{focus}->[0];
+    my $output = first { $_->{id} == $focused } @{$tree->{nodes}};
+    return $output;
+}
+
+sub focused_output {
+    return _focused_output->{name}
+}
+
 =head2 focused_ws
 
 Returns the name of the currently focused workspace.
@@ -672,11 +692,9 @@ Returns the name of the currently focused workspace.
   is($ws, '1', 'i3 starts on workspace 1');
 
 =cut
+
 sub focused_ws {
-    my $i3 = i3(get_socket_path());
-    my $tree = $i3->get_tree->recv;
-    my $focused = $tree->{focus}->[0];
-    my $output = first { $_->{id} == $focused } @{$tree->{nodes}};
+    my $output = _focused_output;
     my $content = first { $_->{type} eq 'con' } @{$output->{nodes}};
     my $first = first { $_->{fullscreen_mode} == 1 } @{$content->{nodes}};
     return $first->{name}

testcases/t/502-focus-output.t

@@ -31,13 +31,6 @@ my $i3 = i3(get_socket_path());
 # use 'focus output' and verify that focus gets changed appropriately
 ################################################################################
 
-sub focused_output {
-    my $tree = $i3->get_tree->recv;
-    my $focused = $tree->{focus}->[0];
-    my $output = first { $_->{id} == $focused } @{$tree->{nodes}};
-    return $output->{name};
-}
-
 sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;

testcases/t/506-focus-right.t

@@ -149,32 +149,25 @@ sync_with_i3;
 # Ensure that focusing right/left works in the expected order.
 ############################################################################
 
-sub get_focused_output {
-    my $tree = i3(get_socket_path())->get_tree->recv;
-    my ($focused_id) = @{$tree->{focus}};
-    my ($output) = grep { $_->{id} == $focused_id } @{$tree->{nodes}};
-    return $output->{name};
-}
-
-is(get_focused_output(), 'fake-0', 'focus on fake-0');
+is(focused_output, 'fake-0', 'focus on fake-0');
 
 cmd 'focus output right';
-is(get_focused_output(), 'fake-1', 'focus on fake-1');
+is(focused_output, 'fake-1', 'focus on fake-1');
 
 cmd 'focus output right';
-is(get_focused_output(), 'fake-2', 'focus on fake-2');
+is(focused_output, 'fake-2', 'focus on fake-2');
 
 cmd 'focus output left';
-is(get_focused_output(), 'fake-1', 'focus on fake-1');
+is(focused_output, 'fake-1', 'focus on fake-1');
 
 cmd 'focus output left';
-is(get_focused_output(), 'fake-0', 'focus on fake-0');
+is(focused_output, 'fake-0', 'focus on fake-0');
 
 cmd 'focus output left';
-is(get_focused_output(), 'fake-2', 'focus on fake-2 (wrapping)');
+is(focused_output, 'fake-2', 'focus on fake-2 (wrapping)');
 
 cmd 'focus output right';
-is(get_focused_output(), 'fake-0', 'focus on fake-0 (wrapping)');
+is(focused_output, 'fake-0', 'focus on fake-0 (wrapping)');
 
 exit_gracefully($pid);
 

testcases/t/543-move-workspace-to-multiple-outputs.t

@@ -14,7 +14,7 @@
 # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
 #   (unless you are already familiar with Perl)
 #
-# Test using multiple workspaces for 'move workspace to output …'
+# Test using multiple outputs for 'move workspace to output …'
 # Ticket: #4337
 use i3test i3_config => <<EOT;
 # i3 config file (v4)

testcases/t/544-focus-multiple-outputs.t

@@ -0,0 +1,67 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+#
+# Please read the following documents before working on tests:
+# • https://build.i3wm.org/docs/testsuite.html
+#   (or docs/testsuite)
+#
+# • https://build.i3wm.org/docs/lib-i3test.html
+#   (alternatively: perldoc ./testcases/lib/i3test.pm)
+#
+# • https://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)
+#
+# Test using multiple output for 'focus output …'
+# Ticket: #4619
+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,1024x768+0+768,1024x768+1024+768
+EOT
+
+###############################################################################
+# Test using "next" special keyword
+###############################################################################
+
+is(focused_output, "fake-0", 'sanity check');
+
+for (my $i = 1; $i < 9; $i++) {
+    cmd 'focus output next';
+
+    my $out = $i % 4;
+    is(focused_output, "fake-$out", 'focus output next cycle');
+}
+
+###############################################################################
+# Same as above but explicitely type all the outputs
+###############################################################################
+
+is(focused_output, "fake-0", 'sanity check');
+
+for (my $i = 1; $i < 10; $i++) {
+    cmd 'focus output fake-0 fake-1 fake-2 fake-3';
+
+    my $out = $i % 4;
+    is(focused_output, "fake-$out", 'focus output next cycle');
+}
+
+###############################################################################
+# Use a subset of the outputs plus some non-existing outputs
+###############################################################################
+
+cmd 'focus output fake-1';
+is(focused_output, "fake-1", 'start from fake-1 which is not included in output list');
+
+my @order = (0, 3, 2);
+for (my $i = 0; $i < 10; $i++) {
+    cmd 'focus output doesnotexist fake-0 alsodoesnotexist fake-3 fake-2';
+
+    my $out = $order[$i % 3];
+    is(focused_output, "fake-$out", 'focus output next cycle');
+}
+
+done_testing;