mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-popup: validate positioner on reposition request

Browse source 
(cherry picked from commit 1e58e4006d)
This commit is contained in:
Kirill Primak 2024-06-11 11:37:41 +03:00 • committed by Simon Zeni
parent 9915b1c3ee
commit 388af6a62b
3 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/types/wlr_xdg_shell.h
View file

@ -36,4 +36,9 @@ struct wlr_xdg_toplevel_configure *send_xdg_toplevel_configure(
void handle_xdg_toplevel_ack_configure(struct wlr_xdg_toplevel *toplevel, void handle_xdg_toplevel_ack_configure(struct wlr_xdg_toplevel *toplevel,
struct wlr_xdg_toplevel_configure *configure); struct wlr_xdg_toplevel_configure *configure);
/**
* Returns true if a positioner is complete.
*/
bool wlr_xdg_positioner_is_complete(struct wlr_xdg_positioner *positioner);
#endif #endif

18
types/xdg_shell/wlr_xdg_popup.c
View file

@ -323,8 +323,13 @@ static void xdg_popup_handle_reposition(
return; return;
} }
struct wlr_xdg_positioner *positioner = struct wlr_xdg_positioner *positioner = wlr_xdg_positioner_from_resource(positioner_resource);
wlr_xdg_positioner_from_resource(positioner_resource); if (!wlr_xdg_positioner_is_complete(positioner)) {
wl_resource_post_error(popup->base->client->resource,
XDG_WM_BASE_ERROR_INVALID_POSITIONER, "positioner object is not complete");
return;
}
wlr_xdg_positioner_rules_get_geometry( wlr_xdg_positioner_rules_get_geometry(
&positioner->rules, &popup->scheduled.geometry); &positioner->rules, &popup->scheduled.geometry);
popup->scheduled.rules = positioner->rules; popup->scheduled.rules = positioner->rules;
@ -367,14 +372,11 @@ static void xdg_popup_handle_resource_destroy(struct wl_resource *resource) {
wlr_xdg_popup_destroy(popup); wlr_xdg_popup_destroy(popup);
} }
void create_xdg_popup(struct wlr_xdg_surface *surface, void create_xdg_popup(struct wlr_xdg_surface *surface, struct wlr_xdg_surface *parent,
struct wlr_xdg_surface *parent,
struct wlr_xdg_positioner *positioner, uint32_t id) { struct wlr_xdg_positioner *positioner, uint32_t id) {
if (positioner->rules.size.width == 0 || if (!wlr_xdg_positioner_is_complete(positioner)) {
positioner->rules.anchor_rect.width == 0) {
wl_resource_post_error(surface->client->resource, wl_resource_post_error(surface->client->resource,
XDG_WM_BASE_ERROR_INVALID_POSITIONER, XDG_WM_BASE_ERROR_INVALID_POSITIONER, "positioner object is not complete");
"positioner object is not complete");
return; return;
} }

5
types/xdg_shell/wlr_xdg_positioner.c
View file

@ -203,6 +203,11 @@ static uint32_t xdg_positioner_gravity_to_wlr_edges(
return xdg_positioner_anchor_to_wlr_edges((enum xdg_positioner_anchor)gravity); return xdg_positioner_anchor_to_wlr_edges((enum xdg_positioner_anchor)gravity);
} }
bool wlr_xdg_positioner_is_complete(struct wlr_xdg_positioner *positioner) {
struct wlr_xdg_positioner_rules *rules = &positioner->rules;
return rules->size.width > 0 && rules->anchor_rect.width > 0;
}
void wlr_xdg_positioner_rules_get_geometry( void wlr_xdg_positioner_rules_get_geometry(
const struct wlr_xdg_positioner_rules *rules, struct wlr_box *box) { const struct wlr_xdg_positioner_rules *rules, struct wlr_box *box) {
box->x = rules->offset.x; box->x = rules->offset.x;