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

fix crash: send non-floating window with floating parent to scratchpad (thanks pkordy) 

Fix a crash that occured when moving a window to the scratchpad that is
seemingly floating to the user, but actually a descendant of a floating
parent con (and itself non-floating). If that is the case, move the
floating parent container to scratchpad instead of the window.

fixes #740
next
Simon Elsbrock 2012-09-28 00:38:02 +02:00 committed by Michael Stapelberg
parent 584a6b6b59
commit da2b47c1e5
2 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/scratchpad.c
View File

@ -39,11 +39,17 @@ void scratchpad_move(Con *con) {
return;
}
/* 1: Ensure the window is floating. From now on, we deal with the
* CT_FLOATING_CON. We use automatic == false because the user made the
* choice that this window should be a scratchpad (and floating). */
floating_enable(con, false);
con = con->parent;
/* 1: Ensure the window or any parent is floating. From now on, we deal
* with the CT_FLOATING_CON. We use automatic == false because the user
* made the choice that this window should be a scratchpad (and floating).
*/
Con *maybe_floating_con = con_inside_floating(con);
if (maybe_floating_con == NULL) {
floating_enable(con, false);
con = con->parent;
} else {
con = maybe_floating_con;
}
/* 2: Send the window to the __i3_scratch workspace, mainting its
* coordinates and not warping the pointer. */

76
testcases/t/185-scratchpad.t
View File

@ -323,39 +323,51 @@ does_i3_live;
# 11: focus a workspace and move all of its children to the scratchpad area
################################################################################
sub verify_scratchpad_move_multiple_win {
my $floating = shift;
my $first = open_window;
my $second = open_window;
if ($floating) {
cmd 'floating toggle';
cmd 'focus tiling';
}
cmd 'focus parent';
cmd 'move scratchpad';
does_i3_live;
$ws = get_ws($tmp);
is(scalar @{$ws->{nodes}}, 0, 'no windows on ws');
is(scalar @{$ws->{floating_nodes}}, 0, 'no floating windows on ws');
# show the first window.
cmd 'scratchpad show';
$ws = get_ws($tmp);
is(scalar @{$ws->{nodes}}, 0, 'no windows on ws');
is(scalar @{$ws->{floating_nodes}}, 1, 'one floating windows on ws');
$old_focus = get_focused($tmp);
cmd 'scratchpad show';
# show the second window.
cmd 'scratchpad show';
$ws = get_ws($tmp);
is(scalar @{$ws->{nodes}}, 0, 'no windows on ws');
is(scalar @{$ws->{floating_nodes}}, 1, 'one floating windows on ws');
isnt(get_focused($tmp), $old_focus, 'focus changed');
}
$tmp = fresh_workspace;
my $first = open_window;
my $second = open_window;
cmd 'focus parent';
cmd 'move scratchpad';
does_i3_live;
$ws = get_ws($tmp);
is(scalar @{$ws->{nodes}}, 0, 'no windows on ws');
is(scalar @{$ws->{floating_nodes}}, 0, 'no floating windows on ws');
# show the first window.
cmd 'scratchpad show';
$ws = get_ws($tmp);
is(scalar @{$ws->{nodes}}, 0, 'no windows on ws');
is(scalar @{$ws->{floating_nodes}}, 1, 'one floating windows on ws');
$old_focus = get_focused($tmp);
cmd 'scratchpad show';
# show the second window.
cmd 'scratchpad show';
$ws = get_ws($tmp);
is(scalar @{$ws->{nodes}}, 0, 'no windows on ws');
is(scalar @{$ws->{floating_nodes}}, 1, 'one floating windows on ws');
isnt(get_focused($tmp), $old_focus, 'focus changed');
verify_scratchpad_move_multiple_win(0);
$tmp = fresh_workspace;
verify_scratchpad_move_multiple_win(1);
# TODO: make i3bar display *something* when a window on the scratchpad has the urgency hint