aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/move.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/move.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/move.c')
-rw-r--r--sway/commands/move.c6
1 files changed, 3 insertions, 3 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);