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

wayland: Use surface role when special casing surface commits

Browse Source 
Lets use the role when doing role specific commit actions. The
conditions effectively do that anyway, and this way we will get a
compiler warning here whenever we add a new role, as well as we avoid
having different variants of role-determination checks in different
places.

https://bugzilla.gnome.org/show_bug.cgi?id=744453
This commit is contained in:
Jonas Ådahl 2015-02-05 18:50:27 +08:00
parent bede9970de
commit 6ec7fa2cbd
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/meta-wayland-surface.c
View File

@ -528,14 +528,25 @@ apply_pending_state (MetaWaylandSurface *surface,
wl_list_insert_list (&compositor->frame_callbacks, &pending->frame_callback_list); wl_list_insert_list (&compositor->frame_callbacks, &pending->frame_callback_list);
wl_list_init (&pending->frame_callback_list); wl_list_init (&pending->frame_callback_list);
if (surface == compositor->seat->pointer.cursor_surface) switch (surface->role)
cursor_surface_commit (surface, pending); {
else if (meta_wayland_data_device_is_dnd_surface (&compositor->seat->data_device, surface)) case META_WAYLAND_SURFACE_ROLE_NONE:
dnd_surface_commit (surface, pending); break;
else if (surface->window) case META_WAYLAND_SURFACE_ROLE_CURSOR:
toplevel_surface_commit (surface, pending); cursor_surface_commit (surface, pending);
else if (surface->wl_subsurface) break;
subsurface_surface_commit (surface, pending); case META_WAYLAND_SURFACE_ROLE_DND:
dnd_surface_commit (surface, pending);
break;
case META_WAYLAND_SURFACE_ROLE_XDG_SURFACE:
case META_WAYLAND_SURFACE_ROLE_XDG_POPUP:
case META_WAYLAND_SURFACE_ROLE_WL_SHELL_SURFACE:
toplevel_surface_commit (surface, pending);
break;
case META_WAYLAND_SURFACE_ROLE_SUBSURFACE:
subsurface_surface_commit (surface, pending);
break;
}
pending_state_reset (pending); pending_state_reset (pending);