From d0de3f403d257ffa9cf7f0a02d2a6106cbf6e12f Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Nov 2010 01:39:47 +0100
Subject: [PATCH] Bugfix: Restore focus after changing layout (Thanks
 fernandotcl)

---
 src/con.c                   |  7 ++++++
 testcases/t/40-focus-lost.t | 46 +++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 testcases/t/40-focus-lost.t

diff --git a/src/con.c b/src/con.c
index 8d24c0df..e86f668c 100644
--- a/src/con.c
+++ b/src/con.c
@@ -567,6 +567,10 @@ void con_set_layout(Con *con, int layout) {
          * container. */
         new->orientation = HORIZ;
 
+        Con *old_focused = TAILQ_FIRST(&(con->focus_head));
+        if (old_focused == TAILQ_END(&(con->focus_head)))
+            old_focused = NULL;
+
         /* 4: move the existing cons of this workspace below the new con */
         DLOG("Moving cons\n");
         Con *child;
@@ -580,6 +584,9 @@ void con_set_layout(Con *con, int layout) {
         DLOG("Attaching new split to ws\n");
         con_attach(new, con);
 
+        if (old_focused)
+            con_focus(old_focused);
+
         return;
     }
 
diff --git a/testcases/t/40-focus-lost.t b/testcases/t/40-focus-lost.t
new file mode 100644
index 00000000..9b2db079
--- /dev/null
+++ b/testcases/t/40-focus-lost.t
@@ -0,0 +1,46 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+# Regression: Check if the focus stays the same when switching the layout
+# bug introduced by 77d0d42ed2d7ac8cafe267c92b35a81c1b9491eb
+use i3test tests => 4;
+use X11::XCB qw(:all);
+use Time::HiRes qw(sleep);
+
+BEGIN {
+    use_ok('X11::XCB::Window');
+}
+
+my $i3 = i3("/tmp/nestedcons");
+my $x = X11::XCB::Connection->new;
+
+sub check_order {
+    my ($msg) = @_;
+
+    my @ws = @{$i3->get_workspaces->recv};
+    my @nums = map { $_->{num} } grep { defined($_->{num}) } @ws;
+    my @sorted = sort @nums;
+
+    cmp_deeply(\@nums, \@sorted, $msg);
+}
+
+my $tmp = get_unused_workspace();
+$i3->command("workspace $tmp")->recv;
+
+my $left = open_standard_window($x);
+sleep 0.25;
+my $mid = open_standard_window($x);
+sleep 0.25;
+my $right = open_standard_window($x);
+sleep 0.25;
+
+diag("left = " . $left->id . ", mid = " . $mid->id . ", right = " . $right->id);
+
+is($x->input_focus, $right->id, 'Right window focused');
+
+$i3->command('prev h')->recv;
+
+is($x->input_focus, $mid->id, 'Mid window focused');
+
+$i3->command('layout stacked')->recv;
+
+is($x->input_focus, $mid->id, 'Mid window focused');
-- 
2.39.5