From cd1204f71f7222ea896c94bea3194d3b220845be Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sun, 8 Oct 2017 16:49:37 -0400 Subject: wl-shell: render popups in the right place --- include/wlr/types/wlr_wl_shell.h | 6 ++++- rootston/output.c | 32 ++++++++++++++++++++--- types/wlr_wl_shell.c | 55 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 84 insertions(+), 9 deletions(-) diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index 0db99989..ae30f5c4 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -18,7 +18,6 @@ struct wlr_wl_shell { }; struct wlr_wl_shell_surface_transient_state { - struct wlr_wl_shell_surface *parent; int32_t x; int32_t y; enum wl_shell_surface_transient flags; @@ -55,6 +54,10 @@ struct wlr_wl_shell_surface { struct wl_listener surface_destroy_listener; + struct wlr_wl_shell_surface *parent; + struct wl_list child_link; + struct wl_list children; // transient and popups + struct { struct wl_signal destroy; struct wl_signal ping_timeout; @@ -108,5 +111,6 @@ void wlr_wl_shell_surface_ping(struct wlr_wl_shell_surface *surface); void wlr_wl_shell_surface_configure(struct wlr_wl_shell_surface *surface, enum wl_shell_surface_resize edges, int32_t width, int32_t height); void wlr_wl_shell_surface_popup_done(struct wlr_wl_shell_surface *surface); +bool wlr_wl_shell_surface_is_transient(struct wlr_wl_shell_surface *surface); #endif diff --git a/rootston/output.c b/rootston/output.c index d1b2c7de..90ba1eb7 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -97,13 +97,39 @@ static void render_xdg_v6_popups(struct wlr_xdg_surface_v6 *surface, } } +static void render_wl_shell_surface(struct wlr_wl_shell_surface *surface, struct roots_desktop *desktop, + struct wlr_output *wlr_output, struct timespec *when, double lx, + double ly, float rotation, bool is_child) { + if (is_child || !wlr_wl_shell_surface_is_transient(surface)) { + render_surface(surface->surface, desktop, wlr_output, when, + lx, ly, rotation); + struct wlr_wl_shell_surface *child; + wl_list_for_each(child, &surface->children, child_link) { + render_wl_shell_surface(child, desktop, wlr_output, when, + lx + child->transient_state->x, + ly + child->transient_state->y, + rotation, true); + } + } +} + static void render_view(struct roots_view *view, struct roots_desktop *desktop, struct wlr_output *wlr_output, struct timespec *when) { - render_surface(view->wlr_surface, desktop, wlr_output, when, - view->x, view->y, view->rotation); - if (view->type == ROOTS_XDG_SHELL_V6_VIEW) { + switch (view->type) { + case ROOTS_XDG_SHELL_V6_VIEW: + render_surface(view->wlr_surface, desktop, wlr_output, when, + view->x, view->y, view->rotation); render_xdg_v6_popups(view->xdg_surface_v6, desktop, wlr_output, when, view->x, view->y, view->rotation); + break; + case ROOTS_WL_SHELL_VIEW: + render_wl_shell_surface(view->wl_shell_surface, desktop, wlr_output, + when, view->x, view->y, view->rotation, false); + break; + case ROOTS_XWAYLAND_VIEW: + render_surface(view->wlr_surface, desktop, wlr_output, when, + view->x, view->y, view->rotation); + break; } } diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index e1507e2f..209bf302 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -93,22 +93,53 @@ static void shell_surface_set_toplevel(struct wl_client *client, NULL); } +static void shell_surface_set_parent(struct wlr_wl_shell_surface *surface, + struct wlr_wl_shell_surface *parent) { + assert(surface); + surface->parent = parent; + wl_list_remove(&surface->child_link); + wl_list_init(&surface->child_link); + if (parent) { + wl_list_insert(&parent->children, &surface->child_link); + } +} + +static struct wlr_wl_shell_surface *shell_get_shell_surface(struct wlr_wl_shell *shell, + struct wlr_surface *surface) { + if (surface) { + struct wlr_wl_shell_surface *wl_surface; + wl_list_for_each(wl_surface, &shell->surfaces, link) { + if (wl_surface->surface == surface) { + return wl_surface; + } + } + } + return NULL; +} + static void shell_surface_set_transient(struct wl_client *client, struct wl_resource *resource, struct wl_resource *parent_resource, int32_t x, int32_t y, enum wl_shell_surface_transient flags) { wlr_log(L_DEBUG, "got shell surface transient"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); - struct wlr_wl_shell_surface *parent = + struct wlr_surface *parent = wl_resource_get_user_data(parent_resource); // TODO: check if parent_resource == NULL? + struct wlr_wl_shell_surface *wl_parent = shell_get_shell_surface(surface->shell, parent); + + if (!wl_parent) { + return; + } + struct wlr_wl_shell_surface_transient_state *transient_state = calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); if (transient_state == NULL) { wl_client_post_no_memory(client); return; } - transient_state->parent = parent; + + shell_surface_set_parent(surface, wl_parent); transient_state->x = x; transient_state->y = y; transient_state->flags = flags; @@ -158,9 +189,10 @@ static void shell_surface_set_popup(struct wl_client *client, struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_seat_handle *seat_handle = wl_resource_get_user_data(seat_resource); - struct wlr_wl_shell_surface *parent = + struct wlr_surface *parent = wl_resource_get_user_data(parent_resource); - // TODO: check if parent_resource == NULL? + + struct wlr_wl_shell_surface *wl_parent = shell_get_shell_surface(surface->shell, parent); struct wlr_wl_shell_surface_transient_state *transient_state = calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); @@ -168,7 +200,7 @@ static void shell_surface_set_popup(struct wl_client *client, wl_client_post_no_memory(client); return; } - transient_state->parent = parent; + shell_surface_set_parent(surface, wl_parent); transient_state->x = x; transient_state->y = y; transient_state->flags = flags; @@ -263,6 +295,13 @@ struct wl_shell_surface_interface shell_surface_interface = { static void wl_shell_surface_destroy(struct wlr_wl_shell_surface *surface) { wl_signal_emit(&surface->events.destroy, surface); wl_resource_set_user_data(surface->resource, NULL); + + struct wlr_wl_shell_surface *child; + wl_list_for_each(child, &surface->children, child_link) { + shell_surface_set_parent(child, NULL); + } + wl_list_remove(&surface->child_link); + wl_list_remove(&surface->link); wl_list_remove(&surface->surface_destroy_listener.link); wl_event_source_remove(surface->ping_timer); @@ -311,6 +350,8 @@ static void wl_shell_get_shell_surface(struct wl_client *client, wl_client_post_no_memory(client); return; } + wl_list_init(&wl_surface->child_link); + wl_list_init(&wl_surface->children); wl_surface->shell = wl_shell; wl_surface->client = client; @@ -430,3 +471,7 @@ void wlr_wl_shell_surface_configure(struct wlr_wl_shell_surface *surface, void wlr_wl_shell_surface_popup_done(struct wlr_wl_shell_surface *surface) { wl_shell_surface_send_popup_done(surface->resource); } + +bool wlr_wl_shell_surface_is_transient(struct wlr_wl_shell_surface *surface) { + return surface->parent != NULL; +} -- cgit v1.2.3