From 39fa1d724a486e6936e2401cac0434fc78f0c28f Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 20 Nov 2010 20:16:15 +0100
Subject: [PATCH] =?UTF-8?q?bugfix:=20don=E2=80=99t=20treat=20workspace=20a?=
 =?UTF-8?q?s=20empty=20if=20they=20only=20have=20floating=20windows=20(+te?=
 =?UTF-8?q?stcase)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/workspace.c                    |  2 +-
 testcases/t/36-floating-ws-empty.t | 54 ++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 testcases/t/36-floating-ws-empty.t

diff --git a/src/workspace.c b/src/workspace.c
index cdea9827..e13faa60 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -205,7 +205,7 @@ void workspace_show(const char *num) {
         next = TAILQ_FIRST(&(next->focus_head));
 
 
-    if (TAILQ_EMPTY(&(old->nodes_head))) {
+    if (TAILQ_EMPTY(&(old->nodes_head)) && TAILQ_EMPTY(&(old->floating_head))) {
         /* check if this workspace is currently visible */
         if (!workspace_is_visible(old)) {
             LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
diff --git a/testcases/t/36-floating-ws-empty.t b/testcases/t/36-floating-ws-empty.t
new file mode 100644
index 00000000..1d795e31
--- /dev/null
+++ b/testcases/t/36-floating-ws-empty.t
@@ -0,0 +1,54 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+# Regression test: when only having a floating window on a workspace, it should not be deleted.
+
+use i3test tests => 6;
+use X11::XCB qw(:all);
+use Time::HiRes qw(sleep);
+
+BEGIN {
+    use_ok('X11::XCB::Window');
+}
+
+my $i3 = i3("/tmp/nestedcons");
+
+my $tmp = get_unused_workspace();
+$i3->command("workspace $tmp")->recv;
+
+#############################################################################
+# 1: open a floating window, get it mapped
+#############################################################################
+
+sub workspace_exists {
+    my ($name) = @_;
+    ($name ~~ @{get_workspace_names()})
+}
+
+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 = $x->root->create_child(
+    class => WINDOW_CLASS_INPUT_OUTPUT,
+    rect => [ 0, 0, 30, 30],
+    background_color => '#C0C0C0',
+    # replace the type with 'utility' as soon as the coercion works again in X11::XCB
+    window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'),
+);
+
+isa_ok($window, 'X11::XCB::Window');
+
+$window->map;
+
+sleep 0.25;
+
+ok($window->mapped, 'Window is mapped');
+
+# switch to a different workspace, see if the window is still mapped?
+
+my $otmp = get_unused_workspace();
+$i3->command("workspace $otmp")->recv;
+
+ok(workspace_exists($otmp), "new workspace $otmp exists");
+ok(workspace_exists($tmp), "old workspace $tmp still exists");