mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg_shell: be smarter about expected resizes

Browse source 
Previously in 32b93ef6 any client resize would create a new
transaction, but most client resizes are actually expected since we
request them. We should only need a new transaction when the client
sends us an unexpected size.
This commit is contained in:
Ronan Pigott 2020-11-29 22:34:25 -07:00
parent 1204ee4413
commit 3c85d58f5a
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
sway/desktop/xdg_shell.c
View file

@ -291,20 +291,40 @@ static void handle_commit(struct wl_listener *listener, void *data) {
new_geo.x != view->geometry.x ||
new_geo.y != view->geometry.y;
if (new_size) {
// The view has unexpectedly sent a new size
// Did the view send the size we expect?
bool expected = !new_size;
if (view->container->node.instruction) {
struct sway_container_state *requested =
&view->container->node.instruction->container_state;
expected = requested->content_width == new_geo.width &&
requested->content_height == new_geo.height;
}
if (new_size && expected) {
// The client has resized as requested
memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
transaction_notify_view_ready_by_serial(view,
xdg_surface->configure_serial);
} else if (new_size && !expected) {
// The view has sent an unexpected size
desktop_damage_view(view);
view_update_size(view, new_geo.width, new_geo.height);
memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
desktop_damage_view(view);
transaction_commit_dirty();
}
if (view->container->node.instruction) {
if (view->container->node.instruction) {
// The size is different than requested
transaction_notify_view_ready_by_serial(view,
xdg_surface->configure_serial);
} else {
// The view has resized unprompted
transaction_notify_view_ready_immediately(view);
}
} else if (!new_size && !expected) {
// The view has unexpectedly refused to resize
desktop_damage_view(view);
transaction_notify_view_ready_by_serial(view,
xdg_surface->configure_serial);
} else if (new_size) {
transaction_notify_view_ready_immediately(view);
}
view_damage_from(view);