aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/output.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/desktop/output.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/desktop/output.c')
-rw-r--r--sway/desktop/output.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 0b3e1edb..b1e3464a 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -251,14 +251,11 @@ static void output_for_each_surface(struct sway_output *output,
251 }; 251 };
252 252
253 struct sway_workspace *workspace = output_get_active_workspace(output); 253 struct sway_workspace *workspace = output_get_active_workspace(output);
254 if (!workspace) {
255 return;
256 }
257 struct sway_container *fullscreen_con = root->fullscreen_global; 254 struct sway_container *fullscreen_con = root->fullscreen_global;
258 if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) {
259 fullscreen_con = NULL;
260 }
261 if (!fullscreen_con) { 255 if (!fullscreen_con) {
256 if (!workspace) {
257 return;
258 }
262 fullscreen_con = workspace->current.fullscreen; 259 fullscreen_con = workspace->current.fullscreen;
263 } 260 }
264 if (fullscreen_con) { 261 if (fullscreen_con) {