Merge branch 'master' into next

diff --combined testcases/t/136-floating-ws-empty.t
index f17b0ec146fa465b9ffad2c5de81a867b768edf6,72cb6f86f9fa7085549800e57a9acd03cfbb3bb5..fa747718e012d3a6506b36647dfa773bc9f2ed3e
--- 1/testcases/t/136-floating-ws-empty.t
--- 2/testcases/t/136-floating-ws-empty.t
+++ b/testcases/t/136-floating-ws-empty.t
@@@ -3,6 -3,11 +3,6 @@@
  # Regression test: when only having a floating window on a workspace, it should not be deleted.
  
  use i3test;
 -use X11::XCB qw(:all);
 -
 -BEGIN {
 -    use_ok('X11::XCB::Window');
 -}
  
  my $i3 = i3(get_socket_path());
  
@@@ -14,8 -19,10 +14,8 @@@ my $tmp = fresh_workspace
  
  ok(workspace_exists($tmp), "workspace $tmp exists");
  
 -my $x = X11::XCB::Connection->new;
 -
  # Create a floating window which is smaller than the minimum enforced size of i3
 -my $window = open_floating_window($x);
 +my $window = open_floating_window;
  ok($window->mapped, 'Window is mapped');
  
  # switch to a different workspace, see if the window is still mapped?
@@@ -25,4 -32,31 +25,31 @@@ my $otmp = fresh_workspace
  ok(workspace_exists($otmp), "new workspace $otmp exists");
  ok(workspace_exists($tmp), "old workspace $tmp still exists");
  
+ ################################################################################
+ # 2: Similar test: Have two floating windows on a workspace, close one of them.
+ # The workspace should not be closed. Regression present until (including) commit
+ # 1f2c9306a27cced83ad960e929bb9e9a163b7843
+ ################################################################################
+ 
+ $tmp = fresh_workspace;
+ 
+ ok(workspace_exists($tmp), "workspace $tmp exists");
+ 
+ # Create a floating window which is smaller than the minimum enforced size of i3
+ my $first = open_floating_window;
+ my $second = open_floating_window;
+ ok($first->mapped, 'Window is mapped');
+ ok($second->mapped, 'Window is mapped');
+ 
+ $otmp = fresh_workspace;
+ 
+ ok(workspace_exists($otmp), "new workspace $otmp exists");
+ ok(workspace_exists($tmp), "old workspace $tmp still exists");
+ 
+ $first->unmap;
+ wait_for_unmap $first;
+ 
+ ok(workspace_exists($otmp), "new workspace $otmp exists");
+ ok(workspace_exists($tmp), "old workspace $tmp still exists");
+ 
  done_testing;