diff options
| author | emersion <contact@emersion.fr> | 2018-04-09 17:40:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 17:40:55 -0400 |
| commit | 48fca1c7ec0d49152f5290c58b605c2ecb5da578 (patch) | |
| tree | f024ad39b9ef79045bbcf0a49087f12270126a03 | |
| parent | 78b6ac6aa1377948182a3f7e4bc108bd87d25e0e (diff) | |
| parent | 63b2543749e57e4340f539a2742fd13e89d96d94 (diff) | |
Merge pull request #1788 from thejan2009/move_auto_back_and_forth
Add workspace_auto_back_and_forth for move cmd
| -rw-r--r-- | sway/commands/move.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 15a5ebc4..a5273ba4 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -1,3 +1,4 @@ +#define _XOPEN_SOURCE 500 #include <string.h> #include <strings.h> #include <wlr/types/wlr_output.h> @@ -63,18 +64,29 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, "Can only move containers and views."); } struct sway_container *ws; - const char *num_name = NULL; char *ws_name = NULL; if (argc == 5 && strcasecmp(argv[3], "number") == 0) { // move "container to workspace number x" - num_name = argv[4]; - ws = workspace_by_number(num_name); + ws_name = strdup(argv[4]); + ws = workspace_by_number(ws_name); } else { ws_name = join_args(argv + 3, argc - 3); ws = workspace_by_name(ws_name); } + + if (config->auto_back_and_forth && prev_workspace_name) { + // auto back and forth move + struct sway_container *curr_ws = container_parent(current, C_WORKSPACE); + if (curr_ws->name && strcmp(curr_ws->name, ws_name) == 0) { + // if target workspace is the current one + free(ws_name); + ws_name = strdup(prev_workspace_name); + ws = workspace_by_name(ws_name); + } + } + if (!ws) { - ws = workspace_create(NULL, ws_name ? ws_name : num_name); + ws = workspace_create(NULL, ws_name); } free(ws_name); struct sway_container *old_parent = current->parent; |