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

Merge branch 'fix-configure-request'

This commit is contained in:
Michael Stapelberg 2011-12-17 17:16:35 +00:00
parent fcfdfedcb5 75c57c4eef
commit 422846e1c5
2 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/handlers.c
View File

@ -376,25 +376,45 @@ static int handle_configure_request(xcb_configure_request_event_t *event) {
bsr.height -= deco_height; bsr.height -= deco_height;
} }
Con *floatingcon = con->parent; Con *floatingcon = con->parent;
DLOG("Container is a floating leaf node, will do that.\n");
Rect newrect = floatingcon->rect;
if (event->value_mask & XCB_CONFIG_WINDOW_X) { if (event->value_mask & XCB_CONFIG_WINDOW_X) {
floatingcon->rect.x = event->x + (-1) * bsr.x; newrect.x = event->x + (-1) * bsr.x;
DLOG("proposed x = %d, new x is %d\n", event->x, floatingcon->rect.x); DLOG("proposed x = %d, new x is %d\n", event->x, newrect.x);
} }
if (event->value_mask & XCB_CONFIG_WINDOW_Y) { if (event->value_mask & XCB_CONFIG_WINDOW_Y) {
floatingcon->rect.y = event->y + (-1) * bsr.y; newrect.y = event->y + (-1) * bsr.y;
DLOG("proposed y = %d, new y is %d\n", event->y, floatingcon->rect.y); DLOG("proposed y = %d, new y is %d\n", event->y, newrect.y);
} }
if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) { if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
floatingcon->rect.width = event->width + (-1) * bsr.width; newrect.width = event->width + (-1) * bsr.width;
floatingcon->rect.width += con->border_width * 2; newrect.width += con->border_width * 2;
DLOG("proposed width = %d, new width is %d (x11 border %d)\n", event->width, floatingcon->rect.width, con->border_width); DLOG("proposed width = %d, new width is %d (x11 border %d)\n",
event->width, newrect.width, con->border_width);
} }
if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) { if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
floatingcon->rect.height = event->height + (-1) * bsr.height; newrect.height = event->height + (-1) * bsr.height;
floatingcon->rect.height += con->border_width * 2; newrect.height += con->border_width * 2;
DLOG("proposed height = %d, new height is %d (x11 border %d)\n", event->height, floatingcon->rect.height, con->border_width); DLOG("proposed height = %d, new height is %d (x11 border %d)\n",
event->height, newrect.height, con->border_width);
} }
/* Sanity check: Are the new coordinates on any output? If not, we
* ignore that request. */
Output *output = get_output_containing(
newrect.x + (newrect.width / 2),
newrect.y + (newrect.height / 2));
if (!output) {
ELOG("No output found at destination coordinates. Ignoring this ConfigureRequest.\n");
fake_absolute_configure_notify(con);
return 0;
}
DLOG("Container is a floating leaf node, will do that.\n");
floatingcon->rect = newrect;
floating_maybe_reassign_ws(floatingcon); floating_maybe_reassign_ws(floatingcon);
tree_render(); tree_render();
} }

18
testcases/t/112-floating-resize.t
View File

@ -62,4 +62,22 @@ cmd 'border 1pixel';
test_resize; test_resize;
################################################################################
# Check if we can position a floating window out of bounds. The XDummy screen
# is 1280x1024, so x=2864, y=893 is out of bounds.
################################################################################
($a, $t) = $window->rect;
$window->rect(X11::XCB::Rect->new(
x => 2864,
y => 893,
width => $a->width,
height => $a->height));
sync_with_i3;
($a, $t) = $window->rect;
cmp_ok($a->x, '<', 1280, 'X not moved out of bounds');
cmp_ok($a->y, '<', 1024, 'Y not moved out of bounds');
done_testing; done_testing;