mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle popups under xdg-toplevels in xdg-popup.c

Browse source 
...to make it easier to deal them separetely from layer-shell popups
This commit is contained in:
Johan Malm 2022-02-20 13:14:10 +00:00
parent 177c130183
commit 9fed8e0998
2 changed files with 65 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/xdg-popup.c
View file

@ -4,11 +4,24 @@
* *
* This file is only needed in support of * This file is only needed in support of
* - unconstraining XDG popups * - unconstraining XDG popups
* - keeping non-layer-shell xdg-popups outside the layers.c code
*/ */
#include "labwc.h" #include "labwc.h"
/* TODO: surely this ought to just move to xdg.c now??? */ struct view_child {
struct wlr_surface *surface;
struct view *parent;
};
struct xdg_popup {
struct view_child view_child;
struct wlr_xdg_popup *wlr_popup;
struct wl_listener destroy;
struct wl_listener new_popup;
};
static void static void
popup_unconstrain(struct view *view, struct wlr_xdg_popup *popup) popup_unconstrain(struct view *view, struct wlr_xdg_popup *popup)
{ {
@ -30,8 +43,56 @@ popup_unconstrain(struct view *view, struct wlr_xdg_popup *popup)
wlr_xdg_popup_unconstrain_from_box(popup, &output_toplevel_box); wlr_xdg_popup_unconstrain_from_box(popup, &output_toplevel_box);
} }
static void
handle_xdg_popup_destroy(struct wl_listener *listener, void *data)
{
struct xdg_popup *popup = wl_container_of(listener, popup, destroy);
wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link);
free(popup);
}
static void
popup_handle_new_xdg_popup(struct wl_listener *listener, void *data)
{
struct xdg_popup *popup = wl_container_of(listener, popup, new_popup);
struct wlr_xdg_popup *wlr_popup = data;
xdg_popup_create(popup->view_child.parent, wlr_popup);
}
void void
xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup) xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
{ {
struct xdg_popup *popup = calloc(1, sizeof(struct xdg_popup));
if (!popup) {
return;
}
popup->wlr_popup = wlr_popup;
popup->view_child.parent = view;
popup->view_child.surface = wlr_popup->base->surface;
popup->destroy.notify = handle_xdg_popup_destroy;
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
popup->new_popup.notify = popup_handle_new_xdg_popup;
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
/*
* We must add xdg popups to the scene graph so they get rendered. The
* wlroots scene graph provides a helper for this, but to use it we must
* provide the proper parent scene node of the xdg popup. To enable
* this, we always set the user data field of xdg_surfaces to the
* corresponding scene node.
*/
if (!wlr_surface_is_xdg_surface(wlr_popup->parent)) {
wlr_log(WLR_ERROR, "xdg_surface is not xdg");
return;
}
struct wlr_xdg_surface *parent =
wlr_xdg_surface_from_wlr_surface(wlr_popup->parent);
struct wlr_scene_node *parent_node = parent->surface->data;
wlr_popup->base->surface->data =
wlr_scene_xdg_surface_create(parent_node, wlr_popup->base);
popup_unconstrain(view, wlr_popup); popup_unconstrain(view, wlr_popup);
} }

17
src/xdg.c
View file

@ -372,24 +372,13 @@ xdg_surface_new(struct wl_listener *listener, void *data)
struct wlr_xdg_surface *xdg_surface = data; struct wlr_xdg_surface *xdg_surface = data;
/* /*
* We must add xdg popups to the scene graph so they get rendered. The * We deal with popups in xdg-popup.c and layers.c as they have to be
* wlroots scene graph provides a helper for this, but to use it we must * treated differently
* provide the proper parent scene node of the xdg popup. To enable
* this, we always set the user data field of xdg_surfaces to the
* corresponding scene node.
*/ */
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
struct wlr_xdg_surface *parent =
wlr_xdg_surface_from_wlr_surface(
xdg_surface->popup->parent);
struct wlr_scene_node *parent_node = parent->surface->data;
xdg_surface->surface->data =
wlr_scene_xdg_surface_create(parent_node, xdg_surface);
/* TODO: unconstrain here rather than in xdg-popup.c? */
return; return;
} }
/* WLR_XDG_SURFACE_ROLE_TOPLEVEL */
wlr_xdg_surface_ping(xdg_surface); wlr_xdg_surface_ping(xdg_surface);
struct view *view = calloc(1, sizeof(struct view)); struct view *view = calloc(1, sizeof(struct view));