Xwayland unmanaged views aren't views anymore

3 files changed, 11 insertions, 5 deletions

diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index d707df17..423c0a22 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -70,7 +70,9 @@ struct sway_container {
         enum sway_container_layout prev_layout;
         enum sway_container_layout workspace_layout;
 
-        // in output-local coordinates
+        // For C_ROOT, this has no meaning
+        // For C_OUTPUT, this is the output position in layout coordinates
+        // For other types, this is the position in output-local coordinates
         double x, y;
         // does not include borders or gaps.
         double width, height;
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index 0a904c4b..fecf1582 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -23,7 +23,7 @@ struct sway_root {
 
         struct wl_listener output_layout_change;
 
-        struct wl_list unmanaged_views; // sway_view::unmanaged_view_link
+        struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
 
         struct {
                 struct wl_signal new_container;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 4e753b2a..4b84205e 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -39,6 +39,13 @@ struct sway_xwayland_surface {
         int pending_width, pending_height;
 };
 
+struct sway_xwayland_unmanaged {
+        struct wlr_xwayland_surface *wlr_xwayland_surface;
+        struct wl_list link;
+
+        struct wl_listener destroy;
+};
+
 struct sway_wl_shell_surface {
         struct sway_view *view;
 
@@ -127,9 +134,6 @@ void view_damage_from(struct sway_view *view);
 
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface);
 
-void view_map_unmanaged(struct sway_view *view,
-        struct wlr_surface *wlr_surface);
-
 void view_unmap(struct sway_view *view);
 
 void view_update_position(struct sway_view *view, double ox, double oy);