nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix: killing unfocused window shouldn't produce focus event

This commit is contained in:
Orestis Floros 2018-12-14 20:37:29 +02:00
parent f70c3b168d
commit dd708199ea
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/x.c
View File

@ -276,7 +276,12 @@ static void _x_con_kill(Con *con) {
free(state); free(state);
/* Invalidate focused_id to correctly focus new windows with the same ID */ /* Invalidate focused_id to correctly focus new windows with the same ID */
focused_id = last_focused = XCB_NONE; if (con->frame.id == focused_id) {
focused_id = XCB_NONE;
}
if (con->frame.id == last_focused) {
last_focused = XCB_NONE;
}
} }
/* /*

15
testcases/t/219-ipc-window-focus.t
View File

@ -44,11 +44,26 @@ sub focus_subtest {
is($events[0]->{container}->{name}, $name, "$name focused"); is($events[0]->{container}->{name}, $name, "$name focused");
} }
sub kill_subtest {
my ($cmd, $name) = @_;
my $focus = AnyEvent->condvar;
my @events = events_for(
sub { cmd $cmd },
'window');
is(scalar @events, 1, 'Received 1 event');
is($events[0]->{change}, 'close', 'Close event received');
is($events[0]->{container}->{name}, $name, "$name closed");
}
subtest 'focus left (1)', \&focus_subtest, 'focus left', $win1->name; subtest 'focus left (1)', \&focus_subtest, 'focus left', $win1->name;
subtest 'focus left (2)', \&focus_subtest, 'focus left', $win0->name; subtest 'focus left (2)', \&focus_subtest, 'focus left', $win0->name;
subtest 'focus right (1)', \&focus_subtest, 'focus right', $win1->name; subtest 'focus right (1)', \&focus_subtest, 'focus right', $win1->name;
subtest 'focus right (2)', \&focus_subtest, 'focus right', $win2->name; subtest 'focus right (2)', \&focus_subtest, 'focus right', $win2->name;
subtest 'focus right (3)', \&focus_subtest, 'focus right', $win0->name; subtest 'focus right (3)', \&focus_subtest, 'focus right', $win0->name;
subtest 'focus left', \&focus_subtest, 'focus left', $win2->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;
done_testing; done_testing;