From 6fcd702c9791fc89591057a84e78da18060667bf Mon Sep 17 00:00:00 2001 From: Alexander Orzechowski Date: Sat, 21 May 2022 14:09:01 -0400 Subject: [PATCH] scene_graph: Port xwayland --- include/sway/output.h | 6 ---- include/sway/scene_descriptor.h | 1 + include/sway/tree/root.h | 7 ++-- include/sway/tree/view.h | 6 ++-- sway/desktop/output.c | 17 ---------- sway/desktop/xwayland.c | 58 +++++++++++++-------------------- sway/input/cursor.c | 5 +++ sway/tree/root.c | 3 -- 8 files changed, 34 insertions(+), 69 deletions(-) diff --git a/include/sway/output.h b/include/sway/output.h index 3411f0247..739ded61a 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -143,12 +143,6 @@ void output_view_for_each_popup_surface(struct sway_output *output, struct sway_view *view, sway_surface_iterator_func_t iterator, void *user_data); -#if HAVE_XWAYLAND -void output_unmanaged_for_each_surface(struct sway_output *output, - struct wl_list *unmanaged, sway_surface_iterator_func_t iterator, - void *user_data); -#endif - void output_for_each_workspace(struct sway_output *output, void (*f)(struct sway_workspace *ws, void *data), void *data); diff --git a/include/sway/scene_descriptor.h b/include/sway/scene_descriptor.h index 746ae7d8b..f750d4fdf 100644 --- a/include/sway/scene_descriptor.h +++ b/include/sway/scene_descriptor.h @@ -7,6 +7,7 @@ enum sway_scene_descriptor_type { SWAY_SCENE_DESC_NON_INTERACTIVE, SWAY_SCENE_DESC_CONTAINER, SWAY_SCENE_DESC_LAYER_SHELL, + SWAY_SCENE_DESC_XWAYLAND_UNMANAGED, SWAY_SCENE_DESC_POPUP, SWAY_SCENE_DESC_DRAG_ICON, }; diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h index 389bdad09..50ce6010d 100644 --- a/include/sway/tree/root.h +++ b/include/sway/tree/root.h @@ -42,16 +42,15 @@ struct sway_root { struct wlr_scene_tree *shell_top; struct wlr_scene_tree *fullscreen; struct wlr_scene_tree *fullscreen_global; +#if HAVE_XWAYLAND + struct wlr_scene_tree *unmanaged; +#endif struct wlr_scene_tree *shell_overlay; struct wlr_scene_tree *popup; struct wlr_scene_tree *seat; struct wlr_scene_tree *session_lock; } layers; -#if HAVE_XWAYLAND - struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link -#endif - // Includes disabled outputs struct wl_list all_outputs; // sway_output::link diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index f1c1ee087..bdb356280 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -146,6 +146,8 @@ struct sway_xdg_shell_view { struct sway_xwayland_view { struct sway_view view; + struct wlr_scene_surface *surface_scene; + struct wl_listener commit; struct wl_listener request_move; struct wl_listener request_resize; @@ -168,14 +170,12 @@ struct sway_xwayland_view { struct sway_xwayland_unmanaged { struct wlr_xwayland_surface *wlr_xwayland_surface; - struct wl_list link; - int lx, ly; + struct wlr_scene_surface *surface_scene; struct wl_listener request_activate; struct wl_listener request_configure; struct wl_listener request_fullscreen; - struct wl_listener commit; struct wl_listener set_geometry; struct wl_listener map; struct wl_listener unmap; diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 0932e5b97..b11dc3c79 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -169,23 +169,6 @@ void output_view_for_each_popup_surface(struct sway_output *output, view_for_each_popup_surface(view, output_for_each_surface_iterator, &data); } -#if HAVE_XWAYLAND -void output_unmanaged_for_each_surface(struct sway_output *output, - struct wl_list *unmanaged, sway_surface_iterator_func_t iterator, - void *user_data) { - struct sway_xwayland_unmanaged *unmanaged_surface; - wl_list_for_each(unmanaged_surface, unmanaged, link) { - struct wlr_xwayland_surface *xsurface = - unmanaged_surface->wlr_xwayland_surface; - double ox = unmanaged_surface->lx - output->lx; - double oy = unmanaged_surface->ly - output->ly; - - output_surface_for_each_surface(output, xsurface->surface, ox, oy, - iterator, user_data); - } -} -#endif - static int scale_length(int length, int offset, float scale) { return round((offset + length) * scale) - round(offset * scale); } diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 7453c07d6..e7891ea1b 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -5,15 +5,16 @@ #include #include #include +#include #include #include #include "log.h" -#include "sway/desktop.h" #include "sway/desktop/transaction.h" #include "sway/input/cursor.h" #include "sway/input/input-manager.h" #include "sway/input/seat.h" #include "sway/output.h" +#include "sway/scene_descriptor.h" #include "sway/tree/arrange.h" #include "sway/tree/container.h" #include "sway/tree/view.h" @@ -43,29 +44,12 @@ static void unmanaged_handle_request_configure(struct wl_listener *listener, ev->width, ev->height); } -static void unmanaged_handle_commit(struct wl_listener *listener, void *data) { - struct sway_xwayland_unmanaged *surface = - wl_container_of(listener, surface, commit); - struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; - - desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, - false); -} - static void unmanaged_handle_set_geometry(struct wl_listener *listener, void *data) { struct sway_xwayland_unmanaged *surface = wl_container_of(listener, surface, set_geometry); struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; - if (xsurface->x != surface->lx || xsurface->y != surface->ly) { - // Surface has moved - desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, - true); - surface->lx = xsurface->x; - surface->ly = xsurface->y; - desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, - true); - } + wlr_scene_node_set_position(&surface->surface_scene->buffer->node, xsurface->x, xsurface->y); } static void unmanaged_handle_map(struct wl_listener *listener, void *data) { @@ -73,17 +57,18 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) { wl_container_of(listener, surface, map); struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; - wl_list_insert(root->xwayland_unmanaged.prev, &surface->link); + surface->surface_scene = wlr_scene_surface_create(root->layers.unmanaged, + xsurface->surface); - wl_signal_add(&xsurface->events.set_geometry, &surface->set_geometry); - surface->set_geometry.notify = unmanaged_handle_set_geometry; + if (surface->surface_scene) { + scene_descriptor_assign(&surface->surface_scene->buffer->node, + SWAY_SCENE_DESC_XWAYLAND_UNMANAGED, surface); + wlr_scene_node_set_position(&surface->surface_scene->buffer->node, + xsurface->x, xsurface->y); - wl_signal_add(&xsurface->surface->events.commit, &surface->commit); - surface->commit.notify = unmanaged_handle_commit; - - surface->lx = xsurface->x; - surface->ly = xsurface->y; - desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, true); + wl_signal_add(&xsurface->events.set_geometry, &surface->set_geometry); + surface->set_geometry.notify = unmanaged_handle_set_geometry; + } if (wlr_xwayland_or_surface_wants_focus(xsurface)) { struct sway_seat *seat = input_manager_current_seat(); @@ -97,10 +82,10 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) { struct sway_xwayland_unmanaged *surface = wl_container_of(listener, surface, unmap); struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; - desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true); - wl_list_remove(&surface->link); - wl_list_remove(&surface->set_geometry.link); - wl_list_remove(&surface->commit.link); + + if (surface->surface_scene) { + wl_list_remove(&surface->set_geometry.link); + } struct sway_seat *seat = input_manager_current_seat(); if (seat->wlr_seat->keyboard_state.focused_surface == xsurface->surface) { @@ -425,7 +410,6 @@ static void handle_commit(struct wl_listener *listener, void *data) { // The client changed its surface size in this commit. For floating // containers, we resize the container to match. For tiling containers, // we only recenter the surface. - desktop_damage_view(view); memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box)); if (container_is_floating(view->container)) { view_update_size(view); @@ -433,15 +417,12 @@ static void handle_commit(struct wl_listener *listener, void *data) { } else { view_center_surface(view); } - desktop_damage_view(view); } if (view->container->node.instruction) { transaction_notify_view_ready_by_geometry(view, xsurface->x, xsurface->y, state->width, state->height); } - - view_damage_from(view); } static void handle_destroy(struct wl_listener *listener, void *data) { @@ -486,6 +467,8 @@ static void handle_unmap(struct wl_listener *listener, void *data) { view_unmap(view); + xwayland_view->surface_scene = NULL; + wl_list_remove(&xwayland_view->commit.link); } @@ -506,6 +489,9 @@ static void handle_map(struct wl_listener *listener, void *data) { // Put it back into the tree view_map(view, xsurface->surface, xsurface->fullscreen, NULL, false); + xwayland_view->surface_scene = wlr_scene_surface_create( + xwayland_view->view.content_tree, xsurface->surface); + transaction_commit_dirty(); } diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 2ec284267..bb996304e 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -86,6 +86,11 @@ struct sway_node *node_at_coords( struct sway_container *con = popup->child.view->container; return &con->node; } +#if HAVE_XWAYLAND + else if (desc->type == SWAY_SCENE_DESC_XWAYLAND_UNMANAGED) { + return NULL; + } +#endif } if (!current->parent) { diff --git a/sway/tree/root.c b/sway/tree/root.c index 666d5103c..28db0e997 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -67,9 +67,6 @@ struct sway_root *root_create(void) { root->output_layout = wlr_output_layout_create(); wl_list_init(&root->all_outputs); -#if HAVE_XWAYLAND - wl_list_init(&root->xwayland_unmanaged); -#endif wl_signal_init(&root->events.new_node); root->outputs = create_list(); root->non_desktop_outputs = create_list();