Merge branch 'master' into next

[i3/i3] / testcases / t / 100-fullscreen.t

diff --git a/testcases/t/100-fullscreen.t b/testcases/t/100-fullscreen.t
index f8fc92a24aee749c58bbd58d31c3383e6a3d8e86..cec7000aa9146ea0ef8de534554c88b24c96fae3 100644 (file)
--- a/testcases/t/100-fullscreen.t
+++ b/testcases/t/100-fullscreen.t
@@ -1,5 +1,18 @@
 #!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)
 
 use i3test;
 use List::Util qw(first);
@@ -9,7 +22,10 @@ my $i3 = i3(get_socket_path());
 my $tmp = fresh_workspace;
 
 sub fullscreen_windows {
-    scalar grep { $_->{fullscreen_mode} != 0 } @{get_ws_content($tmp)}
+    my $ws = $tmp;
+    $ws = shift if @_;
+
+    scalar grep { $_->{fullscreen_mode} != 0 } @{get_ws_content($ws)}
 }
 
 # get the output of this workspace
@@ -104,9 +120,10 @@ ok(($wrect->{y} - $orect->{y}) < $threshold, 'y coordinate fullscreen');
 ok(abs($wrect->{width} - $orect->{width}) < $threshold, 'width coordinate fullscreen');
 ok(abs($wrect->{height} - $orect->{height}) < $threshold, 'height coordinate fullscreen');
 
-###############################################################################
-# test if setting two windows in fullscreen mode at the same time does not work
-###############################################################################
+################################################################################
+# Verify that when one window wants to go into fullscreen mode, the old
+# fullscreen window will be replaced.
+################################################################################
 
 $original_rect = X11::XCB::Rect->new(x => 0, y => 0, width => 30, height => 30);
 my $swindow = open_window(
@@ -130,7 +147,7 @@ is(fullscreen_windows(), 1, 'amount of fullscreen windows');
 
 $window->fullscreen(0);
 sync_with_i3;
-is(fullscreen_windows(), 0, 'amount of fullscreen windows');
+is(fullscreen_windows(), 1, 'amount of fullscreen windows');
 
 ok($swindow->mapped, 'window mapped after other fullscreen ended');
 
@@ -174,4 +191,27 @@ is($x->input_focus, $window->id, 'fullscreen window focused');
 cmd 'focus left';
 is($x->input_focus, $window->id, 'fullscreen window still focused');
 
+################################################################################
+# Verify that fullscreening a window on a second workspace and moving it onto
+# the first workspace unfullscreens the first window.
+################################################################################
+
+my $tmp2 = fresh_workspace;
+$swindow = open_window;
+
+cmd 'fullscreen';
+
+is(fullscreen_windows($tmp2), 1, 'one fullscreen window on second ws');
+
+cmd "move workspace $tmp";
+
+is(fullscreen_windows($tmp2), 0, 'no fullscreen windows on second ws');
+is(fullscreen_windows($tmp), 1, 'one fullscreen window on first ws');
+
+$swindow->fullscreen(0);
+sync_with_i3;
+
+# Verify that $swindow was the one that initially remained fullscreen.
+is(fullscreen_windows($tmp), 0, 'no fullscreen windows on first ws');
+
 done_testing;