isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-02 04:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Always set the new buffer on the surface on commit

Browse Source 
Even when it doesn't have a role.

This fixes cursors not quite working right, as they're a "detached"
surface without a role since nobody called set_cursor on them yet.
This commit is contained in:
Jasper St. Pierre 2014-04-11 23:29:05 -07:00
parent f0bf9c7fc3
commit dbe4fc0e45
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,20 +145,10 @@ ensure_buffer_texture (MetaWaylandBuffer *buffer)
buffer->texture = texture; buffer->texture = texture;
} }
static void
commit_attached_buffer (MetaWaylandSurface *surface,
MetaWaylandDoubleBufferedState *pending)
{
if (pending->newly_attached)
surface_set_buffer (surface, pending->buffer);
}
static void static void
cursor_surface_commit (MetaWaylandSurface *surface, cursor_surface_commit (MetaWaylandSurface *surface,
MetaWaylandDoubleBufferedState *pending) MetaWaylandDoubleBufferedState *pending)
{ {
commit_attached_buffer (surface, pending);
if (pending->newly_attached) if (pending->newly_attached)
meta_wayland_seat_update_cursor_surface (surface->compositor->seat); meta_wayland_seat_update_cursor_surface (surface->compositor->seat);
} }
@ -169,8 +159,6 @@ actor_surface_commit (MetaWaylandSurface *surface,
{ {
MetaSurfaceActor *surface_actor = surface->surface_actor; MetaSurfaceActor *surface_actor = surface->surface_actor;
commit_attached_buffer (surface, pending);
if (pending->newly_attached && pending->buffer) if (pending->newly_attached && pending->buffer)
{ {
ensure_buffer_texture (pending->buffer); ensure_buffer_texture (pending->buffer);
@ -356,6 +344,9 @@ commit_double_buffered_state (MetaWaylandSurface *surface,
{ {
MetaWaylandCompositor *compositor = surface->compositor; MetaWaylandCompositor *compositor = surface->compositor;
if (pending->newly_attached)
surface_set_buffer (surface, pending->buffer);
if (surface == compositor->seat->cursor_surface) if (surface == compositor->seat->cursor_surface)
cursor_surface_commit (surface, pending); cursor_surface_commit (surface, pending);
else if (surface->window) else if (surface->window)