aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/swap.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-15 21:06:24 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-15 21:06:24 +1000
commit26278b694c5eeff38512cfe8156567718db73c65 (patch)
tree7c7a5226543817d6c723a9b698458934ee905735 /sway/commands/swap.c
parentMerge pull request #2831 from swaywm/move-output-docs (diff)
downloadsway-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/swap.c')
-rw-r--r--sway/commands/swap.c4
1 files changed, 2 insertions, 2 deletions
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) {