diff options
| author | emersion <contact@emersion.fr> | 2018-04-02 15:24:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 15:24:25 -0400 |
| commit | 0c0cc79282b5ce29616893977aca629f90521988 (patch) | |
| tree | e06d46f222487c4d266c09892d1907ce80b69a66 /sway/commands/move.c | |
| parent | 4134407fa967c7f45cd09554b74a15f28974fca5 (diff) | |
| parent | c7a6524954578977dd8f806713a258a0947a4951 (diff) | |
Merge pull request #1699 from acrisci/seat-fixes
Seat fixes and cleanup
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, } free(ws_name); struct sway_container *old_parent = current->parent; - struct sway_container *focus = sway_seat_get_focus_inactive( + struct sway_container *focus = seat_get_focus_inactive( config->handler_context.seat, ws); container_move_to(current, focus); - sway_seat_set_focus(config->handler_context.seat, old_parent); + seat_set_focus(config->handler_context.seat, old_parent); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } else if (strcasecmp(argv[1], "to") == 0 && strcasecmp(argv[2], "output") == 0) { @@ -100,7 +100,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, return cmd_results_new(CMD_FAILURE, "move workspace", "Can't find output with name/direction '%s'", argv[3]); } - struct sway_container *focus = sway_seat_get_focus_inactive( + struct sway_container *focus = seat_get_focus_inactive( config->handler_context.seat, destination); if (!focus) { // We've never been to this output before @@ -108,7 +108,7 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, } struct sway_container *old_parent = current->parent; container_move_to(current, focus); - sway_seat_set_focus(config->handler_context.seat, old_parent); + seat_set_focus(config->handler_context.seat, old_parent); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } return cmd_results_new(CMD_INVALID, "move", expected_syntax); |