mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg_shell: wait for initial commit to unconstrain popups

Browse source
This commit is contained in:
Simon Ser 2024-08-30 18:50:11 +02:00
parent 412c11ea91
commit f0651c7671
2 changed files with 53 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

55
xdg_shell.c
View file

@ -85,8 +85,13 @@ popup_get_view(struct wlr_xdg_popup *popup)
} }
static void static void
popup_unconstrain(struct cg_view *view, struct wlr_xdg_popup *popup) popup_unconstrain(struct wlr_xdg_popup *popup)
{ {
struct cg_view *view = popup_get_view(popup);
if (view == NULL) {
return;
}
struct cg_server *server = view->server; struct cg_server *server = view->server;
struct wlr_box *popup_box = &popup->current.geometry; struct wlr_box *popup_box = &popup->current.geometry;
@ -283,19 +288,38 @@ handle_new_xdg_toplevel(struct wl_listener *listener, void *data)
toplevel->base->data = xdg_shell_view; toplevel->base->data = xdg_shell_view;
} }
static void
popup_handle_destroy(struct wl_listener *listener, void *data)
{
struct cg_xdg_popup *popup = wl_container_of(listener, popup, destroy);
wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->commit.link);
free(popup);
}
static void
popup_handle_commit(struct wl_listener *listener, void *data)
{
struct cg_xdg_popup *popup = wl_container_of(listener, popup, commit);
if (popup->xdg_popup->base->initial_commit) {
popup_unconstrain(popup->xdg_popup);
}
}
void void
handle_new_xdg_popup(struct wl_listener *listener, void *data) handle_new_xdg_popup(struct wl_listener *listener, void *data)
{ {
struct cg_server *server = wl_container_of(listener, server, new_xdg_popup); struct cg_server *server = wl_container_of(listener, server, new_xdg_popup);
struct wlr_xdg_popup *popup = data; struct wlr_xdg_popup *wlr_popup = data;
struct cg_view *view = popup_get_view(popup); struct cg_view *view = popup_get_view(wlr_popup);
if (view == NULL) { if (view == NULL) {
return; return;
} }
struct wlr_scene_tree *parent_scene_tree = NULL; struct wlr_scene_tree *parent_scene_tree = NULL;
struct wlr_xdg_surface *parent = wlr_xdg_surface_try_from_wlr_surface(popup->parent); struct wlr_xdg_surface *parent = wlr_xdg_surface_try_from_wlr_surface(wlr_popup->parent);
if (parent == NULL) { if (parent == NULL) {
return; return;
} }
@ -313,15 +337,28 @@ handle_new_xdg_popup(struct wl_listener *listener, void *data)
return; return;
} }
struct wlr_scene_tree *popup_scene_tree = wlr_scene_xdg_surface_create(parent_scene_tree, popup->base); struct cg_xdg_popup *popup = calloc(1, sizeof(*popup));
if (popup_scene_tree == NULL) { if (popup == NULL) {
wlr_log(WLR_ERROR, "Failed to allocate scene-graph node for XDG popup"); wlr_log(WLR_ERROR, "Failed to allocate popup");
return; return;
} }
popup_unconstrain(view, popup); popup->xdg_popup = wlr_popup;
popup->base->data = popup_scene_tree; popup->destroy.notify = popup_handle_destroy;
wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
popup->commit.notify = popup_handle_commit;
wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
struct wlr_scene_tree *popup_scene_tree = wlr_scene_xdg_surface_create(parent_scene_tree, wlr_popup->base);
if (popup_scene_tree == NULL) {
wlr_log(WLR_ERROR, "Failed to allocate scene-graph node for XDG popup");
free(popup);
return;
}
wlr_popup->base->data = popup_scene_tree;
} }
void void

7
xdg_shell.h
View file

@ -26,6 +26,13 @@ struct cg_xdg_decoration {
struct wl_listener request_mode; struct wl_listener request_mode;
}; };
struct cg_xdg_popup {
struct wlr_xdg_popup *xdg_popup;
struct wl_listener destroy;
struct wl_listener commit;
};
void handle_new_xdg_toplevel(struct wl_listener *listener, void *data); void handle_new_xdg_toplevel(struct wl_listener *listener, void *data);
void handle_new_xdg_popup(struct wl_listener *listener, void *data); void handle_new_xdg_popup(struct wl_listener *listener, void *data);