1 files changed, 226 insertions, 113 deletions

diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index e1a2e463..9f3f4d5f 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -5,16 +5,20 @@
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_xdg_activation_v1.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/xwayland.h>
+#include <xcb/xcb_icccm.h>
 #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/server.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 
@@ -42,29 +46,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) {
@@ -72,17 +59,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);
-
-        wl_signal_add(&xsurface->events.set_geometry, &surface->set_geometry);
-        surface->set_geometry.notify = unmanaged_handle_set_geometry;
+        surface->surface_scene = wlr_scene_surface_create(root->layers.unmanaged,
+                xsurface->surface);
 
-        wl_signal_add(&xsurface->surface->events.commit, &surface->commit);
-        surface->commit.notify = unmanaged_handle_commit;
+        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);
 
-        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();
@@ -96,23 +84,22 @@ 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);
+
+                wlr_scene_node_destroy(&surface->surface_scene->buffer->node);
+                surface->surface_scene = NULL;
+        }
 
         struct sway_seat *seat = input_manager_current_seat();
         if (seat->wlr_seat->keyboard_state.focused_surface == xsurface->surface) {
                 // This simply returns focus to the parent surface if there's one available.
                 // This seems to handle JetBrains issues.
-                if (xsurface->parent && xsurface->parent->surface &&
-                                wlr_surface_is_xwayland_surface(xsurface->parent->surface)) {
-                        struct wlr_xwayland_surface *next_surface =
-                                wlr_xwayland_surface_from_wlr_surface(xsurface->parent->surface);
-                        if (wlr_xwayland_or_surface_wants_focus(next_surface)) {
-                                seat_set_focus_surface(seat, xsurface->parent->surface, false);
-                                return;
-                        }
+                if (xsurface->parent && xsurface->parent->surface
+                                && wlr_xwayland_or_surface_wants_focus(xsurface->parent)) {
+                        seat_set_focus_surface(seat, xsurface->parent->surface, false);
+                        return;
                 }
 
                 // Restore focus
@@ -125,18 +112,53 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
         }
 }
 
+static void unmanaged_handle_request_activate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_unmanaged *surface =
+                wl_container_of(listener, surface, request_activate);
+        struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
+                return;
+        }
+        struct sway_seat *seat = input_manager_current_seat();
+        struct sway_container *focus = seat_get_focused_container(seat);
+        if (focus && focus->view && focus->view->pid != xsurface->pid) {
+                return;
+        }
+
+        seat_set_focus_surface(seat, xsurface->surface, false);
+}
+
+static void unmanaged_handle_associate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_unmanaged *surface =
+                wl_container_of(listener, surface, associate);
+        struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
+        wl_signal_add(&xsurface->surface->events.map, &surface->map);
+        surface->map.notify = unmanaged_handle_map;
+        wl_signal_add(&xsurface->surface->events.unmap, &surface->unmap);
+        surface->unmap.notify = unmanaged_handle_unmap;
+}
+
+static void unmanaged_handle_dissociate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_unmanaged *surface =
+                wl_container_of(listener, surface, dissociate);
+        wl_list_remove(&surface->map.link);
+        wl_list_remove(&surface->unmap.link);
+}
+
 static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
         struct sway_xwayland_unmanaged *surface =
                 wl_container_of(listener, surface, destroy);
         wl_list_remove(&surface->request_configure.link);
-        wl_list_remove(&surface->map.link);
-        wl_list_remove(&surface->unmap.link);
+        wl_list_remove(&surface->associate.link);
+        wl_list_remove(&surface->dissociate.link);
         wl_list_remove(&surface->destroy.link);
         wl_list_remove(&surface->override_redirect.link);
+        wl_list_remove(&surface->request_activate.link);
         free(surface);
 }
 
 static void handle_map(struct wl_listener *listener, void *data);
+static void handle_associate(struct wl_listener *listener, void *data);
 
 struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsurface);
 
