isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/xdg-shell: Fix top-most check when grabbing

Browse Source 
Move the top-most-popup correctness check to the finish_popup_setup()
function after checking the serial. If we pass the serial check, we
should have reached a state that if there are any popups they should be
the one from the same client.

Also avoid failing a client that correctly set the top-most popup at map
time, but where at the time of processing the top most popup have
already been dismissed by the compositor for some arbitrary reason.

https://bugzilla.gnome.org/show_bug.cgi?id=790358
This commit is contained in:
Jonas Ådahl 2017-11-15 16:02:03 +08:00
parent 4cf340ae9b
commit 5d3b4f0134
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/wayland/meta-wayland-xdg-shell.c
View File

@ -448,7 +448,6 @@ xdg_popup_grab (struct wl_client *client,
META_WAYLAND_XDG_POPUP (wl_resource_get_user_data (resource)); META_WAYLAND_XDG_POPUP (wl_resource_get_user_data (resource));
MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource); MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
MetaWaylandSurface *parent_surface; MetaWaylandSurface *parent_surface;
MetaWaylandSurface *top_popup;
parent_surface = xdg_popup->setup.parent_surface; parent_surface = xdg_popup->setup.parent_surface;
if (!parent_surface) if (!parent_surface)
@ -459,21 +458,6 @@ xdg_popup_grab (struct wl_client *client,
return; return;
} }
top_popup = meta_wayland_pointer_get_top_popup (seat->pointer);
if ((top_popup == NULL &&
!META_IS_WAYLAND_XDG_SURFACE (parent_surface->role)) ||
(top_popup != NULL && parent_surface != top_popup))
{
MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_popup);
struct wl_resource *xdg_shell_resource =
meta_wayland_xdg_surface_get_shell_resource (xdg_surface);
wl_resource_post_error (xdg_shell_resource,
ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP,
"parent not top most surface");
return;
}
xdg_popup->setup.grab_seat = seat; xdg_popup->setup.grab_seat = seat;
xdg_popup->setup.grab_serial = serial; xdg_popup->setup.grab_serial = serial;
} }
@ -794,7 +778,10 @@ scale_placement_rule (MetaPlacementRule *placement_rule,
static void static void
finish_popup_setup (MetaWaylandXdgPopup *xdg_popup) finish_popup_setup (MetaWaylandXdgPopup *xdg_popup)
{ {
MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_popup);
MetaWaylandSurfaceRole *surface_role = META_WAYLAND_SURFACE_ROLE (xdg_popup); MetaWaylandSurfaceRole *surface_role = META_WAYLAND_SURFACE_ROLE (xdg_popup);
struct wl_resource *xdg_shell_resource =
meta_wayland_xdg_surface_get_shell_resource (xdg_surface);
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent_surface; MetaWaylandSurface *parent_surface;
@ -813,11 +800,22 @@ finish_popup_setup (MetaWaylandXdgPopup *xdg_popup)
if (seat) if (seat)
{ {
MetaWaylandSurface *top_popup;
if (!meta_wayland_seat_can_popup (seat, serial)) if (!meta_wayland_seat_can_popup (seat, serial))
{ {
zxdg_popup_v6_send_popup_done (xdg_popup->resource); zxdg_popup_v6_send_popup_done (xdg_popup->resource);
return; return;
} }
top_popup = meta_wayland_pointer_get_top_popup (seat->pointer);
if (top_popup && parent_surface != top_popup)
{
wl_resource_post_error (xdg_shell_resource,
ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP,
"parent not top most surface");
return;
}
} }
xdg_popup->parent_surface = parent_surface; xdg_popup->parent_surface = parent_surface;