aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/root.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/root.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/root.c')
-rw-r--r--sway/tree/root.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c
index a9d306a4..1dabc287 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -62,6 +62,11 @@ void root_scratchpad_add_container(struct sway_container *con) {
62 struct sway_container *parent = con->parent; 62 struct sway_container *parent = con->parent;
63 struct sway_workspace *workspace = con->workspace; 63 struct sway_workspace *workspace = con->workspace;
64 64
65 // Clear the fullscreen mode when sending to the scratchpad
66 if (con->fullscreen_mode != FULLSCREEN_NONE) {
67 container_fullscreen_disable(con);
68 }
69
65 // When a tiled window is sent to scratchpad, center and resize it. 70 // When a tiled window is sent to scratchpad, center and resize it.
66 if (!container_is_floating(con)) { 71 if (!container_is_floating(con)) {
67 container_set_floating(con, true); 72 container_set_floating(con, true);
@@ -143,6 +148,15 @@ void root_scratchpad_hide(struct sway_container *con) {
143 struct sway_node *focus = seat_get_focus_inactive(seat, &root->node); 148 struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
144 struct sway_workspace *ws = con->workspace; 149 struct sway_workspace *ws = con->workspace;
145 150
151 if (con->fullscreen_mode == FULLSCREEN_GLOBAL && !con->workspace) {
152 // If the container was made fullscreen global while in the scratchpad,
153 // it should be shown until fullscreen has been disabled
154 return;
155 }
156
157 if (con->fullscreen_mode != FULLSCREEN_NONE) {
158 container_fullscreen_disable(con);
159 }
146 container_detach(con); 160 container_detach(con);
147 arrange_workspace(ws); 161 arrange_workspace(ws);
148 if (&con->node == focus || node_has_ancestor(focus, &con->node)) { 162 if (&con->node == focus || node_has_ancestor(focus, &con->node)) {