diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-07 20:40:05 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 22:49:59 +1000 |
commit | 832ebc896655cb5ca7689559d4e42b426d764e71 (patch) | |
tree | 1a3bc3ff7fb13d7ed5e86ad67a05739d4c4a1de3 /sway/input | |
parent | Merge pull request #2791 from RyanDwyer/status-command-optional (diff) | |
download | sway-832ebc896655cb5ca7689559d4e42b426d764e71.tar.gz sway-832ebc896655cb5ca7689559d4e42b426d764e71.tar.zst sway-832ebc896655cb5ca7689559d4e42b426d764e71.zip |
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.
Diffstat (limited to 'sway/input')
-rw-r--r-- | sway/input/cursor.c | 16 | ||||
-rw-r--r-- | sway/input/seat.c | 9 |
2 files changed, 24 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 331c6c7e..08eeb812 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -98,6 +98,22 @@ static struct sway_node *node_at_coords( | |||
98 | return NULL; | 98 | return NULL; |
99 | } | 99 | } |
100 | if (ws->fullscreen) { | 100 | if (ws->fullscreen) { |
101 | // Try transient containers | ||
102 | if (config->popup_during_fullscreen == POPUP_SMART && | ||
103 | ws->fullscreen->view) { | ||
104 | for (int i = 0; i < ws->floating->length; ++i) { | ||
105 | struct sway_container *floater = ws->floating->items[i]; | ||
106 | if (floater->view && view_is_transient_for( | ||
107 | floater->view, ws->fullscreen->view)) { | ||
108 | struct sway_container *con = tiling_container_at( | ||
109 | &floater->node, lx, ly, surface, sx, sy); | ||
110 | if (con) { | ||
111 | return &con->node; | ||
112 | } | ||
113 | } | ||
114 | } | ||
115 | } | ||
116 | // Try fullscreen container | ||
101 | struct sway_container *con = | 117 | struct sway_container *con = |
102 | tiling_container_at(&ws->fullscreen->node, lx, ly, surface, sx, sy); | 118 | tiling_container_at(&ws->fullscreen->node, lx, ly, surface, sx, sy); |
103 | if (con) { | 119 | if (con) { |
diff --git a/sway/input/seat.c b/sway/input/seat.c index f5cb2f9e..690b59e6 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -655,7 +655,14 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, | |||
655 | // Deny setting focus to a view which is hidden by a fullscreen container | 655 | // Deny setting focus to a view which is hidden by a fullscreen container |
656 | if (new_workspace && new_workspace->fullscreen && container && | 656 | if (new_workspace && new_workspace->fullscreen && container && |
657 | !container_is_fullscreen_or_child(container)) { | 657 | !container_is_fullscreen_or_child(container)) { |
658 | return; | 658 | // Unless it's a transient container |
659 | bool is_transient = new_workspace->fullscreen->view && | ||
660 | config->popup_during_fullscreen == POPUP_SMART && | ||
661 | container->view && view_is_transient_for( | ||
662 | container->view, new_workspace->fullscreen->view); | ||
663 | if (!is_transient) { | ||
664 | return; | ||
665 | } | ||
659 | } | 666 | } |
660 | 667 | ||
661 | struct sway_output *last_output = last_workspace ? | 668 | struct sway_output *last_output = last_workspace ? |