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: use new lifecycle events

Browse source
This commit is contained in:
Simon Ser 2024-02-16 16:48:25 +01:00
parent 7cc49d2292
commit 874a4a1e79
4 changed files with 66 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cage.c
View file

@ -404,8 +404,10 @@ main(int argc, char *argv[])
ret = 1; ret = 1;
goto end; goto end;
} }
server.new_xdg_shell_surface.notify = handle_xdg_shell_surface_new; server.new_xdg_toplevel.notify = handle_new_xdg_toplevel;
wl_signal_add(&xdg_shell->events.new_surface, &server.new_xdg_shell_surface); wl_signal_add(&xdg_shell->events.new_toplevel, &server.new_xdg_toplevel);
server.new_xdg_popup.notify = handle_new_xdg_popup;
wl_signal_add(&xdg_shell->events.new_popup, &server.new_xdg_popup);
struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager = struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager =
wlr_xdg_decoration_manager_v1_create(server.wl_display); wlr_xdg_decoration_manager_v1_create(server.wl_display);

3
server.h
View file

@ -44,7 +44,8 @@ struct cg_server {
struct wl_listener output_layout_change; struct wl_listener output_layout_change;
struct wl_listener xdg_toplevel_decoration; struct wl_listener xdg_toplevel_decoration;
struct wl_listener new_xdg_shell_surface; struct wl_listener new_xdg_toplevel;
struct wl_listener new_xdg_popup;
struct wl_listener new_virtual_keyboard; struct wl_listener new_virtual_keyboard;
struct wl_listener new_virtual_pointer; struct wl_listener new_virtual_pointer;

117
xdg_shell.c
View file

@ -221,72 +221,71 @@ static const struct cg_view_impl xdg_shell_view_impl = {
}; };
void void
handle_xdg_shell_surface_new(struct wl_listener *listener, void *data) handle_new_xdg_toplevel(struct wl_listener *listener, void *data)
{ {
struct cg_server *server = wl_container_of(listener, server, new_xdg_shell_surface); struct cg_server *server = wl_container_of(listener, server, new_xdg_toplevel);
struct wlr_xdg_surface *xdg_surface = data; struct wlr_xdg_toplevel *toplevel = data;
switch (xdg_surface->role) { struct cg_xdg_shell_view *xdg_shell_view = calloc(1, sizeof(struct cg_xdg_shell_view));
if (!xdg_shell_view) {
wlr_log(WLR_ERROR, "Failed to allocate XDG Shell view");
return;
}
view_init(&xdg_shell_view->view, server, CAGE_XDG_SHELL_VIEW, &xdg_shell_view_impl);
xdg_shell_view->xdg_toplevel = toplevel;
xdg_shell_view->map.notify = handle_xdg_shell_surface_map;
wl_signal_add(&toplevel->base->surface->events.map, &xdg_shell_view->map);
xdg_shell_view->unmap.notify = handle_xdg_shell_surface_unmap;
wl_signal_add(&toplevel->base->surface->events.unmap, &xdg_shell_view->unmap);
xdg_shell_view->destroy.notify = handle_xdg_shell_surface_destroy;
wl_signal_add(&toplevel->events.destroy, &xdg_shell_view->destroy);
xdg_shell_view->request_fullscreen.notify = handle_xdg_shell_surface_request_fullscreen;
wl_signal_add(&toplevel->events.request_fullscreen, &xdg_shell_view->request_fullscreen);
toplevel->base->data = xdg_shell_view;
}
void
handle_new_xdg_popup(struct wl_listener *listener, void *data)
{
struct cg_server *server = wl_container_of(listener, server, new_xdg_popup);
struct wlr_xdg_popup *popup = data;
struct cg_view *view = popup_get_view(popup);
if (view == NULL) {
return;
}
struct wlr_scene_tree *parent_scene_tree = NULL;
struct wlr_xdg_surface *parent = wlr_xdg_surface_try_from_wlr_surface(popup->parent);
if (parent == NULL) {
return;
}
switch (parent->role) {
case WLR_XDG_SURFACE_ROLE_TOPLEVEL:; case WLR_XDG_SURFACE_ROLE_TOPLEVEL:;
struct cg_xdg_shell_view *xdg_shell_view = calloc(1, sizeof(struct cg_xdg_shell_view)); parent_scene_tree = view->scene_tree;
if (!xdg_shell_view) {
wlr_log(WLR_ERROR, "Failed to allocate XDG Shell view");
return;
}
view_init(&xdg_shell_view->view, server, CAGE_XDG_SHELL_VIEW, &xdg_shell_view_impl);
xdg_shell_view->xdg_toplevel = xdg_surface->toplevel;
xdg_shell_view->map.notify = handle_xdg_shell_surface_map;
wl_signal_add(&xdg_surface->surface->events.map, &xdg_shell_view->map);
xdg_shell_view->unmap.notify = handle_xdg_shell_surface_unmap;
wl_signal_add(&xdg_surface->surface->events.unmap, &xdg_shell_view->unmap);
xdg_shell_view->destroy.notify = handle_xdg_shell_surface_destroy;
wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_view->destroy);
xdg_shell_view->request_fullscreen.notify = handle_xdg_shell_surface_request_fullscreen;
wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen, &xdg_shell_view->request_fullscreen);
xdg_surface->data = xdg_shell_view;
break; break;
case WLR_XDG_SURFACE_ROLE_POPUP:; case WLR_XDG_SURFACE_ROLE_POPUP:
struct wlr_xdg_popup *popup = xdg_surface->popup; parent_scene_tree = parent->data;
struct cg_view *view = popup_get_view(popup);
if (view == NULL) {
return;
}
struct wlr_scene_tree *parent_scene_tree = NULL;
struct wlr_xdg_surface *parent = wlr_xdg_surface_try_from_wlr_surface(popup->parent);
if (parent == NULL) {
return;
}
switch (parent->role) {
case WLR_XDG_SURFACE_ROLE_TOPLEVEL:;
parent_scene_tree = view->scene_tree;
break;
case WLR_XDG_SURFACE_ROLE_POPUP:
parent_scene_tree = parent->data;
break;
case WLR_XDG_SURFACE_ROLE_NONE:
break;
}
if (parent_scene_tree == NULL) {
return;
}
struct wlr_scene_tree *popup_scene_tree = wlr_scene_xdg_surface_create(parent_scene_tree, xdg_surface);
if (popup_scene_tree == NULL) {
wlr_log(WLR_ERROR, "Failed to allocate scene-graph node for XDG popup");
return;
}
popup_unconstrain(view, popup);
xdg_surface->data = popup_scene_tree;
break; break;
case WLR_XDG_SURFACE_ROLE_NONE: case WLR_XDG_SURFACE_ROLE_NONE:
assert(false); // unreachable break;
} }
if (parent_scene_tree == NULL) {
return;
}
struct wlr_scene_tree *popup_scene_tree = wlr_scene_xdg_surface_create(parent_scene_tree, popup->base);
if (popup_scene_tree == NULL) {
wlr_log(WLR_ERROR, "Failed to allocate scene-graph node for XDG popup");
return;
}
popup_unconstrain(view, popup);
popup->base->data = popup_scene_tree;
} }
void void

3
xdg_shell.h
View file

@ -24,7 +24,8 @@ struct cg_xdg_decoration {
struct wl_listener request_mode; struct wl_listener request_mode;
}; };
void handle_xdg_shell_surface_new(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_xdg_toplevel_decoration(struct wl_listener *listener, void *data); void handle_xdg_toplevel_decoration(struct wl_listener *listener, void *data);