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 | Merge pull request #2831 from swaywm/move-output-docs (diff) | |
download | sway-26278b694c5eeff38512cfe8156567718db73c65.tar.gz sway-26278b694c5eeff38512cfe8156567718db73c65.tar.zst sway-26278b694c5eeff38512cfe8156567718db73c65.zip |
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) { | |||
543 | if (new_output_last_ws && new_output_last_ws != new_workspace) { | 543 | if (new_output_last_ws && new_output_last_ws != new_workspace) { |
544 | struct sway_node *new_output_last_focus = | 544 | struct sway_node *new_output_last_focus = |
545 | seat_get_focus_inactive(seat, &new_output_last_ws->node); | 545 | seat_get_focus_inactive(seat, &new_output_last_ws->node); |
546 | seat_set_focus_warp(seat, new_output_last_focus, false, false); | 546 | seat_set_raw_focus(seat, new_output_last_focus); |
547 | } | 547 | } |
548 | 548 | ||
549 | // restore focus | 549 | // restore focus |
@@ -556,7 +556,7 @@ static struct cmd_results *cmd_move_container(int argc, char **argv) { | |||
556 | focus = seat_get_focus_inactive(seat, &old_ws->node); | 556 | focus = seat_get_focus_inactive(seat, &old_ws->node); |
557 | } | 557 | } |
558 | } | 558 | } |
559 | seat_set_focus_warp(seat, focus, true, false); | 559 | seat_set_focus(seat, focus); |
560 | 560 | ||
561 | // clean-up, destroying parents if the container was the last child | 561 | // clean-up, destroying parents if the container was the last child |
562 | if (old_parent) { | 562 | if (old_parent) { |
@@ -593,7 +593,7 @@ static void workspace_move_to_output(struct sway_workspace *workspace, | |||
593 | char *ws_name = workspace_next_name(old_output->wlr_output->name); | 593 | char *ws_name = workspace_next_name(old_output->wlr_output->name); |
594 | struct sway_workspace *ws = workspace_create(old_output, ws_name); | 594 | struct sway_workspace *ws = workspace_create(old_output, ws_name); |
595 | free(ws_name); | 595 | free(ws_name); |
596 | seat_set_focus_workspace(seat, ws); | 596 | seat_set_raw_focus(seat, &ws->node); |
597 | } | 597 | } |
598 | 598 | ||
599 | workspace_consider_destroy(new_output_old_ws); | 599 | 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, | |||
50 | enum sway_container_layout layout2 = container_parent_layout(con2); | 50 | enum sway_container_layout layout2 = container_parent_layout(con2); |
51 | if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) { | 51 | if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) { |
52 | if (workspace_is_visible(ws2)) { | 52 | if (workspace_is_visible(ws2)) { |
53 | seat_set_focus_warp(seat, &con2->node, false, true); | 53 | seat_set_focus_warp(seat, &con2->node, false); |
54 | } | 54 | } |
55 | seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1); | 55 | seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1); |
56 | } else if (focus == con2 && (layout1 == L_TABBED | 56 | } else if (focus == con2 && (layout1 == L_TABBED |
57 | || layout1 == L_STACKED)) { | 57 | || layout1 == L_STACKED)) { |
58 | if (workspace_is_visible(ws1)) { | 58 | if (workspace_is_visible(ws1)) { |
59 | seat_set_focus_warp(seat, &con1->node, false, true); | 59 | seat_set_focus_warp(seat, &con1->node, false); |
60 | } | 60 | } |
61 | seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2); | 61 | seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2); |
62 | } else if (ws1 != ws2) { | 62 | } else if (ws1 != ws2) { |