mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-02-10 04:27:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Inherit parent's workspace, unconditional, untested

Browse source
This commit is contained in:
Nitzan Raz 2025-11-02 00:24:15 +02:00
parent 055be4ec35
commit d47e5d966a
1 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

45
sway/tree/view.c
View file

@ -577,9 +577,54 @@ void view_assign_ctx(struct sway_view *view, struct launcher_ctx *ctx) {
view->ctx = ctx;
}
static struct sway_workspace *get_parent_workspace(struct sway_view *view) {
// Try to get the parent view's workspace for both XDG and XWayland windows
struct sway_view *parent_view = NULL;
// Check for XDG Shell parent
if (view->wlr_xdg_toplevel && view->wlr_xdg_toplevel->parent) {
struct wlr_xdg_surface *parent_surface = view->wlr_xdg_toplevel->parent->base;
if (parent_surface) {
struct sway_view *xdg_parent_view = view_from_wlr_xdg_surface(parent_surface);
if (xdg_parent_view && xdg_parent_view->container) {
parent_view = xdg_parent_view;
}
}
}
#if WLR_HAS_XWAYLAND
// Check for XWayland parent (only for XWayland views!)
if (!parent_view && view->type == SWAY_VIEW_XWAYLAND &&
view->wlr_xwayland_surface && view->wlr_xwayland_surface->parent) {
struct wlr_xwayland_surface *parent_xsurface = view->wlr_xwayland_surface->parent;
// Check if parent surface is mapped and has valid data
if (parent_xsurface->surface && parent_xsurface->surface->mapped && parent_xsurface->data) {
struct sway_view *xw_parent_view = view_from_wlr_xwayland_surface(parent_xsurface);
if (xw_parent_view && xw_parent_view->container) {
parent_view = xw_parent_view;
}
}
}
#endif
// If we found a parent view with a container, return its workspace
if (parent_view && parent_view->container) {
return parent_view->container->pending.workspace;
}
return NULL;
}
static struct sway_workspace *select_workspace(struct sway_view *view) {
struct sway_seat *seat = input_manager_current_seat();
// Check if the view has a parent window, and if so, use its workspace
struct sway_workspace *parent_ws = get_parent_workspace(view);
if (parent_ws) {
return parent_ws;
}
// Check if there's any `assign` criteria for the view
list_t *criterias = criteria_for_view(view,
CT_ASSIGN_WORKSPACE | CT_ASSIGN_WORKSPACE_NUMBER | CT_ASSIGN_OUTPUT);