diff options
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index ab959b77..644c622b 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
| @@ -78,10 +78,10 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, | |||
| 78 | } | 78 | } |
| 79 | free(ws_name); | 79 | free(ws_name); |
| 80 | struct sway_container *old_parent = current->parent; | 80 | struct sway_container *old_parent = current->parent; |
| 81 | struct sway_container *focus = sway_seat_get_focus_inactive( | 81 | struct sway_container *focus = seat_get_focus_inactive( |
| 82 | config->handler_context.seat, ws); | 82 | config->handler_context.seat, ws); |
| 83 | container_move_to(current, focus); | 83 | container_move_to(current, focus); |
| 84 | sway_seat_set_focus(config->handler_context.seat, old_parent); | 84 | seat_set_focus(config->handler_context.seat, old_parent); |
| 85 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 85 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
| 86 | } else if (strcasecmp(argv[1], "to") == 0 | 86 | } else if (strcasecmp(argv[1], "to") == 0 |
| 87 | && strcasecmp(argv[2], "output") == 0) { | 87 | && strcasecmp(argv[2], "output") == 0) { |
| @@ -100,7 +100,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, | |||
| 100 | return cmd_results_new(CMD_FAILURE, "move workspace", | 100 | return cmd_results_new(CMD_FAILURE, "move workspace", |
| 101 | "Can't find output with name/direction '%s'", argv[3]); | 101 | "Can't find output with name/direction '%s'", argv[3]); |
| 102 | } | 102 | } |
| 103 | struct sway_container *focus = sway_seat_get_focus_inactive( | 103 | struct sway_container *focus = seat_get_focus_inactive( |
| 104 | config->handler_context.seat, destination); | 104 | config->handler_context.seat, destination); |
| 105 | if (!focus) { | 105 | if (!focus) { |
| 106 | // We've never been to this output before | 106 | // We've never been to this output before |
| @@ -108,7 +108,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, | |||
| 108 | } | 108 | } |
| 109 | struct sway_container *old_parent = current->parent; | 109 | struct sway_container *old_parent = current->parent; |
| 110 | container_move_to(current, focus); | 110 | container_move_to(current, focus); |
| 111 | sway_seat_set_focus(config->handler_context.seat, old_parent); | 111 | seat_set_focus(config->handler_context.seat, old_parent); |
| 112 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 112 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
| 113 | } | 113 | } |
| 114 | return cmd_results_new(CMD_INVALID, "move", expected_syntax); | 114 | return cmd_results_new(CMD_INVALID, "move", expected_syntax); |