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

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-12-22 14:08:14 +01:00
parent e0194f0765 bf2b25a915
commit a1ccca22e6
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/handlers.c
View File

@ -349,6 +349,11 @@ static void handle_configure_request(xcb_configure_request_event_t *event) {
} }
Con *floatingcon = con->parent; Con *floatingcon = con->parent;
if (strcmp(con_get_workspace(floatingcon)->name, "__i3_scratch") == 0) {
DLOG("This is a scratchpad container, ignoring ConfigureRequest\n");
return;
}
Rect newrect = floatingcon->rect; Rect newrect = floatingcon->rect;
if (event->value_mask & XCB_CONFIG_WINDOW_X) { if (event->value_mask & XCB_CONFIG_WINDOW_X) {

54
testcases/t/511-scratchpad-configure-request.t Normal file
View File

@ -0,0 +1,54 @@
#!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)
#
# Tests that ConfigureRequests don’t make windows fall out of the scratchpad.
# Ticket: #898
# Bug still in: 4.4-15-g770ead6
use i3test i3_autostart => 0;
# Ensure the pointer is at (0, 0) so that we really start on the first
# (the left) workspace.
$x->root->warp_pointer(0, 0);
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0
EOT
my $pid = launch_with_config($config);
my $left_ws = fresh_workspace(output => 0);
my $right_ws = fresh_workspace(output => 1);
my $window = open_window;
cmd 'move scratchpad';
# Cause a ConfigureRequest by setting the window’s position/size.
my ($a, $t) = $window->rect;
$window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => $a->width, height => $a->height));
sync_with_i3;
my $ws = get_ws($left_ws);
is(scalar @{$ws->{floating_nodes}}, 0, 'scratchpad window still in scratchpad after ConfigureRequest');
$ws = get_ws($right_ws);
is(scalar @{$ws->{floating_nodes}}, 0, 'scratchpad window still in scratchpad after ConfigureRequest');
exit_gracefully($pid);
done_testing;