diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-03-10 11:50:41 +0100 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-06-26 00:08:11 +0200 |
| commit | c84423baeaf669d80a87121d1aceb4cade85ce8f (patch) | |
| tree | fcc379e82515c430893fda66b4e48044a4d15254 | |
| parent | ee58911912d88caacf340a5cb6a9e25fcba24996 (diff) | |
| download | weston-c84423baeaf669d80a87121d1aceb4cade85ce8f.tar.gz | |
libweston-desktop/xdg_shell_v6: Send error on wrongly-sized buffer
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | libweston-desktop/xdg-shell-v6.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/libweston-desktop/xdg-shell-v6.c b/libweston-desktop/xdg-shell-v6.c index 7d0bd8e4..600723eb 100644 --- a/libweston-desktop/xdg-shell-v6.c +++ b/libweston-desktop/xdg-shell-v6.c @@ -625,7 +625,6 @@ weston_desktop_xdg_toplevel_committed(struct weston_desktop_xdg_toplevel *toplev { struct weston_surface *wsurface = weston_desktop_surface_get_surface(toplevel->base.desktop_surface); - bool reconfigure = false; if (!wsurface->buffer_ref.buffer && !toplevel->added) { 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) return; - if (toplevel->next_state.maximized || toplevel->next_state.fullscreen) - reconfigure = - ( ( toplevel->requested_size.width != wsurface->width ) || - ( toplevel->requested_size.height != wsurface->height ) ); - - if (reconfigure) { - weston_desktop_xdg_surface_schedule_configure(&toplevel->base); - } else { - 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); + if ((toplevel->next_state.maximized || toplevel->next_state.fullscreen) && + (toplevel->requested_size.width != wsurface->width || + 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); + + wl_resource_post_error(client_resource, + ZXDG_SHELL_V6_ERROR_INVALID_SURFACE_STATE, + "xdg_surface buffer does not match the configured state"); + return; } + + 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 |