From 832ebc896655cb5ca7689559d4e42b426d764e71 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 7 Oct 2018 20:40:05 +1000 Subject: Implement popup_during_fullscreen This introduces a new view_impl function: is_transient_for. Similar to container_has_ancestor but works using the surface parents rather than the tree. This patch modifies view_is_visible, container_at and so on to allow transient views to function normally when they're in front of a fullscreen view. --- sway/desktop/xdg_shell_v6.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'sway/desktop/xdg_shell_v6.c') diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index a7838c0f..dacfca02 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -189,6 +189,21 @@ static void for_each_popup(struct sway_view *view, user_data); } +static bool is_transient_for(struct sway_view *child, + struct sway_view *ancestor) { + if (xdg_shell_v6_view_from_view(child) == NULL) { + return false; + } + struct wlr_xdg_surface_v6 *surface = child->wlr_xdg_surface_v6; + while (surface) { + if (surface->toplevel->parent == ancestor->wlr_xdg_surface_v6) { + return true; + } + surface = surface->toplevel->parent; + } + return false; +} + static void _close(struct sway_view *view) { if (xdg_shell_v6_view_from_view(view) == NULL) { return; @@ -230,6 +245,7 @@ static const struct sway_view_impl view_impl = { .wants_floating = wants_floating, .for_each_surface = for_each_surface, .for_each_popup = for_each_popup, + .is_transient_for = is_transient_for, .close = _close, .close_popups = close_popups, .destroy = destroy, @@ -380,6 +396,18 @@ static void handle_map(struct wl_listener *listener, void *data) { WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; view_update_csd_from_client(view, csd); + if (config->popup_during_fullscreen == POPUP_LEAVE && + view->container->workspace && + view->container->workspace->fullscreen && + xdg_surface->toplevel->parent) { + struct wlr_xdg_surface_v6 *psurface = xdg_surface->toplevel->parent; + struct sway_xdg_shell_v6_view *parent = psurface->data; + struct sway_view *sway_view = &parent->view; + if (sway_view->container && sway_view->container->is_fullscreen) { + container_set_fullscreen(sway_view->container, false); + } + } + if (xdg_surface->toplevel->client_pending.fullscreen) { container_set_fullscreen(view->container, true); arrange_workspace(view->container->workspace); -- cgit v1.2.3 From b8002fc0c4c7e517665cb78ab206338f7f7560a7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 8 Oct 2018 23:39:35 +1000 Subject: Look for any ancestor when checking for fullscreen exit --- sway/desktop/xdg_shell.c | 9 ++++----- sway/desktop/xdg_shell_v6.c | 9 ++++----- sway/desktop/xwayland.c | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) (limited to 'sway/desktop/xdg_shell_v6.c') diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 54831679..5b53653d 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -404,12 +404,11 @@ static void handle_map(struct wl_listener *listener, void *data) { if (config->popup_during_fullscreen == POPUP_LEAVE && view->container->workspace && view->container->workspace->fullscreen && + view->container->workspace->fullscreen->view && xdg_surface->toplevel->parent) { - struct wlr_xdg_surface *psurface = xdg_surface->toplevel->parent; - struct sway_xdg_shell_view *parent = psurface->data; - struct sway_view *sway_view = &parent->view; - if (sway_view->container && sway_view->container->is_fullscreen) { - container_set_fullscreen(sway_view->container, false); + struct sway_container *fs = view->container->workspace->fullscreen; + if (is_transient_for(view, fs->view)) { + container_set_fullscreen(fs, false); } } diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index dacfca02..ac42cfed 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -399,12 +399,11 @@ static void handle_map(struct wl_listener *listener, void *data) { if (config->popup_during_fullscreen == POPUP_LEAVE && view->container->workspace && view->container->workspace->fullscreen && + view->container->workspace->fullscreen->view && xdg_surface->toplevel->parent) { - struct wlr_xdg_surface_v6 *psurface = xdg_surface->toplevel->parent; - struct sway_xdg_shell_v6_view *parent = psurface->data; - struct sway_view *sway_view = &parent->view; - if (sway_view->container && sway_view->container->is_fullscreen) { - container_set_fullscreen(sway_view->container, false); + struct sway_container *fs = view->container->workspace->fullscreen; + if (is_transient_for(view, fs->view)) { + container_set_fullscreen(fs, false); } } diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 80489f93..2bdb7dc0 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -410,12 +410,11 @@ static void handle_map(struct wl_listener *listener, void *data) { if (config->popup_during_fullscreen == POPUP_LEAVE && view->container->workspace && view->container->workspace->fullscreen && + view->container->workspace->fullscreen->view && xsurface->parent) { - struct wlr_xwayland_surface *psurface = xsurface->parent; - struct sway_xwayland_view *parent = psurface->data; - struct sway_view *sway_view = &parent->view; - if (sway_view->container && sway_view->container->is_fullscreen) { - container_set_fullscreen(sway_view->container, false); + struct sway_container *fs = view->container->workspace->fullscreen; + if (is_transient_for(view, fs->view)) { + container_set_fullscreen(fs, false); } } -- cgit v1.2.3 From d21d2c8665f8fdaad719bb81cc636052f7c1d1a1 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 8 Oct 2018 23:50:43 +1000 Subject: Remove duplicate code --- sway/desktop/xdg_shell.c | 11 ----------- sway/desktop/xdg_shell_v6.c | 11 ----------- sway/desktop/xwayland.c | 11 ----------- sway/tree/view.c | 10 ++++++++++ 4 files changed, 10 insertions(+), 33 deletions(-) (limited to 'sway/desktop/xdg_shell_v6.c') diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 5b53653d..4690a3c5 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -401,17 +401,6 @@ static void handle_map(struct wl_listener *listener, void *data) { view_update_csd_from_client(view, csd); } - if (config->popup_during_fullscreen == POPUP_LEAVE && - view->container->workspace && - view->container->workspace->fullscreen && - view->container->workspace->fullscreen->view && - xdg_surface->toplevel->parent) { - struct sway_container *fs = view->container->workspace->fullscreen; - if (is_transient_for(view, fs->view)) { - container_set_fullscreen(fs, false); - } - } - if (xdg_surface->toplevel->client_pending.fullscreen) { container_set_fullscreen(view->container, true); arrange_workspace(view->container->workspace); diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index ac42cfed..ff950c70 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -396,17 +396,6 @@ static void handle_map(struct wl_listener *listener, void *data) { WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; view_update_csd_from_client(view, csd); - if (config->popup_during_fullscreen == POPUP_LEAVE && - view->container->workspace && - view->container->workspace->fullscreen && - view->container->workspace->fullscreen->view && - xdg_surface->toplevel->parent) { - struct sway_container *fs = view->container->workspace->fullscreen; - if (is_transient_for(view, fs->view)) { - container_set_fullscreen(fs, false); - } - } - if (xdg_surface->toplevel->client_pending.fullscreen) { container_set_fullscreen(view->container, true); arrange_workspace(view->container->workspace); diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 2bdb7dc0..ebf2131e 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -407,17 +407,6 @@ static void handle_map(struct wl_listener *listener, void *data) { // Put it back into the tree view_map(view, xsurface->surface); - if (config->popup_during_fullscreen == POPUP_LEAVE && - view->container->workspace && - view->container->workspace->fullscreen && - view->container->workspace->fullscreen->view && - xsurface->parent) { - struct sway_container *fs = view->container->workspace->fullscreen; - if (is_transient_for(view, fs->view)) { - container_set_fullscreen(fs, false); - } - } - if (xsurface->fullscreen) { container_set_fullscreen(view->container, true); arrange_workspace(view->container->workspace); diff --git a/sway/tree/view.c b/sway/tree/view.c index b107d871..97525d6b 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -575,6 +575,16 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) { view_set_tiled(view, true); } + if (config->popup_during_fullscreen == POPUP_LEAVE && + view->container->workspace && + view->container->workspace->fullscreen && + view->container->workspace->fullscreen->view) { + struct sway_container *fs = view->container->workspace->fullscreen; + if (view_is_transient_for(view, fs->view)) { + container_set_fullscreen(fs, false); + } + } + if (should_focus(view)) { input_manager_set_focus(input_manager, &view->container->node); } -- cgit v1.2.3