Merge pull request #1725 from Airblader/bug-1056

Allow window decoration to change focus
next
Michael Stapelberg 2015-05-31 16:13:51 +02:00
commit 9a117767e8
2 changed files with 150 additions and 4 deletions

View File

@ -215,7 +215,7 @@ static void handle_motion_notify(xcb_motion_notify_event_t *event) {
/* Skip events where the pointer was over a child window, we are only
* interested in events on the root window. */
if (event->child != 0)
if (event->child != XCB_NONE)
return;
Con *con;
@ -228,7 +228,7 @@ static void handle_motion_notify(xcb_motion_notify_event_t *event) {
if (config.disable_focus_follows_mouse)
return;
if (con->layout != L_DEFAULT)
if (con->layout != L_DEFAULT && con->layout != L_SPLITV && con->layout != L_SPLITH)
return;
/* see over which rect the user is */
@ -245,8 +245,6 @@ static void handle_motion_notify(xcb_motion_notify_event_t *event) {
x_push_changes(croot);
return;
}
return;
}
/*

View File

@ -0,0 +1,148 @@
#!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)
#
# Ensure that hovering over the window decoration of a window causes it to focus
# correctly.
# Ticket: #1056
# Bug still in: 4.10.2-174-g8029ff0
use i3test;
my ($ws, $A, $B, $C, $target, $y);
my @cons;
# ==================================================================================
# Given the following layout (= denotes the window decoration),
# when moving the mouse from 1 to 2,
# then the C should be focused.
#
# This should especially be the case if B is the focus head of its vertically split parent container.
#
# +===A===+===B===+
# | | |
# | 1 +=2=C===+
# | | |
# +-------+-------+
#
# ==================================================================================
$ws = fresh_workspace;
open_window;
$B = open_window;
cmd 'split v';
open_window;
$target = get_focused($ws);
@cons = @{get_ws($ws)->{nodes}};
$A = $cons[0];
$C = $cons[1]->{nodes}[1];
$y = $C->{rect}->{y} - 0.5 * $C->{deco_rect}->{height};
# make sure that B is the focus head of its parent
cmd '[id="' . $B->{id} . '"] focus';
# move pointer to position 1
$x->root->warp_pointer($C->{rect}->{x} - 0.5 * $A->{rect}->{width}, $y);
sync_with_i3;
# move pointer to position 2
$x->root->warp_pointer($C->{rect}->{x} + 0.5 * $C->{rect}->{width}, $y);
sync_with_i3;
is(get_focused($ws), $target, 'focus switched to container C');
# ==================================================================================
# Given a tabbed container when the mouse is moved onto the window decoration
# then the focus head of the tabbed container is focused regardless of which particular
# tab's decoration the mouse is on.
#
# +=========+=========+
# | | |
# | 1 +=2==|****| <- tab to the right is focus head of tabbed container
# | | |
# +---------+---------+
#
# ==================================================================================
$ws = fresh_workspace;
open_window;
open_window;
cmd 'split v';
open_window;
cmd 'split h';
open_window;
$target = get_focused($ws);
cmd 'layout tabbed';
@cons = @{get_ws($ws)->{nodes}};
$A = $cons[0];
$B = $cons[1]->{nodes}[1]->{nodes}[1];
$y = $B->{rect}->{y} - 0.5 * $B->{deco_rect}->{height};
$x->root->warp_pointer($B->{rect}->{x} - 0.5 * $A->{rect}->{width}, $y);
sync_with_i3;
$x->root->warp_pointer($B->{rect}->{x} + 0.2 * $B->{rect}->{width}, $y);
sync_with_i3;
is(get_focused($ws), $target, 'focus switched to the focus head of the tabbed container');
# ==================================================================================
# Given a stacked container when the mouse is moved onto the window decoration
# then the focus head of the stacked container is focused regardless of which particular
# tab's decoration the mouse is on.
#
# +=========+=========+
# | | |
# | 1 +=2=======+
# | +*********+ <- the lower tab is the focus head of the stacked container
# | | |
# +---------+---------+
#
# ==================================================================================
$ws = fresh_workspace;
open_window;
open_window;
cmd 'split v';
open_window;
cmd 'split h';
open_window;
$target = get_focused($ws);
cmd 'layout stacked';
@cons = @{get_ws($ws)->{nodes}};
$A = $cons[0];
$B = $cons[1]->{nodes}[1]->{nodes}[0];
$C = $cons[1]->{nodes}[1]->{nodes}[1];
$y = $B->{rect}->{y} - 1.5 * $B->{deco_rect}->{height};
$x->root->warp_pointer($B->{rect}->{x} - 0.5 * $A->{rect}->{width}, $y);
sync_with_i3;
$x->root->warp_pointer($B->{rect}->{x} + 0.5 * $B->{rect}->{width}, $y);
sync_with_i3;
is(get_focused($ws), $target, 'focus switched to the focus head of the stacked container');
# ==================================================================================
done_testing;