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 | |
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')
-rw-r--r-- | sway/commands/floating.c | 5 | ||||
-rw-r--r-- | sway/commands/focus.c | 4 | ||||
-rw-r--r-- | sway/commands/fullscreen.c | 7 | ||||
-rw-r--r-- | sway/commands/layout.c | 6 | ||||
-rw-r--r-- | sway/commands/move.c | 9 | ||||
-rw-r--r-- | sway/commands/split.c | 3 |
6 files changed, 32 insertions, 2 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)) { |
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) { |
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c index 52248ce4..a268ba03 100644 --- a/sway/commands/fullscreen.c +++ b/sway/commands/fullscreen.c | |||
@@ -26,6 +26,13 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) { | |||
26 | "Can't fullscreen an empty workspace"); | 26 | "Can't fullscreen an empty workspace"); |
27 | } | 27 | } |
28 | 28 | ||
29 | // If in the scratchpad, operate on the highest container | ||
30 | if (container && !container->workspace) { | ||
31 | while (container->parent) { | ||
32 | container = container->parent; | ||
33 | } | ||
34 | } | ||
35 | |||
29 | bool is_fullscreen = container && | 36 | bool is_fullscreen = container && |
30 | container->fullscreen_mode != FULLSCREEN_NONE; | 37 | container->fullscreen_mode != FULLSCREEN_NONE; |
31 | bool global = false; | 38 | bool global = false; |
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 7d61c3be..32f8fb52 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c | |||
@@ -147,7 +147,11 @@ struct cmd_results *cmd_layout(int argc, char **argv) { | |||
147 | workspace->layout = new_layout; | 147 | workspace->layout = new_layout; |
148 | workspace_update_representation(workspace); | 148 | workspace_update_representation(workspace); |
149 | } | 149 | } |
150 | arrange_workspace(workspace); | 150 | if (root->fullscreen_global) { |
151 | arrange_root(); | ||
152 | } else { | ||
153 | arrange_workspace(workspace); | ||
154 | } | ||
151 | } | 155 | } |
152 | 156 | ||
153 | return cmd_results_new(CMD_SUCCESS, NULL); | 157 | return cmd_results_new(CMD_SUCCESS, NULL); |
diff --git a/sway/commands/move.c b/sway/commands/move.c index f642f023..4ebc949b 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -395,6 +395,11 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { | |||
395 | container = workspace_wrap_children(workspace); | 395 | container = workspace_wrap_children(workspace); |
396 | } | 396 | } |
397 | 397 | ||
398 | if (container->fullscreen_mode == FULLSCREEN_GLOBAL) { | ||
399 | return cmd_results_new(CMD_FAILURE, | ||
400 | "Can't move fullscreen global container"); | ||
401 | } | ||
402 | |||
398 | bool no_auto_back_and_forth = false; | 403 | bool no_auto_back_and_forth = false; |
399 | while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) { | 404 | while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) { |
400 | no_auto_back_and_forth = true; | 405 | no_auto_back_and_forth = true; |
@@ -646,6 +651,10 @@ static struct cmd_results *cmd_move_workspace(int argc, char **argv) { | |||
646 | } | 651 | } |
647 | 652 | ||
648 | struct sway_workspace *workspace = config->handler_context.workspace; | 653 | struct sway_workspace *workspace = config->handler_context.workspace; |
654 | if (!workspace) { | ||
655 | return cmd_results_new(CMD_FAILURE, "No workspace to move"); | ||
656 | } | ||
657 | |||
649 | struct sway_output *old_output = workspace->output; | 658 | struct sway_output *old_output = workspace->output; |
650 | int center_x = workspace->width / 2 + workspace->x, | 659 | int center_x = workspace->width / 2 + workspace->x, |
651 | center_y = workspace->height / 2 + workspace->y; | 660 | center_y = workspace->height / 2 + workspace->y; |
diff --git a/sway/commands/split.c b/sway/commands/split.c index e9670722..8702f39e 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c | |||
@@ -13,7 +13,8 @@ static struct cmd_results *do_split(int layout) { | |||
13 | struct sway_container *con = config->handler_context.container; | 13 | struct sway_container *con = config->handler_context.container; |
14 | struct sway_workspace *ws = config->handler_context.workspace; | 14 | struct sway_workspace *ws = config->handler_context.workspace; |
15 | if (con) { | 15 | if (con) { |
16 | if (container_is_scratchpad_hidden(con)) { | 16 | if (container_is_scratchpad_hidden(con) && |
17 | con->fullscreen_mode != FULLSCREEN_GLOBAL) { | ||
17 | return cmd_results_new(CMD_FAILURE, | 18 | return cmd_results_new(CMD_FAILURE, |
18 | "Cannot split a hidden scratchpad container"); | 19 | "Cannot split a hidden scratchpad container"); |
19 | } | 20 | } |