Send an invalid_parent error when the client tries to create a popup with a paren that is neither a xdg_surface nor a xdg_popup.
Signed-off-by: Jonas Ådahl <[email protected]> --- desktop-shell/shell.c | 11 ++++++++++- protocol/xdg-shell.xml | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 6697222..57f7335 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -4092,12 +4092,21 @@ create_xdg_popup(struct shell_client *owner, void *shell, uint32_t serial, int32_t x, int32_t y) { - struct shell_surface *shsurf; + struct shell_surface *shsurf, *parent_shsurf; /* Verify that we are creating the top most popup when mapping, * as its not until then we know whether it was mapped as most * top level or not. */ + parent_shsurf = get_shell_surface(parent); + if (!shell_surface_is_xdg_popup(parent_shsurf) && + !shell_surface_is_xdg_surface(parent_shsurf)) { + wl_resource_post_error(owner->resource, + XDG_POPUP_ERROR_INVALID_PARENT, + "xdg_popup parent was invalid"); + return NULL; + } + shsurf = create_common_surface(owner, shell, surface, client); if (!shsurf) return NULL; diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml index 360179d..14165dc 100644 --- a/protocol/xdg-shell.xml +++ b/protocol/xdg-shell.xml @@ -402,7 +402,8 @@ <description summary="xdg_popup error values"> These errors can be emitted in response to xdg_popup requests. </description> - <entry name="not_the_topmost_popup" value="0" summary="The client tried to destroy a non-toplevel popup"/> + <entry name="not_the_topmost_popup" value="0" summary="The client tried to map or destroy a non-toplevel popup"/> + <entry name="invalid_parent" value="1" summary="The client specified an invalid parent surface"/> </enum> <request name="destroy" type="destructor"> -- 2.1.0 _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
