aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/focus.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/commands/focus.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/commands/focus.c')
-rw-r--r--sway/commands/focus.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 14e90955..8baa616d 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -182,6 +182,10 @@ static struct sway_node *node_get_in_direction_floating(
182 double closest_distance = DBL_MAX; 182 double closest_distance = DBL_MAX;
183 struct sway_container *closest_con = NULL; 183 struct sway_container *closest_con = NULL;
184 184
185 if (!con->workspace) {
186 return NULL;
187 }
188
185 for (int i = 0; i < con->workspace->floating->length; i++) { 189 for (int i = 0; i < con->workspace->floating->length; i++) {
186 struct sway_container *floater = con->workspace->floating->items[i]; 190 struct sway_container *floater = con->workspace->floating->items[i];
187 if (floater == con) { 191 if (floater == con) {