brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window-wayland: Clean up code that pends moves

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-27 17:47:40 +02:00
parent 57037a45b8
commit e6558f838e
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/wayland/window-wayland.c
View File

@ -160,7 +160,7 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
MetaMoveResizeResultFlags *result) MetaMoveResizeResultFlags *result)
{ {
MetaWindowWayland *wl_window = META_WINDOW_WAYLAND (window); MetaWindowWayland *wl_window = META_WINDOW_WAYLAND (window);
gboolean should_move = FALSE; gboolean can_move_now;
g_assert (window->frame == NULL); g_assert (window->frame == NULL);
@ -201,16 +201,12 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
/* This is a commit of an attach. We should move the window to match the /* This is a commit of an attach. We should move the window to match the
* new position the client wants. */ * new position the client wants. */
should_move = TRUE; can_move_now = TRUE;
} }
if (constrained_rect.width != window->rect.width || if (constrained_rect.width != window->rect.width ||
constrained_rect.height != window->rect.height) constrained_rect.height != window->rect.height)
{ {
wl_window->has_pending_move = TRUE;
wl_window->pending_move_x = constrained_rect.x;
wl_window->pending_move_y = constrained_rect.y;
wl_window->last_sent_width = constrained_rect.width; wl_window->last_sent_width = constrained_rect.width;
wl_window->last_sent_height = constrained_rect.height; wl_window->last_sent_height = constrained_rect.height;
@ -218,15 +214,18 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
constrained_rect.width, constrained_rect.width,
constrained_rect.height, constrained_rect.height,
&wl_window->pending_configure_serial); &wl_window->pending_configure_serial);
/* We need to wait until the resize completes before we can move */
can_move_now = FALSE;
} }
else else
{ {
/* We're just moving the window, so we don't need to wait for a configure /* We're just moving the window, so we don't need to wait for a configure
* and then ack to simply move the window. */ * and then ack to simply move the window. */
should_move = TRUE; can_move_now = TRUE;
} }
if (should_move) if (can_move_now)
{ {
int new_x = constrained_rect.x; int new_x = constrained_rect.x;
int new_y = constrained_rect.y; int new_y = constrained_rect.y;
@ -248,6 +247,18 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
window->buffer_rect.y = new_buffer_y; window->buffer_rect.y = new_buffer_y;
} }
} }
else
{
int new_x = constrained_rect.x;
int new_y = constrained_rect.y;
if (new_x != window->rect.x || new_y != window->rect.y)
{
wl_window->has_pending_move = TRUE;
wl_window->pending_move_x = new_x;
wl_window->pending_move_y = new_y;
}
}
} }
static void static void