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

Bugfix: only honor _NET_ACTIVE_WINDOW for visible windows (+test) (Thanks Tucos) 

fixes #774
This commit is contained in:
Michael Stapelberg 2012-08-12 16:08:31 +02:00
parent 1e49f1b08a
commit 68a23b9577
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/handlers.c
View File

@ -635,6 +635,15 @@ static void handle_client_message(xcb_client_message_event_t *event) {
return; return;
} }
Con *ws = con_get_workspace(con);
if (!workspace_is_visible(ws)) {
DLOG("Workspace not visible, ignoring _NET_ACTIVE_WINDOW\n");
return;
}
if (ws != con_get_workspace(focused))
workspace_show(ws);
con_focus(con); con_focus(con);
tree_render(); tree_render();
} else if (event->type == A_I3_SYNC) { } else if (event->type == A_I3_SYNC) {

54
testcases/t/195-net-active-window.t Normal file
View File

@ -0,0 +1,54 @@
#!perl
# vim:ts=4:sw=4:expandtab
# Verifies that the _NET_ACTIVE_WINDOW message only changes focus when the
# window is on a visible workspace.
# ticket #774, bug still present in commit 1e49f1b08a3035c1f238fcd6615e332216ab582e
use i3test;
sub send_net_active_window {
my ($id) = @_;
my $msg = pack "CCSLLLLLLL",
X11::XCB::CLIENT_MESSAGE, # response_type
32, # format
0, # sequence
$id, # destination window
$x->atom(name => '_NET_ACTIVE_WINDOW')->id,
0,
0,
0,
0,
0;
$x->send_event(0, $x->get_root_window(), X11::XCB::EVENT_MASK_SUBSTRUCTURE_REDIRECT, $msg);
}
my $ws1 = fresh_workspace;
my $win1 = open_window;
my $win2 = open_window;
################################################################################
# Ensure that the _NET_ACTIVE_WINDOW ClientMessage works when windows are visible
################################################################################
is($x->input_focus, $win2->id, 'window 2 has focus');
send_net_active_window($win1->id);
is($x->input_focus, $win1->id, 'window 1 has focus');
################################################################################
# Switch to a different workspace and ensure sending the _NET_ACTIVE_WINDOW
# ClientMessage has no effect anymore.
################################################################################
my $ws2 = fresh_workspace;
my $win3 = open_window;
is($x->input_focus, $win3->id, 'window 3 has focus');
send_net_active_window($win1->id);
is($x->input_focus, $win3->id, 'window 3 still has focus');
done_testing;