aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/cursor.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/input/cursor.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/input/cursor.c')
-rw-r--r--sway/input/cursor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 5c446299..bbe6b890 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -596,7 +596,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
596 struct sway_output *focused_output = node_get_output(focus); 596 struct sway_output *focused_output = node_get_output(focus);
597 struct sway_output *output = node_get_output(node); 597 struct sway_output *output = node_get_output(node);
598 if (output != focused_output) { 598 if (output != focused_output) {
599 seat_set_focus_warp(seat, node, false, true); 599 seat_set_focus_warp(seat, node, false);
600 } 600 }
601 } else if (node->type == N_CONTAINER && node->sway_container->view) { 601 } else if (node->type == N_CONTAINER && node->sway_container->view) {
602 // Focus node if the following are true: 602 // Focus node if the following are true:
@@ -606,14 +606,14 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
606 if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) && 606 if (!wlr_seat_keyboard_has_grab(cursor->seat->wlr_seat) &&
607 node != prev_node && 607 node != prev_node &&
608 view_is_visible(node->sway_container->view)) { 608 view_is_visible(node->sway_container->view)) {
609 seat_set_focus_warp(seat, node, false, true); 609 seat_set_focus_warp(seat, node, false);
610 } else { 610 } else {
611 struct sway_node *next_focus = 611 struct sway_node *next_focus =
612 seat_get_focus_inactive(seat, &root->node); 612 seat_get_focus_inactive(seat, &root->node);
613 if (next_focus && next_focus->type == N_CONTAINER && 613 if (next_focus && next_focus->type == N_CONTAINER &&
614 next_focus->sway_container->view && 614 next_focus->sway_container->view &&
615 view_is_visible(next_focus->sway_container->view)) { 615 view_is_visible(next_focus->sway_container->view)) {
616 seat_set_focus_warp(seat, next_focus, false, true); 616 seat_set_focus_warp(seat, next_focus, false);
617 } 617 }
618 } 618 }
619 } 619 }