diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-03-31 23:27:18 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-04-13 08:48:37 -0600 |
commit | 69a1a0ff99171f15c7842bfde23ed90f09a37256 (patch) | |
tree | 6d03653b20e1c5f62200d7cc6905d768fced8d52 /sway/commands/floating.c | |
parent | Fix potential null accesses (diff) | |
download | sway-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/floating.c')
-rw-r--r-- | sway/commands/floating.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/commands/floating.c b/sway/commands/floating.c index 5df9b1bf..ce123345 100644 --- a/sway/commands/floating.c +++ b/sway/commands/floating.c | |||
@@ -32,6 +32,11 @@ struct cmd_results *cmd_floating(int argc, char **argv) { | |||
32 | seat_set_focus_container(config->handler_context.seat, container); | 32 | seat_set_focus_container(config->handler_context.seat, container); |
33 | } | 33 | } |
34 | 34 | ||
35 | if (container_is_scratchpad_hidden(container)) { | ||
36 | return cmd_results_new(CMD_INVALID, | ||
37 | "Can't change floating on hidden scratchpad container"); | ||
38 | } | ||
39 | |||
35 | // If the container is in a floating split container, | 40 | // If the container is in a floating split container, |
36 | // operate on the split container instead of the child. | 41 | // operate on the split container instead of the child. |
37 | if (container_is_floating_or_child(container)) { | 42 | if (container_is_floating_or_child(container)) { |