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 e11ca75407
commit 93a9f3c244
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/handlers.c
View File

@ -365,11 +365,31 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
if (client_is_floating(client)) { if (client_is_floating(client)) {
i3Font *font = load_font(conn, config.font); i3Font *font = load_font(conn, config.font);
int mode = (client->container != NULL ? client->container->mode : MODE_DEFAULT); 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) if (event->value_mask & XCB_CONFIG_WINDOW_X) {
client->rect.x = event->x; if (mode == MODE_STACK || mode == MODE_TABBED) {
if (event->value_mask & XCB_CONFIG_WINDOW_Y) client->rect.x = event->x - 2;
client->rect.y = event->y; } 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 (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
if (mode == MODE_STACK || mode == MODE_TABBED) { if (mode == MODE_STACK || mode == MODE_TABBED) {
client->rect.width = event->width + 2 + 2; client->rect.width = event->width + 2 + 2;

9
testcases/t/12-floating-resize.t
View File

@ -4,7 +4,7 @@
# the workspace to be empty). # the workspace to be empty).
# TODO: skip it by default? # TODO: skip it by default?
use Test::More tests => 16; use Test::More tests => 17;
use Test::Deep; use Test::Deep;
use X11::XCB qw(:all); use X11::XCB qw(:all);
use Data::Dumper; use Data::Dumper;
@ -47,6 +47,13 @@ isa_ok($window, 'X11::XCB::Window');
$window->map; $window->map;
sleep 0.25; 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 { sub test_resize {
$window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => 100, height => 100)); $window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => 100, height => 100));