diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-15 21:06:24 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-15 21:06:24 +1000 |
| commit | 26278b694c5eeff38512cfe8156567718db73c65 (patch) | |
| tree | 7c7a5226543817d6c723a9b698458934ee905735 /sway/commands | |
| parent | 56c388b51076c3d96363e6afb62d0138cd3dce36 (diff) | |
| download | sway-26278b694c5eeff38512cfe8156567718db73c65.tar.xz | |
Introduce seat_set_raw_focus and remove notify argument from seat_set_focus_warp
This introduces seat_set_raw_focus: a function that manipulates the
focus stack without doing any other behaviour whatsoever. There are a
few places where this is useful, such as where we set focus_inactive
followed by another call to set the real focus again. With this change,
the notify argument to seat_set_focus_warp is also removed as these
cases now use the raw function instead.
A bonus of this is we are no longer emitting window::focus IPC events
when setting focus_inactive, nor are we sending focus/unfocus events to
the surface.
This also fixes the following:
* When running `move workspace to output <name>` and moving the last
workspace from the source output, the workspace::focus IPC event is no
longer emitted for the newly created workspace.
* When splitting the currently focused container, unfocus/focus events
will not be sent to the surface when giving focus_inactive to the newly
created parent, and window::focus events will not be emitted.
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/move.c | 6 | ||||
| -rw-r--r-- | sway/commands/swap.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index fc2f1cc1..215ffe27 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); diff --git a/sway/commands/swap.c b/sway/commands/swap.c index e7f9cbea..22e3927d 100644 --- a/sway/commands/swap.c +++ b/sway/commands/swap.c @@ -50,13 +50,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) { |