@@ -145,14 +167,22 @@ static void unmanaged_handle_override_redirect(struct wl_listener *listener, voi
                 wl_container_of(listener, surface, override_redirect);
         struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
 
-        bool mapped = xsurface->mapped;
+        bool associated = xsurface->surface != NULL;
+        bool mapped = associated && xsurface->surface->mapped;
         if (mapped) {
                 unmanaged_handle_unmap(&surface->unmap, NULL);
         }
+        if (associated) {
+                unmanaged_handle_dissociate(&surface->dissociate, NULL);
+        }
 
         unmanaged_handle_destroy(&surface->destroy, NULL);
         xsurface->data = NULL;
+
         struct sway_xwayland_view *xwayland_view = create_xwayland_view(xsurface);
+        if (associated) {
+                handle_associate(&xwayland_view->associate, NULL);
+        }
         if (mapped) {
                 handle_map(&xwayland_view->map, xsurface);
         }
@@ -172,14 +202,16 @@ static struct sway_xwayland_unmanaged *create_unmanaged(
         wl_signal_add(&xsurface->events.request_configure,
                 &surface->request_configure);
         surface->request_configure.notify = unmanaged_handle_request_configure;
-        wl_signal_add(&xsurface->events.map, &surface->map);
-        surface->map.notify = unmanaged_handle_map;
-        wl_signal_add(&xsurface->events.unmap, &surface->unmap);
-        surface->unmap.notify = unmanaged_handle_unmap;
+        wl_signal_add(&xsurface->events.associate, &surface->associate);
+        surface->associate.notify = unmanaged_handle_associate;
+        wl_signal_add(&xsurface->events.dissociate, &surface->dissociate);
+        surface->dissociate.notify = unmanaged_handle_dissociate;
         wl_signal_add(&xsurface->events.destroy, &surface->destroy);
         surface->destroy.notify = unmanaged_handle_destroy;
         wl_signal_add(&xsurface->events.set_override_redirect, &surface->override_redirect);
         surface->override_redirect.notify = unmanaged_handle_override_redirect;
+        wl_signal_add(&xsurface->events.request_activate, &surface->request_activate);
+        surface->request_activate.notify = unmanaged_handle_request_activate;
 
         return surface;
 }
@@ -258,6 +290,7 @@ static void set_activated(struct sway_view *view, bool activated) {
         }
 
         wlr_xwayland_surface_activate(surface, activated);
+        wlr_xwayland_surface_restack(surface, NULL, XCB_STACK_MODE_ABOVE);
 }
 
 static void set_tiled(struct sway_view *view, bool tiled) {
@@ -297,7 +330,7 @@ static bool wants_floating(struct sway_view *view) {
                 }
         }
 
