236e9ec68f
When deciding if `configure` event should be sent, `meta_window_wayland_move_resize_internal` compares requested window size with `window->rect` size. However, `window->rect` is only updated when `commit` is received. So the following sequence produces incorrect result: 1. a window initially has size `size1` 2. `move_resize_internal` is called with `size2`. `configure` is sent 3. `move_resize_internal` is called with `size1` to restore original size, but `commit` for `size2` haven't arrived yet. So `window->rect` still has size `size1`, and thus new `configure` is not sent 4. `commit` for `size2` arrives, window changes size to `size2` Expected window size in the end: `size1` Actual: `size2` To fix the issue, take size from pending `configure` events into account. Fixes https://gitlab.gnome.org/GNOME/mutter/-/issues/1627 Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1755>
141 lines
4.0 KiB
C
141 lines
4.0 KiB
C
/*
|
|
* Copyright (C) 2019 Red Hat
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
* 02111-1307, USA.
|
|
*
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "wayland/meta-wayland-window-configuration.h"
|
|
|
|
#include "wayland/meta-window-wayland.h"
|
|
|
|
static uint32_t global_serial_counter = 0;
|
|
|
|
static gboolean
|
|
is_window_size_fixed (MetaWindow *window)
|
|
{
|
|
if (meta_window_is_fullscreen (window))
|
|
return TRUE;
|
|
|
|
if (meta_window_get_maximized (window) |
|
|
(META_MAXIMIZE_VERTICAL | META_MAXIMIZE_VERTICAL))
|
|
return TRUE;
|
|
|
|
if (meta_window_get_tile_mode (window) != META_TILE_NONE)
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
MetaWaylandWindowConfiguration *
|
|
meta_wayland_window_configuration_new (MetaWindow *window,
|
|
int x,
|
|
int y,
|
|
int width,
|
|
int height,
|
|
int scale,
|
|
MetaMoveResizeFlags flags,
|
|
MetaGravity gravity)
|
|
{
|
|
MetaWaylandWindowConfiguration *configuration;
|
|
MetaWindowWayland *wl_window = META_WINDOW_WAYLAND (window);
|
|
int pending_width;
|
|
int pending_height;
|
|
|
|
meta_window_wayland_get_pending_size (wl_window,
|
|
&pending_width,
|
|
&pending_height);
|
|
|
|
configuration = g_new0 (MetaWaylandWindowConfiguration, 1);
|
|
*configuration = (MetaWaylandWindowConfiguration) {
|
|
.serial = ++global_serial_counter,
|
|
|
|
.scale = scale,
|
|
.gravity = gravity,
|
|
.flags = flags,
|
|
};
|
|
|
|
if (flags & META_MOVE_RESIZE_MOVE_ACTION ||
|
|
window->rect.x != x ||
|
|
window->rect.y != y)
|
|
{
|
|
configuration->has_position = TRUE;
|
|
configuration->x = x;
|
|
configuration->y = y;
|
|
}
|
|
|
|
if (flags & META_MOVE_RESIZE_RESIZE_ACTION ||
|
|
is_window_size_fixed (window) ||
|
|
pending_width != width ||
|
|
pending_height != height)
|
|
{
|
|
configuration->has_size = TRUE;
|
|
configuration->width = width;
|
|
configuration->height = height;
|
|
}
|
|
|
|
return configuration;
|
|
}
|
|
|
|
MetaWaylandWindowConfiguration *
|
|
meta_wayland_window_configuration_new_relative (int rel_x,
|
|
int rel_y,
|
|
int width,
|
|
int height,
|
|
int scale)
|
|
{
|
|
MetaWaylandWindowConfiguration *configuration;
|
|
|
|
configuration = g_new0 (MetaWaylandWindowConfiguration, 1);
|
|
*configuration = (MetaWaylandWindowConfiguration) {
|
|
.serial = ++global_serial_counter,
|
|
|
|
.has_relative_position = TRUE,
|
|
.rel_x = rel_x,
|
|
.rel_y = rel_y,
|
|
|
|
.has_size = TRUE,
|
|
.width = width,
|
|
.height = height,
|
|
|
|
.scale = scale,
|
|
};
|
|
|
|
return configuration;
|
|
}
|
|
|
|
MetaWaylandWindowConfiguration *
|
|
meta_wayland_window_configuration_new_empty (void)
|
|
{
|
|
MetaWaylandWindowConfiguration *configuration;
|
|
|
|
configuration = g_new0 (MetaWaylandWindowConfiguration, 1);
|
|
*configuration = (MetaWaylandWindowConfiguration) {
|
|
.serial = ++global_serial_counter,
|
|
.scale = 1,
|
|
};
|
|
|
|
return configuration;
|
|
}
|
|
|
|
void
|
|
meta_wayland_window_configuration_free (MetaWaylandWindowConfiguration *configuration)
|
|
{
|
|
g_free (configuration);
|
|
}
|