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

Bugfix: Don’t mess up x/y coordinates in configurerequests for floating windows 

This was the cause for ticket #93, which actually has a false
conclusion for the reason of this bug.

This code needs to be refactored.
This commit is contained in:
Michael Stapelberg 2010-03-11 23:34:29 +01:00
parent 9714f24971
commit 56b08ab4fc
2 changed files with 114 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/handlers.c
View File

@ -341,11 +341,31 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
if (client_is_floating(client)) {
i3Font *font = load_font(conn, config.font);
int mode = (client->container != NULL ? client->container->mode : MODE_DEFAULT);
/* TODO: refactor this code. we need a function to translate
* coordinates of child_rect/rect. */
if (event->value_mask & XCB_CONFIG_WINDOW_X)
client->rect.x = event->x;
if (event->value_mask & XCB_CONFIG_WINDOW_Y)
client->rect.y = event->y;
if (event->value_mask & XCB_CONFIG_WINDOW_X) {
if (mode == MODE_STACK || mode == MODE_TABBED) {
client->rect.x = event->x - 2;
} else {
if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
client->rect.x = event->x;
else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
client->rect.x = event->x - 1;
else client->rect.x = event->x - 2;
}
}
if (event->value_mask & XCB_CONFIG_WINDOW_Y) {
if (mode == MODE_STACK || mode == MODE_TABBED) {
client->rect.y = event->y - 2;
} else {
if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
client->rect.y = event->y;
else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
client->rect.y = event->y - 1;
else client->rect.y = event->y - font->height - 2 - 2;
}
}
if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
if (mode == MODE_STACK || mode == MODE_TABBED) {
client->rect.width = event->width + 2 + 2;

90
testcases/t/12-floating-resize.t Normal file
View File

@ -0,0 +1,90 @@
#!perl
# vim:ts=4:sw=4:expandtab
# Beware that this test uses workspace 9 to perform some tests (it expects
# the workspace to be empty).
# TODO: skip it by default?
use Test::More tests => 17;
use Test::Deep;
use X11::XCB qw(:all);
use Data::Dumper;
use Time::HiRes qw(sleep);
use FindBin;
use Digest::SHA1 qw(sha1_base64);
use lib "$FindBin::Bin/lib";
use i3test;
BEGIN {
use_ok('IO::Socket::UNIX') or BAIL_OUT('Cannot load IO::Socket::UNIX');
use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
}
my $x = X11::XCB::Connection->new;
my $sock = IO::Socket::UNIX->new(Peer => '/tmp/i3-ipc.sock');
isa_ok($sock, 'IO::Socket::UNIX');
# Switch to the nineth workspace
$sock->write(i3test::format_ipc_command("9"));
sleep 0.25;
#####################################################################
# Create a floating window and see if resizing works
#####################################################################
# Create a floating window
my $window = $x->root->create_child(
class => WINDOW_CLASS_INPUT_OUTPUT,
rect => [ 0, 0, 30, 30],
background_color => '#C0C0C0',
# replace the type with 'utility' as soon as the coercion works again in X11::XCB
type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'),
);
isa_ok($window, 'X11::XCB::Window');
$window->map;
sleep 0.25;
# See if configurerequests cause window movements (they should not)
my ($a, $t) = $window->rect;
$window->rect(X11::XCB::Rect->new(x => $a->x, y => $a->y, width => $a->width, height => $a->height));
sleep 0.25;
my ($na, $nt) = $window->rect;
is_deeply($na, $a, 'Rects are equal after configurerequest');
sub test_resize {
$window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => 100, height => 100));
my ($absolute, $top) = $window->rect;
# Make sure the width/height are different from what we’re gonna test, so
# that the test will work.
isnt($absolute->width, 300, 'width != 300');
isnt($absolute->height, 500, 'height != 500');
$window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => 300, height => 500));
sleep 0.25;
($absolute, $top) = $window->rect;
is($absolute->width, 300, 'width = 300');
is($absolute->height, 500, 'height = 500');
}
# Test with default border
test_resize;
# Test borderless
$sock->write(i3test::format_ipc_command("bb"));
sleep 0.25;
test_resize;
# Test with 1-px-border
$sock->write(i3test::format_ipc_command("bp"));
sleep 0.25;
test_resize;