diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-02 23:05:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 23:05:49 +1000 |
| commit | 706c0fbe2376e15f8140be60f3c8b0713128ebba (patch) | |
| tree | ffefcdd261970549f8b83adae8d93b6c3b9ebbbb /sway/commands | |
| parent | 26c5ef18ba295e016074c9d87affe5da44e71cb1 (diff) | |
| parent | 8e60f6a73263c444ab5fecdeacdaf7883a9b1505 (diff) | |
| download | sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.tar.xz | |
Merge branch 'master' into nagbar
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/exec_always.c | 4 | ||||
| -rw-r--r-- | sway/commands/move.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 9bf2b320..c730cb8b 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -4,6 +4,7 @@ #include <string.h> #include <sys/wait.h> #include <unistd.h> +#include <signal.h> #include "sway/commands.h" #include "sway/config.h" #include "sway/tree/container.h" @@ -47,6 +48,9 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((pid = fork()) == 0) { // Fork child process again setsid(); + sigset_t set; + sigemptyset(&set); + sigprocmask(SIG_SETMASK, &set, NULL); close(fd[0]); if ((child = fork()) == 0) { close(fd[1]); diff --git a/sway/commands/move.c b/sway/commands/move.c index 46ebcd83..702b42d9 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -59,8 +59,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, && strcasecmp(argv[2], "workspace") == 0) { // move container to workspace x if (current->type == C_WORKSPACE) { - // TODO: Wrap children in a container and move that - return cmd_results_new(CMD_FAILURE, "move", "Unimplemented"); + current = container_wrap_children(current); } else if (current->type != C_CONTAINER && current->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); |