isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland-surface: Restructure code flow in wl_surface_attach a bit more...

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-11-25 17:35:44 -05:00
parent ea1b8cdc22
commit 7841042a85
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compositor/meta-surface-actor.c
View File

@ -156,7 +156,11 @@ meta_surface_actor_attach_wayland_buffer (MetaSurfaceActor *self,
{ {
MetaSurfaceActorPrivate *priv = self->priv; MetaSurfaceActorPrivate *priv = self->priv;
priv->buffer = buffer; priv->buffer = buffer;
if (buffer)
meta_shaped_texture_set_texture (self->priv->texture, buffer->texture); meta_shaped_texture_set_texture (self->priv->texture, buffer->texture);
else
meta_shaped_texture_set_texture (self->priv->texture, NULL);
} }
void void

11
src/wayland/meta-wayland-surface.c
View File

@ -286,15 +286,13 @@ toplevel_surface_commit (MetaWaylandSurface *surface)
{ {
ensure_buffer_texture (buffer); ensure_buffer_texture (buffer);
meta_wayland_buffer_reference (&surface->buffer_ref, buffer); meta_wayland_buffer_reference (&surface->buffer_ref, buffer);
meta_surface_actor_attach_wayland_buffer (surface_actor, buffer);
surface_process_damage (surface, surface->pending.damage);
meta_window_set_surface_mapped (window, buffer != NULL); meta_window_set_surface_mapped (window, buffer != NULL);
if (buffer != NULL)
{
meta_surface_actor_attach_wayland_buffer (surface_actor, buffer);
/* We resize X based surfaces according to X events */ /* We resize X based surfaces according to X events */
if (window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND) if (buffer != NULL && window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
{ {
int new_width; int new_width;
int new_height; int new_height;
@ -309,9 +307,6 @@ toplevel_surface_commit (MetaWaylandSurface *surface)
surface->pending.dx, surface->pending.dy); surface->pending.dx, surface->pending.dy);
} }
} }
}
surface_process_damage (surface, surface->pending.damage);
if (surface->pending.opaque_region) if (surface->pending.opaque_region)
meta_surface_actor_set_opaque_region (surface_actor, surface->pending.opaque_region); meta_surface_actor_set_opaque_region (surface_actor, surface->pending.opaque_region);