From f76a2fdf68d3794b8fc4deeb8159adba905a23df Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 6 Aug 2015 21:35:34 +0200
Subject: [PATCH] layout restore: remove remaining criteria when swallowing
 window

fixes #1817
---
 src/manage.c                                  |  7 ++
 .../t/250-layout-restore-multiple-criteria.t  | 84 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 testcases/t/250-layout-restore-multiple-criteria.t

diff --git a/src/manage.c b/src/manage.c
index 002a7c78..08e11b57 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -301,6 +301,13 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
     if (nc->window != NULL && nc->window != cwindow) {
         if (!restore_kill_placeholder(nc->window->id)) {
             DLOG("Uh?! Container without a placeholder, but with a window, has swallowed this to-be-managed window?!\n");
+        } else {
+            /* Remove remaining criteria, the first swallowed window wins. */
+            while (!TAILQ_EMPTY(&(nc->swallow_head))) {
+                Match *first = TAILQ_FIRST(&(nc->swallow_head));
+                TAILQ_REMOVE(&(nc->swallow_head), first, matches);
+                match_free(first);
+            }
         }
     }
     nc->window = cwindow;
diff --git a/testcases/t/250-layout-restore-multiple-criteria.t b/testcases/t/250-layout-restore-multiple-criteria.t
new file mode 100644
index 00000000..88c68823
--- /dev/null
+++ b/testcases/t/250-layout-restore-multiple-criteria.t
@@ -0,0 +1,84 @@
+#!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)
+#
+# TODO: Description of this file.
+# Ticket: #1817
+# Bug still in: 4.10.3-270-g0fb784f
+use i3test;
+use File::Temp qw(tempfile);
+use IO::Handle;
+
+my $ws = fresh_workspace;
+
+my @content = @{get_ws_content($ws)};
+is(@content, 0, 'no nodes on the new workspace yet');
+
+my ($fh, $filename) = tempfile(UNLINK => 1);
+print $fh <<'EOT';
+{
+    // stacked split container with 1 children
+    "border": "normal",
+    "floating": "auto_off",
+    "layout": "stacked",
+    "percent": 0.40,
+    "type": "con",
+    "nodes": [
+        {
+            "border": "normal",
+            "current_border_width": 2,
+            "floating": "auto_off",
+            "geometry": {
+               "height": 460,
+               "width": 804,
+               "x": 0,
+               "y": 0
+            },
+            // "name": "",
+            "percent": 0.5,
+            "swallows": [
+               { "class": "^URxvt$" },
+               { "class": "^Gitk$" },
+               { "class": "^Git-gui$" }
+            ],
+            "type": "con"
+        }
+    ]
+}
+EOT
+$fh->flush;
+my $reply = cmd "append_layout $filename";
+close($fh);
+
+does_i3_live;
+
+@content = @{get_ws_content($ws)};
+is(@content, 1, "one node on the workspace now");
+
+my $should_swallow = open_window(wm_class => 'URxvt');
+
+@content = @{get_ws_content($ws)};
+is(@content, 1, "still one node on the workspace now");
+my @nodes = @{$content[0]->{nodes}};
+is($nodes[0]->{window}, $should_swallow->id, "swallowed window on top");
+
+cmd 'focus parent';
+
+my $should_ignore = open_window(wm_class => 'Gitk');
+
+@content = @{get_ws_content($ws)};
+is(@content, 2, "two nodes on the workspace");
+
+done_testing;
-- 
2.39.2