From 1a0239e40ffc945b55a4f3218ae9a41ce0f143e3 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 7 Dec 2017 11:54:11 +0200 Subject: [PATCH] desktop-shell: handle redundant panels If for some reason the helper client weston-desktop-shell would create more than one panel surface for the same weston_output, this code would corrupt the surface destroy listener list by adding a link already in one list into another list. Instead, do not store the new, redundant panel surface and do not subscribe to its destruction. Also, tell the helper that the surface is redundant by configuring it with a 0x0 size, so that we don't waste memory on a panel that is never used. (Clone mode is a valid reason why weston-desktop-shell could do that.) Signed-off-by: Pekka Paalanen Reviewed-by: Daniel Stone --- desktop-shell/shell.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 18d8855..1c35d18 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3068,16 +3068,25 @@ desktop_shell_set_panel(struct wl_client *client, weston_surface_set_label_func(surface, panel_get_label); surface->output = weston_output_from_resource(output_resource); view->output = surface->output; - weston_desktop_shell_send_configure(resource, 0, - surface_resource, - surface->output->width, - surface->output->height); sh_output = find_shell_output_from_weston_output(shell, surface->output); - sh_output->panel_surface = surface; + if (sh_output->panel_surface) { + /* The output already has a panel, tell our helper + * there is no need for another one. */ + weston_desktop_shell_send_configure(resource, 0, + surface_resource, + 0, 0); + } else { + weston_desktop_shell_send_configure(resource, 0, + surface_resource, + surface->output->width, + surface->output->height); - sh_output->panel_surface_listener.notify = handle_panel_surface_destroy; - wl_signal_add(&surface->destroy_signal, &sh_output->panel_surface_listener); + sh_output->panel_surface = surface; + + sh_output->panel_surface_listener.notify = handle_panel_surface_destroy; + wl_signal_add(&surface->destroy_signal, &sh_output->panel_surface_listener); + } } static int -- 2.7.4