blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1548 from emersion/error-invalid-transform 

surface: error out on invalid transform
This commit is contained in:
Drew DeVault 2019-02-15 15:28:00 +01:00 committed by GitHub
parent b59370088e d238cc9f56
commit 8b203c28f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
types/wlr_surface.c
View File

@ -450,15 +450,20 @@ static void surface_commit(struct wl_client *client,
} }
static void surface_set_buffer_transform(struct wl_client *client, static void surface_set_buffer_transform(struct wl_client *client,
struct wl_resource *resource, int transform) { struct wl_resource *resource, int32_t transform) {
if (transform < WL_OUTPUT_TRANSFORM_NORMAL ||
transform > WL_OUTPUT_TRANSFORM_FLIPPED_270) {
wl_resource_post_error(resource, WL_SURFACE_ERROR_INVALID_TRANSFORM,
"Specified transform value (%d) is invalid", transform);
return;
}
struct wlr_surface *surface = wlr_surface_from_resource(resource); struct wlr_surface *surface = wlr_surface_from_resource(resource);
surface->pending.committed |= WLR_SURFACE_STATE_TRANSFORM; surface->pending.committed |= WLR_SURFACE_STATE_TRANSFORM;
surface->pending.transform = transform; surface->pending.transform = transform;
} }
static void surface_set_buffer_scale(struct wl_client *client, static void surface_set_buffer_scale(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *resource, int32_t scale) {
int32_t scale) {
if (scale <= 0) { if (scale <= 0) {
wl_resource_post_error(resource, WL_SURFACE_ERROR_INVALID_SCALE, wl_resource_post_error(resource, WL_SURFACE_ERROR_INVALID_SCALE,
"Specified scale value (%d) is not positive", scale); "Specified scale value (%d) is not positive", scale);