aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/move.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/move.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/move.c')
-rw-r--r--sway/commands/move.c9
1 files changed, 9 insertions, 0 deletions
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;