sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

MetaWindowActor: fix updates with multiple size changes in one frame

Browse source 
We must set x11_size_changed even if we are frozen, as every window
size change makes the X server drop the pixmap, and we might lose
the information at the next thaw() if the window changes size
twice in one frame (so we would keep drawing with the old pixmap
until something else causes another resize)
This commit is contained in:
Giovanni Campagna 2013-09-25 19:16:08 +02:00
parent ce5e0b20b5
commit e965cf32d4
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/compositor/meta-window-actor.c
View file

@ -1473,6 +1473,22 @@ meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;
MetaRectangle window_rect; MetaRectangle window_rect;
meta_window_get_input_rect (priv->window, &window_rect);
/* When running as a display server we catch size changes when new
buffers are attached */
if (!meta_is_wayland_compositor ())
{
if (priv->last_width != window_rect.width ||
priv->last_height != window_rect.height)
{
priv->x11_size_changed = TRUE;
priv->last_width = window_rect.width;
priv->last_height = window_rect.height;
}
}
/* Normally we want freezing a window to also freeze its position; this allows /* Normally we want freezing a window to also freeze its position; this allows
* windows to atomically move and resize together, either under app control, * windows to atomically move and resize together, either under app control,
* or because the user is resizing from the left/top. But on initial placement * or because the user is resizing from the left/top. But on initial placement
@ -1483,22 +1499,12 @@ meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
if (is_frozen (self) && !did_placement) if (is_frozen (self) && !did_placement)
return; return;
meta_window_get_input_rect (priv->window, &window_rect);
/* When running as a display server then we instead catch size changes when
* new buffers are attached */
if (!meta_is_wayland_compositor ()) if (!meta_is_wayland_compositor ())
{ {
if (priv->last_width != window_rect.width || if (priv->x11_size_changed)
priv->last_height != window_rect.height)
{ {
priv->x11_size_changed = TRUE;
meta_window_actor_queue_create_x11_pixmap (self); meta_window_actor_queue_create_x11_pixmap (self);
meta_window_actor_update_shape (self); meta_window_actor_update_shape (self);
priv->last_width = window_rect.width;
priv->last_height = window_rect.height;
} }
} }