From: Orestis Floros Date: Fri, 14 Dec 2018 18:39:34 +0000 (+0200) Subject: Invalidate last_focused when focusing the EWMH support window X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F3566%2Fhead;p=i3%2Fi3 Invalidate last_focused when focusing the EWMH support window Fixes #3562 --- diff --git a/src/x.c b/src/x.c index a2f2c39f..f643a9b3 100644 --- a/src/x.c +++ b/src/x.c @@ -1325,6 +1325,7 @@ void x_push_changes(Con *con) { change_ewmh_focus(XCB_WINDOW_NONE, last_focused); focused_id = ewmh_window; + last_focused = XCB_NONE; } xcb_flush(conn); diff --git a/testcases/t/219-ipc-window-focus.t b/testcases/t/219-ipc-window-focus.t index afb1bfbc..696fc7b2 100644 --- a/testcases/t/219-ipc-window-focus.t +++ b/testcases/t/219-ipc-window-focus.t @@ -14,14 +14,20 @@ # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf # (unless you are already familiar with Perl) -use i3test; +use i3test i3_config => < 0); my $win0 = open_window; my $win1 = open_window; my $win2 = open_window; @@ -66,4 +72,30 @@ subtest 'focus right (3)', \&focus_subtest, 'focus right', $win0->name; subtest 'focus left', \&focus_subtest, 'focus left', $win2->name; subtest 'kill doesn\'t produce focus event', \&kill_subtest, '[id=' . $win1->id . '] kill', $win1->name; +# See issue #3562. We need to switch to an existing workspace on the second +# output to trigger the bug. +cmd 'workspace X'; +subtest 'workspace focus', \&focus_subtest, "workspace $ws", $win2->name; + +sub scratchpad_subtest { + my ($cmd, $name) = @_; + + my $focus = AnyEvent->condvar; + + my @events = events_for( + sub { cmd $cmd }, + 'window'); + + is(scalar @events, 2, 'Received 2 events'); + is($events[0]->{change}, 'move', 'Move event received'); + is($events[0]->{container}->{nodes}->[0]->{name}, $name, "$name moved"); + is($events[1]->{change}, 'focus', 'Focus event received'); + is($events[1]->{container}->{name}, $name, "$name focused"); +} + +fresh_workspace; +my $win = open_window; +cmd 'move scratchpad'; +subtest 'scratchpad', \&scratchpad_subtest, '[id=' . $win->id . '] scratchpad show', $win->name; + done_testing;