-        struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
+        xcb_size_hints_t *size_hints = surface->size_hints;
         if (size_hints != NULL &&
                         size_hints->min_width > 0 && size_hints->min_height > 0 &&
                         (size_hints->max_width == size_hints->min_width ||
@@ -351,7 +384,7 @@ static void destroy(struct sway_view *view) {
 static void get_constraints(struct sway_view *view, double *min_width,
                 double *max_width, double *min_height, double *max_height) {
         struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
-        struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
+        xcb_size_hints_t *size_hints = surface->size_hints;
 
         if (size_hints == NULL) {
                 *min_width = DBL_MIN;
@@ -381,17 +414,6 @@ static const struct sway_view_impl view_impl = {
         .destroy = destroy,
 };
 
-static void get_geometry(struct sway_view *view, struct wlr_box *box) {
-        box->x = box->y = 0;
-        if (view->surface) {
-                box->width = view->surface->current.width;
-                box->height = view->surface->current.height;
-        } else {
-                box->width = 0;
-                box->height = 0;
-        }
-}
-
 static void handle_commit(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, commit);
@@ -399,33 +421,38 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
         struct wlr_surface_state *state = &xsurface->surface->current;
 
+        struct wlr_box new_geo = {0};
+        new_geo.width = state->width;
+        new_geo.height = state->height;
+
+        bool new_size = new_geo.width != view->geometry.width ||
+                        new_geo.height != view->geometry.height;
+
+        if (new_size) {
+                // 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.
+                memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+                if (container_is_floating(view->container)) {
+                        view_update_size(view);
+                        transaction_commit_dirty_client();
+                }
+
+                view_center_and_clip_surface(view);
+        }
+
         if (view->container->node.instruction) {
-                get_geometry(view, &view->geometry);
-                transaction_notify_view_ready_by_geometry(view,
+                bool successful = transaction_notify_view_ready_by_geometry(view,
                                 xsurface->x, xsurface->y, state->width, state->height);
-        } else {
-                struct wlr_box new_geo;
-                get_geometry(view, &new_geo);
-
-                if ((new_geo.width != view->geometry.width ||
-                                        new_geo.height != view->geometry.height ||
-                                        new_geo.x != view->geometry.x ||
-                                        new_geo.y != view->geometry.y)) {
-                        // The view has unexpectedly sent a new size
-                        // eg. The Firefox "Save As" dialog when downloading a file
-                        desktop_damage_view(view);
-                        view_update_size(view, new_geo.width, new_geo.height);
-                        memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
-                        desktop_damage_view(view);
-                        transaction_commit_dirty();
-                        transaction_notify_view_ready_by_geometry(view,
-                                        xsurface->x, xsurface->y, new_geo.width, new_geo.height);
-                } else {
-                        memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+
+                // If we saved the view and this commit isn't what we're looking for
+                // that means the user will never actually see the buffers submitted to
+                // us here. Just send frame done events to these surfaces so they can
+                // commit another time for us.
+                if (view->saved_surface_tree && !successful) {
+                        view_send_frame_done(view);
                 }
         }
-
-        view_damage_from(view);
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -438,6 +465,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
                 wl_list_remove(&xwayland_view->commit.link);
         }
 
+        xwayland_view->view.wlr_xwayland_surface = NULL;
+
         wl_list_remove(&xwayland_view->destroy.link);
         wl_list_remove(&xwayland_view->request_configure.link);
         wl_list_remove(&xwayland_view->request_fullscreen.link);
@@ -448,11 +477,12 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
         wl_list_remove(&xwayland_view->set_title.link);
         wl_list_remove(&xwayland_view->set_class.link);
         wl_list_remove(&xwayland_view->set_role.link);
+        wl_list_remove(&xwayland_view->set_startup_id.link);
         wl_list_remove(&xwayland_view->set_window_type.link);
         wl_list_remove(&xwayland_view->set_hints.link);
         wl_list_remove(&xwayland_view->set_decorations.link);
-        wl_list_remove(&xwayland_view->map.link);
-        wl_list_remove(&xwayland_view->unmap.link);
+        wl_list_remove(&xwayland_view->associate.link);
+        wl_list_remove(&xwayland_view->dissociate.link);
         wl_list_remove(&xwayland_view->override_redirect.link);
         view_begin_destroy(&xwayland_view->view);
 }
@@ -466,16 +496,28 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
                 return;
         }
 
+        wl_list_remove(&xwayland_view->commit.link);
+        wl_list_remove(&xwayland_view->surface_tree_destroy.link);
+
+        if (xwayland_view->surface_tree) {
+                wlr_scene_node_destroy(&xwayland_view->surface_tree->node);
+                xwayland_view->surface_tree = NULL;
+        }
+
         view_unmap(view);
+}
 
-        wl_list_remove(&xwayland_view->commit.link);
+static void handle_surface_tree_destroy(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view,
+                surface_tree_destroy);
+        xwayland_view->surface_tree = NULL;
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, map);
-        struct wlr_xwayland_surface *xsurface = data;
         struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
 
         view->natural_width = xsurface->width;
         view->natural_height = xsurface->height;
@@ -488,23 +530,42 @@ 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_tree = wlr_scene_subsurface_tree_create(
+                xwayland_view->view.content_tree, xsurface->surface);
+
+        if (xwayland_view->surface_tree) {
+                xwayland_view->surface_tree_destroy.notify = handle_surface_tree_destroy;
+                wl_signal_add(&xwayland_view->surface_tree->node.events.destroy,
+                        &xwayland_view->surface_tree_destroy);
+        }
+
         transaction_commit_dirty();
 }
 
+static void handle_dissociate(struct wl_listener *listener, void *data);
+
 static void handle_override_redirect(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, override_redirect);
-        struct wlr_xwayland_surface *xsurface = data;
         struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
 
-        bool mapped = xsurface->mapped;
+        bool associated = xsurface->surface != NULL;
+        bool mapped = associated && xsurface->surface->mapped;
         if (mapped) {
                 handle_unmap(&xwayland_view->unmap, NULL);
         }
+        if (associated) {
+                handle_dissociate(&xwayland_view->dissociate, NULL);
+        }
 
         handle_destroy(&xwayland_view->destroy, view);
         xsurface->data = NULL;
+
         struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface);
+        if (associated) {
+                unmanaged_handle_associate(&unmanaged->associate, NULL);
+        }
         if (mapped) {
                 unmanaged_handle_map(&unmanaged->map, xsurface);
         }
@@ -516,7 +577,7 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
         struct wlr_xwayland_surface_configure_event *ev = data;
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 wlr_xwayland_surface_configure(xsurface, ev->x, ev->y,
                         ev->width, ev->height);
                 return;
@@ -527,10 +588,10 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
                 view->natural_height = ev->height;
                 container_floating_resize_and_center(view->container);
 
