mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-shell: use wlr_surface_synced for popups

Browse source
This commit is contained in:
Simon Ser 2023-12-08 12:16:12 +01:00
parent 9201431c29
commit 4b3553409a
4 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
types/xdg_shell/wlr_xdg_popup.c
View file

@ -236,16 +236,16 @@ static struct wlr_xdg_popup_grab *get_xdg_shell_popup_grab_from_seat(
return xdg_grab;
}
void handle_xdg_popup_committed(struct wlr_xdg_popup *popup) {
void handle_xdg_popup_client_commit(struct wlr_xdg_popup *popup) {
if (!popup->parent) {
wl_resource_post_error(popup->base->resource,
XDG_SURFACE_ERROR_NOT_CONSTRUCTED,
"xdg_popup has no parent");
return;
}
}
popup->current = popup->pending;
void handle_xdg_popup_committed(struct wlr_xdg_popup *popup) {
if (popup->base->initial_commit && !popup->sent_initial_configure) {
wlr_xdg_surface_schedule_configure(popup->base);
popup->sent_initial_configure = true;
@ -358,6 +358,10 @@ static const struct xdg_popup_interface xdg_popup_implementation = {
.reposition = xdg_popup_handle_reposition,
};
static const struct wlr_surface_synced_impl surface_synced_impl = {
.state_size = sizeof(struct wlr_xdg_popup_state),
};
static void xdg_popup_handle_resource_destroy(struct wl_resource *resource) {
struct wlr_xdg_popup *popup =
wlr_xdg_popup_from_resource(resource);
@ -396,14 +400,17 @@ void create_xdg_popup(struct wlr_xdg_surface *surface,
}
surface->popup->base = surface;
if (!wlr_surface_synced_init(&surface->popup->synced, surface->surface,
&surface_synced_impl, &surface->popup->pending,
&surface->popup->current)) {
goto error_popup;
}
surface->popup->resource = wl_resource_create(
surface->client->client, &xdg_popup_interface,
wl_resource_get_version(surface->resource), id);
if (surface->popup->resource == NULL) {
free(surface->popup);
surface->popup = NULL;
wl_resource_post_no_memory(surface->resource);
return;
goto error_synced;
}
wl_resource_set_implementation(surface->popup->resource,
&xdg_popup_implementation, surface->popup,
@ -429,6 +436,15 @@ void create_xdg_popup(struct wlr_xdg_surface *surface,
set_xdg_surface_role_object(surface, surface->popup->resource);
wl_signal_emit_mutable(&surface->client->shell->events.new_popup, surface->popup);
return;
error_synced:
wlr_surface_synced_finish(&surface->popup->synced);
error_popup:
free(surface->popup);
surface->popup = NULL;
wl_resource_post_no_memory(surface->resource);
}
void reset_xdg_popup(struct wlr_xdg_popup *popup) {
@ -465,6 +481,7 @@ void destroy_xdg_popup(struct wlr_xdg_popup *popup) {
wl_signal_emit_mutable(&popup->events.destroy, NULL);
wlr_surface_synced_finish(&popup->synced);
popup->base->popup = NULL;
wl_list_remove(&popup->link);
wl_resource_set_user_data(popup->resource, NULL);

3
types/xdg_shell/wlr_xdg_surface.c
View file

@ -284,6 +284,9 @@ static void xdg_surface_role_client_commit(struct wlr_surface *wlr_surface) {
}
break;
case WLR_XDG_SURFACE_ROLE_POPUP:
if (surface->popup != NULL) {
handle_xdg_popup_client_commit(surface->popup);
}
break;
}
}