blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

subcompositor protocol errors

This commit is contained in:
Tony Crisci 2017-09-29 08:58:17 -04:00
parent 93f79378f7
commit 19e30aab9b
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wlr/types/wlr_surface.h
View File

@ -114,4 +114,9 @@ int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
void wlr_surface_make_subsurface(struct wlr_surface *surface, void wlr_surface_make_subsurface(struct wlr_surface *surface,
struct wlr_surface *parent, uint32_t id); struct wlr_surface *parent, uint32_t id);
/**
* Get the top of the subsurface tree for this surface.
*/
struct wlr_surface *wlr_surface_get_main_surface(struct wlr_surface *surface);
#endif #endif

29
types/wlr_compositor.c
View File

@ -84,10 +84,31 @@ static void subcompositor_get_subsurface(struct wl_client *client,
struct wlr_surface *surface = wl_resource_get_user_data(surface_resource); struct wlr_surface *surface = wl_resource_get_user_data(surface_resource);
struct wlr_surface *parent = wl_resource_get_user_data(parent_resource); struct wlr_surface *parent = wl_resource_get_user_data(parent_resource);
// TODO: errors static const char msg[] = "get_subsurface: wl_subsurface@";
// * cannot be its own parent
// * cannot already a subsurface if (surface == parent) {
// * cannot be an ancestor of parent wl_resource_post_error(resource,
WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE,
"%s%d: wl_surface@%d cannot be its own parent",
msg, id, wl_resource_get_id(surface_resource));
return;
}
if (surface->subsurface) {
wl_resource_post_error(resource,
WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE,
"%s%d: wl_surface@%d is already a sub-surface",
msg, id, wl_resource_get_id(surface_resource));
return;
}
if (wlr_surface_get_main_surface(parent) == surface) {
wl_resource_post_error(resource,
WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE,
"%s%d: wl_surface@%d is an ancestor of parent",
msg, id, wl_resource_get_id(surface_resource));
return;
}
if (wlr_surface_set_role(surface, "wl_subsurface", resource, if (wlr_surface_set_role(surface, "wl_subsurface", resource,
WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE) < 0) { WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE) < 0) {

11
types/wlr_surface.c
View File

@ -769,3 +769,14 @@ void wlr_surface_make_subsurface(struct wlr_surface *surface,
surface->subsurface = subsurface; surface->subsurface = subsurface;
} }
struct wlr_surface *wlr_surface_get_main_surface(struct wlr_surface *surface) {
struct wlr_subsurface *sub;
while (surface && (sub = surface->subsurface)) {
surface = sub->parent;
}
return surface;
}