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/tree/container.c | |
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/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index f36fe4b0..edab7a17 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -1202,8 +1202,8 @@ struct sway_container *container_split(struct sway_container *child, | |||
1202 | container_add_child(cont, child); | 1202 | container_add_child(cont, child); |
1203 | 1203 | ||
1204 | if (set_focus) { | 1204 | if (set_focus) { |
1205 | seat_set_focus_container(seat, cont); | 1205 | seat_set_raw_focus(seat, &cont->node); |
1206 | seat_set_focus_container(seat, child); | 1206 | seat_set_raw_focus(seat, &child->node); |
1207 | } | 1207 | } |
1208 | 1208 | ||
1209 | return cont; | 1209 | return cont; |