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

xdg-shell: add wlr_xdg_toplevel_set_parent 

Co-authored-by: Jason Francis <cycl0ps@tuta.io>
This commit is contained in:
Ilia Bozhinov 2021-01-05 20:14:47 +01:00 committed by Simon Ser
parent bf4e2e0eac
commit 42d033e738
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wlr/types/wlr_xdg_shell.h
View File

@ -309,6 +309,12 @@ uint32_t wlr_xdg_toplevel_set_tiled(struct wlr_xdg_surface *surface,
*/ */
void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface); void wlr_xdg_toplevel_send_close(struct wlr_xdg_surface *surface);
/**
* Sets the parent of this toplevel. Parent can be NULL.
*/
void wlr_xdg_toplevel_set_parent(struct wlr_xdg_surface *surface,
struct wlr_xdg_surface *parent);
/** /**
* Request that this xdg popup closes. * Request that this xdg popup closes.
**/ **/

10
types/xdg_shell/wlr_xdg_toplevel.c
View File

@ -194,16 +194,14 @@ struct wlr_xdg_surface *wlr_xdg_surface_from_toplevel_resource(
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
} }
static void set_parent(struct wlr_xdg_surface *surface,
struct wlr_xdg_surface *parent);
static void handle_parent_unmap(struct wl_listener *listener, void *data) { static void handle_parent_unmap(struct wl_listener *listener, void *data) {
struct wlr_xdg_toplevel *toplevel = struct wlr_xdg_toplevel *toplevel =
wl_container_of(listener, toplevel, parent_unmap); wl_container_of(listener, toplevel, parent_unmap);
set_parent(toplevel->base, toplevel->parent->toplevel->parent); wlr_xdg_toplevel_set_parent(toplevel->base,
toplevel->parent->toplevel->parent);
} }
static void set_parent(struct wlr_xdg_surface *surface, void wlr_xdg_toplevel_set_parent(struct wlr_xdg_surface *surface,
struct wlr_xdg_surface *parent) { struct wlr_xdg_surface *parent) {
assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL); assert(surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
assert(!parent || parent->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL); assert(!parent || parent->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
@ -232,7 +230,7 @@ static void xdg_toplevel_handle_set_parent(struct wl_client *client,
parent = wlr_xdg_surface_from_toplevel_resource(parent_resource); parent = wlr_xdg_surface_from_toplevel_resource(parent_resource);
} }
set_parent(surface, parent); wlr_xdg_toplevel_set_parent(surface, parent);
} }
static void xdg_toplevel_handle_set_title(struct wl_client *client, static void xdg_toplevel_handle_set_title(struct wl_client *client,