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

xdg-popup: use CONNECT_SIGNAL() macro

Browse source
This commit is contained in:
tokyo4j 2025-05-27 16:11:15 +09:00 • committed by Consolatis
parent aff7cb92e4
commit f4a85860cf
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/xdg-popup.c
View file

@ -70,7 +70,7 @@ popup_unconstrain(struct xdg_popup *popup)
} }
static void static void
handle_xdg_popup_destroy(struct wl_listener *listener, void *data) handle_destroy(struct wl_listener *listener, void *data)
{ {
struct xdg_popup *popup = wl_container_of(listener, popup, destroy); struct xdg_popup *popup = wl_container_of(listener, popup, destroy);
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
@ -88,7 +88,7 @@ handle_xdg_popup_destroy(struct wl_listener *listener, void *data)
} }
static void static void
handle_xdg_popup_commit(struct wl_listener *listener, void *data) handle_commit(struct wl_listener *listener, void *data)
{ {
struct xdg_popup *popup = wl_container_of(listener, popup, commit); struct xdg_popup *popup = wl_container_of(listener, popup, commit);
@ -102,14 +102,14 @@ handle_xdg_popup_commit(struct wl_listener *listener, void *data)
} }
static void static void
handle_xdg_popup_reposition(struct wl_listener *listener, void *data) handle_reposition(struct wl_listener *listener, void *data)
{ {
struct xdg_popup *popup = wl_container_of(listener, popup, reposition); struct xdg_popup *popup = wl_container_of(listener, popup, reposition);
popup_unconstrain(popup); popup_unconstrain(popup);
} }
static void static void
popup_handle_new_xdg_popup(struct wl_listener *listener, void *data) handle_new_popup(struct wl_listener *listener, void *data)
{ {
struct xdg_popup *popup = wl_container_of(listener, popup, new_popup); struct xdg_popup *popup = wl_container_of(listener, popup, new_popup);
struct wlr_xdg_popup *wlr_popup = data; struct wlr_xdg_popup *wlr_popup = data;
@ -130,17 +130,10 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
popup->parent_view = view; popup->parent_view = view;
popup->wlr_popup = wlr_popup; popup->wlr_popup = wlr_popup;
popup->destroy.notify = handle_xdg_popup_destroy; CONNECT_SIGNAL(wlr_popup, popup, destroy);
wl_signal_add(&wlr_popup->events.destroy, &popup->destroy); CONNECT_SIGNAL(wlr_popup->base, popup, new_popup);
CONNECT_SIGNAL(wlr_popup->base->surface, popup, commit);
popup->new_popup.notify = popup_handle_new_xdg_popup; CONNECT_SIGNAL(wlr_popup, popup, reposition);
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
popup->commit.notify = handle_xdg_popup_commit;
wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
popup->reposition.notify = handle_xdg_popup_reposition;
wl_signal_add(&wlr_popup->events.reposition, &popup->reposition);
/* /*
* We must add xdg popups to the scene graph so they get rendered. The * We must add xdg popups to the scene graph so they get rendered. The