sway

commit 90bef0364b349f97f1568bf8e4075184e8748c43
parent a074e0f5046244230363c6fa0e5452056bf70038
Author: Brian Ashworth <bosrsf04@gmail.com>
Date:   Tue, 20 Aug 2019 00:13:51 -0400

cmd_move: fix move to scratchpad hidden container

When moving to a scratchpad hidden container (using `move
[window|container] [to] mark <mark>`), this moves the container to the
scratchpad (equivalent to `move [window|container] [to] scratchpad`).

Previously, this would crash since the destination did not have a
workspace.

Diffstat:
M
sway/commands/move.c
 | 
7
+++++++

1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/sway/commands/move.c b/sway/commands/move.c
@@ -388,6 +388,8 @@ static bool container_move_in_direction(struct sway_container *container,
 	return false;
 }
 
+static struct cmd_results *cmd_move_to_scratchpad(void);
+
 static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
 		int argc, char **argv) {
 	struct cmd_results *error = NULL;
@@ -505,6 +507,11 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
 		return cmd_results_new(CMD_INVALID, expected_syntax);
 	}
 
+	if (destination->type == N_CONTAINER &&
+			container_is_scratchpad_hidden(destination->sway_container)) {
+		return cmd_move_to_scratchpad();
+	}
+
 	if (container->is_sticky && container_is_floating_or_child(container) &&
 			old_output && node_has_ancestor(destination, &old_output->node)) {
 		return cmd_results_new(CMD_FAILURE, "Can't move sticky "