compositor: send error for surface role resets
With the more accurate definition of wl_surface roles in Wayland,
enforce the restriction: a role is always set permanently, and
attempting to change it is a protocol error.
This patch is based on Jasper's patch:
http://lists.freedesktop.org/archives/wayland-devel/2014-August/016811.html
The difference in this patch compared to his are:
- send role errors on the interface whose request triggers it, not on
wl_surface
- an interface could have several requests assigning different roles,
cannot use wl_interface as the unique key; use an arbitary string
instead
- ensure in window-manager.c that create_shell_surface() ->
create_common_surface() is never called with surface->configure set,
to avoid compositor abort
- use wl_resource_post_no_memory() where appropriate instead of
hand-rolling it with wl_resource_post_error()
Ideally we would not add weston_surface::role_name field, but use
weston_surface::configure. At the moment this is not possible though,
because at least shell.c uses several different roles with the same
configure function. Drag'n'drop uses two configure functions for the
same role. The configure hook is also reset in several places,
which is not good for role tracking.
This patch overlooks the wl_surface roles assigned in privileged
extensions: screensaver, panel, background, lock, input panel.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 810961f..9fafb39 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3463,10 +3463,7 @@
{
struct shell_surface *shsurf;
- if (surface->configure) {
- weston_log("surface->configure already set\n");
- return NULL;
- }
+ assert(surface->configure == NULL);
shsurf = calloc(1, sizeof *shsurf);
if (!shsurf) {
@@ -3579,18 +3576,13 @@
struct desktop_shell *shell = sc->shell;
struct shell_surface *shsurf;
- if (get_shell_surface(surface)) {
- wl_resource_post_error(surface_resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "desktop_shell::get_shell_surface already requested");
+ if (weston_surface_set_role(surface, "wl_shell_surface",
+ resource, WL_SHELL_ERROR_ROLE) < 0)
return;
- }
shsurf = create_common_surface(sc, shell, surface, &shell_client);
if (!shsurf) {
- wl_resource_post_error(surface_resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "surface->configure already set");
+ wl_resource_post_no_memory(surface_resource);
return;
}
@@ -3899,18 +3891,13 @@
struct desktop_shell *shell = sc->shell;
struct shell_surface *shsurf;
- if (get_shell_surface(surface)) {
- wl_resource_post_error(surface_resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "xdg_shell::get_xdg_surface already requested");
+ if (weston_surface_set_role(surface, "xdg_surface",
+ resource, XDG_SHELL_ERROR_ROLE) < 0)
return;
- }
shsurf = create_xdg_surface(sc, shell, surface, &xdg_client);
if (!shsurf) {
- wl_resource_post_error(surface_resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "surface->configure already set");
+ wl_resource_post_no_memory(surface_resource);
return;
}
@@ -3997,12 +3984,9 @@
struct weston_surface *parent;
struct shell_seat *seat;
- if (get_shell_surface(surface)) {
- wl_resource_post_error(surface_resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "xdg_shell::get_xdg_popup already requested");
+ if (weston_surface_set_role(surface, "xdg_popup",
+ resource, XDG_SHELL_ERROR_ROLE) < 0)
return;
- }
if (!parent_resource) {
wl_resource_post_error(surface_resource,
@@ -4017,9 +4001,7 @@
shsurf = create_xdg_popup(sc, shell, surface, &xdg_popup_client,
parent, seat, serial, x, y);
if (!shsurf) {
- wl_resource_post_error(surface_resource,
- WL_DISPLAY_ERROR_INVALID_OBJECT,
- "surface->configure already set");
+ wl_resource_post_no_memory(surface_resource);
return;
}