-                configure(view, view->container->content_x,
-                                view->container->content_y,
-                                view->container->content_width,
-                                view->container->content_height);
+                configure(view, view->container->pending.content_x,
+                                view->container->pending.content_y,
+                                view->container->pending.content_width,
+                                view->container->pending.content_height);
                 node_set_dirty(&view->container->node);
         } else {
                 configure(view, view->container->current.content_x,
@@ -545,7 +606,7 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
                 wl_container_of(listener, xwayland_view, request_fullscreen);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         container_set_fullscreen(view->container, xsurface->fullscreen);
@@ -559,7 +620,7 @@ static void handle_request_minimize(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_minimize);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
 
@@ -574,10 +635,11 @@ static void handle_request_move(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_move);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
-        if (!container_is_floating(view->container)) {
+        if (!container_is_floating(view->container) ||
+                        view->container->pending.fullscreen_mode) {
                 return;
         }
         struct sway_seat *seat = input_manager_current_seat();
@@ -589,7 +651,7 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_resize);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         if (!container_is_floating(view->container)) {
@@ -605,10 +667,10 @@ static void handle_request_activate(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_activate);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
-        view_request_activate(view);
+        view_request_activate(view, NULL);
 
         transaction_commit_dirty();
 }
@@ -618,7 +680,7 @@ static void handle_set_title(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_title);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_update_title(view, false);
@@ -630,7 +692,7 @@ static void handle_set_class(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_class);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_execute_criteria(view);
@@ -641,18 +703,43 @@ static void handle_set_role(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_role);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_execute_criteria(view);
 }
 
+static void handle_set_startup_id(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, set_startup_id);
+        struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+        if (xsurface->startup_id == NULL) {
+                return;
+        }
+
+        struct wlr_xdg_activation_token_v1 *token =
+                wlr_xdg_activation_v1_find_token(
+                                server.xdg_activation_v1, xsurface->startup_id);
+        if (token == NULL) {
+                // Tried to activate with an unknown or expired token
+                return;
+        }
+
+        struct launcher_ctx *ctx = token->data;
+        if (token->data == NULL) {
+                // TODO: support external launchers in X
+                return;
+        }
+        view_assign_ctx(view, ctx);
+}
+
 static void handle_set_window_type(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, set_window_type);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_execute_criteria(view);
@@ -663,20 +750,39 @@ static void handle_set_hints(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_hints);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
-        if (!xsurface->hints_urgency && view->urgent_timer) {
+        const bool hints_urgency = xcb_icccm_wm_hints_get_urgency(xsurface->hints);
+        if (!hints_urgency && view->urgent_timer) {
                 // The view is in the timeout period. We'll ignore the request to
                 // unset urgency so that the view remains urgent until the timer clears
                 // it.
                 return;
         }
         if (view->allow_request_urgent) {
-                view_set_urgent(view, (bool)xsurface->hints_urgency);
+                view_set_urgent(view, hints_urgency);
         }
 }
 
+static void handle_associate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, associate);
+        struct wlr_xwayland_surface *xsurface =
+                xwayland_view->view.wlr_xwayland_surface;
+        wl_signal_add(&xsurface->surface->events.unmap, &xwayland_view->unmap);
+        xwayland_view->unmap.notify = handle_unmap;
+        wl_signal_add(&xsurface->surface->events.map, &xwayland_view->map);
+        xwayland_view->map.notify = handle_map;
+}
+
+static void handle_dissociate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, dissociate);
+        wl_list_remove(&xwayland_view->map.link);
+        wl_list_remove(&xwayland_view->unmap.link);
+}
+
 struct sway_view *view_from_wlr_xwayland_surface(
                 struct wlr_xwayland_surface *xsurface) {
         return xsurface->data;
@@ -692,7 +798,10 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu
                 return NULL;
         }
 
-        view_init(&xwayland_view->view, SWAY_VIEW_XWAYLAND, &view_impl);
+        if (!view_init(&xwayland_view->view, SWAY_VIEW_XWAYLAND, &view_impl)) {
+                free(xwayland_view);
+                return NULL;
+        }
         xwayland_view->view.wlr_xwayland_surface = xsurface;
 
         wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy);
@@ -731,6 +840,10 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu
         wl_signal_add(&xsurface->events.set_role, &xwayland_view->set_role);
         xwayland_view->set_role.notify = handle_set_role;
 
+        wl_signal_add(&xsurface->events.set_startup_id,
+                        &xwayland_view->set_startup_id);
+        xwayland_view->set_startup_id.notify = handle_set_startup_id;
+
         wl_signal_add(&xsurface->events.set_window_type,
                         &xwayland_view->set_window_type);
         xwayland_view->set_window_type.notify = handle_set_window_type;
@@ -742,11 +855,11 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu
                         &xwayland_view->set_decorations);
         xwayland_view->set_decorations.notify = handle_set_decorations;
 
-        wl_signal_add(&xsurface->events.unmap, &xwayland_view->unmap);
-        xwayland_view->unmap.notify = handle_unmap;
+        wl_signal_add(&xsurface->events.associate, &xwayland_view->associate);
+        xwayland_view->associate.notify = handle_associate;
 
-        wl_signal_add(&xsurface->events.map, &xwayland_view->map);
-        xwayland_view->map.notify = handle_map;
+        wl_signal_add(&xsurface->events.dissociate, &xwayland_view->dissociate);
+        xwayland_view->dissociate.notify = handle_dissociate;
 
         wl_signal_add(&xsurface->events.set_override_redirect,
                         &xwayland_view->override_redirect);