mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clients/desktop-shell: avoid invalid sized panel

Browse Source 
If for some reason the desktop-shell plugin would configure a panel with
an invalid size, just destroy the whole panel and forget about it for
this wl_output.

A following patch will cause desktop-shell to configure 0x0 panel when
it deems the panel redundant.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen
2017-12-07 12:39:15 +02:00
parent cb11538049
commit 1cbfcf49a7
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/desktop-shell.c
+18 -2
View File
@@ -96,6 +96,9 @@ struct output;
struct panel { struct panel {
struct surface base; struct surface base;
struct output *owner;
struct window *window; struct window *window;
struct widget *widget; struct widget *widget;
struct wl_list launcher_list; struct wl_list launcher_list;
@@ -525,6 +528,9 @@ panel_resize_handler(struct widget *widget,
x, y, w + 1, h + 1); x, y, w + 1, h + 1);
} }
static void
panel_destroy(struct panel *panel);
static void static void
panel_configure(void *data, panel_configure(void *data,
struct weston_desktop_shell *desktop_shell, struct weston_desktop_shell *desktop_shell,
@@ -534,6 +540,15 @@ panel_configure(void *data,
struct desktop *desktop = data; struct desktop *desktop = data;
struct surface *surface = window_get_user_data(window); struct surface *surface = window_get_user_data(window);
struct panel *panel = container_of(surface, struct panel, base); struct panel *panel = container_of(surface, struct panel, base);
struct output *owner;
if (width < 1 || height < 1) {
/* Shell plugin configures 0x0 for redundant panel. */
owner = panel->owner;
panel_destroy(panel);
owner->panel = NULL;
return;
}
switch (desktop->panel_position) { switch (desktop->panel_position) {
case WESTON_DESKTOP_SHELL_PANEL_POSITION_TOP: case WESTON_DESKTOP_SHELL_PANEL_POSITION_TOP:
@@ -593,13 +608,14 @@ panel_destroy(struct panel *panel)
} }
static struct panel * static struct panel *
panel_create(struct desktop *desktop) panel_create(struct desktop *desktop, struct output *output)
{ {
struct panel *panel; struct panel *panel;
struct weston_config_section *s; struct weston_config_section *s;
panel = xzalloc(sizeof *panel); panel = xzalloc(sizeof *panel);
panel->owner = output;
panel->base.configure = panel_configure; panel->base.configure = panel_configure;
panel->window = window_create_custom(desktop->display); panel->window = window_create_custom(desktop->display);
panel->widget = window_add_widget(panel->window, panel); panel->widget = window_add_widget(panel->window, panel);
@@ -1277,7 +1293,7 @@ output_init(struct output *output, struct desktop *desktop)
struct wl_surface *surface; struct wl_surface *surface;
if (desktop->want_panel) { if (desktop->want_panel) {
output->panel = panel_create(desktop); output->panel = panel_create(desktop, output);
surface = window_get_wl_surface(output->panel->window); surface = window_get_wl_surface(output->panel->window);
weston_desktop_shell_set_panel(desktop->shell, weston_desktop_shell_set_panel(desktop->shell,
output->output, surface); output->output, surface);