mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-positioner: use enum_is_valid functions

Browse source 
Signed-off-by: xurui <xurui@kylinos.cn>
This commit is contained in:
xurui 2024-10-23 18:46:16 +08:00
parent 527b77b445
commit 0d467ef9aa
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
types/xdg_shell/wlr_xdg_positioner.c
View file

@ -52,7 +52,8 @@ static void xdg_positioner_handle_set_anchor(struct wl_client *client,
struct wlr_xdg_positioner *positioner = struct wlr_xdg_positioner *positioner =
wlr_xdg_positioner_from_resource(resource); wlr_xdg_positioner_from_resource(resource);
if (anchor > XDG_POSITIONER_ANCHOR_BOTTOM_RIGHT) { uint32_t version = wl_resource_get_version(resource);
if (!xdg_positioner_anchor_is_valid(anchor, version)) {
wl_resource_post_error(resource, wl_resource_post_error(resource,
XDG_POSITIONER_ERROR_INVALID_INPUT, XDG_POSITIONER_ERROR_INVALID_INPUT,
"invalid anchor value"); "invalid anchor value");
@ -67,7 +68,8 @@ static void xdg_positioner_handle_set_gravity(struct wl_client *client,
struct wlr_xdg_positioner *positioner = struct wlr_xdg_positioner *positioner =
wlr_xdg_positioner_from_resource(resource); wlr_xdg_positioner_from_resource(resource);
if (gravity > XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT) { uint32_t version = wl_resource_get_version(resource);
if (!xdg_positioner_gravity_is_valid(gravity, version)) {
wl_resource_post_error(resource, wl_resource_post_error(resource,
XDG_POSITIONER_ERROR_INVALID_INPUT, XDG_POSITIONER_ERROR_INVALID_INPUT,
"invalid gravity value"); "invalid gravity value");
@ -83,6 +85,14 @@ static void xdg_positioner_handle_set_constraint_adjustment(
struct wlr_xdg_positioner *positioner = struct wlr_xdg_positioner *positioner =
wlr_xdg_positioner_from_resource(resource); wlr_xdg_positioner_from_resource(resource);
uint32_t version = wl_resource_get_version(resource);
if (!xdg_positioner_constraint_adjustment_is_valid(constraint_adjustment, version)) {
wl_resource_post_error(resource,
XDG_POSITIONER_ERROR_INVALID_INPUT,
"invalid constraint_adjustment value");
return;
}
positioner->rules.constraint_adjustment = constraint_adjustment; positioner->rules.constraint_adjustment = constraint_adjustment;
} }