aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/node.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-03-31 23:27:18 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-04-13 08:48:37 -0600
commit69a1a0ff99171f15c7842bfde23ed90f09a37256 (patch)
tree6d03653b20e1c5f62200d7cc6905d768fced8d52 /sway/tree/node.c
parentFix potential null accesses (diff)
downloadsway-69a1a0ff99171f15c7842bfde23ed90f09a37256.tar.gz
sway-69a1a0ff99171f15c7842bfde23ed90f09a37256.tar.zst
sway-69a1a0ff99171f15c7842bfde23ed90f09a37256.zip
Fix scratchpad fullscreen behavior and crash
When setting fullscreen on a hidden scratchpad container, there was a check to see if there was an existing fullscreen container on the workspace so it could be fullscreen disabled first. Since the workspace is NULL, it would cause a SIGSEGV. This adds a NULL check to avoid the crash. This also changes the behavior of how fullscreen is handled when adding a container to the scratchpad or changing visibility of a scratchpad container to match i3's. The behavior is as follows: - When adding a container to the scratchpad or hiding a container back into the scratchpad, there is an implicit fullscreen disable - When setting fullscreen on a container that is hidden in the scratchpad, it will be fullscreen when shown (and fullscreen disabled when hidden as stated above) - When setting fullscreen global on a container that is hidden in the scratchpad, it will be shown immediately as fullscreen global. The container is not moved to a workspace and remains in the scratchpad. The container will be visible until fullscreen disabled or killed. Since the container is in the scratchpad, running `scratchpad show` or `move container to scratchpad` will have no effect This also changes `container_replace` to transfer fullscreen and scratchpad status.
Diffstat (limited to 'sway/tree/node.c')
-rw-r--r--sway/tree/node.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sway/tree/node.c b/sway/tree/node.c
index dcab1c9b..ffa7f2cc 100644
--- a/sway/tree/node.c
+++ b/sway/tree/node.c
@@ -142,11 +142,19 @@ list_t *node_get_children(struct sway_node *node) {
142} 142}
143 143
144bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) { 144bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
145 if (ancestor->type == N_ROOT && node->type == N_CONTAINER &&
146 node->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
147 return true;
148 }
145 struct sway_node *parent = node_get_parent(node); 149 struct sway_node *parent = node_get_parent(node);
146 while (parent) { 150 while (parent) {
147 if (parent == ancestor) { 151 if (parent == ancestor) {
148 return true; 152 return true;
149 } 153 }
154 if (ancestor->type == N_ROOT && parent->type == N_CONTAINER &&
155 parent->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
156 return true;
157 }
150 parent = node_get_parent(parent); 158 parent = node_get_parent(parent);
151 } 159 }
152 return false; 160 return false;