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

libweston-desktop/xdg_shell_v6: Send error on wrongly-sized buffer

Browse Source 
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Quentin Glidic
2017-03-10 11:50:41 +01:00
parent ee58911912
commit c84423baea
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston-desktop/xdg-shell-v6.c
+19 -15
View File
@@ -625,7 +625,6 @@ weston_desktop_xdg_toplevel_committed(struct weston_desktop_xdg_toplevel *toplev
{ {
struct weston_surface *wsurface = struct weston_surface *wsurface =
weston_desktop_surface_get_surface(toplevel->base.desktop_surface); weston_desktop_surface_get_surface(toplevel->base.desktop_surface);
bool reconfigure = false;
if (!wsurface->buffer_ref.buffer && !toplevel->added) { if (!wsurface->buffer_ref.buffer && !toplevel->added) {
weston_desktop_xdg_toplevel_ensure_added(toplevel); weston_desktop_xdg_toplevel_ensure_added(toplevel);
@@ -634,22 +633,27 @@ weston_desktop_xdg_toplevel_committed(struct weston_desktop_xdg_toplevel *toplev
if (!wsurface->buffer_ref.buffer) if (!wsurface->buffer_ref.buffer)
return; return;
if (toplevel->next_state.maximized || toplevel->next_state.fullscreen) if ((toplevel->next_state.maximized || toplevel->next_state.fullscreen) &&
reconfigure = (toplevel->requested_size.width != wsurface->width ||
( ( toplevel->requested_size.width != wsurface->width ) || toplevel->requested_size.height != wsurface->height)) {
( toplevel->requested_size.height != wsurface->height ) ); struct weston_desktop_client *client =
weston_desktop_surface_get_client(toplevel->base.desktop_surface);
struct wl_resource *client_resource =
weston_desktop_client_get_resource(client);
if (reconfigure) { wl_resource_post_error(client_resource,
weston_desktop_xdg_surface_schedule_configure(&toplevel->base); ZXDG_SHELL_V6_ERROR_INVALID_SURFACE_STATE,
} else { "xdg_surface buffer does not match the configured state");
toplevel->state = toplevel->next_state; return;
toplevel->min_size = toplevel->next_min_size;
toplevel->max_size = toplevel->next_max_size;
weston_desktop_api_committed(toplevel->base.desktop,
toplevel->base.desktop_surface,
sx, sy);
} }
toplevel->state = toplevel->next_state;
toplevel->min_size = toplevel->next_min_size;
toplevel->max_size = toplevel->next_max_size;
weston_desktop_api_committed(toplevel->base.desktop,
toplevel->base.desktop_surface,
sx, sy);
} }
static void static void