system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-06 23:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ivi-shell: abort if shell_surface_send_configure is called for non-ivi surfaces

Browse source 
shell_surface_send_configure() should only be called for ivi surfaces. Other (or
no) *configure() calls are needed for other types of surfaces.

Make sure that get_ivi_shell_surface() returns NULL if the surface is not an ivi
surface. And don't ignore wrong surfaces but assert instead to make it obvious
that new surface types need special handling in ivi_layout_surface_set_size().

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
This commit is contained in:
Michael Olbrich 2023-02-07 10:27:16 +01:00
parent b6423e59d9
commit 1c02bdfb8e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ivi-shell/ivi-shell.c
View file

@ -86,7 +86,10 @@ get_ivi_shell_surface(struct weston_surface *surface)
if (desktop_surface)
return weston_desktop_surface_get_user_data(desktop_surface);
return surface->committed_private;
if (surface->committed == ivi_shell_surface_committed)
return surface->committed_private;
return NULL;
}
struct ivi_layout_surface *
@ -108,8 +111,7 @@ shell_surface_send_configure(struct weston_surface *surface,
struct ivi_shell_surface *shsurf;
shsurf = get_ivi_shell_surface(surface);
if (!shsurf)
return;
assert(shsurf);
if (shsurf->resource)
ivi_surface_send_configure(shsurf->resource, width, height);