mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-08 21:25:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for toplevel capture

Browse source 
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5078
This commit is contained in:
Simon Ser 2025-05-25 19:38:05 +02:00 • committed by Kenny Levinsen
parent eb8acfd7b1
commit 170c9c9525
6 changed files with 60 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/server.h
View file

@ -112,6 +112,9 @@ struct sway_server {
struct wlr_export_dmabuf_manager_v1 *export_dmabuf_manager_v1;
struct wlr_security_context_manager_v1 *security_context_manager_v1;
struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1 *ext_foreign_toplevel_image_capture_source_manager_v1;
struct wl_listener new_foreign_toplevel_capture_request;
struct wlr_xdg_activation_v1 *xdg_activation_v1;
struct wl_listener xdg_activation_v1_request_activate;
struct wl_listener xdg_activation_v1_new_token;

11
include/sway/tree/view.h
View file

@ -69,6 +69,9 @@ struct sway_view {
struct wlr_scene_tree *content_tree;
struct wlr_scene_tree *saved_surface_tree;
struct wlr_scene *image_capture_scene;
struct wlr_ext_image_capture_source_v1 *image_capture_source;
struct sway_container *container; // NULL if unmapped and transactions finished
struct wlr_surface *surface; // NULL for unmapped views
struct sway_xdg_decoration *xdg_decoration;
@ -124,6 +127,8 @@ struct sway_view {
struct sway_xdg_shell_view {
struct sway_view view;
struct wlr_scene_tree *image_capture_tree;
struct wl_listener commit;
struct wl_listener request_move;
struct wl_listener request_resize;
@ -142,6 +147,8 @@ struct sway_xwayland_view {
struct wlr_scene_tree *surface_tree;
struct wlr_scene_surface *image_capture_scene_surface;
struct wl_listener commit;
struct wl_listener request_move;
struct wl_listener request_resize;
@ -192,10 +199,12 @@ struct sway_popup_desc {
struct sway_xdg_popup {
struct sway_view *view;
struct wlr_xdg_popup *wlr_xdg_popup;
struct wlr_scene_tree *scene_tree;
struct wlr_scene_tree *xdg_surface_tree;
struct wlr_xdg_popup *wlr_xdg_popup;
struct wlr_scene_tree *image_capture_tree;
struct sway_popup_desc desc;

16
sway/desktop/xdg_shell.c
View file

@ -20,13 +20,13 @@
static struct sway_xdg_popup *popup_create(
struct wlr_xdg_popup *wlr_popup, struct sway_view *view,
struct wlr_scene_tree *parent);
struct wlr_scene_tree *parent, struct wlr_scene_tree *image_capture_parent);
static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
struct sway_xdg_popup *popup =
wl_container_of(listener, popup, new_popup);
struct wlr_xdg_popup *wlr_popup = data;
popup_create(wlr_popup, popup->view, popup->xdg_surface_tree);
popup_create(wlr_popup, popup->view, popup->xdg_surface_tree, popup->image_capture_tree);
}
static void popup_handle_destroy(struct wl_listener *listener, void *data) {
@ -77,7 +77,8 @@ static void popup_handle_reposition(struct wl_listener *listener, void *data) {
}
static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
struct sway_view *view, struct wlr_scene_tree *parent) {
struct sway_view *view, struct wlr_scene_tree *parent,
struct wlr_scene_tree *image_capture_parent) {
struct wlr_xdg_surface *xdg_surface = wlr_popup->base;
struct sway_xdg_popup *popup = calloc(1, sizeof(struct sway_xdg_popup));
@ -113,6 +114,11 @@ static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
return NULL;
}
popup->image_capture_tree = wlr_scene_xdg_surface_create(image_capture_parent, xdg_surface);
if (popup->image_capture_tree == NULL) {
return NULL;
}
popup->wlr_xdg_popup = xdg_surface->popup;
struct sway_xdg_shell_view *shell_view =
wl_container_of(view, shell_view, view);
@ -359,7 +365,7 @@ static void handle_new_popup(struct wl_listener *listener, void *data) {
struct wlr_xdg_popup *wlr_popup = data;
struct sway_xdg_popup *popup = popup_create(wlr_popup,
&xdg_shell_view->view, root->layers.popup);
&xdg_shell_view->view, root->layers.popup, xdg_shell_view->image_capture_tree);
if (!popup) {
return;
}
@ -570,6 +576,8 @@ void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data) {
wl_signal_add(&xdg_toplevel->events.destroy, &xdg_shell_view->destroy);
wlr_scene_xdg_surface_create(xdg_shell_view->view.content_tree, xdg_toplevel->base);
xdg_shell_view->image_capture_tree =
wlr_scene_xdg_surface_create(&xdg_shell_view->view.image_capture_scene->tree, xdg_toplevel->base);
xdg_toplevel->base->data = xdg_shell_view;
}

6
sway/desktop/xwayland.c
View file

@ -497,6 +497,9 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
wl_list_remove(&xwayland_view->commit.link);
wl_list_remove(&xwayland_view->surface_tree_destroy.link);
wlr_scene_node_destroy(&xwayland_view->image_capture_scene_surface->buffer->node);
xwayland_view->image_capture_scene_surface = NULL;
if (xwayland_view->surface_tree) {
wlr_scene_node_destroy(&xwayland_view->surface_tree->node);
xwayland_view->surface_tree = NULL;
@ -537,6 +540,9 @@ static void handle_map(struct wl_listener *listener, void *data) {
&xwayland_view->surface_tree_destroy);
}
xwayland_view->image_capture_scene_surface =
wlr_scene_surface_create(&xwayland_view->view.image_capture_scene->tree, xsurface->surface);
transaction_commit_dirty();
}

22
sway/server.c
View file

@ -232,6 +232,21 @@ static void handle_renderer_lost(struct wl_listener *listener, void *data) {
server->recreating_renderer = wl_event_loop_add_idle(server->wl_event_loop, do_renderer_recreate, server);
}
static void handle_new_foreign_toplevel_capture_request(struct wl_listener *listener, void *data) {
struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request *request = data;
struct sway_view *view = request->toplevel_handle->data;
if (view->image_capture_source == NULL) {
view->image_capture_source = wlr_ext_image_capture_source_v1_create_with_scene_node(
&view->image_capture_scene->tree.node, server.wl_event_loop, server.allocator, server.renderer);
if (view->image_capture_source == NULL) {
return;
}
}
wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_accept(request, view->image_capture_source);
}
bool server_init(struct sway_server *server) {
sway_log(SWAY_DEBUG, "Initializing Wayland server");
server->wl_display = wl_display_create();
@ -395,6 +410,12 @@ bool server_init(struct sway_server *server) {
wlr_content_type_manager_v1_create(server->wl_display, 1);
wlr_fractional_scale_manager_v1_create(server->wl_display, 1);
server->ext_foreign_toplevel_image_capture_source_manager_v1 =
wlr_ext_foreign_toplevel_image_capture_source_manager_v1_create(server->wl_display, 1);
server->new_foreign_toplevel_capture_request.notify = handle_new_foreign_toplevel_capture_request;
wl_signal_add(&server->ext_foreign_toplevel_image_capture_source_manager_v1->events.new_request,
&server->new_foreign_toplevel_capture_request);
server->tearing_control_v1 =
wlr_tearing_control_manager_v1_create(server->wl_display, 1);
server->tearing_control_new_object.notify = handle_new_tearing_hint;
@ -488,6 +509,7 @@ void server_fini(struct sway_server *server) {
wl_list_remove(&server->xdg_activation_v1_request_activate.link);
wl_list_remove(&server->xdg_activation_v1_new_token.link);
wl_list_remove(&server->request_set_cursor_shape.link);
wl_list_remove(&server->new_foreign_toplevel_capture_request.link);
input_manager_finish(server->input);
// TODO: free sway-specific resources

7
sway/tree/view.c
View file

@ -49,6 +49,11 @@ bool view_init(struct sway_view *view, enum sway_view_type type,
failed = true;
}
view->image_capture_scene = wlr_scene_create();
if (view->image_capture_scene == NULL) {
failed = true;
}
if (failed) {
wlr_scene_node_destroy(&view->scene_tree->node);
return false;
@ -81,6 +86,7 @@ void view_destroy(struct sway_view *view) {
list_free(view->executed_criteria);
view_assign_ctx(view, NULL);
wlr_scene_node_destroy(&view->image_capture_scene->tree.node);
wlr_scene_node_destroy(&view->scene_tree->node);
if (view->impl->destroy) {
view->impl->destroy(view);
@ -815,6 +821,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
};
view->ext_foreign_toplevel =
wlr_ext_foreign_toplevel_handle_v1_create(server.foreign_toplevel_list, &foreign_toplevel_state);
view->ext_foreign_toplevel->data = view;
view->foreign_toplevel =
wlr_foreign_toplevel_handle_v1_create(server.foreign_toplevel_manager);