aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/seat.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-19 07:57:50 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-19 08:00:13 +1000
commita2fdac2c4b81b6da95b914a5f65fb297cb8d4ce4 (patch)
treecc3e83eae5042db2ca75b063413d4d8403e79a7a /sway/input/seat.c
parentMerge pull request #2874 from ianyfan/swaybar (diff)
downloadsway-a2fdac2c4b81b6da95b914a5f65fb297cb8d4ce4.tar.gz
sway-a2fdac2c4b81b6da95b914a5f65fb297cb8d4ce4.tar.zst
sway-a2fdac2c4b81b6da95b914a5f65fb297cb8d4ce4.zip
Consider cursor warp when switching workspaces
Fixes a regression introduced in 24a90e5d86441fc345356eb3767e5a6880dcedbd. consider_warp_to_focus has been renamed to seat_consider_warp_to_focus, moved to seat.c and made public. It is now called when switching workspaces via `workspace <ws>`.
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r--sway/input/seat.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 60ee27d0..08b2e7cf 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1187,3 +1187,21 @@ void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
1187 seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat, 1187 seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat,
1188 time_msec, button, state); 1188 time_msec, button, state);
1189} 1189}
1190
1191void seat_consider_warp_to_focus(struct sway_seat *seat) {
1192 struct sway_node *focus = seat_get_focus(seat);
1193 if (config->mouse_warping == WARP_NO || !focus || !seat->prev_focus) {
1194 return;
1195 }
1196 if (config->mouse_warping == WARP_OUTPUT &&
1197 node_get_output(focus) == node_get_output(seat->prev_focus)) {
1198 return;
1199 }
1200
1201 if (focus->type == N_CONTAINER) {
1202 cursor_warp_to_container(seat->cursor, focus->sway_container);
1203 } else {
1204 cursor_warp_to_workspace(seat->cursor, focus->sway_workspace);
1205 }
1206 cursor_send_pointer_motion(seat->cursor, 0, false);
1207}