diff options
| author | Ian Fan <ianfan0@gmail.com> | 2018-10-16 10:59:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 10:59:09 +0100 |
| commit | 113751ea48b9ffa537c357373913ca9caecb68e0 (patch) | |
| tree | 994739d4ba8388d7a336ac825a618daf2274ec66 /sway/commands | |
| parent | cd02d60a992ee38689a0d17fc69c4e2b1956f266 (diff) | |
| parent | ac20690945f1cd44c4c22267c9e7a172ebcf5ba5 (diff) | |
Merge pull request #2836 from RyanDwyer/set-set-raw-focus
Introduce seat_set_raw_focus and remove notify argument from seat_set_focus_warp
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/move.c | 8 | ||||
| -rw-r--r-- | sway/commands/swap.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index fc2f1cc1..24036f36 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -543,7 +543,7 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { if (new_output_last_ws && new_output_last_ws != new_workspace) { struct sway_node *new_output_last_focus = seat_get_focus_inactive(seat, &new_output_last_ws->node); - seat_set_focus_warp(seat, new_output_last_focus, false, false); + seat_set_raw_focus(seat, new_output_last_focus); } // restore focus @@ -556,7 +556,7 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { focus = seat_get_focus_inactive(seat, &old_ws->node); } } - seat_set_focus_warp(seat, focus, true, false); + seat_set_focus(seat, focus); // clean-up, destroying parents if the container was the last child if (old_parent) { @@ -593,7 +593,7 @@ static void workspace_move_to_output(struct sway_workspace *workspace, char *ws_name = workspace_next_name(old_output->wlr_output->name); struct sway_workspace *ws = workspace_create(old_output, ws_name); free(ws_name); - seat_set_focus_workspace(seat, ws); + seat_set_raw_focus(seat, &ws->node); } workspace_consider_destroy(new_output_old_ws); @@ -704,7 +704,7 @@ static struct cmd_results *cmd_move_in_direction( } // Hack to re-focus container - seat_set_focus_workspace(config->handler_context.seat, new_ws); + seat_set_raw_focus(config->handler_context.seat, &new_ws->node); seat_set_focus_container(config->handler_context.seat, container); if (old_ws != new_ws) { diff --git a/sway/commands/swap.c b/sway/commands/swap.c index d8ffe78c..9cc0d5c2 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c @@ -61,13 +61,13 @@ static void swap_focus(struct sway_container *con1, enum sway_container_layout layout2 = container_parent_layout(con2); if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) { if (workspace_is_visible(ws2)) { - seat_set_focus_warp(seat, &con2->node, false, true); + seat_set_focus_warp(seat, &con2->node, false); } seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1); } else if (focus == con2 && (layout1 == L_TABBED || layout1 == L_STACKED)) { if (workspace_is_visible(ws1)) { - seat_set_focus_warp(seat, &con1->node, false, true); + seat_set_focus_warp(seat, &con1->node, false); } seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2); } else if (ws1 != ws2) { |